@standardagents/code 0.11.0 → 0.11.2

package/dist/index.js

@@ -451,14 +451,6 @@ var ApiClient = class {
       })
     );
   }
-  async steerInput(threadId, mutation) {
-    return parseSharedMessagingSnapshot(
-      await this.json(this.messagingPath(threadId, "/steer"), {
-        method: "POST",
-        body: JSON.stringify(mutation)
-      })
-    );
-  }
   async updatePendingInput(threadId, pendingId, mutation) {
     return parseSharedMessagingSnapshot(
       await this.json(this.messagingPath(threadId, `/pending/${encodeURIComponent(pendingId)}`), {
@@ -499,13 +491,23 @@ var ApiClient = class {
       })
     );
   }
-  async requestSharedStop(threadId, origin2) {
-    return parseSharedMessagingSnapshot(
-      await this.json(this.messagingPath(threadId, "/stop"), {
-        method: "POST",
-        body: JSON.stringify(origin2)
-      })
-    );
+  /**
+   * Immediately halt a thread: the instance aborts the in-flight LLM
+   * request(s), marks dangling tool calls failed, and holds new turns until
+   * the next user message. This is Escape's HARD stop — not the old
+   * cooperative "stop at the next safe boundary" intent, which deferred the
+   * halt until the current step finished.
+   */
+  async stopThread(threadId) {
+    await this.json(`/api/threads/${threadId}/stop`, { method: "POST" });
+  }
+  /**
+   * Resume a stopped thread's execution loop. Used after a hard stop when a
+   * queued (steered) message should play immediately instead of waiting for
+   * the user's next direct send.
+   */
+  async continueThread(threadId) {
+    await this.json(`/api/threads/${threadId}/continue`, { method: "POST" });
   }
   async getMessages(threadId, limit = 50, order) {
     const orderParam = order ? `&order=${order}` : "";
@@ -3291,8 +3293,16 @@ var BUSY_TAIL_STALE_MS = 30 * 6e4;
 function toMs(raw) {
   return raw > 1e14 ? raw / 1e3 : raw < 1e12 ? raw * 1e3 : raw;
 }
+var EXECUTION_STOPPED_MARKER = "Execution stopped by user";
 function deriveSessionActivity(messages, nowMs = Date.now()) {
-  const visible = messages.filter((message) => message.silent !== true && message.metadata?.silent !== true).sort((a, b) => createdAt(a) - createdAt(b));
+  const all = messages.filter((message) => message.silent !== true && message.metadata?.silent !== true).sort((a, b) => createdAt(a) - createdAt(b));
+  let stopMs = 0;
+  for (const message of all) {
+    if (message.role === "system" && messageText(message.content).startsWith(EXECUTION_STOPPED_MARKER)) {
+      stopMs = Math.max(stopMs, toMs(createdAt(message)));
+    }
+  }
+  const visible = stopMs > 0 ? all.filter((message) => toMs(createdAt(message)) > stopMs) : all;
   if (visible.some((message) => message.status === "pending")) {
     const lastPending = [...visible].reverse().find((m) => m.status === "pending");
     const pendingMs = lastPending ? toMs(createdAt(lastPending)) : 0;
@@ -9316,7 +9326,7 @@ why: ${req.requestPermission}` : ""}`,
   const sessionEnded = new Promise((r) => endSession = r);
   const quit = async () => {
     tui.end();
-    const stopped2 = bridge?.isOwner ?? false ? api.requestSharedStop(threadId, messagingOrigin).catch(() => {
+    const stopped2 = bridge?.isOwner ?? false ? api.stopThread(threadId).catch(() => {
     }) : Promise.resolve();
     const procsStopped2 = host ? host.stopAllLocalProcesses().catch(() => 0) : Promise.resolve(0);
     bridge?.close();
@@ -9442,11 +9452,6 @@ why: ${req.requestPermission}` : ""}`,
     attachments: [...refs, ...toSharedAttachments(images)],
     ...messagingOrigin
   }));
-  const steerSharedInput = (text, images, refs = []) => applySharedMutation(api.steerInput(threadId, {
-    content: text,
-    attachments: [...refs, ...toSharedAttachments(images)],
-    ...messagingOrigin
-  }));
   const editSharedPending = (item, text, images, refs) => applySharedMutation(api.updatePendingInput(threadId, item.id, {
     content: text,
     attachments: [
@@ -9456,7 +9461,21 @@ why: ${req.requestPermission}` : ""}`,
     ...messagingOrigin
   }));
   const dismissSharedPending = (item) => applySharedMutation(api.dismissPendingInput(threadId, item.id, messagingOrigin));
-  const promoteSharedPending = (item) => applySharedMutation(api.steerPendingInput(threadId, item.id, messagingOrigin));
+  const promoteSharedPending = async (item) => {
+    if (busy) {
+      await Promise.all([
+        api.stopThread(threadId).catch(() => {
+        }),
+        ...[...activeSubagents.keys()].map((childId) => api.stopThread(childId).catch(() => {
+        }))
+      ]);
+      const promoted = await applySharedMutation(api.steerPendingInput(threadId, item.id, messagingOrigin));
+      if (promoted) await api.continueThread(threadId).catch(() => {
+      });
+      return promoted;
+    }
+    return applySharedMutation(api.steerPendingInput(threadId, item.id, messagingOrigin));
+  };
   const sendNow = async (text, images = [], refs = []) => {
     lastSent = { text, images, refs };
     tui.printUserMessage(text || `\u{1F4CE} ${refs.length + images.length} attachment(s)`);
@@ -9797,7 +9816,7 @@ ${c4.gray}Close another session (its slot frees within ~90s), then resend your m
         return;
       }
       const updated = await editSharedPending(item, text, images, draftRefs);
-      const promoted = !steer || !updated ? updated : await applySharedMutation(api.steerPendingInput(threadId, pendingId, messagingOrigin));
+      const promoted = !steer || !updated ? updated : await promoteSharedPending({ ...item, id: pendingId });
       if (!promoted) {
         mirroredDraftRefs = item.attachments.filter(isSharedAttachmentRef);
         tui.setExternalAttachmentNames(mirroredDraftRefs.map((attachment) => attachment.name));
@@ -9806,8 +9825,14 @@ ${c4.gray}Close another session (its slot frees within ~90s), then resend your m
       return;
     }
     if (steer) {
-      tui.print(`${c4.yellow}\u21AA steering at the next safe model boundary:${c4.reset} ${text}`);
-      if (!await steerSharedInput(text, images, draftRefs)) {
+      tui.print(`${c4.yellow}\u21AA steering now \u2014 stopping the current step${c4.reset}`);
+      await Promise.all([
+        api.stopThread(threadId).catch(() => {
+        }),
+        ...[...activeSubagents.keys()].map((childId) => api.stopThread(childId).catch(() => {
+        }))
+      ]);
+      if (!await sendNow(text, images, draftRefs)) {
         mirroredDraftRefs = draftRefs;
         tui.setExternalAttachmentNames(draftRefs.map((attachment) => attachment.name));
         tui.setInput(text, images);
@@ -9844,13 +9869,15 @@ ${c4.gray}Close another session (its slot frees within ~90s), then resend your m
       return;
     }
     if (busy) {
-      if (!sharedMessagingReady) {
-        tui.print(`${c4.dim}Shared messaging is not connected; the session was not stopped.${c4.reset}`);
-        return;
+      const queued = sharedMessaging.pending.items.length;
+      tui.print(`${c4.yellow}\u25A0 stopping now${queued > 0 ? ` \u2014 ${queued} queued message${queued === 1 ? "" : "s"} kept` : ""}${c4.reset}`);
+      const stops = [api.stopThread(threadId).catch(() => {
+      })];
+      for (const childId of activeSubagents.keys()) {
+        stops.push(api.stopThread(childId).catch(() => {
+        }));
       }
-      const advancing = sharedMessaging.pending.items.length > 0;
-      tui.print(`${c4.yellow}${advancing ? "[stopping; next pending message will run]" : "[stopping at the next safe boundary]"}${c4.reset}`);
-      void applySharedMutation(api.requestSharedStop(threadId, messagingOrigin));
+      void Promise.all(stops);
     }
   };
   tui.onBgBadge = () => {
@@ -10061,7 +10088,7 @@ ${c4.dim}runs on ${request.machine || runnerName}${c4.reset}`,
   clearInterval(pollTimer);
   clearInterval(heartbeatPoll);
   process.off("SIGCONT", onTerminalResume);
-  const stopped = bridge?.isOwner ?? false ? api.requestSharedStop(threadId, messagingOrigin).catch(() => {
+  const stopped = bridge?.isOwner ?? false ? api.stopThread(threadId).catch(() => {
   }) : Promise.resolve();
   const procsStopped = host ? host.stopAllLocalProcesses().catch(() => 0) : Promise.resolve(0);
   bridge?.close();
@@ -10328,7 +10355,7 @@ function showKeybindings(tui) {
   tui.print(`${c4.gray}shortcuts:${c4.reset}`);
   tui.print(`${c4.gray}  shift-tab${c4.reset}  cycle auto-accept level (1\u20135)`);
   tui.print(`${c4.gray}  shift-\u23CE${c4.reset}    insert a newline (multiline input)`);
-  tui.print(`${c4.gray}  option-\u23CE${c4.reset}   steer the working agent at the next safe boundary`);
+  tui.print(`${c4.gray}  option-\u23CE${c4.reset}   steer now \u2014 stops the current step and plays your message`);
   tui.print(`${c4.gray}  /${c4.reset}          open the command palette (type to filter)`);
   tui.print(`${c4.gray}  !cmd${c4.reset}       run a shell command on the session's machine (e.g. !ls); !! to send a literal !`);
   tui.print(`${c4.gray}  ctrl-v${c4.reset}     paste an image from the clipboard ([#Image 1])`);