@agentproto/runtime 3.5.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;
         }
       }
@@ -2243,6 +2246,9 @@ function conversationTerminalSlugFor(subject) {
   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;
@@ -2265,7 +2271,7 @@ function isConversationTerminal(subject) {
   }
   return false;
 }
-var CONVERSATION_STORES, NATIVE_LAUNCH_ARGV, CONVERSATION_RESUME_KEYS;
+var CONVERSATION_STORES, NATIVE_LAUNCH_ARGV, BARE_LAUNCH_BINS, CONVERSATION_RESUME_KEYS;
 var init_conversation_store = __esm({
   "src/conversation-store.ts"() {
     CONVERSATION_STORES = {
@@ -2300,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
       },
@@ -2337,6 +2346,10 @@ var init_conversation_store = __esm({
       "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)
     );
@@ -2589,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) {
@@ -2661,11 +2675,13 @@ async function probeNativeTranscript(prev) {
 }
 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) {
@@ -5359,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;
 }
@@ -5385,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;
@@ -8284,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");
@@ -8341,9 +8528,11 @@ function registerAgentTools(server, opts) {
     provisionWorktree,
     resolveWorktreeIsolation,
     supervisor,
-    defaultAgentPromptInterrupt
+    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",
     {
@@ -8589,10 +8778,15 @@ function registerAgentTools(server, opts) {
       // `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.
+      // 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://agentproto_session_chat/view",
+          resourceUri: sessionChatResourceUri,
           visibility: ["model", "app"]
         }
       }
@@ -10432,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;
@@ -12712,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;
@@ -13221,7 +13561,7 @@ ${message}`;
       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;
+          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;
@@ -16671,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,
@@ -16807,7 +17151,7 @@ function registerSessionTools(rawServer, opts) {
           (s) => s.status === "running" || s.status === "starting"
         );
       }
-      return rows;
+      return rows.map(publicSessionDescriptor);
     },
     transformers: [
       paginated({
@@ -17264,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,
@@ -17299,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,
@@ -18213,7 +18557,7 @@ function registerSessionTools(rawServer, opts) {
             content: [
               {
                 type: "text",
-                text: JSON.stringify(desc)
+                text: JSON.stringify(publicSessionDescriptor(desc))
               }
             ]
           };
@@ -18258,7 +18602,7 @@ function registerSessionTools(rawServer, opts) {
               type: "text",
               text: JSON.stringify(
                 {
-                  ...restarted.desc,
+                  ...publicSessionDescriptor(restarted.desc),
                   resumedFrom: restarted.resumedFrom,
                   resumeVia: restarted.resumeVia,
                   ...restarted.resumeFallback ? { resumeFallback: true } : {},
@@ -18329,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 {
@@ -18411,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 {
@@ -18496,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 {
@@ -18580,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 {
@@ -18642,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 {
@@ -18704,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 {
@@ -18820,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 {
@@ -20640,6 +20984,7 @@ function registerMcpApps(server, apps) {
   }
 }
 function makeBuiltinPanelApps(ops) {
+  const sessionChatNativeInstalled = ops.isSessionChatInstalled();
   return [
     makeSessionsPanelApp({ listSessions: ops.listSessions }),
     makeAgentsOverviewApp({ listSessions: ops.listSessions }),
@@ -20649,17 +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,
-      // 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")
-    }),
+    // 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.
@@ -20712,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,
@@ -23138,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",
@@ -27070,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:*",
@@ -29197,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") {
@@ -29287,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 } : {}
@@ -29503,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;
@@ -29742,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 } : {}
@@ -29817,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 });
@@ -29868,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",
@@ -30251,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") {
@@ -31163,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);
@@ -31211,7 +31436,7 @@ async function handleAppUiPage(req, res, appId, appRegistry, frameAncestors) {
     }
   }
   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"];
@@ -38326,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 });
@@ -38516,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,
@@ -38717,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,
@@ -38774,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