@harmonyos-arkts/opencode-acp 0.0.9 → 0.0.11

package/dist/index.cjs

@@ -20649,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;
@@ -20717,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") {
@@ -20746,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;
@@ -20893,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: {
@@ -20912,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) {
@@ -20985,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);
@@ -21020,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) {
@@ -21492,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";
@@ -21505,6 +21557,7 @@ var Agent = class {
   authProvider;
   mcpManager;
   turnTimeoutTracker;
+  cancelTurnTracker = new CancelTurnTracker();
   constructor(config2) {
     this.config = config2;
     this.sdk = config2.sdk;
@@ -21519,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();
   }
@@ -21864,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) {
@@ -21975,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,