@mirasoth/soothe-client 0.5.4 → 0.5.7

package/dist/index.js

@@ -84,7 +84,7 @@ import {
   subscribeEnvelope,
   unsubscribeEnvelope,
   validateLoopInputIntentHint
-} from "./chunk-B5FIL7O4.js";
+} from "./chunk-56Z7SUGW.js";
 
 // src/session.ts
 async function bootstrapLoopSession(client, resumeLoopId, config, loopNew) {
@@ -270,6 +270,10 @@ var CommandClient = class {
   async autopilotGetJob(jobId) {
     return this.request("autopilot_get_job", { job_id: jobId });
   }
+  /** Jobs → goals → loops snapshot for CLI top. */
+  async autopilotTop(includeTerminal = false) {
+    return this.request("autopilot_top", { include_terminal: includeTerminal });
+  }
   async cronAdd(text, priority = 0) {
     const params = { text };
     if (priority > 0) params.priority = priority;
@@ -287,7 +291,7 @@ async function checkDaemonStatus(client, timeout) {
   return client.requestResponse("daemon_status", {}, "daemon_status", timeout ?? 5e3);
 }
 async function isDaemonLive(wsURL, timeout) {
-  const { Client: Client2 } = await import("./client-BOND6P6S.js");
+  const { Client: Client2 } = await import("./client-CUYIRMFW.js");
   const t = timeout ?? 5e3;
   const client = new Client2(wsURL, defaultConfig());
   try {
@@ -361,9 +365,6 @@ async function refreshAuthToken(client, refreshToken, timeout) {
     timeout ?? 15e3
   );
 }
-async function fetchLoopCards(client, loopID, timeout) {
-  return client.fetchLoopCards(loopID, timeout);
-}
 async function fetchLoopMessages(client, loopID, opts) {
   return client.getLoopMessages(
     loopID,
@@ -374,7 +375,7 @@ async function fetchLoopMessages(client, loopID, opts) {
   );
 }
 async function connectedWebsocket(wsUrl, fn, timeoutMs = 3e4) {
-  const { Client: Client2 } = await import("./client-BOND6P6S.js");
+  const { Client: Client2 } = await import("./client-CUYIRMFW.js");
   const client = new Client2(wsUrl, defaultConfig());
   const deadline = Date.now() + timeoutMs;
   try {
@@ -431,6 +432,59 @@ async function protocol1Rpc(wsUrl, method, params = null, opts = {}) {
   }
 }
 
+// src/turn_boundary.ts
+function formatTurnId(loopId, generation) {
+  const lid = String(loopId || "").trim();
+  const gen = Number(generation);
+  if (!lid || !Number.isFinite(gen) || gen <= 0) return "";
+  return `${lid}:${Math.trunc(gen)}`;
+}
+function parseTurnGeneration(turnId) {
+  const raw = String(turnId || "").trim();
+  if (!raw || !raw.includes(":")) return null;
+  const suffix = raw.split(":").pop() ?? "";
+  const gen = Number.parseInt(suffix, 10);
+  return Number.isFinite(gen) && gen > 0 ? gen : null;
+}
+function frameTurnId(frame) {
+  if (!frame || typeof frame !== "object") return null;
+  const tid = frame.turn_id;
+  if (typeof tid === "string" && tid.trim()) return tid.trim();
+  const data = frame.data;
+  if (data && typeof data === "object") {
+    const inner = data.turn_id;
+    if (typeof inner === "string" && inner.trim()) return inner.trim();
+  }
+  return null;
+}
+function frameSeq(frame) {
+  if (!frame || typeof frame !== "object") return null;
+  const raw = frame.seq;
+  if (typeof raw === "boolean") return null;
+  if (typeof raw === "number" && Number.isFinite(raw) && raw >= 0 && Number.isInteger(raw)) {
+    return raw;
+  }
+  return null;
+}
+function turnIdsMatch(expected, candidate) {
+  const exp = String(expected || "").trim();
+  const cand = String(candidate || "").trim();
+  return Boolean(exp) && Boolean(cand) && exp === cand;
+}
+function isTurnTerminalAllowed(opts) {
+  if (!opts.queryStarted || !opts.turnProgressSeen) return false;
+  return turnIdsMatch(opts.expectedTurnId, opts.frameTurnId);
+}
+function isIdleTerminalAllowed(opts) {
+  if (!opts.queryStarted || !String(opts.expectedTurnId || "").trim()) return false;
+  const cand = String(opts.frameTurnId || "").trim();
+  if (cand) {
+    if (!turnIdsMatch(opts.expectedTurnId, cand)) return false;
+    return Boolean(opts.turnProgressSeen || opts.cancellationSeen);
+  }
+  return Boolean(opts.cancellationSeen);
+}
+
 // src/appkit/broadcaster.ts
 var SUBSCRIBER_QUEUE_CAP = 100;
 var SSEBroadcaster = class {
@@ -1387,8 +1441,9 @@ var TURN_END_IDLE = "status.idle";
 var TURN_END_STOPPED = "status.stopped";
 var TurnLifecycleGate = class {
   sawRunning = false;
-  sawStreamPayload = false;
   sawTurnProgress = false;
+  expectedTurnId = null;
+  cancellationSeen = false;
   observe(msg) {
     const frame = normalizeFrame(msg);
     if (!frame) return;
@@ -1396,22 +1451,43 @@ var TurnLifecycleGate = class {
     if (typ === "status") {
       if (String(frame.state ?? "").trim().toLowerCase() === "running") {
         this.sawRunning = true;
+        const statusTurn = frameTurnId(frame);
+        if (statusTurn) {
+          const newGen = parseTurnGeneration(statusTurn);
+          const oldGen = parseTurnGeneration(this.expectedTurnId);
+          if (this.expectedTurnId === null || newGen !== null && (oldGen === null || newGen >= oldGen)) {
+            if (this.expectedTurnId && statusTurn !== this.expectedTurnId) {
+              this.sawTurnProgress = false;
+            }
+            this.expectedTurnId = statusTurn;
+          }
+        }
       }
       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;
+  allowStreamEnd(frameTurn) {
+    return isTurnTerminalAllowed({
+      expectedTurnId: this.expectedTurnId,
+      frameTurnId: frameTurn,
+      queryStarted: this.sawRunning,
+      turnProgressSeen: this.sawTurnProgress
+    });
   }
-  allowIdleComplete() {
-    return this.sawRunning && this.sawStreamPayload;
+  allowIdleComplete(frameTurn) {
+    return isIdleTerminalAllowed({
+      expectedTurnId: this.expectedTurnId,
+      frameTurnId: frameTurn,
+      queryStarted: this.sawRunning,
+      turnProgressSeen: this.sawTurnProgress,
+      cancellationSeen: this.cancellationSeen
+    });
   }
 };
 var TurnBoundary = class {
@@ -1426,17 +1502,23 @@ var TurnBoundary = class {
     const typ = String(frame.type ?? "");
     if (typ === "status") {
       const state = String(frame.state ?? "").trim().toLowerCase();
+      const frameTurn = frameTurnId(frame);
       if (state === "stopped" && this.gate.sawRunning) {
+        if (this.gate.expectedTurnId && !turnIdsMatch(this.gate.expectedTurnId, frameTurn)) {
+          return [false, ""];
+        }
         return this.mark(TURN_END_STOPPED);
       }
-      if (state === "idle" && this.gate.allowIdleComplete()) {
+      if (state === "idle" && this.gate.allowIdleComplete(frameTurn)) {
         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()) {
+      const data = frame.data;
+      const dataTurn = frameTurnId(data) || frameTurnId(frame);
+      if (mode === "custom" && isTurnEndCustomData(data) && this.gate.allowStreamEnd(dataTurn)) {
         return this.mark(TURN_END_STREAM_END);
       }
     }
@@ -1462,20 +1544,26 @@ function normalizeFrame(msg) {
       return inner;
     }
     if (inner && typeof inner === "object" && inner.mode) {
-      return {
+      const out = {
         type: "event",
         mode: inner.mode,
         data: inner.data,
         namespace: inner.namespace ?? payload.namespace
       };
+      const tid = inner.turn_id ?? payload.turn_id ?? m.turn_id;
+      if (tid) out.turn_id = tid;
+      return out;
     }
     if (payload.mode) {
-      return {
+      const out = {
         type: "event",
         mode: payload.mode,
         data: payload.data,
         namespace: payload.namespace
       };
+      const tid = payload.turn_id ?? m.turn_id;
+      if (tid) out.turn_id = tid;
+      return out;
     }
     return null;
   }
@@ -2113,25 +2201,6 @@ var DaemonSession = class {
       return this.rpcClient.listLoops(15e3);
     });
   }
-  async fetchLoopCards(loopId) {
-    const lid = String(loopId || "").trim();
-    if (!lid) return { cards: [], seq: 0, contextTokens: 0, success: false };
-    return this.withRpcLock(async () => {
-      await this.ensureRpcConnected();
-      try {
-        const resp = await this.rpcClient.fetchLoopCards(lid, 3e4);
-        const rawCards = resp.cards;
-        return {
-          cards: Array.isArray(rawCards) ? rawCards : [],
-          seq: Number(resp.seq ?? 0),
-          contextTokens: typeof resp.context_tokens === "number" && resp.context_tokens >= 0 ? resp.context_tokens : 0,
-          success: true
-        };
-      } catch {
-        return { cards: [], seq: 0, contextTokens: 0, success: false };
-      }
-    });
-  }
   async fetchLoopHistory(loopId) {
     const lid = String(loopId || "").trim();
     if (!lid) {
@@ -2183,7 +2252,7 @@ var DaemonSession = class {
     this.lastTurnErrorMessage = null;
     let queryStarted = false;
     let expectedLoopId = this.loopId;
-    let streamPayloadSeen = false;
+    let expectedTurnId = null;
     let turnProgressSeen = false;
     this.streaming = true;
     const absoluteDeadline = opts.maxWaitMs !== void 0 && opts.maxWaitMs > 0 ? Date.now() + opts.maxWaitMs : null;
@@ -2217,6 +2286,17 @@ var DaemonSession = class {
         if (expectedLoopId && typeof eventLoopId === "string" && eventLoopId && eventLoopId !== expectedLoopId) {
           continue;
         }
+        const evTurnId = frameTurnId(frame);
+        const statusState = eventType === "status" ? String(frame.state ?? "") : "";
+        const isRunningStatus = statusState === "running";
+        const isTerminalStatus = statusState === "idle" || statusState === "stopped";
+        if (expectedTurnId && (eventType === "event" || eventType === "status") && !isRunningStatus) {
+          if (isTerminalStatus) {
+            if (evTurnId && !turnIdsMatch(expectedTurnId, evTurnId)) continue;
+          } else if (!turnIdsMatch(expectedTurnId, evTurnId)) {
+            continue;
+          }
+        }
         if (eventType === "error") {
           const errObj = frame.error ?? {};
           throw new Error(String(errObj.message || frame.message || "daemon error"));
@@ -2227,16 +2307,37 @@ var DaemonSession = class {
             this.loopId = loopEv;
             expectedLoopId = loopEv;
           }
-          const state = String(frame.state ?? "");
-          if (state === "running") {
+          if (statusState === "running") {
             queryStarted = true;
-          } else if (queryStarted && state === "stopped") {
-            this.lastTurnEndState = state;
+            const statusTurn = frameTurnId(frame);
+            if (statusTurn) {
+              const newGen = parseTurnGeneration(statusTurn);
+              const oldGen = parseTurnGeneration(expectedTurnId);
+              if (expectedTurnId === null || newGen !== null && (oldGen === null || newGen >= oldGen)) {
+                if (expectedTurnId && statusTurn !== expectedTurnId) {
+                  turnProgressSeen = false;
+                }
+                expectedTurnId = statusTurn;
+              }
+            }
+          } else if (queryStarted && statusState === "stopped") {
+            const stopTurn = frameTurnId(frame);
+            if (expectedTurnId && !turnIdsMatch(expectedTurnId, stopTurn)) continue;
+            this.lastTurnEndState = statusState;
             yield* this.drainStreamEventsAfterIdle(expectedLoopId);
             break;
-          } else if (queryStarted && state === "idle") {
-            if (!streamPayloadSeen && !this.lastTurnCancellationSeen) continue;
-            this.lastTurnEndState = state;
+          } else if (queryStarted && statusState === "idle") {
+            const idleTurn = frameTurnId(frame);
+            if (!isIdleTerminalAllowed({
+              expectedTurnId,
+              frameTurnId: idleTurn,
+              queryStarted,
+              turnProgressSeen,
+              cancellationSeen: this.lastTurnCancellationSeen
+            })) {
+              continue;
+            }
+            this.lastTurnEndState = statusState;
             yield* this.drainStreamEventsAfterIdle(expectedLoopId);
             break;
           }
@@ -2258,9 +2359,16 @@ var DaemonSession = class {
           continue;
         }
         if (mode === "custom" && isTurnEndCustomData(data)) {
-          if (!queryStarted || !turnProgressSeen) continue;
+          const dataTurn = frameTurnId(data) || evTurnId;
+          if (!isTurnTerminalAllowed({
+            expectedTurnId,
+            frameTurnId: dataTurn,
+            queryStarted,
+            turnProgressSeen
+          })) {
+            continue;
+          }
         }
-        streamPayloadSeen = true;
         if (isTurnProgressChunk(mode, data)) turnProgressSeen = true;
         yield [namespace, mode, data];
         if (mode === "custom" && isTurnEndCustomData(data)) {
@@ -2456,19 +2564,23 @@ export {
   extractSootheLoopID,
   extractThinkingStep,
   fetchConfigSection,
-  fetchLoopCards,
   fetchLoopHistory,
   fetchLoopMessages,
   fetchSkillsCatalog,
+  formatTurnId,
+  frameSeq,
+  frameTurnId,
   idleTimeoutForTurn,
   inboundNeedsDeliveryAck,
   inputMessageForLoop,
   isCompletionEvent,
   isDaemonLive,
   isDaemonTurnEndEvent,
+  isIdleTerminalAllowed,
   isSubagentProgressEvent,
   isTurnEndCustomData,
   isTurnProgressChunk,
+  isTurnTerminalAllowed,
   isValidVerbosityLevel,
   loadConfigFromEnv,
   newLoopInputMessage,
@@ -2478,6 +2590,7 @@ export {
   notificationEnvelope,
   parseCardCustomPayload,
   parseNamespace,
+  parseTurnGeneration,
   pingEnvelope,
   pongEnvelope,
   protocol1Rpc,
@@ -2488,6 +2601,7 @@ export {
   shouldShow,
   splitWirePayload,
   subscribeEnvelope,
+  turnIdsMatch,
   unsubscribeEnvelope,
   validateLoopInputIntentHint,
   waitDaemonReady,