Merge branch 'main' into feat/feishu-2

Author: Cai-Tang-www

docs/reference/gateway-rpc-api.md

@@ -440,7 +440,7 @@ Response Schema：
       "saved_ratio": 0.63,
       "trigger_mode": "manual",
       "transcript_id": "compact-1",
-      "transcript_path": ".neocode/transcripts/compact-1.md"
+      "transcript_path": ".neocode/transcripts/compact-subagent.md"
     }
   }
 }
@@ -1147,7 +1147,7 @@ Success Response：
       "SavedRatio": 0.63,
       "TriggerMode": "manual",
       "TranscriptID": "compact-demo-1",
-      "TranscriptPath": ".neocode/transcripts/compact-demo-1.md"
+      "TranscriptPath": ".neocode/transcripts/compact-demo-subagent.md"
     }
   }
 }

docs/reference/tui-gateway-contract-matrix.md

@@ -0,0 +1,66 @@
+# TUI-Gateway Contract Matrix (Single-Version Baseline)
+
+This document freezes the contract that TUI consumes from gateway.
+It is intentionally single-version and fail-fast by design.
+
+## Scope
+
+- Transport contract: JSON-RPC 2.0 (`internal/gateway/protocol`)
+- Runtime contract: gateway DTOs (`internal/gateway/contracts.go`)
+- Event payload version source of truth: `internal/runtime/controlplane/envelope.go`
+
+## RPC Methods Used By TUI
+
+| Method | Params Type | Result Payload | Notes |
+| --- | --- | --- | --- |
+| `gateway.authenticate` | `protocol.AuthenticateParams` | frame ack | Must succeed before runtime actions |
+| `gateway.bindStream` | `protocol.BindStreamParams` | frame ack | Binds session/run event stream |
+| `gateway.run` | `protocol.RunParams` | frame ack with `session_id`/`run_id` | Async acceptance only |
+| `gateway.compact` | `protocol.CompactParams` | `gateway.CompactResult` | Manual compact |
+| `gateway.executeSystemTool` | `protocol.ExecuteSystemToolParams` | `tools.ToolResult` | Tool execution passthrough |
+| `gateway.resolvePermission` | `protocol.ResolvePermissionParams` | frame ack | Permission decision submit |
+| `gateway.cancel` | `protocol.CancelParams` | frame ack | Cancels run by run/session binding |
+| `gateway.listSessions` | none | `[]gateway.SessionSummary` | Session list |
+| `gateway.loadSession` | `protocol.LoadSessionParams` | `gateway.Session` | Full session snapshot |
+| `gateway.activateSessionSkill` | `protocol.ActivateSessionSkillParams` | frame ack | Activate skill in session |
+| `gateway.deactivateSessionSkill` | `protocol.DeactivateSessionSkillParams` | frame ack | Deactivate skill in session |
+| `gateway.listSessionSkills` | `protocol.ListSessionSkillsParams` | `[]gateway.SessionSkillState` | Active skill states |
+| `gateway.listAvailableSkills` | `protocol.ListAvailableSkillsParams` | `[]gateway.AvailableSkillState` | Available skill catalog |
+
+## Runtime Event Contract
+
+- Notification method: `gateway.event`
+- TUI only accepts a runtime envelope payload with these required keys:
+  - `runtime_event_type` (string)
+  - `turn` (number)
+  - `phase` (string)
+  - `timestamp` (RFC3339 or RFC3339Nano)
+  - `payload_version` (number)
+  - `payload` (event-specific object/string)
+- `payload_version` must equal `controlplane.PayloadVersion`.
+- Version mismatch is treated as a hard incompatibility and must fail fast.
+
+## Error Contract
+
+TUI consumes standard JSON-RPC errors and gateway extended error codes from
+`protocol.JSONRPCError.Data.GatewayCode`.
+
+Primary gateway codes used for UI mapping:
+
+- `invalid_frame`
+- `invalid_action`
+- `invalid_multimodal_payload`
+- `missing_required_field`
+- `unsupported_action`
+- `internal_error`
+- `timeout`
+- `unsafe_path`
+- `unauthorized`
+- `access_denied`
+- `resource_not_found`
+
+## Non-Goals
+
+- No multi-version payload decoding.
+- No alias method fallback.
+- No legacy field fallback in event payload.

docs/repository-design.md

@@ -80,6 +80,7 @@ require (
 	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/ncruces/go-strftime v1.0.0 // indirect
+	github.com/odvcencio/gotreesitter v0.15.3 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.66.1 // indirect

go.mod

@@ -191,6 +191,10 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
 github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
+github.com/odvcencio/gotreesitter v0.15.3 h1:bcSIEMyRrDaFIZw2zwM8cNR03VX6y8CbXFxVzfFSGX0=
+github.com/odvcencio/gotreesitter v0.15.3/go.mod h1:ccYZsDUmAJQAtliLsNHT33F3X4AN7f/Z6JGiPNZoEzY=
+github.com/openai/openai-go/v3 v3.30.0 h1:T8VkhqAm6BuvxwpVG+Aw+H4TcYIsbj9nqytjpWcE/aU=
+github.com/openai/openai-go/v3 v3.30.0/go.mod h1:cdufnVK14cWcT9qA1rRtrXx4FTRsgbDPW7Ia7SS5cZo=
 github.com/openai/openai-go/v3 v3.32.0 h1:aHp/3wkX1W6jB8zTtf9xV0aK0qPFSVDqS7AHmlJ4hXs=
 github.com/openai/openai-go/v3 v3.32.0/go.mod h1:cdufnVK14cWcT9qA1rRtrXx4FTRsgbDPW7Ia7SS5cZo=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=

go.sum

@@ -21,12 +21,14 @@ import (
 	"neo-code/internal/provider/builtin"
 	providercatalog "neo-code/internal/provider/catalog"
 	providertypes "neo-code/internal/provider/types"
+	"neo-code/internal/repository"
 	agentruntime "neo-code/internal/runtime"
 	"neo-code/internal/security"
 	agentsession "neo-code/internal/session"
 	"neo-code/internal/skills"
 	"neo-code/internal/tools"
 	"neo-code/internal/tools/bash"
+	"neo-code/internal/tools/codebase"
 	diagnosetool "neo-code/internal/tools/diagnose"
 	"neo-code/internal/tools/filesystem"
 	"neo-code/internal/tools/mcp"
@@ -460,6 +462,10 @@ func buildToolRegistry(cfg config.Config) (*tools.Registry, func() error, error)
 	}))
 	toolRegistry.Register(todo.New())
 	toolRegistry.Register(spawnsubagent.New())
