@agentproto/runtime 2.7.0 → 2.10.0

package/dist/resume-strategies.mjs

@@ -1,6 +1,6 @@
+import { join, resolve } from 'path';
 import { createReadStream, promises } from 'fs';
 import { homedir } from 'os';
-import { join, resolve } from 'path';
 import { createInterface } from 'readline';
 
 /**
@@ -99,6 +99,10 @@ var init_tool_call_record = __esm({
   "src/tool-call-record.ts"() {
   }
 });
+var init_pr_provenance = __esm({
+  "src/pr-provenance.ts"() {
+  }
+});
 function sessionTranscriptDir(sessionId, baseDir) {
   return join(join(homedir(), ".agentproto", "sessions"), sessionId);
 }
@@ -108,6 +112,7 @@ function sessionEventsPath(sessionId, baseDir) {
 var init_transcript_writer = __esm({
   "src/transcript-writer.ts"() {
     init_tool_call_record();
+    init_pr_provenance();
   }
 });
 
@@ -219,14 +224,13 @@ function renderMarkdown(session, opts = {}) {
 function renderJson(session) {
   return JSON.stringify(session, null, 2);
 }
-async function exportClaudeCodeSession(adapterSessionId, cwd) {
+async function exportClaudeCodeSession(adapterSessionId, cwd, configDir) {
   if (!cwd) {
     throw new Error(
       "claude-code exporter: cwd is required to locate the JSONL file.\nPass cwd explicitly or use a session id that is in the registry."
     );
   }
-  const encoded = claudeProjectSlug(cwd);
-  const filePath = join(homedir(), ".claude", "projects", encoded, `${adapterSessionId}.jsonl`);
+  const filePath = join(claudeCodeProjectDir(cwd, configDir), `${adapterSessionId}.jsonl`);
   let stream;
   try {
     stream = createReadStream(filePath, { encoding: "utf8" });
@@ -614,6 +618,10 @@ Either the session never drove an agent-cli turn, or it predates this feature.`
         flushAssistant();
         messages.push({ role: "user", text: rec.text ?? "", ...tsOrUndefined !== void 0 ? { ts: tsOrUndefined } : {} });
         break;
+      case "system-prompt":
+        flushAssistant();
+        messages.push({ role: "system", text: rec.text ?? "", ...tsOrUndefined !== void 0 ? { ts: tsOrUndefined } : {} });
+        break;
       case "text-delta":
         if (asmTs === void 0) asmTs = tsOrUndefined;
         asmText += rec.text ?? "";
@@ -1320,6 +1328,7 @@ async function exportAgentSession(input) {
   let adapterSlug = input.adapter;
   let cwd = input.cwd;
   let adapterSessionId = sessionId;
+  let configDir;
   const err = (msg) => ({
     sessionId,
     adapter: adapterSlug ?? "unknown",
@@ -1332,6 +1341,7 @@ async function exportAgentSession(input) {
   if (desc) {
     adapterSlug = adapterSlug ?? desc.adapterSlug;
     cwd = cwd ?? desc.cwd;
+    configDir = desc.adapterConfigDir;
     if (desc.adapterSessionId) adapterSessionId = desc.adapterSessionId;
   }
   const tryNative = async () => {
@@ -1349,7 +1359,7 @@ Pass adapter explicitly or use a known session id (sess_xxx or name).`
 Only sessions spawned via claude-code or hermes can be exported.`
       );
     }
-    return exporter.exportSession(adapterSessionId, cwd);
+    return exporter.exportSession(adapterSessionId, cwd, configDir);
   };
   const tryDaemon = () => exportDaemonEventsSession(daemonSessionId, desc);
   let session;
@@ -1429,8 +1439,9 @@ var init_transcript_export = __esm({
 function claudeProjectSlug(cwd) {
   return cwd.replace(/[^a-zA-Z0-9]/g, "-");
 }
-function claudeCodeProjectDir(cwd) {
-  return resolve(homedir(), ".claude", "projects", claudeProjectSlug(cwd));
+function claudeCodeProjectDir(cwd, configDir) {
+  const base = configDir ?? resolve(homedir(), ".claude");
+  return resolve(base, "projects", claudeProjectSlug(cwd));
 }
 function extractFirstText(content) {
   if (typeof content === "string") {
@@ -1491,8 +1502,8 @@ function claudeEntrypointFor(mode) {
   return mode === "native" ? "cli" : "sdk-ts";
 }
 async function discoverClaudeCode(input) {
-  const { cwd, since, until, attachmentMode, expectedId } = input;
-  const dir = claudeCodeProjectDir(cwd);
+  const { cwd, since, until, attachmentMode, configDir, expectedId } = input;
+  const dir = claudeCodeProjectDir(cwd, configDir);
   if (expectedId) {
     const filePath = join(dir, `${expectedId}.jsonl`);
     try {
@@ -1537,9 +1548,9 @@ async function discoverClaudeCode(input) {
   scored.sort((a, b) => b.mtimeMs - a.mtimeMs);
   return scored.map((s) => s.candidate);
 }
-async function readClaudeCode(conversationId, cwd) {
+async function readClaudeCode(conversationId, cwd, configDir) {
   const { exportClaudeCodeSession: exportClaudeCodeSession2 } = await Promise.resolve().then(() => (init_transcript_export(), transcript_export_exports));
-  return exportClaudeCodeSession2(conversationId, cwd);
+  return exportClaudeCodeSession2(conversationId, cwd, configDir);
 }
 async function discoverHermes(input) {
   const { discoverHermesSessions: discoverHermesSessions2 } = await Promise.resolve().then(() => (init_transcript_export(), transcript_export_exports));
@@ -1591,6 +1602,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],
+        configDirEnvVar: "CLAUDE_CONFIG_DIR",
         discover: discoverClaudeCode,
         read: readClaudeCode
       },
@@ -1641,11 +1653,13 @@ var RESUME_STRATEGIES = Object.fromEntries(
       {
         outputHint: store.outputHint,
         storeAs: store.storeAs,
-        fsProbe: async (cwd, prevStartedAt, expectedId) => {
+        ...store.configDirEnvVar ? { configDirEnvVar: store.configDirEnvVar } : {},
+        fsProbe: async (cwd, prevStartedAt, expectedId, configDir) => {
           const candidates = await s.discover({
             cwd,
             since: prevStartedAt,
-            expectedId
+            expectedId,
+            configDir
           });
           return candidates[0]?.conversationId ?? null;
         },
@@ -1659,8 +1673,9 @@ function hasResumeStrategy(adapterSlug) {
   const s = RESUME_STRATEGIES[adapterSlug];
   return !!(s && (s.outputHint || s.fsProbe || s.spawnArgs));
 }
-function decideRestartStrategy(prev) {
-  if (prev.adapterSlug && prev.nativeTerminalResume === true) {
+function decideRestartStrategy(prev, opts = {}) {
+  const mayPreferNative = prev.pty === true || opts.preferNativeTerminal === true;
+  if (prev.adapterSlug && prev.nativeTerminalResume === true && mayPreferNative) {
     const strategy = RESUME_STRATEGIES[prev.adapterSlug];
     const id = strategy?.storeAs ? prev.resumeMetadata?.[strategy.storeAs] : void 0;
     if (strategy?.spawnArgs && id) {
@@ -1694,7 +1709,10 @@ async function augmentWithFsResume(prev) {
   const id = await strategy.fsProbe(
     prev.cwd,
     prev.startedAt,
-    prev.adapterSessionId
+    prev.adapterSessionId,
+    // A config-dir-isolated session (#824) persisted its transcript under
+    // its own CLAUDE_CONFIG_DIR — probe there, not the global ~/.claude.
+    prev.adapterConfigDir
   );
   if (!id) return prev;
   return {
@@ -1712,8 +1730,9 @@ async function augmentWithFsResume(prev) {
     }
   };
 }
-function describeResumePath(prev) {
-  if (prev.adapterSlug) {
+function describeResumePath(prev, opts = {}) {
+  const mayPreferNative = prev.pty === true || opts.preferNativeTerminal === true;
+  if (prev.adapterSlug && mayPreferNative) {
     const s = RESUME_STRATEGIES[prev.adapterSlug];
     if (s?.spawnArgs && s.storeAs && prev.resumeMetadata?.[s.storeAs]) {
       const sample = s.spawnArgs("\u2026")[0] ?? prev.adapterSlug;