jetbrains-pi-acp 0.1.4 → 0.1.7

package/README.md

@@ -11,7 +11,7 @@ Requires **Node.js 22.19.0+** and a JetBrains IDE with ACP support, such as Inte
 1. Sign in to your model provider from a terminal:
 
    ```bash
-   npx --yes jetbrains-pi-acp@0.1.4 --setup
+   npx --yes jetbrains-pi-acp@0.1.7 --setup
    ```
 
    In pi, run `/login`, complete sign-in, then exit pi and return to the IDE. Credentials are managed by pi.
@@ -23,7 +23,7 @@ Requires **Node.js 22.19.0+** and a JetBrains IDE with ACP support, such as Inte
      "agent_servers": {
        "pi": {
          "command": "npx",
-         "args": ["--yes", "jetbrains-pi-acp@0.1.4"],
+         "args": ["--yes", "jetbrains-pi-acp@0.1.7"],
          "use_idea_mcp": true,
          "use_custom_mcp": true
        }
@@ -38,10 +38,10 @@ The IDE must be able to find `npx`; use its absolute path if needed. Menu locati
 ## Features
 
 - ACP v1 and v2 draft support, with streaming responses, reasoning, tool status, terminal output, and usage reporting.
-- Native pi session history: list, load, resume, rename, fork, and delete sessions.
+- Native pi session history: list, load, resume, rename, fork, and delete sessions. Use `/tree` to view the session tree in a selection form and switch context while preserving previous branches. Selecting a user message returns to before it was sent and shows the original text for resending (reattach any attachments). Switching does not revert files, remove existing IDE messages, or generate a branch summary. Clients without form support only display the tree.
 - Model and reasoning-level selection, plus full-access, standard, read-only, and plan modes.
 - UI text (config names, mode and command descriptions, permission options, errors) follows the system language: Chinese for `zh*` locales, English otherwise, based on the first non-empty `LC_ALL`, `LC_MESSAGES`, or `LANG`, falling back to the system locale. Tool descriptions and system prompts sent to the model are always English. Restart the adapter after changing the language.
-- File diffs for built-in `edit`/`write` tools, with optional Air Git patches and per-turn file reports.
+- File diffs for built-in `edit`/`write` tools, with optional Air Git patches and per-turn file reports. File report snapshots follow Git ignore rules, including `.gitignore`, while retaining tracked files; non-Git projects or systems without Git use filesystem scanning that skips common dependency, build, and cache directories such as `node_modules/`, `vendor/`, `target/`, `build/`, `dist/`, `coverage/`, `.cache/`, and `.venv/`, including nested directories. Snapshots always skip `.DS_Store`.
 - stdio/HTTP MCP forwarding, including IDE tools; subagents and background shell tasks with targeted cancellation.
 - Steering, terminal stdin, forms, and URL interactions when supported by the client. Air v1 provides `/stdin text` and `/eof` during command execution.
 
@@ -52,7 +52,7 @@ The IDE must be able to find `npx`; use its absolute path if needed. Menu locati
 Append pi options after `--` in the agent's `args`, for example:
 
 ```json
-["--yes", "jetbrains-pi-acp@0.1.4", "--", "--model", "provider/model-id", "--thinking", "medium"]
+["--yes", "jetbrains-pi-acp@0.1.7", "--", "--model", "provider/model-id", "--thinking", "medium"]
 ```
 
 Use configuration options here, not initial prompts, interactive mode, or session-selection arguments. The adapter manages RPC mode and sessions.
@@ -61,6 +61,8 @@ To use an external pi executable, add `--pi-command /absolute/path/to/pi` before
 
 Sessions use pi's native storage, normally `~/.pi/agent/sessions/`, and respect pi's session-directory settings. History is filtered by the project working directory. Avoid accessing the same session simultaneously from multiple adapters or from pi and the IDE.
 
+The first time you open a historical session after restarting ACP, pi reads its current configuration, including newly added models, extensions, skills, and prompts. For an open session, send `/reload` to refresh configuration and the IDE's model and command lists. Historical sessions retain their selected model and reasoning level; changing the default model in `settings.json` does not switch an existing session. Select the new model in the IDE's model menu. Custom models normally live in `~/.pi/agent/models.json`, or under `PI_CODING_AGENT_DIR` when set. Authentication for added models must also be available to the pi process launched by the IDE.
+
 Restart the agent connection after updating the adapter or changing startup options.
 
 ## Limitations

package/README.zh-CN.md

@@ -11,7 +11,7 @@
 1. 在终端中登录模型提供商：
 
    ```bash
-   npx --yes jetbrains-pi-acp@0.1.4 --setup
+   npx --yes jetbrains-pi-acp@0.1.7 --setup
    ```
 
    在 pi 中运行 `/login`，完成登录后退出 pi 并返回 IDE。凭据由 pi 管理。
@@ -23,7 +23,7 @@
      "agent_servers": {
        "pi": {
          "command": "npx",
-         "args": ["--yes", "jetbrains-pi-acp@0.1.4"],
+         "args": ["--yes", "jetbrains-pi-acp@0.1.7"],
          "use_idea_mcp": true,
          "use_custom_mcp": true
        }
@@ -39,10 +39,10 @@ IDE 必须能找到 `npx`，必要时使用其绝对路径。菜单位置随 IDE
 
 - 支持 ACP v1 和 v2 草案，流式展示回答、思考、工具状态、终端输出和用量。
 - 每轮汇总模型请求与自动压缩的输入、输出及缓存读写 token，取消仍保留已发生用量；通过 `usage_update.cost` 发布 pi 记录的会话累计美元费用，恢复历史后继续累计。可用 `/status` 查看累计 token、费用和上下文用量。
-- 使用 pi 原生历史，支持会话列表、加载、恢复、改名、分叉和删除。
+- 使用 pi 原生历史，支持会话列表、加载、恢复、改名、分叉和删除。输入 `/tree` 可通过选择表单查看会话树并切换上下文；原分支保留，选择用户消息会回到发送前，并显示原文供重新发送（附件需重新添加）。切换不会回滚文件或清除 IDE 中已有消息，也不会自动生成分支摘要；不支持表单的客户端仅展示会话树。
 - 支持切换模型与推理级别，以及完全访问、标准访问、只读和规划模式。
 - 界面文案（配置名称、模式说明、命令说明、授权选项、报错等）按系统语言自动切换中英文，给模型看的工具描述和系统提示固定使用英文。语言判断依次读取非空的 `LC_ALL`、`LC_MESSAGES`、`LANG`，未设置时使用系统默认语言；中文使用中文，其余语言使用英文。更改系统语言后需重启适配器。
-- 展示内置 `edit/write` 工具的文件 diff，可协商 Air Git patch 和每轮文件报告。
+- 展示内置 `edit/write` 工具的文件 diff，可协商 Air Git patch 和每轮文件报告。文件报告快照遵守 `.gitignore` 等 Git 忽略规则，保留已跟踪文件；非 Git 项目或 Git 不可用时使用文件系统扫描，跳过 `node_modules/`、`vendor/`、`target/`、`build/`、`dist/`、`coverage/`、`.cache/`、`.venv/` 等常见依赖、构建和缓存目录（包括嵌套目录）。快照始终跳过 `.DS_Store`。
 - 转发 stdio/HTTP MCP 配置及 IDE 工具；支持子 agent、后台 shell 任务和定向停止。
 - 按客户端能力提供 steering、终端 stdin、表单和 URL 交互。Air v1 可在命令执行期间发送 `/stdin 文本` 和 `/eof`。
 
@@ -53,7 +53,7 @@ IDE 必须能找到 `npx`，必要时使用其绝对路径。菜单位置随 IDE
 在 Agent 的 `args` 末尾添加 `--`，随后传递 pi 参数，例如：
 
 ```json
-["--yes", "jetbrains-pi-acp@0.1.4", "--", "--model", "provider/model-id", "--thinking", "medium"]
+["--yes", "jetbrains-pi-acp@0.1.7", "--", "--model", "provider/model-id", "--thinking", "medium"]
 ```
 
 这里只传配置选项，不传初始提示、交互模式或会话选择参数。RPC 模式和会话由适配器管理。
@@ -62,6 +62,8 @@ IDE 必须能找到 `npx`，必要时使用其绝对路径。菜单位置随 IDE
 
 历史使用 pi 原生存储，通常位于 `~/.pi/agent/sessions/`，同时遵循 pi 的会话目录设置。列表按项目工作目录过滤。避免多个适配器，或终端 pi 与 IDE，同时操作同一会话。
 
+历史会话在 ACP 重启后首次打开时读取当前 pi 配置，可使用新增的模型、扩展、skills 和提示词。已打开的会话可发送 `/reload`，刷新配置及 IDE 中的模型、命令列表。历史会话会保留上次选择的模型和推理级别；修改 `settings.json` 的默认模型不会自动切换历史会话，请在 IDE 模型菜单中选择新模型。自定义模型通常配置在 `~/.pi/agent/models.json`；设置了 `PI_CODING_AGENT_DIR` 时，以该目录为准，新增模型的认证也必须对 IDE 启动的 pi 可用。
+
 更新适配器或调整启动参数后，需要重启 Agent 连接。
 
 ## 限制

package/extensions/acp.ts

@@ -143,6 +143,13 @@ export default function (pi: any) {
       await ctx.fork(JSON.parse(args), { position: 'at' });
     },
   });
