@cydm/pie 2.7.3 → 2.7.5

package/dist/chunks/{chunk-MPTME6HX.js → chunk-MLRF72MK.js}

@@ -4,7 +4,7 @@ import {
   disposeModelTransports,
   streamSimple,
   validateToolArguments
-} from "./chunk-E5JQ5SVA.js";
+} from "./chunk-SUPAWIKP.js";
 
 // ../../packages/agent-core/src/agent-loop.ts
 function createLoopErrorMessage(error, config, signal) {
@@ -290,6 +290,7 @@ async function executeToolCalls(tools, assistantMessage, signal, stream, getStee
     } catch (e) {
       console.warn(`[AgentLoop] beforeToolCall hook failed for ${toolCall.name}:`, e);
     }
+    if (signal?.aborted) break;
     let result;
     let isError = false;
     let executionArgs = toolCall.arguments;
@@ -637,6 +638,8 @@ var Agent = class {
     return this.runningPrompt ?? Promise.resolve();
   }
   reset() {
+    this.abortController?.abort();
+    this.abortController = void 0;
     this.releaseTransport();
     this._state.messages = [];
     this._state.isStreaming = false;
@@ -660,6 +663,7 @@ var Agent = class {
    * Useful when resuming a session that was saved mid-processing.
    */
   resetProcessingState() {
+    this.abortController?.abort();
     this._state.isStreaming = false;
     this._state.streamMessage = null;
     this._state.pendingToolCalls = /* @__PURE__ */ new Set();
@@ -766,8 +770,10 @@ var Agent = class {
   async _runLoop(messages, options) {
     const model = this._state.model;
     if (!model) throw new Error("No model configured");
-    this.abortController = new AbortController();
-    bindToolCallerIdentity(this.abortController.signal, this.toolCallerIdentity);
+    const runController = new AbortController();
+    this.abortController = runController;
+    const ownsRun = () => this.abortController === runController;
+    bindToolCallerIdentity(runController.signal, this.toolCallerIdentity);
     this._state.isStreaming = true;
     this._state.streamMessage = null;
     this._state.error = void 0;
@@ -791,7 +797,7 @@ var Agent = class {
       getApiKey: this.getApiKey,
       hooks: this.hooks,
       getSteeringMessages: async () => {
-        if (options?.suppressSteeringPolls) {
+        if (!ownsRun() || options?.suppressSteeringPolls) {
           return [];
         }
         if (skipInitialSteeringPoll) {
@@ -801,7 +807,7 @@ var Agent = class {
         return this.dequeueSteeringMessages();
       },
       getFollowUpMessages: async () => {
-        if (options?.suppressFollowUpPolls) {
+        if (!ownsRun() || options?.suppressFollowUpPolls) {
           return [];
         }
         return this.dequeueFollowUpMessages();
@@ -809,8 +815,9 @@ var Agent = class {
     };
     let partial = null;
     try {
-      const stream = messages ? agentLoop(messages, context, config, this.abortController.signal, this.streamFn) : agentLoopContinue(context, config, this.abortController.signal, this.streamFn);
+      const stream = messages ? agentLoop(messages, context, config, runController.signal, this.streamFn) : agentLoopContinue(context, config, runController.signal, this.streamFn);
       for await (const event of stream) {
+        if (!ownsRun()) return;
         switch (event.type) {
           case "message_start":
             partial = event.message;
@@ -847,9 +854,9 @@ var Agent = class {
             this._state.streamMessage = null;
             break;
         }
-        this.emit(event);
+        this.emit(event, ownsRun);
       }
-      if (partial && partial.role === "assistant" && partial.content?.length > 0) {
+      if (ownsRun() && partial && partial.role === "assistant" && partial.content?.length > 0) {
         const onlyEmpty = !partial.content.some(
           (c) => c.type === "thinking" && c.thinking?.trim().length > 0 || c.type === "text" && c.text?.trim().length > 0 || c.type === "toolCall" && c.name?.trim().length > 0
         );
@@ -859,6 +866,7 @@ var Agent = class {
         }
       }
     } catch (err) {
+      if (!ownsRun()) return;
       const errorMsg = {
         role: "assistant",
         content: [{ type: "text", text: "" }],
@@ -879,19 +887,22 @@ var Agent = class {
       };
       this.appendMessage(errorMsg);
       this._state.error = err?.message || String(err);
-      this.emit({ type: "agent_end", messages: [errorMsg] });
+      this.emit({ type: "agent_end", messages: [errorMsg] }, ownsRun);
     } finally {
-      this._state.isStreaming = false;
-      this._state.streamMessage = null;
-      this._state.pendingToolCalls = /* @__PURE__ */ new Set();
-      this.abortController = void 0;
+      if (ownsRun()) {
+        this._state.isStreaming = false;
+        this._state.streamMessage = null;
+        this._state.pendingToolCalls = /* @__PURE__ */ new Set();
+        this.abortController = void 0;
+      }
     }
   }
   reportObserverError(kind, eventType, error) {
     console.warn(`[Agent] ${kind} failed while handling ${eventType}:`, error);
   }
-  emit(e) {
+  emit(e, ownsRun = () => true) {
     for (const listener of this.listeners) {
+      if (!ownsRun()) return;
       try {
         listener(e);
       } catch (error) {
@@ -899,13 +910,14 @@ var Agent = class {
       }
     }
     try {
-      this.emitDerivedSemanticEvents(e);
+      if (ownsRun()) this.emitDerivedSemanticEvents(e, ownsRun);
     } catch (error) {
       this.reportObserverError("derived semantic event", e.type, error);
     }
   }
-  emitSemantic(e) {
+  emitSemantic(e, ownsRun = () => true) {
     for (const listener of this.semanticListeners) {
+      if (!ownsRun()) return;
       try {
         listener(e);
       } catch (error) {
@@ -913,7 +925,8 @@ var Agent = class {
       }
     }
   }
-  updateStatusSnapshot(next) {
+  updateStatusSnapshot(next, ownsRun = () => true) {
+    if (!ownsRun()) return;
     const snapshot = {
       ...this.statusSnapshot,
       ...next
@@ -922,26 +935,32 @@ var Agent = class {
       return;
     }
     this.statusSnapshot = snapshot;
-    this.emitSemantic({ type: "status_snapshot_changed", snapshot: { ...snapshot } });
+    this.emitSemantic({ type: "status_snapshot_changed", snapshot: { ...snapshot } }, ownsRun);
   }
-  emitDerivedSemanticEvents(event) {
+  emitDerivedSemanticEvents(event, ownsRun) {
+    const publish = {
+      updateStatusSnapshot: (next) => this.updateStatusSnapshot(next, ownsRun),
+      emitSemantic: (event2) => {
+        if (ownsRun()) this.emitSemantic(event2, ownsRun);
+      }
+    };
     switch (event.type) {
       case "message_start":
         if (event.message.role === "assistant") {
-          this.updateStatusSnapshot({
+          publish.updateStatusSnapshot({
             phase: "responding",
             turnState: "continuing",
             activeToolName: void 0,
             lastStopReason: void 0,
             hasPendingToolContinuation: false
           });
-          this.emitSemantic({ type: "assistant_response_started", message: event.message });
+          publish.emitSemantic({ type: "assistant_response_started", message: event.message });
         }
         break;
       case "message_update":
         if (event.message.role === "assistant" && event.assistantMessageEvent.type === "text_delta") {
-          this.updateStatusSnapshot({ phase: "responding" });
-          this.emitSemantic({
+          publish.updateStatusSnapshot({ phase: "responding" });
+          publish.emitSemantic({
             type: "assistant_response_delta",
             message: event.message,
             delta: event.assistantMessageEvent.delta
@@ -950,18 +969,18 @@ var Agent = class {
         break;
       case "message_end":
         if (event.message.role === "assistant") {
-          this.emitSemantic({ type: "assistant_response_finished", message: event.message });
+          publish.emitSemantic({ type: "assistant_response_finished", message: event.message });
         }
         break;
       case "tool_execution_start":
-        this.updateStatusSnapshot({
+        publish.updateStatusSnapshot({
           phase: "running_tool",
           turnState: "continuing",
           activeToolName: event.toolName,
           lastStopReason: void 0,
           hasPendingToolContinuation: false
         });
-        this.emitSemantic({
+        publish.emitSemantic({
           type: "tool_started",
           toolCallId: event.toolCallId,
           toolName: event.toolName,
@@ -969,7 +988,7 @@ var Agent = class {
         });
         break;
       case "tool_execution_update":
-        this.emitSemantic({
+        publish.emitSemantic({
           type: "tool_progressed",
           toolCallId: event.toolCallId,
           toolName: event.toolName,
@@ -978,11 +997,11 @@ var Agent = class {
         });
         break;
       case "tool_execution_end":
-        this.updateStatusSnapshot({
+        publish.updateStatusSnapshot({
           phase: this._state.isStreaming ? "responding" : "completed",
           activeToolName: void 0
         });
-        this.emitSemantic({
+        publish.emitSemantic({
           type: "tool_finished",
           toolCallId: event.toolCallId,
           toolName: event.toolName,
@@ -996,40 +1015,40 @@ var Agent = class {
         const hasToolCalls = event.message.role === "assistant" && Array.isArray(event.message.content) && event.message.content.some((block) => block.type === "toolCall");
         if (stopReason === "error" || stopReason === "aborted") {
           this.reportedFailureMessage = event.message;
-          this.updateStatusSnapshot({
+          publish.updateStatusSnapshot({
             phase: "failed",
             turnState: "failed",
             lastStopReason: stopReason,
             hasPendingToolContinuation: false,
             activeToolName: void 0
           });
-          this.emitSemantic({
+          publish.emitSemantic({
             type: "turn_failed",
             message: event.message,
             toolResults: event.toolResults
           });
         } else if (hasToolCalls) {
-          this.updateStatusSnapshot({
+          publish.updateStatusSnapshot({
             phase: "responding",
             turnState: "continuing",
             lastStopReason: stopReason,
             hasPendingToolContinuation: true,
             activeToolName: void 0
           });
-          this.emitSemantic({
+          publish.emitSemantic({
             type: "turn_continues",
             message: event.message,
             toolResults: event.toolResults
           });
         } else {
-          this.updateStatusSnapshot({
+          publish.updateStatusSnapshot({
             phase: "completed",
             turnState: "completed",
             lastStopReason: stopReason,
             hasPendingToolContinuation: false,
             activeToolName: void 0
           });
-          this.emitSemantic({
+          publish.emitSemantic({
             type: "turn_completed",
             message: event.message,
             toolResults: event.toolResults
@@ -1042,20 +1061,20 @@ var Agent = class {
         const alreadyReported = lastMessage !== void 0 && lastMessage === this.reportedFailureMessage;
         this.reportedFailureMessage = void 0;
         if (!alreadyReported && lastMessage?.role === "assistant" && (lastMessage.stopReason === "error" || lastMessage.stopReason === "aborted")) {
-          this.updateStatusSnapshot({
+          publish.updateStatusSnapshot({
             phase: "failed",
             turnState: "failed",
             lastStopReason: lastMessage.stopReason,
             hasPendingToolContinuation: false,
             activeToolName: void 0
           });
-          this.emitSemantic({
+          publish.emitSemantic({
             type: "turn_failed",
             message: lastMessage,
             toolResults: []
           });
         }
-        this.updateStatusSnapshot({
+        publish.updateStatusSnapshot({
           phase: "idle",
           activeToolName: void 0,
           hasPendingToolContinuation: false

package/dist/chunks/{chunk-WLLZTG4W.js → chunk-OOUL3DRE.js}

@@ -6,10 +6,10 @@ import {
   createSharedWebSearchTool,
   interpretShellExit,
   requestInteraction
-} from "./chunk-F3U2TYDT.js";
+} from "./chunk-BFHCZVNO.js";
 import {
   getLogger
-} from "./chunk-E5JQ5SVA.js";
+} from "./chunk-SUPAWIKP.js";
 import {
   Type
 } from "./chunk-XXGYUYXI.js";