@agentproto/runtime 3.5.0 → 4.0.0

package/dist/mcp-imports.d.ts

@@ -17,6 +17,7 @@
  *   - ~/.cursor/mcp.json (cursor) — flat `mcpServers` map.
  *   - ~/.config/goose/config.yaml (goose) — TOML/YAML hybrid; we
  *     only handle the YAML form for now.
+ *   - ~/.codex/config.toml (codex) — `[mcp_servers.<name>]` tables.
  *   - any `.mcp.json` under the user's home that follows the
  *     standard mcpServers shape.
  *
@@ -29,7 +30,7 @@ interface DiscoveredMcp {
      *  cross-call identity (UI treat as React key). */
     id: string;
     /** Where we found it. Lets the UI render a source badge. */
-    source: "claude-code" | "cursor" | "goose" | "workspace";
+    source: "claude-code" | "cursor" | "goose" | "codex" | "workspace";
     /** "global" when the entry sits at the top level of the host's
      *  config; "project:<path>" when it's scoped to a single
      *  workspace. claude-code in particular nests per-project. */

package/dist/resume-strategies.d.ts

@@ -105,9 +105,10 @@ interface RestartCandidate {
     resumable?: boolean;
     /**
      * Manifest-declared `capabilities.nativeTerminalResume` for `adapterSlug`.
-     * The `pty-native` restart strategy is only chosen when this flag is true
-     * AND a native resume id is available. ACP resumability (`resumable`)
-     * alone does NOT imply a native TUI resume is safe or available.
+     * The `pty-native` strategy requires this flag for ACP-origin sessions.
+     * Legacy PTY rows without the flag can use a newly-added store strategy
+     * when they already carry an exact native resume id; explicit false blocks
+     * that fallback. ACP resumability (`resumable`) does not imply a TUI resume.
      */
     nativeTerminalResume?: boolean;
 }

package/dist/resume-strategies.mjs

@@ -188,7 +188,7 @@ function renderMarkdown(session, opts = {}) {
   out.push("");
   for (const m of messages) {
     const icon = ROLE_ICON[m.role] ?? m.role;
-    const nameSuffix = m.toolName ? ` \xB7 \`${m.toolName}\`` : "";
+    const nameSuffix = m.toolName ? ` \xB7 \`${m.toolName}\`` : m.from ? ` \xB7 from ${m.from.relation} \`${m.from.label ?? m.from.sessionId ?? ""}\` (${m.from.kind})` : "";
     out.push(`### ${icon}${nameSuffix}`);
     if (m.reasoning?.trim()) {
       out.push("");
@@ -652,6 +652,25 @@ ${rec.stderr}`);
         flushAssistant();
         messages.push({ role: "user", text: rec.text ?? "", ...tsOrUndefined !== void 0 ? { ts: tsOrUndefined } : {} });
         break;
+      case "session-message": {
+        flushAssistant();
+        const m = rec.message;
+        if (!m) break;
+        const relation = m.from?.relation ?? "system";
+        messages.push({
+          role: "user",
+          text: m.text ?? "",
+          from: {
+            ...m.from?.sessionId ? { sessionId: m.from.sessionId } : {},
+            ...m.from?.label ? { label: m.from.label } : {},
+            relation,
+            kind: m.kind ?? "report",
+            messageId: m.id
+          },
+          ...tsOrUndefined !== void 0 ? { ts: tsOrUndefined } : {}
+        });
+        break;
+      }
       case "system-prompt":
         flushAssistant();
         messages.push({ role: "system", text: rec.text ?? "", ...tsOrUndefined !== void 0 ? { ts: tsOrUndefined } : {} });
@@ -1063,8 +1082,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();
@@ -1495,6 +1514,9 @@ function extractFirstText(content) {
   }
   return void 0;
 }
+function isClaudeControlText(text) {
+  return /^<(?:local-command-caveat|local-command-stdout|command-name|task-notification)>/i.test(text);
+}
 async function scanClaudeJsonl(filePath) {
   const stream = createReadStream(filePath, { encoding: "utf8" });
   const rl = createInterface({ input: stream, crlfDelay: Infinity });
@@ -1523,7 +1545,7 @@ async function scanClaudeJsonl(filePath) {
       messageCount += 1;
       if (preview === void 0 && entry.type === "user") {
         const text = extractFirstText(entry.message?.content);
-        if (text !== void 0) {
+        if (text !== void 0 && !isClaudeControlText(text)) {
           preview = text.length > 120 ? text.slice(0, 120) : text;
         }
       }
@@ -1664,6 +1686,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
       },
@@ -1717,7 +1742,8 @@ function hasResumeStrategy(adapterSlug) {
 }
 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) {
@@ -1789,11 +1815,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) {