thatgfsj-code 3.0.4 → 3.0.7

package/README.md

@@ -7,12 +7,16 @@ AI 编程助手 — 终端里的 AI 编程伙伴
 ## 特性
 
 - **Ink TUI** — React 驱动的终端 UI，流式输出、Markdown 渲染
-- **工具调用** — AI 可以读写文件、执行命令、搜索代码、操作 Git
+- **Agent 工具调用** — AI 可以读写文件、执行命令、搜索代码、操作 Git，写/删文件前展示 diff 并请求确认
+- **MCP 支持** — 接入 Model Context Protocol 服务器（stdio），工具动态注册进对话，`~/.thatgfsj/mcp.json` 配置
+- **会话持久化** — 每轮自动保存到 `~/.thatgfsj/sessions/`，`/resume` 随时恢复历史会话
+- **Headless 模式** — `gfcode "任务" --json` 输出行分隔 JSON 事件流，可脚本化 / 接 CI
+- **权限管线** — 写/执行类工具调用默认需要确认（y / a / n），`--yolo` 跳过
+- **上下文自动压缩** — 超过阈值按"完整工具调用块"原子压缩，不产生孤儿 tool_calls
+- **Prompt Caching** — Reasonix 式缓存架构：稳定序列化、Anthropic cache_control 断点、智能 TTL、命中率统计
 - **16 个内置 Skills** — 规划、调试、TDD、架构优化、代码审查等
 - **NeuroWeave Timeline** — 项目演进记忆，自动归档（30天）
-- **多 Provider** — 15 个平台 + 自定义中转站
-- **上下文压缩** — 超限自动压缩，节省 token
-- **Playwright** — 浏览器自动化（测试/抓取/截图）
+- **多 Provider** — 15 个平台 + 自定义中转站，含 Ollama 本地模型
 - **消息队列** — AI 工作时输入补充说明，完成后自动处理
 - **中文命令** — `/模型` `/新建` `/压缩` `/技能` 等
 
@@ -32,7 +36,7 @@ irm https://www.thatgfsj.xyz/install/gfcode.ps1 | iex
 curl -fsSL https://www.thatgfsj.xyz/install/gfcode.sh | bash
 ```
 
-**npm（已有 Node.js）：**
+**npm（已有 Node.js ≥ 20.19）：**
 ```bash
 npm install -g thatgfsj-code
 ```
@@ -56,25 +60,61 @@ gfcode
 # 单次 prompt
 gfcode "帮我写一个 Hello World"
 
+# headless JSON 事件流（可接脚本/CI）
+gfcode "跑一下测试并总结结果" --json
+
+# 跳过工具确认（谨慎）
+gfcode --yolo
+
 # 指定模型
 gfcode -m gpt-4o "你的任务"
 ```
 
+### 权限确认
+
+写/执行类操作（shell、git 写操作、文件写入/删除）默认需要确认：
+
+- 文件写入会展示**逐行 diff**（超长自动截断）
+- `y` 允许一次 · `a` 本会话全部允许 · `n` 拒绝（60 秒无响应自动拒绝）
+- headless / 非 TTY 环境默认**拒绝**，需要放行请加 `--yolo`（TUI 内也可用 `/yolo` 切换）
+
 ### 内置命令
 
 | 命令 | 别名 | 说明 |
 |------|------|------|
-| `/model <名称>` | `/模型` | 切换模型 |
+| `/model <名称>` | `/模型` | 切换模型（立即生效，无需重启） |
 | `/provider` | `/服务商` | 更换服务商 |
-| `/new` | `/新建` | 新建会话 |
-| `/compact` | `/压缩` | 压缩上下文 |
+| `/new` | `/新建` | 新建会话（保留系统提示） |
+| `/resume [序号]` | `/恢复` | 恢复历史会话 |
+| `/compact` | `/压缩` | 压缩上下文（保持工具调用完整） |
+| `/cache` | `/缓存` | 缓存命中率统计（`/cache reset` 清零） |
+| `/ttl 5m\|1h` | `/ttl` | 设置缓存 TTL（立即生效） |
+| `/thinking on\|off` | `/思考` | 切换思考块显示 |
 | `/skills [id]` | `/技能` | 管理技能 |
-| `/mcp` | - | MCP 设置 |
+| `/mcp` | - | MCP 服务器状态 |
+| `/yolo` | - | 切换写/执行操作自动确认 |
 | `/help` | `/帮助` | 查看帮助 |
 | `exit` | - | 退出 |
 
 输入 `/` 会弹出命令选择框，↑↓ 选择，Tab 补全。
 
