@harmonyos-arkts/opencode-acp 0.0.8 → 0.0.10

package/dist/index.cjs

@@ -20422,9 +20422,15 @@ function sanitize(obj, depth = 0) {
     } 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
-      );
+      result[key] = val.map((item) => {
+        if (typeof item === "string" && item.length > 2e3) {
+          return item.slice(0, 2e3) + `... [${item.length} chars total]`;
+        }
+        if (item && typeof item === "object") {
+          return sanitize(item, depth + 1);
+        }
+        return item;
+      });
     } else {
       result[key] = val;
     }
@@ -20462,12 +20468,12 @@ function toLocations(toolName, input) {
     case "read":
     case "edit":
     case "write":
-      return input["filePath"] ? [{ path: input["filePath"] }] : [];
+      return input.filePath ? [{ path: input.filePath }] : [];
     case "glob":
     case "grep":
-      return input["path"] ? [{ path: input["path"] }] : [];
+      return input.path ? [{ path: input.path }] : [];
     case "list":
-      return input["path"] ? [{ path: input["path"] }] : [];
+      return input.path ? [{ path: input.path }] : [];
     default:
       return [];
   }
@@ -20492,18 +20498,30 @@ function parseUri(uri) {
     return { type: "text", text: uri };
   }
 }
+function buildUpdateLogPayload(updateType, update) {
+  if (updateType === "agent_message_chunk" || updateType === "agent_thought_chunk") {
+    return { messageId: update.messageId?.slice(0, 12), delta: update.content?.text?.slice(0, 200) };
+  }
+  if (updateType === "tool_call" || updateType === "tool_call_update") {
+    return { toolCallId: update.toolCallId, tool: update.title, kind: update.kind, status: update.status };
+  }
+  if (updateType === "session_info_update") {
+    return { title: update.title, _meta: update._meta };
+  }
+  if (updateType === "usage_update") {
+    return { used: update.used, size: update.size, cost: update.cost, _meta: update._meta, error: update._meta?.error?.message };
+  }
+  if (update._meta?.error) {
+    return { error: update._meta.error?.message ?? update._meta.error };
+  }
+  return {};
+}
 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 } : {}
+    ...buildUpdateLogPayload(updateType, update)
   });
   return connection.sessionUpdate(params);
 }
@@ -20534,9 +20552,19 @@ function normalizeError(err) {
   }
   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;
+    let message;
+    if (typeof o.message === "string" && o.message.trim()) {
+      message = o.message.trim();
+    } else if (typeof o.error === "string" && o.error.trim()) {
+      message = o.error.trim();
+    }
     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;
