jetbrains-pi-acp 0.1.7 → 0.1.9

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.9 --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.9"],
          "use_idea_mcp": true,
          "use_custom_mcp": true
        }
@@ -37,6 +37,7 @@ The IDE must be able to find `npx`; use its absolute path if needed. Menu locati
 
 ## Features
 
+- `/goal <objective>` and `/goal resume` continue automatically until the model verifies completion and calls `goal_complete` to clear the goal. After 20 unfinished rounds, execution pauses; use `/goal resume` to continue. Stop cancels execution; `/goal pause` or pausing in the Air goal panel prevents further rounds. Completion is judged by the executing model, without an independent auditor. Setting or resuming a goal in the Air panel only updates its state; send `/goal resume` to start execution.
 - 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. 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.
@@ -52,7 +53,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.9", "--", "--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.
@@ -72,6 +73,7 @@ Restart the agent connection after updating the adapter or changing startup opti
 - 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.
+- RPC does not support custom terminal panels from extensions. With `pi-mcp-adapter`, `/mcp` falls back to text status, and command notifications appear in chat; these notifications are not saved in pi session history.
 - ACP v2 follows a draft schema. Client UI behavior, real provider sign-in, and Windows hardware still need verification.
 
 ## Development

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.9 --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.9"],
          "use_idea_mcp": true,
          "use_custom_mcp": true
        }
@@ -44,6 +44,7 @@ IDE 必须能找到 `npx`，必要时使用其绝对路径。菜单位置随 IDE
 - 界面文案（配置名称、模式说明、命令说明、授权选项、报错等）按系统语言自动切换中英文，给模型看的工具描述和系统提示固定使用英文。语言判断依次读取非空的 `LC_ALL`、`LC_MESSAGES`、`LANG`，未设置时使用系统默认语言；中文使用中文，其余语言使用英文。更改系统语言后需重启适配器。
 - 展示内置 `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 任务和定向停止。
+- `/goal <目标>` 和 `/goal resume` 会自动持续执行，直到模型验证完成并调用 `goal_complete` 清除目标；连续 20 轮仍未完成会暂停，可用 `/goal resume` 继续。停止按钮取消当前执行，`/goal pause` 或 Air 目标面板的暂停操作阻止后续轮次。完成由执行模型判断，不包含独立审计。Air 面板设置或恢复目标仅同步状态，启动执行请发送 `/goal resume`。
 - 按客户端能力提供 steering、终端 stdin、表单和 URL 交互。Air v1 可在命令执行期间发送 `/stdin 文本` 和 `/eof`。
 
 **默认完全访问，自动允许工具调用。** 标准访问对内置只读工具以外的工具逐次授权；只读和规划模式拒绝这些工具。权限模式不是操作系统沙箱，安装的 pi 扩展仍属于受信任代码。具体功能取决于客户端协商能力。
@@ -53,7 +54,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.9", "--", "--model", "provider/model-id", "--thinking", "medium"]
 ```
 
 这里只传配置选项，不传初始提示、交互模式或会话选择参数。RPC 模式和会话由适配器管理。
@@ -73,6 +74,7 @@ IDE 必须能找到 `npx`，必要时使用其绝对路径。菜单位置随 IDE
 - 只有模型以 `interactive: true` 调用的命令可以接收输入；其他命令与 pi 原生一致，stdin 为空（`/dev/null`），误读 stdin 的命令会直接结束，不会卡住。
 - diff 有大小限制，二进制文件或旧历史可能无法展示。每轮文件报告的单次快照最多扫描 20,000 项或两秒，无法准确区分外部并发修改。
 - 不支持 MCP SSE、音频和二进制内嵌资源，图片支持取决于模型。
+- RPC 不支持扩展的终端自定义面板。`pi-mcp-adapter` 的 `/mcp` 会降级为文字状态，命令通知在聊天中显示；这些通知不会写入 pi 会话历史。
 - ACP v2 仍为草案，客户端界面展示、真实提供商账号登录及 Windows 实机仍需验证。
 - 每轮 token 在 v1 提示响应的 `usage`、v2 完成状态的 `usage` 中返回；未上报用量时省略，不单列思考 token 或每轮费用。费用取自 pi 的模型计价数据；上下文用量不可用时不发送 `usage_update`，IDE 展示取决于客户端支持。
 