+	repoSvc := repository.NewService()
+	toolRegistry.Register(codebase.NewRead(repoSvc, cfg.Workdir))
+	toolRegistry.Register(codebase.NewSearchText(repoSvc, cfg.Workdir))
+	toolRegistry.Register(codebase.NewSearchSymbol(repoSvc, cfg.Workdir))
 	mcpRegistry, err := BuildMCPRegistry(cfg)
 	if err != nil {
 		return nil, nil, err

internal/app/bootstrap.go

@@ -220,3 +220,15 @@ func TestSourceFilesInWorkdir_HandlesEmptyWorkdir(t *testing.T) {
 		t.Fatalf("expected nil with empty workdir, got %v", got)
 	}
 }
+
+func equalStringSlice(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := range a {
+		if a[i] != b[i] {
+			return false
+		}
+	}
+	return true
+}

internal/checkpoint/bash_capture_test.go

@@ -17,6 +17,8 @@ import (
 	"time"
 
 	"github.com/pmezard/go-difflib/difflib"
+
+	"neo-code/internal/repository"
 )
 
 const (
@@ -446,20 +448,17 @@ func (s *PerEditSnapshotStore) HasPending() bool {
 	return len(s.pending) > 0
 }
 
-// FileChangeKind 表示两个 checkpoint 之间单个 path 的变更类别。
-type FileChangeKind string
+// FileChangeKind 是 repository.FileChangeKind 的别名，保留以维持向后兼容。
+type FileChangeKind = repository.FileChangeKind
 
 const (
-	FileChangeAdded    FileChangeKind = "added"
-	FileChangeDeleted  FileChangeKind = "deleted"
-	FileChangeModified FileChangeKind = "modified"
+	FileChangeAdded    = repository.FileChangeAdded
+	FileChangeDeleted  = repository.FileChangeDeleted
+	FileChangeModified = repository.FileChangeModified
 )
 
-// FileChangeEntry 描述端到端 diff 中单个 path 的变更。
-type FileChangeEntry struct {
-	Path string
-	Kind FileChangeKind
-}
+// FileChangeEntry 是 repository.FileChangeEntry 的别名，保留以维持向后兼容。
+type FileChangeEntry = repository.FileChangeEntry
 
 // ChangedFiles 端到端比较两个 checkpoint，返回 path → 变更类别的列表（按 path 字典序）。
 // 不返回内容差异，仅用于 UI 分组（添加/删除/修改）。完整 patch 仍由 Diff 生成。

internal/checkpoint/per_edit_snapshot.go

@@ -59,7 +59,7 @@ type gatewayCommandOptions struct {
 
 	MetricsEnabled           bool
 	MetricsEnabledOverridden bool
-	SkipIPC                 bool
+	SkipIPC                  bool
 }
 
 // defaultNewAuthManager 创建默认网关认证器，并把具体持久化实现收敛在 CLI 装配层内部。

internal/cli/gateway_commands.go

@@ -591,7 +591,7 @@ func TestGatewayRuntimePortBridgeRuntimeMethods(t *testing.T) {
 			SavedRatio:     0.5,
 			TriggerMode:    "manual",
 			TranscriptID:   "tx-1",
-			TranscriptPath: "/tmp/tx-1.md",
+			TranscriptPath: "/tmp/tx-subagent.md",
 		},
 		systemToolRes: tools.ToolResult{
 			ToolCallID: "call-system-1",
@@ -2627,3 +2627,22 @@ func TestGatewayRuntimePortBridgeDeleteMCPServerSuccess(t *testing.T) {
 		t.Fatalf("servers = %+v, want [srv-2]", cfgMgr.cfg.Tools.MCP.Servers)
 	}
 }
+
+func TestDefaultBuildGatewayRuntimePortListSessionsWithoutExplicitWorkdir(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+	t.Setenv("USERPROFILE", home)
+	t.Setenv("XDG_CONFIG_HOME", filepath.Join(home, ".config"))
+
+	port, cleanup, err := defaultBuildGatewayRuntimePort(context.Background(), "")
+	if err != nil {
+		t.Fatalf("defaultBuildGatewayRuntimePort() error = %v", err)
+	}
+	if cleanup != nil {
+		defer func() { _ = cleanup() }()
+	}
+
+	if _, err := port.ListSessions(context.Background()); err != nil {
+		t.Fatalf("ListSessions() with empty cli workdir should succeed, got %v", err)
+	}
+}