@agentproto/runtime 3.4.0 → 3.6.1

package/dist/index.mjs

@@ -21,18 +21,18 @@ import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/
 import { createServer as createServer$1 } from 'net';
 import { defineTool, catchErrors, ToolError, pageParamsShape, paginated, paginate, toolText } from '@agentproto/tool';
 import { CatalogProviderSchema, getModelsByProvider, getStaticModelProvider } from '@agentproto/model-catalog';
+import { APP_UI_DISCOVERY_TOOLS, RUNNER_SELECT_SCRIPT } from '@agentproto/app-client/runner-select';
+import { SESSION_CHAT_APP_ID, liveSessionApp, makeLiveSessionApp, sessionsPanelApp, agentsOverviewApp, bureauSessionsApp, sessionStoryApp, workBoardApp, makeSessionsPanelApp, makeAgentsOverviewApp, makeBureauSessionsApp, makeSessionStoryPanelApp, makeSessionChatApp, makeWorkBoardApp, sessionChatApp } from '@agentproto/apps';
 import { inferLegacyModeKind, parseModelSwitchCommand, isModelSwitchAcknowledgement } from '@agentproto/driver-agent-cli';
 import { loadSandboxConfig, resolveCommandSandbox, COMMAND_SANDBOX_MODE_ENV } from '@agentproto/command-sandbox';
 import { createBrainManager, parseKnowledgeConfig } from '@agentproto/workspace-brain';
 import { defineHttpDriver } from '@agentproto/driver-http';
-import { liveSessionApp, makeLiveSessionApp, sessionsPanelApp, agentsOverviewApp, bureauSessionsApp, sessionStoryApp, workBoardApp, makeSessionsPanelApp, makeAgentsOverviewApp, makeBureauSessionsApp, makeSessionStoryPanelApp, makeSessionChatApp, makeWorkBoardApp, SESSION_CHAT_APP_ID, sessionChatApp } from '@agentproto/apps';
 import matter2 from 'gray-matter';
 import { createServer } from 'http';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import { WebSocketServer } from 'ws';
 import { loadAppHandle } from '@agentproto/app-kit';
 import { loadAgent } from '@agentproto/agent';
-import { APP_UI_DISCOVERY_TOOLS, RUNNER_SELECT_SCRIPT } from '@agentproto/app-client/runner-select';
 import { normalizeToolId } from '@agentproto/driver';
 import { createIngestionClient } from '@agentproto/telemetry-langfuse';
 import { resolveRedactor } from '@agentproto/redaction';
@@ -1666,8 +1666,8 @@ async function discoverOpenCodeSessions(cwd, since, expectedId) {
     const sinceMs = since ? Date.parse(since) : NaN;
     return rows.filter((r) => {
       if (!Number.isFinite(sinceMs)) return true;
-      const last = r.time_updated ?? r.time_created;
-      return last === void 0 || last >= sinceMs - 1e3;
+      if (r.time_created === void 0) return false;
+      return r.time_created >= sinceMs - 1e3;
     }).map(openCodeRowToCandidate);
   } finally {
     db.close();
@@ -2098,6 +2098,9 @@ function extractFirstText(content) {
   }
   return void 0;
 }
