runcastle 1.4.6 → 1.4.8

package/bin/runcastle.js

@@ -4640,6 +4640,63 @@ var init_git = __esm(() => {
   ];
 });
 
+// src/doctor/system-exec.ts
+import { spawn as spawn4 } from "child_process";
+function createSystemExec(opts = {}) {
+  const timeoutMs = opts.timeoutMs ?? DEFAULT_EXEC_TIMEOUT_MS;
+  const containFn = opts.containFn ?? containHostProcess;
+  return (command, args) => new Promise((resolve4) => {
+    const { file, args: spawnArgs } = resolveSpawnTarget(command, args);
+    let stdout = "";
+    let stderr = "";
+    let settled = false;
+    const settle = (outcome) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      resolve4(outcome);
+    };
+    const child = spawn4(file, spawnArgs, { cwd: opts.cwd, windowsHide: true });
+    const containment = child.pid === undefined ? null : containFn(child.pid);
+    const timer = setTimeout(() => {
+      if (containment)
+        containment.kill();
+      else if (child.pid !== undefined)
+        killProcessTree(child.pid);
+      const note = `${command} ${args.join(" ")} timed out after ${Math.round(timeoutMs / 1000)}s`;
+      settle({
+        ok: true,
+        code: null,
+        stdout,
+        stderr: stderr ? `${stderr}
+${note}` : note,
+        timedOut: true
+      });
+    }, timeoutMs);
+    child.stdout?.on("data", (d) => {
+      stdout += d.toString();
+    });
+    child.stderr?.on("data", (d) => {
+      stderr += d.toString();
+    });
+    child.on("error", (err) => {
+      containment?.kill();
+      settle({ ok: false, code: null, stdout, stderr: stderr || String(err) });
+    });
+    child.on("close", (code) => {
+      containment?.kill();
+      settle({ ok: true, code: code ?? 0, stdout, stderr });
+    });
+  });
+}
+var DEFAULT_EXEC_TIMEOUT_MS = 60000;
+var init_system_exec = __esm(() => {
+  init_kill_tree();
+  init_contain_host();
+  init_resolve_executable();
+});
+
 // src/launcher/edit-guard.ts
 import { isAbsolute, relative, resolve as resolve4 } from "path";
 function guardsEdits(kind) {
@@ -4759,6 +4816,64 @@ var init_install_guard = __esm(() => {
   HEREDOC_OPENER = /(?<!<)<<(?!<)(-?)[ \t]*(?:'([^'\n]+)'|"([^"\n]+)"|\\?([\w.-]+))/g;
 });
 
