@harmonyos-arkts/opencode-acp 0.0.4 → 0.0.7

package/dist/index.cjs

@@ -19586,6 +19586,11 @@ function createOpencodeClient(config2) {
 // node_modules/@opencode-ai/sdk/dist/v2/server.js
 var import_cross_spawn = __toESM(require_cross_spawn(), 1);
 
+// src/index.ts
+var http = __toESM(require("node:http"), 1);
+var https = __toESM(require("node:https"), 1);
+var import_node_stream = require("node:stream");
+
 // src/agent.ts
 var import_url2 = require("url");
 
@@ -19699,6 +19704,14 @@ var SessionManager = class {
   getChildren(parentId) {
     return [...this.children.get(parentId) ?? []];
   }
+  /** All registered session IDs (parent + discovered children). */
+  listSessionIds() {
+    return [...this.sessions.keys()];
+  }
+  /** Top-level sessions only (no parentID) — used for global error broadcast. */
+  listTopLevelSessionIds() {
+    return [...this.sessions.values()].filter((s) => !s.parentID).map((s) => s.id);
+  }
   // Model and mode management
   getModel(sessionId) {
     return this.get(sessionId).model;
@@ -20279,65 +20292,6 @@ function applyStructuredPatch(source, patch, options = {}) {
 
 // src/utils.ts
 var import_url = require("url");
-function toToolKind(toolName) {
-  const tool = toolName.toLowerCase();
-  switch (tool) {
-    case "bash":
-      return "execute";
-    case "webfetch":
-      return "fetch";
-    case "edit":
-    case "patch":
-    case "write":
-      return "edit";
-    case "grep":
-    case "glob":
-    case "context7_resolve_library_id":
-    case "context7_get_library_docs":
-      return "search";
-    case "list":
-    case "read":
-      return "read";
-    default:
-      return "other";
-  }
-}
-function toLocations(toolName, input) {
-  const tool = toolName.toLowerCase();
-  switch (tool) {
-    case "read":
-    case "edit":
-    case "write":
-      return input["filePath"] ? [{ path: input["filePath"] }] : [];
-    case "glob":
-    case "grep":
-      return input["path"] ? [{ path: input["path"] }] : [];
-    case "list":
-      return input["path"] ? [{ path: input["path"] }] : [];
-    default:
-      return [];
-  }
-}
-function parseUri(uri) {
-  try {
-    if (uri.startsWith("file://")) {
-      const path = uri.slice(7);
-      const name = path.split("/").pop() || path;
-      return { type: "file", url: uri, filename: name, mime: "text/plain" };
-    }
-    if (uri.startsWith("zed://")) {
-      const url2 = new URL(uri);
-      const path = url2.searchParams.get("path");
-      if (path) {
-        const name = path.split("/").pop() || path;
-        return { type: "file", url: (0, import_url.pathToFileURL)(path).href, filename: name, mime: "text/plain" };
-      }
-    }
-    return { type: "text", text: uri };
-  } catch {
-    return { type: "text", text: uri };
-  }
-}
 
 // src/logger.ts
 var import_fs = require("fs");
@@ -20403,13 +20357,18 @@ function sysLog(action, data) {
   write("system", action, data);
 }
 function sanitize(obj, depth = 0) {
-  if (!obj || depth > 5) return obj;
+  if (!obj) return obj;
+  if (depth > 5) return { __truncated__: true, __depth__: depth };
   const result = {};
   for (const [key, val] of Object.entries(obj)) {
     if (typeof val === "string" && val.length > 2e3) {
       result[key] = val.slice(0, 2e3) + `... [${val.length} chars total]`;
     } else if (val && typeof val === "object" && !Array.isArray(val)) {
       result[key] = sanitize(val, depth + 1);
+    } else if (val && Array.isArray(val)) {
+      result[key] = val.map(
+        (item) => typeof item === "string" && item.length > 2e3 ? item.slice(0, 2e3) + `... [${item.length} chars total]` : item && typeof item === "object" ? sanitize(item, depth + 1) : item
+      );
     } else {
       result[key] = val;
     }
@@ -20417,8 +20376,171 @@ function sanitize(obj, depth = 0) {
   return result;
 }
 
+// src/utils.ts
+function toToolKind(toolName) {
+  const tool = toolName.toLowerCase();
+  switch (tool) {
+    case "bash":
+      return "execute";
+    case "webfetch":
+      return "fetch";
+    case "edit":
+    case "patch":
+    case "write":
+      return "edit";
+    case "grep":
+    case "glob":
+    case "context7_resolve_library_id":
+    case "context7_get_library_docs":
+      return "search";
+    case "list":
+    case "read":
+      return "read";
+    default:
+      return "other";
+  }
+}
+function toLocations(toolName, input) {
+  const tool = toolName.toLowerCase();
+  switch (tool) {
+    case "read":
+    case "edit":
+    case "write":
+      return input["filePath"] ? [{ path: input["filePath"] }] : [];
+    case "glob":
+    case "grep":
+      return input["path"] ? [{ path: input["path"] }] : [];
+    case "list":
+      return input["path"] ? [{ path: input["path"] }] : [];
+    default:
+      return [];
+  }
+}
+function parseUri(uri) {
+  try {
+    if (uri.startsWith("file://")) {
+      const path = uri.slice(7);
+      const name = path.split("/").pop() || path;
+      return { type: "file", url: uri, filename: name, mime: "text/plain" };
+    }
+    if (uri.startsWith("zed://")) {
+      const url2 = new URL(uri);
+      const path = url2.searchParams.get("path");
+      if (path) {
+        const name = path.split("/").pop() || path;
+        return { type: "file", url: (0, import_url.pathToFileURL)(path).href, filename: name, mime: "text/plain" };
+      }
+    }
+    return { type: "text", text: uri };
+  } catch {
+    return { type: "text", text: uri };
+  }
+}
+async function sendToClient(connection, params) {
+  const updateType = params.update.sessionUpdate;
+  const update = params.update;
+  acpOut(`sessionUpdate.${updateType}`, {
+    sessionId: params.sessionId.slice(0, 12),
+    ...updateType === "agent_message_chunk" || updateType === "agent_thought_chunk" ? { messageId: update.messageId?.slice(0, 12), delta: update.content?.text?.slice(0, 200) } : updateType === "tool_call" || updateType === "tool_call_update" ? { toolCallId: update.toolCallId, tool: update.title, kind: update.kind, status: update.status } : updateType === "session_info_update" ? { title: update.title, _meta: update._meta } : updateType === "usage_update" ? {
+      used: update.used,
+      size: update.size,
+      cost: update.cost,
+      _meta: update._meta,
+      error: update._meta?.error?.message
+    } : update._meta?.error ? { error: update._meta.error?.message ?? update._meta.error } : {}
+  });
+  return connection.sessionUpdate(params);
+}
+
+// src/acp-error.ts
+function inferCode(err) {
+  const name = typeof err.name === "string" ? err.name : "";
+  if (name === "AI_LoadAPIKeyError" || /auth/i.test(name)) return "auth_required";
+  if (/provider|api|model/i.test(name)) return "provider_error";
+  return "turn_error";
+}
+function extractTurnError(raw) {
+  return normalizeError(raw.responseError) ?? normalizeError(raw.messageError);
+}
+function normalizeError(err) {
+  if (err == null || err === false) return void 0;
+  if (typeof err === "string" && err.trim()) {
+    return { code: "turn_error", message: err.trim(), display: "inline" };
+  }
+  if (err instanceof Error && err.message.trim()) {
+    return {
+      code: inferCode({ name: err.name }),
+      message: err.message.trim(),
+      name: err.name,
+      cause: err.cause instanceof Error ? err.cause.message : void 0,
+      display: "inline"
+    };
+  }
+  if (typeof err === "object") {
+    const o = err;
+    const message = typeof o.message === "string" && o.message.trim() ? o.message.trim() : typeof o.error === "string" && o.error.trim() ? o.error.trim() : void 0;
+    if (!message) return void 0;
+    const cause = o.cause instanceof Error ? o.cause.message : typeof o.cause === "object" && o.cause !== null && typeof o.cause.message === "string" ? o.cause.message : void 0;
+    return {
+      code: inferCode(o),
+      message,
+      name: typeof o.name === "string" ? o.name : void 0,
+      cause,
+      display: "inline",
+      details: o
+    };
+  }
+  return void 0;
+}
+function subscriptionErrorFrom(err) {
+  const normalized = normalizeError(err);
+  if (normalized) {
+    return { ...normalized, code: "subscription_error", display: "banner" };
+  }
+  const message = err instanceof Error ? err.message : "OpenCode event stream disconnected";
+  return {
+    code: "subscription_error",
+    message: message.trim() || "OpenCode event stream disconnected",
+    display: "banner"
+  };
+}
+function stopReasonForTurn(error48, finish) {
+  if (!error48) return "end_turn";
+  if (finish === "refusal" || finish === "content_filter") return "refusal";
+  if (/refus/i.test(error48.message) || error48.code === "auth_required") return "refusal";
+  return "end_turn";
+}
+async function emitSessionError(connection, sessionId, payload, options) {
+  const display = payload.display ?? "inline";
+  const messageId = options?.messageId ?? payload.messageId ?? `err-${Date.now()}`;
+  if (display !== "silent") {
+    await sendToClient(connection, {
+      sessionId,
+      update: {
+        sessionUpdate: "agent_message_chunk",
+        messageId,
+        content: { type: "text", text: payload.message },
+        _meta: { error: payload }
+      }
+    }).catch(() => {
+    });
+  }
+  if (display === "banner" || display === "inline") {
+    await sendToClient(connection, {
+      sessionId,
+      update: {
+        sessionUpdate: "session_info_update",
+        _meta: { error: payload }
+      }
+    }).catch(() => {
+    });
+  }
+}
+
 // src/event-handler.ts
-var QUESTION_TIMEOUT_MS = 6e4;
+var SUBSCRIPTION_RETRY_MS = 3e3;
+var SUBSCRIPTION_ERROR_BROADCAST_MS = 3e4;
+var QUESTION_TIMEOUT_MS = 3e5;
 var permissionOptions = [
   { optionId: "once", kind: "allow_once", name: "Allow once" },
   { optionId: "always", kind: "allow_always", name: "Always allow" },
@@ -20438,60 +20560,69 @@ var EventHandler = class {
   partMetaIndex = /* @__PURE__ */ new Map();
   /** Track tool call counts per child session to detect completion. */
   childToolCounts = /* @__PURE__ */ new Map();
-  /** Cumulative code change stats per session, aggregated from session.diff SSE events. */
-  diffStats = /* @__PURE__ */ new Map();
-  /**
-   * Wrapper around connection.sessionUpdate that logs ALL outgoing traffic to the ACP client.
-   * Every call here corresponds to a real message sent over the wire.
-   */
-  async sendToClient(params) {
-    const updateType = params.update.sessionUpdate;
-    const update = params.update;
-    acpOut(`sessionUpdate.${updateType}`, {
-      sessionId: params.sessionId.slice(0, 12),
-      ...updateType === "agent_message_chunk" || updateType === "agent_thought_chunk" ? { messageId: update.messageId?.slice(0, 12), delta: update.content?.text?.slice(0, 200) } : updateType === "tool_call" || updateType === "tool_call_update" ? { toolCallId: update.toolCallId, tool: update.title, kind: update.kind, status: update.status } : updateType === "session_info_update" ? { title: update.title, _meta: update._meta } : updateType === "usage_update" ? { used: update.used, size: update.size, cost: update.cost, _meta: update._meta } : {}
-    });
-    return this.connection.sessionUpdate(params);
-  }
-  getDiffStats(sessionId) {
-    return this.diffStats.get(sessionId);
-  }
-  setDiffStats(sessionId, stats) {
-    if (this.diffStats.has(sessionId)) return;
-    this.diffStats.set(sessionId, stats);
-  }
+  /** Cumulative file diff stats per session, aggregated from session.diff SSE events. */
+  fileDiffStats = /* @__PURE__ */ new Map();
+  /** AI code change stats per session, keyed by sessionId → filePath → { additions, deletions }. */
+  aiCodeChangeStats = /* @__PURE__ */ new Map();
+  lastSubscriptionErrorBroadcastAt = 0;
+  turnTimeoutTracker;
   constructor(deps) {
     this.connection = deps.connection;
     this.sdk = deps.sdk;
     this.sessionManager = deps.sessionManager;
+    this.turnTimeoutTracker = deps.turnTimeoutTracker;
   }
   start() {
     if (this.started) return;
     this.started = true;
-    this.runSubscription().catch((err) => {
-      if (this.abort.signal.aborted) return;
-      console.error("[event-handler] subscription failed:", err);
-    });
+    this.turnTimeoutTracker?.start();
+    void this.runSubscription();
   }
   stop() {
     this.abort.abort();
+    this.turnTimeoutTracker?.stop();
   }
   async runSubscription() {
     while (true) {
       if (this.abort.signal.aborted) return;
-      const events = await this.sdk.global.event({
-        signal: this.abort.signal
-      });
-      for await (const event of events.stream) {
-        if (this.abort.signal.aborted) return;
-        const payload = event?.payload;
-        if (!payload) continue;
-        await this.handleEvent(payload).catch((err) => {
-          console.error("[event-handler] failed to handle event:", err);
+      try {
+        const events = await this.sdk.global.event({
+          signal: this.abort.signal
         });
+        for await (const event of events.stream) {
+          if (this.abort.signal.aborted) return;
+          const payload = event?.payload;
+          if (!payload) continue;
+          await this.handleEvent(payload).catch((err) => {
+            console.error("[event-handler] failed to handle event:", err);
+          });
+        }
+      } catch (err) {
+        if (this.abort.signal.aborted) return;
+        console.error("[event-handler] subscription failed:", err);
+        await this.broadcastSubscriptionError(err);
+        await new Promise((r) => setTimeout(r, SUBSCRIPTION_RETRY_MS));
       }
     }
   }
+  /** Notify all top-level sessions that the OpenCode SSE stream dropped. */
+  async broadcastSubscriptionError(err) {
+    const now = Date.now();
+    if (now - this.lastSubscriptionErrorBroadcastAt < SUBSCRIPTION_ERROR_BROADCAST_MS) {
+      return;
+    }
+    this.lastSubscriptionErrorBroadcastAt = now;
+    const payload = subscriptionErrorFrom(err);
+    sysLog("subscription.error", { message: payload.message });
+    const sessionIds = this.sessionManager.listTopLevelSessionIds();
+    if (sessionIds.length === 0) {
+      return;
+    }
+    for (const sessionId of sessionIds) {
+      await emitSessionError(this.connection, sessionId, payload).catch(() => {
+      });
+    }
+  }
   // ─── Resolve session for routing ────────────────────────────────
   /**
    * Resolve the sessionId to use for ACP routing.
@@ -20508,6 +20639,7 @@ var EventHandler = class {
     if (event.type === "server.heartbeat") {
       return;
     }
+    this.turnTimeoutTracker?.noteEvent(event);
     switch (event.type) {
       case "session.created":
       case "session.updated": {
@@ -20602,15 +20734,26 @@ var EventHandler = class {
       }
       case "question.asked": {
         const q = event.properties;
-        const resolved = this.resolveSession(q.sessionID);
-        if (!resolved) return;
+        ocEvent("question.asked", event);
+        let resolved = this.resolveSession(q.sessionID);
+        if (!resolved) {
+          console.warn(`[event-handler] question.asked: session ${q.sessionID} not in manager, attempting auto-register`);
+          try {
+            const sessionResp = await this.sdk.session.get({ sessionID: q.sessionID, directory: "" });
+            const fetchedSession = sessionResp.data;
+            if (fetchedSession?.parentID) {
+              this.sessionManager.registerDiscovered(fetchedSession.id, fetchedSession.parentID, fetchedSession.title);
+              resolved = this.resolveSession(q.sessionID);
+            } else if (fetchedSession) {
+              console.warn(`[event-handler] question.asked: top-level session ${q.sessionID} not registered; was agent.newSession called?`);
+            }
+          } catch (err) {
+            console.error(`[event-handler] question.asked: failed to fetch session ${q.sessionID}:`, err);
+          }
+          if (!resolved) return;
+        }
         const directory = resolved.cwd;
         const sessionId = resolved.sessionId;
-        ocEvent("question.asked", {
-          id: q.id,
-          sessionID: q.sessionID,
-          questions: q.questions.length
-        });
         const prev = this.questionQueues.get(q.sessionID) ?? Promise.resolve();
         const next = prev.then(async () => {
           const extResult = await Promise.race([
@@ -20630,7 +20773,7 @@ var EventHandler = class {
           if (!extResult || !extResult.answers) {
             await this.sdk.question.reject({ requestID: q.id, directory }).catch(() => {
             });
-            ocEvent("question.rejected", { requestID: q.id });
+            sysLog("question.rejected", { requestID: q.id });
             return;
           }
           const answers = extResult.answers;
@@ -20638,7 +20781,7 @@ var EventHandler = class {
             console.error("[event-handler] invalid answers shape from client:", JSON.stringify(answers));
             await this.sdk.question.reject({ requestID: q.id, directory }).catch(() => {
             });
-            ocEvent("question.rejected", {
+            sysLog("question.rejected", {
               requestID: q.id,
               reason: "invalid_answers"
             });
@@ -20649,7 +20792,7 @@ var EventHandler = class {
             directory,
             answers
           });
-          ocEvent("question.reply", { requestID: q.id, answers });
+          sysLog("question.reply", { requestID: q.id, answers });
         }).catch((err) => {
           console.error("[event-handler] question handling error:", err);
         }).finally(() => {
@@ -20673,7 +20816,7 @@ var EventHandler = class {
           await this.handleToolPart(resolved.sessionId, part);
         }
         if (part.type === "text" && typeof part.text === "string" && part.ignored === true) {
-          await this.sendToClient({
+          await sendToClient(this.connection, {
             sessionId: resolved.sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
@@ -20694,7 +20837,7 @@ var EventHandler = class {
         const partMeta = this.partMetaIndex.get(props.partID);
         if (!partMeta) return;
         if (partMeta.type === "text" && props.field === "text" && partMeta.ignored !== true) {
-          await this.sendToClient({
+          await sendToClient(this.connection, {
             sessionId,
             update: {
               sessionUpdate: "agent_message_chunk",
@@ -20706,7 +20849,7 @@ var EventHandler = class {
           return;
         }
         if (partMeta.type === "reasoning" && props.field === "text") {
-          await this.sendToClient({
+          await sendToClient(this.connection, {
             sessionId,
             update: {
               sessionUpdate: "agent_thought_chunk",
@@ -20731,7 +20874,7 @@ var EventHandler = class {
           additions += d.additions;
           deletions += d.deletions;
         }
-        this.diffStats.set(resolved.sessionId, { additions, deletions, files: diff.length });
+        this.fileDiffStats.set(resolved.sessionId, { additions, deletions, files: diff.length });
         return;
       }
       default: {
@@ -20747,7 +20890,7 @@ var EventHandler = class {
    * and _meta containing structured metadata about the subagent.
    */
   async announceChildSession(childSessionId, parentSessionId, title, meta3) {
-    await this.sendToClient({
+    await sendToClient(this.connection, {
       sessionId: childSessionId,
       update: {
         sessionUpdate: "session_info_update",
@@ -20767,6 +20910,7 @@ var EventHandler = class {
   async handleToolPart(sessionId, part) {
     if (!this.toolStarts.has(part.callID)) {
       this.toolStarts.add(part.callID);
+      this.turnTimeoutTracker?.onToolCallStart(sessionId);
       const session = this.sessionManager.tryGet(sessionId);
       if (session?.parentID) {
         const tracker = this.childToolCounts.get(sessionId);
@@ -20780,7 +20924,7 @@ var EventHandler = class {
           });
         }
       }
-      await this.sendToClient({
+      await sendToClient(this.connection, {
         sessionId,
         update: {
           sessionUpdate: "tool_call",
@@ -20812,7 +20956,7 @@ var EventHandler = class {
             content: { type: "text", text: output }
           });
         }
-        await this.sendToClient({
+        await sendToClient(this.connection, {
           sessionId,
           update: {
             sessionUpdate: "tool_call_update",
@@ -20829,15 +20973,18 @@ var EventHandler = class {
         return;
       }
       case "completed": {
-        this.toolStarts.delete(part.callID);
+        if (this.toolStarts.delete(part.callID)) {
+          this.turnTimeoutTracker?.onToolCallEnd(sessionId);
+        }
         this.bashSnapshots.delete(part.callID);
         if (part.tool === "task" && part.state.metadata) {
           const childSessionId = typeof part.state.metadata["sessionId"] === "string" ? part.state.metadata["sessionId"] : void 0;
           if (childSessionId && this.sessionManager.tryGet(childSessionId)) {
             const tracker = this.childToolCounts.get(childSessionId);
-            await this.sendChildSessionCompleted(
+            await this.sendChildSessionFinished(
               childSessionId,
               sessionId,
+              "completed",
               tracker?.completed ?? 0,
               tracker ? Date.now() - tracker.startTime : 0
             ).catch(() => {
@@ -20865,12 +21012,13 @@ var EventHandler = class {
           const oldText = typeof input["oldString"] === "string" ? input["oldString"] : "";
           const newText = typeof input["newString"] === "string" ? input["newString"] : typeof input["content"] === "string" ? input["content"] : "";
           content.push({ type: "diff", path: filePath, oldText, newText });
+          this.accumulateAICodeChangeStats(sessionId, part);
         }
         if (part.tool === "todowrite") {
           try {
             const todos = JSON.parse(part.state.output);
             if (Array.isArray(todos)) {
-              await this.sendToClient({
+              await sendToClient(this.connection, {
                 sessionId,
                 update: {
                   sessionUpdate: "plan",
@@ -20886,7 +21034,7 @@ var EventHandler = class {
           } catch {
           }
         }
-        await this.sendToClient({
+        await sendToClient(this.connection, {
           sessionId,
           update: {
             sessionUpdate: "tool_call_update",
@@ -20906,9 +21054,33 @@ var EventHandler = class {
         return;
       }
       case "error": {
-        this.toolStarts.delete(part.callID);
+        if (this.toolStarts.delete(part.callID)) {
+          this.turnTimeoutTracker?.onToolCallEnd(sessionId);
+        }
         this.bashSnapshots.delete(part.callID);
-        await this.sendToClient({
+        if (part.tool === "task" && part.state.metadata) {
+          const childSessionId = typeof part.state.metadata["sessionId"] === "string" ? part.state.metadata["sessionId"] : void 0;
+          if (childSessionId && this.sessionManager.tryGet(childSessionId)) {
+            const tracker = this.childToolCounts.get(childSessionId);
+            const errText = typeof part.state.error === "string" && part.state.error.trim() ? part.state.error.trim() : "Sub-agent task failed";
+            const payload = {
+              code: "session_error",
+              message: errText,
+              display: "inline"
+            };
+            await this.sendChildSessionFinished(
+              childSessionId,
+              sessionId,
+              "failed",
+              tracker?.completed ?? 0,
+              tracker ? Date.now() - tracker.startTime : 0,
+              payload
+            ).catch(() => {
+            });
+            this.childToolCounts.delete(childSessionId);
+          }
+        }
+        await sendToClient(this.connection, {
           sessionId,
           update: {
             sessionUpdate: "tool_call_update",
@@ -20935,21 +21107,20 @@ var EventHandler = class {
     }
   }
   /**
-   * Notify the ACP client that a child session has completed.
+   * Notify the ACP client that a child session finished (success or failure).
    */
-  async sendChildSessionCompleted(childSessionId, parentSessionId, toolCallCount, durationMs) {
+  async sendChildSessionFinished(childSessionId, parentSessionId, status, toolCallCount, durationMs, error48) {
     const child = this.sessionManager.tryGet(childSessionId);
     const title = child?.title ?? "Subagent";
     const agentMatch = title.match(/@(\w+)\s+subagent/);
     const agentType = agentMatch?.[1];
     const description = title.replace(/\s*\(@\w+\s+subagent\)\s*$/, "");
-    const childDiffStats = this.diffStats.get(childSessionId);
-    await this.sendToClient({
+    await sendToClient(this.connection, {
       sessionId: childSessionId,
       update: {
         sessionUpdate: "session_info_update",
         title,
-        status: "completed",
+        status,
         _meta: {
           parentSessionId,
           isSubagent: true,
@@ -20957,7 +21128,7 @@ var EventHandler = class {
           durationMs,
           ...agentType && { agentType },
           ...description && { description },
-          ...childDiffStats && { codeChange: childDiffStats }
+          ...error48 && { error: error48 }
         }
       }
     });
@@ -20969,6 +21140,44 @@ var EventHandler = class {
     if (typeof output !== "string") return;
     return output;
   }
+  // ─── Statistics Accessors ────────────────────────────────────────
+  getFileDiffStats(sessionId) {
+    return this.fileDiffStats.get(sessionId);
+  }
+  setFileDiffStats(sessionId, stats) {
+    if (this.fileDiffStats.has(sessionId)) return;
+    this.fileDiffStats.set(sessionId, stats);
+  }
+  /**
+   * Accumulate AI code change stats from a completed tool part's metadata.
+   * The harmony-code plugin injects `metadata.aiCodeChange` for edit/write tools.
+   */
+  accumulateAICodeChangeStats(sessionId, part) {
+    if (part.state.status !== "completed") return;
+    const meta3 = part.state.metadata ?? {};
+    const aiCodeChange = meta3["aiCodeChange"];
+    if (!aiCodeChange || aiCodeChange.additions === 0 && aiCodeChange.deletions === 0) return;
+    const fileMap = this.aiCodeChangeStats.get(sessionId) ?? /* @__PURE__ */ new Map();
+    const existing = fileMap.get(aiCodeChange.file) ?? { additions: 0, deletions: 0 };
+    fileMap.set(aiCodeChange.file, {
+      additions: existing.additions + aiCodeChange.additions,
+      deletions: existing.deletions + aiCodeChange.deletions
+    });
+    if (!this.aiCodeChangeStats.has(sessionId)) {
+      this.aiCodeChangeStats.set(sessionId, fileMap);
+    }
+  }
+  getAICodeChangeStats(sessionId) {
+    const fileMap = this.aiCodeChangeStats.get(sessionId);
+    if (!fileMap || fileMap.size === 0) return void 0;
+    let additions = 0;
+    let deletions = 0;
+    for (const stats of fileMap.values()) {
+      additions += stats.additions;
+      deletions += stats.deletions;
+    }
+    return { additions, deletions, files: fileMap.size };
+  }
 };
 function simpleHash(str) {
   let hash2 = 0;
@@ -21060,6 +21269,140 @@ var AuthProviderManager = class {
   }
 };
 
+// src/turn-timeout-tracker.ts
+var TURN_IDLE_LOG_MS = 9e4;
+var TURN_IDLE_LOG_MS_WITH_TOOL = 10 * 6e4;
+var TURN_IDLE_CHECK_INTERVAL_MS = 3e4;
+function parsePositiveIntEnv(name, fallback) {
+  const raw = process.env[name];
+  if (!raw) return fallback;
+  const n = Number.parseInt(raw, 10);
+  return Number.isFinite(n) && n > 0 ? n : fallback;
+}
+function turnIdleLogThresholdMs(hasActiveTool) {
+  const base = parsePositiveIntEnv("HARMONY_ACP_TURN_IDLE_LOG_MS", TURN_IDLE_LOG_MS);
+  const withTool = parsePositiveIntEnv("HARMONY_ACP_TURN_IDLE_LOG_MS_WITH_TOOL", TURN_IDLE_LOG_MS_WITH_TOOL);
+  return hasActiveTool ? withTool : base;
+}
+function sessionIdFromEvent(event) {
+  const props = event.properties;
+  if (!props) return void 0;
+  switch (event.type) {
+    case "message.part.updated": {
+      const part = props.part;
+      return typeof part?.sessionID === "string" ? part.sessionID : void 0;
+    }
+    case "message.part.delta":
+      return typeof props.sessionID === "string" ? props.sessionID : void 0;
+    case "session.diff":
+    case "session.updated":
+    case "session.created":
+      return typeof props.sessionID === "string" ? props.sessionID : typeof props.info?.id === "string" ? props.info.id : void 0;
+    case "permission.asked": {
+      const permission = props;
+      return typeof permission.sessionID === "string" ? permission.sessionID : void 0;
+    }
+  }
+  return void 0;
+}
+var TurnTimeoutTracker = class {
+  constructor(sessionManager) {
+    this.sessionManager = sessionManager;
+  }
+  turns = /* @__PURE__ */ new Map();
+  timer;
+  start() {
+    if (this.timer) return;
+    const interval = parsePositiveIntEnv(
+      "HARMONY_ACP_TURN_IDLE_CHECK_MS",
+      TURN_IDLE_CHECK_INTERVAL_MS
+    );
+    this.timer = setInterval(() => this.checkIdleTurns(), interval);
+  }
+  stop() {
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = void 0;
+    }
+  }
+  rootSessionId(sessionId) {
+    return this.sessionManager.findRootSession(sessionId)?.id ?? sessionId;
+  }
+  onPromptStart(sessionId, meta3) {
+    const root = this.rootSessionId(sessionId);
+    const now = Date.now();
+    this.turns.set(root, {
+      rootSessionId: root,
+      promptStartedAt: now,
+      lastActivityAt: now,
+      activeToolCalls: 0,
+      idleLogged: false,
+      model: meta3?.model
+    });
+    sysLog("turn.prompt_start", { sessionId: root, model: meta3?.model });
+  }
+  onPromptEnd(sessionId) {
+    const root = this.rootSessionId(sessionId);
+    const state = this.turns.get(root);
+    if (state) {
+      sysLog("turn.prompt_end", {
+        sessionId: root,
+        durationMs: Date.now() - state.promptStartedAt
+      });
+    }
+    this.turns.delete(root);
+  }
+  /** SSE / OpenCode activity for a session (child events bump the root turn). */
+  noteActivity(sessionId) {
+    const root = this.rootSessionId(sessionId);
+    const state = this.turns.get(root);
+    if (!state) return;
+    state.lastActivityAt = Date.now();
+    state.idleLogged = false;
+  }
+  onToolCallStart(sessionId) {
+    const root = this.rootSessionId(sessionId);
+    const state = this.turns.get(root);
+    if (!state) return;
+    state.activeToolCalls++;
+    state.lastActivityAt = Date.now();
+    state.idleLogged = false;
+  }
+  onToolCallEnd(sessionId) {
+    const root = this.rootSessionId(sessionId);
+    const state = this.turns.get(root);
+    if (!state) return;
+    state.activeToolCalls = Math.max(0, state.activeToolCalls - 1);
+    state.lastActivityAt = Date.now();
+    state.idleLogged = false;
+  }
+  noteEvent(event) {
+    const sid = sessionIdFromEvent(event);
+    if (sid) {
+      this.noteActivity(sid);
+    }
+  }
+  checkIdleTurns() {
+    const now = Date.now();
+    for (const state of this.turns.values()) {
+      const idleMs = now - state.lastActivityAt;
+      const thresholdMs = turnIdleLogThresholdMs(state.activeToolCalls > 0);
+      if (idleMs < thresholdMs || state.idleLogged) {
+        continue;
+      }
+      state.idleLogged = true;
+      sysLog("turn.idle_timeout", {
+        sessionId: state.rootSessionId,
+        idleMs,
+        thresholdMs,
+        promptAgeMs: now - state.promptStartedAt,
+        activeToolCalls: state.activeToolCalls,
+        model: state.model
+      });
+    }
+  }
+};
+
 // src/agent.ts
 function isApiKeyError(err) {
   return err instanceof Error && err.name === "AI_LoadAPIKeyError";
@@ -21072,44 +21415,22 @@ var Agent = class {
   eventHandler;
   authProvider;
   mcpManager;
-  /**
-   * Wrapper around connection.sessionUpdate that logs what's sent to the ACP client.
-   */
-  async sendToClient(params) {
-    const updateType = params.update.sessionUpdate;
-    const update = params.update;
-    acpOut(`sessionUpdate.${updateType}`, {
-      sessionId: params.sessionId.slice(0, 12),
-      ...updateType === "agent_message_chunk" || updateType === "agent_thought_chunk" ? {
-        messageId: update.messageId?.slice(0, 12),
-        delta: update.content?.text?.slice(0, 200)
-      } : updateType === "tool_call" || updateType === "tool_call_update" ? {
-        toolCallId: update.toolCallId,
-        tool: update.title,
-        kind: update.kind,
-        status: update.status
-      } : updateType === "usage_update" ? {
-        used: update.used,
-        size: update.size,
-        cost: update.cost,
-        _meta: update._meta
-      } : {}
-    });
-    return this.connection.sessionUpdate(params);
-  }
+  turnTimeoutTracker;
   constructor(config2) {
     this.config = config2;
     this.sdk = config2.sdk;
     this.sessionManager = new SessionManager(config2.sdk);
     this.authProvider = new AuthProviderManager(config2.sdk);
     this.mcpManager = new McpManager(config2.sdk);
+    this.turnTimeoutTracker = new TurnTimeoutTracker(this.sessionManager);
   }
   init(connection) {
     this.connection = connection;
     this.eventHandler = new EventHandler({
       connection,
       sdk: this.sdk,
-      sessionManager: this.sessionManager
+      sessionManager: this.sessionManager,
+      turnTimeoutTracker: this.turnTimeoutTracker
     });
     this.eventHandler.start();
   }
@@ -21317,13 +21638,14 @@ var Agent = class {
     }
   }
   async loadSession(params) {
+    acpIn("loadSession", { sessionId: params.sessionId, cwd: params.cwd });
     try {
       const directory = params.cwd;
       const sessionId = params.sessionId;
       const model = await this.defaultModel(directory);
       const { session } = await this.sessionManager.load(sessionId, params.cwd, params.mcpServers, model);
       if (session.summary) {
-        this.eventHandler.setDiffStats(sessionId, {
+        this.eventHandler.setFileDiffStats(sessionId, {
           additions: session.summary.additions,
           deletions: session.summary.deletions,
           files: session.summary.files
@@ -21364,6 +21686,7 @@ var Agent = class {
     }
   }
   async listSessions(params) {
+    acpIn("listSessions", { cwd: params.cwd, cursor: params.cursor });
     const limit = 100;
     const cursor = params.cursor ? Number(params.cursor) : void 0;
     const sessions = await this.sdk.session.list({ directory: params.cwd ?? void 0, roots: true }).then((x) => x.data ?? []);
@@ -21380,9 +21703,11 @@ var Agent = class {
     const next = filtered.length > limit && last ? String(last.time.updated) : void 0;
     const response = { sessions: entries };
     if (next) response.nextCursor = next;
+    acpOut("listSessions.response", { count: entries.length, hasNext: !!next });
     return response;
   }
   async unstable_forkSession(params) {
+    acpIn("forkSession", { sessionId: params.sessionId, cwd: params.cwd });
     try {
       const directory = params.cwd;
       const mcpServers = params.mcpServers ?? [];
@@ -21408,6 +21733,7 @@ var Agent = class {
     }
   }
   async unstable_resumeSession(params) {
+    acpIn("resumeSession", { sessionId: params.sessionId, cwd: params.cwd });
     try {
       const directory = params.cwd;
       const sessionId = params.sessionId;
@@ -21415,7 +21741,7 @@ var Agent = class {
       const model = await this.defaultModel(directory);
       const { session } = await this.sessionManager.load(sessionId, directory, mcpServers, model);
       if (session.summary) {
-        this.eventHandler.setDiffStats(sessionId, {
+        this.eventHandler.setFileDiffStats(sessionId, {
           additions: session.summary.additions,
           deletions: session.summary.deletions,
           files: session.summary.files
@@ -21447,92 +21773,114 @@ var Agent = class {
     const agent = session.modeId ?? await this.defaultAgent(directory);
     const parts = this.convertPromptParts(params.prompt);
     const cmd = this.parseCommand(parts);
-    ocCall("session.prompt", { sessionID, agent, model: `${model.providerID}/${model.modelID}` });
-    if (!cmd) {
-      const response2 = await this.sdk.session.prompt({
+    const modelLabel = `${model.providerID}/${model.modelID}`;
+    ocCall("session.prompt", { sessionID, agent, model: modelLabel });
+    this.turnTimeoutTracker.onPromptStart(sessionID, { model: modelLabel });
+    try {
+      if (!cmd) {
+        const response2 = await this.sdk.session.prompt({
+          sessionID,
+          model: {
+            providerID: model.providerID,
+            modelID: model.modelID
+          },
+          variant: this.sessionManager.getVariant(sessionID),
+          parts,
+          agent,
+          directory
+        });
+        const rawErr2 = response2.error;
+        ocCall("session.prompt.raw", {
+          hasData: !!response2.data,
+          hasError: !!rawErr2,
+          errorName: rawErr2?.name,
+          errorMessage: rawErr2?.message,
+          errorCode: rawErr2?.code ?? rawErr2?.cause?.code,
+          errorCauseName: rawErr2?.cause?.name,
+          errorCauseMessage: rawErr2?.cause?.message
+        });
+        const msg2 = response2.data?.info;
+        return await this.finishPromptTurn(sessionID, directory, { rawErr: rawErr2, msg: msg2 });
+      }
+      const command = await this.sdk.command.list({ directory }).then((x) => x.data?.find((c) => c.name === cmd.name));
+      if (command) {
+        const response2 = await this.sdk.session.command({
+          sessionID,
+          command: command.name,
+          arguments: cmd.args,
+          model: modelLabel,
+          agent,
+          directory
+        });
+        const rawErr2 = response2.error;
+        const msg2 = response2.data?.info;
+        return await this.finishPromptTurn(sessionID, directory, { rawErr: rawErr2, msg: msg2 });
+      }
+      if (cmd.name === "compact") {
+        await this.sdk.session.summarize(
+          {
+            sessionID,
+            directory,
+            providerID: model.providerID,
+            modelID: model.modelID
+          },
+          { throwOnError: true }
+        ).catch(() => {
+        });
+        await this.sendUsageUpdate(sessionID, directory);
+        return {
+          stopReason: "end_turn",
+          _meta: {}
+        };
+      }
+      const response = await this.sdk.session.prompt({
         sessionID,
-        model: {
-          providerID: model.providerID,
-          modelID: model.modelID
-        },
+        model: { providerID: model.providerID, modelID: model.modelID },
         variant: this.sessionManager.getVariant(sessionID),
         parts,
         agent,
         directory
       });
-      const msg2 = response2.data?.info;
-      ocCall("session.prompt.response", {
-        messageId: msg2?.id,
-        role: msg2?.role,
-        model: msg2 ? `${msg2.providerID}/${msg2.modelID}` : void 0,
-        tokens: msg2?.tokens,
-        cost: msg2?.cost,
-        finish: msg2?.finish,
-        error: msg2?.error
-      });
-      await this.logMessageContent(sessionID, msg2?.id, directory);
-      await this.sendUsageUpdate(sessionID, directory);
-      acpOut("prompt.response", {
-        stopReason: "end_turn",
-        usage: msg2 ? this.buildUsage(msg2) : void 0
-      });
-      return {
-        stopReason: "end_turn",
-        usage: msg2 ? this.buildUsage(msg2) : void 0,
-        _meta: {}
-      };
-    }
-    const command = await this.sdk.command.list({ directory }).then((x) => x.data?.find((c) => c.name === cmd.name));
-    if (command) {
-      const response2 = await this.sdk.session.command({
-        sessionID,
-        command: command.name,
-        arguments: cmd.args,
-        model: model.providerID + "/" + model.modelID,
-        agent,
-        directory
-      });
-      const msg2 = response2.data?.info;
-      await this.logMessageContent(sessionID, msg2?.id, directory);
-      await this.sendUsageUpdate(sessionID, directory);
-      return {
-        stopReason: "end_turn",
-        usage: msg2 ? this.buildUsage(msg2) : void 0,
-        _meta: {}
-      };
-    }
-    if (cmd.name === "compact") {
-      await this.sdk.session.summarize(
-        {
-          sessionID,
-          directory,
-          providerID: model.providerID,
-          modelID: model.modelID
-        },
-        { throwOnError: true }
-      ).catch(() => {
-      });
-      await this.sendUsageUpdate(sessionID, directory);
-      return {
-        stopReason: "end_turn",
-        _meta: {}
-      };
+      const rawErr = response.error;
+      const msg = response.data?.info;
+      return await this.finishPromptTurn(sessionID, directory, { rawErr, msg });
+    } finally {
+      this.turnTimeoutTracker.onPromptEnd(sessionID);
     }
-    const response = await this.sdk.session.prompt({
-      sessionID,
-      model: { providerID: model.providerID, modelID: model.modelID },
-      variant: this.sessionManager.getVariant(sessionID),
-      parts,
-      agent,
-      directory
+  }
+  /**
+   * Complete a prompt turn: emit streaming errors, usage, and PromptResponse._meta.error.
+   */
+  async finishPromptTurn(sessionID, directory, opts) {
+    const turnError = extractTurnError({
+      responseError: opts.rawErr,
+      messageError: opts.msg?.error
+    });
+    ocCall("session.prompt.response", {
+      messageId: opts.msg?.id,
+      role: opts.msg?.role,
+      model: opts.msg ? `${opts.msg.providerID}/${opts.msg.modelID}` : void 0,
+      tokens: opts.msg?.tokens,
+      cost: opts.msg?.cost,
+      finish: opts.msg?.finish,
+      error: turnError?.message
+    });
+    if (turnError) {
+      await emitSessionError(this.connection, sessionID, turnError, { messageId: opts.msg?.id });
+    }
+    await this.logMessageContent(sessionID, opts.msg?.id, directory);
+    await this.sendUsageUpdate(sessionID, directory, turnError);
+    const stopReason = stopReasonForTurn(turnError, opts.msg?.finish);
+    const usage = opts.msg ? this.buildUsage(opts.msg) : void 0;
+    acpOut("prompt.response", {
+      stopReason,
+      usage,
+      error: turnError?.message
     });
-    const msg = response.data?.info;
-    await this.logMessageContent(sessionID, msg?.id, directory);
-    await this.sendUsageUpdate(sessionID, directory);
     return {
-      stopReason: "end_turn",
-      usage: msg ? this.buildUsage(msg) : void 0,
-      _meta: {}
+      stopReason,
+      usage,
+      _meta: turnError ? { error: turnError } : {}
     };
   }
   async cancel(params) {
@@ -21543,9 +21891,11 @@ var Agent = class {
       sessionID: params.sessionId,
       directory: session.cwd
     });
+    this.turnTimeoutTracker.onPromptEnd(params.sessionId);
   }
   // ─── Configuration ────────────────────────────────────────────────
   async setSessionMode(params) {
+    acpIn("setSessionMode", { sessionId: params.sessionId, modeId: params.modeId });
     const session = this.sessionManager.get(params.sessionId);
     const agents = await this.sdk.app.agents({ directory: session.cwd }).then((x) => x.data ?? []).catch(() => []);
     const availableModes = agents.filter((a) => a.mode !== "subagent" && !a.hidden);
@@ -21555,6 +21905,7 @@ var Agent = class {
     this.sessionManager.setMode(params.sessionId, params.modeId);
   }
   async unstable_setSessionModel(params) {
+    acpIn("setSessionModel", { sessionId: params.sessionId, modelId: params.modelId });
     const session = this.sessionManager.get(params.sessionId);
     const providers = await this.sdk.config.providers({ directory: session.cwd }).then((x) => x.data?.providers ?? []).catch(() => []);
     const selection = parseModelSelection(params.modelId, providers);
@@ -21568,6 +21919,7 @@ var Agent = class {
     };
   }
   async setSessionConfigOption(params) {
+    acpIn("setSessionConfigOption", { sessionId: params.sessionId, configId: params.configId, value: params.value });
     const session = this.sessionManager.get(params.sessionId);
     const providers = await this.sdk.config.providers({ directory: session.cwd }).then((x) => x.data?.providers ?? []).catch(() => []);
     const sortedProviders = [...providers].sort(
@@ -21653,7 +22005,7 @@ var Agent = class {
     if (!childMessages?.length) return;
     const title = `Subagent (${childSessionId.slice(0, 8)})`;
     this.sessionManager.registerDiscovered(childSessionId, parentSessionId, title);
-    await this.sendToClient({
+    await sendToClient(this.connection, {
       sessionId: childSessionId,
       update: {
         sessionUpdate: "session_info_update",
@@ -21770,7 +22122,7 @@ var Agent = class {
       availableCommands.push({ name: "compact", description: "compact the session" });
     }
     setTimeout(() => {
-      this.sendToClient({
+      sendToClient(this.connection, {
         sessionId: params.sessionId,
         update: {
           sessionUpdate: "available_commands_update",
@@ -21823,7 +22175,7 @@ var Agent = class {
         await this.replayToolPart(sessionId, part);
       } else if (part.type === "text" && part.text) {
         const audience = part.synthetic ? ["assistant"] : part.ignored ? ["user"] : void 0;
-        await this.sendToClient({
+        await sendToClient(this.connection, {
           sessionId,
           update: {
             sessionUpdate: messageChunk,
@@ -21841,7 +22193,7 @@ var Agent = class {
         const filename = part.filename ?? "file";
         const mime = part.mime || "application/octet-stream";
         if (url2.startsWith("file://")) {
-          await this.sendToClient({
+          await sendToClient(this.connection, {
             sessionId,
             update: {
               sessionUpdate: messageChunk,
@@ -21856,7 +22208,7 @@ var Agent = class {
           const base64Data = base64Match?.[2] ?? "";
           const effectiveMime = dataMime || mime;
           if (effectiveMime.startsWith("image/")) {
-            await this.sendToClient({
+            await sendToClient(this.connection, {
               sessionId,
               update: {
                 sessionUpdate: messageChunk,
@@ -21878,7 +22230,7 @@ var Agent = class {
               mimeType: effectiveMime,
               text: Buffer.from(base64Data, "base64").toString("utf-8")
             } : { uri: fileUri, mimeType: effectiveMime, blob: base64Data };
-            await this.sendToClient({
+            await sendToClient(this.connection, {
               sessionId,
               update: {
                 sessionUpdate: messageChunk,
@@ -21890,7 +22242,7 @@ var Agent = class {
           }
         }
       } else if (part.type === "reasoning" && part.text) {
-        await this.sendToClient({
+        await sendToClient(this.connection, {
           sessionId,
           update: {
             sessionUpdate: "agent_thought_chunk",
@@ -21903,7 +22255,7 @@ var Agent = class {
     }
   }
   async replayToolPart(sessionId, part) {
-    await this.sendToClient({
+    await sendToClient(this.connection, {
       sessionId,
       update: {
         sessionUpdate: "tool_call",
@@ -21928,12 +22280,13 @@ var Agent = class {
             oldText: typeof input["oldString"] === "string" ? input["oldString"] : "",
             newText: typeof input["newString"] === "string" ? input["newString"] : typeof input["content"] === "string" ? input["content"] : ""
           });
+          this.eventHandler.accumulateAICodeChangeStats(sessionId, part);
         }
         if (part.tool === "todowrite") {
           try {
             const todos = JSON.parse(part.state.output);
             if (Array.isArray(todos)) {
-              await this.sendToClient({
+              await sendToClient(this.connection, {
                 sessionId,
                 update: {
                   sessionUpdate: "plan",
@@ -21949,7 +22302,7 @@ var Agent = class {
           } catch {
           }
         }
-        await this.sendToClient({
+        await sendToClient(this.connection, {
           sessionId,
           update: {
             sessionUpdate: "tool_call_update",
@@ -21966,7 +22319,7 @@ var Agent = class {
         break;
       }
       case "error":
-        await this.sendToClient({
+        await sendToClient(this.connection, {
           sessionId,
           update: {
             sessionUpdate: "tool_call_update",
@@ -21983,7 +22336,7 @@ var Agent = class {
         break;
     }
   }
-  async sendUsageUpdate(sessionId, directory) {
+  async sendUsageUpdate(sessionId, directory, turnError) {
     const messages = await this.sdk.session.messages({ sessionID: sessionId, directory }).then((x) => x.data).catch(() => void 0);
     if (!messages) return;
     const assistantMessages = messages.filter(
@@ -22002,19 +22355,6 @@ var Agent = class {
         childCost += childMessages.filter((m) => m.info.role === "assistant").reduce((sum, m) => sum + (m.info.cost ?? 0), 0);
       }
     }
-    const stats = this.eventHandler.getDiffStats(sessionId);
-    let childStats;
-    for (const childId of children) {
-      const cs = this.eventHandler.getDiffStats(childId);
-      if (cs) {
-        childStats = childStats ? {
-          additions: childStats.additions + cs.additions,
-          deletions: childStats.deletions + cs.deletions,
-          files: childStats.files + cs.files
-        } : { ...cs };
-      }
-    }
-    const totalStats = stats ?? childStats;
     const providers = await this.sdk.config.providers({ directory }).then((x) => x.data?.providers ?? []).catch(() => []);
     const provider = providers.find((p) => p.id === msg.providerID);
     const model = provider?.models[msg.modelID];
@@ -22025,13 +22365,12 @@ var Agent = class {
       _meta.childCost = childCost;
       _meta.childSessionCount = children.length;
     }
-    if (totalStats) {
-      _meta.codeChange = totalStats;
+    this.aggregateFileDiffStats(sessionId, children, _meta);
+    this.aggregateAICodeChangeStats(sessionId, children, _meta);
+    if (turnError) {
+      _meta.error = turnError;
     }
-    if (childStats) {
-      _meta.childCodeChange = childStats;
-    }
-    await this.sendToClient({
+    await sendToClient(this.connection, {
       sessionId,
       update: {
         sessionUpdate: "usage_update",
@@ -22043,6 +22382,56 @@ var Agent = class {
     }).catch(() => {
     });
   }
+  /**
+   * Aggregate file diff stats (git-based) for parent + child sessions into _meta.
+   * 主 session 的 session.diff 已包含子任务的变更数据，直接使用，不累加子 session。
+   */
+  aggregateFileDiffStats(sessionId, children, _meta) {
+    const stats = this.eventHandler.getFileDiffStats(sessionId);
+    let childFileDiffStats;
+    for (const childId of children) {
+      const cs = this.eventHandler.getFileDiffStats(childId);
+      if (cs) {
+        childFileDiffStats = childFileDiffStats ? {
+          additions: childFileDiffStats.additions + cs.additions,
+          deletions: childFileDiffStats.deletions + cs.deletions,
+          files: childFileDiffStats.files + cs.files
+        } : { ...cs };
+      }
+    }
+    const totalFileDiffStats = stats ?? childFileDiffStats;
+    if (totalFileDiffStats) {
+      _meta.fileDiffStats = totalFileDiffStats;
+    }
+    if (childFileDiffStats) {
+      _meta.childFileDiffStats = childFileDiffStats;
+    }
+  }
+  /**
+   * Aggregate AI code change stats (tool-based) for parent + child sessions into _meta.
+   */
+  aggregateAICodeChangeStats(sessionId, children, _meta) {
+    const parentStats = this.eventHandler.getAICodeChangeStats(sessionId);
+    let childAICodeChangeStats;
+    for (const childId of children) {
+      const cs = this.eventHandler.getAICodeChangeStats(childId);
+      if (cs) {
+        childAICodeChangeStats = childAICodeChangeStats ? {
+          additions: childAICodeChangeStats.additions + cs.additions,
+          deletions: childAICodeChangeStats.deletions + cs.deletions,
+          files: childAICodeChangeStats.files + cs.files
+        } : { ...cs };
+      }
+    }
+    const totalAICodeChangeStats = parentStats ? childAICodeChangeStats ? {
+      additions: parentStats.additions + childAICodeChangeStats.additions,
+      deletions: parentStats.deletions + childAICodeChangeStats.deletions,
+      files: parentStats.files + childAICodeChangeStats.files
+    } : parentStats : childAICodeChangeStats;
+    if (totalAICodeChangeStats) {
+      _meta.aiCodeChange = totalAICodeChangeStats;
+    }
+  }
   convertPromptParts(parts) {
     const result = [];
     for (const part of parts) {
@@ -22124,13 +22513,15 @@ var Agent = class {
     }
   }
   buildUsage(msg) {
+    const tokens = msg.tokens;
+    if (!tokens) return void 0;
     return {
-      totalTokens: msg.tokens.input + msg.tokens.output + msg.tokens.reasoning + (msg.tokens.cache?.read ?? 0) + (msg.tokens.cache?.write ?? 0),
-      inputTokens: msg.tokens.input,
-      outputTokens: msg.tokens.output,
-      thoughtTokens: msg.tokens.reasoning || void 0,
-      cachedReadTokens: msg.tokens.cache?.read || void 0,
-      cachedWriteTokens: msg.tokens.cache?.write || void 0
+      totalTokens: tokens.input + tokens.output + tokens.reasoning + (tokens.cache?.read ?? 0) + (tokens.cache?.write ?? 0),
+      inputTokens: tokens.input,
+      outputTokens: tokens.output,
+      thoughtTokens: tokens.reasoning || void 0,
+      cachedReadTokens: tokens.cache?.read || void 0,
+      cachedWriteTokens: tokens.cache?.write || void 0
     };
   }
 };
@@ -22168,6 +22559,91 @@ function parseModelSelection(modelId, providers) {
 }
 
 // src/index.ts
+var nativeFetch = (input, init) => {
+  return new Promise((resolve, reject) => {
+    let url2;
+    let requestMethod;
+    let requestHeaders;
+    let requestBody = null;
+    if (typeof input === "string") {
+      url2 = new URL(input);
+    } else if (input instanceof URL) {
+      url2 = input;
+    } else {
+      url2 = new URL(input.url);
+      requestMethod = input.method;
+      requestHeaders = input.headers;
+      requestBody = input.body;
+    }
+    const method = (init?.method ?? requestMethod ?? "GET").toUpperCase();
+    const mergedHeaders = new Headers(init?.headers ?? requestHeaders ?? void 0);
+    const headerObj = {};
+    mergedHeaders.forEach((value, key) => {
+      headerObj[key] = value;
+    });
+    const body = init?.body !== void 0 ? init.body : requestBody;
+    const signal = init?.signal;
+    if (signal?.aborted) {
+      return reject(
+        signal.reason instanceof Error ? signal.reason : new DOMException("The operation was aborted.", "AbortError")
+      );
+    }
+    const mod = url2.protocol === "https:" ? https : http;
+    const req = mod.request(
+      url2,
+      {
+        method,
+        headers: headerObj
+        // Note: do NOT set `timeout` here. Leaving it unset means
+        // node:http will not apply any inactivity-based abort.
+      },
+      (res) => {
+        const respHeaders = new Headers();
+        for (const [k, v] of Object.entries(res.headers)) {
+          if (v == null) continue;
+          if (Array.isArray(v)) {
+            for (const item of v) respHeaders.append(k, item);
+          } else {
+            respHeaders.set(k, String(v));
+          }
+        }
+        const webStream = import_node_stream.Readable.toWeb(res);
+        resolve(
+          new Response(webStream, {
+            status: res.statusCode ?? 200,
+            statusText: res.statusMessage ?? "",
+            headers: respHeaders
+          })
+        );
+      }
+    );
+    req.on("error", reject);
+    if (signal) {
+      signal.addEventListener(
+        "abort",
+        () => {
+          req.destroy(
+            signal.reason instanceof Error ? signal.reason : new DOMException("The operation was aborted.", "AbortError")
+          );
+        },
+        { once: true }
+      );
+    }
+    if (body == null) {
+      req.end();
+    } else if (typeof body === "string") {
+      req.end(body);
+    } else if (body instanceof Uint8Array || Buffer.isBuffer(body)) {
+      req.end(body);
+    } else if (body instanceof URLSearchParams) {
+      req.end(body.toString());
+    } else if (typeof body.pipeTo === "function") {
+      import_node_stream.Readable.fromWeb(body).pipe(req);
+    } else {
+      req.end(String(body));
+    }
+  });
+};
 function parseArgs(args) {
   let server = "http://localhost:4096";
   let cwd = process.cwd();
@@ -22207,7 +22683,10 @@ async function main() {
   initLogger();
   if (log) setLogEnabled(true);
   sysLog("starting", { server, cwd });
-  const sdk = createOpencodeClient({ baseUrl: server });
+  const sdk = createOpencodeClient({
+    baseUrl: server,
+    fetch: nativeFetch
+  });
   try {
     await sdk.global.health();
     sysLog("server_connected");