orion-super-agent-dev 0.1.40 → 0.1.41

package/out/main.js

@@ -30114,6 +30114,29 @@ var require_refreshOnRefusal = __commonJS({
   }
 });
 
+// ../packages/orion-client-core/dist/boundaryEvents.js
+var require_boundaryEvents = __commonJS({
+  "../packages/orion-client-core/dist/boundaryEvents.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.BOUNDARY_EVENTS = void 0;
+    exports2.resumeTokenOf = resumeTokenOf;
+    exports2.BOUNDARY_EVENTS = /* @__PURE__ */ new Set([
+      "tool_request",
+      "permission_request",
+      "plan_approval_request",
+      "user_input_request",
+      "hook_request",
+      "file_history_rewind_request"
+    ]);
+    function resumeTokenOf(event) {
+      if (!exports2.BOUNDARY_EVENTS.has(event.event))
+        return void 0;
+      return event.data?.resume_token ?? void 0;
+    }
+  }
+});
+
 // ../packages/orion-client-core/dist/atomicWrite.js
 var require_atomicWrite = __commonJS({
   "../packages/orion-client-core/dist/atomicWrite.js"(exports2) {
@@ -32038,6 +32061,41 @@ var require_interimModels = __commonJS({
   }
 });
 
+// ../packages/orion-client-core/dist/interruptedTurn.js
+var require_interruptedTurn = __commonJS({
+  "../packages/orion-client-core/dist/interruptedTurn.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.MOVED_ON_NOTE = void 0;
+    exports2.interruptedTurnMessages = interruptedTurnMessages;
+    exports2.carryInterruptedTurn = carryInterruptedTurn;
+    exports2.interruptedTurnOf = interruptedTurnOf2;
+    var textBlock = (text) => ({ type: "text", text });
+    exports2.MOVED_ON_NOTE = "[Reply cut off here \u2014 the user sent their next message before it finished. That message is what they want now: pick up from this point as it directs, without restarting this reply or remarking on the cut.]";
+    function interruptedTurnMessages(messages, prompt, partialReply, cause = "stopped") {
+      const out2 = [...messages];
+      if (prompt && prompt.trim().length > 0) {
+        out2.push({ role: "user", content: [textBlock(prompt)] });
+      }
+      if (partialReply && partialReply.trim().length > 0) {
+        const content = [textBlock(partialReply)];
+        if (cause === "moved_on")
+          content.push(textBlock(exports2.MOVED_ON_NOTE));
+        out2.push({ role: "assistant", content });
+      }
+      return out2;
+    }
+    var carried = /* @__PURE__ */ new WeakMap();
+    function carryInterruptedTurn(error, turn) {
+      if (typeof error === "object" && error !== null)
+        carried.set(error, turn);
+    }
+    function interruptedTurnOf2(error) {
+      return typeof error === "object" && error !== null ? carried.get(error) : void 0;
+    }
+  }
+});
+
 // ../packages/orion-client-core/dist/transportError.js
 var require_transportError = __commonJS({
   "../packages/orion-client-core/dist/transportError.js"(exports2) {
@@ -38006,6 +38064,309 @@ var require_toolConcurrency = __commonJS({
   }
 });
 
+// ../packages/orion-client-core/dist/turnClose.js
+var require_turnClose = __commonJS({
+  "../packages/orion-client-core/dist/turnClose.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.CLOSE_TURNS_IN_BACKGROUND = exports2.STOPPED_TOOL_GRACE_MS = exports2.TURN_CLOSE_TIMEOUT_MS = exports2.TURN_CLOSE_WAIT_MS = void 0;
+    exports2.closeTurn = closeTurn;
+    var boundaryEvents_js_1 = require_boundaryEvents();
+    var interruptedTurn_js_1 = require_interruptedTurn();
+    exports2.TURN_CLOSE_WAIT_MS = 3e3;
+    exports2.TURN_CLOSE_TIMEOUT_MS = 15e3;
+    exports2.STOPPED_TOOL_GRACE_MS = 500;
+    exports2.CLOSE_TURNS_IN_BACKGROUND = { turnCloseWaitMs: 0, stoppedToolGraceMs: 0 };
+    var RUNS_THE_TURN = /* @__PURE__ */ new Set([
+      "text_delta",
+      "thinking_delta",
+      "tool_use_start",
+      "usage_recorded",
+      ...boundaryEvents_js_1.BOUNDARY_EVENTS,
+      "turn_complete"
+    ]);
+    async function closeTurn(trail, ending, deps2) {
+      if (ending === "failed" && !trail.contentSeen)
+        return void 0;
+      const everything = await everythingTheTurnDid(trail, ending, deps2).catch(() => void 0);
+      if (everything !== void 0)
+        return everything;
+      try {
+        return {
+          kept: "words",
+          messages: (0, interruptedTurn_js_1.interruptedTurnMessages)(deps2.committed(), deps2.prompt, trail.words, deps2.cause)
+        };
+      } catch {
+        return void 0;
+      }
+    }
+    async function everythingTheTurnDid(trail, ending, deps2) {
+      if (trail.resumeToken === void 0)
+        return void 0;
+      const parked = trail.parked;
+      if (parked)
+        await settledWithin(trail.stillRunning, deps2.graceMs);
+      const closing = parked && ending === "stopped" ? "abandoned" : "recovery";
+      const transcript = await engineTranscript(deps2.transport, deps2.closingBody(closing, trail.resumeToken, trail.answered), deps2.waitMs);
+      if (transcript === void 0)
+        return void 0;
+      return {
+        kept: "everything",
+        // Parked, the token holds every word the turn said. Cut mid-stream, the words since
+        // the last boundary are in no token: they follow the transcript as the step that was cut.
+        messages: parked ? transcript : (0, interruptedTurn_js_1.interruptedTurnMessages)(transcript, null, trail.wordsSinceBoundary, deps2.cause)
+      };
+    }
+    async function settledWithin(work, ms) {
+      if (work.length === 0 || ms <= 0)
+        return;
+      let timer;
+      const elapsed = new Promise((resolve5) => {
+        timer = setTimeout(resolve5, ms);
+        timer.unref?.();
+      });
+      try {
+        await Promise.race([Promise.allSettled(work).then(() => void 0), elapsed]);
+      } finally {
+        if (timer !== void 0)
+          clearTimeout(timer);
+      }
+    }
+    function engineTranscript(transport, body2, waitMs) {
+      return new Promise((resolve5) => {
+        const ac = new AbortController();
+        const timers = [];
+        const after = (ms, act) => {
+          const timer = setTimeout(act, ms);
+          timer.unref?.();
+          timers.push(timer);
+        };
+        const onEvent = (event) => {
+          if (RUNS_THE_TURN.has(event.event)) {
+            ac.abort();
+            resolve5(void 0);
+            return;
+          }
+          if (event.event !== "turn_error")
+            return;
+          const messages = event.data?.messages;
+          resolve5(Array.isArray(messages) ? messages : void 0);
+        };
+        after(exports2.TURN_CLOSE_TIMEOUT_MS, () => ac.abort());
+        if (waitMs > 0)
+          after(waitMs, () => resolve5(void 0));
+        else
+          resolve5(void 0);
+        let closing;
+        try {
+          closing = transport.streamSegment(body2, onEvent, ac.signal);
+        } catch {
+          closing = Promise.resolve();
+        }
+        void closing.catch(() => void 0).finally(() => {
+          for (const timer of timers)
+            clearTimeout(timer);
+          resolve5(void 0);
+        });
+      });
+    }
+  }
+});
+
+// ../packages/orion-client-core/dist/planState.js
+var require_planState = __commonJS({
+  "../packages/orion-client-core/dist/planState.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.planOfEvent = planOfEvent2;
+    function planOfEvent2(data) {
+      if (typeof data !== "object" || data === null)
+        return null;
+      const { steps: rawSteps, current_step: pointer } = data;
+      const steps = Array.isArray(rawSteps) ? rawSteps.filter((step) => typeof step === "string") : [];
+      if (steps.length === 0)
+        return null;
+      return {
+        steps,
+        current_step: typeof pointer === "number" && Number.isFinite(pointer) ? pointer : 0
+      };
+    }
+  }
+});
+
+// ../packages/orion-client-core/dist/turnTrail.js
+var require_turnTrail = __commonJS({
+  "../packages/orion-client-core/dist/turnTrail.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.TurnTrail = void 0;
+    var boundaryEvents_js_1 = require_boundaryEvents();
+    var planState_js_1 = require_planState();
+    var StreamedWords = class {
+      text = "";
+      stepEnded = false;
+      add(delta) {
+        if (delta === "")
+          return;
+        if (this.stepEnded && this.text !== "")
+          this.text = `${this.text.replace(/\n+$/, "")}
+
+`;
+        this.stepEnded = false;
+        this.text += delta;
+      }
+      /** What follows belongs to the next step. */
+      endStep() {
+        this.stepEnded = true;
+      }
+      read() {
+        return this.text;
+      }
+    };
+    var TurnTrail = class {
+      /** The `.orion` snapshot the turn's segments carry — a closing carries the same one. */
+      orionResources;
+      /** Whether anything of the turn reached the host. A turn that never did changed nothing. */
+      contentSeen = false;
+      /** The plan the engine last announced this turn; `undefined` = it announced none. */
+      plan;
+      token;
+      isParked = false;
+      resumedOn;
+      carried = [];
+      answer;
+      batch = [];
+      settled = /* @__PURE__ */ new Map();
+      running = /* @__PURE__ */ new Set();
+      turnWords = new StreamedWords();
+      stepWords = new StreamedWords();
+      // ── what happens to a turn ────────────────────────────────────────────────────────────
+      /** A segment goes out, resumed on `result` (nothing, for the turn's first). The engine
+       *  owns the turn until it ends or parks. */
+      segmentStarts(result) {
+        this.isParked = false;
+        this.resumedOn = result;
+        this.carried = [];
+        this.answer = void 0;
+        this.batch = [];
+        this.settled.clear();
+        this.running.clear();
+        this.stepWords = new StreamedWords();
+        this.turnWords.endStep();
+      }
+      /** That segment carries `steering`: what the host had queued for the turn since the last
+       *  one — the user's words, a sub-agent's report. The engine folds it as the segment starts. */
+      steeredWith(steering) {
+        this.carried = steering;
+      }
+      /** The engine parked the turn at a boundary: it waits on this machine, and `token` holds
+       *  everything it did up to here — the words of the segment that parked it included, and
+       *  what that segment was steered with. Heard once per segment; the trail hears it from the
+       *  boundary event itself as it ARRIVES ({@link observe}), because a stop or a cut can land
+       *  before that segment's stream ends. */
+      parkedAt(token) {
+        if (this.isParked)
+          return;
+        this.token = token;
+        this.isParked = true;
+        this.resumedOn = void 0;
+        this.carried = [];
+        this.stepWords = new StreamedWords();
+        this.turnWords.endStep();
+      }
+      /** The client answered the boundary in full; the turn stays parked until the next segment
+       *  goes out with the answer. */
+      answeredWith(result) {
+        this.answer = result;
+      }
+      /** One event of the turn's stream, as the host is about to see it. */
+      observe(event) {
+        this.contentSeen = true;
+        const token = (0, boundaryEvents_js_1.resumeTokenOf)(event);
+        if (token !== void 0)
+          this.parkedAt(token);
+        if (event.agent_id)
+          return;
+        const data = event.data;
+        switch (event.event) {
+          case "text_delta": {
+            const delta = typeof data?.delta === "string" ? data.delta : "";
+            this.turnWords.add(delta);
+            this.stepWords.add(delta);
+            break;
+          }
+          case "tool_use_start":
+            this.turnWords.endStep();
+            this.stepWords.endStep();
+            break;
+          case "plan_updated":
+            this.plan = (0, planState_js_1.planOfEvent)(data);
+            break;
+          default:
+            break;
+        }
+      }
+      /** The parked boundary is a batch of client tools. */
+      runsTools(batch) {
+        this.batch = batch;
+      }
+      /** One tool of that batch, running: its result is kept the moment it settles, whether or
+       *  not the batch ever finishes. A tool that fails to settle leaves no result. */
+      watch(request, run3) {
+        const watched = run3.then((result) => {
+          this.settled.set(request.request_id, result);
+        }, () => void 0);
+        this.running.add(watched);
+        void watched.finally(() => this.running.delete(watched));
+        return run3;
+      }
+      // ── what a closing reads ──────────────────────────────────────────────────────────────
+      /** The last boundary's resume token; `undefined` before the turn reached one. */
+      get resumeToken() {
+        return this.token;
+      }
+      /** Whether the turn is waiting at that boundary (no segment is streaming). */
+      get parked() {
+        return this.isParked;
+      }
+      /** What the client has answered the last boundary with. While a segment STREAMS, the whole
+       *  answer it was resumed on. While the turn is PARKED, the whole answer once there is one;
+       *  until then, of a batch of tools, the results of those that have settled so far, in the
+       *  order they were asked for — and of a card, nothing. */
+      get answered() {
+        if (!this.isParked)
+          return this.resumedOn;
+        if (this.answer !== void 0)
+          return this.answer;
+        const results = this.batch.flatMap((request) => {
+          const result = this.settled.get(request.request_id);
+          return result === void 0 ? [] : [result];
+        });
+        return results.length === 0 ? void 0 : { kind: "tool_result", results };
+      }
+      /** What the segment in flight was steered with — in no token until that segment parks, so
+       *  a closing carries it again. Nothing while the turn is parked: the token holds what rode
+       *  the segment that parked it, and what was queued since is still the host's. */
+      get steering() {
+        return this.carried;
+      }
+      /** The tools of the parked batch that have not settled yet. */
+      get stillRunning() {
+        return [...this.running];
+      }
+      /** Every word the turn's main agent streamed. */
+      get words() {
+        return this.turnWords.read();
+      }
+      /** The words streamed since the last boundary — the ones no token holds. */
+      get wordsSinceBoundary() {
+        return this.stepWords.read();
+      }
+    };
+    exports2.TurnTrail = TurnTrail;
+  }
+});
+
 // ../packages/orion-client-core/dist/segmentDriver.js
 var require_segmentDriver = __commonJS({
   "../packages/orion-client-core/dist/segmentDriver.js"(exports2) {
@@ -38062,12 +38423,14 @@ var require_segmentDriver = __commonJS({
     exports2.runToolBatch = runToolBatch;
     var node_events_1 = __require("node:events");
     var os9 = __importStar(__require("node:os"));
+    var boundaryEvents_js_1 = require_boundaryEvents();
     var compactionTrigger_js_1 = require_compactionTrigger();
     var duetEntry_js_1 = require_duetEntry();
     var duetRouterModel_js_1 = require_duetRouterModel();
     var duetMode_js_1 = require_duetMode();
     var duetPlan_js_1 = require_duetPlan();
     var interimModels_js_1 = require_interimModels();
+    var interruptedTurn_js_1 = require_interruptedTurn();
     var retrievalModels_js_1 = require_retrievalModels();
     var retrievalSteps_js_1 = require_retrievalSteps();
     var repoIdentity_js_1 = require_repoIdentity();
@@ -38081,6 +38444,8 @@ var require_segmentDriver = __commonJS({
     var wellFormed_js_1 = require_wellFormed();
     var orionSnapshot_js_1 = require_orionSnapshot();
     var toolConcurrency_js_1 = require_toolConcurrency();
+    var turnClose_js_1 = require_turnClose();
+    var turnTrail_js_1 = require_turnTrail();
     function turnAbortController() {
       const ac = new AbortController();
       (0, node_events_1.setMaxListeners)(0, ac.signal);
@@ -38126,14 +38491,6 @@ var require_segmentDriver = __commonJS({
       return error instanceof transportError_js_2.TransportError && (error.status === void 0 || error.status >= 500);
     }
     exports2.TERMINAL_EVENTS = /* @__PURE__ */ new Set(["turn_complete", "turn_error"]);
-    var BOUNDARY_EVENTS = /* @__PURE__ */ new Set([
-      "tool_request",
-      "permission_request",
-      "plan_approval_request",
-      "user_input_request",
-      "hook_request",
-      "file_history_rewind_request"
-    ]);
     function effectiveWirePermissionMode2(turbo, configured2) {
       return turbo ? "full_access" : configured2;
     }
@@ -38220,20 +38577,57 @@ var require_segmentDriver = __commonJS({
     }
     async function driveTurn3(transport, start2, handlers, opts) {
       const work = (0, keepAwake_js_1.beginAgentTurn)();
+      const trail = new turnTrail_js_1.TurnTrail();
+      const closing = closingFor(transport, start2, handlers, trail, opts);
       try {
-        return await driveTurnToOutcome(transport, start2, cardsWaitOnPerson(handlers, work), opts);
+        return await driveTurnToOutcome(transport, start2, cardsWaitOnPerson(handlers, work), opts, trail, closing);
       } catch (error) {
-        if ((0, transportError_js_2.isAbortError)(error)) {
+        const stopped = (0, transportError_js_2.isAbortError)(error) || stopRequested(handlers);
+        if (stopped) {
           try {
             opts?.mirror?.(stoppedTerminal(start2.sessionId));
           } catch {
           }
         }
+        const left = await closing(stopped ? "stopped" : "failed");
+        if (left !== void 0)
+          (0, interruptedTurn_js_1.carryInterruptedTurn)(error, left);
         throw error;
       } finally {
         work.end();
       }
     }
+    function closingFor(transport, start2, handlers, trail, opts) {
+      let closed;
+      return (ending) => closed ??= (0, turnClose_js_1.closeTurn)(trail, ending, {
+        transport,
+        closingBody: (closing, token, answered) => buildSegmentBody(start2, { resumeToken: token, boundaryResult: answered, closing }, trail),
+        committed: () => start2.getMessages(),
+        prompt: promptOf2(start2),
+        cause: ending === "stopped" ? stopCauseOf(handlers) : "stopped",
+        waitMs: opts?.turnCloseWaitMs ?? turnClose_js_1.TURN_CLOSE_WAIT_MS,
+        graceMs: opts?.stoppedToolGraceMs ?? turnClose_js_1.STOPPED_TOOL_GRACE_MS
+      });
+    }
+    function stopRequested(handlers) {
+      try {
+        return handlers.signal?.aborted === true || handlers.isCancelRequested?.() === true;
+      } catch {
+        return false;
+      }
+    }
+    function stopCauseOf(handlers) {
+      try {
+        return handlers.stopCause?.() ?? "stopped";
+      } catch {
+        return "stopped";
+      }
+    }
+    function promptOf2(start2) {
+      if (start2.skill)
+        return `/${start2.skill.name}${start2.skill.args ? ` ${start2.skill.args}` : ""}`;
+      return start2.text ?? null;
+    }
     function cardsWaitOnPerson(handlers, work) {
       const waitingOnPerson = (card) => async (...args2) => {
         const resume = work.waitOnPerson();
@@ -38250,8 +38644,8 @@ var require_segmentDriver = __commonJS({
         onAskUser: waitingOnPerson(handlers.onAskUser)
       };
     }
-    async function driveTurnToOutcome(transport, start2, handlers, opts) {
-      const orionResources = start2.getOrionResources ? await start2.getOrionResources() : void 0;
+    async function driveTurnToOutcome(transport, start2, handlers, opts, trail, closing) {
+      trail.orionResources = start2.getOrionResources ? await start2.getOrionResources() : void 0;
       void (0, scratchpad_js_1.ensureSessionScratchDir)({
         sessionId: start2.sessionId,
         workspaceRoot: (0, pathResolution_js_1.effectiveWorkspaceRoot)(start2.routing?.workspaceRoot ?? null)
@@ -38262,7 +38656,6 @@ var require_segmentDriver = __commonJS({
       let transportRetried = false;
       let busyAttempts = 0;
       let busyWaitedMs = 0;
-      const stoppedDuringWait = () => handlers.signal?.aborted === true || handlers.isCancelRequested?.() === true;
       for (; ; ) {
         let sawEvent = false;
         let drained = [];
@@ -38275,7 +38668,7 @@ var require_segmentDriver = __commonJS({
           }
         };
         try {
-          return await driveTurnAttempt(transport, attemptStart, handlers, orionResources, () => {
+          return await driveTurnAttempt(transport, attemptStart, handlers, trail, closing, () => {
             sawEvent = true;
           }, {
             silenceMs: opts?.streamSilenceMs ?? exports2.STREAM_SILENCE_TIMEOUT_MS,
@@ -38283,7 +38676,7 @@ var require_segmentDriver = __commonJS({
           }, busy !== null, opts?.mirror);
         } catch (error) {
           if (error instanceof SessionBusyRefusal) {
-            if (busy !== null && busyWaitedMs < busy.maxWaitMs && !stoppedDuringWait()) {
+            if (busy !== null && busyWaitedMs < busy.maxWaitMs && !stopRequested(handlers)) {
               requeue = drained;
               const delayMs = sessionBusyDelayMs(busyAttempts, busy);
               busyAttempts += 1;
@@ -38295,7 +38688,7 @@ var require_segmentDriver = __commonJS({
                 setTimeout(resolve5, delayMs);
               });
               busyWaitedMs += delayMs;
-              if (stoppedDuringWait())
+              if (stopRequested(handlers))
                 throw new DOMException("turn aborted", "AbortError");
               continue;
             }
@@ -38442,6 +38835,19 @@ var require_segmentDriver = __commonJS({
       };
       return { event: "turn_error", session_id: sessionId, timestamp: Date.now() / 1e3, data };
     }
+    function endsWithNothing(ev, trail) {
+      if (ev.event !== "turn_error")
+        return false;
+      const data = ev.data;
+      if (Array.isArray(data.messages))
+        return false;
+      return data.error === exports2.TURN_CANCELLED_ERROR || trail.contentSeen;
+    }
+    async function withWhatTheTurnLeft(terminal, closing) {
+      const stopped = terminal.data.error === exports2.TURN_CANCELLED_ERROR;
+      const left = await closing(stopped ? "stopped" : "failed");
+      return left === void 0 ? terminal : { ...terminal, data: { ...terminal.data, messages: left.messages } };
+    }
     function stoppedTerminal(sessionId) {
       return {
         event: "turn_error",
@@ -38460,11 +38866,10 @@ var require_segmentDriver = __commonJS({
       const plan = file ? (0, planFile_js_1.readPlanFileSync)(file.path) : null;
       return plan === null ? ev : { ...ev, data: { ...ev.data, plan } };
     }
-    async function driveTurnAttempt(transport, start2, handlers, orionResources, markEvent, caps, busyRetry, mirror) {
+    async function driveTurnAttempt(transport, start2, handlers, trail, closing, markEvent, caps, busyRetry, mirror) {
       let resumeToken;
       let boundaryResult;
       let first = true;
-      let contentSeen = false;
       const workspaceRoot = start2.routing?.workspaceRoot;
       let applyChain = Promise.resolve();
       const agentTouchedRoots = /* @__PURE__ */ new Set();
@@ -38483,7 +38888,7 @@ var require_segmentDriver = __commonJS({
           handlers.onEvent(ev);
           return;
         }
-        contentSeen = true;
+        trail.observe(ev);
         markEvent();
         if (ev.event === "client_write") {
           const d2 = ev.data;
@@ -38528,10 +38933,12 @@ var require_segmentDriver = __commonJS({
           throw new DOMException("turn aborted", "AbortError");
         }
         const openingSegment = first;
-        const body2 = buildSegmentBody(start2, first, resumeToken, boundaryResult, orionResources);
+        trail.segmentStarts(boundaryResult);
+        const body2 = buildSegmentBody(start2, first ? "opening" : { resumeToken, boundaryResult }, trail);
         first = false;
         handlers.onPhaseChange?.("stream");
         let terminal;
+        let held;
         let markTerminal;
         const terminalSeen = new Promise((resolve5) => {
           markTerminal = resolve5;
@@ -38540,11 +38947,19 @@ var require_segmentDriver = __commonJS({
         let busyRefusal;
         const segmentOnEvent = (ev) => {
           watchdog.feed();
-          if (busyRetry && openingSegment && !contentSeen && busyRefusal === void 0 && ev.event === "turn_error" && isSessionBusyRefusal(ev.data)) {
+          if (busyRetry && openingSegment && !trail.contentSeen && busyRefusal === void 0 && ev.event === "turn_error" && isSessionBusyRefusal(ev.data)) {
             busyRefusal = ev;
             markTerminal();
             return;
           }
+          if (!terminal && held === void 0 && endsWithNothing(ev, trail)) {
+            held = ev;
+            markTerminal();
+            return;
+          }
+          deliver(ev);
+        };
+        const deliver = (ev) => {
           onEvent(ev);
           if (!terminal && (ev.event === "turn_complete" || ev.event === "turn_error")) {
             terminal = ev;
@@ -38571,6 +38986,14 @@ var require_segmentDriver = __commonJS({
           });
           throw new SessionBusyRefusal(busyRefusal);
         }
+        if (held !== void 0 && !handlers.signal?.aborted) {
+          watchdog.settle();
+          void streamDone.catch(() => {
+          });
+          const whole = await withWhatTheTurnLeft(held, closing);
+          deliver(whole);
+          return { kind: "turn_error", event: whole };
+        }
         if (terminal) {
           watchdog.settle();
           void streamDone.catch(() => {
@@ -38582,8 +39005,8 @@ var require_segmentDriver = __commonJS({
           watchdog.settle();
           void streamDone.catch(() => {
           });
-          const synthetic = killTerminal(start2.sessionId, kill, watchdog.step(), (0, keepAwake_js_1.sleptDuring)(watchdog.armedAt()));
-          segmentOnEvent(synthetic);
+          const synthetic = await withWhatTheTurnLeft(killTerminal(start2.sessionId, kill, watchdog.step(), (0, keepAwake_js_1.sleptDuring)(watchdog.armedAt())), closing);
+          deliver(synthetic);
           return { kind: "turn_error", event: synthetic };
         }
         if (handlers.signal?.aborted) {
@@ -38603,17 +39026,19 @@ var require_segmentDriver = __commonJS({
         handlers.onPhaseChange?.("boundary");
         resumeToken = readResumeToken(events);
         if (resumeToken === void 0) {
-          if (!events.some((e) => BOUNDARY_EVENTS.has(e.event))) {
+          if (!events.some((e) => boundaryEvents_js_1.BOUNDARY_EVENTS.has(e.event))) {
             throw new transportError_js_2.TransportError("segment stream ended without a terminal \u2014 the connection was cut mid-turn");
           }
           throw new Error("boundary segment carried no resume_token \u2014 cannot resume the turn");
         }
+        trail.parkedAt(resumeToken);
         const tokenSaving = start2.routing?.tokenSaving;
         const toolContext = tokenSaving === void 0 && handlers.signal === void 0 ? void 0 : {
           ...tokenSaving !== void 0 ? { tokenSaving } : {},
           ...handlers.signal !== void 0 ? { signal: handlers.signal } : {}
         };
-        boundaryResult = await untilStopped(resolveBoundary(events, handlers, start2.sessionId, toolContext), handlers.signal);
+        boundaryResult = await untilStopped(resolveBoundary(events, handlers, start2.sessionId, toolContext, trail), handlers.signal);
+        trail.answeredWith(boundaryResult);
       }
     }
     function untilStopped(work, signal) {
@@ -38634,7 +39059,8 @@ var require_segmentDriver = __commonJS({
         });
       });
     }
-    function buildSegmentBody(start2, first, resumeToken, boundaryResult, orionResources) {
+    function buildSegmentBody(start2, segment, trail) {
+      const orionResources = trail.orionResources;
       const body2 = {
         // Host-supplied extras ride first so the canonical fields below always win
         // a key collision (rule: the driver owns the wire shape, extras only add).
@@ -38683,9 +39109,9 @@ var require_segmentDriver = __commonJS({
       const repoIdentity = (0, repoIdentity_js_1.repoIdentityForSegment)(start2.routing?.workspaceRoot);
       if (repoIdentity !== void 0)
         Object.assign(body2, repoIdentity);
-      const cs = start2.getClientState?.();
-      if (cs !== void 0)
-        body2.client_state = cs;
+      const clientState = clientStateForSegment(start2.getClientState?.(), trail.plan);
+      if (clientState !== void 0)
+        body2.client_state = clientState;
       const fileHistory = start2.getFileHistoryManifest?.();
       if (fileHistory && fileHistory.snapshots.length > 0)
         body2.file_history = fileHistory;
@@ -38701,7 +39127,8 @@ var require_segmentDriver = __commonJS({
       if (attention && (attention.active || attention.open.length > 0 || attention.touched.length > 0)) {
         body2.ovault_attention = attention;
       }
-      if (first) {
+      const closing = segment === "opening" ? void 0 : segment.closing;
+      if (segment === "opening") {
         if (start2.skill) {
           body2.skill = start2.skill;
         } else {
@@ -38710,12 +39137,19 @@ var require_segmentDriver = __commonJS({
         if (start2.attachments && start2.attachments.length > 0)
           body2.attachments = start2.attachments;
       } else {
-        body2.resume_token = resumeToken;
-        if (boundaryResult !== void 0)
-          body2.boundary_result = boundaryResult;
-      }
-      const queued = start2.drainQueuedInput?.();
-      if (queued && queued.length > 0)
+        body2.resume_token = segment.resumeToken;
+        if (segment.boundaryResult !== void 0)
+          body2.boundary_result = segment.boundaryResult;
+        if (closing !== void 0) {
+          body2.abandoned = true;
+          if (closing === "recovery")
+            body2.recovery = true;
+        }
+      }
+      const queued = closing !== void 0 ? trail.steering : start2.drainQueuedInput?.() ?? [];
+      if (closing === void 0)
+        trail.steeredWith(queued);
+      if (queued.length > 0)
         body2.queued_input = queued.map(queuedInput_js_1.queuedInputWire);
       const relayDepth = start2.peerRelayDepth?.();
       if (relayDepth !== void 0)
@@ -38728,6 +39162,11 @@ var require_segmentDriver = __commonJS({
       }
       return (0, wellFormed_js_1.toWellFormedJsonDeep)(body2);
     }
+    function clientStateForSegment(state, announced) {
+      if (announced === void 0)
+        return state;
+      return state === void 0 ? { plan: announced } : { ...state, plan: announced };
+    }
     function applyRouting(body2, routing) {
       if (!routing)
         return;
@@ -38772,15 +39211,13 @@ var require_segmentDriver = __commonJS({
     }
     function readResumeToken(events) {
       for (const e of events) {
-        if (BOUNDARY_EVENTS.has(e.event)) {
-          const t = e.data.resume_token;
-          if (t !== void 0 && t !== null)
-            return t;
-        }
+        const token = (0, boundaryEvents_js_1.resumeTokenOf)(e);
+        if (token !== void 0)
+          return token;
       }
       return void 0;
     }
-    async function resolveBoundary(events, handlers, sessionId, toolContext) {
+    async function resolveBoundary(events, handlers, sessionId, toolContext, trail) {
       const hookReqs = events.filter((e) => e.event === "hook_request");
       if (hookReqs.length > 0) {
         const results = {};
@@ -38827,7 +39264,9 @@ var require_segmentDriver = __commonJS({
       }
       const toolReqs = events.filter((e) => e.event === "tool_request");
       if (toolReqs.length > 0) {
-        const results = await runToolBatch(toolReqs.map((e) => e.data), (req) => handlers.runTool(req, sessionId, toolContext), handlers.signal);
+        const batch = toolReqs.map((e) => e.data);
+        trail.runsTools(batch);
+        const results = await runToolBatch(batch, (req) => trail.watch(req, handlers.runTool(req, sessionId, toolContext)), handlers.signal);
         if (handlers.signal?.aborted)
           throw new DOMException("turn aborted", "AbortError");
         for (const result of results)
@@ -50954,6 +51393,7 @@ var require_agentManager = __commonJS({
     } });
     var agentNarration_2 = require_agentNarration();
     var askAnswers_js_1 = require_askAnswers();
+    var interruptedTurn_js_1 = require_interruptedTurn();
     var awaitWake_js_1 = require_awaitWake();
     var agentDefs_js_1 = require_agentDefs();
     var dosePolicy_js_1 = require_dosePolicy();
@@ -51606,6 +52046,7 @@ ${(0, agentNarration_2.lastChars)(entry.partialText.trim(), 4e3)}`;
       async runChild(entry, opts) {
         let outcome;
         let failure;
+        let left;
         try {
           const start2 = this.childSegmentStart(entry, opts);
           const handlers = this.childHandlers(entry);
@@ -51613,9 +52054,10 @@ ${(0, agentNarration_2.lastChars)(entry.partialText.trim(), 4e3)}`;
             transportRetry: {}
           });
         } catch (e) {
+          left = (0, interruptedTurn_js_1.interruptedTurnOf)(e);
           failure = entry.status === "stopped" || entry.status === "lost" ? void 0 : e instanceof Error ? e.message : String(e);
         }
-        await this.settleChild(entry, outcome, failure);
+        await this.settleChild(entry, outcome, failure, left);
       }
       childSegmentStart(entry, opts) {
         const { def, routing } = opts;
@@ -51765,7 +52207,7 @@ When done, reply with your findings \u2014 your FINAL MESSAGE is your report and
        * the worktree decision and `reportText` are final — a consumer that
        * observes a terminal status (agent_check, dashboards, harnesses polling
        * the registry) must never see half-settled terminal state. */
-      async settleChild(entry, outcome, failure) {
+      async settleChild(entry, outcome, failure, left) {
         const wasStopped = entry.status === "stopped" || entry.status === "lost";
         const terminal = wasStopped ? entry.status : outcome?.kind === "turn_complete" ? "finished" : "failed";
         let summary;
@@ -51776,18 +52218,22 @@ When done, reply with your findings \u2014 your FINAL MESSAGE is your report and
           entry.costUsd += typeof data.cost_usd === "number" ? data.cost_usd : 0;
           summary = typeof data.assistant_message === "string" && data.assistant_message.trim() || entry.partialText.trim() || "(Sub-agent completed but returned no output.)";
           success = !wasStopped;
-        } else if (wasStopped) {
-          summary = entry.partialText.trim() ? `Stopped before finishing. Partial result:
+        } else {
+          const transcript = outcome ? outcome.event.data.messages : left?.messages;
+          if (Array.isArray(transcript))
+            entry.transcript = transcript;
+          if (wasStopped) {
+            summary = entry.partialText.trim() ? `Stopped before finishing. Partial result:
 
 ${entry.partialText.trim()}` : "Stopped before producing any output.";
-          success = false;
-        } else {
-          const error = failure ?? String(outcome?.event.data?.error ?? "turn failed");
-          summary = entry.partialText.trim() ? `${error}
+          } else {
+            const error = failure ?? String(outcome?.event.data?.error ?? "turn failed");
+            summary = entry.partialText.trim() ? `${error}
 
 Partial result before the failure:
 
 ${entry.partialText.trim()}` : error;
+          }
           success = false;
         }
         const worktreeNote = await this.cleanupWorktree(entry);
@@ -62379,20 +62825,13 @@ var require_flushGate = __commonJS({
       peek() {
         return this.queue;
       }
-      /** Close the gate and hand back the queued items to drain IN ORDER after the flush. */
+      /** Close the gate and hand back the queued items IN ORDER. */
       open() {
         this.armed = false;
         const items = this.queue;
         this.queue = [];
         return items;
       }
-      /** Permanent close: discard and report how many items were lost. */
-      drop() {
-        this.armed = false;
-        const lost = this.queue.length;
-        this.queue = [];
-        return lost;
-      }
     };
     exports2.FlushGate = FlushGate;
   }
@@ -62519,6 +62958,7 @@ var require_mirror = __commonJS({
       // observes every event before this check.
       "tool_input_delta"
     ]);
+    var ACK_KINDS = /* @__PURE__ */ new Set(["rc_ack", "rc_permission_resolved"]);
     function coalesceInto(batch, event, n) {
       const last = batch[batch.length - 1];
       if (event.event === "thinking_delta") {
@@ -62615,19 +63055,27 @@ var require_mirror = __commonJS({
        *  and its ack must land regardless — the buffered channel replays it on attach. */
       emitControl(event) {
         if (this.phase === "dormant") {
-          this.chain = this.chain.then(() => this.deps.publish([event]).catch((error) => {
-            this.deps.reportOutcome({
-              kind: "rc_control_publish_failed",
-              session_id: this.sessionId,
-              error: String(error)
-            });
-          }));
+          this.publishDirect([event]);
           return;
         }
         if (this.gate.enqueue(event))
           return;
         this.enqueueLive(event);
       }
+      /** Publish outside the batch — sequenced through the SAME chain as backfills and flushes,
+       *  deliberately NOT generation-fenced (an ack must land even across a mirror reset). A
+       *  detached fire-and-forget POST here races a backfill that starts a beat later, and the
+       *  gateway stamps order by ARRIVAL: the losing interleaving renders a user's prompt AFTER
+       *  the answer it caused. */
+      publishDirect(events) {
+        this.chain = this.chain.then(() => this.deps.publish(events).catch((error) => {
+          this.deps.reportOutcome({
+            kind: "rc_control_publish_failed",
+            session_id: this.sessionId,
+            error: String(error)
+          });
+        }));
+      }
       /** A viewer attached (the instant signal). `backfill` is the viewer's word on what it
        *  needs: `true` (every phone before the gateway-held transcript, and any signal that
        *  does not say) earns a fresh backfill — while LIVE too, a re-attaching phone's state
@@ -62815,17 +63263,9 @@ var require_mirror = __commonJS({
           clearTimeout(this.timer);
           this.timer = null;
         }
-        const lostGate = this.gate.drop();
-        const lostBatch = this.batch.length;
+        const held = [...this.gate.open(), ...this.batch];
         this.batch = [];
-        if (lostGate + lostBatch > 0) {
-          this.deps.reportOutcome({
-            kind: "rc_mirror_dropped",
-            session_id: this.sessionId,
-            reason,
-            events: lostGate + lostBatch
-          });
-        }
+        this.salvageAcks(held, reason);
       }
       startBackfill() {
         this.generation += 1;
@@ -62934,12 +63374,7 @@ var require_mirror = __commonJS({
         const generation = this.generation;
         this.chain = this.chain.then(async () => {
           if (generation !== this.generation) {
-            this.deps.reportOutcome({
-              kind: "rc_mirror_dropped",
-              session_id: this.sessionId,
-              reason: "superseded_in_flight",
-              events: events.length
-            });
+            this.salvageAcks(events, "superseded_in_flight");
             return;
           }
           try {
@@ -62953,10 +63388,28 @@ var require_mirror = __commonJS({
               events: events.length,
               error: String(error)
             });
+            this.salvageAcks(events);
             this.goDormant("publish_failed");
           }
         });
       }
+      /** Events that will not reach the wire the way they were meant to: the acks among them are
+       *  published on their own (`ACK_KINDS`), the rest is counted as loss under `reason` — or
+       *  left to the caller's own accounting when no reason is given. */
+      salvageAcks(events, reason) {
+        const acks = events.filter((event) => ACK_KINDS.has(event.event));
+        if (acks.length > 0)
+          this.publishDirect(acks);
+        const lost = events.length - acks.length;
+        if (reason !== void 0 && lost > 0) {
+          this.deps.reportOutcome({
+            kind: "rc_mirror_dropped",
+            session_id: this.sessionId,
+            reason,
+            events: lost
+          });
+        }
+      }
     };
     exports2.SessionMirror = SessionMirror;
     function chunk(items, size) {
@@ -63106,6 +63559,17 @@ var require_hostBridge = __commonJS({
     var mirror_js_1 = require_mirror();
     var rcSettings_js_1 = require_rcSettings();
     var types_js_1 = require_types();
+    function mailboxStampOf(event) {
+      const data = event.data;
+      const stamp = data?.mailbox;
+      if (typeof stamp !== "object" || stamp === null)
+        return void 0;
+      const { origin, seq } = stamp;
+      if (typeof origin !== "string" || origin === "" || typeof seq !== "number")
+        return void 0;
+      return { origin, seq };
+    }
+    var MAILBOX_ORIGINS_MAX = 32;
     function isFenceRefusal(message) {
       const normalized = message.toLowerCase().replace(/[_-]/g, " ");
       return normalized.includes("stale epoch") || normalized.includes("not registered");
@@ -63204,6 +63668,9 @@ var require_hostBridge = __commonJS({
       const announced = /* @__PURE__ */ new Set();
       let beatWaiters = [];
       let mailboxCursor;
+      let streamGeneration;
+      const mailboxOrigins = /* @__PURE__ */ new Map();
+      let streamBlockedSince = null;
       let heartbeatTimer = null;
       let debounceTimer = null;
       let lastTickAt = null;
@@ -63506,12 +63973,47 @@ var require_hostBridge = __commonJS({
         if (!watchFramed && epoch !== null) {
           watchFramed = true;
           linkState = "seen";
+          if (streamBlockedSince !== null) {
+            report({ kind: "rc_stream_restored", blocked_ms: clock() - streamBlockedSince });
+            streamBlockedSince = null;
+          }
           setStatus({ phase: "connected" });
         }
         const event = raw;
+        if (event.event === "stream_status") {
+          const generation2 = event.data?.generation;
+          if (typeof generation2 === "string" && generation2 !== "" && generation2 !== streamGeneration) {
+            if (streamGeneration !== void 0)
+              mailboxCursor = void 0;
+            streamGeneration = generation2;
+          }
+        }
         if (typeof event.seq === "number" && (mailboxCursor === void 0 || event.seq > mailboxCursor)) {
           mailboxCursor = event.seq;
         }
+        applyControlFrame(event);
+      }
+      function applyControlFrame(event) {
+        const stamp = mailboxStampOf(event);
+        if (stamp !== void 0) {
+          const known = mailboxOrigins.get(stamp.origin);
+          mailboxOrigins.set(stamp.origin, {
+            seq: Math.max(stamp.seq, known?.seq ?? 0),
+            seenAtMs: clock()
+          });
+          if (mailboxOrigins.size > MAILBOX_ORIGINS_MAX) {
+            let oldest;
+            let oldestAt = Number.POSITIVE_INFINITY;
+            for (const [origin, { seenAtMs }] of mailboxOrigins) {
+              if (seenAtMs < oldestAt) {
+                oldest = origin;
+                oldestAt = seenAtMs;
+              }
+            }
+            if (oldest !== void 0)
+              mailboxOrigins.delete(oldest);
+          }
+        }
         if (event.event === "rc_command") {
           const stamped = event.data.epoch;
           if (typeof stamped === "number" && epoch !== null && stamped !== epoch) {
@@ -63536,6 +64038,22 @@ var require_hostBridge = __commonJS({
           }
         }
       }
+      function mailboxCursorsForBeat() {
+        const cursors = {};
+        for (const [origin, { seq }] of mailboxOrigins)
+          cursors[origin] = seq;
+        return cursors;
+      }
+      function applyMailbox(mailbox) {
+        if (!Array.isArray(mailbox) || mailbox.length === 0)
+          return;
+        const frames = mailbox.filter((frame) => typeof frame === "object" && frame !== null && typeof frame.event === "string");
+        if (frames.length === 0)
+          return;
+        report({ kind: "rc_mailbox_read", frames: frames.length });
+        for (const frame of frames)
+          applyControlFrame(frame);
+      }
       function teardownChannel() {
         controlWatch?.dispose();
         controlWatch = null;
@@ -63546,9 +64064,23 @@ var require_hostBridge = __commonJS({
         watchFramed = false;
         watchOpenedAtMs = clock();
         controlWatch = deps2.bridge.watchSession(channel, onControlEvent, {
-          since: () => mailboxCursor
+          since: () => mailboxCursor,
+          generation: () => streamGeneration
         });
       }
+      function judgeStream(linked) {
+        if (watchFramed || linked === void 0 || controlWatch === null) {
+          setStatus({ phase: "connected" });
+          return;
+        }
+        if (watchAttaching())
+          return;
+        if (streamBlockedSince === null) {
+          streamBlockedSince = clock();
+          report({ kind: "rc_stream_blocked" });
+        }
+        setStatus({ phase: "stream_blocked", sinceMs: streamBlockedSince });
+      }
       function watchAttaching() {
         return !watchFramed && clock() - watchOpenedAtMs < tuning.heartbeatMs / 2;
       }
@@ -63863,7 +64395,11 @@ var require_hostBridge = __commonJS({
           const result = await beatRpc("rc_heartbeat", {
             host_id: hostId,
             epoch: myEpoch,
-            sessions: upserts
+            sessions: upserts,
+            // The heartbeat lane's two words: what this host has received off its mailbox, and
+            // whether its stream delivers at all (what the phones are told beside this machine).
+            mailbox_cursors: mailboxCursorsForBeat(),
+            push_blocked: streamBlockedSince !== null
           });
           if (superseded())
             return;
@@ -63907,8 +64443,9 @@ var require_hostBridge = __commonJS({
             relinked = false;
             linkState = "seen";
             resetLinkFailures();
-            setStatus({ phase: "connected" });
+            judgeStream(result.linked);
           }
+          applyMailbox(result.mailbox);
           applyWatching(result.watching);
         } catch (error) {
           if (superseded())
@@ -64228,7 +64765,7 @@ var require_hostBridge = __commonJS({
           tick();
         },
         canAnswerPermissions(sessionId) {
-          return status.phase === "connected" && settings.enabled && sessions.has(sessionId) && !hidden(sessionId);
+          return (status.phase === "connected" || status.phase === "stream_blocked") && settings.enabled && sessions.has(sessionId) && !hidden(sessionId);
         },
         status: () => status,
         onStatusChange(listener) {
@@ -64541,6 +65078,13 @@ var require_statusText = __commonJS({
           return { label: "connecting", detail: null, action: null, severity: "ok" };
         case "connected":
           return { label: "connected", detail: null, action: null, severity: "ok" };
+        case "stream_blocked":
+          return {
+            label: "connected by heartbeat",
+            detail: null,
+            action: "Orion's live stream isn't reaching this machine \u2014 a proxy or VPN on this network is holding it \u2014 so your phone's messages arrive with its heartbeat, up to about twenty seconds later.",
+            severity: "transport"
+          };
         case "reconnecting":
           return { label: "reconnecting", detail: status.reason, action: null, severity: "transport" };
         case "failed":
@@ -79398,7 +79942,7 @@ var require_toolExecutor = __commonJS({
       };
     }();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.ToolExecutor = exports2.STOPPED_COMMAND_STATUS = exports2.DETACHED_PROCESS_NOTE = exports2.DETACHED_OUTPUT_DRAIN_MS = exports2.SUBPROCESS_DEFAULT_TIMEOUT_S = exports2.UNBOUNDED_COMMAND_TIMEOUTS = exports2.DESKTOP_COMMAND_TIMEOUTS = void 0;
+    exports2.ToolExecutor = exports2.STOPPED_WITH_TURN_NOTE = exports2.STOPPED_COMMAND_STATUS = exports2.DETACHED_PROCESS_NOTE = exports2.DETACHED_OUTPUT_DRAIN_MS = exports2.SUBPROCESS_DEFAULT_TIMEOUT_S = exports2.UNBOUNDED_COMMAND_TIMEOUTS = exports2.DESKTOP_COMMAND_TIMEOUTS = void 0;
     exports2.enhancedSearchStamp = enhancedSearchStamp;
     exports2.judgeSearchStamp = judgeSearchStamp;
     exports2.formatErrorDiagnostics = formatErrorDiagnostics;
@@ -79780,16 +80324,50 @@ ${exports2.DETACHED_PROCESS_NOTE}`;
       onChunk?.(note, "status");
       return note;
     }
-    function endWithTurn(proc, signal) {
+    function endWithTurn(proc, signal, onEnded) {
       if (signal === void 0)
         return;
-      const stop2 = () => void (0, processHardening_1.terminateChildTree)(proc);
+      const stop2 = () => {
+        onEnded?.();
+        void (0, processHardening_1.terminateChildTree)(proc);
+      };
       signal.addEventListener("abort", stop2, { once: true });
       const release = () => signal.removeEventListener("abort", stop2);
       proc.once("exit", release);
       proc.once("error", release);
     }
     exports2.STOPPED_COMMAND_STATUS = "\n(exit null)";
+    exports2.STOPPED_WITH_TURN_NOTE = "(the turn was stopped while this command was running \u2014 it did not finish)";
+    var CommandStop = class {
+      signal;
+      ended = false;
+      constructor(signal) {
+        this.signal = signal;
+      }
+      /** End `proc` with the turn ({@link endWithTurn}). */
+      watch(proc) {
+        endWithTurn(proc, this.signal, () => {
+          this.ended = true;
+        });
+      }
+      /** Whether the stop landed while the command's process was alive. */
+      get endedCommand() {
+        return this.ended;
+      }
+    };
+    var EXIT_TRAILER = /\n?(\(exit (?:null|-?\d+)\)\s*)$/;
+    function stoppedWithTurn(result, stop2) {
+      if (!stop2.endedCommand)
+        return result;
+      const trailer = EXIT_TRAILER.exec(result);
+      if (trailer === null)
+        return result;
+      const printed = result.slice(0, trailer.index);
+      const lead = printed === "" ? "" : `${printed}
+`;
+      return `${lead}${exports2.STOPPED_WITH_TURN_NOTE}
+${trailer[1]}`;
+    }
     function openCommandCard(sink, sessionId, toolKey, command, signal) {
       if (sink === null || signal?.aborted)
         return { feed: void 0, close: () => void 0 };
@@ -81304,18 +81882,19 @@ exit $__orion_rc`;
         const sandbox = this.sandboxForParams(params, sessionId);
         const card = openCommandCard(params._agent_id ? null : this.termSink, sessionId, reqId, command, context.signal);
         try {
-          const out2 = await this.runBash(wrapped, resolveCommandTimeoutS(params.timeout_s, this.commandTimeouts), effectiveCwd, card.feed, false, sandbox, command, context.signal);
+          const stop2 = new CommandStop(context.signal);
+          const out2 = await this.runBash(wrapped, resolveCommandTimeoutS(params.timeout_s, this.commandTimeouts), effectiveCwd, card.feed, false, sandbox, command, stop2);
           if (baseline) {
             const changes = await (0, bashFileChanges_1.diffAgainstBaseline)(baseline);
             if (changes.length > 0)
               this.pendingBashChanges.set(reqId, changes);
           }
-          const compressed = (0, terminalOutputCompression_1.compressTerminalOutput)({
+          const compressed = stoppedWithTurn((0, terminalOutputCompression_1.compressTerminalOutput)({
             toolName: req.name,
             command,
             output: out2,
             tokenSaving: context.tokenSaving
-          });
+          }), stop2);
           if (sandbox && /\(exit \d+\)\s*$/.test(out2) && (0, bashSandbox_1.looksLikeSandboxDenial)(out2)) {
             return compressed + bashSandbox_1.SANDBOX_RETRY_HINT;
           }
@@ -81376,18 +81955,19 @@ exit $__orion_rc`;
         const baseline = detectRoot && effectiveCwd && !inScratch ? await (0, bashFileChanges_1.captureBaseline)(effectiveCwd, detectRoot) : null;
         const card = openCommandCard(params._agent_id ? null : this.termSink, sessionId, reqId, command, context.signal);
         try {
-          const out2 = await this.runPowershell(wrapped, resolveCommandTimeoutS(params.timeout_s, this.commandTimeouts), effectiveCwd, card.feed, context.signal);
+          const stop2 = new CommandStop(context.signal);
+          const out2 = await this.runPowershell(wrapped, resolveCommandTimeoutS(params.timeout_s, this.commandTimeouts), effectiveCwd, card.feed, stop2);
           if (baseline) {
             const changes = await (0, bashFileChanges_1.diffAgainstBaseline)(baseline);
             if (changes.length > 0)
               this.pendingBashChanges.set(reqId, changes);
           }
-          return (0, terminalOutputCompression_1.compressTerminalOutput)({
+          return stoppedWithTurn((0, terminalOutputCompression_1.compressTerminalOutput)({
             toolName: req.name,
             command,
             output: out2,
             tokenSaving: context.tokenSaving
-          });
+          }), stop2);
         } finally {
           card.close();
           if (cwdFile) {
@@ -81815,8 +82395,8 @@ exit $__orion_rc`;
       /** Spawn one PowerShell command. Shares `runBash`'s streaming, truncation,
        *  exit-marker and turn-stop conventions so the model reads the same shape of
        *  result from either shell; the interpreter and its flags are the only difference. */
-      async runPowershell(command, timeoutS, cwd, onChunk, signal) {
-        if (signal?.aborted)
+      async runPowershell(command, timeoutS, cwd, onChunk, stop2) {
+        if (stop2?.signal?.aborted)
           throw new DOMException("turn aborted", "AbortError");
         const inv = (0, powershellResolver_1.powershellInvocation)(command);
         return await new Promise((resolve5, reject) => {
@@ -81840,7 +82420,7 @@ exit $__orion_rc`;
           proc.stdout?.on("data", take);
           proc.stderr?.on("data", take);
           (0, processHardening_1.trackChild)(proc);
-          endWithTurn(proc, signal);
+          stop2?.watch(proc);
           let timedOut = false;
           const timer = timeoutS === null ? null : setTimeout(() => {
             timedOut = true;
@@ -81873,8 +82453,8 @@ exit $__orion_rc`;
           });
         });
       }
-      async runBash(command, timeoutS, cwd, onChunk, partialOnTimeout = false, sandbox, label = command, signal) {
-        if (signal?.aborted)
+      async runBash(command, timeoutS, cwd, onChunk, partialOnTimeout = false, sandbox, label = command, stop2) {
+        if (stop2?.signal?.aborted)
           throw new DOMException("turn aborted", "AbortError");
         const inv = sandbox && sandbox.capability ? (0, bashSandbox_1.buildSandboxedInvocation)(command, {
           capability: sandbox.capability,
@@ -81918,7 +82498,7 @@ exit $__orion_rc`;
           this.shellChildren.set(proc, label);
           proc.once("exit", () => this.shellChildren.delete(proc));
           proc.once("error", () => this.shellChildren.delete(proc));
-          endWithTurn(proc, signal);
+          stop2?.watch(proc);
           let timedOut = false;
           const timer = timeoutS === null ? null : setTimeout(() => {
             timedOut = true;
@@ -87230,6 +87810,7 @@ var require_loopRunner = __commonJS({
     var askAnswers_js_1 = require_askAnswers();
     var anchorDrift_js_1 = require_anchorDrift();
     var segmentDriver_js_1 = require_segmentDriver();
+    var turnClose_js_1 = require_turnClose();
     var common_js_1 = require_common();
     var loopEnvelope_js_1 = require_loopEnvelope();
     var loopRuns_js_1 = require_loopRuns();
@@ -87412,27 +87993,34 @@ var require_loopRunner = __commonJS({
         let text = "";
         let failure = "";
         try {
-          const outcome = await (0, segmentDriver_js_1.driveTurn)(this.deps.transport, {
-            sessionId,
-            ...decl.skill ? { skill: { name: decl.skill, args: "" } } : { text: decl.prompt },
-            getMessages: () => [],
-            routing,
-            // No fan-out, no scheduling, no work graphs: a standing loop is one agent.
-            clientCapabilities: []
-          }, this.handlers(decl, run3, budget, sessionId, (question) => {
-            parkedQuestion = question;
-            void this.deps.store.save({
-              ...base,
-              status: "parked",
-              session_id: sessionId,
-              cost_usd: budget.spendUsd,
-              parked: question,
-              summary: `waiting on you: ${(0, common_js_1.clipTail)(question.question, 160)}`
-            });
-            if (decl.notify.on.includes("parked")) {
-              this.deps.notify?.(`[loop ${decl.name}] waiting on you: ${question.question}`);
-            }
-          }));
+          const outcome = await (0, segmentDriver_js_1.driveTurn)(
+            this.deps.transport,
+            {
+              sessionId,
+              ...decl.skill ? { skill: { name: decl.skill, args: "" } } : { text: decl.prompt },
+              getMessages: () => [],
+              routing,
+              // No fan-out, no scheduling, no work graphs: a standing loop is one agent.
+              clientCapabilities: []
+            },
+            this.handlers(decl, run3, budget, sessionId, (question) => {
+              parkedQuestion = question;
+              void this.deps.store.save({
+                ...base,
+                status: "parked",
+                session_id: sessionId,
+                cost_usd: budget.spendUsd,
+                parked: question,
+                summary: `waiting on you: ${(0, common_js_1.clipTail)(question.question, 160)}`
+              });
+              if (decl.notify.on.includes("parked")) {
+                this.deps.notify?.(`[loop ${decl.name}] waiting on you: ${question.question}`);
+              }
+            }),
+            // A run starts from nothing and its session is closed behind it: nothing reads what a
+            // run that was stopped left.
+            turnClose_js_1.CLOSE_TURNS_IN_BACKGROUND
+          );
           if (outcome.kind === "turn_complete") {
             const data = outcome.event.data;
             text = typeof data.assistant_message === "string" ? data.assistant_message : "";
@@ -88833,7 +89421,7 @@ var require_dist = __commonJS({
       for (var p in m2) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m2, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.safeSpawnCwd = exports2.gitFrom = exports2.reconcileMemoryIndex = exports2.memoryRootsFor = exports2.memoryRootOf = exports2.isAbsolutePath = exports2.frontmatterField = exports2.MEMORY_INDEX_FILENAME = exports2.watchUserSettingsFile = void 0;
+    exports2.safeSpawnCwd = exports2.gitFrom = exports2.reconcileMemoryIndex = exports2.memoryRootsFor = exports2.memoryRootOf = exports2.isAbsolutePath = exports2.frontmatterField = exports2.MEMORY_INDEX_FILENAME = exports2.watchUserSettingsFile = exports2.TURN_CLOSE_WAIT_MS = exports2.TURN_CLOSE_TIMEOUT_MS = exports2.STOPPED_TOOL_GRACE_MS = exports2.CLOSE_TURNS_IN_BACKGROUND = void 0;
     __exportStar(require_shims(), exports2);
     __exportStar(require_protocol(), exports2);
     __exportStar(require_askAnswers(), exports2);
@@ -88863,6 +89451,21 @@ var require_dist = __commonJS({
     __exportStar(require_migrateChat(), exports2);
     __exportStar(require_streamHealth(), exports2);
     __exportStar(require_segmentDriver(), exports2);
+    __exportStar(require_interruptedTurn(), exports2);
+    var turnClose_1 = require_turnClose();
+    Object.defineProperty(exports2, "CLOSE_TURNS_IN_BACKGROUND", { enumerable: true, get: function() {
+      return turnClose_1.CLOSE_TURNS_IN_BACKGROUND;
+    } });
+    Object.defineProperty(exports2, "STOPPED_TOOL_GRACE_MS", { enumerable: true, get: function() {
+      return turnClose_1.STOPPED_TOOL_GRACE_MS;
+    } });
+    Object.defineProperty(exports2, "TURN_CLOSE_TIMEOUT_MS", { enumerable: true, get: function() {
+      return turnClose_1.TURN_CLOSE_TIMEOUT_MS;
+    } });
+    Object.defineProperty(exports2, "TURN_CLOSE_WAIT_MS", { enumerable: true, get: function() {
+      return turnClose_1.TURN_CLOSE_WAIT_MS;
+    } });
+    __exportStar(require_planState(), exports2);
     __exportStar(require_queuedInput(), exports2);
     __exportStar(require_heldInputPen(), exports2);
     __exportStar(require_customProviders(), exports2);
@@ -89172,31 +89775,6 @@ var require_clientState = __commonJS({
   }
 });
 
-// ../packages/orion-client-ui-core/dist/interruptedTurn.js
-var require_interruptedTurn = __commonJS({
-  "../packages/orion-client-ui-core/dist/interruptedTurn.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.MOVED_ON_NOTE = void 0;
-    exports2.interruptedTurnMessages = interruptedTurnMessages2;
-    var textBlock = (text) => ({ type: "text", text });
-    exports2.MOVED_ON_NOTE = "[Reply cut off here \u2014 the user sent their next message before it finished. That message is what they want now: pick up from this point as it directs, without restarting this reply or remarking on the cut.]";
-    function interruptedTurnMessages2(messages, prompt, partialReply, cause = "stopped") {
-      const out2 = [...messages];
-      if (prompt && prompt.trim().length > 0) {
-        out2.push({ role: "user", content: [textBlock(prompt)] });
-      }
-      if (partialReply && partialReply.trim().length > 0) {
-        const content = [textBlock(partialReply)];
-        if (cause === "moved_on")
-          content.push(textBlock(exports2.MOVED_ON_NOTE));
-        out2.push({ role: "assistant", content });
-      }
-      return out2;
-    }
-  }
-});
-
 // ../packages/orion-client-ui-core/dist/chatFork.js
 var require_chatFork = __commonJS({
   "../packages/orion-client-ui-core/dist/chatFork.js"(exports2) {
@@ -93094,7 +93672,7 @@ var require_progress = __commonJS({
   "../packages/orion-client-ui-core/dist/progress.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.STALLED_LABEL = exports2.STALL_AFTER_MS = exports2.THINKING_STAGES_MS = exports2.WAITING_FOR_PREVIOUS_TURN = void 0;
+    exports2.STALLED_LABEL = exports2.STALL_AFTER_MS = exports2.THINKING_STAGES_MS = exports2.STOPPING_TURN = exports2.WAITING_FOR_PREVIOUS_TURN = void 0;
     exports2.formatMeterElapsed = formatMeterElapsed3;
     exports2.formatMeterTokens = formatMeterTokens;
     exports2.progressMeter = progressMeter;
@@ -93102,6 +93680,7 @@ var require_progress = __commonJS({
     exports2.thinkingLabel = thinkingLabel;
     exports2.isStalled = isStalled;
     exports2.WAITING_FOR_PREVIOUS_TURN = "Waiting for the previous turn to finish\u2026";
+    exports2.STOPPING_TURN = "Stopping\u2026";
     function formatMeterElapsed3(ms) {
       const total = Math.max(0, Math.floor(ms / 1e3));
       const h = Math.floor(total / 3600);
@@ -93549,6 +94128,107 @@ var require_pasteRefs = __commonJS({
   }
 });
 
+// ../packages/orion-client-ui-core/dist/providerFailure.js
+var require_providerFailure = __commonJS({
+  "../packages/orion-client-ui-core/dist/providerFailure.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.providerWords = providerWords;
+    exports2.plainLine = plainLine;
+    exports2.readEndpointFailure = readEndpointFailure;
+    var toolLog_1 = require_toolLog();
+    var ADAPTER_PREFIX = /provider request failed:\s*/i;
+    var RELAY_WORDS = /^gateway (auth refused|rate limit|unavailable|stream)\b/i;
+    function providerWords(text) {
+      const m2 = ADAPTER_PREFIX.exec(text);
+      if (!m2)
+        return null;
+      const words = text.slice(m2.index + m2[0].length);
+      return RELAY_WORDS.test(words) ? null : words;
+    }
+    var HIDDEN = /[\u0000-\u001f\u007f-\u009f\u200b-\u200f\u2028-\u202e\u2060-\u206f\ufeff]/g;
+    function plainLine(text, max) {
+      return (0, toolLog_1.clip)(text.replace(HIDDEN, " "), max);
+    }
+    var DETAIL_MAX = 200;
+    function messageIn(value, depth) {
+      if (typeof value === "string")
+        return value.trim() || null;
+      if (depth > 3 || value === null || typeof value !== "object" || Array.isArray(value))
+        return null;
+      const record = value;
+      for (const key of ["message", "detail", "error"]) {
+        const found = messageIn(record[key], depth + 1);
+        if (found !== null)
+          return found;
+      }
+      return null;
+    }
+    var TITLE_SCAN = 4096;
+    function bodyMessage(body2, status) {
+      const raw = body2.trim();
+      if (!raw)
+        return "";
+      let found = null;
+      try {
+        found = messageIn(JSON.parse(raw), 0);
+      } catch {
+      }
+      if (found === null) {
+        const title = /<title[^>]*>([\s\S]*?)<\/title>/i.exec(raw.slice(0, TITLE_SCAN));
+        found = title ? title[1] : raw.startsWith("<") ? "" : raw;
+      }
+      return plainLine(found.replace(new RegExp(`^\\s*${status}\\b[\\s:-]*`), ""), DETAIL_MAX);
+    }
+    var HTTP_ANSWER = /^(\d{3})(?:[ \t]+([^:\r\n]*))?:[ \t]*([\s\S]*)$/;
+    var STREAMED_ERROR = /^(?:openai responses|openai|anthropic) error \(([^)]*)\):\s*([\s\S]*)$/i;
+    function answerDetail(status, words) {
+      if (status === null)
+        return words || null;
+      return words ? `HTTP ${status}: ${words}` : `HTTP ${status}`;
+    }
+    var CONNECT_FAILURE = /^error sending request for url \(([^)\s]*)\)([\s\S]*)$/i;
+    var RELAY_ROUTE = /\/llm\/v1\/stream(?:[?#]|$)/i;
+    var TRANSPORT_FRAMING = /^(client error \(\w+\)|tcp connect error|dns error|error trying to connect|connection error)$/i;
+    function reachDetail(url, chain) {
+      let where = "";
+      try {
+        const origin = new URL(url).origin;
+        where = origin === "null" ? "" : origin;
+      } catch {
+      }
+      const cause = chain.split(/:\s+/).map((part) => part.trim()).find((part) => part.length > 0 && !TRANSPORT_FRAMING.test(part));
+      const why = cause ? plainLine(cause.replace(/\s*\(os error \d+\)$/i, "").replace(/[.]$/, ""), 120) : "";
+      if (why && where)
+        return `${why} at ${where}`;
+      return why || where || null;
+    }
+    var RELAYED = /^provider request failed:/i;
+    function readEndpointFailure(said) {
+      if (RELAYED.test(said))
+        return null;
+      const reach = CONNECT_FAILURE.exec(said);
+      if (reach) {
+        return RELAY_ROUTE.test(reach[1]) ? null : { shape: "unreachable", detail: reachDetail(reach[1], reach[2]) };
+      }
+      const http = HTTP_ANSWER.exec(said);
+      if (http) {
+        const status2 = Number(http[1]);
+        const message2 = bodyMessage(http[3], http[1]);
+        return { shape: "answer", status: status2, kind: "", message: message2, detail: answerDetail(status2, message2 || plainLine(http[2] ?? "", 80)) };
+      }
+      const streamed = STREAMED_ERROR.exec(said);
+      if (!streamed)
+        return null;
+      const code = streamed[1].trim();
+      const status = /^\d{3}$/.test(code) ? Number(code) : null;
+      const kind = status === null ? code : "";
+      const message = plainLine(streamed[2], DETAIL_MAX);
+      return { shape: "answer", status, kind, message, detail: answerDetail(status, message || plainLine(kind, 80)) };
+    }
+  }
+});
+
 // ../packages/orion-client-ui-core/dist/turnErrors.js
 var require_turnErrors = __commonJS({
   "../packages/orion-client-ui-core/dist/turnErrors.js"(exports2) {
@@ -93556,6 +94236,7 @@ var require_turnErrors = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.describeTurnError = describeTurnError3;
     var client_core_1 = require_dist();
+    var providerFailure_1 = require_providerFailure();
     var HINTS = {
       retry: "Send it again to retry.",
       pick_model: "Pick another model.",
@@ -93565,6 +94246,8 @@ var require_turnErrors = __commonJS({
       compact: "Compact the conversation, or start a new chat.",
       none: null
     };
+    var CONTEXT_TOO_LONG = /context (window )?(too large|exceeded)|prompt is too long|too many tokens|exceeds the model's context/i;
+    var BUSY = /rate.?limit|too many requests|\b429\b|overloaded|\b529\b/i;
     function providerDetail(text) {
       const m2 = /provider reported an error:\s*(.+)$/i.exec(text);
       return m2 ? m2[1].trim() : null;
@@ -93576,6 +94259,51 @@ var require_turnErrors = __commonJS({
     function capitalise(text) {
       return text.length === 0 ? text : text[0].toUpperCase() + text.slice(1);
     }
+    function endpointOf(ctx) {
+      const name2 = (0, client_core_1.parseCustomProviderRef)(ctx.provider?.trim() ?? "");
+      if (name2 === null)
+        return null;
+      return ctx.mode === "duet" ? "" : name2;
+    }
+    var ENDPOINT_OUTCOMES = {
+      refused: {
+        headline: (who) => `${capitalise(who)} refused the request.`,
+        hint: "Check the endpoint's API key and that its server is healthy, then send it again."
+      },
+      unreachable: {
+        headline: (who) => `Orion couldn't reach ${who}.`,
+        hint: "Check that the endpoint is running and its address is right, then send it again."
+      },
+      busy: {
+        headline: (who) => `${capitalise(who)} is busy right now.`,
+        hint: HINTS.retry
+      },
+      failed: {
+        headline: (who) => `${capitalise(who)} returned an error.`,
+        hint: "Check the endpoint's server, then send it again."
+      }
+    };
+    var REFUSAL_KIND = /auth|permission|forbidden|unauthori[sz]ed|api.?key/i;
+    function outcomeOf(reading) {
+      if (reading.shape === "unreachable")
+        return "unreachable";
+      const { status, kind, message } = reading;
+      if (status === 401 || status === 403 || status === null && REFUSAL_KIND.test(kind))
+        return "refused";
+      if (status === 429 || status === 529 || BUSY.test(kind) || BUSY.test(message))
+        return "busy";
+      return "failed";
+    }
+    function endpointFailure(said, name2) {
+      if (CONTEXT_TOO_LONG.test(said))
+        return null;
+      const reading = (0, providerFailure_1.readEndpointFailure)(said);
+      if (reading === null)
+        return null;
+      const who = name2 ? `your endpoint "${(0, providerFailure_1.plainLine)(name2, 60)}"` : "your endpoint";
+      const { headline, hint } = ENDPOINT_OUTCOMES[outcomeOf(reading)];
+      return { headline: headline(who), detail: reading.detail, action: "retry", hint, retryable: true };
+    }
     function describeTurnError3(data, ctx = {}) {
       const text = typeof data?.error === "string" ? data.error.trim() : "";
       const code = typeof data?.code === "string" ? data.code : "";
@@ -93594,6 +94322,13 @@ var require_turnErrors = __commonJS({
       if ((0, client_core_1.describeNetworkFailure)(new Error(text)).kind === "tls-untrusted") {
         return view((0, client_core_1.networkFailureText)(new Error(text)), "network_settings", null, true);
       }
+      const said = (0, providerFailure_1.providerWords)(text);
+      const endpoint = endpointOf(ctx);
+      if (said !== null && endpoint !== null) {
+        const failure = endpointFailure(said, endpoint);
+        if (failure !== null)
+          return failure;
+      }
       if (/no provider adapter configured/i.test(text) || /provider .* not (configured|available)/i.test(text)) {
         return view(`${model} can't run on this server.`, "pick_model");
       }
@@ -93616,13 +94351,13 @@ var require_turnErrors = __commonJS({
       if (/fetch failed|ECONNREFUSED|ENOTFOUND|ECONNRESET|network|unreachable|socket hang up|error sending request|client error \(Connect\)/i.test(text)) {
         return view("Orion couldn't reach the backend.", "check_network", null, true);
       }
-      if (/gateway auth refused|\b401\b|unauthori[sz]ed|not signed in|sign-in|signin|token (expired|revoked|refused)|auth(entication)? (failed|error)/i.test(text)) {
+      if (said === null && /gateway auth refused|\b401\b|unauthori[sz]ed|not signed in|sign-in|signin|token (expired|revoked|refused)|auth(entication)? (failed|error)/i.test(text)) {
         return view("Your sign-in has expired.", "sign_in");
       }
-      if (/context (window )?(too large|exceeded)|prompt is too long|too many tokens|exceeds the model's context/i.test(text)) {
+      if (CONTEXT_TOO_LONG.test(text)) {
         return view("The conversation is too long for the model's window.", "compact");
       }
-      if (/rate.?limit|too many requests|\b429\b|overloaded|\b529\b/i.test(text)) {
+      if (BUSY.test(text)) {
         return view("The model provider is busy right now.", "retry");
       }
       if (text.length === 0) {
@@ -94048,6 +94783,8 @@ var require_placeholder = __commonJS({
           const waiting = n === 1 ? "1 message waiting for the next step" : `${n} messages waiting for the next step`;
           return host.queueEditKey ? `${waiting} \u2014 ${host.queueEditKey} edits, Enter adds another` : `${waiting} \u2014 Enter adds another`;
         }
+        case "stopping":
+          return "Stopping the turn \u2014 what you send now goes next";
         case "parked":
           return situation.on === "permission" ? parkedComposer_1.PARKED_COMPOSER_WORDING.permissionPlaceholder : situation.on === "plan" ? parkedComposer_1.PARKED_COMPOSER_WORDING.plan : parkedComposer_1.PARKED_COMPOSER_WORDING.ask;
         case "after-error":
@@ -94757,7 +95494,6 @@ var require_dist2 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.normalizeCapabilities = exports2.isRenderableGuard = exports2.isGuardEntitled = exports2.entitledGuards = exports2.productToggles = exports2.UNAVAILABLE_CAPABILITIES = exports2.GUARD_IDS = exports2.GUARD_FIELDS = exports2.parseUserCompaction = exports2.parseInputGuardEvent = exports2.parseTrust = void 0;
     __exportStar(require_clientState(), exports2);
-    __exportStar(require_interruptedTurn(), exports2);
     __exportStar(require_chatFork(), exports2);
     __exportStar(require_permissionCard(), exports2);
     __exportStar(require_askCard(), exports2);
@@ -110384,7 +111120,7 @@ var ScrollBox2 = ScrollBox_default;
 
 // src/main.tsx
 var import_client_core61 = __toESM(require_dist(), 1);
-var import_client_ui_core54 = __toESM(require_dist2(), 1);
+var import_client_ui_core55 = __toESM(require_dist2(), 1);
 var import_client_core62 = __toESM(require_dist(), 1);
 import { fileURLToPath as fileURLToPath3 } from "url";
 import * as os8 from "os";
@@ -112594,6 +113330,9 @@ function fileModified(s, d2) {
   const live = settlesBlock && f.live ? { ...f.live, liveCode: null } : f.live;
   return { ...f, live, settled: [...f.settled, item] };
 }
+function applyPlanUpdated(s, plan) {
+  return { ...s, clientState: { ...s.clientState, plan } };
+}
 function applyTurnComplete(s, data) {
   const flushed = flushLive(s);
   const messages = Array.isArray(data.messages) ? data.messages : flushed.messages;
@@ -112608,24 +113347,22 @@ function applyTurnComplete(s, data) {
     live: null
   });
 }
-function isUnrepairedStop(data) {
-  return data.error === "cancelled" && !Array.isArray(data.messages);
-}
-function applyTurnError(s, data) {
-  const flushed = flushLive(s);
-  const messages = Array.isArray(data.messages) ? data.messages : flushed.messages;
-  const settledTurn = { ...flushed, messages, committedCount: flushed.settled.length, live: null };
-  return isUnrepairedStop(data) ? settledTurn : markTurnBoundary(settledTurn);
-}
-function applyTurnInterrupted(s, prompt, partialReply = "") {
-  const partial = partialReply || s.live?.assistantText || "";
+function settleEndedTurn(s, left, forkable) {
   const flushed = flushLive(s);
-  return markTurnBoundary({
+  const settledTurn = {
     ...flushed,
-    messages: (0, import_client_ui_core8.interruptedTurnMessages)(flushed.messages, prompt, partial),
+    messages: left ?? flushed.messages,
     committedCount: flushed.settled.length,
     live: null
-  });
+  };
+  return forkable ? markTurnBoundary(settledTurn) : settledTurn;
+}
+function applyTurnError(s, data) {
+  const left = Array.isArray(data.messages) ? data.messages : void 0;
+  return settleEndedTurn(s, left, left !== void 0 || data.error !== "cancelled");
+}
+function applyTurnInterrupted(s, left) {
+  return settleEndedTurn(s, left?.messages, left !== void 0);
 }
 function hydrate(sessionId, messages, clientState, transcript, contextGauge, turnMarks) {
   const msgs = Array.isArray(messages) ? messages : [];
@@ -113273,6 +114010,7 @@ function sessionSwapReset(s) {
     turnStartedAt: 0,
     // a stale anchor from a mid-swap turn must never stamp an Orbited line
     waitingOnPreviousTurn: false,
+    stopping: false,
     turnFacts: import_client_ui_core12.EMPTY_TURN_FACTS,
     followUp: null,
     lastTurnMs: 0,
@@ -113324,6 +114062,7 @@ function initialAppState(partial) {
     turnStartedAt: 0,
     turnModel: "",
     waitingOnPreviousTurn: false,
+    stopping: false,
     turnFacts: import_client_ui_core12.EMPTY_TURN_FACTS,
     followUp: null,
     lastTurnMs: 0,
@@ -119063,6 +119802,20 @@ function applyIndexStatus(state, key, value) {
   return state;
 }
 
+// src/state/stoppedTurn.ts
+function showInterrupted(transcript, turn) {
+  if (turn.settled) return;
+  transcript.setState(
+    (s) => s.sessionId !== turn.sessionId || s.live === null ? s : appendNote(applyTurnInterrupted(s, void 0), INTERRUPT_NOTE)
+  );
+}
+function settleInterrupted(transcript, turn, left) {
+  if (turn.settled) return;
+  showInterrupted(transcript, turn);
+  turn.settled = true;
+  transcript.setState((s) => s.sessionId === turn.sessionId ? applyTurnInterrupted(s, left) : s);
+}
+
 // src/events/renderLane.ts
 var import_client_core31 = __toESM(require_dist(), 1);
 var import_client_ui_core21 = __toESM(require_dist2(), 1);
@@ -119079,8 +119832,8 @@ var TURN_ERROR_GESTURES = {
   compact: "/compact shortens it; /new starts fresh.",
   none: null
 };
-function turnErrorNote(data, modelLabel) {
-  const view = (0, import_client_ui_core20.describeTurnError)(data, { modelLabel });
+function turnErrorNote(data, modelLabel, route = {}) {
+  const view = (0, import_client_ui_core20.describeTurnError)(data, { modelLabel, ...route });
   const parts2 = [view.headline];
   if (view.detail) parts2.push(`(${view.detail})`);
   if (view.hint) parts2.push(view.hint);
@@ -119285,6 +120038,7 @@ function renderLane(transcript, app, ev) {
           current_step: typeof d2.current_step === "number" ? d2.current_step : 0
         }
       }));
+      transcript.setState((s) => applyPlanUpdated(s, (0, import_client_core32.planOfEvent)(d2)));
       break;
     case "agent_lifecycle": {
       const agentId = String(d2.agent_id ?? ev.agent_id ?? "");
@@ -119425,8 +120179,8 @@ function renderLane(transcript, app, ev) {
         }));
       } else {
         const quota = (0, import_client_core32.parseQuotaRefusal)(d2);
-        const { modelLabel, model } = app.getState();
-        const failure = turnErrorNote(data, modelLabel || displayModel(model));
+        const { modelLabel, model, provider, mode } = app.getState();
+        const failure = turnErrorNote(data, modelLabel || displayModel(model), { provider, mode });
         transcript.setState(
           (s) => quota ? appendQuota(applyTurnError(s, data), quota) : appendNote(applyTurnError(s, data), failure.text, { tone: "error" })
         );
@@ -119636,7 +120390,7 @@ function startupFailureMessage(err2, apiUrl) {
 }
 
 // src/main.tsx
-var import_client_ui_core55 = __toESM(require_dist2(), 1);
+var import_client_ui_core56 = __toESM(require_dist2(), 1);
 
 // src/services/goalTurn.ts
 var GOAL_SEND_MAX_ATTEMPTS = 20;
@@ -120483,7 +121237,7 @@ var WorkPlanApprovalBridge = class {
 };
 
 // src/main.tsx
-var import_client_ui_core56 = __toESM(require_dist2(), 1);
+var import_client_ui_core57 = __toESM(require_dist2(), 1);
 
 // src/components/layout/Transcript.tsx
 var import_react30 = __toESM(require_react(), 1);
@@ -137771,7 +138525,7 @@ function detectTerminal2(env3 = process.env, platform2 = process.platform) {
 
 // src/services/version.ts
 function tuiVersion() {
-  return "0.1.40".length > 0 ? "0.1.40" : null;
+  return "0.1.41".length > 0 ? "0.1.41" : null;
 }
 
 // src/components/layout/WelcomeCard.tsx
@@ -142640,15 +143394,33 @@ function WorkingStatus({
   ] });
 }
 
-// src/state/inputQueue.ts
+// src/components/layout/footerWords.ts
 var import_client_ui_core46 = __toESM(require_dist2(), 1);
+function stopUnderWay(moment) {
+  return moment.stopping && moment.status === "streaming";
+}
+function workingLabel(moment) {
+  if (stopUnderWay(moment)) return import_client_ui_core46.STOPPING_TURN;
+  return moment.waitingOnPreviousTurn ? import_client_ui_core46.WAITING_FOR_PREVIOUS_TURN : void 0;
+}
+function composerSituation(moment) {
+  if (moment.status === "error") return { kind: "after-error" };
+  if (moment.status === "streaming") {
+    if (moment.stopping) return { kind: "stopping" };
+    return moment.queuedCount > 0 ? { kind: "queued", count: moment.queuedCount } : { kind: "busy" };
+  }
+  return moment.conversationStarted ? { kind: "idle" } : { kind: "first" };
+}
+
+// src/state/inputQueue.ts
+var import_client_ui_core47 = __toESM(require_dist2(), 1);
 function isEditable(entry) {
-  return (0, import_client_ui_core46.isEditableSteer)(entry);
+  return (0, import_client_ui_core47.isEditableSteer)(entry);
 }
 function popEditableQueue(app, draft) {
   const own = app.getState().queuedMessages.filter(isEditable);
   const attachments = own.flatMap((entry) => entry.attachments ?? []);
-  const merged = (0, import_client_ui_core46.mergeIntoDraft)(
+  const merged = (0, import_client_ui_core47.mergeIntoDraft)(
     own.map((entry) => entry.text),
     draft
   );
@@ -142658,7 +143430,7 @@ function popEditableQueue(app, draft) {
   return merged ?? draft;
 }
 function queueRows(queued) {
-  const { shown, hidden } = (0, import_client_ui_core46.capMachineRows)(queued);
+  const { shown, hidden } = (0, import_client_ui_core47.capMachineRows)(queued);
   const rows = shown.map((entry) => ({ kind: "entry", entry }));
   if (hidden > 0) rows.push({ kind: "overflow", hidden });
   return rows;
@@ -142711,7 +143483,7 @@ function PendingAttachments({ items: all }) {
 }
 
 // src/components/layout/ReplFooter.tsx
-var import_client_ui_core47 = __toESM(require_dist2(), 1);
+var import_client_ui_core48 = __toESM(require_dist2(), 1);
 var import_jsx_runtime77 = __toESM(require_jsx_runtime(), 1);
 function ReplFooter({
   appStore,
@@ -142761,11 +143533,12 @@ function ReplFooter({
   const cloudJobStatus = useStoreSelector(appStore, (s) => s.cloudJobStatus);
   const cloudWorking = cloudJobStatus !== null && agentWorking(cloudJobStatus);
   const queuedCount = useStoreSelector(appStore, (s) => s.queuedMessages.length);
+  const stopping = useStoreSelector(appStore, stopUnderWay);
   const followUp = useStoreSelector(appStore, (s) => s.followUp);
   const screenReader = useStoreSelector(appStore, (s) => s.screenReader);
   const ghost = !cloud && !screenReader && status === "idle" && followUp ? followUp : void 0;
-  const placeholder = cloud ? cloudJob ? (0, import_client_ui_core47.cloudInputPlaceholder)((0, import_client_ui_core47.inputModeFor)(cloudJobStatus ?? "queued", true), null) : (0, import_client_ui_core47.inputPlaceholder)("cloud") : (0, import_client_ui_core47.composerPlaceholder)(
-    status === "error" ? { kind: "after-error" } : status === "streaming" ? queuedCount > 0 ? { kind: "queued", count: queuedCount } : { kind: "busy" } : conversationStarted ? { kind: "idle" } : { kind: "first" },
+  const placeholder = cloud ? cloudJob ? (0, import_client_ui_core48.cloudInputPlaceholder)((0, import_client_ui_core48.inputModeFor)(cloudJobStatus ?? "queued", true), null) : (0, import_client_ui_core48.inputPlaceholder)("cloud") : (0, import_client_ui_core48.composerPlaceholder)(
+    composerSituation({ status, stopping, queuedCount, conversationStarted }),
     // No queue key here: the strip under the turn carries that hint itself.
     { shellPrefix: true, queueEditKey: null, helpKey: "?" }
   );
@@ -142794,7 +143567,14 @@ function ReplFooter({
   );
   const [menuOpen, setMenuOpen] = import_react51.default.useState(false);
   return /* @__PURE__ */ (0, import_jsx_runtime77.jsxs)(import_jsx_runtime77.Fragment, { children: [
-    streaming && !parked ? /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(WorkingStatus, { store: appStore, label: waitingOnPreviousTurn ? import_client_ui_core47.WAITING_FOR_PREVIOUS_TURN : void 0, stopKey: vimMode ? "Ctrl+C" : "esc" }) : cloudWorking ? /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(WorkingStatus, { store: appStore, tokens: 0, stopKey: null }) : null,
+    streaming && !parked ? /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(
+      WorkingStatus,
+      {
+        store: appStore,
+        label: workingLabel({ status, stopping, waitingOnPreviousTurn }),
+        stopKey: stopping ? null : vimMode ? "Ctrl+C" : "esc"
+      }
+    ) : cloudWorking ? /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(WorkingStatus, { store: appStore, tokens: 0, stopKey: null }) : null,
     plan && /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(PlanCard, { plan }),
     pendingWorkPlan ? /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(
       WorkPlanApprovalPrompt,
@@ -142987,13 +143767,13 @@ function FullscreenLayout({
 // src/components/dialogs/AgentsDashboard.tsx
 var import_react54 = __toESM(require_react(), 1);
 var import_client_core51 = __toESM(require_dist(), 1);
-var import_client_ui_core49 = __toESM(require_dist2(), 1);
+var import_client_ui_core50 = __toESM(require_dist2(), 1);
 var import_strip_ansi4 = __toESM(require_strip_ansi(), 1);
 
 // src/components/dialogs/agentsHandback.tsx
 var import_react53 = __toESM(require_react(), 1);
 var import_client_core50 = __toESM(require_dist(), 1);
-var import_client_ui_core48 = __toESM(require_dist2(), 1);
+var import_client_ui_core49 = __toESM(require_dist2(), 1);
 var import_jsx_runtime79 = __toESM(require_jsx_runtime(), 1);
 function useHandback(host) {
   const [mismatch, setMismatch] = (0, import_react53.useState)(null);
@@ -143006,7 +143786,7 @@ function useHandback(host) {
     const hb = host.handback;
     if (!hb) return;
     const outcome = await hb.checkout(root2, branch, strategy);
-    say((0, import_client_ui_core48.checkedOutNote)(outcome), outcome.ok ? "success" : "warning");
+    say((0, import_client_ui_core49.checkedOutNote)(outcome), outcome.ok ? "success" : "warning");
     if (outcome.ok && then === "continue") {
       await hb.continueLocally(job);
       host.onClose();
@@ -143054,7 +143834,7 @@ function useHandback(host) {
       const diff3 = await host.getDiff(job);
       if (diff3.files.length === 0) return say("The agent has not pushed any changes yet.", "warning");
       const outcome = await hb.apply(root2, diff3);
-      say((0, import_client_ui_core48.appliedNote)(outcome, { nameFirstConflict: true }), outcome.conflicted.length ? "warning" : "success");
+      say((0, import_client_ui_core49.appliedNote)(outcome, { nameFirstConflict: true }), outcome.conflicted.length ? "warning" : "success");
     });
   };
   const handleCardKey = (job, input, escape) => {
@@ -143062,7 +143842,7 @@ function useHandback(host) {
     if (escape) setMismatch(null);
     else if (input === "!") setMismatch({ ...mismatch, remember: !mismatch.remember });
     else {
-      const choice = import_client_ui_core48.MISMATCH_CHOICES[Number(input) - 1];
+      const choice = import_client_ui_core49.MISMATCH_CHOICES[Number(input) - 1];
       if (choice) answerMismatch(job, choice.choice);
     }
     return true;
@@ -143071,14 +143851,14 @@ function useHandback(host) {
 }
 function MismatchCard({ job, card }) {
   return /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(Box2, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { colorKey: "listSelection", bold: true, children: (0, import_client_ui_core48.jobTitle)(job) }),
+    /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { colorKey: "listSelection", bold: true, children: (0, import_client_ui_core49.jobTitle)(job) }),
     /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { colorKey: "warning", bold: true, wrap: "truncate-end", children: (0, import_client_ui_core48.mismatchCardTitle)(card.currentBranch, card.files) }),
-      /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { dim: true, wrap: "truncate-end", children: import_client_ui_core48.MISMATCH_QUESTION }),
+      /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { colorKey: "warning", bold: true, wrap: "truncate-end", children: (0, import_client_ui_core49.mismatchCardTitle)(card.currentBranch, card.files) }),
+      /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { dim: true, wrap: "truncate-end", children: import_client_ui_core49.MISMATCH_QUESTION }),
       card.files.slice(0, 6).map((f) => /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { dim: true, wrap: "truncate-end", children: `    ${f}` }, f)),
       card.files.length > 6 ? /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { dim: true, children: `    \u2026and ${card.files.length - 6} more` }) : null
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(Box2, { flexDirection: "column", marginTop: 1, children: import_client_ui_core48.MISMATCH_CHOICES.map((c3, i2) => /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { colorKey: c3.choice === "discard" ? "error" : void 0, wrap: "truncate-end", children: `  ${i2 + 1}  ${c3.label} \u2014 ${c3.detail}` }, c3.choice)) }),
+    /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(Box2, { flexDirection: "column", marginTop: 1, children: import_client_ui_core49.MISMATCH_CHOICES.map((c3, i2) => /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { colorKey: c3.choice === "discard" ? "error" : void 0, wrap: "truncate-end", children: `  ${i2 + 1}  ${c3.label} \u2014 ${c3.detail}` }, c3.choice)) }),
     /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(Box2, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(ThemedText, { dim: true, wrap: "truncate-end", children: `  ! ${card.remember ? "[x]" : "[ ]"} don't ask again for this repository (stash or commit) \xB7 esc keeps the tree` }) })
   ] });
 }
@@ -143129,7 +143909,7 @@ function AgentsDashboard({
   const [board, setBoard] = (0, import_react54.useState)(panel.jobs);
   const boardRef = (0, import_react54.useRef)(panel.jobs);
   const feedRef = (0, import_react54.useRef)(null);
-  const [transcript, setTranscript] = (0, import_react54.useState)(() => (0, import_client_ui_core49.emptyTranscript)());
+  const [transcript, setTranscript] = (0, import_react54.useState)(() => (0, import_client_ui_core50.emptyTranscript)());
   const [diff3, setDiff] = (0, import_react54.useState)(null);
   const diffFetchedFor = (0, import_react54.useRef)(null);
   const [liveTerm, setLiveTerm] = (0, import_react54.useState)("");
@@ -143159,12 +143939,12 @@ function AgentsDashboard({
   const launchRepos = panel.launchRepos ?? [];
   const now2 = Date.now();
   const byId = new Map(board.map((row) => [row.id, row]));
-  const views = (0, import_client_ui_core49.sortJobRows)(board.map((row) => (0, import_client_ui_core49.jobRowView)(row, now2)));
+  const views = (0, import_client_ui_core50.sortJobRows)(board.map((row) => (0, import_client_ui_core50.jobRowView)(row, now2)));
   const jobs = views.map((v2) => byId.get(v2.id));
   const safeCursor = Math.min(cursor, Math.max(0, jobs.length - 1));
   const detailId = screen.kind === "detail" ? screen.id : null;
   const detailJob = detailId ? byId.get(detailId) ?? null : null;
-  const inputMode = detailJob && (0, import_client_core51.isTerminal)(detailJob.status) ? (0, import_client_ui_core49.inputModeFor)(detailJob.status, true) : transcript.inputMode;
+  const inputMode = detailJob && (0, import_client_core51.isTerminal)(detailJob.status) ? (0, import_client_ui_core50.inputModeFor)(detailJob.status, true) : transcript.inputMode;
   const panelRef = (0, import_react54.useRef)(panel);
   panelRef.current = panel;
   const screenRef = (0, import_react54.useRef)(screen);
@@ -143184,10 +143964,10 @@ function AgentsDashboard({
       listJobs: (options) => panelRef.current.listJobs(options)
     });
     feedRef.current = feed;
-    const deduper = new import_client_ui_core49.NotificationDeduper();
+    const deduper = new import_client_ui_core50.NotificationDeduper();
     const sub = feed.subscribe((change) => {
       if (change.kind === "patch") {
-        const decision = (0, import_client_ui_core49.notificationFor)(change.previous, change.job, { windowFocused: false, enabled: true });
+        const decision = (0, import_client_ui_core50.notificationFor)(change.previous, change.job, { windowFocused: false, enabled: true });
         if (decision && deduper.first(decision.dedupeKey)) panelRef.current.bell();
       }
       if (change.kind !== "health") {
@@ -143210,7 +143990,7 @@ function AgentsDashboard({
   (0, import_react54.useEffect)(() => {
     if (!detailId) return;
     const seed = boardRef.current.find((row) => row.id === detailId);
-    let current2 = seed ? (0, import_client_ui_core49.applyJobRow)((0, import_client_ui_core49.emptyTranscript)(detailId), seed) : (0, import_client_ui_core49.emptyTranscript)(detailId);
+    let current2 = seed ? (0, import_client_ui_core50.applyJobRow)((0, import_client_ui_core50.emptyTranscript)(detailId), seed) : (0, import_client_ui_core50.emptyTranscript)(detailId);
     setTranscript(current2);
     setDiff(null);
     setLiveTerm("");
@@ -143254,7 +144034,7 @@ function AgentsDashboard({
         }
       }
       if (message.kind === "job") feedRef.current?.applyRow(message.job.unread ? { ...message.job, unread: false } : message.job);
-      current2 = (0, import_client_ui_core49.applyStreamMessage)(current2, message);
+      current2 = (0, import_client_ui_core50.applyStreamMessage)(current2, message);
       schedule();
     });
     stream.start();
@@ -143842,13 +144622,13 @@ function footerHint(screen, job, messaging, conn, width, launch) {
 }
 function WatchLine({ status, accountsUrl }) {
   if (!status) return null;
-  const page = (0, import_client_ui_core49.watcherPageUrl)(accountsUrl);
+  const page = (0, import_client_ui_core50.watcherPageUrl)(accountsUrl);
   return /* @__PURE__ */ (0, import_jsx_runtime80.jsxs)(Box2, { flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime80.jsxs)(ThemedText, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: status.connections.length > 0 ? "success" : void 0, dim: status.connections.length === 0, children: `${status.connections.length > 0 ? "\u2691 " : ""}${(0, import_client_ui_core49.watchSummaryLine)(status.connections)}` }),
+      /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: status.connections.length > 0 ? "success" : void 0, dim: status.connections.length === 0, children: `${status.connections.length > 0 ? "\u2691 " : ""}${(0, import_client_ui_core50.watchSummaryLine)(status.connections)}` }),
       /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { dim: true, children: page ? `  \xB7 manage at ${page}` : "  \xB7 set up on the website" })
     ] }),
-    status.connections.slice(0, 6).map((c3) => /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { dim: true, wrap: "truncate-end", children: `    ${(0, import_client_ui_core49.watchConnectionLine)(c3)} \xB7 ${(0, import_client_ui_core49.watchHealthChip)(c3).label}` }, c3.id))
+    status.connections.slice(0, 6).map((c3) => /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { dim: true, wrap: "truncate-end", children: `    ${(0, import_client_ui_core50.watchConnectionLine)(c3)} \xB7 ${(0, import_client_ui_core50.watchHealthChip)(c3).label}` }, c3.id))
   ] });
 }
 function ConnectionsView({
@@ -144005,9 +144785,9 @@ function JobDetailView({
   const terminal = (0, import_client_core51.isTerminal)(status);
   const pending = queue.filter((item) => !item.sent_at);
   const live = composer.mode !== "none" && composer.mode !== "launch";
-  const row = job ? (0, import_client_ui_core49.jobRowView)(job, Date.now()) : null;
-  const pill = row ? (0, import_client_ui_core49.jobStatusPill)(status, row.failure) : null;
-  const recording = job && (job.screen_state === "ready" || job.screen_state === "truncated") ? (0, import_client_ui_core49.recordingPageUrl)(accountsUrl, job.id) : null;
+  const row = job ? (0, import_client_ui_core50.jobRowView)(job, Date.now()) : null;
+  const pill = row ? (0, import_client_ui_core50.jobStatusPill)(status, row.failure) : null;
+  const recording = job && (job.screen_state === "ready" || job.screen_state === "truncated") ? (0, import_client_ui_core50.recordingPageUrl)(accountsUrl, job.id) : null;
   const errorLine = job?.error && !transcript.failure && terminal ? job.error : null;
   (0, import_react54.useEffect)(() => {
     const measure = () => {
@@ -144022,10 +144802,10 @@ function JobDetailView({
   });
   if (!job) return /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { dim: true, children: "Job not found." });
   if (handback?.mismatch) return /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(MismatchCard, { job, card: handback.mismatch });
-  const facts = [pill?.label ?? status, row?.sourceChip ?? "", repoName((0, import_client_ui_core49.repoSlug)(job.repo_url)), job.branch_name ?? (job.target_branch ? `\u2192 ${job.target_branch}` : ""), row?.elapsed ?? "", job.model ?? ""].filter(Boolean);
+  const facts = [pill?.label ?? status, row?.sourceChip ?? "", repoName((0, import_client_ui_core50.repoSlug)(job.repo_url)), job.branch_name ?? (job.target_branch ? `\u2192 ${job.target_branch}` : ""), row?.elapsed ?? "", job.model ?? ""].filter(Boolean);
   return /* @__PURE__ */ (0, import_jsx_runtime80.jsxs)(Box2, { flexDirection: "column", flexGrow: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime80.jsxs)(Box2, { flexDirection: "column", flexShrink: 0, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: "listSelection", bold: true, children: fitCell((0, import_client_ui_core49.jobTitle)(job), width).trimEnd() }),
+      /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: "listSelection", bold: true, children: fitCell((0, import_client_ui_core50.jobTitle)(job), width).trimEnd() }),
       /* @__PURE__ */ (0, import_jsx_runtime80.jsxs)(Box2, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: statusColorKey(status), bold: true, children: facts[0] }),
         facts.length > 1 ? /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { dim: true, children: `  \xB7  ${fitCell(facts.slice(1).join("  \xB7  "), Math.max(0, width - facts[0].length - 5)).trimEnd()}` }) : null
@@ -144033,7 +144813,7 @@ function JobDetailView({
       job.pr_url ? /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: "info", children: fitCell(`PR  ${job.pr_url}${row?.prChip ? `  \xB7  ${row.prChip.replace(/^PR\s*/, "")}` : ""}`, width).trimEnd() }) : null,
       recording ? /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: "info", children: fitCell(`Recording  ${recording}${job.screen_state === "truncated" ? "  \xB7  cut at the cap" : ""}`, width).trimEnd() }) : null,
       errorLine ? /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: "error", children: fitCell(errorLine, width).trimEnd() }) : null,
-      transcript.health === "failed" ? /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: "error", children: fitCell((0, import_client_ui_core49.streamFailureLine)(transcript), width).trimEnd() }) : transcript.health === "reconnecting" ? /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { dim: true, children: "reconnecting\u2026" }) : null
+      transcript.health === "failed" ? /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { colorKey: "error", children: fitCell((0, import_client_ui_core50.streamFailureLine)(transcript), width).trimEnd() }) : transcript.health === "reconnecting" ? /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(ThemedText, { dim: true, children: "reconnecting\u2026" }) : null
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime80.jsx)("ink-box", { ref: viewportRef, style: { flexDirection: "column", flexGrow: 1, flexShrink: 1, minHeight: 3, overflow: "hidden", marginTop: 1 }, children: /* @__PURE__ */ (0, import_jsx_runtime80.jsxs)("ink-box", { ref: bodyRef, style: { flexDirection: "column", flexShrink: 0, marginTop: -scroll }, children: [
       /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(
@@ -144872,6 +145652,17 @@ var REMOTE_DENIED = /* @__PURE__ */ new Set([
   "agent-messages"
 ]);
 var REMOTE_ARG_REQUIRED = /* @__PURE__ */ new Set(["provider", "persona", "reasoning", "tokensave"]);
+function sendVerdict(outcome) {
+  switch (outcome) {
+    case "started":
+    case "queued":
+      return import_client_core54.RC_OK;
+    case "declined":
+      return (0, import_client_core54.rcRefusePhotosMidTurn)();
+    case "blocked":
+      return (0, import_client_core54.rcRefuse)("signed_out", "sign in on this machine and choose a model first");
+  }
+}
 function flattenInfoView(view) {
   const lines = [view.title];
   if (view.subtitle !== void 0 && view.subtitle !== "") lines.push(view.subtitle);
@@ -144922,8 +145713,8 @@ function startTuiRemoteControl(opts) {
       opts.verbs.steer(text);
       return import_client_core54.RC_OK;
     }
-    const sent = attachments !== void 0 && attachments.length > 0 ? opts.verbs.send(text, attachments) : opts.verbs.send(text);
-    return sent ? import_client_core54.RC_OK : (0, import_client_core54.rcRefuse)("signed_out", "sign in on this machine first");
+    const outcome = attachments !== void 0 && attachments.length > 0 ? opts.verbs.send(text, attachments) : opts.verbs.send(text);
+    return sendVerdict(outcome);
   };
   const commandCatalog = () => opts.commands === void 0 ? [] : opts.commands.registry.all().filter((command) => !REMOTE_DENIED.has(command.name)).map((command) => ({
     name: command.name,
@@ -145188,7 +145979,7 @@ function startTuiRemoteControl(opts) {
 
 // src/services/machineWake.ts
 var import_client_core55 = __toESM(require_dist(), 1);
-var import_client_ui_core50 = __toESM(require_dist2(), 1);
+var import_client_ui_core51 = __toESM(require_dist2(), 1);
 function createWakeIfIdle(deps2) {
   return (prompt) => {
     if (!deps2.isIdle()) return;
@@ -145210,7 +146001,7 @@ function createPeerDelivery(deps2) {
   return (message) => {
     const hold = (0, import_client_core55.inboundNoteToHold)(message, (userId) => deps2.trusted?.(userId) === true);
     deps2.pen.hold(hold.item, hold.relayDepth, hold.turnStart);
-    deps2.appendRow((0, import_client_ui_core50.peerDeliveredRow)(message));
+    deps2.appendRow((0, import_client_ui_core51.peerDeliveredRow)(message));
     queueMicrotask(() => wakeIfIdle((0, import_client_core55.peerMessageWakePrompt)(message)));
   };
 }
@@ -145230,7 +146021,7 @@ function createTuiIdleWatcher(deps2) {
 
 // src/services/friendsSurface.ts
 var import_client_core56 = __toESM(require_dist(), 1);
-var import_client_ui_core51 = __toESM(require_dist2(), 1);
+var import_client_ui_core52 = __toESM(require_dist2(), 1);
 function createTuiFriends(deps2) {
   const store = new import_client_core56.FriendsStore({
     api: {
@@ -145255,14 +146046,14 @@ function createTuiFriends(deps2) {
     senderClass: () => deps2.senderClass(),
     onSettled: (sessionId, review, outcome, detail) => {
       if (sessionId !== deps2.currentSessionId()) return;
-      deps2.appendRow((0, import_client_ui_core51.friendSendSettledRow)(review, outcome, detail));
-      deps2.pen.hold((0, import_client_core56.harnessNoticeInput)((0, import_client_ui_core51.friendSendNoticeForModel)(review, outcome, detail)));
+      deps2.appendRow((0, import_client_ui_core52.friendSendSettledRow)(review, outcome, detail));
+      deps2.pen.hold((0, import_client_core56.harnessNoticeInput)((0, import_client_ui_core52.friendSendNoticeForModel)(review, outcome, detail)));
     },
     onChanged: (sessionId) => {
       if (sessionId !== deps2.currentSessionId()) return;
       const pending = reviews.pendingFor(sessionId).length;
       if (pendingReviews.arrived(sessionId, pending)) {
-        deps2.appendRow(`${(0, import_client_ui_core51.friendSendPendingSummary)(pending)} \u2014 /messages to review`);
+        deps2.appendRow(`${(0, import_client_ui_core52.friendSendPendingSummary)(pending)} \u2014 /messages to review`);
       }
     }
   });
@@ -145544,12 +146335,12 @@ function shouldAutoApprove(fullyAutomatic, configAutoApprove) {
 
 // src/headless/runHeadless.ts
 var import_client_core59 = __toESM(require_dist(), 1);
-var import_client_ui_core52 = __toESM(require_dist2(), 1);
+var import_client_ui_core53 = __toESM(require_dist2(), 1);
 import * as os7 from "os";
 import { randomUUID } from "crypto";
 function adoptTurnComplete(carry, data) {
   if (Array.isArray(data.messages)) carry.messages = data.messages;
-  (0, import_client_ui_core52.mergeTurnComplete)(carry.clientState, data);
+  (0, import_client_ui_core53.mergeTurnComplete)(carry.clientState, data);
 }
 var HEADLESS_RESULT_PREFIX = "ORION_HEADLESS_RESULT ";
 var HEADLESS_DEFAULT_MAX_TURNS = 100;
@@ -145790,7 +146581,7 @@ async function runHeadless(flags2) {
     };
   };
   const sessionId = randomUUID();
-  const carry = { messages: [], clientState: (0, import_client_ui_core52.emptyClientState)() };
+  const carry = { messages: [], clientState: (0, import_client_ui_core53.emptyClientState)() };
   const trace = process.env.ORION_HEADLESS_TRACE === "1";
   const runTurn = async (prompt) => {
     const ac = new AbortController();
@@ -145819,7 +146610,9 @@ async function runHeadless(flags2) {
         ...boundary.makeHandlers(sessionId, ac.signal, onEvent),
         isCancelRequested: () => false,
         onPhaseChange: () => void 0
-      }
+      },
+      // A turn that fails ends the run (below): nothing reads what it left.
+      import_client_core59.CLOSE_TURNS_IN_BACKGROUND
     );
     const data = outcome.event.data ?? {};
     if (outcome.kind === "turn_error") {
@@ -145869,7 +146662,7 @@ async function runHeadless(flags2) {
 
 // src/services/feedbackGate.ts
 var import_client_core60 = __toESM(require_dist(), 1);
-var import_client_ui_core53 = __toESM(require_dist2(), 1);
+var import_client_ui_core54 = __toESM(require_dist2(), 1);
 import { randomUUID as randomUUID2 } from "crypto";
 var TuiFeedbackGate = class {
   constructor(deps2) {
@@ -145889,13 +146682,13 @@ var TuiFeedbackGate = class {
   maybeOffer(sessionId, turnId) {
     const now2 = this.now();
     const config = this.deps.loadConfig();
-    let state = (0, import_client_ui_core53.feedbackStateFromScalars)(config, now2);
+    let state = (0, import_client_ui_core54.feedbackStateFromScalars)(config, now2);
     if (config.feedbackFirstSeenAt <= 0 || config.feedbackSeed === 0) {
-      state = { ...state, seed: (0, import_client_ui_core53.mintFeedbackSeed)() };
-      this.safeSave((0, import_client_ui_core53.feedbackScalarsFromState)(state));
+      state = { ...state, seed: (0, import_client_ui_core54.mintFeedbackSeed)() };
+      this.safeSave((0, import_client_ui_core54.feedbackScalarsFromState)(state));
     }
     const pendings = this.deps.getPendings();
-    const offer = (0, import_client_ui_core53.shouldOfferFeedback)(state, {
+    const offer = (0, import_client_ui_core54.shouldOfferFeedback)(state, {
       now: now2,
       completedTurnsThisSession: this.turnsBySession.get(sessionId) ?? 0,
       turnCompletedCleanly: true,
@@ -145906,8 +146699,8 @@ var TuiFeedbackGate = class {
       forced: this.deps.forced
     });
     if (!offer) return;
-    state = (0, import_client_ui_core53.applyFeedbackShown)(state, now2);
-    this.safeSave((0, import_client_ui_core53.feedbackScalarsFromState)(state));
+    state = (0, import_client_ui_core54.applyFeedbackShown)(state, now2);
+    this.safeSave((0, import_client_ui_core54.feedbackScalarsFromState)(state));
     const routing = this.deps.getRouting();
     const requestId = randomUUID2();
     this.pendingId = requestId;
@@ -145929,10 +146722,10 @@ var TuiFeedbackGate = class {
     const snapshot = this.deps.getMessages().slice();
     const now2 = this.now();
     const config = this.deps.loadConfig();
-    const state = (0, import_client_ui_core53.applyFeedbackSubmitted)((0, import_client_ui_core53.feedbackStateFromScalars)(config, now2), now2);
-    this.safeSave((0, import_client_ui_core53.feedbackScalarsFromState)(state));
-    const card = (0, import_client_ui_core53.feedbackSetWhy)((0, import_client_ui_core53.feedbackSelectScore)((0, import_client_ui_core53.createFeedbackCard)(), score), why);
-    const body2 = (0, import_client_ui_core53.buildFeedbackSubmission)(card, {
+    const state = (0, import_client_ui_core54.applyFeedbackSubmitted)((0, import_client_ui_core54.feedbackStateFromScalars)(config, now2), now2);
+    this.safeSave((0, import_client_ui_core54.feedbackScalarsFromState)(state));
+    const card = (0, import_client_ui_core54.feedbackSetWhy)((0, import_client_ui_core54.feedbackSelectScore)((0, import_client_ui_core54.createFeedbackCard)(), score), why);
+    const body2 = (0, import_client_ui_core54.buildFeedbackSubmission)(card, {
       submissionId: randomUUID2(),
       sessionId: meta.sessionId,
       turnId: meta.turnId,
@@ -145947,7 +146740,7 @@ var TuiFeedbackGate = class {
       conversation,
       conversation_truncated: truncated
     });
-    this.deps.appendNote(import_client_ui_core53.FEEDBACK_WORDING.transcriptNote);
+    this.deps.appendNote(import_client_ui_core54.FEEDBACK_WORDING.transcriptNote);
     return true;
   }
   /** The session/transcript under a pending card is going away (new chat, resume) —
@@ -145966,11 +146759,11 @@ var TuiFeedbackGate = class {
     this.deps.setPendingFeedback(null);
     if (explicit) {
       const now2 = this.now();
-      const state = (0, import_client_ui_core53.applyFeedbackDismissed)(
-        (0, import_client_ui_core53.feedbackStateFromScalars)(this.deps.loadConfig(), now2),
+      const state = (0, import_client_ui_core54.applyFeedbackDismissed)(
+        (0, import_client_ui_core54.feedbackStateFromScalars)(this.deps.loadConfig(), now2),
         now2
       );
-      this.safeSave((0, import_client_ui_core53.feedbackScalarsFromState)(state));
+      this.safeSave((0, import_client_ui_core54.feedbackScalarsFromState)(state));
       void (0, import_client_core60.sendFeedbackImpression)(this.deps.submit, "dismissed", "tui");
     }
     return true;
@@ -146045,10 +146838,10 @@ async function main() {
   const flags2 = parseLaunchFlags(process.argv.slice(2));
   const latestSaved = () => [...loadIndex()].sort((a, b2) => b2.updatedAt - a.updatedAt)[0]?.sessionId ?? null;
   const resumeId = flags2.resumeId ?? (flags2.continueLast ? latestSaved() : null);
-  const commandUsage = new import_client_ui_core55.CommandUsage(fileUsageStorage());
+  const commandUsage = new import_client_ui_core56.CommandUsage(fileUsageStorage());
   const sessionNumber = config.sessionsStarted + 1;
   saveConfig({ sessionsStarted: sessionNumber });
-  const tips = new import_client_ui_core55.TipService({ host: "tui", state: config.tips, save: (state) => saveConfig({ tips: state }), session: sessionNumber });
+  const tips = new import_client_ui_core56.TipService({ host: "tui", state: config.tips, save: (state) => saveConfig({ tips: state }), session: sessionNumber });
   let turnsCompleted = 0;
   let steeredThisSession = 0;
   let changedFilesSession = 0;
@@ -146275,7 +147068,7 @@ async function main() {
     // the store's referential stability: unchanged state returns the same object.
     (relPath) => transcriptStore.setState((s) => {
       const clientState = { ...s.clientState };
-      if (!(0, import_client_ui_core56.dropSeenPath)(clientState, relPath)) return s;
+      if (!(0, import_client_ui_core57.dropSeenPath)(clientState, relPath)) return s;
       return { ...s, clientState };
     }),
     { rgPath: ripgrep.locate(), mode: config.indexMode }
@@ -146383,15 +147176,6 @@ async function main() {
     send: (text, attachments) => void sendTurn(text, void 0, attachments),
     runCommand: (text) => routeInput(text)
   });
-  const settleInterrupted = (turn) => {
-    if (turn.settled) return;
-    turn.settled = true;
-    transcriptStore.setState((s) => {
-      const hadLive = s.live !== null;
-      const next = applyTurnInterrupted(s, turn.promptText, turn.partialText);
-      return hadLive ? appendNote(next, INTERRUPT_NOTE) : next;
-    });
-  };
   let lastTurnComplete = null;
   let lastDuetExecutorStatus = null;
   const onRenderEvent = (rawEvent) => {
@@ -146698,19 +147482,19 @@ async function main() {
         controller: turn.abort,
         sendCancel: () => turnTransport.cancelTurn(turn.sessionId)
       });
-      appStore.setState((s) => ({ ...s, statusText: "stopping\u2026", ...clearParkedForStop(s) }));
+      appStore.setState((s) => ({ ...s, stopping: true, statusText: "stopping\u2026", ...clearParkedForStop(s) }));
       rejectPendingWorkPlan();
       return;
     }
-    if (turn) settleInterrupted(turn);
+    const closing = turn !== null && !turn.settled;
+    if (turn) showInterrupted(transcriptStore, turn);
     turn?.abort.abort();
     rejectPendingWorkPlan();
     appStore.setState((s) => ({
       ...s,
       ...clearParkedForStop(s),
       // same one definition as the graceful branch
-      status: "idle",
-      statusText: "",
+      ...closing ? { stopping: true } : { status: "idle", statusText: "", stopping: false },
       turnStartedAt: 0,
       // an interrupted turn stamps no Orbited line
       waitingOnPreviousTurn: false
@@ -146760,7 +147544,7 @@ async function main() {
     const pending = appStore.getState().pendingPlanApproval;
     boundary.resolvePlanApproval(requestId, decision, sid, feedback);
     if (pending?.requestId === requestId) {
-      const record = (0, import_client_ui_core56.planDecisionRecord)({ decision, feedback }, { planPath: pending.planPath });
+      const record = (0, import_client_ui_core57.planDecisionRecord)({ decision, feedback }, { planPath: pending.planPath });
       if (record) {
         const note = planDecisionNote(record);
         transcriptStore.setState((s) => appendNote(s, note.text, note.tone ? { tone: note.tone } : void 0));
@@ -146807,7 +147591,7 @@ async function main() {
     notify: (sid, message, status) => {
       rc?.host.reportAgentNotice(sid, message, status);
       if (status === "expired" && sid === sessionId) {
-        transcriptStore.setState((s) => appendNote(s, (0, import_client_ui_core56.peerSettledRow)(message, "expired")));
+        transcriptStore.setState((s) => appendNote(s, (0, import_client_ui_core57.peerSettledRow)(message, "expired")));
       }
     },
     onHeldChanged: (sid) => {
@@ -146816,14 +147600,14 @@ async function main() {
       appStore.setState((s) => ({ ...s, heldPeerMessages: waiting }));
       if (waiting > before) {
         transcriptStore.setState(
-          (s) => appendNote(s, `${(0, import_client_ui_core56.peerHeldSummary)(waiting)} \u2014 /messages to review`)
+          (s) => appendNote(s, `${(0, import_client_ui_core57.peerHeldSummary)(waiting)} \u2014 /messages to review`)
         );
       }
     },
     onWaitingChanged: (sid) => {
       const arrived = waitingFriendNotes.arrived(sid, peerInbox.waitingFor(sid).length);
       if (arrived && sid === sessionId) {
-        transcriptStore.setState((s) => appendNote(s, import_client_ui_core54.FRIEND_NOTE_WAITING_ROW));
+        transcriptStore.setState((s) => appendNote(s, import_client_ui_core55.FRIEND_NOTE_WAITING_ROW));
       }
     }
   });
@@ -147002,7 +147786,7 @@ async function main() {
         event: "file_modified",
         session_id: sid,
         timestamp: Date.now(),
-        data: { ...data, agent_label: (0, import_client_ui_core56.subagentLabel)(agent) }
+        data: { ...data, agent_label: (0, import_client_ui_core57.subagentLabel)(agent) }
       }),
       getOrionResources: () => (0, import_client_core61.buildOrionSnapshot)(config.workspaceRoot, void 0, sid),
       // Full-dose source for review-persona children (lesson dosing) — the same
@@ -147129,11 +147913,6 @@ async function main() {
       disposeFallback: null,
       phase: "stream",
       hadEdits: false,
-      // The stop-repair inputs (see settleInterrupted): the OUTGOING prompt (a
-      // skill turn is identified by its typed form); the partial reply
-      // accumulates from this turn's own deltas in onEvent below.
-      promptText: start2.text ?? (start2.skill ? `/${start2.skill.name}${start2.skill.args ? ` ${start2.skill.args}` : ""}` : null),
-      partialText: "",
       settled: false
     };
     currentTurn = turn;
@@ -147169,7 +147948,7 @@ async function main() {
           )
         );
         if (currentTurn === turn) currentTurn = null;
-        appStore.setState((s) => ({ ...s, status: "idle", statusText: "" }));
+        appStore.setState((s) => ({ ...s, status: "idle", statusText: "", stopping: false }));
         endSettle = { kind: "error", message: `custom endpoint '${name2}' is not configured` };
         fireTurnEnd();
         return;
@@ -147227,10 +148006,6 @@ async function main() {
     let sawEvent = false;
     const onEvent = (ev) => {
       sawEvent = true;
-      if (ev.event === "text_delta" && !ev.agent_id) {
-        const delta = ev.data?.delta;
-        if (typeof delta === "string") turn.partialText += delta;
-      }
       onRenderEvent(ev);
     };
     try {
@@ -147362,30 +148137,30 @@ async function main() {
           kind: "error",
           message: typeof data.error === "string" ? data.error : "turn failed"
         };
-        if (isUnrepairedStop(data)) {
-          settleInterrupted(turn);
-        } else {
-          turn.settled = true;
-        }
+        turn.settled = true;
       }
     } catch (e) {
       if (ac.signal.aborted || turn.cancelRequested) {
         settleOutcome = "cancelled";
         endSettle = { kind: "cancelled" };
-        settleInterrupted(turn);
+        settleInterrupted(transcriptStore, turn, (0, import_client_core62.interruptedTurnOf)(e));
         if (currentTurn === turn) {
           appStore.setState((s) => ({ ...s, status: "idle", statusText: "", error: null }));
         }
         return;
       }
-      turn.settled = true;
       settleOutcome = "error";
       const msg = e instanceof Error ? e.message : String(e);
       endSettle = { kind: "error", message: msg };
+      const left = (0, import_client_core62.interruptedTurnOf)(e);
+      if (left !== void 0 && transcriptStore.getState().sessionId === sid) {
+        transcriptStore.setState((t) => applyTurnError(t, { error: msg, messages: left.messages }));
+      }
+      turn.settled = true;
       if (currentTurn === turn) {
         if (!sawEvent) transcriptStore.setState(() => snapshot);
-        const { modelLabel, model } = appStore.getState();
-        const failure = turnErrorNote({ error: msg }, modelLabel || displayModel(model));
+        const { modelLabel, model, provider, mode } = appStore.getState();
+        const failure = turnErrorNote({ error: msg }, modelLabel || displayModel(model), { provider, mode });
         transcriptStore.setState((t) => appendNote(t, failure.text, { tone: "error" }));
         appStore.setState((s) => ({ ...s, status: "error", statusText: failure.headline, error: msg }));
       }
@@ -147423,7 +148198,10 @@ async function main() {
           assistantText: endSettle.kind === "complete" ? endSettle.finalText : ""
         });
       }
-      if (currentTurn === turn) currentTurn = null;
+      if (currentTurn === turn) {
+        currentTurn = null;
+        appStore.setState((s) => s.stopping ? { ...s, stopping: false } : s);
+      }
       fireTurnEnd();
     }
   };
@@ -147688,18 +148466,23 @@ async function main() {
     // is defined below; the closure reads it lazily, after startup has built it.
     commands: { registry, contextFor: () => cmdCtx },
     verbs: {
-      send: (text, attachments) => {
-        if (!ensureSignedInToChat()) return false;
-        const outcome = sendTurn(text, void 0, attachments, "system", { from: "phone" });
-        return outcome === "started" || outcome === "queued";
-      },
+      // A phone-driven turn is UNATTENDED at the terminal — origin "system" so the
+      // feedback card never takes over a composer nobody is watching (the PA relies
+      // on its isAttendedActive gate for the same path; the TUI has no attach state,
+      // so origin is the equivalent signal). A send landing on a LIVE turn folds
+      // into the steer queue (the gate — a phone can't race the terminal into two
+      // concurrent turns); only a photo-bearing send declines then (the phone lane's
+      // own rule, see `sendTurn`). The outcome itself goes back, so the phone hears
+      // WHY a send did not start — signed out, no model chosen, photos mid-turn —
+      // in the remote host's words for each.
+      send: (text, attachments) => sendTurn(text, void 0, attachments, "system", { from: "phone" }),
       steer: (text) => enqueueMachineSteer(text),
       // Every note meets the receive policy first: delivered, held for the person at this
       // terminal, or refused — and the sender is told which (`peerInbox.ts`).
       deliverAgentMessage: (message) => void peerInbox.receive(sessionId, message),
       deliverAgentNotice: (notice) => {
-        transcriptStore.setState((s) => appendNote(s, (0, import_client_ui_core56.peerNoticeRow)(notice)));
-        heldInputs.hold((0, import_client_core62.harnessNoticeInput)((0, import_client_ui_core56.peerNoticeForModel)(notice)));
+        transcriptStore.setState((s) => appendNote(s, (0, import_client_ui_core57.peerNoticeRow)(notice)));
+        heldInputs.hold((0, import_client_core62.harnessNoticeInput)((0, import_client_ui_core57.peerNoticeForModel)(notice)));
       },
       agentMessagingEnabled: () => (0, import_client_core62.agentMessagesFor)(config.workspaceRoot).choice !== "off",
       agentMailWithoutPhone: () => (0, import_client_core62.wantsMailWithoutPhone)((0, import_client_core62.agentMessagesFor)(config.workspaceRoot)),
@@ -147815,15 +148598,15 @@ async function main() {
   };
   const showTip = (force) => {
     const tip = tips.next(currentTipMoment(), force);
-    if (tip) transcriptStore.setState((t) => appendNote(t, (0, import_client_ui_core55.tipLine)(tip), { ephemeral: true }));
+    if (tip) transcriptStore.setState((t) => appendNote(t, (0, import_client_ui_core56.tipLine)(tip), { ephemeral: true }));
     return tip !== null;
   };
   if (sessionNumber === 1) showTip(true);
   {
     const version = tuiVersion();
-    if ((0, import_client_ui_core54.shouldOfferWhatsNew)(version, config.lastSeenVersion || null)) {
-      const url = (0, import_client_ui_core54.changelogUrl)(config.accountsUrl);
-      transcriptStore.setState((t) => appendNote(t, `${(0, import_client_ui_core54.whatsNewLine)(version)}${url ? ` \u2014 what changed: ${url}` : ""}`, { ephemeral: true }));
+    if ((0, import_client_ui_core55.shouldOfferWhatsNew)(version, config.lastSeenVersion || null)) {
+      const url = (0, import_client_ui_core55.changelogUrl)(config.accountsUrl);
+      transcriptStore.setState((t) => appendNote(t, `${(0, import_client_ui_core55.whatsNewLine)(version)}${url ? ` \u2014 what changed: ${url}` : ""}`, { ephemeral: true }));
     }
     if (version && version !== config.lastSeenVersion) saveConfig({ lastSeenVersion: version });
   }
@@ -148012,7 +148795,7 @@ async function main() {
       void (0, import_client_core62.loadCustomProviders)(opts).then(panel);
     }
   };
-  const commandTypoGuard = new import_client_ui_core55.CommandTypoGuard(() => registry.all());
+  const commandTypoGuard = new import_client_ui_core56.CommandTypoGuard(() => registry.all());
   const routeInput = (text, source2 = "input") => {
     appStore.setState((s) => s.status === "error" ? { ...s, status: "idle", statusText: "" } : s);
     return routeChatInput(text, {