+// src/launcher/skills-root.ts
+import { existsSync as existsSync7 } from "fs";
+import { dirname as dirname3, join as join7, resolve as resolve6 } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
+function resolveSkillsRoot(fromDir) {
+  const override = process.env[SKILLS_DIR_ENV];
+  if (override) {
+    const root = resolve6(override);
+    if (existsSync7(join7(root, SKILLS_MARKER)))
+      return root;
+    throw new Error(`${SKILLS_DIR_ENV}=${override} is not a runcastle skills root (missing ${SKILLS_MARKER})`);
+  }
+  const searched = [];
+  let dir = fromDir;
+  for (let i = 0;i < 8; i += 1) {
+    const candidate = join7(dir, "packages", "skills");
+    searched.push(candidate);
+    if (existsSync7(join7(candidate, SKILLS_MARKER)))
+      return candidate;
+    const parent = dirname3(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  throw new Error(`runcastle skills root not found; searched:
+  ${searched.join(`
+  `)}`);
+}
+function resolvePluginDir(fromDir = dirname3(fileURLToPath3(import.meta.url))) {
+  const rel = join7("packages", "skills", "packs", "runcastle");
+  const override = process.env[SKILLS_DIR_ENV];
+  if (override) {
+    const dir2 = join7(resolve6(override), "packs", "runcastle");
+    if (existsSync7(dir2))
+      return dir2;
+    throw new Error(`${SKILLS_DIR_ENV}=${override} has no plugin dir at ${dir2}`);
+  }
+  const searched = [];
+  let dir = fromDir;
+  for (let i = 0;i < 8; i += 1) {
+    const candidate = join7(dir, rel);
+    searched.push(candidate);
+    if (existsSync7(candidate))
+      return candidate;
+    const parent = dirname3(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  throw new Error(`runcastle plugin dir (${rel}) not found; searched:
+  ${searched.join(`
+  `)}`);
+}
+var SKILLS_DIR_ENV = "RUNCASTLE_SKILLS_DIR", SKILLS_MARKER;
+var init_skills_root = __esm(() => {
+  SKILLS_MARKER = join7("packs", "runcastle");
+});
+
 // src/launcher/runtimes/skills.ts
 function skillRef(runtime, skill) {
   return SPELLINGS[runtime](skill);
@@ -4814,10 +4929,10 @@ var init_skills = __esm(() => {
 
 // src/launcher/artifacts.ts
 import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync2 } from "fs";
-import { fileURLToPath as fileURLToPath3 } from "url";
-import { join as join7 } from "path";
+import { fileURLToPath as fileURLToPath4 } from "url";
+import { join as join8 } from "path";
 function hookClientPath() {
-  return resolveAsset(ASSET_ENV.hookClient, fileURLToPath3(new URL("./hook-client.ts", import.meta.url)));
+  return resolveAsset(ASSET_ENV.hookClient, fileURLToPath4(new URL("./hook-client.ts", import.meta.url)));
 }
 function serverUrlFor(config2) {
   return `http://localhost:${config2.serverPort}`;
@@ -5261,6 +5376,10 @@ function renderProjectPrompt(brief, runtime = DEFAULT_RUNTIME) {
   ].join(`
 `);
 }
+function skillPackReadRule(packDir) {
+  const posix2 = packDir.replace(/\\/g, "/").replace(/^([A-Za-z]):/, (_, drive) => `/${drive.toLowerCase()}`).replace(/\/+$/, "");
+  return `Read(/${posix2}/**)`;
+}
 function entrySkillDenyRules(kind) {
   const allowed = new Set(entrySkillsFor(kind));
   return ENTRY_SKILLS.filter((skill) => !allowed.has(skill)).flatMap((skill) => [
@@ -5279,7 +5398,7 @@ function sessionBashAllowRules(kind) {
   }
   return SESSION_BASH_ALLOW_RULES;
 }
-function renderSettings(hookClient, kind) {
+function renderSettings(hookClient, kind, skillPackDir) {
   const cmd = (event) => ({
     type: "command",
     command: `bun run "${hookClient}" ${event}`,
@@ -5287,7 +5406,11 @@ function renderSettings(hookClient, kind) {
   });
   return {
     permissions: {
-      allow: [...RUNCASTLE_MCP_ALLOW_RULES, ...sessionBashAllowRules(kind)],
+      allow: [
+        ...RUNCASTLE_MCP_ALLOW_RULES,
+        ...sessionBashAllowRules(kind),
+        ...skillPackDir ? [skillPackReadRule(skillPackDir)] : []
+      ],
       deny: entrySkillDenyRules(kind)
     },
     hooks: {
@@ -5348,15 +5471,15 @@ function renderSessionPrompt(input) {
     return renderProjectPrompt(projectBrief, runtime);
   throw new Error(`session ${session.id} has no feature and no project-session brief`);
 }
-async function writeSessionArtifacts(input) {
+async function writeSessionArtifacts(input, pluginDir = resolvePluginDir()) {
   const { session, config: config2 } = input;
   const dir = sessionDir(session.id);
   mkdirSync3(dir, { recursive: true });
-  const systemPromptPath = join7(dir, "system-prompt.md");
-  const settingsPath = join7(dir, "settings.json");
-  const mcpConfigPath = join7(dir, "mcp.json");
+  const systemPromptPath = join8(dir, "system-prompt.md");
+  const settingsPath = join8(dir, "settings.json");
+  const mcpConfigPath = join8(dir, "mcp.json");
   writeFileSync2(systemPromptPath, renderSessionPrompt(input), "utf8");
-  writeFileSync2(settingsPath, JSON.stringify(renderSettings(hookClientPath(), session.kind), null, 2), "utf8");
+  writeFileSync2(settingsPath, JSON.stringify(renderSettings(hookClientPath(), session.kind, pluginDir), null, 2), "utf8");
   writeFileSync2(mcpConfigPath, JSON.stringify(renderMcpConfig(session, config2), null, 2), "utf8");
   return { systemPromptPath, settingsPath, mcpConfigPath };
 }
@@ -5368,6 +5491,7 @@ var init_artifacts = __esm(() => {
   init_asset_paths();
   init_edit_guard();
   init_install_guard();
+  init_skills_root();
   init_skills();
   RUNCASTLE_MCP_ALLOW_RULES = [
     "mcp__runcastle__get_feature_context",
@@ -5416,64 +5540,6 @@ var init_artifacts = __esm(() => {
   SESSION_START_SOURCES = ["startup", "resume", "clear", "compact", "fork"];
 });
 
-// src/launcher/skills-root.ts
-import { existsSync as existsSync7 } from "fs";
-import { dirname as dirname3, join as join8, resolve as resolve6 } from "path";
-import { fileURLToPath as fileURLToPath4 } from "url";
-function resolveSkillsRoot(fromDir) {
-  const override = process.env[SKILLS_DIR_ENV];
-  if (override) {
-    const root = resolve6(override);
-    if (existsSync7(join8(root, SKILLS_MARKER)))
-      return root;
-    throw new Error(`${SKILLS_DIR_ENV}=${override} is not a runcastle skills root (missing ${SKILLS_MARKER})`);
-  }
-  const searched = [];
-  let dir = fromDir;
-  for (let i = 0;i < 8; i += 1) {
-    const candidate = join8(dir, "packages", "skills");
-    searched.push(candidate);
-    if (existsSync7(join8(candidate, SKILLS_MARKER)))
-      return candidate;
-    const parent = dirname3(dir);
-    if (parent === dir)
-      break;
-    dir = parent;
-  }
-  throw new Error(`runcastle skills root not found; searched:
-  ${searched.join(`
-  `)}`);
-}
-function resolvePluginDir(fromDir = dirname3(fileURLToPath4(import.meta.url))) {
-  const rel = join8("packages", "skills", "packs", "runcastle");
-  const override = process.env[SKILLS_DIR_ENV];
-  if (override) {
-    const dir2 = join8(resolve6(override), "packs", "runcastle");
-    if (existsSync7(dir2))
-      return dir2;
-    throw new Error(`${SKILLS_DIR_ENV}=${override} has no plugin dir at ${dir2}`);
-  }
-  const searched = [];
-  let dir = fromDir;
-  for (let i = 0;i < 8; i += 1) {
-    const candidate = join8(dir, rel);
-    searched.push(candidate);
-    if (existsSync7(candidate))
-      return candidate;
-    const parent = dirname3(dir);
-    if (parent === dir)
-      break;
-    dir = parent;
-  }
-  throw new Error(`runcastle plugin dir (${rel}) not found; searched:
-  ${searched.join(`
-  `)}`);
-}
-var SKILLS_DIR_ENV = "RUNCASTLE_SKILLS_DIR", SKILLS_MARKER;
-var init_skills_root = __esm(() => {
-  SKILLS_MARKER = join8("packs", "runcastle");
-});
-
 // src/launcher/runtimes/types.ts
 function assertHeadlessKickoff(headless, line) {
   if (headless && !line)
@@ -5511,8 +5577,27 @@ function buildClaudeArgs(input) {
     ...input.kickoffLine ? [input.kickoffLine] : []
   ];
 }
-var CC_NESTING_ENV, KICKOFF_LINES, CLAUDE_BIN = "claude", claudeRuntime;
+function findBackgroundSessionIn(listing, ccSessionId) {
+  if (!Array.isArray(listing))
+    return;
+  const held = listing.find((entry) => typeof entry === "object" && entry !== null && entry.sessionId === ccSessionId && entry.kind === "background");
+  if (!held)
+    return;
+  return { sessionId: ccSessionId, shortId: typeof held.id === "string" ? held.id : ccSessionId.slice(0, 8) };
+}
+async function listClaudeAgents() {
+  try {
+    const out = await createSystemExec({ timeoutMs: AGENTS_LISTING_TIMEOUT_MS })(CLAUDE_BIN, ["agents", "--json"]);
+    if (!out.ok || out.timedOut)
+      return;
+    return JSON.parse(out.stdout);
+  } catch {
+    return;
+  }
+}
+var CC_NESTING_ENV, KICKOFF_LINES, AGENTS_LISTING_TIMEOUT_MS = 1e4, CLAUDE_BIN = "claude", claudeRuntime;
 var init_claude = __esm(() => {
+  init_system_exec();
   init_resolve_executable();
   init_artifacts();
   init_skills_root();
@@ -5544,11 +5629,12 @@ var init_claude = __esm(() => {
       };
     },
     async writeArtifacts(input) {
-      const files = await writeSessionArtifacts({ ...input, runtime: this.id });
+      const pluginDir = resolvePluginDir();
+      const files = await writeSessionArtifacts({ ...input, runtime: this.id }, pluginDir);
       return {
         files: [files.systemPromptPath, files.settingsPath, files.mcpConfigPath],
         argv: buildClaudeArgs({
-          pluginDir: resolvePluginDir(),
+          pluginDir,
           settingsPath: files.settingsPath,
           mcpConfigPath: files.mcpConfigPath,
           systemPromptPath: files.systemPromptPath,
@@ -5561,13 +5647,17 @@ var init_claude = __esm(() => {
         }),
         env: {
           RUNCASTLE_SESSION_ID: input.session.id,
-          RUNCASTLE_SERVER_URL: input.serverUrl
+          RUNCASTLE_SERVER_URL: input.serverUrl,
+          CLAUDE_CODE_DISABLE_AGENT_VIEW: "1"
         },
         envScrub: CC_NESTING_ENV
       };
     },
     kickoffLine(kind) {
       return KICKOFF_LINES[kind];
+    },
+    async findBackgroundSession(ccSessionId) {
+      return findBackgroundSessionIn(await listClaudeAgents(), ccSessionId);
     }
   };
 });
@@ -8214,7 +8304,7 @@ var init_chat_branch = __esm(() => {
 });
 
 // src/workflows/kill-registry.ts
-import { spawn as spawn4 } from "child_process";
+import { spawn as spawn5 } from "child_process";
 function log2(msg) {
   console.error(`[kill-registry] ${msg}`);
 }
@@ -8231,7 +8321,7 @@ function runDockerCommand(args) {
     const timer = setTimeout(() => settle(false), DOCKER_COMMAND_TIMEOUT_MS);
     timer.unref?.();
     try {
-      const child = spawn4("docker", args, { windowsHide: true, stdio: "ignore" });
+      const child = spawn5("docker", args, { windowsHide: true, stdio: "ignore" });
       child.on("exit", (code) => settle(code === 0));
       child.on("close", (code) => settle(code === 0));
       child.on("error", () => settle(false));
@@ -8362,63 +8452,6 @@ var init_kill_registry = __esm(() => {
   REGISTRY_KEY2 = Symbol.for("runcastle.kill.registry");
 });
 
-// src/doctor/system-exec.ts
-import { spawn as spawn5 } from "child_process";
-function createSystemExec(opts = {}) {
-  const timeoutMs = opts.timeoutMs ?? DEFAULT_EXEC_TIMEOUT_MS;
-  const containFn = opts.containFn ?? containHostProcess;
-  return (command, args) => new Promise((resolve9) => {
-    const { file, args: spawnArgs } = resolveSpawnTarget(command, args);
-    let stdout = "";
-    let stderr = "";
-    let settled = false;
-    const settle = (outcome) => {
-      if (settled)
-        return;
-      settled = true;
-      clearTimeout(timer);
-      resolve9(outcome);
-    };
-    const child = spawn5(file, spawnArgs, { cwd: opts.cwd, windowsHide: true });
-    const containment = child.pid === undefined ? null : containFn(child.pid);
-    const timer = setTimeout(() => {
-      if (containment)
-        containment.kill();
-      else if (child.pid !== undefined)
-        killProcessTree(child.pid);
-      const note = `${command} ${args.join(" ")} timed out after ${Math.round(timeoutMs / 1000)}s`;
-      settle({
-        ok: true,
-        code: null,
-        stdout,
-        stderr: stderr ? `${stderr}
-${note}` : note,
-        timedOut: true
-      });
-    }, timeoutMs);
-    child.stdout?.on("data", (d) => {
-      stdout += d.toString();
-    });
-    child.stderr?.on("data", (d) => {
-      stderr += d.toString();
-    });
-    child.on("error", (err) => {
-      containment?.kill();
-      settle({ ok: false, code: null, stdout, stderr: stderr || String(err) });
-    });
-    child.on("close", (code) => {
-      containment?.kill();
-      settle({ ok: true, code: code ?? 0, stdout, stderr });
-    });
-  });
-}
-var DEFAULT_EXEC_TIMEOUT_MS = 60000;
-var init_system_exec = __esm(() => {
-  init_kill_tree();
-  init_contain_host();
-  init_resolve_executable();
-});
-
 // src/services/settings.ts
 import { existsSync as existsSync13, mkdirSync as mkdirSync7, readFileSync as readFileSync9, writeFileSync as writeFileSync6 } from "fs";
 import { dirname as dirname6 } from "path";
@@ -57724,7 +57757,8 @@ function runCommand2(bin, args2) {
     const timer = setTimeout(() => settle(false), COMMAND_TIMEOUT_MS);
     timer.unref?.();
     try {
-      const child = spawn8(bin, [...args2], { windowsHide: true, stdio: "ignore" });
+      const target = spawnTargetFor(bin, [...args2]);
+      const child = spawn8(target.file, target.args, { windowsHide: true, stdio: "ignore" });
       child.on("exit", (code) => settle(code === 0));
       child.on("close", (code) => settle(code === 0));
       child.on("error", () => settle(false));
@@ -57790,6 +57824,7 @@ async function reapRecorder(ticketId, options = {}) {
 var AGENT_BROWSER_BIN = "agent-browser", DEFAULT_TIMEOUT_MS2 = 1e4, POLL_INTERVAL_MS = 100, COMMAND_TIMEOUT_MS = 5000, REAL_DEPS2;
 var init_recorder_reap = __esm(() => {
   init_paths();
+  init_resolve_executable();
   REAL_DEPS2 = {
     findBrowser: () => findOnPath(AGENT_BROWSER_BIN),
     fileExists: existsSync16,
@@ -58400,7 +58435,10 @@ function couldNotReview(ticket, reason, digest) {
 **${headline2}**` : `**${headline2}**`
   };
 }
-var FFMPEG_BIN = "ffmpeg", spawnVersion = (path2) => spawnSync(path2, ["--version"], { timeout: 3000, stdio: "ignore" }), withheldDrives, DECLARATION, REVIEW_DIRECTORY_FS;
+var FFMPEG_BIN = "ffmpeg", spawnVersion = (path2) => {
+  const { file, args: args2 } = spawnTargetFor(path2, ["--version"]);
+  return spawnSync(file, args2, { timeout: 3000, stdio: "ignore", windowsHide: true });
+}, withheldDrives, DECLARATION, REVIEW_DIRECTORY_FS;
 var init_review_ticket = __esm(() => {
   init_src();
   init_paths();
@@ -58410,6 +58448,7 @@ var init_review_ticket = __esm(() => {
   init_agent_stream();
   init_git();
   init_review_findings();
+  init_resolve_executable();
   init_kill_registry();
   init_recorder_reap();
   init_recorder_reap();
@@ -62837,6 +62876,24 @@ async function commitDocsCheckpoint(ctx, session, summary) {
   }
   await landChatCommits(ctx, project3, feature);
 }
+function checkpointDocsAfterReply(ctx, session, summary) {
+  let queue = docsCheckpointQueues.get(session.worktreePath);
+  if (!queue) {
+    queue = createSerialQueue();
+    docsCheckpointQueues.set(session.worktreePath, queue);
+  }
+  queue(() => commitDocsCheckpoint(ctx, session, summary)).catch((e) => {
+    try {
+      emit(ctx, requireFeatureId(session), {
+        type: "git.commit_pending",
+        message: `docs checkpoint failed: ${e instanceof Error ? e.message : String(e)}`,
+        data: { summary }
+      });
+    } catch (err) {
+      console.error(`docs checkpoint failed for session ${session.id}`, e, err);
+    }
+  });
+}
 function requireProject(ctx, session) {
   if (!session.projectId) {
     throw new GateError(`this tool belongs to a project-scoped session; this is a ${session.kind} session on a ` + "feature. Use get_feature_context and the pipeline tools for feature work.");
@@ -63577,7 +63634,7 @@ function buildMcpServer(audience) {
       if (!rs)
         return noSession();
       const result = toolEmitTickets(rs.ctx, rs.session, args2);
-      await commitDocsCheckpoint(rs.ctx, rs.session, `tickets emitted (${result.stored})`);
+      checkpointDocsAfterReply(rs.ctx, rs.session, `tickets emitted (${result.stored})`);
       return ok(result);
     });
   }
@@ -63599,7 +63656,7 @@ function buildMcpServer(audience) {
       if (!rs)
         return noSession();
       const result = toolUpdateTicket(rs.ctx, rs.session, args2);
-      await commitDocsCheckpoint(rs.ctx, rs.session, `ticket ${result.ticket.seq} updated`);
+      checkpointDocsAfterReply(rs.ctx, rs.session, `ticket ${result.ticket.seq} updated`);
       return ok(result);
     });
   }
@@ -63616,7 +63673,7 @@ function buildMcpServer(audience) {
       if (!rs)
         return noSession();
       const result = toolCancelTicket(rs.ctx, rs.session, args2);
-      await commitDocsCheckpoint(rs.ctx, rs.session, `ticket ${result.ticket.seq} cancelled`);
+      checkpointDocsAfterReply(rs.ctx, rs.session, `ticket ${result.ticket.seq} cancelled`);
       return ok(result);
     });
   }
@@ -63660,7 +63717,7 @@ function buildMcpServer(audience) {
         return noSession();
       const result = toolCompletePhase(rs.ctx, rs.session, args2);
       if (result.ok) {
-        await commitDocsCheckpoint(rs.ctx, rs.session, `phase '${args2.phase}' complete`);
+        checkpointDocsAfterReply(rs.ctx, rs.session, `phase '${args2.phase}' complete`);
       }
       return ok(result);
     });
@@ -63693,7 +63750,7 @@ async function readMcpBody(c) {
     return;
   }
 }
-var DOCS_NOTE, TICKETS_NOTE, REVIEW_TITLE, ResolveFindingShape, ResolveFindingInput, DRAFTING_KINDS, ADRS_NOTE, FEATURE_INDEX_NOTE, FEATURE_INDEX_SHIPPED_CAP = 50, WORK_RECORD_DIGESTS_NOTE, FEATURE_KINDS, PROJECT_KINDS, ALL_AUDIENCES, TOOL_AUDIENCES, CompletablePhase, EventType, mcp, server_default;
+var DOCS_NOTE, TICKETS_NOTE, REVIEW_TITLE, ResolveFindingShape, ResolveFindingInput, docsCheckpointQueues, DRAFTING_KINDS, ADRS_NOTE, FEATURE_INDEX_NOTE, FEATURE_INDEX_SHIPPED_CAP = 50, WORK_RECORD_DIGESTS_NOTE, FEATURE_KINDS, PROJECT_KINDS, ALL_AUDIENCES, TOOL_AUDIENCES, CompletablePhase, EventType, mcp, server_default;
 var init_server = __esm(() => {
   init_src();
   init_paths();
@@ -63712,6 +63769,7 @@ var init_server = __esm(() => {
   init_review_findings();
   init_git();
   init_knowledge();
+  init_landing_queue();
   init_planning();
   init_project_notes();
   init_repo();
@@ -63736,6 +63794,7 @@ var init_server = __esm(() => {
       });
     }
   });
+  docsCheckpointQueues = new Map;
   DRAFTING_KINDS = ["chat"];
   ADRS_NOTE = "adrs[] is an index of the project\u2019s LIVE decisions (superseded ones are already omitted), not " + "their text. Read the ones your work touches with read_adr({ relPath }) \u2014 they bind you the " + "same either way. They are also plain files in this worktree at docs/adr/.";
   FEATURE_INDEX_NOTE = "featureIndex lists every in-flight feature, then every draft, then the most recently shipped, " + "one `slug \u2014 title [state]` line each. A trailing `\xB7 waits on: a, b \u2713` lists the features it " + "must wait to merge (\u2713 = already shipped), and `[draft, waiting]` marks a draft that cannot " + "start until every unmarked one ships. A shipped feature\u2019s docs live at docs/features/<slug>/ " + "in this worktree; an in-flight or draft feature\u2019s docs live on an unmerged branch. Any " + "feature\u2019s brief is read_feature_brief({ slug }); what one actually did is " + "get_work_record({ featureSlug }).";
@@ -65368,16 +65427,17 @@ function handlePtyExit(ctx, feature, session, meta, exitCode) {
   if (session.runtime === "codex" && feature) {
     noteResolvedMerge(ctx, session, feature).catch(() => {});
   }
+  let resumeFailureReported;
   if (diedBeforeLive && meta.resumeSessionId) {
-    emitForSession(ctx, session, {
-      type: "session.resume_failed",
-      message: `resume failed for ${session.kind} \u2014 the session exited before starting (code ${exitCode ?? "unknown"}); the previous conversation is still resumable`,
-      data: {
-        sessionId: session.id,
-        resumeSessionId: meta.resumeSessionId,
-        exitCode: exitCode ?? null
-      }
-    });
+    const resumeSessionId = meta.resumeSessionId;
+    const report = (background) => emitResumeFailed(ctx, session, resumeSessionId, exitCode, background);
+    if (meta.findBackgroundSession) {
+      resumeFailureReported = meta.findBackgroundSession(resumeSessionId).catch(() => {
+        return;
+      }).then(report);
+    } else {
+      report(undefined);
+    }
   }
   if (session.purpose === "self-plan" && feature) {
     const current2 = getFeatureRow(ctx, feature.id);
@@ -65393,19 +65453,36 @@ function handlePtyExit(ctx, feature, session, meta, exitCode) {
     message: ptyExitMessage(exitCode),
     data: { sessionId: session.id, exitCode: exitCode ?? null }
   });
+  return resumeFailureReported;
+}
+function emitResumeFailed(ctx, session, resumeSessionId, exitCode, background) {
+  const exited = `resume failed for ${session.kind} \u2014 the session exited before starting (code ${exitCode ?? "unknown"})`;
+  const short = background?.shortId;
+  emitForSession(ctx, session, {
+    type: "session.resume_failed",
+    message: short ? `${exited}: its conversation is running as a Claude Code background session (${short}), which cannot be resumed here. ` + `Run \`claude attach ${short}\` to look at it, then \`claude stop ${short}\` (stopping keeps the conversation), then relaunch.` : `${exited}; the previous conversation is still resumable`,
+    data: {
+      sessionId: session.id,
+      resumeSessionId,
+      exitCode: exitCode ?? null,
+      ...short ? { backgroundSessionId: short } : {}
+    }
+  });
 }
 function spawnEmbeddedPty(ctx, feature, session, worktreePath, runtime5, spec, meta = {}) {
   const { file, args: args2 } = spawnTargetFor(runtime5.resolveBinary(), spec.argv);
   const env = { ...process.env, ...spec.env };
   for (const key of spec.envScrub)
     delete env[key];
+  const findBackgroundSession = runtime5.findBackgroundSession?.bind(runtime5);
+  const exitMeta = findBackgroundSession ? { ...meta, findBackgroundSession } : meta;
   try {
     const entry = ptyRegistry().create({
       sessionId: session.id,
       cmd: file,
       args: args2,
       opts: { cwd: worktreePath, env, cols: 80, rows: 24, useConpty: true },
-      onExit: ({ exitCode }) => handlePtyExit(ctx, feature, session, meta, exitCode)
+      onExit: ({ exitCode }) => void handlePtyExit(ctx, feature, session, exitMeta, exitCode)
     });
     if (feature)
       startDocsWatch(ctx, feature);
@@ -65974,8 +66051,8 @@ var init_transcripts = __esm(() => {
 
 // src/services/conversations.ts
 function withoutKickoff(turns, kind, runtime5) {
-  const kickoff = kickoffLineFor(kind, undefined, runtime5);
-  return turns.filter((turn) => !(turn.role === "user" && promptMatchesKickoff(kickoff, turn.text)));
+  const kickoffs = [kickoffLineFor(kind, undefined, runtime5), selfPlanKickoffFor(runtime5)];
+  return turns.filter((turn) => !(turn.role === "user" && kickoffs.some((kickoff) => promptMatchesKickoff(kickoff, turn.text))));
 }
 function promptMatchesKickoff(line, prompt) {
   if (!prompt)
@@ -66069,6 +66146,7 @@ var TITLE_MAX = 60, MATCH_PREFIX = 40, INTERRUPTED = "[Request interrupted by us
 var init_conversations = __esm(() => {
   init_src();
   init_sessions();
+  init_skills();
   init_transcripts();
 });