Merge pull request #714 from wynxing/feat-session-asset-delete-v2

feat: 会话附件删除接口与图片输入模型兼容投影 (clean v2)

Author: wynxing

.gitignore

@@ -42,6 +42,7 @@ workspace.xml
 .vscode/
 .claude/
 .windsurf/
+.codebuddy/
 # VitePress / frontend build artifacts
 www/.vitepress/cache/
 www/.vitepress/dist/

internal/cli/gateway_runtime_bridge.go

@@ -40,6 +40,10 @@ type runtimeRunCanceler interface {
 	CancelRun(runID string) bool
 }
 
+type sessionAssetDeleter interface {
+	DeleteAsset(ctx context.Context, sessionID string, assetID string) error
+}
+
 type runtimeSessionCreator interface {
 	CreateSession(ctx context.Context, id string) (agentsession.Session, error)
 }
@@ -709,6 +713,19 @@ func (b *gatewayRuntimePortBridge) SaveSessionAsset(
 	if sessionID == "" {
 		return gateway.SessionAssetMeta{}, gateway.ErrRuntimeResourceNotFound
 	}
+	if b.sessionStore == nil {
+		return gateway.SessionAssetMeta{}, fmt.Errorf("gateway runtime bridge: session store is unavailable")
+	}
+	loader, ok := b.sessionStore.(bridgeSessionLoader)
+	if !ok {
+		return gateway.SessionAssetMeta{}, fmt.Errorf("gateway runtime bridge: session asset store is unavailable")
+	}
+	if _, err := loader.LoadSession(ctx, sessionID); err != nil {
+		if isRuntimeNotFoundError(err) {
+			return gateway.SessionAssetMeta{}, gateway.ErrRuntimeResourceNotFound
+		}
+		return gateway.SessionAssetMeta{}, err
+	}
 	assetStore, ok := b.sessionStore.(agentsession.AssetStore)
 	if !ok || assetStore == nil {
 		return gateway.SessionAssetMeta{}, fmt.Errorf("gateway runtime bridge: session asset store is unavailable")
@@ -744,6 +761,9 @@ func (b *gatewayRuntimePortBridge) OpenSessionAsset(
 	}
 	reader, meta, err := assetStore.Open(ctx, sessionID, assetID)
 	if err != nil {
+		if isRuntimeNotFoundError(err) || errors.Is(err, os.ErrNotExist) {
+			return gateway.OpenSessionAssetResult{}, gateway.ErrRuntimeResourceNotFound
+		}
 		return gateway.OpenSessionAssetResult{}, err
 	}
 	return gateway.OpenSessionAssetResult{
@@ -757,6 +777,32 @@ func (b *gatewayRuntimePortBridge) OpenSessionAsset(
 	}, nil
 }
 
+// DeleteSessionAsset 删除当前工作区的会话附件，供 Web 在取消上传引用时释放服务端文件。
+func (b *gatewayRuntimePortBridge) DeleteSessionAsset(ctx context.Context, input gateway.DeleteSessionAssetInput) error {
+	if err := b.ensureRuntimeAccess(input.SubjectID); err != nil {
+		return err
+	}
+	sessionID := strings.TrimSpace(input.SessionID)
+	assetID := strings.TrimSpace(input.AssetID)
+	if sessionID == "" || assetID == "" {
+		return gateway.ErrRuntimeResourceNotFound
+	}
+	if b.sessionStore == nil {
+		return fmt.Errorf("gateway runtime bridge: session store is unavailable")
+	}
+	deleter, ok := b.sessionStore.(sessionAssetDeleter)
+	if !ok || deleter == nil {
+		return fmt.Errorf("gateway runtime bridge: session asset store does not support delete")
+	}
+	if err := deleter.DeleteAsset(ctx, sessionID, assetID); err != nil {
+		if isRuntimeNotFoundError(err) {
+			return nil
+		}
+		return err
+	}
+	return nil
+}
+
 // DeleteSession 删除/归档指定会话。
 func (b *gatewayRuntimePortBridge) DeleteSession(ctx context.Context, input gateway.DeleteSessionInput) (bool, error) {
 	if err := b.ensureRuntimeAccess(input.SubjectID); err != nil {
@@ -2645,6 +2691,7 @@ type manualModelPayload struct {
 }
 
 var _ gateway.RuntimePort = (*gatewayRuntimePortBridge)(nil)
+var _ gateway.SessionAssetPort = (*gatewayRuntimePortBridge)(nil)
 
 func (b *gatewayRuntimePortBridge) ListCheckpoints(ctx context.Context, input gateway.ListCheckpointsInput) ([]gateway.CheckpointEntry, error) {
 	cp, ok := b.runtime.(runtimeCheckpointer)

internal/cli/gateway_runtime_bridge_test.go

@@ -1594,6 +1594,7 @@ func TestGatewayRuntimePortBridgeSessionAssets(t *testing.T) {
 
 	workdir := t.TempDir()
 	store := agentsession.NewSQLiteStore(t.TempDir(), workdir)
+	t.Cleanup(func() { _ = store.Close() })
 	session := agentsession.NewWithWorkdir("asset session", workdir)
 	if _, err := store.CreateSession(context.Background(), agentsession.CreateSessionInput{
 		ID:        session.ID,
@@ -1637,14 +1638,38 @@ func TestGatewayRuntimePortBridgeSessionAssets(t *testing.T) {
 	if err != nil {
 		t.Fatalf("OpenSessionAsset() error = %v", err)
 	}
-	defer opened.Reader.Close()
 	got, err := io.ReadAll(opened.Reader)
 	if err != nil {
 		t.Fatalf("ReadAll() error = %v", err)
 	}
 	if string(got) != string(payload) || opened.Meta.AssetID != meta.AssetID || opened.Meta.MimeType != "image/png" {
 		t.Fatalf("unexpected opened asset meta=%+v payload=%q", opened.Meta, string(got))
 	}
+	if err := opened.Reader.Close(); err != nil {
+		t.Fatalf("Close opened asset reader: %v", err)
+	}
+
+	if err := bridge.DeleteSessionAsset(context.Background(), gateway.DeleteSessionAssetInput{
+		SubjectID: testBridgeSubjectID,
+		SessionID: session.ID,
+		AssetID:   meta.AssetID,
+	}); err != nil {
+		t.Fatalf("DeleteSessionAsset() error = %v", err)
+	}
+	if err := bridge.DeleteSessionAsset(context.Background(), gateway.DeleteSessionAssetInput{
+		SubjectID: testBridgeSubjectID,
+		SessionID: session.ID,
+		AssetID:   meta.AssetID,
+	}); err != nil {
+		t.Fatalf("DeleteSessionAsset() should be idempotent, got %v", err)
+	}
+	if _, err := bridge.OpenSessionAsset(context.Background(), gateway.OpenSessionAssetInput{
+		SubjectID: testBridgeSubjectID,
+		SessionID: session.ID,
+		AssetID:   meta.AssetID,
+	}); !errors.Is(err, gateway.ErrRuntimeResourceNotFound) {
+		t.Fatalf("OpenSessionAsset() after delete error = %v, want resource not found", err)
+	}
 }
 
 func TestGatewayRuntimePortBridgeSessionAssetErrors(t *testing.T) {
@@ -1683,6 +1708,13 @@ func TestGatewayRuntimePortBridgeSessionAssetErrors(t *testing.T) {
 	}); err == nil || !strings.Contains(err.Error(), "asset store is unavailable") {
 		t.Fatalf("expected unavailable asset store save error, got %v", err)
 	}
+	if err := bridge.DeleteSessionAsset(context.Background(), gateway.DeleteSessionAssetInput{
+		SubjectID: testBridgeSubjectID,
+		SessionID: "session-1",
+		AssetID:   "asset-1",
+	}); err == nil || !strings.Contains(err.Error(), "does not support delete") {
+		t.Fatalf("expected unavailable asset store delete error, got %v", err)
+	}
 	if _, err := bridge.OpenSessionAsset(context.Background(), gateway.OpenSessionAssetInput{
 		SubjectID: testBridgeSubjectID,
 		SessionID: "session-1",
@@ -1692,6 +1724,32 @@ func TestGatewayRuntimePortBridgeSessionAssetErrors(t *testing.T) {
 	}
 }
 
+func TestGatewayRuntimePortBridgeSessionAssetSaveRequiresExistingSession(t *testing.T) {
+	t.Parallel()
+
+	store := agentsession.NewSQLiteStore(t.TempDir(), t.TempDir())
+	t.Cleanup(func() { _ = store.Close() })
+	bridge, err := newGatewayRuntimePortBridge(
+		context.Background(),
+		&runtimeStub{eventsCh: make(chan agentruntime.RuntimeEvent, 1)},
+		store,
+	)
+	if err != nil {
+		t.Fatalf("new bridge: %v", err)
+	}
+	defer bridge.Close()
+
+	_, err = bridge.SaveSessionAsset(context.Background(), gateway.SaveSessionAssetInput{
+		SubjectID: testBridgeSubjectID,
+		SessionID: "missing-session",
+		Reader:    strings.NewReader("x"),
+		MimeType:  "image/png",
+	})
+	if !errors.Is(err, gateway.ErrRuntimeResourceNotFound) {
+		t.Fatalf("SaveSessionAsset() missing session error = %v, want resource not found", err)
+	}
+}
+
 func TestConvertRuntimeSessionToGatewaySessionIncludesCurrentPlan(t *testing.T) {
 	required := true
 	session := agentsession.New("plan session")

internal/config/runtime_hooks.go

@@ -286,14 +286,14 @@ func (c RuntimeHookItemConfig) Validate(defaultFailurePolicy string) error {
 		default:
 			return fmt.Errorf("handler %q is not supported", c.Handler)
 		}
-			if handler == runtimeHookHandlerWarnOnToolCall && !hooks.HasHookMatcherConfig(c.Match) {
-				return fmt.Errorf("handler %q requires match", c.Handler)
-			}
-			if hooks.HasHookMatcherConfig(c.Match) {
-				if err := hooks.ValidateHookMatcher(point, c.Match); err != nil {
-					return fmt.Errorf("match: %w", err)
-				}
+		if handler == runtimeHookHandlerWarnOnToolCall && !hooks.HasHookMatcherConfig(c.Match) {
+			return fmt.Errorf("handler %q requires match", c.Handler)
+		}
+		if hooks.HasHookMatcherConfig(c.Match) {
+			if err := hooks.ValidateHookMatcher(point, c.Match); err != nil {
+				return fmt.Errorf("match: %w", err)
 			}
+		}
 	case runtimeHookKindCommand:
 		if normalizedMode != runtimeHookModeSync {
 			return fmt.Errorf("mode %q is not supported for kind command (only sync)", c.Mode)

internal/config/runtime_hooks_test.go

@@ -398,7 +398,7 @@ func TestRuntimeHooksConfigItemDefaultsAndClone(t *testing.T) {
 				},
 			},
 		},
-}
+	}
 	cfg.ApplyDefaults(defaultRuntimeHooksConfig())
 
 	item := cfg.Items[0]
@@ -666,7 +666,6 @@ func TestRuntimeHooksConfigEdgeBranches(t *testing.T) {
 			t.Fatal("expected deep clone for nested map in slice")
 		}
 
-
 		matchCfg := RuntimeHookItemConfig{
 			Match: map[string]any{
 				"tool_name_regex": []any{`^bash$`},

internal/context/builder.go

@@ -19,7 +19,9 @@ func newStablePromptSources(extra ...SectionSource) []promptSectionSource {
 		newRulesPromptSource(nil),
 	}
 	for _, src := range extra {
-		sources = append(sources, src)
+		if src != nil {
+			sources = append(sources, src)
+		}
 	}
 	return sources
 }

internal/context/builder_test.go

@@ -645,6 +645,40 @@ func TestNewConfiguredBuilder(t *testing.T) {
 		}
 	})
 
+	t.Run("nil extra source is safely ignored", func(t *testing.T) {
+		t.Parallel()
+		builder := NewConfiguredBuilder(nil)
+		input := BuildInput{
+			Messages: []providertypes.Message{{Role: "user", Parts: []providertypes.ContentPart{providertypes.NewTextPart("hello")}}},
+			Metadata: testMetadata(t.TempDir()),
+		}
+		result, err := builder.Build(stdcontext.Background(), input)
+		if err != nil {
+			t.Fatalf("Build() with nil source error = %v", err)
+		}
+		if result.SystemPrompt == "" {
+			t.Fatal("expected non-empty system prompt even with nil extra source")
+		}
+	})
+
+	t.Run("mixed nil and valid extra sources", func(t *testing.T) {
+		t.Parallel()
+		builder := NewConfiguredBuilder(nil, stubPromptSectionSource{
+			sections: []promptSection{{Title: "Valid", Content: "valid section"}},
+		}, nil)
+		input := BuildInput{
+			Messages: []providertypes.Message{{Role: "user", Parts: []providertypes.ContentPart{providertypes.NewTextPart("hello")}}},
+			Metadata: testMetadata(t.TempDir()),
+		}
+		result, err := builder.Build(stdcontext.Background(), input)
+		if err != nil {
+			t.Fatalf("Build() with mixed nil/valid sources error = %v", err)
+		}
+		if !strings.Contains(result.SystemPrompt, "## Valid") {
+			t.Fatal("expected valid section to be present while nil sources are ignored")
+		}
+	})
+
 	t.Run("multiple extra section sources are appended", func(t *testing.T) {
 		builder := NewConfiguredBuilder(stubPromptSectionSource{
 			sections: []promptSection{{Title: "First", Content: "first body"}},

internal/gateway/contracts.go

@@ -262,6 +262,16 @@ type OpenSessionAssetInput struct {
 	AssetID string
 }
 
+// DeleteSessionAssetInput 表示删除会话附件的下游输入。
+type DeleteSessionAssetInput struct {
+	// SubjectID 是请求方身份主体标识。
+	SubjectID string
+	// SessionID 是附件所属会话标识。
+	SessionID string
+	// AssetID 是附件标识。
+	AssetID string
+}
+
 // OpenSessionAssetResult 表示打开会话附件后的读取结果。
 type OpenSessionAssetResult struct {
 	// Reader 是附件内容流，调用方负责关闭。
@@ -965,10 +975,6 @@ type RuntimePort interface {
 	GetRuntimeSnapshot(ctx context.Context, input GetRuntimeSnapshotInput) (RuntimeSnapshot, error)
 	// CreateSession 创建并返回可用会话标识。
 	CreateSession(ctx context.Context, input CreateSessionInput) (string, error)
-	// SaveSessionAsset 保存会话附件并返回元数据。
-	SaveSessionAsset(ctx context.Context, input SaveSessionAssetInput) (SessionAssetMeta, error)
-	// OpenSessionAsset 打开会话附件供 HTTP 读取接口返回。
-	OpenSessionAsset(ctx context.Context, input OpenSessionAssetInput) (OpenSessionAssetResult, error)
 	// DeleteSession 删除/归档指定会话。
 	DeleteSession(ctx context.Context, input DeleteSessionInput) (bool, error)
 	// RenameSession 重命名指定会话。
@@ -997,6 +1003,16 @@ type RuntimePort interface {
 	CheckpointDiff(ctx context.Context, input CheckpointDiffInput) (CheckpointDiffResult, error)
 }
 
+// SessionAssetPort 定义 Gateway HTTP 资产端点访问会话附件的独立下游端口。
+type SessionAssetPort interface {
+	// SaveSessionAsset 保存会话附件并返回元数据。
+	SaveSessionAsset(ctx context.Context, input SaveSessionAssetInput) (SessionAssetMeta, error)
+	// OpenSessionAsset 打开会话附件供 HTTP 读取接口返回。
+	OpenSessionAsset(ctx context.Context, input OpenSessionAssetInput) (OpenSessionAssetResult, error)
+	// DeleteSessionAsset 删除已上传但不再需要的会话附件。
+	DeleteSessionAsset(ctx context.Context, input DeleteSessionAssetInput) error
+}
+
 // PlanApprovalRuntimePort 定义批准计划的可选下游能力。
 type PlanApprovalRuntimePort interface {
 	// ApprovePlan 将指定 draft 计划 revision 推进到 approved。

internal/gateway/contracts_test.go

@@ -155,6 +155,10 @@ func (s *runtimePortCompileStub) OpenSessionAsset(_ context.Context, _ OpenSessi
 	return OpenSessionAssetResult{}, nil
 }
 
+func (s *runtimePortCompileStub) DeleteSessionAsset(_ context.Context, _ DeleteSessionAssetInput) error {
+	return nil
+}
+
 func (s *runtimePortCompileStub) ListCheckpoints(_ context.Context, _ ListCheckpointsInput) ([]CheckpointEntry, error) {
 	return nil, nil
 }
@@ -172,5 +176,6 @@ func (s *runtimePortCompileStub) CheckpointDiff(_ context.Context, _ CheckpointD
 }
 
 var _ RuntimePort = (*runtimePortCompileStub)(nil)
+var _ SessionAssetPort = (*runtimePortCompileStub)(nil)
 var _ TransportAdapter = (*Server)(nil)
 var _ TransportAdapter = (*NetworkServer)(nil)

internal/gateway/multi_workspace_runtime.go

@@ -407,15 +407,36 @@ func (m *MultiWorkspaceRuntime) SaveSessionAsset(ctx context.Context, input Save
 	if err != nil {
 		return SessionAssetMeta{}, err
 	}
-	return port.SaveSessionAsset(ctx, input)
+	assetPort, ok := port.(SessionAssetPort)
+	if !ok {
+		return SessionAssetMeta{}, ErrRuntimeUnavailable
+	}
+	return assetPort.SaveSessionAsset(ctx, input)
 }
 
 func (m *MultiWorkspaceRuntime) OpenSessionAsset(ctx context.Context, input OpenSessionAssetInput) (OpenSessionAssetResult, error) {
 	port, err := m.getPort(ctx)
 	if err != nil {
 		return OpenSessionAssetResult{}, err
 	}
-	return port.OpenSessionAsset(ctx, input)
+	assetPort, ok := port.(SessionAssetPort)
+	if !ok {
+		return OpenSessionAssetResult{}, ErrRuntimeUnavailable
+	}
+	return assetPort.OpenSessionAsset(ctx, input)
+}
+
+// DeleteSessionAsset 按请求上下文中的工作区选择对应运行桥，并转发会话附件删除。
+func (m *MultiWorkspaceRuntime) DeleteSessionAsset(ctx context.Context, input DeleteSessionAssetInput) error {
+	port, err := m.getPort(ctx)
+	if err != nil {
+		return err
+	}
+	assetPort, ok := port.(SessionAssetPort)
+	if !ok {
+		return ErrRuntimeUnavailable
+	}
+	return assetPort.DeleteSessionAsset(ctx, input)
 }
 
 func (m *MultiWorkspaceRuntime) DeleteSession(ctx context.Context, input DeleteSessionInput) (bool, error) {