very-happy-cli 0.2.177 → 0.2.179

package/dist/{AcpBackend-B0K0WrtW.mjs → AcpBackend-CHp3y7cb.mjs}

@@ -1,11 +1,11 @@
 import { spawn } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { randomUUID } from 'node:crypto';
-import { l as logger } from './logger-13cBr_ew.mjs';
-import { d as delay } from './time-yEL6wHUF.mjs';
+import { l as logger } from './logger-BtVhHnD8.mjs';
+import { d as delay } from './time-65DcU6Jx.mjs';
 import { c as contentLogMetadata, e as errorLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
 import { r as readableStderrTail, a as appendStderrRing, s as stopProcessGracefully, k as killProcessTree } from './processTree-CP5IvQ2Z.mjs';
-import { p as packageJson } from './package-CjlsAaRe.mjs';
+import { p as packageJson } from './package-BPPebGQF.mjs';
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {
@@ -539,6 +539,51 @@ function handleThinkingUpdate(update, ctx) {
   return { handled: true };
 }
 
+const CHOICE = /^choice-\d+$/;
+function readPiExtensionDialog(params) {
+  const toolCall = params.toolCall;
+  if (!toolCall || typeof toolCall.toolCallId !== "string" || !toolCall.toolCallId.startsWith("pi-ui-")) return null;
+  const method = toolCall.rawInput?.method;
+  const options = params.options ?? [];
+  if (method === "select" && options.length > 0 && options.every((o) => typeof o.optionId === "string" && CHOICE.test(o.optionId))) {
+    const title = typeof toolCall.rawInput?.title === "string" ? toolCall.rawInput.title : toolCall.title;
+    return {
+      kind: "select",
+      question: typeof title === "string" && title.trim() ? title : "pi asks",
+      options: options.map((o) => ({ optionId: o.optionId, label: String(o.name ?? o.optionId) }))
+    };
+  }
+  if (method === "confirm" && options.some((o) => o.optionId === "yes") && options.some((o) => o.optionId === "no")) {
+    return { kind: "confirm" };
+  }
+  return null;
+}
+function piSelectQuestionInput(dialog, message) {
+  return {
+    questions: [{
+      question: dialog.question,
+      header: dialog.question.length > 30 ? `${dialog.question.slice(0, 29)}\u2026` : dialog.question,
+      options: dialog.options.map((o) => ({ label: o.label, description: "" })),
+      multiSelect: false
+    }],
+    ...typeof message === "string" && message.trim() ? { message } : {}
+  };
+}
+function piDialogOutcome(dialog, result) {
+  const approved = result.decision === "approved" || result.decision === "approved_for_session";
+  if (dialog.kind === "confirm") return { outcome: "selected", optionId: approved ? "yes" : "no" };
+  if (!approved) return { outcome: "cancelled" };
+  const answers = result.updatedInput?.answers;
+  const picked = answers && typeof answers === "object" ? answers[dialog.question] : void 0;
+  if (typeof picked !== "string") return { outcome: "cancelled" };
+  const match = dialog.options.find((o) => o.label === picked);
+  return match ? { outcome: "selected", optionId: match.optionId } : { outcome: "cancelled" };
+}
+
+const LOAD_SESSION_TIMEOUT_MS = 6e4;
+function isReplayedConversationUpdate(updateType) {
+  return updateType === "user_message_chunk" || updateType === "agent_message_chunk" || updateType === "agent_thought_chunk" || updateType === "tool_call" || updateType === "tool_call_update" || updateType === "plan";
+}
 const RETRY_CONFIG = {
   /** Maximum number of retry attempts for init/newSession */
   maxAttempts: 3,
@@ -655,6 +700,13 @@ class AcpBackend {
   process = null;
   connection = null;
   acpSessionId = null;
+  /**
+   * B-633: true while `session/load` runs. pi-acp replays the whole earlier
+   * conversation as user/agent/tool updates before it answers; the web already
+   * holds that transcript, so those updates are dropped (config, mode, model
+   * and command updates still apply).
+   */
+  replayingHistory = false;
   disposed = false;
   /** Track active tool calls to prevent duplicate events */
   activeToolCalls = /* @__PURE__ */ new Set();
@@ -730,7 +782,7 @@ class AcpBackend {
       }
     }
   }
-  async startSession(initialPrompt) {
+  async startSession(initialPrompt, options = {}) {
     if (this.disposed) {
       throw new Error("Backend has been disposed");
     }
@@ -906,21 +958,26 @@ class AcpBackend {
           let toolName = resolved.toolName;
           const toolCallId = resolved.toolCallId;
           const permissionId = toolCallId;
-          const input = resolved.input;
+          let input = resolved.input;
+          const piDialog = readPiExtensionDialog(extendedParams);
           const context = {
             recentPromptHadChangeTitle: this.recentPromptHadChangeTitle,
             toolCallCountSincePrompt: this.toolCallCountSincePrompt
           };
           toolName = this.transport.determineToolName?.(toolName, toolCallId, input, context) ?? toolName;
+          if (piDialog?.kind === "select") {
+            toolName = "AskUserQuestion";
+            input = piSelectQuestionInput(piDialog, resolved.input.message);
+          }
           if (toolName !== (toolCall?.kind || toolCall?.toolName || extendedParams.kind || "Unknown tool")) {
             logger.debug(`[AcpBackend] Inferred tool name for toolCallId: ${toolCallId}`);
           }
           this.toolCallCountSincePrompt++;
-          const options = extendedParams.options || [];
+          const options2 = extendedParams.options || [];
           logger.debug("[AcpBackend] Permission request metadata:", {
             hasToolCall: !!toolCall,
             toolCallId,
-            optionCount: options.length,
+            optionCount: options2.length,
             input: contentLogMetadata(input)
           });
           this.emit({
@@ -933,7 +990,7 @@ class AcpBackend {
               toolCallId,
               toolName,
               input,
-              options: options.map((opt) => ({
+              options: options2.map((opt) => ({
                 id: opt.optionId,
                 name: opt.name,
                 kind: opt.kind
@@ -947,20 +1004,31 @@ class AcpBackend {
                 toolName,
                 input
               );
+              if (piDialog) {
+                const answer = piDialogOutcome(piDialog, result);
+                const answered = answer.outcome === "selected" && answer.optionId !== "no";
+                this.emit({
+                  type: "tool-result",
+                  toolName,
+                  result: { status: answered ? "approved" : "denied", decision: result.decision },
+                  callId: permissionId
+                });
+                return { outcome: answer };
+              }
               let optionId = "cancel";
               if (result.decision === "approved" || result.decision === "approved_for_session") {
-                const proceedOnceOption2 = options.find(
+                const proceedOnceOption2 = options2.find(
                   (opt) => opt.optionId === "proceed_once" || opt.name?.toLowerCase().includes("once")
                 );
-                const proceedAlwaysOption = options.find(
+                const proceedAlwaysOption = options2.find(
                   (opt) => opt.optionId === "proceed_always" || opt.name?.toLowerCase().includes("always")
                 );
                 if (result.decision === "approved_for_session" && proceedAlwaysOption) {
                   optionId = proceedAlwaysOption.optionId || "proceed_always";
                 } else if (proceedOnceOption2) {
                   optionId = proceedOnceOption2.optionId || "proceed_once";
-                } else if (options.length > 0) {
-                  optionId = options[0].optionId || "proceed_once";
+                } else if (options2.length > 0) {
+                  optionId = options2[0].optionId || "proceed_once";
                 }
                 this.emit({
                   type: "tool-result",
@@ -969,7 +1037,7 @@ class AcpBackend {
                   callId: permissionId
                 });
               } else {
-                const cancelOption = options.find(
+                const cancelOption = options2.find(
                   (opt) => opt.optionId === "cancel" || opt.name?.toLowerCase().includes("cancel")
                 );
                 if (cancelOption) {
@@ -988,10 +1056,10 @@ class AcpBackend {
               return { outcome: { outcome: "selected", optionId: "cancel" } };
             }
           }
-          const proceedOnceOption = options.find(
+          const proceedOnceOption = options2.find(
             (opt) => opt.optionId === "proceed_once" || typeof opt.name === "string" && opt.name.toLowerCase().includes("once")
           );
-          const defaultOptionId = proceedOnceOption?.optionId || (options.length > 0 && options[0].optionId ? options[0].optionId : "proceed_once");
+          const defaultOptionId = proceedOnceOption?.optionId || (options2.length > 0 && options2[0].optionId ? options2[0].optionId : "proceed_once");
           return { outcome: { outcome: "selected", optionId: defaultOptionId } };
         }
       };
@@ -1072,6 +1140,50 @@ class AcpBackend {
         cwd: this.options.cwd,
         mcpServers
       };
+      let resumed;
+      let loadFailure;
+      if (options.loadSessionId) {
+        if (initializeResponse.agentCapabilities?.loadSession !== true) {
+          resumed = "fresh";
+          loadFailure = `${this.transport.agentName} cannot reopen sessions`;
+        } else {
+          const loadRequest = { ...newSessionRequest, sessionId: options.loadSessionId };
+          let timeoutHandle = null;
+          this.replayingHistory = true;
+          try {
+            const loaded = await Promise.race([
+              startupFailurePromise,
+              this.connection.loadSession(loadRequest),
+              new Promise((_, reject) => {
+                timeoutHandle = setTimeout(() => reject(new Error(`Load session timeout after ${LOAD_SESSION_TIMEOUT_MS}ms`)), LOAD_SESSION_TIMEOUT_MS);
+              })
+            ]);
+            this.acpSessionId = options.loadSessionId;
+            resumed = "loaded";
+            logger.debug(`[AcpBackend] Session reopened: ${this.acpSessionId}`);
+            this.emitInitialSessionMetadata(loaded);
+          } catch (error) {
+            if (startupFailure && error === startupFailure) throw error;
+            resumed = "fresh";
+            const message = error?.message;
+            loadFailure = typeof message === "string" ? message : String(error);
+            logger.debug(`[AcpBackend] Reopening session ${options.loadSessionId} failed; starting a new one: ${loadFailure}`);
+          } finally {
+            if (timeoutHandle) clearTimeout(timeoutHandle);
+            this.replayingHistory = false;
+          }
+        }
+      }
+      if (resumed === "loaded") {
+        this.emitIdleStatus();
+        if (initialPrompt) {
+          this.sendPrompt(sessionId, initialPrompt).catch((error) => {
+            logger.debug("[AcpBackend] Error sending initial prompt:", errorLogMetadata(error));
+            this.emit({ type: "status", status: "error", detail: String(error) });
+          });
+        }
+        return { sessionId, agentSessionId: this.acpSessionId, resumed };
+      }
       logger.debug(`[AcpBackend] Creating new session...`);
       const sessionResponse = await withRetry(
         async () => {
@@ -1122,7 +1234,11 @@ class AcpBackend {
           this.emit({ type: "status", status: "error", detail: String(error) });
         });
       }
-      return { sessionId };
+      return {
+        sessionId,
+        agentSessionId: this.acpSessionId ?? void 0,
+        ...resumed ? { resumed, ...loadFailure ? { loadFailure } : {} } : {}
+      };
     } catch (error) {
       logger.debug("[AcpBackend] Error starting session:", errorLogMetadata(error));
       if (!startupStatusErrorEmitted) {
@@ -1208,6 +1324,9 @@ class AcpBackend {
         `Incoming session update from ${this.options.agentName}: type=${sessionUpdateType ?? "unknown"} payloadBytes=${String(updateMetadata.payloadBytes ?? "unknown")}`
       );
     }
+    if (this.replayingHistory && isReplayedConversationUpdate(updateType)) {
+      return;
+    }
     const ctx = this.createHandlerContext();
     if (sessionUpdateType === "agent_message_chunk") {
       handleAgentMessageChunk(update, ctx);

package/dist/{AcpBackend-B-ny68XM.cjs → AcpBackend-DFipFF7-.cjs}

@@ -3,11 +3,11 @@
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var node_crypto = require('node:crypto');
-var logger = require('./logger-LvwVeATU.cjs');
-var time = require('./time-Dg5tVB8S.cjs');
+var logger = require('./logger-C1GWx3gi.cjs');
+var time = require('./time-CrwIMHta.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var processTree = require('./processTree-CMHWlVse.cjs');
-var _package = require('./package-Ch9WGDV_.cjs');
+var _package = require('./package-SgqTYsjn.cjs');
 
 function acpImageBlocks(attachments, supportsImages) {
   return attachments.filter((file) => ["image/jpeg", "image/png", "image/gif", "image/webp"].includes(file.mimeType)).map((file) => {
@@ -541,6 +541,51 @@ function handleThinkingUpdate(update, ctx) {
   return { handled: true };
 }
 
+const CHOICE = /^choice-\d+$/;
+function readPiExtensionDialog(params) {
+  const toolCall = params.toolCall;
+  if (!toolCall || typeof toolCall.toolCallId !== "string" || !toolCall.toolCallId.startsWith("pi-ui-")) return null;
+  const method = toolCall.rawInput?.method;
+  const options = params.options ?? [];
+  if (method === "select" && options.length > 0 && options.every((o) => typeof o.optionId === "string" && CHOICE.test(o.optionId))) {
+    const title = typeof toolCall.rawInput?.title === "string" ? toolCall.rawInput.title : toolCall.title;
+    return {
+      kind: "select",
+      question: typeof title === "string" && title.trim() ? title : "pi asks",
+      options: options.map((o) => ({ optionId: o.optionId, label: String(o.name ?? o.optionId) }))
+    };
+  }
+  if (method === "confirm" && options.some((o) => o.optionId === "yes") && options.some((o) => o.optionId === "no")) {
+    return { kind: "confirm" };
+  }
+  return null;
+}
+function piSelectQuestionInput(dialog, message) {
+  return {
+    questions: [{
+      question: dialog.question,
+      header: dialog.question.length > 30 ? `${dialog.question.slice(0, 29)}\u2026` : dialog.question,
+      options: dialog.options.map((o) => ({ label: o.label, description: "" })),
+      multiSelect: false
+    }],
+    ...typeof message === "string" && message.trim() ? { message } : {}
+  };
+}
+function piDialogOutcome(dialog, result) {
+  const approved = result.decision === "approved" || result.decision === "approved_for_session";
+  if (dialog.kind === "confirm") return { outcome: "selected", optionId: approved ? "yes" : "no" };
+  if (!approved) return { outcome: "cancelled" };
+  const answers = result.updatedInput?.answers;
+  const picked = answers && typeof answers === "object" ? answers[dialog.question] : void 0;
+  if (typeof picked !== "string") return { outcome: "cancelled" };
+  const match = dialog.options.find((o) => o.label === picked);
+  return match ? { outcome: "selected", optionId: match.optionId } : { outcome: "cancelled" };
+}
+
+const LOAD_SESSION_TIMEOUT_MS = 6e4;
+function isReplayedConversationUpdate(updateType) {
+  return updateType === "user_message_chunk" || updateType === "agent_message_chunk" || updateType === "agent_thought_chunk" || updateType === "tool_call" || updateType === "tool_call_update" || updateType === "plan";
+}
 const RETRY_CONFIG = {
   /** Maximum number of retry attempts for init/newSession */
   maxAttempts: 3,
@@ -657,6 +702,13 @@ class AcpBackend {
   process = null;
   connection = null;
   acpSessionId = null;
+  /**
+   * B-633: true while `session/load` runs. pi-acp replays the whole earlier
+   * conversation as user/agent/tool updates before it answers; the web already
+   * holds that transcript, so those updates are dropped (config, mode, model
+   * and command updates still apply).
+   */
+  replayingHistory = false;
   disposed = false;
   /** Track active tool calls to prevent duplicate events */
   activeToolCalls = /* @__PURE__ */ new Set();
@@ -732,7 +784,7 @@ class AcpBackend {
       }
     }
   }
-  async startSession(initialPrompt) {
+  async startSession(initialPrompt, options = {}) {
     if (this.disposed) {
       throw new Error("Backend has been disposed");
     }
@@ -908,21 +960,26 @@ class AcpBackend {
           let toolName = resolved.toolName;
           const toolCallId = resolved.toolCallId;
           const permissionId = toolCallId;
-          const input = resolved.input;
+          let input = resolved.input;
+          const piDialog = readPiExtensionDialog(extendedParams);
           const context = {
             recentPromptHadChangeTitle: this.recentPromptHadChangeTitle,
             toolCallCountSincePrompt: this.toolCallCountSincePrompt
           };
           toolName = this.transport.determineToolName?.(toolName, toolCallId, input, context) ?? toolName;
+          if (piDialog?.kind === "select") {
+            toolName = "AskUserQuestion";
+            input = piSelectQuestionInput(piDialog, resolved.input.message);
+          }
           if (toolName !== (toolCall?.kind || toolCall?.toolName || extendedParams.kind || "Unknown tool")) {
             logger.logger.debug(`[AcpBackend] Inferred tool name for toolCallId: ${toolCallId}`);
           }
           this.toolCallCountSincePrompt++;
-          const options = extendedParams.options || [];
+          const options2 = extendedParams.options || [];
           logger.logger.debug("[AcpBackend] Permission request metadata:", {
             hasToolCall: !!toolCall,
             toolCallId,
-            optionCount: options.length,
+            optionCount: options2.length,
             input: contentLogMetadata.contentLogMetadata(input)
           });
           this.emit({
@@ -935,7 +992,7 @@ class AcpBackend {
               toolCallId,
               toolName,
               input,
-              options: options.map((opt) => ({
+              options: options2.map((opt) => ({
                 id: opt.optionId,
                 name: opt.name,
                 kind: opt.kind
@@ -949,20 +1006,31 @@ class AcpBackend {
                 toolName,
                 input
               );
+              if (piDialog) {
+                const answer = piDialogOutcome(piDialog, result);
+                const answered = answer.outcome === "selected" && answer.optionId !== "no";
+                this.emit({
+                  type: "tool-result",
+                  toolName,
+                  result: { status: answered ? "approved" : "denied", decision: result.decision },
+                  callId: permissionId
+                });
+                return { outcome: answer };
+              }
               let optionId = "cancel";
               if (result.decision === "approved" || result.decision === "approved_for_session") {
-                const proceedOnceOption2 = options.find(
+                const proceedOnceOption2 = options2.find(
                   (opt) => opt.optionId === "proceed_once" || opt.name?.toLowerCase().includes("once")
                 );
-                const proceedAlwaysOption = options.find(
+                const proceedAlwaysOption = options2.find(
                   (opt) => opt.optionId === "proceed_always" || opt.name?.toLowerCase().includes("always")
                 );
                 if (result.decision === "approved_for_session" && proceedAlwaysOption) {
                   optionId = proceedAlwaysOption.optionId || "proceed_always";
                 } else if (proceedOnceOption2) {
                   optionId = proceedOnceOption2.optionId || "proceed_once";
-                } else if (options.length > 0) {
-                  optionId = options[0].optionId || "proceed_once";
+                } else if (options2.length > 0) {
+                  optionId = options2[0].optionId || "proceed_once";
                 }
                 this.emit({
                   type: "tool-result",
@@ -971,7 +1039,7 @@ class AcpBackend {
                   callId: permissionId
                 });
               } else {
-                const cancelOption = options.find(
+                const cancelOption = options2.find(
                   (opt) => opt.optionId === "cancel" || opt.name?.toLowerCase().includes("cancel")
                 );
                 if (cancelOption) {
@@ -990,10 +1058,10 @@ class AcpBackend {
               return { outcome: { outcome: "selected", optionId: "cancel" } };
             }
           }
-          const proceedOnceOption = options.find(
+          const proceedOnceOption = options2.find(
             (opt) => opt.optionId === "proceed_once" || typeof opt.name === "string" && opt.name.toLowerCase().includes("once")
           );
-          const defaultOptionId = proceedOnceOption?.optionId || (options.length > 0 && options[0].optionId ? options[0].optionId : "proceed_once");
+          const defaultOptionId = proceedOnceOption?.optionId || (options2.length > 0 && options2[0].optionId ? options2[0].optionId : "proceed_once");
           return { outcome: { outcome: "selected", optionId: defaultOptionId } };
         }
       };
@@ -1074,6 +1142,50 @@ class AcpBackend {
         cwd: this.options.cwd,
         mcpServers
       };
+      let resumed;
+      let loadFailure;
+      if (options.loadSessionId) {
+        if (initializeResponse.agentCapabilities?.loadSession !== true) {
+          resumed = "fresh";
+          loadFailure = `${this.transport.agentName} cannot reopen sessions`;
+        } else {
+          const loadRequest = { ...newSessionRequest, sessionId: options.loadSessionId };
+          let timeoutHandle = null;
+          this.replayingHistory = true;
+          try {
+            const loaded = await Promise.race([
+              startupFailurePromise,
+              this.connection.loadSession(loadRequest),
+              new Promise((_, reject) => {
+                timeoutHandle = setTimeout(() => reject(new Error(`Load session timeout after ${LOAD_SESSION_TIMEOUT_MS}ms`)), LOAD_SESSION_TIMEOUT_MS);
+              })
+            ]);
+            this.acpSessionId = options.loadSessionId;
+            resumed = "loaded";
+            logger.logger.debug(`[AcpBackend] Session reopened: ${this.acpSessionId}`);
+            this.emitInitialSessionMetadata(loaded);
+          } catch (error) {
+            if (startupFailure && error === startupFailure) throw error;
+            resumed = "fresh";
+            const message = error?.message;
+            loadFailure = typeof message === "string" ? message : String(error);
+            logger.logger.debug(`[AcpBackend] Reopening session ${options.loadSessionId} failed; starting a new one: ${loadFailure}`);
+          } finally {
+            if (timeoutHandle) clearTimeout(timeoutHandle);
+            this.replayingHistory = false;
+          }
+        }
+      }
+      if (resumed === "loaded") {
+        this.emitIdleStatus();
+        if (initialPrompt) {
+          this.sendPrompt(sessionId, initialPrompt).catch((error) => {
+            logger.logger.debug("[AcpBackend] Error sending initial prompt:", contentLogMetadata.errorLogMetadata(error));
+            this.emit({ type: "status", status: "error", detail: String(error) });
+          });
+        }
+        return { sessionId, agentSessionId: this.acpSessionId, resumed };
+      }
       logger.logger.debug(`[AcpBackend] Creating new session...`);
       const sessionResponse = await withRetry(
         async () => {
@@ -1124,7 +1236,11 @@ class AcpBackend {
           this.emit({ type: "status", status: "error", detail: String(error) });
         });
       }
-      return { sessionId };
+      return {
+        sessionId,
+        agentSessionId: this.acpSessionId ?? void 0,
+        ...resumed ? { resumed, ...loadFailure ? { loadFailure } : {} } : {}
+      };
     } catch (error) {
       logger.logger.debug("[AcpBackend] Error starting session:", contentLogMetadata.errorLogMetadata(error));
       if (!startupStatusErrorEmitted) {
@@ -1210,6 +1326,9 @@ class AcpBackend {
         `Incoming session update from ${this.options.agentName}: type=${sessionUpdateType ?? "unknown"} payloadBytes=${String(updateMetadata.payloadBytes ?? "unknown")}`
       );
     }
+    if (this.replayingHistory && isReplayedConversationUpdate(updateType)) {
+      return;
+    }
     const ctx = this.createHandlerContext();
     if (sessionUpdateType === "agent_message_chunk") {
       handleAgentMessageChunk(update, ctx);

package/dist/{AcpSessionManager-CjdJLofq.cjs → AcpSessionManager-0zpvRJXc.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var cuid2 = require('@paralleldrive/cuid2');
-var index = require('./index-De8L5lFK.cjs');
+var index = require('./index-C6O2vVjm.cjs');
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };
@@ -24,6 +24,26 @@ function toolCallEndResult(result) {
     ...record.truncated === true ? { truncated: true } : {}
   };
 }
+function piSubagentLabel(args) {
+  if (args.piTool !== "subagent") return null;
+  const raw = args.rawInput && typeof args.rawInput === "object" ? args.rawInput : {};
+  const clip = (text) => {
+    const flat = text.replace(/\s+/g, " ").trim();
+    return flat.length > 120 ? `${flat.slice(0, 119)}\u2026` : flat;
+  };
+  const agent = typeof raw.agent === "string" ? raw.agent : void 0;
+  if (typeof raw.task === "string" && raw.task.trim()) return { description: clip(raw.task), ...agent ? { subagentType: agent } : {} };
+  if (Array.isArray(raw.tasks)) return { description: `${raw.tasks.length} parallel task${raw.tasks.length === 1 ? "" : "s"}`, ...agent ? { subagentType: agent } : {} };
+  if (Array.isArray(raw.chain)) return { description: `chain of ${raw.chain.length} step${raw.chain.length === 1 ? "" : "s"}` };
+  return { description: agent ? `${agent} sub-agent` : "sub-agent", ...agent ? { subagentType: agent } : {} };
+}
+function subagentStopStatus(result) {
+  if (!result || typeof result !== "object" || Array.isArray(result)) return "completed";
+  const record = result;
+  if (record.status === "cancelled" || record.status === "canceled") return "stopped";
+  if (record.error !== void 0 || record.status === "failed" || typeof record.exitCode === "number" && record.exitCode !== 0) return "failed";
+  return "completed";
+}
 function parseThinkingPayload(payload) {
   if (typeof payload === "string") {
     return { text: payload, streaming: false };
@@ -37,6 +57,8 @@ function parseThinkingPayload(payload) {
 }
 class AcpSessionManager {
   currentTurnId = null;
+  /** B-632 ③: ACP call id → sub-agent id of a running pi `subagent` call. */
+  subagentByCall = /* @__PURE__ */ new Map();
   acpCallToSessionCall = /* @__PURE__ */ new Map();
   stream;
   /** Monotonic clock: max(lastTime + 1, Date.now()) */
@@ -134,10 +156,13 @@ class AcpSessionManager {
       return flushed;
     }
     const turnId = this.currentTurnId;
+    const stops = [...this.subagentByCall.values()].map((subagent) => index.createEnvelope("agent", { t: "stop", status: status === "completed" ? "completed" : "stopped" }, { turn: turnId, time: this.nextTime(), subagent }));
+    this.subagentByCall.clear();
     this.currentTurnId = null;
     this.acpCallToSessionCall.clear();
     return [
       ...flushed,
+      ...stops,
       index.createEnvelope("agent", { t: "turn-end", status }, { turn: turnId, time: this.nextTime() })
     ];
   }
@@ -172,6 +197,10 @@ class AcpSessionManager {
     if (msg.type === "tool-call") {
       const flushed = this.flush();
       const call = this.ensureSessionCallId(msg.callId);
+      const label = piSubagentLabel(msg.args ?? {});
+      const subagent = label ? this.subagentByCall.get(msg.callId) ?? cuid2.createId() : void 0;
+      const started = subagent !== void 0 && !this.subagentByCall.has(msg.callId);
+      if (subagent) this.subagentByCall.set(msg.callId, subagent);
       return [
         ...flushed,
         index.createEnvelope("agent", {
@@ -180,17 +209,22 @@ class AcpSessionManager {
           name: msg.toolName,
           title: buildToolTitle(msg.toolName),
           description: buildToolDescription(msg.toolName),
-          args: msg.args
-        }, turnOptions(this.currentTurnId, this.nextTime()))
+          // The web links the call row to the sub-agent card by this id (as for Claude's Agent).
+          args: subagent ? { ...msg.args, sessionSubagent: subagent } : msg.args
+        }, turnOptions(this.currentTurnId, this.nextTime())),
+        ...started && label ? [index.createEnvelope("agent", { t: "start", ...label }, { ...turnOptions(this.currentTurnId, this.nextTime()), subagent })] : []
       ];
     }
     if (msg.type === "tool-result") {
       const flushed = this.flush();
       const call = this.ensureSessionCallId(msg.callId);
       const result = toolCallEndResult(msg.result);
+      const subagent = this.subagentByCall.get(msg.callId);
+      if (subagent) this.subagentByCall.delete(msg.callId);
       return [
         ...flushed,
-        index.createEnvelope("agent", { t: "tool-call-end", call, ...result ? { result } : {} }, turnOptions(this.currentTurnId, this.nextTime()))
+        index.createEnvelope("agent", { t: "tool-call-end", call, ...result ? { result } : {} }, turnOptions(this.currentTurnId, this.nextTime())),
+        ...subagent ? [index.createEnvelope("agent", { t: "stop", status: subagentStopStatus(msg.result) }, { ...turnOptions(this.currentTurnId, this.nextTime()), subagent })] : []
       ];
     }
     return [];