jetbrains-pi-acp 0.1.3 → 0.1.6

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.3 --setup
+   npx --yes jetbrains-pi-acp@0.1.6 --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.3"],
+         "args": ["--yes", "jetbrains-pi-acp@0.1.6"],
          "use_idea_mcp": true,
          "use_custom_mcp": true
        }
@@ -41,7 +41,7 @@ The IDE must be able to find `npx`; use its absolute path if needed. Menu locati
 - Native pi session history: list, load, resume, rename, fork, and delete sessions.
 - 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.3", "--", "--model", "provider/model-id", "--thinking", "medium"]
+["--yes", "jetbrains-pi-acp@0.1.6", "--", "--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,12 +61,15 @@ 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
 
 - Tools execute locally through pi; ACP client-side `fs/*` and `terminal/*` execution is not implemented. Save editor buffers before asking the agent to read or change files.
 - Terminal input uses stdin pipes, not a PTY. Full-screen apps and TTY password prompts are unsupported; background tasks have no stdin input.
+- Only commands the model runs with `interactive: true` accept input. Other commands get an empty stdin (`/dev/null`) like native pi, so commands that read stdin by mistake exit instead of hanging.
 - Diffs have size limits and may be unavailable for binary files or older history. File reports scan at most 20,000 entries or two seconds per snapshot and cannot reliably attribute concurrent external changes.
 - MCP SSE, audio, and binary embedded resources are unsupported. Image support depends on the model.
 - ACP v2 follows a draft schema. Client UI behavior, real provider sign-in, and Windows hardware still need verification.

package/README.zh-CN.md

@@ -11,7 +11,7 @@
 1. 在终端中登录模型提供商：
 
    ```bash
-   npx --yes jetbrains-pi-acp@0.1.3 --setup
+   npx --yes jetbrains-pi-acp@0.1.6 --setup
    ```
 
    在 pi 中运行 `/login`，完成登录后退出 pi 并返回 IDE。凭据由 pi 管理。
@@ -23,7 +23,7 @@
      "agent_servers": {
        "pi": {
          "command": "npx",
-         "args": ["--yes", "jetbrains-pi-acp@0.1.3"],
+         "args": ["--yes", "jetbrains-pi-acp@0.1.6"],
          "use_idea_mcp": true,
          "use_custom_mcp": true
        }
@@ -42,7 +42,7 @@ IDE 必须能找到 `npx`，必要时使用其绝对路径。菜单位置随 IDE
 - 使用 pi 原生历史，支持会话列表、加载、恢复、改名、分叉和删除。
 - 支持切换模型与推理级别，以及完全访问、标准访问、只读和规划模式。
 - 界面文案（配置名称、模式说明、命令说明、授权选项、报错等）按系统语言自动切换中英文，给模型看的工具描述和系统提示固定使用英文。语言判断依次读取非空的 `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.3", "--", "--model", "provider/model-id", "--thinking", "medium"]
+["--yes", "jetbrains-pi-acp@0.1.6", "--", "--model", "provider/model-id", "--thinking", "medium"]
 ```
 
 这里只传配置选项，不传初始提示、交互模式或会话选择参数。RPC 模式和会话由适配器管理。
@@ -62,12 +62,15 @@ 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 连接。
 
 ## 限制
 
 - 工具由本机 pi 执行，尚未接入客户端 `fs/*` 和 `terminal/*` 执行接口。让 Agent 读取或修改文件前，请保存编辑器内容。
 - 终端输入使用 stdin 管道，不提供 PTY，不支持全屏终端应用和 TTY 密码提示；后台任务不支持 stdin 输入。
+- 只有模型以 `interactive: true` 调用的命令可以接收输入；其他命令与 pi 原生一致，stdin 为空（`/dev/null`），误读 stdin 的命令会直接结束，不会卡住。
 - diff 有大小限制，二进制文件或旧历史可能无法展示。每轮文件报告的单次快照最多扫描 20,000 项或两秒，无法准确区分外部并发修改。
 - 不支持 MCP SSE、音频和二进制内嵌资源，图片支持取决于模型。
 - ACP v2 仍为草案，客户端界面展示、真实提供商账号登录及 Windows 实机仍需验证。

package/extensions/acp.ts

@@ -79,13 +79,17 @@ export default function (pi: any) {
       const createTool = name === 'bash' ? createBashToolDefinition : createPowerShellToolDefinition;
       const definition = createTool(process.cwd());
       pi.registerTool({ ...definition,
+        parameters: Type.Object({ ...definition.parameters.properties,
+          interactive: Type.Optional(Type.Boolean({ description: 'Set true only when the command must read input typed by the user on stdin. ' +
+            'Default false: stdin is empty (/dev/null) and no input can be sent while it runs.' })) }),
         execute: async (id: string, args: any, signal: AbortSignal, update: any, ctx: any) => {
+          const interactive = args.interactive === true;
           const settings = SettingsManager.create(ctx.cwd);
           const tool = createTool(ctx.cwd, {
             commandPrefix: settings.getShellCommandPrefix(),
             operations: { exec: (command: string, cwd: string, options: any) => terminals.exec(id,
               name === 'bash' ? getShellConfig(settings.getShellPath()) : getPowerShellConfig(),
-              command, cwd, options, () => ctx.ui.notify(`PI_ACP_TERMINAL_READY:${id}`, 'info')) },
+              command, cwd, { ...options, interactive }, () => ctx.ui.notify(`PI_ACP_TERMINAL_READY:${id}`, 'info')) },
           });
           return tool.execute(id, args, signal, update, ctx);
         },
@@ -187,6 +191,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.3",
+  "version": "0.1.6",
   "type": "module",
   "description": "连接 JetBrains IDE 与 pi coding agent 的 ACP 适配器",
   "bin": {

package/src/agent.js

@@ -763,6 +763,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'),

package/src/commands.js

@@ -8,7 +8,7 @@ export class Commands {
   }
 
   isLocal(text) {
-    return text === '/status' || /^\/(compact|goal)(?:\s|$)/.test(text);
+    return text === '/status' || text === '/reload' || /^\/(compact|goal)(?:\s|$)/.test(text);
   }
 
   // Air 聊天框中的 /stdin、/eof 转为唯一可输入终端的输入；返回 true 表示已处理。
@@ -57,6 +57,16 @@ export class Commands {
       await this.agent.sendUsage(session, stats);
       return finish({ stopReason: 'end_turn' });
     }
+    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;
@@ -87,6 +97,7 @@ export class Commands {
     const availableCommands = new Map([
       ['status', { name: 'status', description: t('cmdStatus'), input: null }],
       // Air 的 ACP v1 解析器需要 input 的类型判别字段。
+      ['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,14 @@
+import { execFile } from 'node:child_process';
 import { lstat, opendir } from 'node:fs/promises';
 import { join } from 'node:path';
+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 +16,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);

package/src/i18n.js

@@ -142,6 +142,8 @@ const zh = {
 
   // 斜杠命令
   cmdStatus: '显示当前模型、token、成本和上下文使用情况',
+  cmdReload: '重新加载 pi 的模型、扩展、skills 和提示词配置',
+  reloadDone: '已重新加载 pi 配置',
   cmdCompact: '压缩对话上下文，可附带摘要要求',
   cmdCompactHint: '可选摘要要求',
   cmdGoal: '设置或查看长期目标，也支持 pause、resume、clear',
@@ -342,6 +344,8 @@ const en = {
   promptContentUnsupported: 'Unsupported prompt content: {type}',
 
   cmdStatus: 'Show the current model, tokens, cost, and context usage',
+  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/terminal-input.js

@@ -17,7 +17,7 @@ export class TerminalProcesses {
   async input(params) {
     validateTerminalInput(params);
     const child = this.processes.get(params.terminalId);
-    if (!child || child.exitCode !== null || child.signalCode !== null || !child.stdin.writable) {
+    if (!child || child.exitCode !== null || child.signalCode !== null || !child.stdin?.writable) {
       throw new Error(t('terminalUnavailable'));
     }
     await new Promise((resolve, reject) => {
@@ -43,18 +43,19 @@ export class TerminalProcesses {
     for (const child of this.processes.values()) this.kill(child);
   }
 
-  async exec(terminalId, shell, command, cwd, { onData, signal, timeout, env }, ready) {
+  async exec(terminalId, shell, command, cwd, { onData, signal, timeout, env, interactive }, ready) {
     if (signal?.aborted) throw new Error('aborted');
     if (timeout !== undefined && (!Number.isFinite(timeout) || timeout <= 0 || timeout * 1000 > 2147483647)) {
       throw new Error('Invalid timeout');
     }
     // shortcut: stdin 管道不提供 PTY；需要全屏程序、终端尺寸或 tty 密码提示时再接入 PTY。
     if (shell.commandTransport === 'stdin') throw new Error(t('shellStdinTransport'));
+    // 非交互命令的 stdin 用 /dev/null，与 pi 原生一致，避免误读 stdin 的命令一直卡住。
     const child = spawn(shell.shell, [...shell.args, command], {
-      cwd, env, stdio: ['pipe', 'pipe', 'pipe'], detached: process.platform !== 'win32', windowsHide: true,
+      cwd, env, stdio: [interactive ? 'pipe' : 'ignore', 'pipe', 'pipe'], detached: process.platform !== 'win32', windowsHide: true,
     });
     this.processes.set(terminalId, child);
-    child.stdin.on('error', () => {});
+    child.stdin?.on('error', () => {});
     child.stdout.on('data', data => onData(data, 'stdout'));
     child.stderr.on('data', data => onData(data, 'stderr'));
     let timedOut = false;
@@ -70,7 +71,7 @@ export class TerminalProcesses {
           clearTimeout(idleTimer);
           child.stdout.destroy();
           child.stderr.destroy();
-          child.stdin.destroy();
+          child.stdin?.destroy();
           resolve(code ?? 128 + (constants.signals[child.signalCode] ?? 0));
         };
         const drain = () => {
@@ -81,7 +82,7 @@ export class TerminalProcesses {
         child.stdout.on('data', drain);
         child.stderr.on('data', drain);
         child.once('error', reject);
-        child.once('spawn', ready);
+        if (interactive) child.once('spawn', ready);
         child.once('close', finish);
         child.once('exit', () => { exited = true; drain(); });
       });