+function isClaudeControlText(text10) {
+  return /^<(?:local-command-caveat|local-command-stdout|command-name|task-notification)>/i.test(text10);
+}
 async function scanClaudeJsonl(filePath) {
   const stream = createReadStream(filePath, { encoding: "utf8" });
   const rl = createInterface({ input: stream, crlfDelay: Infinity });
@@ -2126,7 +2129,7 @@ async function scanClaudeJsonl(filePath) {
       messageCount += 1;
       if (preview2 === void 0 && entry.type === "user") {
         const text10 = extractFirstText(entry.message?.content);
-        if (text10 !== void 0) {
+        if (text10 !== void 0 && !isClaudeControlText(text10)) {
           preview2 = text10.length > 120 ? text10.slice(0, 120) : text10;
         }
       }
@@ -2232,7 +2235,43 @@ 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, bins] of Object.entries(BARE_LAUNCH_BINS)) {
+    if (bins.some((b) => argvBasename(b) === bin)) return slug;
+  }
+  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, BARE_LAUNCH_BINS, CONVERSATION_RESUME_KEYS;
 var init_conversation_store = __esm({
   "src/conversation-store.ts"() {
     CONVERSATION_STORES = {
@@ -2242,6 +2281,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
@@ -2266,6 +2306,9 @@ var init_conversation_store = __esm({
       },
       opencode: {
         storeAs: "openCodeResumeId",
+        // Match the adapter's portable npx installation: a direct `opencode`
+        // binary is not guaranteed to be on the daemon's PATH on every host.
+        attachArgv: (conversationId) => ["npx", "-y", "opencode-ai", "-s", conversationId],
         discover: discoverOpenCode,
         read: readOpenCode
       },
@@ -2280,6 +2323,36 @@ 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"]
+    };
+    BARE_LAUNCH_BINS = {
+      opencode: ["opencode"],
+      mastracode: ["mastracode"]
+    };
+    CONVERSATION_RESUME_KEYS = new Set(
+      Object.values(CONVERSATION_STORES).map((s) => s.storeAs)
+    );
   }
 });
 
@@ -2512,6 +2585,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,
@@ -2528,7 +2602,8 @@ var RESUME_STRATEGIES = Object.fromEntries(
 );
 function decideRestartStrategy(prev, opts = {}) {
   const mayPreferNative = prev.pty === true || opts.preferNativeTerminal === true;
-  if (prev.adapterSlug && prev.nativeTerminalResume === true && mayPreferNative) {
+  const hasNativeCapability = prev.nativeTerminalResume === true || prev.pty === true && prev.nativeTerminalResume === void 0;
+  if (prev.adapterSlug && hasNativeCapability && mayPreferNative) {
     const strategy = RESUME_STRATEGIES[prev.adapterSlug];
     const id = strategy?.storeAs ? prev.resumeMetadata?.[strategy.storeAs] : void 0;
     if (strategy?.spawnArgs && id) {
@@ -2583,13 +2658,30 @@ 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) {
+  const hasNativeCapability = prev.nativeTerminalResume === true || prev.pty === true && prev.nativeTerminalResume === void 0;
+  if (prev.adapterSlug && hasNativeCapability && mayPreferNative) {
     const s = RESUME_STRATEGIES[prev.adapterSlug];
     if (s?.spawnArgs && s.storeAs && prev.resumeMetadata?.[s.storeAs]) {
-      const sample = s.spawnArgs("\u2026")[0] ?? prev.adapterSlug;
-      return `resumed via ${sample} --resume`;
+      const sample = s.spawnArgs("\u2026");
+      const idIndex = sample.indexOf("\u2026");
+      return `resumed via ${idIndex > 0 ? sample.slice(0, idIndex).join(" ") : sample[0] ?? prev.adapterSlug}`;
     }
   }
   if (prev.adapterSlug && prev.adapterSessionId) {
@@ -2628,6 +2720,9 @@ function tokenizeCommand(s) {
   return out;
 }
 
+// src/sessions.ts
+init_conversation_store();
+
 // src/command-log.ts
 init_transcript_writer();
 function writeCommandLogEntry(sessionId, entry, baseDir) {
@@ -5280,6 +5375,9 @@ async function resolveWorkspaceRules(slug, deps2 = {}) {
 
 // src/session-title.ts
 var MAX_LENGTH = 72;
+function isInternalDerivedTitle(title) {
+  return /^<(?:local-command-caveat|local-command-stdout|command-name|task-notification)>/i.test(title);
+}
 function isRecord3(value) {
   return typeof value === "object" && value !== null;
 }
@@ -5306,6 +5404,7 @@ function deriveSessionTitle(message) {
   if (raw === void 0) return void 0;
   const collapsed = raw.replace(/\s+/g, " ").trim();
   if (collapsed === "") return void 0;
+  if (isInternalDerivedTitle(collapsed)) return void 0;
   const sentence = collapsed.replace(/[.?!](\s.*)?$/, "").trim();
   if (sentence === "" || !/[\p{L}\p{N}]/u.test(sentence)) return void 0;
   return Array.from(sentence).length > MAX_LENGTH ? truncate2(sentence, MAX_LENGTH) : sentence;
@@ -8205,8 +8304,175 @@ var sandboxSpecWithReuseSchema = z.object({
     "Reconnect to an existing box instead of booting a new one. Accepts a prior session's exact `sandboxId`, a ledger `label` (exact match), or an unambiguous prefix of a ledger sandboxId \u2014 resolved against the local sandbox ledger (`~/.agentproto/sandboxes.json`, see `agentproto sandbox list`). A prefix matching more than one ledger entry fails with `sandbox_reuse_ambiguous` listing the candidates. Requires the provider to support reconnect (e.g. e2b); omit to boot fresh (default)."
   )
 }).strict();
-
-// src/agent-tools.ts
+function appUiToolId(appId) {
+  const slug = appId.replace(/^@[^/]+\//, "").replace(/[^a-z0-9]/g, "_");
+  return `app_ui_${slug}`;
+}
+var MCP_APP_BRIDGE_SCRIPT = `<script>
+(function () {
+  window.__AGENTPROTO_UI_TRANSPORT__ = "mcp";
+  if (window.McpApp) return;
+  var nextId = 1, pending = {}, teardownCbs = [];
+  function post(m) { window.parent.postMessage(m, "*"); }
+  window.addEventListener("message", function (e) {
+    var m = e.data;
+    if (typeof m === "string") { try { m = JSON.parse(m); } catch (_) { return; } }
+    if (!m || m.jsonrpc !== "2.0") return;
+    if (m.method === "ui/resource-teardown") {
+      for (var i = 0; i < teardownCbs.length; i++) teardownCbs[i]();
+      post({ jsonrpc: "2.0", id: m.id, result: {} });
+      return;
+    }
+    if (m.id != null && pending[m.id]) { var cb = pending[m.id]; delete pending[m.id]; cb(m.result, m.error); }
+  });
+  function request(method, params) {
+    return new Promise(function (resolve, reject) {
+      var id = nextId++;
+      pending[id] = function (r, err) { if (err) reject(new Error((err && err.message) || String(err))); else resolve(r); };
+      post({ jsonrpc: "2.0", id: id, method: method, params: params });
+    });
+  }
+  window.McpApp = {
+    connect: function () {
+      if (window.parent === window) return Promise.reject(new Error("no host (standalone)"));
+      return request("ui/initialize", {
+        appInfo: { name: "agentproto-app", version: "1.0" },
+        appCapabilities: { availableDisplayModes: ["inline", "fullscreen"] },
+        protocolVersion: "2026-01-26"
+      }).then(function () {
+        post({ jsonrpc: "2.0", method: "ui/notifications/initialized", params: {} });
+        return {
+          callTool: function (name, args) { return request("tools/call", { name: name, arguments: args || {} }); },
+          sendMessage: function (p) {
+            var params = typeof p === "string" ? { content: p } : (p || {});
+            var content = typeof params.content === "string" ? [{ type: "text", text: params.content }] : (params.content || []);
+            return request("ui/message", { role: "user", content: content });
+          },
+          updateModelContext: function (p) { return request("ui/update-model-context", p || {}); },
+          openLink: function (url) { return request("ui/open-link", { url: url }); },
+          onTeardown: function (cb) { teardownCbs.push(cb); }
+        };
+      });
+    }
+  };
+})();
+</script>
+`;
+function injectAfterStructuralTag(html, script) {
+  for (const tag of ["head", "body", "html"]) {
+    const match = html.match(new RegExp(`<${tag}[^>]*>`, "i"));
+    if (match?.index !== void 0) {
+      const insertAt = match.index + match[0].length;
+      return html.slice(0, insertAt) + script + html.slice(insertAt);
+    }
+  }
+  return script + html;
+}
+function injectMcpAppBridge(html) {
+  const hasBridge = /window\.McpApp\s*=/.test(html);
+  const hasRunnerSelect = /window\.AgentprotoUI\s*=/.test(html);
+  if (hasBridge && hasRunnerSelect) return html;
+  const script = (hasBridge ? "" : MCP_APP_BRIDGE_SCRIPT) + (hasRunnerSelect ? "" : RUNNER_SELECT_SCRIPT);
+  return injectAfterStructuralTag(html, script);
+}
+var STANDALONE_REST_BRIDGE_SCRIPT = `<script>
+(function () {
+  window.__AGENTPROTO_UI_TRANSPORT__ = "http";
+  if (window.McpApp) return;
+  window.McpApp = {
+    connect: function () {
+      return Promise.resolve({
+        callTool: function (name, args) {
+          return fetch("./tool-call", {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ tool: name, args: args || {} })
+          }).then(function (res) {
+            return res.json().catch(function () {
+              throw new Error("tool-call failed: HTTP " + res.status);
+            }).then(function (body) {
+              if (!res.ok) throw new Error((body && (body.message || body.error)) || ("tool-call failed: HTTP " + res.status));
+              return body;
+            });
+          });
+        },
+        sendMessage: function () {
+          return Promise.reject(new Error("sendMessage: no chat host (standalone mode)"));
+        },
+        updateModelContext: function () {
+          return Promise.reject(new Error("updateModelContext: no host (standalone mode)"));
+        },
+        openLink: function (url) {
+          window.open(url, "_blank");
+          return Promise.resolve({});
+        },
+        onTeardown: function () {}
+      });
+    }
+  };
+})();
+</script>
+`;
+function injectStandaloneAppBridge(html, baseUrl) {
+  const hasRunnerSelect = /window\.AgentprotoUI\s*=/.test(html);
+  const baseUrlScript = baseUrl ? `<script>window.__AGENTPROTO_BASEURL__=${JSON.stringify(baseUrl).replace(/</g, "\\u003c")};</script>` : "";
+  const script = baseUrlScript + STANDALONE_REST_BRIDGE_SCRIPT + (hasRunnerSelect ? "" : RUNNER_SELECT_SCRIPT);
+  return injectAfterStructuralTag(html, script);
+}
+function createUiHtmlCache() {
+  const cache = /* @__PURE__ */ new Map();
+  return {
+    async get(path, version) {
+      const cached = cache.get(path);
+      if (cached && cached.version === version) return cached.html;
+      const raw = await readFile(path, "utf8");
+      const html = injectMcpAppBridge(raw);
+      cache.set(path, { version, html });
+      return html;
+    }
+  };
+}
+async function makeInstalledAppUiApps(appRegistry, cache, existingToolNames) {
+  const apps = [];
+  const seen = new Set(existingToolNames);
+  for (const app of appRegistry.listApps()) {
+    const ui = app.ui;
+    if (!ui) continue;
+    const toolId = appUiToolId(app.appId);
+    if (seen.has(toolId)) {
+      console.warn(
+        `[app-ui-apps] skipping UI panel for app "${app.appId}": tool id "${toolId}" collides with an existing tool or another installed app's panel.`
+      );
+      continue;
+    }
+    let html;
+    try {
+      html = await cache.get(ui.path, app.updatedAt);
+    } catch (err) {
+      console.warn(
+        `[app-ui-apps] skipping UI panel for app "${app.appId}": could not read "${ui.path}": ${err instanceof Error ? err.message : String(err)}`
+      );
+      continue;
+    }
+    seen.add(toolId);
+    apps.push({
+      id: toolId,
+      title: ui.title ?? app.name ?? app.appId,
+      ...ui.description ? { description: ui.description } : {},
+      inputSchema: z.object({}),
+      execute: async () => ({ appId: app.appId, tools: ui.tools ?? [] }),
+      html,
+      ...ui.csp ? {
+        csp: {
+          ...ui.csp.connectDomains ? { connectDomains: [...ui.csp.connectDomains] } : {},
+          ...ui.csp.resourceDomains ? { resourceDomains: [...ui.csp.resourceDomains] } : {},
+          ...ui.csp.frameDomains ? { frameDomains: [...ui.csp.frameDomains] } : {}
+        }
+      } : {}
+    });
+  }
+  return apps;
+}
 function stripAnsi(s) {
   let result = s.replace(/\x1b\[[0-9;?]*[A-Za-z]/g, "");
   result = result.replace(/\r\n/g, "\n");
@@ -8261,8 +8527,12 @@ function registerAgentTools(server, opts) {
     resolveSandboxProvider: resolveSandboxProvider2,
     provisionWorktree,
     resolveWorktreeIsolation,
-    supervisor
+    supervisor,
+    defaultAgentPromptInterrupt,
+    isSessionChatInstalled
   } = opts;
+  const interruptDefault = defaultAgentPromptInterrupt ?? false;
+  const sessionChatResourceUri = isSessionChatInstalled?.() ? `ui://${appUiToolId(SESSION_CHAT_APP_ID)}/view` : "ui://agentproto_session_chat/view";
   server.registerTool(
     "agent_start",
     {
@@ -8498,14 +8768,25 @@ 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. `resourceUri` binds
+      // to the native `app_ui_session_chat` MCP Apps tool once
+      // `@agentik/session-chat` is installed (`isSessionChatInstalled`
+      // above) — the loopback-HTTP `agentproto_session_chat` launcher this
+      // otherwise binds to is unreachable under a strict-CSP host (Codex),
+      // and builtin-apps.ts stops mounting it once the native tool exists.
       _meta: {
         ui: {
-          resourceUri: "ui://live_session/view",
+          resourceUri: sessionChatResourceUri,
           visibility: ["model", "app"]
         }
       }
@@ -8618,7 +8899,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 +8910,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 +8920,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 +8963,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 +9002,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 +9018,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(
@@ -10316,6 +10626,149 @@ function filterSessionObserver(inner, shouldObserve) {
 init_tool_presenter();
 init_transcript_writer();
 
+// src/session-titler.ts
+init_config();
+init_transcript_writer();
+var DEFAULT_TITLER_MODEL = "z-ai/glm-5.2@openrouter";
+var DEFAULT_LABELS = /* @__PURE__ */ new Set(["chat-starter", "chat-starter-autoprompt", "agentproto"]);
+var MIN_TURN_CHARS = 200;
+var titledSessions = /* @__PURE__ */ new Set();
+async function resolveTitlerConfig() {
+  const cfg = await loadConfig();
+  const t = cfg.titler;
+  return { enabled: t?.enabled === true, model: t?.model ?? DEFAULT_TITLER_MODEL };
+}
+function isDefaultLabel(desc) {
+  const label = desc.label?.trim() ?? "";
+  if (label === "") return true;
+  if (desc.title !== void 0 && label === desc.title) return true;
+  return DEFAULT_LABELS.has(label);
+}
+function fallbackTitle(userText) {
+  const firstLine = userText.split(/\r?\n/).find((l) => l.trim().length > 0)?.trim() ?? "";
+  return firstLine.split(/\s+/).filter(Boolean).slice(0, 6).join(" ");
+}
+function sanitizeTitle(raw) {
+  if (!raw) return void 0;
+  const cleaned = raw.replace(/[`*_"“”'']/g, "").split(/\r?\n/)[0]?.trim();
+  if (!cleaned) return void 0;
+  const words = cleaned.split(/\s+/).map((w) => w.replace(/[.,;:!?]+$/u, "")).filter((w) => /[\p{L}\p{N}]/u.test(w)).slice(0, 8);
+  const title = words.join(" ");
+  return title.length > 0 ? title : void 0;
+}
+async function readFirstTurn(sessionId) {
+  let stream;
+  try {
+    stream = createReadStream(sessionEventsPath(sessionId), { encoding: "utf8" });
+    await new Promise((resolve31, reject) => {
+      stream.once("error", reject);
+      stream.once("open", resolve31);
+    });
+  } catch {
+    return null;
+  }
+  let userText = "";
+  let assistantText = "";
+  let sawUserPrompt = false;
+  try {
+    const rl = createInterface({ input: stream, crlfDelay: Infinity });
+    for await (const line of rl) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      let rec;
+      try {
+        rec = JSON.parse(trimmed);
+      } catch {
+        continue;
+      }
+      if (rec.kind === "user-prompt" && typeof rec.text === "string") {
+        userText = rec.text;
+        sawUserPrompt = true;
+      } else if (rec.kind === "text-delta" && typeof rec.text === "string") {
+        assistantText += rec.text;
+      } else if (rec.kind === "turn-end") {
+        break;
+      }
+    }
+  } catch {
+    return null;
+  }
+  if (!sawUserPrompt) return null;
+  return { userText, assistantText };
+}
+async function generateTitleViaLlm(model, input) {
+  const apiKey = process.env.OPENROUTER_API_KEY;
+  if (!apiKey) return void 0;
+  const excerpt = (s, n) => s.length <= n ? s : `${s.slice(0, n)}\u2026`;
+  const body = {
+    model,
+    max_tokens: 64,
+    messages: [
+      {
+        role: "system",
+        content: "You write short prosaic titles for agent sessions. Reply with ONLY the title: 4-8 plain words, no quotes, no punctuation at the end, describing what the session is doing."
+      },
+      {
+        role: "user",
+        content: `User asked: ${excerpt(input.userText, 2e3)}
+Assistant worked on: ${excerpt(input.assistantText, 2e3)}
+Title:`
+      }
+    ]
+  };
+  try {
+    const res = await fetch("https://openrouter.ai/api/v1/chat/completions", {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${apiKey}`
+      },
+      body: JSON.stringify(body),
+      signal: AbortSignal.timeout(15e3)
+    });
+    if (!res.ok) return void 0;
+    const parsed = await res.json();
+    const content = parsed.choices?.[0]?.message?.content;
+    return typeof content === "string" ? content : void 0;
+  } catch {
+    return void 0;
+  }
+}
+async function maybeTitleSession(registry, sessionId, opts = {}) {
+  try {
+    if (titledSessions.has(sessionId)) return null;
+    titledSessions.add(sessionId);
+    const desc = registry.get(sessionId);
+    if (!desc || desc.kind !== "agent-cli") return null;
+    if (desc.renamedByUser === true) return null;
+    if (!isDefaultLabel(desc)) return null;
+    const generate = opts.generate ?? (async (t) => {
+      const { enabled, model } = await resolveTitlerConfig();
+      if (!enabled) return void 0;
+      return generateTitleViaLlm(model, t);
+    });
+    if (!opts.generate) {
+      const { enabled } = await resolveTitlerConfig();
+      if (!enabled) return null;
+    }
+    const read = opts.readFirstTurn ?? readFirstTurn;
+    const turn = await read(sessionId);
+    if (!turn) return null;
+    const minChars = opts.minChars ?? MIN_TURN_CHARS;
+    if (turn.userText.length + turn.assistantText.length < minChars) return null;
+    const generated = sanitizeTitle(await generate(turn));
+    const title = generated ?? fallbackTitle(turn.userText);
+    if (!title) return null;
+    registry.renameSession(sessionId, { label: title });
+    return title;
+  } catch (err) {
+    console.warn(
+      `[session-titler] maybeTitleSession(${sessionId}) failed: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return null;
+  }
+}
+
 // src/resume-context-digest.ts
 init_transcript_export();
 var DIGEST_CHAR_BUDGET = 7e3;
@@ -10915,6 +11368,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 +11764,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 +11946,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 +11992,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 +12150,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 +12165,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 +12182,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) => {
@@ -12506,6 +13049,9 @@ ${message}`;
           });
         }
         if (overBudget) emitExited(rt);
+        if ((rt.desc.turnsCompleted ?? 0) === 1) {
+          void maybeTitleSession(registry, rt.desc.id);
+        }
       } else {
         rt.desc.turnsCompleted = (rt.desc.turnsCompleted ?? 0) + 1;
         if (rt.desc.lastTurnEmpty !== void 0) delete rt.desc.lastTurnEmpty;
@@ -13010,6 +13556,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" && !(conversationSlug === "opencode" && (input.argv[i] === "--session" || input.argv[i] === "-s"))) 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 +13583,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 +13619,8 @@ ${message}`;
         emitter: new EventEmitter(),
         busy: false,
         textBuf: "",
-        thoughtBuf: ""
+        thoughtBuf: "",
+        ...isConversationTerminal(desc) ? { conversationTerminal: true } : {}
       };
       rt.emitter.setMaxListeners(50);
       sessions.set(id, rt);
@@ -13062,6 +13632,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 +13846,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 +13862,7 @@ ${message}`;
           "stderr"
         );
       });
+      return { queued: false };
     },
     removeQueuedPrompt(id, queueId) {
       const rt = sessions.get(id);
@@ -13575,7 +14150,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 +14163,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 };
     },
@@ -16432,6 +17011,10 @@ var mcpBool2 = z.preprocess(
   (v) => v === "true" ? true : v === "false" ? false : v,
   z.boolean()
 );
+var publicSessionDescriptor = (session) => {
+  const { ptyResumeEnv: _privateResumeEnv, ...publicDescriptor } = session;
+  return publicDescriptor;
+};
 var compactSessionItem = (s) => ({
   id: s.id,
   kind: s.kind,
@@ -16568,7 +17151,7 @@ function registerSessionTools(rawServer, opts) {
           (s) => s.status === "running" || s.status === "starting"
         );
       }
-      return rows;
+      return rows.map(publicSessionDescriptor);
     },
     transformers: [
       paginated({
@@ -17025,7 +17608,7 @@ function registerSessionTools(rawServer, opts) {
           (s) => s.status === "running" || s.status === "starting"
         );
       }
-      return rows;
+      return rows.map(publicSessionDescriptor);
     },
     project: compactSessionItemWithProvenance,
     keyOf: (s) => s.id,
@@ -17060,7 +17643,7 @@ function registerSessionTools(rawServer, opts) {
           (s) => s.status === "running" || s.status === "starting"
         );
       }
-      return rows;
+      return rows.map(publicSessionDescriptor);
     },
     project: compactSessionItemWithProvenance,
     keyOf: (s) => s.id,
@@ -17899,9 +18482,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`)
@@ -17956,7 +18557,7 @@ function registerSessionTools(rawServer, opts) {
             content: [
               {
                 type: "text",
-                text: JSON.stringify(desc)
+                text: JSON.stringify(publicSessionDescriptor(desc))
               }
             ]
           };
@@ -17983,6 +18584,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 } : {}
         });
@@ -17992,10 +18602,11 @@ function registerSessionTools(rawServer, opts) {
               type: "text",
               text: JSON.stringify(
                 {
-                  ...restarted.desc,
+                  ...publicSessionDescriptor(restarted.desc),
                   resumedFrom: restarted.resumedFrom,
                   resumeVia: restarted.resumeVia,
-                  ...restarted.resumeFallback ? { resumeFallback: true } : {}
+                  ...restarted.resumeFallback ? { resumeFallback: true } : {},
+                  ...nativeResumeDecline ? { nativeResumeDecline } : {}
                 },
                 null,
                 2
@@ -18062,7 +18673,7 @@ function registerSessionTools(rawServer, opts) {
       try {
         const desc = registry.archiveSession(prev.id);
         return {
-          content: [{ type: "text", text: JSON.stringify(desc) }]
+          content: [{ type: "text", text: JSON.stringify(publicSessionDescriptor(desc)) }]
         };
       } catch (err) {
         return {
@@ -18144,7 +18755,7 @@ function registerSessionTools(rawServer, opts) {
       try {
         const desc = registry.unarchiveSession(prev.id);
         return {
-          content: [{ type: "text", text: JSON.stringify(desc) }]
+          content: [{ type: "text", text: JSON.stringify(publicSessionDescriptor(desc)) }]
         };
       } catch (err) {
         return {
@@ -18229,7 +18840,7 @@ function registerSessionTools(rawServer, opts) {
           reason: input.reason
         });
         return {
-          content: [{ type: "text", text: JSON.stringify(desc) }]
+          content: [{ type: "text", text: JSON.stringify(publicSessionDescriptor(desc)) }]
         };
       } catch (err) {
         return {
@@ -18313,7 +18924,7 @@ function registerSessionTools(rawServer, opts) {
           ...input.label !== void 0 ? { label: input.label } : {}
         });
         return {
-          content: [{ type: "text", text: JSON.stringify(desc) }]
+          content: [{ type: "text", text: JSON.stringify(publicSessionDescriptor(desc)) }]
         };
       } catch (err) {
         return {
@@ -18375,7 +18986,7 @@ function registerSessionTools(rawServer, opts) {
       try {
         const desc = registry.setKeepAlive(prev.id, input.keepAlive);
         return {
-          content: [{ type: "text", text: JSON.stringify(desc) }]
+          content: [{ type: "text", text: JSON.stringify(publicSessionDescriptor(desc)) }]
         };
       } catch (err) {
         return {
@@ -18437,7 +19048,7 @@ function registerSessionTools(rawServer, opts) {
       try {
         const desc = registry.setPinned(prev.id, input.pinned);
         return {
-          content: [{ type: "text", text: JSON.stringify(desc) }]
+          content: [{ type: "text", text: JSON.stringify(publicSessionDescriptor(desc)) }]
         };
       } catch (err) {
         return {
@@ -18553,7 +19164,7 @@ function registerSessionTools(rawServer, opts) {
           } : {}
         });
         return {
-          content: [{ type: "text", text: JSON.stringify(desc) }]
+          content: [{ type: "text", text: JSON.stringify(publicSessionDescriptor(desc)) }]
         };
       } catch (err) {
         return {
@@ -20289,13 +20900,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,
@@ -20352,6 +20984,7 @@ function registerMcpApps(server, apps) {
   }
 }
 function makeBuiltinPanelApps(ops) {
+  const sessionChatNativeInstalled = ops.isSessionChatInstalled();
   return [
     makeSessionsPanelApp({ listSessions: ops.listSessions }),
     makeAgentsOverviewApp({ listSessions: ops.listSessions }),
@@ -20361,13 +20994,26 @@ function makeBuiltinPanelApps(ops) {
     // `agent_start` via _meta.ui.resourceUri (agent-tools.ts) so a launch
     // auto-renders it.
     makeLiveSessionApp({ httpBaseUrl: ops.httpBaseUrl }),
-    // Session-chat widget — thin launcher for the installed
+    // Session-chat widget — thin loopback-HTTP launcher for the installed
     // `@agentik/session-chat` app's standalone UI (deep-linked iframe when
     // installed, install notice otherwise; see apps/src/session-chat).
-    makeSessionChatApp({
-      httpBaseUrl: ops.httpBaseUrl,
-      isSessionChatInstalled: ops.isSessionChatInstalled
-    }),
+    // Mounted ONLY when the native app isn't installed: once it is, its own
+    // MCP Apps tool (`app_ui_session_chat`, app-ui-apps.ts) is the one and
+    // only launch path — a strict-CSP host (Codex) can't fetch this
+    // widget's loopback HTTP calls, so offering both would just add a
+    // broken option next to the working one. `agent_start`'s launch-card
+    // binding (agent-tools.ts) makes the matching choice.
+    ...sessionChatNativeInstalled ? [] : [
+      makeSessionChatApp({
+        httpBaseUrl: ops.httpBaseUrl,
+        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/
     // task_update/task_create over the bridge, same as every other caller.
@@ -20420,6 +21066,39 @@ function builtinPanelCatalogEntries() {
     };
   });
 }
+
+// src/public-origins.ts
+var HTTP_PROTOCOLS = /* @__PURE__ */ new Set(["http:", "https:"]);
+var WS_PROTOCOLS = /* @__PURE__ */ new Set(["ws:", "wss:"]);
+function normalizeOrigin(value, protocols) {
+  const candidate = value?.trim().replace(/\/+$/, "");
+  if (!candidate) return void 0;
+  try {
+    const url = new URL(candidate);
+    if (!protocols.has(url.protocol)) return void 0;
+    if (url.username || url.password || url.search || url.hash) return void 0;
+    if (url.pathname !== "/") return void 0;
+    return url.origin;
+  } catch {
+    return void 0;
+  }
+}
+function resolveRequestHttpBaseUrl(headers, configuredOrigin = process.env.AGENTPROTO_PUBLIC_HTTP_ORIGIN) {
+  const configured = normalizeOrigin(configuredOrigin, HTTP_PROTOCOLS);
+  if (configured) return configured;
+  const forwarded = headers["x-forwarded-proto"];
+  const firstForwarded = (Array.isArray(forwarded) ? forwarded[0] : forwarded)?.split(",")[0]?.trim().toLowerCase();
+  const protocol = firstForwarded === "https" ? "https" : "http";
+  return normalizeOrigin(`${protocol}://${headers.host ?? "127.0.0.1"}`, HTTP_PROTOCOLS) ?? `${protocol}://127.0.0.1`;
+}
+function resolvePublicAppOrigins(port, configuredHttpOrigin = process.env.AGENTPROTO_PUBLIC_HTTP_ORIGIN, configuredWsOrigin = process.env.AGENTPROTO_PUBLIC_WS_ORIGIN) {
+  const httpOrigin = normalizeOrigin(configuredHttpOrigin, HTTP_PROTOCOLS) ?? `http://127.0.0.1:${port}`;
+  const configuredWs = normalizeOrigin(configuredWsOrigin, WS_PROTOCOLS);
+  if (configuredWs) return { httpOrigin, wsOrigin: configuredWs };
+  const http = new URL(httpOrigin);
+  http.protocol = http.protocol === "https:" ? "wss:" : "ws:";
+  return { httpOrigin, wsOrigin: http.origin };
+}
 function summarizeSession(desc, lines, nowMs) {
   return {
     sessionId: desc.id,
@@ -22846,172 +23525,6 @@ function registerAppTools(server, opts) {
     }
   );
 }
-function appUiToolId(appId) {
-  const slug = appId.replace(/^@[^/]+\//, "").replace(/[^a-z0-9]/g, "_");
-  return `app_ui_${slug}`;
-}
-var MCP_APP_BRIDGE_SCRIPT = `<script>
-(function () {
-  if (window.McpApp) return;
-  var nextId = 1, pending = {}, teardownCbs = [];
-  function post(m) { window.parent.postMessage(m, "*"); }
-  window.addEventListener("message", function (e) {
-    var m = e.data;
-    if (typeof m === "string") { try { m = JSON.parse(m); } catch (_) { return; } }
-    if (!m || m.jsonrpc !== "2.0") return;
-    if (m.method === "ui/resource-teardown") {
-      for (var i = 0; i < teardownCbs.length; i++) teardownCbs[i]();
-      post({ jsonrpc: "2.0", id: m.id, result: {} });
-      return;
-    }
-    if (m.id != null && pending[m.id]) { var cb = pending[m.id]; delete pending[m.id]; cb(m.result, m.error); }
-  });
-  function request(method, params) {
-    return new Promise(function (resolve, reject) {
-      var id = nextId++;
-      pending[id] = function (r, err) { if (err) reject(new Error((err && err.message) || String(err))); else resolve(r); };
-      post({ jsonrpc: "2.0", id: id, method: method, params: params });
-    });
-  }
-  window.McpApp = {
-    connect: function () {
-      if (window.parent === window) return Promise.reject(new Error("no host (standalone)"));
-      return request("ui/initialize", {
-        appInfo: { name: "agentproto-app", version: "1.0" },
-        appCapabilities: { availableDisplayModes: ["inline", "fullscreen"] },
-        protocolVersion: "2026-01-26"
-      }).then(function () {
-        post({ jsonrpc: "2.0", method: "ui/notifications/initialized", params: {} });
-        return {
-          callTool: function (name, args) { return request("tools/call", { name: name, arguments: args || {} }); },
-          sendMessage: function (p) {
-            var params = typeof p === "string" ? { content: p } : (p || {});
-            var content = typeof params.content === "string" ? [{ type: "text", text: params.content }] : (params.content || []);
-            return request("ui/message", { role: "user", content: content });
-          },
-          updateModelContext: function (p) { return request("ui/update-model-context", p || {}); },
-          openLink: function (url) { return request("ui/open-link", { url: url }); },
-          onTeardown: function (cb) { teardownCbs.push(cb); }
-        };
-      });
-    }
-  };
-})();
-</script>
-`;
-function injectAfterStructuralTag(html, script) {
-  for (const tag of ["head", "body", "html"]) {
-    const match = html.match(new RegExp(`<${tag}[^>]*>`, "i"));
-    if (match?.index !== void 0) {
-      const insertAt = match.index + match[0].length;
-      return html.slice(0, insertAt) + script + html.slice(insertAt);
-    }
-  }
-  return script + html;
-}
-function injectMcpAppBridge(html) {
-  const hasBridge = /window\.McpApp\s*=/.test(html);
-  const hasRunnerSelect = /window\.AgentprotoUI\s*=/.test(html);
-  if (hasBridge && hasRunnerSelect) return html;
-  const script = (hasBridge ? "" : MCP_APP_BRIDGE_SCRIPT) + (hasRunnerSelect ? "" : RUNNER_SELECT_SCRIPT);
-  return injectAfterStructuralTag(html, script);
-}
-var STANDALONE_REST_BRIDGE_SCRIPT = `<script>
-(function () {
-  if (window.McpApp) return;
-  window.McpApp = {
-    connect: function () {
-      return Promise.resolve({
-        callTool: function (name, args) {
-          return fetch("./tool-call", {
-            method: "POST",
-            headers: { "content-type": "application/json" },
-            body: JSON.stringify({ tool: name, args: args || {} })
-          }).then(function (res) {
-            return res.json().catch(function () {
-              throw new Error("tool-call failed: HTTP " + res.status);
-            }).then(function (body) {
-              if (!res.ok) throw new Error((body && (body.message || body.error)) || ("tool-call failed: HTTP " + res.status));
-              return body;
-            });
-          });
-        },
-        sendMessage: function () {
-          return Promise.reject(new Error("sendMessage: no chat host (standalone mode)"));
-        },
-        updateModelContext: function () {
-          return Promise.reject(new Error("updateModelContext: no host (standalone mode)"));
-        },
-        openLink: function (url) {
-          window.open(url, "_blank");
-          return Promise.resolve({});
-        },
-        onTeardown: function () {}
-      });
-    }
-  };
-})();
-</script>
-`;
-function injectStandaloneAppBridge(html) {
-  const hasRunnerSelect = /window\.AgentprotoUI\s*=/.test(html);
-  const script = STANDALONE_REST_BRIDGE_SCRIPT + (hasRunnerSelect ? "" : RUNNER_SELECT_SCRIPT);
-  return injectAfterStructuralTag(html, script);
-}
-function createUiHtmlCache() {
-  const cache = /* @__PURE__ */ new Map();
-  return {
-    async get(path, version) {
-      const cached = cache.get(path);
-      if (cached && cached.version === version) return cached.html;
-      const raw = await readFile(path, "utf8");
-      const html = injectMcpAppBridge(raw);
-      cache.set(path, { version, html });
-      return html;
-    }
-  };
-}
-async function makeInstalledAppUiApps(appRegistry, cache, existingToolNames) {
-  const apps = [];
-  const seen = new Set(existingToolNames);
-  for (const app of appRegistry.listApps()) {
-    const ui = app.ui;
-    if (!ui) continue;
-    const toolId = appUiToolId(app.appId);
-    if (seen.has(toolId)) {
-      console.warn(
-        `[app-ui-apps] skipping UI panel for app "${app.appId}": tool id "${toolId}" collides with an existing tool or another installed app's panel.`
-      );
-      continue;
-    }
-    let html;
-    try {
-      html = await cache.get(ui.path, app.updatedAt);
-    } catch (err) {
-      console.warn(
-        `[app-ui-apps] skipping UI panel for app "${app.appId}": could not read "${ui.path}": ${err instanceof Error ? err.message : String(err)}`
-      );
-      continue;
-    }
-    seen.add(toolId);
-    apps.push({
-      id: toolId,
-      title: ui.title ?? app.name ?? app.appId,
-      ...ui.description ? { description: ui.description } : {},
-      inputSchema: z.object({}),
-      execute: async () => ({ appId: app.appId, tools: ui.tools ?? [] }),
-      html,
-      ...ui.csp ? {
-        csp: {
-          ...ui.csp.connectDomains ? { connectDomains: [...ui.csp.connectDomains] } : {},
-          ...ui.csp.resourceDomains ? { resourceDomains: [...ui.csp.resourceDomains] } : {},
-          ...ui.csp.frameDomains ? { frameDomains: [...ui.csp.frameDomains] } : {}
-        }
-      } : {}
-    });
-  }
-  return apps;
-}
 function paginatedLegacyList3(opts) {
   return {
     name: "paginatedLegacyList",
@@ -23241,6 +23754,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 +23799,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 +23824,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 +23860,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 +23894,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 +23927,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 +26885,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 +26910,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 } : {}
+              })
+            }
+          ]
+        };
       }
     );
   }
@@ -26734,6 +27291,10 @@ function registerPresetTools(server, opts = {}) {
     lister: async () => listPresets(process.env, adapterPresets)
   });
 }
+function sessionDescriptorForHttp(session) {
+  const { ptyResumeEnv: _privateResumeEnv, ...publicDescriptor } = session;
+  return publicDescriptor;
+}
 var DEFAULT_ALLOWED_ORIGINS = [
   "http://localhost:*",
   "http://127.0.0.1:*",
@@ -26798,7 +27359,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 +27389,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 +27680,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 +27699,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 +28674,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,
@@ -28851,7 +29422,7 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
     } else if (!includeCommands) {
       rows = rows.filter((s) => s.kind !== "command");
     }
-    json(200, { sessions: rows });
+    json(200, { sessions: rows.map(sessionDescriptorForHttp) });
     return true;
   }
   if (path === "/sessions/summaries" && req.method === "GET") {
@@ -28941,7 +29512,7 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
       return true;
     }
     json(201, {
-      ...result.descriptor,
+      ...sessionDescriptorForHttp(result.descriptor),
       ...result.warnings ? { warnings: result.warnings } : {},
       ...result.deduped ? { deduped: true } : {},
       ...result.dedupeSource ? { dedupeSource: result.dedupeSource } : {}
@@ -29157,7 +29728,7 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
         ...typeof b.name === "string" ? { name: b.name } : {},
         ...typeof b.label === "string" ? { label: b.label } : {}
       });
-      json(201, desc);
+      json(201, sessionDescriptorForHttp(desc));
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       const status = msg.includes("already in use") ? 409 : msg.includes("no PTY factory") ? 501 : 500;
@@ -29396,7 +29967,7 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
         ...listCatalogModels ? { listCatalogModels } : {}
       });
       json(200, {
-        ...restarted.desc,
+        ...sessionDescriptorForHttp(restarted.desc),
         resumedFrom: restarted.resumedFrom,
         resumeVia: restarted.resumeVia,
         ...restarted.resumeFallback ? { resumeFallback: true } : {}
@@ -29471,7 +30042,7 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
     };
     try {
       const desc = registry.renameSession(resolved.id, patch);
-      json(200, desc);
+      json(200, sessionDescriptorForHttp(desc));
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       json(msg.includes("no session") ? 404 : 500, { error: "rename_failed", message: msg });
@@ -29522,7 +30093,7 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
         env: b.env && typeof b.env === "object" ? b.env : void 0,
         label: typeof b.label === "string" ? b.label : void 0
       });
-      json(201, desc);
+      json(201, sessionDescriptorForHttp(desc));
     } catch (err) {
       json(500, {
         error: "spawn_failed",
@@ -29905,7 +30476,7 @@ async function handleSessions(req, res, path, registry, resolveAgentAdapter, pty
       json(404, { error: "session_not_found", id: rawIdOrName });
       return true;
     }
-    json(200, resolvedDesc);
+    json(200, sessionDescriptorForHttp(resolvedDesc));
     return true;
   }
   if (!suffix && req.method === "DELETE") {
@@ -30817,7 +31388,7 @@ async function handleProviderInbound(req, res, slug, deps2) {
   res.end(JSON.stringify(result));
 }
 function requestHttpBaseUrl(req) {
-  return `http://${req.headers.host ?? "127.0.0.1"}`;
+  return resolveRequestHttpBaseUrl(req.headers);
 }
 async function handleAppUiPage(req, res, appId, appRegistry, frameAncestors) {
   const app = appRegistry.getApp(appId);
@@ -30853,13 +31424,24 @@ 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));
+  res.end(injectStandaloneAppBridge(raw, requestHttpBaseUrl(req)));
 }
 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 +31462,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 +35427,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, {
@@ -37961,7 +38551,7 @@ async function createGateway(opts) {
   const port = opts.port ?? 18790;
   const daemonMcpUrl = `http://127.0.0.1:${port}/mcp`;
   const resolveSandboxProviderResolved = opts.resolveSandboxProvider ?? makeSandboxResolver(makeSandboxCredsStore());
-  const ptyWsBaseUrl = process.env.AGENTPROTO_PUBLIC_WS_ORIGIN?.trim().replace(/\/+$/, "") || `ws://127.0.0.1:${port}`;
+  const { httpOrigin: publicHttpOrigin, wsOrigin: ptyWsBaseUrl } = resolvePublicAppOrigins(port);
   const events = createRuntimeEvents();
   const conversations = fileConversationStore({ workspace });
   const workspaceFs = createWorkspaceFs({ workspace });
@@ -38151,6 +38741,13 @@ async function createGateway(opts) {
     dispatchTool
   });
   const appRegistry = createAppRegistry({ persist });
+  const isSessionChatInstalled = () => {
+    try {
+      return appRegistry.getApp(SESSION_CHAT_APP_ID)?.ui != null;
+    } catch {
+      return false;
+    }
+  };
   const appUiHtmlCache = createUiHtmlCache();
   const workflowRunner = opts.resolveAgentAdapter ? createWorkflowRunner({
     registry: sessions,
@@ -38278,6 +38875,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 +38939,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 } : {},
@@ -38345,7 +38949,8 @@ async function createGateway(opts) {
       ...opts.installAgentAdapter ? { installAgentAdapter: opts.installAgentAdapter } : {},
       ...opts.listCatalogModels ? { listCatalogModels: opts.listCatalogModels } : {},
       ...opts.listWorktreeStatuses ? { listWorktreeStatuses: opts.listWorktreeStatuses } : {},
-      ...opts.runWorktreeGc ? { runWorktreeGc: opts.runWorktreeGc } : {}
+      ...opts.runWorktreeGc ? { runWorktreeGc: opts.runWorktreeGc } : {},
+      isSessionChatInstalled
     });
     registerBrainTools(server, {
       brains: workspaceBrains,
@@ -38402,18 +39007,12 @@ async function createGateway(opts) {
         listSessions: listSessionsFiltered,
         // httpBaseUrl = this daemon's own origin (SSE stream + bridge
         // fallback for the live-session widget).
-        httpBaseUrl: `http://127.0.0.1:${port}`,
+        httpBaseUrl: publicHttpOrigin,
         // The session-chat widget is a thin launcher for the installed
-        // `@agentik/session-chat` studio app — resolve installed-ness from
-        // the AppRegistry at call time (not boot) so `app_install`/
-        // `app_uninstall` of that app is reflected without a daemon restart.
-        isSessionChatInstalled: () => {
-          try {
-            return appRegistry.getApp(SESSION_CHAT_APP_ID)?.ui != null;
-          } catch {
-            return false;
-          }
-        },
+        // `@agentik/session-chat` studio app — same call-time-resolved check
+        // `registerSessionTools` above gets, so the mount decision here and
+        // `agent_start`'s launch-card binding never disagree.
+        isSessionChatInstalled,
         // Work-board widget's read path — the root `/mcp` endpoint has no
         // scope, so this mount is always the operator caller (default
         // board `ws:<slug>`); `canAccessBoard` lets the operator read any