jetbrains-pi-acp 0.1.7 → 0.1.8

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.7 --setup
+   npx --yes jetbrains-pi-acp@0.1.8 --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.7"],
+         "args": ["--yes", "jetbrains-pi-acp@0.1.8"],
          "use_idea_mcp": true,
          "use_custom_mcp": true
        }
@@ -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.7", "--", "--model", "provider/model-id", "--thinking", "medium"]
+["--yes", "jetbrains-pi-acp@0.1.8", "--", "--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.

package/README.zh-CN.md

@@ -11,7 +11,7 @@
 1. 在终端中登录模型提供商：
 
    ```bash
-   npx --yes jetbrains-pi-acp@0.1.7 --setup
+   npx --yes jetbrains-pi-acp@0.1.8 --setup
    ```
 
    在 pi 中运行 `/login`，完成登录后退出 pi 并返回 IDE。凭据由 pi 管理。
@@ -23,7 +23,7 @@
      "agent_servers": {
        "pi": {
          "command": "npx",
-         "args": ["--yes", "jetbrains-pi-acp@0.1.7"],
+         "args": ["--yes", "jetbrains-pi-acp@0.1.8"],
          "use_idea_mcp": true,
          "use_custom_mcp": true
        }
@@ -53,7 +53,7 @@ IDE 必须能找到 `npx`，必要时使用其绝对路径。菜单位置随 IDE
 在 Agent 的 `args` 末尾添加 `--`，随后传递 pi 参数，例如：
 
 ```json
-["--yes", "jetbrains-pi-acp@0.1.7", "--", "--model", "provider/model-id", "--thinking", "medium"]
+["--yes", "jetbrains-pi-acp@0.1.8", "--", "--model", "provider/model-id", "--thinking", "medium"]
 ```
 
 这里只传配置选项，不传初始提示、交互模式或会话选择参数。RPC 模式和会话由适配器管理。

package/extensions/acp.ts

@@ -185,7 +185,7 @@ export default function (pi: any) {
       return { message: { ...event.message, acpMessageId: id } };
     }
   });
-  const archiveCache = new Map<string, { modified: number; archived: boolean }>();
+  const archiveCache = new Map<string, { modified: number; archived: boolean; children: string[]; records: string[] }>();
   for (const [name, server] of Object.entries(config.mcpServers)) {
     pi.registerMcpServer(name, server);
   }
