fix:Prepare 阶段的 workdir 持久化从“整包回写会话头”改成“只更新 workdir + updated_at

Author: wynxing

internal/runtime/input_prepare_test.go

@@ -160,6 +160,9 @@ func newPrepareTestService(t *testing.T, workdir string, withPreparer bool) (*Se
 	}
 
 	store := agentsession.NewStore(t.TempDir(), workdir)
+	t.Cleanup(func() {
+		_ = store.Close()
+	})
 	svc := NewWithFactory(manager, nil, store, nil, nil)
 	svc.SetSessionAssetStore(store)
 	if withPreparer {

internal/runtime/runtime_internal_helpers_test.go

@@ -44,6 +44,11 @@ func (s *lockProbeStore) ListSummaries(ctx context.Context) ([]agentsession.Summ
 	return nil, errors.New("not implemented")
 }
 
+// UpdateSessionWorkdir 仅为接口占位，当前测试不会走到该分支。
+func (s *lockProbeStore) UpdateSessionWorkdir(ctx context.Context, input agentsession.UpdateSessionWorkdirInput) error {
+	return errors.New("not implemented")
+}
+
 func (s *lockProbeStore) UpdateSessionState(ctx context.Context, input agentsession.UpdateSessionStateInput) error {
 	return errors.New("not implemented")
 }

internal/runtime/runtime_remaining_branches_test.go

@@ -100,6 +100,14 @@ func (s *saveHookStore) AppendMessages(ctx context.Context, input agentsession.A
 	return s.base.AppendMessages(ctx, input)
 }
 
+// UpdateSessionWorkdir 在写前注入回调，再转发给底层内存 store。
+func (s *saveHookStore) UpdateSessionWorkdir(ctx context.Context, input agentsession.UpdateSessionWorkdirInput) error {
+	if err := s.beforeSave(ctx); err != nil {
+		return err
+	}
+	return s.base.UpdateSessionWorkdir(ctx, input)
+}
+
 func (s *saveHookStore) UpdateSessionState(ctx context.Context, input agentsession.UpdateSessionStateInput) error {
 	if err := s.beforeSave(ctx); err != nil {
 		return err
@@ -131,6 +139,11 @@ func (s *postSaveHookStore) AppendMessages(ctx context.Context, input agentsessi
 	return s.afterSave(s.base.AppendMessages(ctx, input))
 }
 
+// UpdateSessionWorkdir 在底层写入完成后执行一次 post-save 钩子。
+func (s *postSaveHookStore) UpdateSessionWorkdir(ctx context.Context, input agentsession.UpdateSessionWorkdirInput) error {
+	return s.afterSave(s.base.UpdateSessionWorkdir(ctx, input))
+}
+
 func (s *postSaveHookStore) UpdateSessionState(ctx context.Context, input agentsession.UpdateSessionStateInput) error {
 	return s.afterSave(s.base.UpdateSessionState(ctx, input))
 }

internal/runtime/runtime_test.go

@@ -161,6 +161,27 @@ func (s *memoryStore) AppendMessages(ctx context.Context, input agentsession.App
 }
 
 // UpdateSessionState 只覆写会话头字段，不改消息正文。
+// UpdateSessionWorkdir 仅更新会话 workdir 与时间，避免输入归一化覆盖其他会话头字段。
+func (s *memoryStore) UpdateSessionWorkdir(ctx context.Context, input agentsession.UpdateSessionWorkdirInput) error {
+	if err := ctx.Err(); err != nil {
+		return err
+	}
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	session, ok := s.sessions[input.SessionID]
+	if !ok {
+		return errors.New("not found")
+	}
+	if !input.UpdatedAt.IsZero() {
+		session.UpdatedAt = input.UpdatedAt
+	}
+	session.Workdir = input.Workdir
+	s.saves++
+	s.sessions[input.SessionID] = cloneSession(session)
+	return nil
+}
+
 func (s *memoryStore) UpdateSessionState(ctx context.Context, input agentsession.UpdateSessionStateInput) error {
 	if err := ctx.Err(); err != nil {
 		return err
@@ -257,6 +278,17 @@ func (s *failingStore) AppendMessages(ctx context.Context, input agentsession.Ap
 }
 
 // UpdateSessionState 转发到底层 Store，并按写入次数注入失败。
+// UpdateSessionWorkdir 杞彂鍒板簳灞?Store锛屽苟鎸夊啓鍏ユ鏁版敞鍏ュけ璐ャ€?
+func (s *failingStore) UpdateSessionWorkdir(ctx context.Context, input agentsession.UpdateSessionWorkdirInput) error {
+	if err := s.nextSaveError(ctx); err != nil {
+		return err
+	}
+	if s.Store == nil {
+		return nil
+	}
+	return s.Store.UpdateSessionWorkdir(ctx, input)
+}
+
 func (s *failingStore) UpdateSessionState(ctx context.Context, input agentsession.UpdateSessionStateInput) error {
 	if err := s.nextSaveError(ctx); err != nil {
 		return err
@@ -376,6 +408,25 @@ func (s *blockingLoadStore) AppendMessages(ctx context.Context, input agentsessi
 }
 
 // UpdateSessionState 在阻塞加载测试桩中更新会话头。
+// UpdateSessionWorkdir 鍦ㄩ樆濉炲姞杞芥祴璇曟々涓粎鏇存柊 workdir 涓庢椂闂淬€?
+func (s *blockingLoadStore) UpdateSessionWorkdir(ctx context.Context, input agentsession.UpdateSessionWorkdirInput) error {
+	if err := ctx.Err(); err != nil {
+		return err
+	}
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	session, ok := s.sessions[input.SessionID]
+	if !ok {
+		return errors.New("not found")
+	}
+	if !input.UpdatedAt.IsZero() {
+		session.UpdatedAt = input.UpdatedAt
+	}
+	session.Workdir = input.Workdir
+	s.sessions[input.SessionID] = cloneSession(session)
+	return nil
+}
+
 func (s *blockingLoadStore) UpdateSessionState(ctx context.Context, input agentsession.UpdateSessionStateInput) error {
 	if err := ctx.Err(); err != nil {
 		return err

internal/runtime/todo_mutator_test.go

@@ -66,6 +66,23 @@ func (s *mutatorStore) AppendMessages(ctx context.Context, input agentsession.Ap
 	return nil
 }
 
+// UpdateSessionWorkdir 仅更新 workdir 与更新时间，模拟最小粒度持久化。
+func (s *mutatorStore) UpdateSessionWorkdir(ctx context.Context, input agentsession.UpdateSessionWorkdirInput) error {
+	if err := ctx.Err(); err != nil {
+		return err
+	}
+	if s.err != nil {
+		return s.err
+	}
+	if s.last.ID != "" && s.last.ID != input.SessionID {
+		return errors.New("not found")
+	}
+	s.last.ID = input.SessionID
+	s.last.UpdatedAt = input.UpdatedAt
+	s.last.Workdir = input.Workdir
+	return nil
+}
+
 func (s *mutatorStore) UpdateSessionState(ctx context.Context, input agentsession.UpdateSessionStateInput) error {
 	if err := ctx.Err(); err != nil {
 		return err

internal/session/asset_store_test.go

@@ -71,6 +71,8 @@ func TestSQLiteStoreSaveAssetRejectsInvalidInput(t *testing.T) {
 	}
 	if _, err := store.SaveAsset(ctx, "missing", strings.NewReader("x"), "image/png"); err == nil {
 		t.Fatalf("expected missing session error")
+	} else if !errors.Is(err, os.ErrNotExist) {
+		t.Fatalf("expected os.ErrNotExist, got %v", err)
 	}
 	if _, _, err := store.Open(ctx, "bad/session", "asset_ok"); err == nil {
 		t.Fatalf("expected invalid session id error")

internal/session/input_preparer.go

@@ -401,18 +401,10 @@ func (p *InputPreparer) persistSessionWorkdirUpdate(ctx context.Context, pending
 	if !pending.dirty {
 		return nil
 	}
-	if err := p.store.UpdateSessionState(ctx, UpdateSessionStateInput{
-		SessionID:        pending.session.ID,
-		Title:            pending.session.Title,
-		UpdatedAt:        pending.session.UpdatedAt,
-		Provider:         pending.session.Provider,
-		Model:            pending.session.Model,
-		Workdir:          pending.session.Workdir,
-		TaskState:        pending.session.TaskState,
-		ActivatedSkills:  pending.session.ActivatedSkills,
-		Todos:            pending.session.Todos,
-		TokenInputTotal:  pending.session.TokenInputTotal,
-		TokenOutputTotal: pending.session.TokenOutputTotal,
+	if err := p.store.UpdateSessionWorkdir(ctx, UpdateSessionWorkdirInput{
+		SessionID: pending.session.ID,
+		UpdatedAt: pending.session.UpdatedAt,
+		Workdir:   pending.session.Workdir,
 	}); err != nil {
 		return err
 	}