+### MCP 配置
+
+编辑 `~/.thatgfsj/mcp.json`（兼容 Claude Code 的 `mcpServers` 键名）：
+
+```json
+{
+  "mcpServers": {
+    "filesystem": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "D:\\projects"]
+    }
+  }
+}
+```
+
+重启后生效，工具以 `mcp__服务器名__工具名` 注册进对话，`/mcp` 查看连接状态。
+
 ### 消息队列
 
 AI 工作时可以继续输入，消息会排队等待：
@@ -117,11 +157,12 @@ AI 工作时可以继续输入，消息会排队等待：
 
 | 工具 | 功能 |
 |------|------|
-| `file` | 读/写/列表/删除文件 |
-| `shell` | 执行 shell 命令 |
-| `git` | Git 操作 |
-| `search` | 代码搜索 |
+| `file` | 读/写/列表/删除文件（写/删需确认，写入带 diff 预览） |
+| `shell` | 执行 shell 命令（每次确认，危险命令黑名单硬拦截） |
+| `git` | Git 操作（写操作确认；参数以数组传递，无 shell 注入） |
+| `search` | 代码搜索（纯 JS grep，Windows 原生可用） |
 | `nwt` | 项目演进记忆（见下方说明） |
+| `mcp__*` | 来自 MCP 服务器的动态工具 |
 
 ### NWT - NeuroWeave Timeline
 
@@ -163,7 +204,7 @@ AI 工作时可以继续输入，消息会排队等待：
 | triage | 问题分级 |
 | git-workflow | Git 最佳实践 |
 | subagent | 任务分解 |
-| playwright | 浏览器自动化 |
+| playwright | 浏览器自动化实践（提示词技能，Playwright 本身按需 `npx` 安装） |
 | frontend-design | UI/UX 实践 |
 | supabase | 数据库实践 |
 | neuroweave | 项目记忆 |
@@ -174,17 +215,18 @@ AI 工作时可以继续输入，消息会排队等待：
 
 ```
 src/
-├── cmd/        # CLI 入口
-├── app/        # 核心服务
+├── cmd/        # CLI 入口（交互 / 单次 / --json headless）
+├── app/        # 核心服务（组装、权限决策、模型热切换）
 ├── config/     # 配置 + Provider
-├── llm/        # LLM 抽象层
-├── session/    # 会话 + 自动压缩
-├── tools/      # 工具系统
+├── llm/        # LLM 抽象层（openai / anthropic / gemini 三协议）
+├── cache/      # Prompt caching（稳定序列化、断点、智能 TTL、统计）
+├── session/    # 会话持久化 / resume / 自动压缩
+├── tools/      # 工具系统（权限确认、diff 预览）
 ├── skills/     # 16 个内置 Skills
 ├── tui/        # Ink TUI 组件
-├── mcp/        # MCP 协议
+├── mcp/        # MCP stdio 客户端
 ├── hooks/      # 钩子系统
-├── prompts/    # 系统提示
+├── prompts/    # 系统提示（分段构建）
 ├── utils/      # 工具函数
 └── types.ts    # 全局类型
 ```
@@ -196,6 +238,7 @@ src/
 - [API Key 获取教程](./docs/API_KEY_GUIDE.md)
 - [常见问题 FAQ](./docs/FAQ.md)
 - [版本路线图](./ROADMAP.md)
+- [更新日志](./CHANGELOG.md)
 
 ---
 

package/dist/app/index.d.ts

@@ -1,10 +1,21 @@
 /**
  * App - Core application singleton
- * Simplified: directly uses LLMService (which has built-in agent loop)
  *
- * v3.0.0+: streamResponse yields structured StreamChunk
- *   - runPrompt streams { type: 'text' } chunks to stdout and captures the
- *     final usage for cache stats recording.
+ * v3.0.5 wiring release:
+ *   - MCP: servers from ~/.thatgfsj/mcp.json are connected at startup
+ *     (per-server failures are non-fatal) and their tools join the
+ *     registry before the system prompt is built. Child processes are
+ *     disconnected on exit.
+ *   - Permission pipeline: tool confirmations now actually reach the UI —
+ *     App owns the mode ('ask' default, 'accept' via --yolo) and a
+ *     pluggable confirmHandler (TUI prompt / headless auto-deny). With no
+ *     handler and 'ask' mode, write/execute tool calls are DENIED instead
+ *     of silently executed.
+ *   - reloadModel(): /model hot-swaps provider+model without restarting;
+ *     tools and the system prompt are rebuilt, TTL resolution resets.
+ *   - applyTtl(): /ttl takes effect immediately (config + provider marker).
+ *   - streamResponse() accepts an AbortSignal that reaches the provider
+ *     fetch calls, so cancelling a round stops token generation.
  */
 import { ConfigManager } from '../config/index.js';
 import { LLMService } from '../llm/index.js';
