@agentproto/runtime 3.4.0 → 3.6.1

package/dist/resume-strategies.d.ts

@@ -78,6 +78,10 @@ interface ResumeStrategy {
      *  why this exists and what silently omitting it breaks. Undefined for
      *  a provider with no config-dir-isolated store. */
     configDirEnvVar?: string;
+    /** Absolute transcript path for a conversation id — see
+     *  `ConversationStore.transcriptPath`. Present only when the provider's
+     *  resume command also accepts a path in place of a bare id. */
+    transcriptPath?(cwd: string, conversationId: string, configDir?: string): string;
 }
 declare const RESUME_STRATEGIES: Record<string, ResumeStrategy>;
 /**
@@ -101,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;
 }
@@ -197,6 +202,30 @@ declare const RESUME_ID_REJECTED_RE: RegExp;
  * "not found", triggering the fresh-spawn fallback + digest injection.
  */
 declare function augmentWithFsResume<T extends FsProbeCandidate>(prev: T): Promise<T>;
+/** What `probeNativeTranscript` found for a candidate's own transcript. */
+interface NativeTranscriptProbe {
+    /** Directory that was (or would be) probed for the transcript. */
+    dir: string;
+    /** Absolute path of the transcript file the id maps to. */
+    path: string;
+    /** Whether that exact file exists on disk right now. */
+    exists: boolean;
+}
+/**
+ * Locate the candidate's own on-disk transcript for a provider whose native
+ * resume command accepts an absolute path (`ResumeStrategy.transcriptPath`).
+ * Returns `undefined` when the adapter declares no `transcriptPath`, or the
+ * candidate has no cwd / no conversation id to map — callers treat that as
+ * "nothing to upgrade, and no directory worth naming in diagnostics".
+ *
+ * The id lookup mirrors `decideRestartStrategy`'s (`resumeMetadata[storeAs]`),
+ * falling back to `adapterSessionId` (for claude-code the ACP session id IS
+ * the on-disk `.jsonl` uuid — acp-host.ts pins them equal) so a probe can
+ * still name the transcript it looked for when the sniffer never fired.
+ * `exists: false` is the honest "transcript not found" answer — never fall
+ * through to a sibling file (cross-session contamination, see fsProbe's doc).
+ */
+declare function probeNativeTranscript(prev: FsProbeCandidate): Promise<NativeTranscriptProbe | undefined>;
 /**
  * Describe which resume path a restart used, for CLI banners / MCP
  * responses. Returns a short phrase like "resumed via claude --resume",
@@ -226,4 +255,4 @@ declare function describeResumePath(prev: RestartCandidate, opts?: DecideRestart
  */
 declare function tokenizeCommand(s: string): string[];
 
-export { type DecideRestartStrategyOptions, type FsProbeCandidate, RESUME_ID_REJECTED_RE, RESUME_STRATEGIES, type RestartCandidate, type RestartStrategy, type ResumeMetadataKey, type ResumeStrategy, augmentWithFsResume, decideRestartStrategy, describeResumePath, hasResumeStrategy, tokenizeCommand };
+export { type DecideRestartStrategyOptions, type FsProbeCandidate, type NativeTranscriptProbe, RESUME_ID_REJECTED_RE, RESUME_STRATEGIES, type RestartCandidate, type RestartStrategy, type ResumeMetadataKey, type ResumeStrategy, augmentWithFsResume, decideRestartStrategy, describeResumePath, hasResumeStrategy, probeNativeTranscript, tokenizeCommand };

package/dist/resume-strategies.mjs

@@ -1,4 +1,4 @@
-import { join, resolve } from 'path';
+import { join, resolve, dirname } from 'path';
 import { createReadStream, promises } from 'fs';
 import { homedir } from 'os';
 import { createInterface } from 'readline';
@@ -1063,8 +1063,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 +1495,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 +1526,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;
         }
       }
@@ -1639,6 +1642,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
@@ -1663,6 +1667,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
       },
@@ -1677,6 +1684,9 @@ var init_conversation_store = __esm({
         read: readPi
       }
     };
+    new Set(
+      Object.values(CONVERSATION_STORES).map((s) => s.storeAs)
+    );
   }
 });
 
@@ -1691,6 +1701,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,
@@ -1712,7 +1723,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) {
@@ -1767,13 +1779,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) {
@@ -1812,6 +1841,6 @@ function tokenizeCommand(s) {
   return out;
 }
 
-export { RESUME_ID_REJECTED_RE, RESUME_STRATEGIES, augmentWithFsResume, decideRestartStrategy, describeResumePath, hasResumeStrategy, tokenizeCommand };
+export { RESUME_ID_REJECTED_RE, RESUME_STRATEGIES, augmentWithFsResume, decideRestartStrategy, describeResumePath, hasResumeStrategy, probeNativeTranscript, tokenizeCommand };
 //# sourceMappingURL=resume-strategies.mjs.map
 //# sourceMappingURL=resume-strategies.mjs.map