+  pi.registerCommand('__acp_tree', {
+    description: 'Navigate the ACP session tree',
+    handler: async (args: string, ctx: any) => {
+      const result = await ctx.navigateTree(JSON.parse(args), { summarize: false });
+      ctx.ui.notify(`PI_ACP_TREE:${JSON.stringify({ cancelled: result.cancelled })}`, 'info');
+    },
+  });
   pi.registerCommand('__acp_goal', {
     description: 'Sync the ACP goal',
     handler: async (args: string) => {
@@ -191,6 +198,11 @@ export default function (pi: any) {
       ctx.ui.notify('PI_ACP_READY', 'info');
     },
   });
+  pi.registerCommand('__acp_reload', {
+    description: 'Reload models.json, extensions, skills and prompts',
+    // reload 不会刷新 models.json，需先刷新模型注册表。
+    handler: async (_args: string, ctx: any) => { await ctx.modelRegistry.refresh(); await ctx.reload(); },
+  });
   pi.registerCommand('__acp_archive', {
     description: 'Sync the ACP archive state',
     handler: async (args: string) => { pi.appendEntry('acp_archive', args.trim() === 'true'); },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jetbrains-pi-acp",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "type": "module",
   "description": "连接 JetBrains IDE 与 pi coding agent 的 ACP 适配器",
   "bin": {

package/src/agent.js

@@ -14,7 +14,7 @@ import { SessionIndex } from './session-index.js';
 import { SessionFork } from './session-fork.js';
 import { Commands } from './commands.js';
 import { convertMcp, convertPrompt } from './convert.js';
-import { changedFiles, fileSnapshot } from './file-changes.js';
+import { bashDiffs, changedFiles, fileSnapshot, snapshotTexts } from './file-changes.js';
 import { air, invalid, logError, modelKey, requireCwd, requireId, restrictedModes } from './shared.js';
 import { t } from './i18n.js';
 
@@ -244,8 +244,10 @@ export class Agent {
     if (session.turn?.finishing) throw invalid(t('sessionReporting'));
     if (session.changingConfig) throw invalid(t('configChanging'));
     const prompt = convertPrompt(params.prompt);
-    if (!steering && !prompt.images && this.commands.isLocal(prompt.message.trim())) {
-      return this.commands.run(session, prompt.message.trim(), this.fileReportRequest(params));
+    // Air 会把选中的提交、文件等附件以 "context: renderer=..." 块追加在文本后，命令判断需先去掉。
+    const command = prompt.message.split(/\n\ncontext: renderer=/)[0].trim();
+    if (!steering && !prompt.images && this.commands.isLocal(command)) {
+      return this.commands.run(session, command, this.fileReportRequest(params));
     }
     return this.prompt(session, prompt, steering, steering ? undefined : this.fileReportRequest(params));
   }
@@ -334,49 +336,58 @@ export class Agent {
     this.update(session, { sessionUpdate: 'session_info_update', ...air({ agentFileChangeReport: report }) });
   }
 
+  // 建立回合状态。prompt() 与 pi 自行发起的回合（扩展 triggerTurn，如子代理完成通知）共用。
+  beginTurn(session, steering, fileReportRequest) {
+    this.onForegroundState?.(session, 'running');
+    let resolve;
+    const completed = new Promise(done => { resolve = done; });
+    const turn = { completed, pending: 0, starts: 0, settled: false,
+      cancelled: false, error: null, stopReason: 'end_turn', usage: Promise.resolve(),
+      fileReportRequest, changedPaths: new Set(), editedPaths: new Set() };
+    if (fileReportRequest) turn.filesBefore = fileSnapshot(session.cwd)
+      .then(async snapshot => ({ ...snapshot, texts: await snapshotTexts(snapshot).catch(() => undefined) }));
+    turn.finish = () => {
+      if (session.turn !== turn || !turn.settled || turn.pending || turn.finishing) return;
+      const complete = () => {
+        this.interactions.cancel(session, { keepAcceptedUrls: true });
+        session.turn = null;
+        if (steering && turn.error && !turn.cancelled) {
+          this.update(session, { sessionUpdate: 'agent_message_chunk',
+            content: { type: 'text', text: `\n${t('executionFailed', { error: turn.error.message })}\n` } });
+        }
+        resolve();
+      };
+      if (!turn.filesBefore || turn.cancelled || turn.error) return complete();
+      turn.finishing = true;
+      turn.filesBefore.then(async before => {
+        const after = await fileSnapshot(session.cwd);
+        for (const path of changedFiles(before, after)) turn.changedPaths.add(path);
+        turn.filesIncomplete = before.incomplete || after.incomplete;
+        const diffs = await bashDiffs(before, changedFiles(before, after), turn.editedPaths);
+        if (diffs.length) this.update(session, { sessionUpdate: 'tool_call', toolCallId: `acp-files-${randomUUID()}`,
+          title: t('changedFilesTitle'), kind: 'edit', status: 'completed', content: diffs,
+          locations: diffs.map(({ path }) => ({ path })) });
+      }).catch(() => { turn.filesIncomplete = true; }).finally(complete);
+    };
+    turn.settle = () => { turn.settled = true; turn.finish(); };
+    session.turn = turn;
+    const task = this.tasks.tasks.get(session.taskId);
+    if (task && task.state !== 'running') {
+      task.state = 'running';
+      task.output = '';
+      task.error = undefined;
+      task.truncated = false;
+      turn.taskWrite = this.tasks.save(this.sessions.get(task.owner), task);
+      task.completion = turn.completed.then(() => this.tasks.finish(task,
+        turn.cancelled ? 'stopped' : turn.error ? 'failed' : 'completed', turn.error));
+      task.completion.catch(error => logError('saveTaskFailed')(error));
+    }
+    return turn;
+  }
+
   async prompt(session, prompt, steering, fileReportRequest) {
     const created = !session.turn;
-    if (created) {
-      this.onForegroundState?.(session, 'running');
-      let resolve;
-      const completed = new Promise(done => { resolve = done; });
-      const turn = { completed, pending: 0, starts: 0, settled: false,
-        cancelled: false, error: null, stopReason: 'end_turn', usage: Promise.resolve(),
-        fileReportRequest, changedPaths: new Set() };
-      if (fileReportRequest) turn.filesBefore = fileSnapshot(session.cwd);
-      turn.finish = () => {
-        if (session.turn !== turn || !turn.settled || turn.pending || turn.finishing) return;
-        const complete = () => {
-          this.interactions.cancel(session, { keepAcceptedUrls: true });
-          session.turn = null;
-          if (steering && turn.error && !turn.cancelled) {
-            this.update(session, { sessionUpdate: 'agent_message_chunk',
-              content: { type: 'text', text: `\n${t('executionFailed', { error: turn.error.message })}\n` } });
-          }
-          resolve();
-        };
-        if (!turn.filesBefore || turn.cancelled || turn.error) return complete();
-        turn.finishing = true;
-        turn.filesBefore.then(async before => {
-          const after = await fileSnapshot(session.cwd);
-          for (const path of changedFiles(before, after)) turn.changedPaths.add(path);
-          turn.filesIncomplete = before.incomplete || after.incomplete;
-        }).catch(() => { turn.filesIncomplete = true; }).finally(complete);
-      };
-      turn.settle = () => { turn.settled = true; turn.finish(); };
-      session.turn = turn;
-      const task = this.tasks.tasks.get(session.taskId);
-      if (task && task.state !== 'running') {
-        task.state = 'running';
-        task.output = '';
-        task.error = undefined;
-        task.truncated = false;
-        turn.taskWrite = this.tasks.save(this.sessions.get(task.owner), task);
-        task.completion = turn.completed.then(() => this.tasks.finish(task,
-          turn.cancelled ? 'stopped' : turn.error ? 'failed' : 'completed', turn.error));
-        task.completion.catch(error => logError('saveTaskFailed')(error));
-      }
-    }
+    if (created) this.beginTurn(session, steering, fileReportRequest);
     const turn = session.turn;
     turn.pending++;
     // 串行提交，避免前一条提示尚在预处理时再次启动运行。
@@ -763,6 +774,24 @@ export class Agent {
     }
   }
 
+  // 重新加载 pi 配置后同步模型列表、命令和扩展内存状态（计划模式、目标）。
+  async reloadSession(session) {
+    await session.pi.request('prompt', { message: '/__acp_reload' });
+    if (session.mode === 'plan') await session.pi.request('prompt', { message: '/__acp_mode plan' });
+    await session.pi.request('prompt', { message: '/__acp_check' });
+    const state = await session.pi.request('get_state');
+    const available = await session.pi.request('get_available_models');
+    session.availableModels = available?.models ?? [];
+    const current = state?.model;
+    if (current && !session.availableModels.some(model => modelKey(model) === modelKey(current))) {
+      session.availableModels.push(current);
+    }
+    if (current) session.currentModelId = modelKey(current);
+    await this.refreshThinking(session);
+    this.update(session, { sessionUpdate: 'config_option_update', configOptions: this.modelConfig(session) });
+    await this.commands.publish(session);
+  }
+
   async refreshThinking(session) {
     const [state, available] = await Promise.all([
       session.pi.request('get_state'), session.pi.request('get_available_thinking_levels'),
@@ -828,6 +857,12 @@ export class Agent {
       });
       return;
     }
+    if (!session.turn && event.type === 'agent_start' && !session.parentId) {
+      // 没有等待中的 session/prompt：回合由 pi 内部扩展发起，补建回合以转发输出并报告空闲。
+      const turn = this.beginTurn(session, true);
+      turn.completed.then(() => this.onForegroundState?.(session, 'idle',
+        { stopReason: turn.cancelled ? 'cancelled' : turn.error ? 'error' : turn.stopReason }));
+    }
     if (!session.turn) return;
     switch (event.type) {
       case 'agent_start':

package/src/commands.js

@@ -1,14 +1,34 @@
 import { invalid, logError } from './shared.js';
 import { t } from './i18n.js';
 
-// 适配器自己实现的斜杠命令（/status、/compact、/goal），以及发布给客户端的命令列表。
+// 将会话树展平为唯一的选项；迭代遍历避免长会话耗尽调用栈。
+export function treeOptions(tree, leafId) {
+  const options = new Map();
+  const pending = [...tree].reverse().map(node => ({ node, depth: 0 }));
+  while (pending.length) {
+    const { node, depth } = pending.pop();
+    const { entry } = node;
+    const content = entry.message?.content ?? entry.summary ?? entry.content;
+    const text = typeof content === 'string' ? content : (content ?? [])
+      .map(block => block.text ?? block.name ?? '').join(' ');
+    const preview = (node.label || text || entry.customType || entry.type).replace(/\s+/g, ' ').slice(0, 100);
+    const label = `${'  '.repeat(Math.min(depth, 12))}${entry.id === leafId ? '●' : '○'} ${entry.message?.role ?? entry.type}: ${preview} [${entry.id}]`;
+    options.set(label, entry);
+    for (let index = node.children.length - 1; index >= 0; index--) {
+      pending.push({ node: node.children[index], depth: depth + 1 });
+    }
+  }
+  return options;
+}
+
+// 适配器自己实现的斜杠命令，以及发布给客户端的命令列表。
 export class Commands {
   constructor(agent) {
     this.agent = agent;
   }
 
   isLocal(text) {
-    return text === '/status' || /^\/(compact|goal)(?:\s|$)/.test(text);
+    return text === '/status' || text === '/reload' || text === '/tree' || /^\/(compact|goal)(?:\s|$)/.test(text);
   }
 
   // Air 聊天框中的 /stdin、/eof 转为唯一可输入终端的输入；返回 true 表示已处理。
@@ -57,6 +77,33 @@ export class Commands {
       await this.agent.sendUsage(session, stats);
       return finish({ stopReason: 'end_turn' });
     }
+    if (text === '/tree') {
+      const command = { cancelled: false };
+      session.command = command;
+      session.changingConfig = true;
+      try {
+        await this.tree(session, command);
+        return finish({ stopReason: command.cancelled ? 'cancelled' : 'end_turn' });
+      } catch (error) {
+        command.error = error;
+        if (this.agent.airSessionFailure) return finish(this.agent.failureResult(session, error));
+        finish({});
+        throw error;
+      } finally {
+        session.command = null;
+        session.changingConfig = false;
+      }
+    }
+    if (text === '/reload') {
+      session.changingConfig = true;
+      try {
+        await this.agent.reloadSession(session);
+        this.agent.update(session, { sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: t('reloadDone') } });
+        return finish({ stopReason: 'end_turn' });
+      } finally {
+        session.changingConfig = false;
+      }
+    }
     const customInstructions = text.slice('/compact'.length).trim() || undefined;
     const command = { cancelled: false };
     session.command = command;
@@ -82,11 +129,44 @@ export class Commands {
     }
   }
 
+  async tree(session, command) {
+    const show = text => this.agent.update(session, { sessionUpdate: 'agent_message_chunk', content: { type: 'text', text } });
+    const { tree, leafId } = await session.pi.request('get_tree');
+    if (command.cancelled) return;
+    const options = treeOptions(tree, leafId);
+    if (!options.size) return show(t('treeEmpty'));
+    if (this.agent.clientCapabilities?.elicitation?.form == null) {
+      return show(`${t('treeUnsupported')}\n\n${[...options.keys()].join('\n')}`);
+    }
+    const result = await this.agent.interactions.request(session, 'elicitation', 'elicitation/create', {
+      sessionId: session.interactionSessionId ?? session.id, mode: 'form', message: t('treeSelect'),
+      requestedSchema: { type: 'object', properties: { value: { type: 'string', enum: [...options.keys()] } }, required: ['value'] },
+    });
+    if (session.failure) throw session.failure;
+    if (command.cancelled || result?.action !== 'accept') return;
+    const entry = options.get(result.content?.value);
+    if (!entry) throw invalid(t('treeSelectionInvalid'));
+    await session.pi.request('prompt', { message: `/__acp_tree ${JSON.stringify(entry.id)}` });
+    if (!command.treeResult) throw new Error(t('treeNavigationFailed'));
+    if (command.treeResult.cancelled) return show(t('treeCancelled'));
+    await session.pi.request('prompt', { message: '/__acp_check' });
+    this.agent.goalUpdate(session);
+    await this.agent.refreshUsage(session);
+    show(t('treeDone', { id: entry.id }));
+    if (entry.message?.role === 'user' || entry.type === 'custom_message') {
+      const content = entry.message?.content ?? entry.content;
+      const text = typeof content === 'string' ? content : (content ?? []).filter(block => block.type === 'text').map(block => block.text).join('\n');
+      if (text) show(`\n\n${t('treeResend')}\n${text}`);
+    }
+  }
+
   async publish(session) {
     const result = await session.pi.request('get_commands');
     const availableCommands = new Map([
       ['status', { name: 'status', description: t('cmdStatus'), input: null }],
       // Air 的 ACP v1 解析器需要 input 的类型判别字段。
+      ['tree', { name: 'tree', description: t('cmdTree'), input: null }],
+      ['reload', { name: 'reload', description: t('cmdReload'), input: null }],
       ['compact', { name: 'compact', description: t('cmdCompact'), input: { type: 'unstructured', hint: t('cmdCompactHint') } }],
       ['goal', { name: 'goal', description: t('cmdGoal'),
         input: { type: 'unstructured', hint: t('cmdGoalHint') } }],

package/src/file-changes.js

@@ -1,5 +1,15 @@
+import { execFile } from 'node:child_process';
 import { lstat, opendir } from 'node:fs/promises';
 import { join } from 'node:path';
+import { fileText } from './file-diff.js';
+import { promisify } from 'node:util';
+
+const executeFile = promisify(execFile);
+const fallbackIgnoredDirectories = new Set([
+  'node_modules', 'vendor', 'target', 'build', 'dist', 'out', 'coverage',
+  '.gradle', '.next', '.nuxt', '.output', '.cache',
+  '.venv', 'venv', '__pycache__', '.pytest_cache', '.mypy_cache', '.ruff_cache', '.tox',
+]);
 
 export async function fileSnapshot(cwd) {
   const files = new Map();
@@ -7,16 +17,27 @@ export async function fileSnapshot(cwd) {
   const deadline = Date.now() + 2000;
   let entries = 0;
   let incomplete = false;
+  const ignored = new Set();
+  let fallback = false;
+  try {
+    // Git 保留已跟踪文件，并处理嵌套 .gitignore、否定规则及仓库本地忽略规则。
+    const { stdout } = await executeFile('git',
+      ['ls-files', '--others', '--ignored', '--exclude-standard', '--directory', '-z'],
+      { cwd, timeout: 2000, maxBuffer: 4 * 1024 * 1024 });
+    for (const path of stdout.split('\0')) if (path) ignored.add(join(cwd, path.replace(/\/$/, '')));
+  } catch { fallback = true; }
   while (directories.length) {
     if (Date.now() > deadline) return { files, incomplete: true };
     const directory = directories.pop();
     try {
       if ((await lstat(directory)).isSymbolicLink()) { incomplete = true; continue; }
       for await (const entry of await opendir(directory)) {
-        if (entry.name === '.git') continue;
+        if (entry.name === '.git' || entry.name === '.DS_Store' ||
+            (fallback && entry.isDirectory() && fallbackIgnoredDirectories.has(entry.name))) continue;
+        const path = join(directory, entry.name);
+        if (ignored.has(path)) continue;
         // shortcut: 每次最多扫描 20000 项或 2 秒，大项目需要增量文件监听时再升级。
         if (++entries > 20000 || Date.now() > deadline) return { files, incomplete: true };
-        const path = join(directory, entry.name);
         try {
           const info = await lstat(path, { bigint: true });
           if (info.isDirectory()) directories.push(path);
@@ -37,3 +58,30 @@ export function changedFiles(before, after) {
   }
   return paths;
 }
+
+// shortcut: 仅缓存 ≤64 KiB 的文本文件，总量 8 MiB、耗时 2 秒，用于给 bash 改动补 diff；更大的文件只报路径。
+export async function snapshotTexts(snapshot) {
+  const texts = new Map();
+  const deadline = Date.now() + 2000;
+  let total = 0;
+  for (const [path, stamp] of snapshot.files) {
+    if (Date.now() > deadline || total > 8 * 1024 * 1024) break;
+    if (Number(stamp.split(':')[2]) > 64 * 1024) continue;
+    const text = await fileText(path);
+    if (typeof text === 'string') { texts.set(path, text); total += text.length; }
+  }
+  return texts;
+}
+
+// 为 edit/write 之外变更的文本文件生成整文件 diff，最多 20 个。
+export async function bashDiffs(before, paths, skip) {
+  const diffs = [];
+  for (const path of paths) {
+    if (skip.has(path) || diffs.length >= 20) continue;
+    const oldText = before.files.has(path) ? before.texts?.get(path) : before.incomplete ? undefined : null;
+    const newText = await fileText(path);
+    if (oldText === undefined || newText === undefined || oldText === newText) continue;
+    diffs.push({ type: 'diff', path, oldText, newText: newText ?? '' });
+  }
+  return diffs;
+}

package/src/i18n.js

@@ -107,6 +107,7 @@ const zh = {
   goalObjectiveInvalid: 'goal objective 无效',
   noGoalSet: '当前没有 goal',
   fileReportUncertainty: '包含内置 edit/write 报告及工作目录前后快照的文件变化（含命令、MCP、扩展）；不扫描 .git 和符号链接目标。无法区分外部并发修改，可能遗漏修改后恢复、目录外及轮次结束后的后台修改。',
+  changedFilesTitle: '其他文件变更',
   fileReportIncomplete: ' 快照扫描未完成（读取失败或超过 20000 项／2 秒限制），新增和删除可能漏报。',
   compactingContext: '压缩对话上下文',
 
@@ -142,6 +143,17 @@ const zh = {
 
   // 斜杠命令
   cmdStatus: '显示当前模型、token、成本和上下文使用情况',
+  cmdTree: '查看会话树并切换历史节点',
+  treeSelect: '选择会话节点（● 为当前位置）；用户消息会回到发送前。切换上下文不会回滚文件，IDE 中已有消息会保留。',
+  treeEmpty: '会话树为空',
+  treeUnsupported: '客户端不支持选择表单，当前仅展示会话树，未切换上下文：',
+  treeSelectionInvalid: '所选会话节点无效',
+  treeNavigationFailed: 'pi 未返回会话树切换结果',
+  treeCancelled: 'pi 扩展取消了会话树切换',
+  treeDone: '已切换到会话节点 {id} 对应的上下文，后续消息从此处继续。原分支和 IDE 中已有消息仍保留；文件未回滚。',
+  treeResend: '如需重新发送该消息，请复制以下原文（附件需重新添加）：',
+  cmdReload: '重新加载 pi 的模型、扩展、skills 和提示词配置',
+  reloadDone: '已重新加载 pi 配置',
   cmdCompact: '压缩对话上下文，可附带摘要要求',
   cmdCompactHint: '可选摘要要求',
   cmdGoal: '设置或查看长期目标，也支持 pause、resume、clear',
@@ -311,6 +323,7 @@ const en = {
   goalObjectiveInvalid: 'Invalid goal objective',
   noGoalSet: 'No goal is set',
   fileReportUncertainty: 'Includes file changes reported by built-in edit/write and from before/after snapshots of the working directory (including commands, MCP, and extensions); .git and symlink targets are not scanned. Concurrent external changes cannot be distinguished, and changes that were reverted, made outside the directory, or made by background work after the turn may be missed.',
+  changedFilesTitle: 'Other file changes',
   fileReportIncomplete: ' The snapshot scan did not finish (read failure or the 20000-entry / 2-second limit), so additions and deletions may be missing.',
   compactingContext: 'Compacting conversation context',
 
@@ -342,6 +355,17 @@ const en = {
   promptContentUnsupported: 'Unsupported prompt content: {type}',
 
   cmdStatus: 'Show the current model, tokens, cost, and context usage',
+  cmdTree: 'View the session tree and switch to a history node',
+  treeSelect: 'Select a session node (● marks the current position); user messages return to before they were sent. Switching context does not revert files or remove existing IDE messages.',
+  treeEmpty: 'The session tree is empty',
+  treeUnsupported: 'This client does not support selection forms. Showing the session tree without switching context:',
+  treeSelectionInvalid: 'Invalid session node selection',
+  treeNavigationFailed: 'pi did not return a tree navigation result',
+  treeCancelled: 'A pi extension cancelled tree navigation',
+  treeDone: 'Switched to the context for session node {id}. Subsequent messages continue from here. The previous branch and existing IDE messages are preserved; files were not reverted.',
+  treeResend: 'To resend this message, copy the original text below (reattach any attachments):',
+  cmdReload: 'Reload pi models, extensions, skills and prompts',
+  reloadDone: 'pi configuration reloaded',
   cmdCompact: 'Compact the conversation context, optionally with summary instructions',
   cmdCompactHint: 'Optional summary instructions',
   cmdGoal: 'Set or view the goal; also supports pause, resume, and clear',

package/src/interactions.js

@@ -17,6 +17,9 @@ const notifyHandlers = {
     if (message.role === 'assistant') session.assistantMessageId = message.id;
     if (message.role === 'user') agent.onUserMessage?.(session, message.id);
   },
+  'PI_ACP_TREE:'(agent, session, payload) {
+    if (session.command) session.command.treeResult = JSON.parse(payload);
+  },
   'PI_ACP_GOAL:'(agent, session, payload) {
     session.goal = JSON.parse(payload);
     if (session.availableModels && !session.changingConfig) agent.goalUpdate(session);

package/src/transcript.js

@@ -109,7 +109,10 @@ export class Transcript {
     }
     const tool = session.tools.get(event.toolCallId);
     if (end && !event.isError && ['edit', 'write'].includes(tool?.title) &&
-        tool.locations?.[0]?.path) session.turn.changedPaths?.add(tool.locations[0].path);
+        tool.locations?.[0]?.path) {
+      session.turn.changedPaths?.add(tool.locations[0].path);
+      session.turn.editedPaths?.add(tool.locations[0].path);
+    }
     this.agent.update(session, { sessionUpdate: 'tool_call_update', toolCallId: event.toolCallId,
       status: !end ? 'in_progress' : event.isError ? 'failed' : 'completed',
       ...this.toolResult(session, event.toolCallId, event.result ?? event.partialResult, event.isError || !end, end) });