@agentproto/runtime 3.4.0 → 3.5.0

package/dist/index.mjs

@@ -2232,7 +2232,40 @@ async function readPi(conversationId) {
   const { exportPiSession: exportPiSession2 } = await Promise.resolve().then(() => (init_transcript_export(), transcript_export_exports));
   return exportPiSession2(conversationId);
 }
-var CONVERSATION_STORES;
+function argvBasename(path) {
+  const idx = path.lastIndexOf("/");
+  return idx === -1 ? path : path.slice(idx + 1);
+}
+function conversationTerminalSlugFor(subject) {
+  if (subject.adapterSlug && (CONVERSATION_STORES[subject.adapterSlug] || NATIVE_LAUNCH_ARGV[subject.adapterSlug])) {
+    return subject.adapterSlug;
+  }
+  const argv = subject.argv;
+  if (!argv || argv.length === 0 || !argv[0]) return void 0;
+  const bin = argvBasename(argv[0]);
+  for (const [slug, launch] of Object.entries(NATIVE_LAUNCH_ARGV)) {
+    const launchBin = launch[0];
+    if (!launchBin || argvBasename(launchBin) !== bin) continue;
+    if (launchBin === "npx") {
+      if (launch.every((arg, i) => argv[i] === arg)) return slug;
+      continue;
+    }
+    return slug;
+  }
+  return void 0;
+}
+function isConversationTerminal(subject) {
+  if (subject.kind !== "terminal") return false;
+  if (conversationTerminalSlugFor(subject) !== void 0) return true;
+  const meta = subject.resumeMetadata;
+  if (meta) {
+    for (const key of CONVERSATION_RESUME_KEYS) {
+      if (meta[key]) return true;
+    }
+  }
+  return false;
+}
+var CONVERSATION_STORES, NATIVE_LAUNCH_ARGV, CONVERSATION_RESUME_KEYS;
 var init_conversation_store = __esm({
   "src/conversation-store.ts"() {
     CONVERSATION_STORES = {
@@ -2242,6 +2275,7 @@ var init_conversation_store = __esm({
         // (default). Example: `claude --resume 0e483f81-1a44-4bec-9667-b37158450296`
         outputHint: /claude\s+--resume\s+([0-9a-f-]{8,})/i,
         attachArgv: (conversationId) => ["claude", "--resume", conversationId],
+        transcriptPath: (cwd, conversationId, configDir) => join(claudeCodeProjectDir(cwd, configDir), `${conversationId}.jsonl`),
         configDirEnvVar: "CLAUDE_CONFIG_DIR",
         discover: discoverClaudeCode,
         read: readClaudeCode
@@ -2280,6 +2314,32 @@ var init_conversation_store = __esm({
         read: readPi
       }
     };
+    NATIVE_LAUNCH_ARGV = {
+      "claude-code": ["claude"],
+      hermes: ["hermes", "--tui"],
+      // Bare arm of the same npx package the adapter spawns IS the TUI.
+      opencode: ["npx", "-y", "opencode-ai"],
+      mastracode: ["npx", "-y", "mastracode"],
+      // The adapter bundles the codex-acp wrapper (ACP-only); the interactive
+      // Codex TUI lives in @openai/codex, fetched by npx on first use.
+      codex: ["npx", "-y", "@openai/codex"],
+      // ACP arms add flags/subcommands to these binaries; bare is interactive.
+      gemini: ["gemini"],
+      "grok-cli": ["grok"],
+      pi: ["pi"],
+      jcode: ["jcode"],
+      // `openclaw chat` = "Open a local terminal UI (alias for tui --local)".
+      openclaw: ["openclaw", "chat"],
+      // Generic ACP catalog CLIs whose ACP arm is a separate binary/subcommand;
+      // the bare bin is the interactive TUI.
+      "gemini-cli": ["gemini"],
+      "qwen-code": ["qwen"],
+      "mistral-vibe": ["vibe"],
+      "kimi-cli": ["kimi"]
+    };
+    CONVERSATION_RESUME_KEYS = new Set(
+      Object.values(CONVERSATION_STORES).map((s) => s.storeAs)
+    );
   }
 });
 
@@ -2512,6 +2572,7 @@ var RESUME_STRATEGIES = Object.fromEntries(
         outputHint: store.outputHint,
         storeAs: store.storeAs,
         ...store.configDirEnvVar ? { configDirEnvVar: store.configDirEnvVar } : {},
+        ...store.transcriptPath ? { transcriptPath: store.transcriptPath } : {},
         fsProbe: async (cwd, prevStartedAt, expectedId, configDir) => {
           const candidates = await s.discover({
             cwd,
@@ -2583,6 +2644,21 @@ async function augmentWithFsResume(prev) {
     }
   };
 }
+async function probeNativeTranscript(prev) {
+  if (!prev.adapterSlug || !prev.cwd) return void 0;
+  const strategy = RESUME_STRATEGIES[prev.adapterSlug];
+  if (!strategy?.transcriptPath) return void 0;
+  const id = prev.resumeMetadata?.[strategy.storeAs] ?? prev.adapterSessionId;
+  if (!id) return void 0;
+  const path = strategy.transcriptPath(prev.cwd, id, prev.adapterConfigDir);
+  let exists = false;
+  try {
+    exists = (await promises.stat(path)).isFile();
+  } catch {
+    exists = false;
+  }
+  return { dir: dirname(path), path, exists };
+}
 function describeResumePath(prev, opts = {}) {
   const mayPreferNative = prev.pty === true || opts.preferNativeTerminal === true;
   if (prev.adapterSlug && mayPreferNative) {
@@ -2628,6 +2704,9 @@ function tokenizeCommand(s) {
   return out;
 }
 
+// src/sessions.ts
+init_conversation_store();
+
 // src/command-log.ts
 init_transcript_writer();
 function writeCommandLogEntry(sessionId, entry, baseDir) {
@@ -8261,8 +8340,10 @@ function registerAgentTools(server, opts) {
     resolveSandboxProvider: resolveSandboxProvider2,
     provisionWorktree,
     resolveWorktreeIsolation,
-    supervisor
+    supervisor,
+    defaultAgentPromptInterrupt
   } = opts;
+  const interruptDefault = defaultAgentPromptInterrupt ?? false;
   server.registerTool(
     "agent_start",
     {
@@ -8498,14 +8579,20 @@ function registerAgentTools(server, opts) {
           "Isolate this session in its OWN git worktree instead of spawning directly in `cwd` \u2014 so a parallel agent can't collide on the working tree. `true` provisions a worktree on a fresh branch `wt/<slug>` cut from origin/main (slug auto-minted from `label`); pass `{ slug, base, async }` to pin either, or opt into an early return (`async`, see that field's own description). The daemon boots the worktree (git worktree add + the repo's agentproto.json setup hooks) and spawns `adapter` THERE; the session's cwd, and every path it edits, live inside the worktree. Honoured only for a ROOT spawn (a spawn made THROUGH an orchestrator inherits its parent's tree \u2014 no second worktree; an EXPLICIT `worktree` on such a nested spawn is REJECTED, not silently ignored \u2014 use `sandbox` to isolate a child) and only when `cwd` is inside a git repo (nothing to isolate otherwise \u21D2 spawns plain, no error). The daemon's `worktrees.isolation` policy may force this ON for every root spawn (`always`) or OFF (`never`, which REJECTS an explicit `worktree`). Ignored for a `sandbox` spawn (the box already isolates). The worktree is NOT auto-removed on session close \u2014 it holds the agent's work; tear it down with `agentproto worktree rm|archive|gc`."
         )
       },
-      // Live-session widget: rendering agent_start's result auto-mounts the
-      // live widget for the new session (ext-apps `_meta.ui.resourceUri` at
-      // the tool-definition level — same mechanism as the panel apps in
-      // mcp-apps-adapter.ts). `visibility:["model","app"]` keeps agent_start
-      // fully usable by the model AND lets the widget re-call it if needed.
+      // Session-chat widget: rendering agent_start's result auto-mounts the
+      // session-chat launcher for the new session (ext-apps
+      // `_meta.ui.resourceUri` at the tool-definition level — same mechanism
+      // as the panel apps in mcp-apps-adapter.ts). The widget reads the
+      // spawned `{ id: "sess_…" }` off the host's tool-result notification
+      // and deep-links the installed `@agentik/session-chat` app straight
+      // into that session (apps/src/session-chat/panel.ts). The older
+      // `ui://live_session/view` resource stays registered for its own
+      // `live_session` tool and other consumers — only this binding moved.
+      // `visibility:["model","app"]` keeps agent_start fully usable by the
+      // model AND lets the widget re-call it if needed.
       _meta: {
         ui: {
-          resourceUri: "ui://live_session/view",
+          resourceUri: "ui://agentproto_session_chat/view",
           visibility: ["model", "app"]
         }
       }
@@ -8618,7 +8705,7 @@ function registerAgentTools(server, opts) {
       id: sessionIdAliasField,
       prompt: z.string().min(1).describe("The next user turn (plain text)."),
       interrupt: z.boolean().optional().describe(
-        "When true and the session is mid-turn, cancel the in-flight turn and deliver this prompt on the same session instead of rejecting. No-op when the session is already idle. Default false (mid-turn rejects, as today)."
+        "When true and the session is mid-turn, cancel the in-flight turn and deliver this prompt on the same session immediately instead of queueing it behind the current turn. No-op when the session is already idle. UNSET falls back to the daemon default `defaults.agentPromptInterrupt` in config.json (false unless an operator changed it) \u2014 so a mid-turn target queues by default; pass `interrupt: true` explicitly to cut now."
       ),
       queue: z.boolean().optional().describe(
         "When the session is mid-turn, queue this prompt (FIFO) and dispatch it automatically once the current turn ends instead of rejecting. Default true. Explicit false restores the old reject-when-busy behavior."
@@ -8629,8 +8716,9 @@ function registerAgentTools(server, opts) {
       if (!sessionId) return missingSessionIdError("agent_prompt");
       try {
         const promptSource = callerScope?.ownerSessionId ?? callerSessionId;
-        await registry.enqueuePrompt(sessionId, input.prompt, {
-          interrupt: input.interrupt,
+        const effectiveInterrupt = input.interrupt ?? interruptDefault;
+        const { queued } = await registry.enqueuePrompt(sessionId, input.prompt, {
+          interrupt: effectiveInterrupt,
           // Queue by default: a mid-turn session holds the prompt in its
           // FIFO queue and dispatches it at turn end, so callers never
           // lose a prompt to the busy rejection. Explicit `queue: false`
@@ -8638,12 +8726,21 @@ function registerAgentTools(server, opts) {
           queue: input.queue ?? true,
           ...promptSource ? { source: `agent:${promptSource}` } : {}
         });
+        const hintQueued = queued && input.interrupt === void 0;
         return {
           content: [
             {
               type: "text",
               text: JSON.stringify(
-                { ok: true, sessionId, queued: true },
+                {
+                  ok: true,
+                  sessionId,
+                  queued: true,
+                  ...hintQueued ? {
+                    delivery: "queued-mid-turn",
+                    hint: "Message queued \u2014 it will only be delivered when the target's CURRENT turn ends. If it's urgent, re-send with interrupt: true (cancels the in-flight turn and redirects the session onto this prompt now)."
+                  } : {}
+                },
                 null,
                 2
               )
@@ -8672,9 +8769,12 @@ function registerAgentTools(server, opts) {
   );
   server.tool(
     "message_parent",
-    "Report a message UP to the session that spawned you (your parent/supervisor) \u2014 a result, a progress update, or a blocker. No session id needed: the daemon resolves your recorded parent from your own session identity (also visible as the AGENTPROTO_PARENT_SESSION_ID env var). Delivered as a prompt when the parent is idle, or queued onto its next turn when it's mid-turn (never interrupts). Errors if this session has no recorded parent or the parent is gone.",
+    "Report a message UP to the session that spawned you (your parent/supervisor) \u2014 a result, a progress update, or a blocker. No session id needed: the daemon resolves your recorded parent from your own session identity (also visible as the AGENTPROTO_PARENT_SESSION_ID env var). Delivered as a prompt when the parent is idle, or queued onto its next turn when it's mid-turn (never interrupts, by default). Pass `interrupt: true` to CUT a mid-turn parent immediately \u2014 cancel its in-flight turn and redirect it onto this message now (same-context cancel, like `agent_prompt`'s `interrupt`) \u2014 for a genuinely urgent report the parent must act on before it finishes what it's doing. Errors if this session has no recorded parent or the parent is gone.",
     {
-      message: z.string().min(1).describe("The message to deliver to your parent session (plain text).")
+      message: z.string().min(1).describe("The message to deliver to your parent session (plain text)."),
+      interrupt: z.boolean().optional().describe(
+        "When true and the parent is mid-turn, cancel its in-flight turn and deliver this message immediately instead of queueing it onto the parent's next turn. No-op when the parent is idle (delivered as a normal prompt either way). UNSET falls back to the daemon default `defaults.agentPromptInterrupt` in config.json (false unless an operator changed it) \u2014 so a report never interrupts by default; pass `interrupt: true` explicitly to cut."
+      )
     },
     async (input) => {
       const fail = (text10) => ({
@@ -8708,11 +8808,12 @@ function registerAgentTools(server, opts) {
       }
       const who = self.label ?? selfId;
       const notice = `[child-message] ${who} (${selfId}): ${input.message}`;
-      const done = (delivery) => ({
+      const effectiveInterrupt = input.interrupt ?? interruptDefault;
+      const done = (delivery, extra) => ({
         content: [
           {
             type: "text",
-            text: JSON.stringify({ ok: true, parentSessionId: parentId, delivery })
+            text: JSON.stringify({ ok: true, parentSessionId: parentId, delivery, ...extra })
           }
         ]
       });
@@ -8723,12 +8824,27 @@ function registerAgentTools(server, opts) {
         } catch {
         }
       }
+      if (effectiveInterrupt) {
+        try {
+          await registry.enqueuePrompt(parentId, notice, {
+            interrupt: true,
+            origin: `child:${who}`
+          });
+          return done("interrupted");
+        } catch {
+        }
+      }
       if (!registry.stampPendingChildCrashNotice(parentId, notice)) {
         return fail(
           `message_parent: parent session "${parentId}" vanished mid-delivery.`
         );
       }
-      return done("queued-next-turn");
+      return done(
+        "queued-next-turn",
+        input.interrupt === void 0 ? {
+          hint: "Message queued \u2014 it will only reach the parent when its CURRENT turn ends. If it's urgent, re-send with interrupt: true (cancels the parent's in-flight turn and redirects it onto this message now)."
+        } : void 0
+      );
     }
   );
   server.tool(
@@ -10915,6 +11031,9 @@ function promptOriginLabel(item) {
   if (code.startsWith("child:")) return `child ${code.slice("child:".length)}`;
   return code;
 }
+function isShellOnlyRow(desc) {
+  return desc.kind === "command" || desc.kind === "terminal" && !isConversationTerminal(desc);
+}
 function toSessionSummary(desc) {
   return {
     id: desc.id,
@@ -11308,6 +11427,7 @@ function createSessionsRegistry(opts) {
   }
   const emitExited = (rt) => {
     if (rt.exitedEmitted) return;
+    rt.linkProbeStop?.();
     cancelPendingPermissionsForSession(rt);
     if (runWorktreeAutoReclaim && rt.desc.worktreeAutoProvisioned && rt.desc.worktreePath) {
       const worktreePath = rt.desc.worktreePath;
@@ -11489,8 +11609,9 @@ function createSessionsRegistry(opts) {
   const recordConversationLink = (rt, adapterSessionIdOverride) => {
     if (!persist || !partitioned) return;
     const desc = rt.desc;
-    if (desc.kind !== "agent-cli") return;
-    const adapterSlug = desc.adapterSlug;
+    const isConvTerminal = desc.kind === "terminal" && isConversationTerminal(desc);
+    if (desc.kind !== "agent-cli" && !isConvTerminal) return;
+    const adapterSlug = desc.adapterSlug ?? (isConvTerminal ? conversationTerminalSlugFor(desc) : void 0);
     const adapterSessionId = adapterSessionIdOverride ?? desc.adapterSessionId;
     const cwd = desc.cwd;
     if (!adapterSlug || !adapterSessionId || !cwd) return;
@@ -11534,6 +11655,81 @@ function createSessionsRegistry(opts) {
       void persistSnapshot();
     }, PERSIST_DEBOUNCE_MS2);
   };
+  const conversationLinkProbeMs = opts?.conversationLinkProbeMs ?? {
+    initialMs: 3e3,
+    intervalMs: 15e3
+  };
+  const startConversationTerminalLinkProbe = (rt) => {
+    const desc = rt.desc;
+    const slug = desc.adapterSlug ?? conversationTerminalSlugFor(desc);
+    const store = slug ? CONVERSATION_STORES[slug] : void 0;
+    const cwd = desc.cwd;
+    if (!store || !cwd) return;
+    let inFlight = false;
+    let stopped = false;
+    const timers = [];
+    const stop = () => {
+      stopped = true;
+      for (const t of timers) clearTimeout(t);
+      timers.length = 0;
+    };
+    rt.linkProbeStop = stop;
+    const tick = async () => {
+      if (stopped || inFlight) return;
+      if (desc.status !== "running") {
+        stop();
+        return;
+      }
+      if (!desc.lastOutputAt) return;
+      if (desc.adapterSessionId) {
+        stop();
+        return;
+      }
+      inFlight = true;
+      try {
+        const candidates = await store.discover({
+          cwd,
+          since: desc.startedAt,
+          // A PTY writes through the provider's native arm, never ACP.
+          attachmentMode: "native"
+          // No configDir on purpose: nothing threaded CLAUDE_CONFIG_DIR
+          // into this PTY, so the global store is where the file is.
+        });
+        if (candidates.length === 1) {
+          const candidate = candidates[0];
+          desc.adapterSessionId = candidate.conversationId;
+          desc.resumeMetadata = {
+            ...desc.resumeMetadata ?? {},
+            [store.storeAs]: candidate.conversationId
+          };
+          delete desc.linkStatus;
+          if (!desc.title && candidate.preview) {
+            const derived = deriveSessionTitle(candidate.preview);
+            if (derived) desc.title = derived;
+          }
+          schedulePersist();
+          recordConversationLink(rt, candidate.conversationId);
+          stop();
+        } else if (candidates.length > 1) {
+          desc.linkStatus = "ambiguous";
+          schedulePersist();
+        }
+      } catch {
+      } finally {
+        inFlight = false;
+      }
+    };
+    const schedule = (delayMs) => {
+      if (stopped) return;
+      const t = setTimeout(() => {
+        void tick().finally(() => schedule(conversationLinkProbeMs.intervalMs));
+      }, delayMs);
+      t.unref?.();
+      timers.length = 0;
+      timers.push(t);
+    };
+    schedule(conversationLinkProbeMs.initialMs);
+  };
   const snapshotRows = () => Array.from(sessions.values()).map((s) => {
     const {
       processAlive: _processAlive,
@@ -11617,8 +11813,9 @@ function createSessionsRegistry(opts) {
     rt.emitter.emit("line", { line, stream });
   };
   const sniffResumeHints = (rt, line) => {
-    if (rt.desc.kind !== "agent-cli") return;
-    const strategy = rt.desc.adapterSlug ? RESUME_STRATEGIES[rt.desc.adapterSlug] : void 0;
+    if (rt.desc.kind !== "agent-cli" && rt.conversationTerminal !== true) return;
+    const strategySlug = rt.desc.adapterSlug ?? conversationTerminalSlugFor(rt.desc);
+    const strategy = strategySlug ? RESUME_STRATEGIES[strategySlug] : void 0;
     if (!strategy?.outputHint) return;
     const plain = stripAnsiCodes(line);
     const m = plain.match(strategy.outputHint);
@@ -11631,6 +11828,14 @@ function createSessionsRegistry(opts) {
       recordConversationLink(rt, m[1]);
     }
   };
+  const sniffConversationTerminalChunk = (rt, chunk) => {
+    const text10 = (rt.sniffCarry ?? "") + chunk.toString("utf8");
+    const lines = text10.split(/\r?\n|\r/);
+    rt.sniffCarry = (lines.pop() ?? "").slice(-4096);
+    for (const line of lines) {
+      if (line) sniffResumeHints(rt, line);
+    }
+  };
   const appendBytes = (rt, chunk) => {
     terminalTranscriptWriter.appendChunk(rt.desc.id, chunk);
     rt.recentBytes.push(chunk);
@@ -11640,6 +11845,7 @@ function createSessionsRegistry(opts) {
       if (dropped) rt.recentBytesSize -= dropped.byteLength;
     }
     rt.desc.lastOutputAt = (/* @__PURE__ */ new Date()).toISOString();
+    if (rt.conversationTerminal === true) sniffConversationTerminalChunk(rt, chunk);
     rt.emitter.emit("data", chunk);
   };
   const reconcilePtySize = (rt) => {
@@ -13010,6 +13216,19 @@ ${message}`;
         rows: input.rows
       });
       const priorCommandSessionId = findPriorCommandSessionId(sessions, input.cwd);
+      const conversationSlug = conversationTerminalSlugFor({ argv: input.argv });
+      const conversationStore = conversationSlug ? CONVERSATION_STORES[conversationSlug] : void 0;
+      const resumeArgvId = (() => {
+        if (!conversationStore) return void 0;
+        for (let i = 0; i < input.argv.length - 1; i++) {
+          if (input.argv[i] !== "--resume" && input.argv[i] !== "-r") continue;
+          const raw = input.argv[i + 1];
+          const base = raw.slice(raw.lastIndexOf("/") + 1);
+          return base.endsWith(".jsonl") ? base.slice(0, -".jsonl".length) : raw;
+        }
+        return void 0;
+      })();
+      const conversationConfigDir = conversationStore?.configDirEnvVar && input.env ? input.env[conversationStore.configDirEnvVar] : void 0;
       const desc = {
         id,
         kind: "terminal",
@@ -13024,6 +13243,16 @@ ${message}`;
         ...worktreeFields(input.cwd),
         ...input.name ? { name: input.name } : {},
         ...input.label ? { label: input.label } : {},
+        // Same rule as spawnAgent: a NEW spawn's label is a slug, not a
+        // human rename — let a later derived title outrank it.
+        ...input.label ? { renamedByUser: false } : {},
+        ...conversationSlug ? { adapterSlug: conversationSlug } : {},
+        ...conversationSlug && RESUME_STRATEGIES[conversationSlug]?.spawnArgs ? { nativeTerminalResume: true } : {},
+        ...conversationConfigDir ? { adapterConfigDir: conversationConfigDir } : {},
+        ...resumeArgvId && conversationStore ? {
+          adapterSessionId: resumeArgvId,
+          resumeMetadata: { [conversationStore.storeAs]: resumeArgvId }
+        } : {},
         ...priorCommandSessionId ? { priorCommandSessionId } : {},
         // Parent attribution + depth (orchestrator WP4) — same recording
         // rule as spawnAgent above: depth always set so subtree/depth
@@ -13050,7 +13279,8 @@ ${message}`;
         emitter: new EventEmitter(),
         busy: false,
         textBuf: "",
-        thoughtBuf: ""
+        thoughtBuf: "",
+        ...isConversationTerminal(desc) ? { conversationTerminal: true } : {}
       };
       rt.emitter.setMaxListeners(50);
       sessions.set(id, rt);
@@ -13062,6 +13292,10 @@ ${message}`;
         depth: desc.depth ?? 0,
         ts: (/* @__PURE__ */ new Date()).toISOString()
       });
+      if (rt.conversationTerminal) {
+        if (desc.adapterSessionId) recordConversationLink(rt);
+        else startConversationTerminalLinkProbe(rt);
+      }
       pty.onData((chunk) => {
         const buf = Buffer.from(chunk, "utf8");
         rt.bracketedPaste = scanBracketedPaste(
@@ -13272,14 +13506,14 @@ ${message}`;
         };
         rtPre.desc.promptQueue = opts2.force ? [item, ...rtPre.desc.promptQueue ?? []] : [...rtPre.desc.promptQueue ?? [], item];
         schedulePersist();
-        return;
+        return { queued: true };
       }
       await maybeResumeAgent(rtPre);
       const rt = validateAgentTurn(id, "enqueuePrompt");
       const structuredAnswer = matchStructuredQuestionAnswer(rt, message);
       if (structuredAnswer) {
         await answerStructuredQuestion(rt, structuredAnswer);
-        return;
+        return { queued: false };
       }
       void runAgentTurn(rt, message, opts2?.source ? { promptSource: opts2.source } : void 0).catch((err) => {
         appendLine(
@@ -13288,6 +13522,7 @@ ${message}`;
           "stderr"
         );
       });
+      return { queued: false };
     },
     removeQueuedPrompt(id, queueId) {
       const rt = sessions.get(id);
@@ -13575,7 +13810,7 @@ ${message}`;
       };
       const all = Array.from(sessions.values()).filter((rt) => includeArchived || !rt.desc.archived).filter((rt) => {
         if (!lane) return true;
-        if (rt.desc.kind === "terminal" || rt.desc.kind === "command") return false;
+        if (isShellOnlyRow(rt.desc)) return false;
         const machine = hasMachineLineage(rt);
         return lane === "auto" ? machine : !machine;
       }).sort((a, b) => b.desc.startedAt.localeCompare(a.desc.startedAt));
@@ -13588,7 +13823,11 @@ ${message}`;
         stampWatchers(desc);
         desc.childrenBusy = childrenBusy.get(desc.id) ?? 0;
         desc.queuedPrompts = desc.promptQueue?.length ?? 0;
-        return toSessionSummary(desc);
+        const summary = toSessionSummary(desc);
+        if (!isShellOnlyRow(desc)) {
+          summary.lane = hasMachineLineage(rt) ? "auto" : "agents";
+        }
+        return summary;
       });
       return { summaries, total: all.length };
     },
@@ -17899,9 +18138,27 @@ function registerSessionTools(rawServer, opts) {
       try {
         if (strategy.kind === "pty-native" || strategy.kind === "pty-plain") {
           if (!ptyEnabled) return ptyNotConfigured("session_restart");
-          const argv = strategy.kind === "pty-native" ? strategy.argv : Array.isArray(prev.argv) && prev.argv.length > 0 ? [...prev.argv] : tokenizeCommand(prev.command);
+          let argv = strategy.kind === "pty-native" ? strategy.argv : Array.isArray(prev.argv) && prev.argv.length > 0 ? [...prev.argv] : tokenizeCommand(prev.command);
+          if (strategy.kind === "pty-native" && prev.adapterSlug) {
+            const probe = await probeNativeTranscript(augmented);
+            if (probe?.exists) {
+              const upgraded = RESUME_STRATEGIES[prev.adapterSlug]?.spawnArgs?.(probe.path);
+              if (upgraded) {
+                argv = upgraded;
+                console.log(
+                  `[session_restart] ${prev.id} pty-native resume upgraded to absolute transcript path ${probe.path}`
+                );
+              }
+            }
+          }
           const envVarName = strategy.kind === "pty-native" && prev.adapterSlug ? RESUME_STRATEGIES[prev.adapterSlug]?.configDirEnvVar : void 0;
-          const ptyEnv = strategy.kind === "pty-native" ? envVarName && augmented.adapterConfigDir ? { [envVarName]: augmented.adapterConfigDir } : void 0 : prev.ptyResumeEnv;
+          const ptyEnv = strategy.kind === "pty-native" ? envVarName && augmented.adapterConfigDir ? { [envVarName]: augmented.adapterConfigDir } : (
+            // A pty-native restart of a row that is ITSELF a restarted
+            // PTY (conversation terminal): no adapterConfigDir, but the
+            // env the earlier hop recorded still names the isolated
+            // store — replay it rather than dropping to the global one.
+            prev.ptyResumeEnv
+          ) : prev.ptyResumeEnv;
           if (strategy.kind === "pty-native") {
             console.log(
               `[session_restart] ${prev.id} pty-native env: ` + (ptyEnv ? `${Object.keys(ptyEnv).join(",")} threaded from adapterConfigDir` : envVarName ? "no adapterConfigDir on descriptor \u2014 resume may miss the isolated store" : `adapter "${prev.adapterSlug}" declares no configDirEnvVar \u2014 resume uses the global store`)
@@ -17983,6 +18240,15 @@ function registerSessionTools(rawServer, opts) {
             isError: true
           };
         }
+        let nativeResumeDecline;
+        if (input.preferNativeTerminal === true && prev.adapterSlug && RESUME_STRATEGIES[prev.adapterSlug]?.spawnArgs) {
+          if (prev.nativeTerminalResume !== true) {
+            nativeResumeDecline = { reason: "capability-missing" };
+          } else {
+            const probe = await probeNativeTranscript(augmented);
+            nativeResumeDecline = probe ? { reason: "transcript-not-found", probedDir: probe.dir } : { reason: "no-resume-id" };
+          }
+        }
         const restarted = await restartAgentSession(registry, resolveAgentAdapter, prev, {
           ...opts.resolveSandboxProvider ? { resolveSandboxProvider: opts.resolveSandboxProvider } : {}
         });
@@ -17995,7 +18261,8 @@ function registerSessionTools(rawServer, opts) {
                   ...restarted.desc,
                   resumedFrom: restarted.resumedFrom,
                   resumeVia: restarted.resumeVia,
-                  ...restarted.resumeFallback ? { resumeFallback: true } : {}
+                  ...restarted.resumeFallback ? { resumeFallback: true } : {},
+                  ...nativeResumeDecline ? { nativeResumeDecline } : {}
                 },
                 null,
                 2
@@ -20289,13 +20556,34 @@ function registerWebSearchTools(server, opts = {}) {
     transformers: [catchErrors(), enrichResolverRejections()]
   });
 }
+var embedTokens = /* @__PURE__ */ new Map();
+function mintAppEmbedToken(appId) {
+  const token = randomBytes(24).toString("base64url");
+  embedTokens.set(token, appId);
+  return token;
+}
+var stableTokens = /* @__PURE__ */ new Map();
+function stableAppEmbedToken(appId) {
+  const existing = stableTokens.get(appId);
+  if (existing) return existing;
+  const token = mintAppEmbedToken(appId);
+  stableTokens.set(appId, token);
+  return token;
+}
+function isValidAppEmbedToken(token) {
+  return typeof token === "string" && token.length > 0 && embedTokens.has(token);
+}
 
 // src/mcp-apps-adapter.ts
 var MIME_TYPE = "text/html;profile=mcp-app";
+var EMBED_TOKEN_PLACEHOLDER = '"__AGENPROTO_EMBED_TOKEN__"';
 function registerMcpApps(server, apps) {
   for (const app of apps) {
     const resourceUri = `ui://${app.id}/view`;
-    const html = typeof app.html === "string" ? app.html : app.html({});
+    let html = typeof app.html === "string" ? app.html : app.html({});
+    if (html.includes(EMBED_TOKEN_PLACEHOLDER)) {
+      html = html.split(EMBED_TOKEN_PLACEHOLDER).join(JSON.stringify(mintAppEmbedToken(app.id)));
+    }
     const resourceMeta = {
       ui: {
         prefersBorder: true,
@@ -20366,7 +20654,11 @@ function makeBuiltinPanelApps(ops) {
     // installed, install notice otherwise; see apps/src/session-chat).
     makeSessionChatApp({
       httpBaseUrl: ops.httpBaseUrl,
-      isSessionChatInstalled: ops.isSessionChatInstalled
+      isSessionChatInstalled: ops.isSessionChatInstalled,
+      // Hand every result a live embed token so a host-cached widget
+      // (Claude Desktop's per-conversation srcdoc) re-arms itself after a
+      // daemon restart instead of 403ing on its dead baked token.
+      mintEmbedToken: () => stableAppEmbedToken("agentproto_session_chat")
     }),
     // Work-board widget — kanban over the Task ledger (see apps/src/
     // work-board). Read path only; writes go through task_claim/
@@ -23241,6 +23533,22 @@ async function sendOutbound(provider, input, deps2) {
       return { ok: false, error: "unsupported_provider" };
   }
 }
+function unwrapMcpToolResult(result) {
+  if (!result || typeof result !== "object") return {};
+  const envelope = result;
+  if (envelope.structuredContent && typeof envelope.structuredContent === "object") {
+    return envelope.structuredContent;
+  }
+  const text10 = envelope.content?.find((c) => c.type === "text")?.text;
+  if (typeof text10 === "string") {
+    try {
+      const parsed = JSON.parse(text10);
+      if (parsed && typeof parsed === "object") return parsed;
+    } catch {
+    }
+  }
+  return result;
+}
 async function sendAgentpush(input, deps2) {
   const alias = input.alias;
   if (!alias) {
@@ -23270,7 +23578,7 @@ async function sendAgentpush(input, deps2) {
       if (!upload.ok) {
         return { ok: false, error: `upload_media_failed: ${upload.error}` };
       }
-      const result = typeof upload.result === "object" && upload.result !== null ? upload.result : {};
+      const result = unwrapMcpToolResult(upload.result);
       const providerMediaId = typeof result.media_id === "string" ? result.media_id : typeof result.id === "string" ? result.id : void 0;
       if (!providerMediaId) {
         return { ok: false, error: "upload_media_missing_media_id" };
@@ -23295,7 +23603,18 @@ async function sendAgentpush(input, deps2) {
   if (!out.ok) {
     return { ok: false, error: out.error };
   }
-  const providerMessageId = extractProviderMessageId(out.result);
+  const payload = unwrapMcpToolResult(out.result);
+  const status = typeof payload.status === "string" ? payload.status : void 0;
+  if (status === "blocked") {
+    const blockedReason = typeof payload.blocked_reason === "string" ? payload.blocked_reason : "blocked";
+    const suggestion = typeof payload.suggestion === "string" ? payload.suggestion : void 0;
+    return { ok: false, error: blockedReason, blockedReason, ...suggestion ? { suggestion } : {} };
+  }
+  if (status === "failed") {
+    const error = typeof payload.error === "string" ? payload.error : "failed";
+    return { ok: false, error };
+  }
+  const providerMessageId = extractProviderMessageId(payload);
   return { ok: true, providerMessageId };
 }
 async function sendTelegram(input, deps2) {
@@ -23320,12 +23639,7 @@ async function sendTelegram(input, deps2) {
         parse_mode: "MarkdownV2"
       })
     });
-    if (!res2.ok) {
-      const body2 = await res2.text().catch(() => "");
-      return { ok: false, error: `telegram_http_${res2.status}: ${body2}` };
-    }
-    const json2 = await res2.json().catch(() => ({}));
-    return { ok: true, providerMessageId: extractTelegramMessageId(json2) };
+    return parseTelegramSendResponse(res2);
   }
   const files = [];
   for (const att of input.attachments) {
@@ -23359,12 +23673,7 @@ async function sendTelegram(input, deps2) {
       headers: { "Content-Type": contentType2 },
       body: toFetchBody(body2)
     });
-    if (!res2.ok) {
-      const bodyText = await res2.text().catch(() => "");
-      return { ok: false, error: `telegram_http_${res2.status}: ${bodyText}` };
-    }
-    const json2 = await res2.json().catch(() => ({}));
-    return { ok: true, providerMessageId: extractTelegramMessageId(json2) };
+    return parseTelegramSendResponse(res2);
   }
   const mediaJson = input.attachments.map((att, index) => {
     const item = {
@@ -23397,11 +23706,18 @@ async function sendTelegram(input, deps2) {
     headers: { "Content-Type": contentType },
     body: toFetchBody(body)
   });
+  return parseTelegramSendResponse(res);
+}
+async function parseTelegramSendResponse(res) {
   if (!res.ok) {
-    const bodyText = await res.text().catch(() => "");
-    return { ok: false, error: `telegram_http_${res.status}: ${bodyText}` };
+    const body = await res.text().catch(() => "");
+    return { ok: false, error: `telegram_http_${res.status}: ${body}` };
   }
   const json = await res.json().catch(() => ({}));
+  if (json.ok !== true) {
+    const description = typeof json.description === "string" ? json.description : "unknown_error";
+    return { ok: false, error: `telegram_error: ${description}` };
+  }
   return { ok: true, providerMessageId: extractTelegramMessageId(json) };
 }
 function extractProviderMessageId(result) {
@@ -26348,7 +26664,16 @@ function registerOrchestrationTools(rawServer, opts) {
         if (!out.ok) {
           return {
             content: [
-              { type: "text", text: JSON.stringify({ sent: false, bound: false, error: out.error }) }
+              {
+                type: "text",
+                text: JSON.stringify({
+                  sent: false,
+                  bound: false,
+                  error: out.error,
+                  ...out.blockedReason ? { blocked_reason: out.blockedReason } : {},
+                  ...out.suggestion ? { suggestion: out.suggestion } : {}
+                })
+              }
             ],
             isError: true
           };
@@ -26364,7 +26689,18 @@ function registerOrchestrationTools(rawServer, opts) {
             provider
           });
         }
-        return { content: [{ type: "text", text: JSON.stringify({ sent: true, bound }) }] };
+        return {
+          content: [
+            {
+              type: "text",
+              text: JSON.stringify({
+                sent: true,
+                bound,
+                ...out.providerMessageId ? { message_id: out.providerMessageId } : {}
+              })
+            }
+          ]
+        };
       }
     );
   }
@@ -26798,7 +27134,7 @@ async function startHttpServer(opts) {
   }
   function authorizeMcp(req, res) {
     const origin = req.headers.origin;
-    if (typeof origin === "string" && origin.length > 0 && !originAllowed(origin)) {
+    if (typeof origin === "string" && origin.length > 0 && !originAllowed(origin) && !embedTokenTrusted(req)) {
       const auth = readAuth();
       const header = req.headers.authorization;
       if (auth.mode === "bearer" && header === `Bearer ${auth.token}`) {
@@ -26828,8 +27164,12 @@ async function startHttpServer(opts) {
     }
     const origin = req.headers.origin;
     if (typeof origin === "string" && originAllowed(origin)) return "ok";
+    if (embedTokenTrusted(req)) return "ok";
     return header ? "bad" : "missing";
   }
+  function embedTokenTrusted(req) {
+    return isValidAppEmbedToken(requestEmbedToken(req));
+  }
   function originAllowed(origin) {
     const list = opts.strictOrigins ? opts.allowedOrigins ?? [] : [...DEFAULT_ALLOWED_ORIGINS, ...opts.allowedOrigins ?? []];
     for (const pattern of list) {
@@ -27115,7 +27455,7 @@ async function startHttpServer(opts) {
   }
   function guardBrowserOrigin(req, res) {
     const origin = req.headers.origin;
-    if (typeof origin === "string" && origin.length > 0 && !originAllowed(origin)) {
+    if (typeof origin === "string" && origin.length > 0 && !originAllowed(origin) && !embedTokenTrusted(req)) {
       const auth = readAuth();
       const header = req.headers.authorization;
       if (auth.mode === "bearer" && header === `Bearer ${auth.token}`) {
@@ -27134,10 +27474,14 @@ async function startHttpServer(opts) {
   }
   function applyCors(req, res) {
     const origin = req.headers.origin;
-    const trusted = typeof origin === "string" && origin.length > 0 && originAllowed(origin);
-    if (trusted) {
+    const tokenTrusted = embedTokenTrusted(req);
+    const originTrusted = typeof origin === "string" && origin.length > 0 && originAllowed(origin);
+    const trusted = originTrusted || tokenTrusted;
+    if (originTrusted) {
       res.setHeader("Access-Control-Allow-Origin", origin);
       res.setHeader("Access-Control-Allow-Credentials", "true");
+    } else if (tokenTrusted && origin && origin !== "null") {
+      res.setHeader("Access-Control-Allow-Origin", origin);
     } else {
       res.setHeader("Access-Control-Allow-Origin", "*");
     }
@@ -28105,7 +28449,9 @@ async function startHttpServer(opts) {
           const uiMatch = path.match(/^\/apps\/(.+)\/ui$/);
           if (uiMatch && req.method === "GET") {
             const uiApp = opts.appRegistry.getApp(decodeURIComponent(uiMatch[1]));
-            if (!iframeEmbedOriginAllowed(req, uiApp ?? {}) && guardBrowserOrigin(req, res)) return;
+            if (!iframeEmbedOriginAllowed(req, uiApp ?? {}) && !isValidAppEmbedToken(requestEmbedToken(req)) && guardBrowserOrigin(req, res)) {
+              return;
+            }
             if (!authorize(req, res)) return;
             await handleAppUiPage(
               req,
@@ -30853,6 +31199,16 @@ async function handleAppUiPage(req, res, appId, appRegistry, frameAncestors) {
     if (frameAncestors.length === 0) {
       headers["x-frame-options"] = "SAMEORIGIN";
     }
+    if (embedRequested && !isValidAppEmbedToken(requestEmbedToken(req))) {
+      console.warn(
+        `[app-ui] embed refused for "${appId}": ` + JSON.stringify({
+          secFetchDest: req.headers["sec-fetch-dest"] ?? null,
+          origin: req.headers.origin ?? null,
+          referer: req.headers.referer ?? null,
+          embedToken: requestEmbedToken(req) != null
+        })
+      );
+    }
   }
   res.writeHead(200, headers);
   res.end(injectStandaloneAppBridge(raw));
@@ -30860,6 +31216,7 @@ async function handleAppUiPage(req, res, appId, appRegistry, frameAncestors) {
 function iframeEmbedAllowed(req, app) {
   const secFetchDest = req.headers["sec-fetch-dest"];
   if (secFetchDest !== void 0 && secFetchDest !== "iframe") return false;
+  if (isValidAppEmbedToken(requestEmbedToken(req))) return true;
   const origin = typeof req.headers.origin === "string" && req.headers.origin.length > 0 ? req.headers.origin : null;
   const referer = typeof req.headers.referer === "string" && req.headers.referer.length > 0 ? req.headers.referer : null;
   if (!origin && !referer) return false;
@@ -30880,6 +31237,13 @@ function iframeEmbedAllowed(req, app) {
   }
   return false;
 }
+function requestEmbedToken(req) {
+  try {
+    return new URL(req.url ?? "/", "http://localhost").searchParams.get("et");
+  } catch {
+    return null;
+  }
+}
 function iframeEmbedOriginAllowed(req, app) {
   const origin = typeof req.headers.origin === "string" && req.headers.origin.length > 0 ? req.headers.origin : null;
   const referer = typeof req.headers.referer === "string" && req.headers.referer.length > 0 ? req.headers.referer : null;
@@ -34838,6 +35202,7 @@ function createOrchestratorMcpServerFactory(deps2) {
       ...deps2.listHarnessCapabilities ? { listHarnessCapabilities: deps2.listHarnessCapabilities } : {},
       ...deps2.webhookNotifier ? { webhookNotifier: deps2.webhookNotifier } : {},
       ...deps2.resolveSandboxProvider ? { resolveSandboxProvider: deps2.resolveSandboxProvider } : {},
+      ...deps2.defaultAgentPromptInterrupt != null ? { defaultAgentPromptInterrupt: deps2.defaultAgentPromptInterrupt } : {},
       daemonMcpUrl: deps2.daemonMcpUrl
     });
     registerOrchestrationTools(server, {
@@ -38278,6 +38643,10 @@ async function createGateway(opts) {
     // can declare `sandbox` and resolve a provider, instead of throwing
     // `sandbox_provider_not_found`.
     resolveSandboxProvider: resolveSandboxProviderResolved,
+    // config.json `defaults.agentPromptInterrupt` — same unset-default the
+    // root /mcp surface uses, so a child driving/reporting through the scoped
+    // orchestrator gateway honours it too.
+    ...configDefaults?.agentPromptInterrupt != null ? { defaultAgentPromptInterrupt: configDefaults.agentPromptInterrupt } : {},
     ...opts.resolveAgentAdapter ? { resolveAgentAdapter: opts.resolveAgentAdapter } : {},
     ...opts.listAgentAdapters ? { listAgentAdapters: opts.listAgentAdapters } : {},
     ...opts.listHarnessCapabilities ? { listHarnessCapabilities: opts.listHarnessCapabilities } : {}
@@ -38338,6 +38707,9 @@ async function createGateway(opts) {
       webhookNotifier,
       daemonMcpUrl,
       resolveSandboxProvider: resolveSandboxProviderResolved,
+      // config.json `defaults.agentPromptInterrupt` — the unset-default for
+      // `interrupt` on agent_prompt / message_parent. Omitted ⇒ false.
+      ...configDefaults?.agentPromptInterrupt != null ? { defaultAgentPromptInterrupt: configDefaults.agentPromptInterrupt } : {},
       ...opts.provisionWorktree ? { provisionWorktree: opts.provisionWorktree } : {},
       ...opts.resolveAgentAdapter ? { resolveAgentAdapter: opts.resolveAgentAdapter } : {},
       ...opts.listAgentAdapters ? { listAgentAdapters: opts.listAgentAdapters } : {},