fix: resolve residual multimodal/session/provider review risks

Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>

Author: xgopilot

internal/provider/openaicompat/chatcompletions/provider_test.go

@@ -123,8 +123,8 @@ func TestNewAndBuildRequest(t *testing.T) {
 		if downgradedSchema["type"] != "object" {
 			t.Fatalf("expected downgraded schema type object, got %+v", downgradedSchema["type"])
 		}
-		if downgradedSchema["x-neocode-schema-downgraded"] != true {
-			t.Fatalf("expected downgrade marker, got %+v", downgradedSchema)
+		if _, ok := downgradedSchema["x-neocode-schema-downgraded"]; ok {
+			t.Fatalf("expected no custom downgrade marker in outbound schema, got %+v", downgradedSchema)
 		}
 
 		withSessionAsset, err := BuildRequest(context.Background(), testCfg("https://api.example.com/v1", "gpt-4.1", "test-key"), providertypes.GenerateRequest{

internal/provider/openaicompat/chatcompletions/request.go

@@ -91,14 +91,10 @@ func normalizeToolSchemaForOpenAI(schema map[string]any) map[string]any {
 	typeName, _ := normalized["type"].(string)
 	if strings.TrimSpace(strings.ToLower(typeName)) != "object" {
 		normalized["type"] = "object"
-		normalized["x-neocode-schema-downgraded"] = true
 	}
 
 	if _, ok := normalized["properties"].(map[string]any); !ok {
 		normalized["properties"] = map[string]any{}
-		if strings.TrimSpace(strings.ToLower(typeName)) != "object" {
-			normalized["x-neocode-schema-downgraded"] = true
-		}
 	}
 	return normalized
 }

internal/session/asset_store_test.go

@@ -224,6 +224,31 @@ func TestJSONStoreOpenAndStatMissingStoredFiles(t *testing.T) {
 	}
 }
 
+func TestJSONStoreDeleteAsset(t *testing.T) {
+	t.Parallel()
+
+	store := NewJSONStore(t.TempDir(), t.TempDir())
+	sessionID := "session-delete-asset"
+	meta, err := store.SaveAsset(context.Background(), sessionID, strings.NewReader("img"), "image/png")
+	if err != nil {
+		t.Fatalf("save seed asset: %v", err)
+	}
+
+	if err := store.DeleteAsset(context.Background(), sessionID, meta.ID); err != nil {
+		t.Fatalf("DeleteAsset() error = %v", err)
+	}
+	if _, statErr := os.Stat(store.assetPath(sessionID, meta.ID)); !errors.Is(statErr, os.ErrNotExist) {
+		t.Fatalf("expected removed asset file, got %v", statErr)
+	}
+	if _, statErr := os.Stat(store.assetMetaPath(sessionID, meta.ID)); !errors.Is(statErr, os.ErrNotExist) {
+		t.Fatalf("expected removed asset meta file, got %v", statErr)
+	}
+
+	if err := store.DeleteAsset(context.Background(), sessionID, meta.ID); err != nil {
+		t.Fatalf("DeleteAsset() should ignore already deleted files, got %v", err)
+	}
+}
+
 type failingReader struct{}
 
 func (failingReader) Read(_ []byte) (int, error) {

internal/session/input_preparer.go

@@ -70,6 +70,10 @@ type InputPreparer struct {
 	assetStore AssetStore
 }
 
+type assetCleanupStore interface {
+	DeleteAsset(ctx context.Context, sessionID string, assetID string) error
+}
+
 // NewInputPreparer 创建会话输入归一化组件。
 func NewInputPreparer(store Store, assetStore AssetStore) *InputPreparer {
 	return &InputPreparer{
@@ -96,7 +100,7 @@ func (p *InputPreparer) Prepare(ctx context.Context, input PrepareInput) (Prepar
 	}
 
 	sessionTitle := buildSessionTitle(trimmedText, len(input.Images) > 0)
-	session, sessionCreated, err := p.loadOrCreateSession(
+	session, sessionCreated, pendingUpdate, err := p.loadOrCreateSession(
 		ctx,
 		input.SessionID,
 		sessionTitle,
@@ -117,6 +121,7 @@ func (p *InputPreparer) Prepare(ctx context.Context, input PrepareInput) (Prepar
 		path := strings.TrimSpace(image.Path)
 		if path == "" {
 			p.rollbackCreatedSession(ctx, session.ID, sessionCreated)
+			p.cleanupSavedAssets(ctx, session.ID, savedAssets)
 			return PreparedInput{}, &AssetSaveError{
 				SessionID: session.ID,
 				Index:     index,
@@ -129,6 +134,7 @@ func (p *InputPreparer) Prepare(ctx context.Context, input PrepareInput) (Prepar
 		meta, err := p.saveImageAsset(ctx, session.ID, session.Workdir, path, mimeType)
 		if err != nil {
 			p.rollbackCreatedSession(ctx, session.ID, sessionCreated)
+			p.cleanupSavedAssets(ctx, session.ID, savedAssets)
 			return PreparedInput{}, &AssetSaveError{
 				SessionID: session.ID,
 				Index:     index,
@@ -142,8 +148,14 @@ func (p *InputPreparer) Prepare(ctx context.Context, input PrepareInput) (Prepar
 
 	if err := providertypes.ValidateParts(parts); err != nil {
 		p.rollbackCreatedSession(ctx, session.ID, sessionCreated)
+		p.cleanupSavedAssets(ctx, session.ID, savedAssets)
 		return PreparedInput{}, fmt.Errorf("session: normalize parts: %w", err)
 	}
+	if err := p.persistSessionWorkdirUpdate(ctx, pendingUpdate); err != nil {
+		p.rollbackCreatedSession(ctx, session.ID, sessionCreated)
+		p.cleanupSavedAssets(ctx, session.ID, savedAssets)
+		return PreparedInput{}, err
+	}
 
 	return PreparedInput{
 		SessionID:   session.ID,
@@ -278,47 +290,53 @@ func resolveImagePath(workdir string, path string) (string, error) {
 	return resolved, nil
 }
 
+// sessionWorkdirUpdate 描述已有会话 workdir 的待提交变更，确保 Prepare 成功后再落盘。
+type sessionWorkdirUpdate struct {
+	session Session
+	dirty   bool
+}
+
 func (p *InputPreparer) loadOrCreateSession(
 	ctx context.Context,
 	sessionID string,
 	title string,
 	defaultWorkdir string,
 	requestedWorkdir string,
-) (Session, bool, error) {
+) (Session, bool, sessionWorkdirUpdate, error) {
 	if strings.TrimSpace(sessionID) == "" {
 		sessionWorkdir, err := resolveWorkdirForInput(defaultWorkdir, "", requestedWorkdir)
 		if err != nil {
-			return Session{}, false, err
+			return Session{}, false, sessionWorkdirUpdate{}, err
 		}
 		session := NewWithWorkdir(title, sessionWorkdir)
 		if err := p.store.Save(ctx, &session); err != nil {
-			return Session{}, false, err
+			return Session{}, false, sessionWorkdirUpdate{}, err
 		}
-		return session, true, nil
+		return session, true, sessionWorkdirUpdate{}, nil
 	}
 
 	session, err := p.store.Load(ctx, sessionID)
 	if err != nil {
-		return Session{}, false, err
+		return Session{}, false, sessionWorkdirUpdate{}, err
 	}
 	if strings.TrimSpace(requestedWorkdir) == "" && strings.TrimSpace(session.Workdir) != "" {
-		return session, false, nil
+		return session, false, sessionWorkdirUpdate{}, nil
 	}
 
 	resolved, err := resolveWorkdirForInput(defaultWorkdir, session.Workdir, requestedWorkdir)
 	if err != nil {
-		return Session{}, false, err
+		return Session{}, false, sessionWorkdirUpdate{}, err
 	}
 	if session.Workdir == resolved {
-		return session, false, nil
+		return session, false, sessionWorkdirUpdate{}, nil
 	}
 
 	session.Workdir = resolved
 	session.UpdatedAt = time.Now()
-	if err := p.store.Save(ctx, &session); err != nil {
-		return Session{}, false, err
-	}
-	return session, false, nil
+	return session, false, sessionWorkdirUpdate{
+		session: session,
+		dirty:   true,
+	}, nil
 }
 
 // rollbackCreatedSession 在本次 Prepare 新建会话后发生错误时回滚会话目录，避免残留孤儿会话。
@@ -332,6 +350,34 @@ func (p *InputPreparer) rollbackCreatedSession(ctx context.Context, sessionID st
 	_ = p.store.DeleteSession(ctx, sessionID)
 }
 
+// persistSessionWorkdirUpdate 在 Prepare 其余步骤完成后统一提交会话 workdir 更新，避免失败时出现部分提交。
+func (p *InputPreparer) persistSessionWorkdirUpdate(ctx context.Context, pending sessionWorkdirUpdate) error {
+	if !pending.dirty {
+		return nil
+	}
+	if err := p.store.Save(ctx, &pending.session); err != nil {
+		return err
+	}
+	return nil
+}
+
+// cleanupSavedAssets 在 Prepare 失败时尽力回收已落盘的附件，减少 existing session 残留垃圾文件。
+func (p *InputPreparer) cleanupSavedAssets(ctx context.Context, sessionID string, assets []AssetMeta) {
+	if len(assets) == 0 || ctx.Err() != nil {
+		return
+	}
+	cleanupStore, ok := p.assetStore.(assetCleanupStore)
+	if !ok {
+		return
+	}
+	for _, asset := range assets {
+		if strings.TrimSpace(asset.ID) == "" {
+			continue
+		}
+		_ = cleanupStore.DeleteAsset(ctx, sessionID, asset.ID)
+	}
+}
+
 func resolveWorkdirForInput(defaultWorkdir string, currentWorkdir string, requestedWorkdir string) (string, error) {
 	base := EffectiveWorkdir(currentWorkdir, defaultWorkdir)
 	if strings.TrimSpace(requestedWorkdir) == "" {

internal/session/input_preparer_test.go

@@ -237,6 +237,76 @@ func TestInputPreparerPrepareErrors(t *testing.T) {
 			t.Fatalf("expected existing session to remain, load error = %v", loadErr)
 		}
 	})
+
+	t.Run("existing session cleanup removes previously saved assets on later failure", func(t *testing.T) {
+		existing := NewWithWorkdir("existing-cleanup", workdir)
+		if err := store.Save(context.Background(), &existing); err != nil {
+			t.Fatalf("Save() error = %v", err)
+		}
+
+		okImage := filepath.Join(workdir, "ok.png")
+		if err := os.WriteFile(okImage, minimalPNGBytes(), 0o644); err != nil {
+			t.Fatalf("write image: %v", err)
+		}
+
+		preparer := NewInputPreparer(store, store)
+		_, err := preparer.Prepare(context.Background(), PrepareInput{
+			SessionID: existing.ID,
+			Text:      "cleanup",
+			Images: []PrepareImageInput{
+				{Path: okImage},
+				{Path: "not-found.png", MimeType: "image/png"},
+			},
+			DefaultWorkdir: workdir,
+		})
+		if err == nil {
+			t.Fatalf("expected prepare error")
+		}
+
+		entries, readErr := os.ReadDir(store.assetsDir(existing.ID))
+		if readErr != nil {
+			t.Fatalf("ReadDir() error = %v", readErr)
+		}
+		if len(entries) != 0 {
+			t.Fatalf("expected no leftover assets, got %d files", len(entries))
+		}
+	})
+
+	t.Run("existing session workdir change is not persisted when prepare fails", func(t *testing.T) {
+		currentWorkdir := filepath.Join(workdir, "current")
+		if err := os.MkdirAll(currentWorkdir, 0o755); err != nil {
+			t.Fatalf("mkdir current workdir: %v", err)
+		}
+		targetWorkdir := filepath.Join(currentWorkdir, "nested")
+		if err := os.MkdirAll(targetWorkdir, 0o755); err != nil {
+			t.Fatalf("mkdir nested workdir: %v", err)
+		}
+
+		existing := NewWithWorkdir("existing-workdir", currentWorkdir)
+		if err := store.Save(context.Background(), &existing); err != nil {
+			t.Fatalf("Save() error = %v", err)
+		}
+
+		preparer := NewInputPreparer(store, store)
+		_, err := preparer.Prepare(context.Background(), PrepareInput{
+			SessionID:        existing.ID,
+			Text:             "will fail",
+			RequestedWorkdir: "nested",
+			Images:           []PrepareImageInput{{Path: "not-found.png", MimeType: "image/png"}},
+			DefaultWorkdir:   workdir,
+		})
+		if err == nil {
+			t.Fatalf("expected prepare error")
+		}
+
+		loaded, loadErr := store.Load(context.Background(), existing.ID)
+		if loadErr != nil {
+			t.Fatalf("Load() error = %v", loadErr)
+		}
+		if loaded.Workdir != currentWorkdir {
+			t.Fatalf("expected workdir to stay %q, got %q", currentWorkdir, loaded.Workdir)
+		}
+	})
 }
 
 func TestInputPreparerPrepareImagePathAndMimeValidation(t *testing.T) {

internal/session/store.go

@@ -399,6 +399,39 @@ func (s *JSONStore) Stat(ctx context.Context, sessionID string, assetID string)
 	return s.statUnlocked(sessionID, assetID)
 }
 
+// DeleteAsset 删除指定会话附件的二进制与元数据文件，用于输入归一化失败后的清理。
+func (s *JSONStore) DeleteAsset(ctx context.Context, sessionID string, assetID string) error {
+	if err := ctx.Err(); err != nil {
+		return err
+	}
+	if err := validateStorageID("session id", sessionID); err != nil {
+		return fmt.Errorf("session: %w", err)
+	}
+	if err := validateStorageID("asset id", assetID); err != nil {
+		return fmt.Errorf("session: %w", err)
+	}
+
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
+	target := s.assetPath(sessionID, assetID)
+	if err := ensurePathWithinBase(s.baseDir, target); err != nil {
+		return fmt.Errorf("session: resolve asset file path: %w", err)
+	}
+	if err := os.Remove(target); err != nil && !errors.Is(err, os.ErrNotExist) {
+		return fmt.Errorf("session: delete asset file: %w", err)
+	}
+
+	metaTarget := s.assetMetaPath(sessionID, assetID)
+	if err := ensurePathWithinBase(s.baseDir, metaTarget); err != nil {
+		return fmt.Errorf("session: resolve asset meta file path: %w", err)
+	}
+	if err := os.Remove(metaTarget); err != nil && !errors.Is(err, os.ErrNotExist) {
+		return fmt.Errorf("session: delete asset meta file: %w", err)
+	}
+	return nil
+}
+
 // statUnlocked 在调用方已持有读锁时读取附件元数据，避免重复加锁导致死锁风险。
 func (s *JSONStore) statUnlocked(sessionID string, assetID string) (AssetMeta, error) {
 	target := s.assetMetaPath(sessionID, assetID)

internal/tui/core/app/update.go

@@ -966,9 +966,6 @@ func (a *App) handleRuntimeEvent(event agentruntime.RuntimeEvent) bool {
 	if !a.shouldHandleRuntimeEvent(event) {
 		return false
 	}
-	if a.state.ActiveSessionID == "" {
-		a.state.ActiveSessionID = event.SessionID
-	}
 	handler, ok := runtimeEventHandlerRegistry[event.Type]
 	if !ok {
 		return false
@@ -1051,6 +1048,9 @@ func runtimeEventUserMessageHandler(a *App, event agentruntime.RuntimeEvent) boo
 	if runID != "" {
 		a.state.ActiveRunID = runID
 	}
+	if sessionID := strings.TrimSpace(event.SessionID); sessionID != "" {
+		a.state.ActiveSessionID = sessionID
+	}
 	a.state.StatusText = statusThinking
 	a.state.StreamingReply = false
 	a.state.CurrentTool = ""
@@ -1085,6 +1085,9 @@ func runtimeEventRunContextHandler(a *App, event agentruntime.RuntimeEvent) bool
 	}
 	mapped := tuiservices.MapRunContextPayload(event.RunID, event.SessionID, payload)
 	a.state.RunContext = mapped
+	if strings.TrimSpace(mapped.SessionID) != "" {
+		a.state.ActiveSessionID = strings.TrimSpace(mapped.SessionID)
+	}
 	if strings.TrimSpace(mapped.RunID) != "" {
 		a.state.ActiveRunID = mapped.RunID
 	}