@@ -219,19 +219,42 @@ export default function (pi: any) {
       const currentPaths = new Set(sessions.map(session => session.path));
       const idsByPath = new Map(sessions.map(session => [session.path, session.id]));
       for (const path of archiveCache.keys()) if (!currentPaths.has(path)) archiveCache.delete(path);
-      ctx.ui.notify(`PI_ACP_SESSIONS:${JSON.stringify(sessions.map(session => {
+      const infos = sessions.map(session => {
         const modified = statSync(session.path).mtimeMs;
         let cached = archiveCache.get(session.path);
         if (!cached || cached.modified !== modified) {
-          const archived = SessionManager.open(session.path).getBranch().findLast((entry: any) =>
+          const manager = SessionManager.open(session.path);
+          const archived = manager.getBranch().findLast((entry: any) =>
             entry.type === 'custom' && entry.customType === 'acp_archive')?.data === true;
-          cached = { modified, archived };
+          const entries = manager.getEntries() as any[];
+          const children = entries.flatMap(entry =>
+            entry.type === 'custom' && entry.customType === 'acp_task' && entry.data?.kind === 'agent' &&
+            entry.data.owner === session.id && typeof entry.data.sessionId === 'string' ? [entry.data.sessionId] : []);
+          const records = entries.flatMap(entry =>
+            entry.type === 'custom' && entry.customType === 'subagents:record' && typeof entry.data?.id === 'string' ? [entry.data.id] : []);
+          cached = { modified, archived, children, records };
           archiveCache.set(session.path, cached);
         }
         return { sessionId: session.id, cwd: session.cwd, title: session.name || session.firstMessage,
           updatedAt: session.modified.toISOString(), path: session.path, archived: cached.archived,
           ...(idsByPath.has(session.parentSessionPath) ? { forkedFrom: idsByPath.get(session.parentSessionPath) } : {}) };
-      }))}`, 'info');
+      });
+      // 子 agent 会话标记 subagent，由适配器从列表中过滤：
+      // 1) 适配器自己的子 agent：父会话的 acp_task 引用其 ID（自有格式，稳定）；
+      // 2) 旧版 @tintinweb/pi-subagents 写在顶层目录的历史会话：名称为 `类型#8位hex`，
+      //    且父会话有 id 以该 hex 开头的 subagents:record。
+      //    当前 pi-subagents 的子会话在嵌套目录或临时目录，SessionManager.list 本就不返回。
+      // shortcut: 规则 2 只为旧包的历史数据，不再有此类会话后可整段删除。
+      const children = new Set(sessions.flatMap(session => archiveCache.get(session.path)?.children ?? []));
+      const recordsByPath = new Map(sessions.map(session => [session.path, archiveCache.get(session.path)?.records ?? []]));
+      const isSubagent = (session: any) => {
+        const hex = /#([0-9a-f]{8})$/.exec(session.name ?? '')?.[1];
+        return children.has(session.id) || (!!hex && !!session.parentSessionPath &&
+          !!recordsByPath.get(session.parentSessionPath)?.some(id => id.startsWith(hex)));
+      };
+      const subagents = new Set(sessions.filter(isSubagent).map(session => session.id));
+      ctx.ui.notify(`PI_ACP_SESSIONS:${JSON.stringify(infos.map(info =>
+        subagents.has(info.sessionId) ? { ...info, subagent: true } : info))}`, 'info');
     },
   });
   pi.on('tool_call', async (event: any, ctx: any) => {

package/package.json

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

package/src/session-index.js

@@ -7,7 +7,7 @@ import { t } from './i18n.js';
 
 const executeFile = promisify(execFile);
 
-// 历史会话索引：列表、查找、归档及列表变化订阅。
+// 历史会话索引：列表、查找、归档及列表变化订阅；列表默认不含子 agent 会话，仅内部查找时包含。
 // 历史由临时启动的 discovery pi 进程通过 /__acp_list 读取。
 export class SessionIndex {
   constructor(agent) {
@@ -16,7 +16,7 @@ export class SessionIndex {
   }
 
   async find(sessionId, cwd) {
-    const { sessions } = await this.list(cwd === undefined ? {} : { cwd }, { includeArchived: true });
+    const { sessions } = await this.list(cwd === undefined ? {} : { cwd }, { includeArchived: true, includeSubagents: true });
     return sessions.find(info => info.sessionId === sessionId && (cwd === undefined || resolve(info.cwd) === resolve(cwd)));
   }
 
@@ -31,7 +31,7 @@ export class SessionIndex {
     }) };
   }
 
-  async read(context, params) {
+  async read(context, params, { includeSubagents = false } = {}) {
     let cwds = [context.cwd];
     if (params._meta?.jetbrains?.air?.list?.includeWorktrees === true) {
       try {
@@ -44,10 +44,10 @@ export class SessionIndex {
     context.history = undefined;
     await context.pi.request('prompt', { message: `/__acp_list ${JSON.stringify({ all: params.cwd === undefined, cwds })}` });
     if (!context.history) throw new Error(t('piNoHistory'));
-    return context.history;
+    return includeSubagents ? context.history : context.history.filter(info => !info.subagent);
   }
 
-  async list(params, { includeArchived = false } = {}) {
+  async list(params, { includeArchived = false, includeSubagents = false } = {}) {
     if (params.cursor !== undefined && (typeof params.cursor !== 'string' || !/^\d+$/.test(params.cursor))) {
       throw invalid(t('listCursorInvalid'));
     }
@@ -65,7 +65,7 @@ export class SessionIndex {
     }
     const created = await this.agent.newSession({ cwd: params.cwd ?? process.cwd(), mcpServers: [] }, { discovery: true });
     try {
-      const history = (await this.read(created, params)).filter(info =>
+      const history = (await this.read(created, params, { includeSubagents })).filter(info =>
         archived === 'all' || (info.archived === true) === (archived === 'archived'));
       const sessions = history.slice(offset, offset + limit);
       return { sessions, ...(offset + limit < history.length ? { nextCursor: String(offset + limit) } : {}) };