+    let cause;
+    if (o.cause instanceof Error) {
+      cause = o.cause.message;
+    } else if (typeof o.cause === "object" && o.cause !== null && typeof o.cause.message === "string") {
+      cause = o.cause.message;
+    }
     return {
       code: inferCode(o),
       message,
@@ -20621,11 +20649,13 @@ var EventHandler = class {
   aiCodeChangeStats = /* @__PURE__ */ new Map();
   lastSubscriptionErrorBroadcastAt = 0;
   turnTimeoutTracker;
+  cancelTurnTracker;
   constructor(deps) {
     this.connection = deps.connection;
     this.sdk = deps.sdk;
     this.sessionManager = deps.sessionManager;
     this.turnTimeoutTracker = deps.turnTimeoutTracker;
+    this.cancelTurnTracker = deps.cancelTurnTracker;
   }
   start() {
     if (this.started) return;
@@ -20689,6 +20719,10 @@ var EventHandler = class {
     if (!session) return void 0;
     return { sessionId: session.id, cwd: session.cwd };
   }
+  /** Drop streaming chunks while a cancelled turn is unwinding on the OpenCode server. */
+  shouldDropStreaming(sessionId) {
+    return this.cancelTurnTracker?.isCancelled(sessionId) ?? false;
+  }
   // ─── Event Handling ──────────────────────────────────────────────
   async handleEvent(event) {
     if (event.type === "server.heartbeat") {
@@ -20718,6 +20752,26 @@ var EventHandler = class {
         }
         return;
       }
+      case "session.status": {
+        ocEvent("session.status", event);
+        const props = event.properties;
+        const sessionID = props.sessionID;
+        if (!sessionID) return;
+        const resolved = this.resolveSession(sessionID);
+        if (!resolved) return;
+        await sendToClient(this.connection, {
+          sessionId: resolved.sessionId,
+          update: {
+            sessionUpdate: "session_info_update",
+            _meta: {
+              opencodeStatus: props.status?.type ?? "unknown",
+              opencodeStatusDetail: props.status
+            }
+          }
+        }).catch(() => {
+        });
+        return;
+      }
       case "permission.asked": {
         ocEvent("permission.asked", event);
         const permission = event.properties;
@@ -20757,8 +20811,8 @@ var EventHandler = class {
           }
           if (res.outcome.optionId !== "reject" && permission.permission === "edit") {
             const metadata = permission.metadata || {};
-            const filepath = typeof metadata["filepath"] === "string" ? metadata["filepath"] : "";
-            const diff = typeof metadata["diff"] === "string" ? metadata["diff"] : "";
+            const filepath = typeof metadata.filepath === "string" ? metadata.filepath : "";
+            const diff = typeof metadata.diff === "string" ? metadata.diff : "";
             if (filepath && diff) {
               const fileResult = await this.sdk.file.read({ path: filepath, directory }).then((x) => x.data).catch(() => void 0);
               const original = typeof fileResult?.content === "string" ? fileResult.content : "";
@@ -20865,7 +20919,7 @@ var EventHandler = class {
         if (part.type === "tool") {
           await this.handleToolPart(resolved.sessionId, part);
         }
-        if (part.type === "text" && typeof part.text === "string" && part.ignored === true) {
+        if (part.type === "text" && typeof part.text === "string" && part.ignored === true && !this.shouldDropStreaming(resolved.sessionId)) {
           await sendToClient(this.connection, {
             sessionId: resolved.sessionId,
             update: {
@@ -20884,6 +20938,7 @@ var EventHandler = class {
         const resolved = this.resolveSession(props.sessionID);
         if (!resolved) return;
         const sessionId = resolved.sessionId;
+        if (this.shouldDropStreaming(sessionId)) return;
         const partMeta = this.partMetaIndex.get(props.partID);
         if (!partMeta) return;
         if (partMeta.type === "text" && props.field === "text" && partMeta.ignored !== true) {
@@ -20927,9 +20982,8 @@ var EventHandler = class {
         this.fileDiffStats.set(resolved.sessionId, { additions, deletions, files: diff.length });
         return;
       }
-      default: {
+      default:
         return;
-      }
     }
   }
   // ─── Child Session Announcement ──────────────────────────────────
@@ -20958,7 +21012,9 @@ var EventHandler = class {
   }
   // ─── Tool Part Handling ──────────────────────────────────────────
   async handleToolPart(sessionId, part) {
+    const dropStreaming = this.shouldDropStreaming(sessionId);
     if (!this.toolStarts.has(part.callID)) {
+      if (dropStreaming) return;
       this.toolStarts.add(part.callID);
       this.turnTimeoutTracker?.onToolCallStart(sessionId);
       const session = this.sessionManager.tryGet(sessionId);
@@ -20993,6 +21049,7 @@ var EventHandler = class {
         this.bashSnapshots.delete(part.callID);
         return;
       case "running": {
+        if (dropStreaming) return;
         const output = this.bashOutput(part);
         const content = [];
         if (output) {
@@ -21028,7 +21085,7 @@ var EventHandler = class {
         }
         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;
+          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.sendChildSessionFinished(
@@ -21058,9 +21115,14 @@ var EventHandler = class {
         ];
         if (kind === "edit") {
           const input = part.state.input;
-          const filePath = typeof input["filePath"] === "string" ? input["filePath"] : "";
-          const oldText = typeof input["oldString"] === "string" ? input["oldString"] : "";
-          const newText = typeof input["newString"] === "string" ? input["newString"] : typeof input["content"] === "string" ? input["content"] : "";
+          const filePath = typeof input.filePath === "string" ? input.filePath : "";
+          const oldText = typeof input.oldString === "string" ? input.oldString : "";
+          let newText = "";
+          if (typeof input.newString === "string") {
+            newText = input.newString;
+          } else if (typeof input.content === "string") {
+            newText = input.content;
+          }
           content.push({ type: "diff", path: filePath, oldText, newText });
           this.accumulateAICodeChangeStats(sessionId, part);
         }
@@ -21109,7 +21171,7 @@ var EventHandler = class {
         }
         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;
+          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";
@@ -21154,6 +21216,8 @@ var EventHandler = class {
         });
         return;
       }
+      default:
+        return;
     }
   }
   /**
@@ -21186,7 +21250,7 @@ var EventHandler = class {
   bashOutput(part) {
     if (part.tool !== "bash") return;
     if (!("metadata" in part.state) || !part.state.metadata || typeof part.state.metadata !== "object") return;
-    const output = part.state.metadata["output"];
+    const output = part.state.metadata.output;
     if (typeof output !== "string") return;
     return output;
   }
@@ -21205,7 +21269,7 @@ var EventHandler = class {
   accumulateAICodeChangeStats(sessionId, part) {
     if (part.state.status !== "completed") return;
     const meta3 = part.state.metadata ?? {};
-    const aiCodeChange = meta3["aiCodeChange"];
+    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 };
@@ -21346,14 +21410,19 @@ function sessionIdFromEvent(event) {
       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 "session.created": {
+      if (typeof props.sessionID === "string") return props.sessionID;
+      const info = props.info;
+      if (typeof info?.id === "string") return info.id;
+      return void 0;
+    }
     case "permission.asked": {
       const permission = props;
       return typeof permission.sessionID === "string" ? permission.sessionID : void 0;
     }
+    default:
+      return void 0;
   }
-  return void 0;
 }
 var TurnTimeoutTracker = class {
   constructor(sessionManager) {
@@ -21453,6 +21522,28 @@ var TurnTimeoutTracker = class {
   }
 };
 
+// src/cancel-turn-tracker.ts
+var CancelTurnTracker = class {
+  cancelled = /* @__PURE__ */ new Set();
+  /** New prompt turn — allow streaming again for this session subtree. */
+  beginTurn(rootSessionId, relatedSessionIds = []) {
+    this.cancelled.delete(rootSessionId);
+    for (const id of relatedSessionIds) {
+      this.cancelled.delete(id);
+    }
+  }
+  /** User cancelled — drop streaming for root and related (child) sessions. */
+  markCancelled(rootSessionId, relatedSessionIds = []) {
+    this.cancelled.add(rootSessionId);
+    for (const id of relatedSessionIds) {
+      this.cancelled.add(id);
+    }
+  }
+  isCancelled(sessionId) {
+    return this.cancelled.has(sessionId);
+  }
+};
+
 // src/agent.ts
 function isApiKeyError(err) {
   return err instanceof Error && err.name === "AI_LoadAPIKeyError";
@@ -21466,6 +21557,7 @@ var Agent = class {
   authProvider;
   mcpManager;
   turnTimeoutTracker;
+  cancelTurnTracker = new CancelTurnTracker();
   constructor(config2) {
     this.config = config2;
     this.sdk = config2.sdk;
@@ -21480,7 +21572,8 @@ var Agent = class {
       connection,
       sdk: this.sdk,
       sessionManager: this.sessionManager,
-      turnTimeoutTracker: this.turnTimeoutTracker
+      turnTimeoutTracker: this.turnTimeoutTracker,
+      cancelTurnTracker: this.cancelTurnTracker
     });
     this.eventHandler.start();
   }
@@ -21825,6 +21918,7 @@ var Agent = class {
     const cmd = this.parseCommand(parts);
     const modelLabel = `${model.providerID}/${model.modelID}`;
     ocCall("session.prompt", { sessionID, agent, model: modelLabel });
+    this.cancelTurnTracker.beginTurn(sessionID, this.sessionManager.getRelatedSessions(sessionID));
     this.turnTimeoutTracker.onPromptStart(sessionID, { model: modelLabel });
     try {
       if (!cmd) {
@@ -21936,6 +22030,19 @@ var Agent = class {
   async cancel(params) {
     acpIn("cancel", { sessionId: params.sessionId });
     const session = this.sessionManager.get(params.sessionId);
+    const related = this.sessionManager.getRelatedSessions(params.sessionId);
+    this.cancelTurnTracker.markCancelled(params.sessionId, related);
+    await sendToClient(this.connection, {
+      sessionId: params.sessionId,
+      update: {
+        sessionUpdate: "session_info_update",
+        _meta: {
+          turnCancelled: true,
+          opencodeStatus: "idle"
+        }
+      }
+    }).catch(() => {
+    });
     ocCall("session.abort", { sessionID: params.sessionId });
     await this.sdk.session.abort({
       sessionID: params.sessionId,
@@ -21973,7 +22080,7 @@ var Agent = class {
     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(
-      (a, b) => a.name.toLowerCase() < b.name.toLowerCase() ? -1 : a.name.toLowerCase() > b.name.toLowerCase() ? 1 : 0
+      (a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase())
     );
     if (params.configId === "model") {
       if (typeof params.value !== "string") throw RequestError.invalidParams("model value must be a string");
@@ -22102,7 +22209,7 @@ var Agent = class {
     const model = await this.defaultModel(params.cwd);
     const providers = await this.sdk.config.providers({ directory: params.cwd }).then((x) => x.data?.providers ?? []).catch(() => []);
     const sortedProviders = [...providers].sort(
-      (a, b) => a.name.toLowerCase() < b.name.toLowerCase() ? -1 : a.name.toLowerCase() > b.name.toLowerCase() ? 1 : 0
+      (a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase())
     );
     const availableModels = sortedProviders.flatMap(
       (provider) => Object.values(provider.models).flatMap((modelInfo) => {
@@ -22224,7 +22331,12 @@ var Agent = class {
       if (part.type === "tool") {
         await this.replayToolPart(sessionId, part);
       } else if (part.type === "text" && part.text) {
-        const audience = part.synthetic ? ["assistant"] : part.ignored ? ["user"] : void 0;
+        let audience;
+        if (part.synthetic) {
+          audience = ["assistant"];
+        } else if (part.ignored) {
+          audience = ["user"];
+        }
         await sendToClient(this.connection, {
           sessionId,
           update: {
@@ -22324,11 +22436,17 @@ var Agent = class {
         const content = [{ type: "content", content: { type: "text", text: part.state.output } }];
         if (kind === "edit") {
           const input = part.state.input;
+          let newText = "";
+          if (typeof input.newString === "string") {
+            newText = input.newString;
+          } else if (typeof input.content === "string") {
+            newText = input.content;
+          }
           content.push({
             type: "diff",
-            path: typeof input["filePath"] === "string" ? input["filePath"] : "",
-            oldText: typeof input["oldString"] === "string" ? input["oldString"] : "",
-            newText: typeof input["newString"] === "string" ? input["newString"] : typeof input["content"] === "string" ? input["content"] : ""
+            path: typeof input.filePath === "string" ? input.filePath : "",
+            oldText: typeof input.oldString === "string" ? input.oldString : "",
+            newText
           });
           this.eventHandler.accumulateAICodeChangeStats(sessionId, part);
         }
@@ -22384,6 +22502,8 @@ var Agent = class {
         }).catch(() => {
         });
         break;
+      default:
+        break;
     }
   }
   async sendUsageUpdate(sessionId, directory, turnError) {
@@ -22473,11 +22593,18 @@ var Agent = class {
         } : { ...cs };
       }
     }
-    const totalAICodeChangeStats = parentStats ? childAICodeChangeStats ? {
-      additions: parentStats.additions + childAICodeChangeStats.additions,
-      deletions: parentStats.deletions + childAICodeChangeStats.deletions,
-      files: parentStats.files + childAICodeChangeStats.files
-    } : parentStats : childAICodeChangeStats;
+    let totalAICodeChangeStats;
+    if (parentStats && childAICodeChangeStats) {
+      totalAICodeChangeStats = {
+        additions: parentStats.additions + childAICodeChangeStats.additions,
+        deletions: parentStats.deletions + childAICodeChangeStats.deletions,
+        files: parentStats.files + childAICodeChangeStats.files
+      };
+    } else if (parentStats) {
+      totalAICodeChangeStats = parentStats;
+    } else {
+      totalAICodeChangeStats = childAICodeChangeStats;
+    }
     if (totalAICodeChangeStats) {
       _meta.aiCodeChange = totalAICodeChangeStats;
     }
@@ -22533,6 +22660,8 @@ var Agent = class {
           }
           break;
         }
+        default:
+          break;
       }
     }
     return result;