@@ -14,7 +25,15 @@ import { HookManager } from '../hooks/index.js';
 import { SystemPromptBuilder } from '../prompts/index.js';
 import { SkillRegistry } from '../skills/index.js';
 import { CacheStatsStore } from '../cache/stats.js';
+import { MCPServerManager, type McpConfigFile } from '../mcp/client.js';
 import type { ChatMessage, ChatResponse, StreamChunk, Usage } from '../types.js';
+/** Read ~/.thatgfsj/mcp.json. Missing or corrupted file = no servers. */
+export declare function loadMcpConfig(): McpConfigFile;
+/** Confirmation request handed to the active UI. */
+export interface ConfirmRequest {
+    /** Human-readable description of the action, including a diff preview when relevant. */
+    message: string;
+}
 export declare class App {
     config: ConfigManager;
     llm: LLMService;
@@ -29,10 +48,18 @@ export declare class App {
      * and the /cache command.
      */
     cacheStats: CacheStatsStore;
+    /** v3.0.5: connected MCP servers (empty manager when none configured). */
+    mcp: MCPServerManager;
+    /** v3.0.5: startup results per configured MCP server, for /mcp output. */
+    mcpStartupResults: Array<{
+        name: string;
+        ok: boolean;
+        error?: string;
+        tools: number;
+    }>;
     /**
-     * v2.2.5 (product 0.4.2): toggle  block compression. Default
-     * true. Toggled by `--show-thinking` on the CLI or `/thinking on|off`
-     * in the REPL.
+     * v2.2.5: toggle thinking block compression. Default true. Toggled by
+     * `--show-thinking` on the CLI or `/thinking on|off` in the REPL.
      */
     showThinking: boolean;
     /**
@@ -41,8 +68,58 @@ export declare class App {
      * is '5m' or '1h' and stays sticky.
      */
     resolvedTtl: '5m' | '1h' | null;
+    /**
+     * v3.0.5: permission mode. 'ask' requires confirmation for write/execute
+     * tool actions; 'accept' (--yolo) allows everything.
+     */
+    permissionMode: 'ask' | 'accept';
+    /**
+     * v3.0.5: pluggable confirmation UI. The TUI installs an Ink prompt;
+     * headless mode leaves it unset → write/execute actions are denied with
+     * a note (add --yolo to allow them).
+     */
+    confirmHandler?: (req: ConfirmRequest) => Promise<boolean>;
     private constructor();
     static create(): Promise<App>;
+    /**
+     * v3.0.5: keep registry and LLMService tool contexts in sync. All asks
+     * funnel through requestConfirmation so the permission mode and the
+     * active UI handler apply uniformly.
+     */
+    private applyToolContext;
+    /**
+     * v3.0.5: central permission decision.
+     * - 'accept' mode (--yolo): always allowed.
+     * - handler installed (TUI): ask it, 60s timeout denies.
+     * - no handler (headless): deny with a hint on stderr.
+     */
+    requestConfirmation(req: ConfirmRequest): Promise<boolean>;
+    /**
+     * v3.0.5: single entry for toggling auto-accept. Also refreshes the
+     * system prompt's permission-mode section so the model knows tool calls
+     * no longer need user approval.
+     */
+    setYolo(on: boolean): void;
+    /**
+     * v3.0.5: hot-swap the model (and provider, if /provider changed it on
+     * disk). Rebuilds LLMService, re-registers every current tool, resets TTL
+     * resolution and refreshes the system prompt. /model previously only
+     * wrote the config file and required a restart.
+     */
+    reloadModel(): Promise<void>;
+    /**
+     * v3.0.5: apply a TTL pin immediately (config write-through + provider
+     * marker). /ttl previously only updated a display value; the wire format
+     * kept the old TTL until restart.
+     */
+    applyTtl(ttl: '5m' | '1h'): Promise<void>;
+    /** v3.0.5: rebuild the system prompt (tools / permission mode changed). */
+    rebuildSystemPrompt(): void;
+    /**
+     * v3.0.5: TUI hook-up — show MCP startup results as an in-chat message.
+     * Returns a short multi-line report (empty when no servers configured).
+     */
+    mcpStatusText(): string;
     /**
      * Stream a response for the current session messages.
      * The LLMService handles the full agent loop internally.
@@ -50,26 +127,20 @@ export declare class App {
      * Yields structured StreamChunks. Returns the final ChatResponse (with usage
      * if the provider reported it) so the caller can record cache stats.
      *
-     * Implementation note: we drain the inner stream manually so the final
-     * ChatResponse returned by LLMService.chatStream is propagated as this
-     * generator's return value. Using yield* doesn't carry the return value
-     * through TS's AsyncGenerator<T, R> type inference in this version of
-     * TypeScript, so we wrap with an inner for-await and explicit return.
+     * v3.0.5: accepts { signal } — propagated into provider fetch calls so
+     * cancellation actually aborts the HTTP request.
      */
-    streamResponse(messages?: ChatMessage[]): AsyncGenerator<StreamChunk, ChatResponse>;
+    streamResponse(messages?: ChatMessage[], opts?: {
+        signal?: AbortSignal;
+    }): AsyncGenerator<StreamChunk, ChatResponse>;
     /**
      * Run a single prompt (non-interactive mode)
      *
-     * v2.2.4 (port from v2.1.0): persistence of the assistant message
-     * uses addMessageSafe, which drops the message if it contains
-     * pollution markers like "[已中断]".
-     *
-     * v2.2.5 (product 0.4.2): persistence also strips  blocks
-     * (and similar reasoning delimiters) when showThinking is false,
-     * so the conversation log stays compact.
+     * v2.2.4: persistence of the assistant message uses addMessageSafe, which
+     * drops the message if it contains pollution markers like "[已中断]".
      *
-     * v3.0.0: yields structured StreamChunks; final usage is captured
-     * into onUsage callback for cache stats persistence.
+     * v3.0.0: yields structured StreamChunks; final usage is captured.
+     * v3.0.5: persists the session to disk when the round completes.
      */
     runPrompt(prompt: string, onUsage?: (usage: Usage) => void): Promise<string>;
 }

package/dist/app/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEjF,qBAAa,GAAG;IACd,MAAM,EAAE,aAAa,CAAC;IACtB,GAAG,EAAE,UAAU,CAAC;IAChB,OAAO,EAAE,cAAc,CAAC;IACxB,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,EAAE,WAAW,CAAC;IACnB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,aAAa,CAAC;IACtB;;;;OAIG;IACH,UAAU,EAAE,eAAe,CAAC;IAC5B;;;;OAIG;IACH,YAAY,EAAE,OAAO,CAAS;IAC9B;;;;OAIG;IACH,WAAW,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAQ;IAEvC,OAAO;WAoBM,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;IAyCnC;;;;;;;;;;;;OAYG;IACI,cAAc,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC;IA6B1F;;;;;;;;;;;;;OAaG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;CAgCnF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAKH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEjF,yEAAyE;AACzE,wBAAgB,aAAa,IAAI,aAAa,CAU7C;AAED,oDAAoD;AACpD,MAAM,WAAW,cAAc;IAC7B,wFAAwF;IACxF,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,GAAG;IACd,MAAM,EAAE,aAAa,CAAC;IACtB,GAAG,EAAE,UAAU,CAAC;IAChB,OAAO,EAAE,cAAc,CAAC;IACxB,KAAK,EAAE,YAAY,CAAC;IACpB,KAAK,EAAE,WAAW,CAAC;IACnB,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,aAAa,CAAC;IACtB;;;;OAIG;IACH,UAAU,EAAE,eAAe,CAAC;IAC5B,0EAA0E;IAC1E,GAAG,EAAE,gBAAgB,CAAC;IACtB,0EAA0E;IAC1E,iBAAiB,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAM;IAC5F;;;OAGG;IACH,YAAY,EAAE,OAAO,CAAS;IAC9B;;;;OAIG;IACH,WAAW,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAQ;IACvC;;;OAGG;IACH,cAAc,EAAE,KAAK,GAAG,QAAQ,CAAS;IACzC;;;;OAIG;IACH,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3D,OAAO;WAsBM,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;IAuEnC;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;;;;OAKG;IACG,mBAAmB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBhE;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI;IAK1B;;;;;OAKG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAUlC;;;;OAIG;IACG,QAAQ,CAAC,GAAG,EAAE,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,2EAA2E;IAC3E,mBAAmB,IAAI,IAAI;IAO3B;;;OAGG;IACH,aAAa,IAAI,MAAM;IAmCvB;;;;;;;;;OASG;IACI,cAAc,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC;IAwB3H;;;;;;;;OAQG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;CA+BnF"}