@mirasoth/soothe-client 0.5.1 → 0.5.2

package/dist/client-YTWVWNAN.js

@@ -0,0 +1,7 @@
+import {
+  Client
+} from "./chunk-NSWLUFSA.js";
+export {
+  Client
+};
+//# sourceMappingURL=client-YTWVWNAN.js.map

package/dist/index.cjs

@@ -357,7 +357,7 @@ var init_protocol = __esm({
     import_node_crypto = require("crypto");
     PROTO_VERSION = "1";
     DEFAULT_CLIENT_CAPABILITIES = ["streaming", "batch", "heartbeat", "receipts"];
-    CLIENT_VERSION = "0.5.1";
+    CLIENT_VERSION = "0.5.2";
   }
 });
 
@@ -2069,9 +2069,14 @@ __export(index_exports, {
   StaleLoopError: () => StaleLoopError,
   StreamCloseFail: () => StreamCloseFail,
   StreamCloseSoftComplete: () => StreamCloseSoftComplete,
+  TURN_END_IDLE: () => TURN_END_IDLE,
+  TURN_END_STOPPED: () => TURN_END_STOPPED,
+  TURN_END_STREAM_END: () => TURN_END_STREAM_END,
   TimeoutError: () => TimeoutError,
   TimeoutPolicy: () => TimeoutPolicy,
+  TurnBoundary: () => TurnBoundary,
   TurnEventStats: () => TurnEventStats,
+  TurnLifecycleGate: () => TurnLifecycleGate,
   TurnRunner: () => TurnRunner,
   VerbosityTier: () => VerbosityTier,
   authenticate: () => authenticate,
@@ -2101,6 +2106,7 @@ __export(index_exports, {
   inputMessageForLoop: () => inputMessageForLoop,
   isCompletionEvent: () => isCompletionEvent,
   isDaemonLive: () => isDaemonLive,
+  isDaemonTurnEndEvent: () => isDaemonTurnEndEvent,
   isSubagentProgressEvent: () => isSubagentProgressEvent,
   isTurnEndCustomData: () => isTurnEndCustomData,
   isTurnProgressChunk: () => isTurnProgressChunk,
@@ -2743,6 +2749,8 @@ var EventClassifier = class {
     if (!eventType) return false;
     switch (eventType) {
       case "status.idle":
+      case "status.stopped":
+      case "soothe.stream.end":
       case "idle_timeout":
       case "query_timeout":
       case "stream_closed":
@@ -3453,6 +3461,110 @@ async function compactAttachments(atts, opts) {
 
 // src/appkit/turn_runner.ts
 init_intent_hints();
+
+// src/appkit/turn_boundary.ts
+init_stream_terminal();
+var TURN_END_STREAM_END = STREAM_END;
+var TURN_END_IDLE = "status.idle";
+var TURN_END_STOPPED = "status.stopped";
+var TurnLifecycleGate = class {
+  sawRunning = false;
+  sawStreamPayload = false;
+  sawTurnProgress = false;
+  observe(msg) {
+    const frame = normalizeFrame(msg);
+    if (!frame) return;
+    const typ = String(frame.type ?? "");
+    if (typ === "status") {
+      if (String(frame.state ?? "").trim().toLowerCase() === "running") {
+        this.sawRunning = true;
+      }
+      return;
+    }
+    if (typ === "event") {
+      this.sawStreamPayload = true;
+      const mode = String(frame.mode ?? "");
+      if (isTurnProgressChunk(mode, frame.data)) {
+        this.sawTurnProgress = true;
+      }
+    }
+  }
+  allowStreamEnd() {
+    return this.sawRunning && this.sawTurnProgress;
+  }
+  allowIdleComplete() {
+    return this.sawRunning && this.sawStreamPayload;
+  }
+};
+var TurnBoundary = class {
+  gate = new TurnLifecycleGate();
+  ended = false;
+  reason = "";
+  feed(msg) {
+    if (this.ended) return [true, this.reason];
+    this.gate.observe(msg);
+    const frame = normalizeFrame(msg);
+    if (!frame) return [false, ""];
+    const typ = String(frame.type ?? "");
+    if (typ === "status") {
+      const state = String(frame.state ?? "").trim().toLowerCase();
+      if (state === "stopped" && this.gate.sawRunning) {
+        return this.mark(TURN_END_STOPPED);
+      }
+      if (state === "idle" && this.gate.allowIdleComplete()) {
+        return this.mark(TURN_END_IDLE);
+      }
+      return [false, ""];
+    }
+    if (typ === "event") {
+      const mode = String(frame.mode ?? "");
+      if (mode === "custom" && isTurnEndCustomData(frame.data) && this.gate.allowStreamEnd()) {
+        return this.mark(TURN_END_STREAM_END);
+      }
+    }
+    return [false, ""];
+  }
+  mark(reason) {
+    this.ended = true;
+    this.reason = reason;
+    return [true, reason];
+  }
+};
+function isDaemonTurnEndEvent(completionEvent) {
+  const e = (completionEvent ?? "").trim();
+  return e === TURN_END_STREAM_END || e === TURN_END_IDLE || e === TURN_END_STOPPED;
+}
+function normalizeFrame(msg) {
+  if (!msg || typeof msg !== "object") return null;
+  const m = msg;
+  if (m.type === "next") {
+    const payload = m.payload ?? {};
+    const inner = payload.data;
+    if (inner && typeof inner === "object" && inner.type === "status") {
+      return inner;
+    }
+    if (inner && typeof inner === "object" && inner.mode) {
+      return {
+        type: "event",
+        mode: inner.mode,
+        data: inner.data,
+        namespace: inner.namespace ?? payload.namespace
+      };
+    }
+    if (payload.mode) {
+      return {
+        type: "event",
+        mode: payload.mode,
+        data: payload.data,
+        namespace: payload.namespace
+      };
+    }
+    return null;
+  }
+  return m;
+}
+
+// src/appkit/turn_runner.ts
 var ErrQueryTimeout = class extends Error {
   constructor() {
     super("appkit: query timeout");
@@ -3592,6 +3704,7 @@ var TurnRunner = class {
       }
       let assistantContent = "";
       const startedAt = Date.now();
+      const boundary = new TurnBoundary();
       const idleForTurn = idleTimeoutForTurn(this.cfg, (attachments?.length ?? 0) > 0);
       let idleReject = null;
       const armIdle = () => {
@@ -3684,6 +3797,7 @@ var TurnRunner = class {
         }
         idleRace = armIdle();
         const msg = res.value;
+        const [ended, endReason] = boundary.feed(msg);
         const eventResult = this.classifier.classify(msg, assistantContent);
         if (eventResult.err && eventResult.terminal === 2 /* FailedComplete */) {
           clearIdle();
@@ -3705,7 +3819,7 @@ var TurnRunner = class {
           eventResult,
           assistantContent
         );
-        if (deliverable) {
+        if (deliverable && !isDaemonTurnEndEvent(eventResult.completionEvent ?? "")) {
           clearIdle();
           await this.completeTurn(
             sessionID,
@@ -3716,6 +3830,24 @@ var TurnRunner = class {
           );
           return;
         }
+        if (ended) {
+          clearIdle();
+          if (this.classifier.isSubstantiveAssistantReply(assistantContent)) {
+            await this.completeTurn(
+              sessionID,
+              loopID,
+              assistantContent.trim(),
+              startedAt,
+              endReason
+            );
+            return;
+          }
+          const err = new Error(`turn ended (${endReason}) with no assistant content`);
+          await this.persistFailed(sessionID, loopID, err);
+          this.broadcastError(sessionID, err);
+          this.onError?.(sessionID, loopID, err);
+          throw err;
+        }
       }
     } finally {
       clearIdle();
@@ -4309,9 +4441,14 @@ var DaemonSession = class {
   StaleLoopError,
   StreamCloseFail,
   StreamCloseSoftComplete,
+  TURN_END_IDLE,
+  TURN_END_STOPPED,
+  TURN_END_STREAM_END,
   TimeoutError,
   TimeoutPolicy,
+  TurnBoundary,
   TurnEventStats,
+  TurnLifecycleGate,
   TurnRunner,
   VerbosityTier,
   authenticate,
@@ -4341,6 +4478,7 @@ var DaemonSession = class {
   inputMessageForLoop,
   isCompletionEvent,
   isDaemonLive,
+  isDaemonTurnEndEvent,
   isSubagentProgressEvent,
   isTurnEndCustomData,
   isTurnProgressChunk,