package/extensions/acp.ts

@@ -121,7 +121,9 @@ export default function (pi: any) {
   const mutations = new Map<string, { path: string; conflicted: boolean; oldText?: string | null }>();
   let planMode = false;
   let goal: { status: string; objective: string } | null = null;
+  let runningGoal: typeof goal = null;
   pi.on('before_agent_start', (event: any) => {
+    runningGoal = goal;
     const sections = { ...event.systemPromptOptions.sections };
     delete sections.acp_client_instructions;
     delete sections.acp_plan_mode;
@@ -130,7 +132,7 @@ export default function (pi: any) {
       ...sections,
       ...(config.customInstructions ? { acp_client_instructions: config.customInstructions } : {}),
       ...(planMode ? { acp_plan_mode: 'Only analyze the problem and produce an actionable plan. Do not modify files, run commands, or use other tools with side effects.' } : {}),
-      ...(goal?.status === 'active' ? { acp_goal: `Long-term goal for this session: ${goal.objective}` } : {}),
+      ...(goal?.status === 'active' ? { acp_goal: `Long-term goal for this session: ${goal.objective}\nKeep working until the goal is fully achieved and verified, then call the goal_complete tool. Do not call it before that.` } : {}),
     };
   });
   pi.registerCommand('__acp_mode', {
@@ -160,6 +162,18 @@ export default function (pi: any) {
       goal = value;
     },
   });
+  pi.registerTool({
+    name: 'goal_complete', label: t('goalCompleteLabel'),
+    description: 'Mark the current long-term goal as achieved. Call only when the goal is fully done and verified.',
+    parameters: Type.Object({ summary: Type.String({ maxLength: 10000 }) }),
+    execute: async (_id: string, input: any, _signal: AbortSignal, _update: any, ctx: any) => {
+      if (goal?.status !== 'active' || goal !== runningGoal) throw new Error(t('noGoalSet'));
+      pi.appendEntry('acp_goal', null);
+      goal = null;
+      ctx.ui.notify(`PI_ACP_GOAL:null`, 'info');
+      return { content: [{ type: 'text', text: 'Goal completed' }], details: { summary: input.summary } };
+    },
+  });
   pi.registerTool({
     name: 'update_plan', label: t('updatePlanLabel'),
     description: 'Update the execution plan and progress of the current task with structured steps. Only records the plan; performs no file or command operations.',
@@ -185,7 +199,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 +233,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.9",
   "type": "module",
   "description": "连接 JetBrains IDE 与 pi coding agent 的 ACP 适配器",
   "bin": {

package/src/agent.js

@@ -385,10 +385,12 @@ export class Agent {
     return turn;
   }
 
-  async prompt(session, prompt, steering, fileReportRequest) {
+  async prompt(session, prompt, steering, fileReportRequest, pursueGoal = false) {
     const created = !session.turn;
     if (created) this.beginTurn(session, steering, fileReportRequest);
     const turn = session.turn;
+    if (created) turn.extensionCommand = /^\/\S/.test(prompt.message);
+    if (pursueGoal) Object.assign(turn, { pursueGoal: true, goalCreatedAt: session.goal.createdAt, goalRounds: 0 });
     turn.pending++;
     // 串行提交，避免前一条提示尚在预处理时再次启动运行。
     const submission = (turn.submission ?? Promise.resolve()).catch(() => {}).then(async () => {
@@ -633,10 +635,10 @@ export class Agent {
     await this.sendUsage(session, await session.pi.request('get_session_stats'));
   }
 
-  // 会话就绪后发布可用命令与用量；失败只记录日志。
+  // v2 初始命令随响应返回，v1 通过通知发布；失败只记录日志。
   async publishSession(session) {
     await Promise.all([
-      this.commands.publish(session).catch(logError('publishCommandsFailed')),
+      this.commands.publish(session, this.protocolVersion !== 2).catch(logError('publishCommandsFailed')),
       this.refreshUsage(session).catch(logError('refreshUsageFailed')),
     ]);
   }
@@ -915,7 +917,7 @@ export class Agent {
       case 'agent_settled':
         if (event.aborted) session.turn.cancelled = true;
         session.turn.usage = this.refreshUsage(session).catch(logError('refreshUsageFailed'));
-        session.turn.settle();
+        void this.commands.settleGoal(session);
         break;
     }
   }

package/src/commands.js

@@ -22,6 +22,8 @@ export function treeOptions(tree, leafId) {
 }
 
 // 适配器自己实现的斜杠命令，以及发布给客户端的命令列表。
+const MAX_GOAL_TURNS = 20;
+
 export class Commands {
   constructor(agent) {
     this.agent = agent;
@@ -43,6 +45,31 @@ export class Commands {
     return true;
   }
 
+  async settleGoal(session) {
+    const turn = session.turn;
+    const goal = session.goal;
+    if (!turn.pursueGoal || turn.cancelled || turn.error || turn.stopReason !== 'end_turn' ||
+        goal?.status !== 'active' || goal.createdAt !== turn.goalCreatedAt) return turn.settle();
+    turn.pending++;
+    try {
+      if (++turn.goalRounds >= MAX_GOAL_TURNS) {
+        await this.agent.goalSession({ sessionId: session.id, action: 'pause' });
+        this.agent.update(session, { sessionUpdate: 'agent_message_chunk',
+          content: { type: 'text', text: t('goalTurnLimit', { turns: turn.goalRounds }) } });
+        turn.settle();
+      } else {
+        const accepted = await session.pi.request('prompt', { message: t('goalContinue', goal) });
+        if (accepted?.disposition === 'handled') turn.settle();
+      }
+    } catch (error) {
+      turn.error = error;
+      turn.settle();
+    } finally {
+      turn.pending--;
+      turn.finish();
+    }
+  }
+
   async run(session, text, fileReportRequest) {
     const finish = result => {
       if (fileReportRequest) this.agent.sendFileReport(session, { fileReportRequest, changedPaths: new Set(), starts: 0,
@@ -59,6 +86,8 @@ export class Commands {
           ...(['pause', 'resume', 'clear'].includes(argument)
             ? { action: argument } : { action: 'set', objective: argument }),
         }));
+        // 设置或恢复后立即开工，否则 Air 面板显示 Running 而没有任何模型轮次在跑。
+        if (session.goal?.status === 'active') return this.agent.prompt(session, { message: t('goalKickoff', session.goal) }, false, fileReportRequest, true);
       }
       return finish({ stopReason: 'end_turn' });
     }
@@ -160,7 +189,7 @@ export class Commands {
     }
   }
 
-  async publish(session) {
+  async publish(session, notify = true) {
     const result = await session.pi.request('get_commands');
     const availableCommands = new Map([
       ['status', { name: 'status', description: t('cmdStatus'), input: null }],
@@ -181,7 +210,8 @@ export class Commands {
       availableCommands.set(command.name, { name: command.name,
         description: command.description || command.name, input: null });
     }
-    this.agent.update(session, { sessionUpdate: 'available_commands_update',
-      availableCommands: [...availableCommands.values()] });
+    session.availableCommands = [...availableCommands.values()];
+    if (notify) this.agent.update(session, { sessionUpdate: 'available_commands_update',
+      availableCommands: session.availableCommands });
   }
 }

package/src/i18n.js

@@ -164,6 +164,10 @@ const zh = {
   needOneTerminal: '需要恰好一个可输入的运行中终端',
   goalStatus: '长期目标（{status}）：{objective}',
   noGoal: '尚未设置长期目标',
+  goalKickoff: '开始推进长期目标：{objective}',
+  goalContinue: '继续推进长期目标：{objective}。若已完全达成并验证，请调用 goal_complete；否则继续工作。',
+  goalTurnLimit: '已连续运行 {turns} 轮仍未完成目标，已暂停自动续跑。可发送 /goal resume 继续。',
+  goalCompleteLabel: '完成目标',
   statusModel: '模型：{model}',
   statusThinking: '推理级别：{level}',
   statusMessages: '消息：{messages}，工具调用：{toolCalls}',
@@ -376,6 +380,10 @@ const en = {
   needOneTerminal: 'Exactly one running terminal that accepts input is required',
   goalStatus: 'Goal ({status}): {objective}',
   noGoal: 'No goal set',
+  goalKickoff: 'Start working on the goal: {objective}',
+  goalContinue: 'Continue working on the goal: {objective}. If it is fully achieved and verified, call goal_complete; otherwise keep working.',
+  goalTurnLimit: 'The goal is still unfinished after {turns} consecutive turns; auto-continue is paused. Send /goal resume to continue.',
+  goalCompleteLabel: 'Complete goal',
   statusModel: 'Model: {model}',
   statusThinking: 'Thinking level: {level}',
   statusMessages: 'Messages: {messages}, tool calls: {toolCalls}',

package/src/interactions.js

@@ -100,6 +100,11 @@ export class Interactions {
       notifyHandlers[prefix](this.agent, session, message.slice(prefix.length));
       return;
     }
+    // RPC 扩展命令（如 /mcp）通过 notify 返回文字，需作为本轮回复展示。
+    if (message && session.turn?.extensionCommand && !session.turn.cancelled && !session.turn.settled && !session.turn.starts) {
+      this.agent.update(session, { sessionUpdate: 'agent_message_chunk', content: { type: 'text', text: `${message}\n` } });
+      return;
+    }
     const notices = this.agent.clientCapabilities?.session?.notices;
     if (notices && typeof notices === 'object' && !Array.isArray(notices)) {
       this.agent.update(session, { sessionUpdate: 'notice',

package/src/protocol.js

@@ -6,6 +6,8 @@ import { invalid } from './shared.js';
 import { t } from './i18n.js';
 
 const options = values => values.map(({ id, ...option }) => ({ configId: id, ...option }));
+const commands = values => values.map(command => ({ ...command,
+  ...(command.input ? { input: { ...command.input, type: 'text' } } : {}) }));
 const object = value => value !== null && typeof value === 'object' && !Array.isArray(value);
 const failure = error => ({ code: Number.isInteger(error.code) ? error.code : -32603, message: error.message });
 
@@ -255,10 +257,12 @@ export class ProtocolAgent {
         } });
       } else if (record.result?.configOptions) {
         const { models, modes, ...result } = record.result;
-        this.send({ ...record, result: { ...result, configOptions: options(result.configOptions) } });
-        if (['session/new', 'session/resume', 'session/fork'].includes(request?.method)) {
-          this.state(result.sessionId ?? request.sessionId, 'idle');
-        }
+        const setup = ['session/new', 'session/resume', 'session/fork'].includes(request?.method);
+        const sessionId = result.sessionId ?? request?.sessionId;
+        const availableCommands = setup ? this.agent.sessions.get(sessionId)?.availableCommands : undefined;
+        this.send({ ...record, result: { ...result, configOptions: options(result.configOptions),
+          ...(availableCommands ? { availableCommands: commands(availableCommands) } : {}) } });
+        if (setup) this.state(sessionId, 'idle');
       } else this.send(record);
       if (record.result && ['session/close', 'session/delete'].includes(request?.method)) this.states.delete(request.sessionId);
       return;
@@ -288,8 +292,7 @@ export class ProtocolAgent {
     if (update.sessionUpdate === 'current_mode_update') return;
     if (update.sessionUpdate === 'config_option_update') update = { ...update, configOptions: options(update.configOptions) };
     if (update.sessionUpdate === 'available_commands_update') update = { ...update,
-      availableCommands: update.availableCommands.map(command => ({ ...command,
-        ...(command.input ? { input: { ...command.input, type: 'text' } } : {}) })) };
+      availableCommands: commands(update.availableCommands) };
     if (update.sessionUpdate === 'plan') update = { sessionUpdate: 'plan_update',
       plan: { type: 'items', planId: 'pi-plan', entries: update.entries } };
     if (['user_message_chunk', 'agent_message_chunk', 'agent_thought_chunk'].includes(update.sessionUpdate)) {

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) } : {}) };