@mycompbox/compbox-cli 1.18.0 → 1.20.0

package/index.js

@@ -5555,84 +5555,360 @@ var INTERVIEW_DEFINITION = [
     fields: ["alternatives"]
   }
 ];
+function interviewFieldKeys() {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const section of INTERVIEW_DEFINITION) {
+    for (const f of section.fields) {
+      if (!seen.has(f)) {
+        seen.add(f);
+        out.push(f);
+      }
+    }
+  }
+  return out;
+}
 var INTERVIEW_FIELD_MIN_WORDS = {
   problemStatement: 60,
   proposedSolution: 100,
   impactAssessment: 40,
   description: 150
 };
-function buildInterviewSystemPrompt(definition = INTERVIEW_DEFINITION, seedContext) {
-  const requiredSections = definition.filter((s) => s.required);
-  const optionalSections = definition.filter((s) => !s.required);
-  const renderSection = (s) => {
-    const tag = s.required ? "REQUIRED" : "OPTIONAL \u2014 ask, but the user may decline";
-    const followUps = s.followUps.map((q) => `    - ${q}`).join("\n");
-    return `- ${s.title} (${tag}) [json keys: ${s.fields.join(", ")}]
-  ${s.purpose}
-${followUps}`;
+
+// ../shared/dist/interview-completion.js
+var TARGET_COMPLIANCE_TIER = "pass";
+function meetsComplianceTarget(compliance) {
+  return !compliance || compliance.tier === TARGET_COMPLIANCE_TIER;
+}
+function buildAuditFeedback(compliance) {
+  const ordered = [
+    ...compliance.issues.filter((i) => i.tier === "critical"),
+    ...compliance.issues.filter((i) => i.tier === "advisory")
+  ].slice(0, 8);
+  const list = ordered.length > 0 ? ordered.map((i) => `- ${i.message}`).join("\n") : "- (no specific issues returned; expand the required fields with more concrete detail)";
+  return `The epic request you just produced scored ${String(compliance.overall)}/100 (tier: ${compliance.tier}). It must reach 90/100 with ZERO critical issues before the interview can finish. Fix these:
+${list}
+
+If you can resolve these by EXPANDING what the employee already told you \u2014 a longer, more complete and concrete problemStatement / proposedSolution / impactAssessment / description that comfortably clear the length minimums \u2014 re-emit the completion JSON now with richer fields. Do NOT re-ask something you already have an answer for. Only if you genuinely need NEW information from the employee, ask ONE focused question to get it.`;
+}
+var OPTIONAL_DRAFT_KEYS = [
+  "successMetrics",
+  "targetAudience",
+  "alternatives",
+  "dependencies",
+  "estimatedEffort"
+];
+function isEpicRequestDraft(value) {
+  if (typeof value !== "object" || value === null)
+    return false;
+  const v = value;
+  const nonEmpty = (x) => typeof x === "string" && x.trim().length > 0;
+  const requiredOk = nonEmpty(v.title) && nonEmpty(v.problemStatement) && nonEmpty(v.proposedSolution) && nonEmpty(v.impactAssessment) && nonEmpty(v.description);
+  if (!requiredOk)
+    return false;
+  for (const key of OPTIONAL_DRAFT_KEYS) {
+    if (key in v && v[key] !== void 0 && typeof v[key] !== "string")
+      return false;
+  }
+  return true;
+}
+function stripTrailingCommas(json) {
+  return json.replace(/,(\s*[}\]])/g, "$1");
+}
+function escapeRawControlCharsInStrings(json) {
+  let out = "";
+  let inString = false;
+  let escaped = false;
+  for (const ch of json) {
+    if (escaped) {
+      out += ch;
+      escaped = false;
+      continue;
+    }
+    if (ch === "\\") {
+      out += ch;
+      escaped = true;
+      continue;
+    }
+    if (ch === '"') {
+      inString = !inString;
+      out += ch;
+      continue;
+    }
+    if (inString && (ch === "\n" || ch === "\r" || ch === "	")) {
+      out += ch === "\n" ? "\\n" : ch === "\r" ? "\\r" : "\\t";
+      continue;
+    }
+    out += ch;
+  }
+  return out;
+}
+function completionJsonCandidates(text) {
+  const candidates = [];
+  const fenced = /```(?:json)?\s*([\s\S]*?)```/i.exec(text);
+  if (fenced?.[1])
+    candidates.push(fenced[1]);
+  const trimmed = text.trim();
+  if (trimmed.startsWith("{"))
+    candidates.push(trimmed);
+  const first = text.indexOf("{");
+  const last = text.lastIndexOf("}");
+  if (first !== -1 && last > first)
+    candidates.push(text.slice(first, last + 1));
+  return candidates;
+}
+function toDraft(parsed) {
+  const draft = {
+    title: parsed.title,
+    problemStatement: parsed.problemStatement,
+    proposedSolution: parsed.proposedSolution,
+    impactAssessment: parsed.impactAssessment,
+    description: parsed.description
   };
-  const completionKeys = [
-    "title",
-    ...interviewFieldKeysFor(definition),
-    "description"
-  ];
-  const completionShape = completionKeys.map((k) => `"${k}": "..."`).join(", ");
-  const base = `You are the CompBox request-formulator, interviewing an employee to turn their idea into a well-formed Epic Request. Ask exactly ONE short, focused question at a time \u2014 never multiple questions in one message, never preamble or explanation.
+  for (const key of OPTIONAL_DRAFT_KEYS) {
+    const raw = parsed[key];
+    if (typeof raw === "string" && raw.trim().length > 0) {
+      draft[key] = raw;
+    }
+  }
+  return draft;
+}
+function extractCompletionJson(text) {
+  for (const candidate of completionJsonCandidates(text)) {
+    for (const variant of [
+      candidate,
+      stripTrailingCommas(candidate),
+      escapeRawControlCharsInStrings(candidate),
+      escapeRawControlCharsInStrings(stripTrailingCommas(candidate))
+    ]) {
+      try {
+        const parsed = JSON.parse(variant);
+        if (isEpicRequestDraft(parsed))
+          return toDraft(parsed);
+      } catch {
+      }
+    }
+  }
+  return null;
+}
+function looksLikeCompletionAttempt(text) {
+  const hasObject = /```(?:json)?\s*\{/i.test(text) || text.trim().startsWith("{");
+  if (!hasObject)
+    return false;
+  return /"(?:done|title|problemStatement|proposedSolution|impactAssessment|description)"\s*:/i.test(text);
+}
+var COMPLETION_REPAIR_INSTRUCTION = 'Your last message looked like a completion but I could NOT parse it as a valid JSON object with all required fields. Re-emit ONLY a single valid JSON object inside a ```json code fence \u2014 no other text \u2014 with every string value properly escaped (escape any internal double-quotes as \\" and any line breaks as \\n), and make sure title, problemStatement, proposedSolution, impactAssessment, and description are all present and non-empty:\n```json\n{"done": true, "title": "...", "problemStatement": "...", "proposedSolution": "...", "impactAssessment": "...", "description": "..."}\n```';
+
+// ../shared/dist/interview-conversation.js
+var CONVERSATION_QUALITY_ROUNDS = 2;
+var JSON_REPAIRS = 3;
+var STARTER = "Hi! I'd like to propose something.";
+var NUDGE = "(Please continue.)";
+function renderSection(s) {
+  const tag = s.required ? "needed" : "nice to have";
+  return `- ${s.title} (${tag}): ${s.purpose} For example: ${s.followUps.slice(0, 2).join(" ")}`;
+}
+function renderSaved(saved) {
+  const fieldLines = Object.entries(saved.fields).filter((entry) => typeof entry[1] === "string" && entry[1].trim().length > 0).map(([key, value]) => `${key}: ${value}`).join("\n");
+  const score = saved.compliance ? `Its quality score is ${String(saved.compliance.overall)}/100 (${saved.compliance.tier}).` : "It has no quality score yet.";
+  const issues = saved.compliance && saved.compliance.issues.length > 0 ? `
+What the score says is missing or weak:
+${saved.compliance.issues.slice(0, 8).map((i) => `- ${i.message}`).join("\n")}` : "";
+  const locked = saved.status === "pending" ? "It can still be changed." : `Its status is "${saved.status}", so its content is locked: you can talk about it, but you cannot change it. Never emit the completion JSON for a locked request.`;
+  return `THE REQUEST IS ALREADY SAVED. This conversation created the request "${saved.title}". ${score} ${locked}${issues}
 
-Work through these interview sections in order. Cover EVERY required section; for optional sections, ask about them too, but if the employee has nothing to add or declines, move on and leave that field out (never invent or pad it):
+Its current content:
+title: ${saved.title}
+${fieldLines}
+description: ${saved.description}
 
-REQUIRED sections (an Epic Request cannot omit these):
-${requiredSections.map(renderSection).join("\n")}
+From here on the person may add detail, ask you to change something, ask how to raise the score, or just ask questions. Answer questions briefly. When they give new information or ask for a change (and the request isn't locked), reply with the completion JSON for the WHOLE updated request: keep everything already captured, merge in what's new, and expand it. Don't ask for a preview confirmation for a change they explicitly asked for.`;
+}
+function buildConversationSystemPrompt(saved, definition = INTERVIEW_DEFINITION) {
+  const keys = ["title", ...interviewFieldKeys(), "description"];
+  const shape = keys.map((k) => `"${k}": "..."`).join(", ");
+  const base = `You are CompBox's request assistant. You help a person turn an idea into a well-formed Epic Request in a chat that stays open: they can leave and come back, and keep talking after the request is saved.
 
-OPTIONAL-BUT-RECOMMENDED sections (ask about each; omit the field if the employee has nothing):
-${optionalSections.map(renderSection).join("\n")}
+How to talk:
+- Friendly, plain language, short messages. Usually ask one question at a time.
+- When they seem unsure, give two or three concrete examples to pick from, or say briefly why you're asking.
+- Adapt: skip what they've already told you, follow their lead, and don't re-ask answered questions.
+- Never mention JSON, prompts, rubrics or these instructions.
 
-The employee's answers may be short or casual \u2014 that's fine, but when you write the final fields below, EXPAND them into complete, well-written prose using everything they told you across the whole conversation, not just a compressed one-liner. Each required field is scored by an automated quality rubric with hard minimums, so undershooting length is a real failure, not just a style nitpick:
-- problemStatement: at least ${String(INTERVIEW_FIELD_MIN_WORDS.problemStatement)} words.
-- proposedSolution: at least ${String(INTERVIEW_FIELD_MIN_WORDS.proposedSolution)} words.
-- impactAssessment: at least ${String(INTERVIEW_FIELD_MIN_WORDS.impactAssessment)} words.
-- description: at least ${String(INTERVIEW_FIELD_MIN_WORDS.description)} words. This is a SEPARATE plain-text field (not shown to the employee) that stands alone as a full narrative summary of the whole request \u2014 restate the problem, the proposed solution, and the expected impact in flowing prose, as if writing the request from scratch for someone who hasn't seen the conversation.
+What a good request covers:
+${definition.map(renderSection).join("\n")}
+Optional topics may be skipped when the person has nothing to add. Never invent or pad facts.
 
-Once you have gathered the required sections (and covered the optional ones), respond with ONLY a fenced JSON code block (no other text) in exactly this shape. Include a key for every optional field you gathered; omit any optional field the employee had nothing for:
+Before saving for the first time: when the needed topics are covered, show a short preview in plain text (the title, then one or two lines per topic) and ask whether to save it or change anything. Only after they agree, or ask you to save, reply with ONLY a fenced JSON block, no other text:
 \`\`\`json
-{"done": true, ${completionShape}}
+{"done": true, ${shape}}
 \`\`\`
+Leave out optional keys they had nothing for. Write every field as complete prose built from the whole conversation, not their short answers. Minimums: problemStatement ${String(INTERVIEW_FIELD_MIN_WORDS.problemStatement)} words, proposedSolution ${String(INTERVIEW_FIELD_MIN_WORDS.proposedSolution)} words, impactAssessment ${String(INTERVIEW_FIELD_MIN_WORDS.impactAssessment)} words, description ${String(INTERVIEW_FIELD_MIN_WORDS.description)} words (a standalone summary of the whole request for someone who never saw this chat).
 
-Until then, respond with ONLY your next question as plain text \u2014 no JSON, no labels, no numbering.`;
-  if (!seedContext || seedContext.priorTranscript.length === 0) {
-    return base;
-  }
-  return `${renderContinuationHeader(seedContext.priorTranscript)}
+Any reply that isn't that JSON block is shown to the person as your message.`;
+  return saved ? `${base}
 
-${base}`;
+${renderSaved(saved)}` : base;
 }
-function renderContinuationHeader(priorTranscript) {
-  const transcript = priorTranscript.map((t) => `${t.role === "agent" ? "You" : "Employee"}: ${t.content}`).join("\n");
-  return `\u26A0\uFE0F CONTINUATION \u2014 this is NOT a fresh interview. You already interviewed this employee; below is that prior conversation, and an Epic Request already exists from it. Your job now is to ENRICH that same request, not restart it.
+function toConversationMessages(turns) {
+  const messages = turns.map((t) => ({
+    role: t.role === "agent" ? "assistant" : "user",
+    content: t.content
+  }));
+  if (messages[0]?.role !== "user")
+    messages.unshift({ role: "user", content: STARTER });
+  if (messages[messages.length - 1]?.role !== "user")
+    messages.push({ role: "user", content: NUDGE });
+  return messages;
+}
+function renderConversationPrompt(messages) {
+  const lines = messages.map((m) => `${m.role === "assistant" ? "You" : "Them"}: ${m.content}`);
+  return `The conversation so far:
 
-Prior conversation:
-${transcript}
+${lines.join("\n\n")}
 
-How to continue:
-- Read the prior conversation first. Do NOT re-ask anything already answered there.
-- Use the section list below only as a checklist of what a complete request needs. Identify which sections are MISSING or THIN, and ask focused questions to fill ONLY those gaps \u2014 still one short question at a time.
-- If the prior conversation already covers everything well, go straight to the completion JSON.
-- When you emit the final completion JSON, MERGE the prior answers with whatever new detail you gathered \u2014 restate and expand every field using the WHOLE conversation (old + new). Never drop or shorten content that was already captured; the goal is a richer request than before, meeting the same length minimums.
+Write your next reply to them.`;
+}
+function savedMessage(saved, created, followUp) {
+  const verb = created ? "Saved your request" : "Updated your request";
+  const c = saved.compliance;
+  let text;
+  if (!c) {
+    text = `${verb} "${saved.title}". You can keep talking here to add detail or change anything.`;
+  } else if (meetsComplianceTarget(c)) {
+    text = `${verb} "${saved.title}". It scores ${String(c.overall)}/100, ready for review. You can keep talking here to change anything.`;
+  } else {
+    const gaps = [...c.issues.filter((i) => i.tier === "critical"), ...c.issues.filter((i) => i.tier === "advisory")].slice(0, 4).map((i) => `- ${i.message}`).join("\n");
+    text = `${verb} "${saved.title}". It scores ${String(c.overall)}/100; 90 is the target.${gaps ? ` To raise it:
+${gaps}` : ""}
 
-`;
-}
-function interviewFieldKeysFor(definition) {
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  for (const section of definition) {
-    for (const f of section.fields) {
-      if (!seen.has(f)) {
-        seen.add(f);
-        out.push(f);
+Tell me more here and I'll update it, or leave it as it is.`;
+  }
+  return followUp ? `${text}
+
+${followUp}` : text;
+}
+async function runConversationStep(input, deps) {
+  const system = buildConversationSystemPrompt(input.saved);
+  const messages = toConversationMessages(input.turns);
+  const locked = input.saved !== null && input.saved.status !== "pending";
+  let requestId = input.saved?.id ?? null;
+  let savedNow = null;
+  let createdHere = false;
+  let qualityRounds = 0;
+  let repairs = 0;
+  for (; ; ) {
+    let reply;
+    try {
+      reply = await deps.reply(system, messages);
+    } catch (error) {
+      if (savedNow)
+        return { kind: "saved", text: savedMessage(savedNow.saved, savedNow.created), ...savedNow };
+      const reason = error instanceof Error ? error.message : "Something went wrong reaching the AI.";
+      return {
+        kind: "error",
+        text: `I couldn't reply just now: ${reason}
+
+Send another message (for example "try again") when you're ready and I'll pick up where we left off.`
+      };
+    }
+    const draft = extractCompletionJson(reply);
+    if (draft) {
+      if (locked) {
+        messages.push({ role: "assistant", content: reply }, { role: "user", content: "That request is locked and can't be changed. Reply to me in plain text instead." });
+        if (++repairs > JSON_REPAIRS)
+          return { kind: "error", text: "This request is locked, so it can't be changed any more." };
+        continue;
+      }
+      let saved;
+      try {
+        saved = await deps.save(requestId, draft);
+      } catch (error) {
+        const reason = error instanceof Error ? error.message : "the save failed";
+        return { kind: "error", text: `I couldn't save the request: ${reason}
+
+Reply "try again" and I'll retry.` };
+      }
+      createdHere ||= requestId === null;
+      savedNow = { saved, created: createdHere };
+      requestId = saved.id;
+      if (meetsComplianceTarget(saved.compliance) || qualityRounds >= CONVERSATION_QUALITY_ROUNDS || !saved.compliance) {
+        return { kind: "saved", text: savedMessage(saved, savedNow.created), ...savedNow };
+      }
+      qualityRounds++;
+      messages.push({ role: "assistant", content: reply }, {
+        role: "user",
+        content: `${buildAuditFeedback(saved.compliance)}
+
+The request IS already saved, and the person will be shown its score. If you ask them something, ask it as a way to improve the saved request; never say it hasn't been saved.`
+      });
+      continue;
+    }
+    if (looksLikeCompletionAttempt(reply)) {
+      if (++repairs > JSON_REPAIRS) {
+        return savedNow ? { kind: "saved", text: savedMessage(savedNow.saved, savedNow.created), ...savedNow } : { kind: "error", text: `I had trouble writing up the request. Reply "try again" and I'll have another go.` };
       }
+      messages.push({ role: "assistant", content: reply }, { role: "user", content: COMPLETION_REPAIR_INSTRUCTION });
+      continue;
+    }
+    const text = reply.trim();
+    if (savedNow) {
+      return { kind: "saved", text: savedMessage(savedNow.saved, savedNow.created, text || void 0), ...savedNow };
     }
+    if (!text)
+      return { kind: "error", text: "I didn't get a reply that time. Send another message and I'll try again." };
+    return { kind: "message", text };
   }
-  return out;
+}
+function savedContextFromRecord(record) {
+  if (typeof record !== "object" || record === null)
+    return null;
+  const r = record;
+  if (typeof r.id !== "string" || typeof r.title !== "string")
+    return null;
+  let structured = r.structuredDesc;
+  if (typeof structured === "string") {
+    try {
+      structured = JSON.parse(structured);
+    } catch {
+      structured = null;
+    }
+  }
+  const fields = {};
+  if (typeof structured === "object" && structured !== null) {
+    for (const [key, value] of Object.entries(structured)) {
+      if (typeof value === "string")
+        fields[key] = value;
+    }
+  }
+  let score = r.complianceScore;
+  if (typeof score === "string") {
+    try {
+      score = JSON.parse(score);
+    } catch {
+      score = null;
+    }
+  }
+  return {
+    id: r.id,
+    title: r.title,
+    status: typeof r.status === "string" ? r.status : "pending",
+    description: typeof r.description === "string" ? r.description : "",
+    fields,
+    compliance: complianceFromRecord(score)
+  };
+}
+function complianceFromRecord(score) {
+  if (typeof score !== "object" || score === null)
+    return null;
+  const s = score;
+  if (typeof s.overall !== "number" || typeof s.tier !== "string")
+    return null;
+  const issues = Array.isArray(s.issues) ? s.issues.filter((i) => typeof i === "object" && i !== null).map((i) => ({
+    message: typeof i.message === "string" ? i.message : typeof i.code === "string" ? i.code : "issue",
+    tier: i.tier === "critical" ? "critical" : "advisory"
+  })) : [];
+  return { overall: s.overall, tier: s.tier, issues };
 }
 
 // src/utils/config-store.ts
@@ -5779,8 +6055,8 @@ async function promptText(question, options = {}) {
   const rendered = defaultValue !== void 0 ? `${question} [${defaultValue}]: ` : question;
   const rl = readline.createInterface({ input: stdin, output: stdout });
   try {
-    const answer = await new Promise((resolve2) => {
-      rl.question(rendered, resolve2);
+    const answer = await new Promise((resolve3) => {
+      rl.question(rendered, resolve3);
     });
     const trimmed = answer.trim();
     if (trimmed.length === 0 && defaultValue !== void 0) {
@@ -5792,7 +6068,7 @@ async function promptText(question, options = {}) {
   }
 }
 function promptSecret(question) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     const rl = readline.createInterface({
       input: stdin,
       output: stdout,
@@ -5804,7 +6080,7 @@ function promptSecret(question) {
     rl.question("", (answer) => {
       rl.close();
       stdout.write("\n");
-      resolve2(answer.trim());
+      resolve3(answer.trim());
     });
   });
 }
@@ -5842,7 +6118,7 @@ async function promptConfirm(question, defaultYes = true) {
 }
 
 // src/utils/loopback.ts
-var LOOPBACK_IMPACT = "your work will NOT reach the cloud (mycompbox.web.app)";
+var LOOPBACK_IMPACT = "your work will NOT reach the cloud (mycompbox.com)";
 var LOOPBACK_NOTICE = `This is a LOCAL dev endpoint \u2014 ${LOOPBACK_IMPACT}. Use \`compbox login --url <cloud-url>\` for production.`;
 function isLoopbackHostname(hostname3) {
   let host = hostname3.trim().toLowerCase();
@@ -5882,6 +6158,7 @@ function isLoopbackUrl(rawUrl) {
 }
 
 // src/commands/login.ts
+var DEFAULT_BASE_URL = "https://mycompbox.com";
 async function resolveBaseUrl(option) {
   if (option && option.trim().length > 0) {
     return option.trim();
@@ -5890,19 +6167,40 @@ async function resolveBaseUrl(option) {
   if (existing && existing.trim().length > 0) {
     return existing.trim();
   }
-  const entered = await promptText("Central CompBox API URL: ");
-  if (entered.length === 0) {
-    throw new Error("A central API URL is required.");
-  }
-  return entered;
+  const entered = await promptText(`CompBox URL [${DEFAULT_BASE_URL}]: `);
+  return entered.length === 0 ? DEFAULT_BASE_URL : entered;
 }
 var loginCommand = new Command5("login").description("Authenticate to central CompBox and store your pairing config").option("--url <url>", "Central CompBox API base URL").option("--email <email>", "Account email (otherwise prompted)").option(
   "--password <password>",
   "Account password (otherwise prompted; prefer the prompt to keep it out of shell history)"
-).option("--token-name <name>", "Name for the generated API token").action(async (options) => {
+).option("--token-name <name>", "Name for the generated API token").option(
+  "--api-token <token>",
+  "Sign in with an existing CompBox API token (st_...) from web Settings \u2192 API Keys \u2014 use this if you sign in with Google"
+).action(async (options) => {
   try {
     const baseUrl = await resolveBaseUrl(options.url);
     const client = new AuthClient(baseUrl);
+    if (options.apiToken && options.apiToken.trim().length > 0) {
+      const token = options.apiToken.trim();
+      console.log(chalk6.gray(`
+Verifying the API token against ${baseUrl}...`));
+      const me = await client.getMe(token);
+      updateConfig({
+        apiBaseUrl: client.baseUrl,
+        apiToken: token,
+        userId: me.id,
+        email: me.email,
+        userName: me.name
+      });
+      console.log(chalk6.green(`
+\u2714 Paired as ${me.name} <${me.email}> using your API token`));
+      console.log(chalk6.gray(`  Central URL:  ${client.baseUrl}`));
+      console.log("\n" + chalk6.bold("Next step:"));
+      console.log(
+        chalk6.gray("  Run `compbox configure` to select your AI mode, pair this device, and write the MCP config.")
+      );
+      return;
+    }
     const email = options.email && options.email.trim().length > 0 ? options.email.trim() : await promptText("Email: ");
     if (email.length === 0) {
       throw new Error("Email is required.");
@@ -5952,7 +6250,17 @@ Authenticating to ${baseUrl}...`));
       console.error(chalk6.red(`
 Login failed: ${error.message}`));
       if (error.status === 401) {
-        console.error(chalk6.yellow("Tip: double-check your email and password."));
+        console.error(
+          chalk6.yellow(
+            "Tip: double-check your email and password. If you sign in with Google, use `compbox login --api-token <st_...>` with a key from web Settings \u2192 API Keys."
+          )
+        );
+      } else if (error.status === 403) {
+        console.error(
+          chalk6.yellow(
+            "Tip: if you just signed up, open the verification link we emailed you, then run `compbox login` again."
+          )
+        );
       } else if (error.status === 0) {
         console.error(chalk6.yellow("Tip: verify the central API URL and your network connection."));
       }
@@ -5969,7 +6277,7 @@ Login failed: ${error.message}`));
 // src/commands/configure.ts
 import { Command as Command6 } from "commander";
 import chalk7 from "chalk";
-import { execFileSync as execFileSync3 } from "child_process";
+import { execFileSync as execFileSync4 } from "child_process";
 import { hostname as hostname2 } from "os";
 
 // src/utils/keychain.ts
@@ -6204,12 +6512,18 @@ var MailboxClient = class {
    * here. Cloud Run bills vCPU for the wall-clock life of a request, so a held
    * connection kept one instance permanently awake at ~$64/month.
    */
-  async nextJob(machineToken, waitMs = 0) {
+  /**
+   * `runningIds`: jobs this daemon is already running, so the server hands out
+   * new work instead of resuming one of them.
+   */
+  async nextJob(machineToken, waitMs = 0, runningIds = []) {
     let res;
     try {
       res = await this.http.get("/api/v1/machines/next-job", {
         headers: { Authorization: `Bearer ${machineToken}` },
-        params: { waitMs }
+        // steps=1: this daemon runs request conversations one reply at a time,
+        // so it never wants back a job that is waiting on the person.
+        params: { waitMs, steps: "1", ...runningIds.length > 0 && { running: runningIds.join(",") } }
       });
     } catch (error) {
       throw toMailboxError(error, "next-job request failed");
@@ -6300,16 +6614,74 @@ var MailboxClient = class {
     const data = res.data;
     return data.data;
   }
+  /**
+   * The person's saved API key for one job sent with "Run with: My API key".
+   * Kept in memory and passed to Claude Code's environment only — never
+   * written to disk or logged.
+   */
+  async getAiKey(machineToken, jobId) {
+    let res;
+    try {
+      res = await this.http.post(
+        `/api/v1/jobs/${jobId}/ai-key`,
+        {},
+        { headers: { Authorization: `Bearer ${machineToken}` } }
+      );
+    } catch (error) {
+      throw toMailboxError(error, "ai-key request failed");
+    }
+    if (res.status < 200 || res.status >= 300) {
+      throw errorFromResponse(res, "ai-key failed");
+    }
+    const data = res.data;
+    return data.data;
+  }
+  /**
+   * Tells CompBox that a request conversation saved its epic request. The
+   * conversation stays open; this only links the job to the request.
+   */
+  async markRequestSaved(machineToken, jobId, epicRequestId) {
+    let res;
+    try {
+      res = await this.http.post(`/api/v1/jobs/${jobId}/saved`, { epicRequestId }, {
+        headers: { Authorization: `Bearer ${machineToken}` }
+      });
+    } catch (error) {
+      throw toMailboxError(error, "saved request failed");
+    }
+    if (res.status < 200 || res.status >= 300) {
+      throw errorFromResponse(res, "saved failed");
+    }
+  }
+  /** Reports what a run on the person's API key spent. */
+  async reportAiUsage(machineToken, jobId, usage) {
+    let res;
+    try {
+      res = await this.http.post(`/api/v1/jobs/${jobId}/ai-usage`, usage, {
+        headers: { Authorization: `Bearer ${machineToken}` }
+      });
+    } catch (error) {
+      throw toMailboxError(error, "ai-usage request failed");
+    }
+    if (res.status < 200 || res.status >= 300) {
+      throw errorFromResponse(res, "ai-usage failed");
+    }
+  }
 };
 
 // src/utils/mcp-config-writer.ts
 import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3 } from "fs";
-import { dirname as dirname2, join as join6 } from "path";
+import { basename, dirname as dirname2, join as join6 } from "path";
 var DEFAULT_MCP_CONFIG_FILENAME = ".mcp.json";
 var DEFAULT_SERVER_KEY = "compbox";
 var MCP_SERVER_PACKAGE = "@mycompbox/compbox-mcp";
 function resolveInstalledMcpBundle(opts) {
   const exists = opts?.exists ?? existsSync6;
+  const self = opts && "self" in opts ? opts.self : process.argv[1];
+  if (self && basename(self) === "compbox.cjs") {
+    const sibling = join6(dirname2(self), "compbox-mcp.cjs");
+    if (exists(sibling)) return sibling;
+  }
   const prefixes = [];
   if (opts?.prefix) prefixes.push(opts.prefix);
   if (process.env.HOMEBREW_PREFIX) prefixes.push(process.env.HOMEBREW_PREFIX);
@@ -6454,6 +6826,100 @@ function findBrew(deps = {}) {
   return pathProbe() ? "brew" : null;
 }
 
+// src/utils/autostart.ts
+import { execFileSync as execFileSync3 } from "node:child_process";
+import { mkdirSync as mkdirSync4, realpathSync, writeFileSync as writeFileSync4 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname3, join as join7 } from "node:path";
+var LAUNCHD_LABEL = "com.mycompbox.agent-runner";
+var SYSTEMD_UNIT = "compbox-agent-runner.service";
+function scriptInstallPath(home = homedir3()) {
+  return join7(home, ".compbox", "bin", "compbox.cjs");
+}
+function isScriptInstall(entry = process.argv[1], home = homedir3()) {
+  if (!entry) return false;
+  try {
+    return realpathSync(entry) === realpathSync(scriptInstallPath(home));
+  } catch {
+    return false;
+  }
+}
+function xmlEscape(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function launchdPlist(opts) {
+  const args = [opts.node, opts.script, "run"].map((a) => `    <string>${xmlEscape(a)}</string>`).join("\n");
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>${LAUNCHD_LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+${args}
+  </array>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PATH</key>
+    <string>${xmlEscape(opts.path)}</string>
+  </dict>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>StandardOutPath</key>
+  <string>${xmlEscape(opts.logFile)}</string>
+  <key>StandardErrorPath</key>
+  <string>${xmlEscape(opts.logFile)}</string>
+</dict>
+</plist>
+`;
+}
+function systemdUnit(opts) {
+  const quote = (s) => `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+  return `[Unit]
+Description=CompBox Agent Runner
+
+[Service]
+ExecStart=${quote(opts.node)} ${quote(opts.script)} run
+Environment=${quote(`PATH=${opts.path}`)}
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=default.target
+`;
+}
+function installAutostart() {
+  const home = homedir3();
+  const script = scriptInstallPath(home);
+  const node = process.execPath;
+  const path3 = process.env.PATH ?? "/usr/bin:/bin";
+  if (process.platform === "darwin") {
+    const plistPath = join7(home, "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
+    const logFile = join7(home, ".compbox", "agent-runner.log");
+    mkdirSync4(dirname3(plistPath), { recursive: true });
+    writeFileSync4(plistPath, launchdPlist({ node, script, path: path3, logFile }));
+    const domain = `gui/${String(process.getuid?.() ?? 0)}`;
+    try {
+      execFileSync3("launchctl", ["bootout", domain, plistPath], { stdio: "ignore" });
+    } catch {
+    }
+    execFileSync3("launchctl", ["bootstrap", domain, plistPath], { stdio: "pipe" });
+    return `it starts at every login (stop it with \`launchctl bootout ${domain} ${plistPath}\`; log: ${logFile})`;
+  }
+  if (process.platform === "linux") {
+    const unitPath = join7(home, ".config", "systemd", "user", SYSTEMD_UNIT);
+    mkdirSync4(dirname3(unitPath), { recursive: true });
+    writeFileSync4(unitPath, systemdUnit({ node, script, path: path3 }));
+    execFileSync3("systemctl", ["--user", "daemon-reload"], { stdio: "pipe" });
+    execFileSync3("systemctl", ["--user", "enable", "--now", SYSTEMD_UNIT], { stdio: "pipe" });
+    return `it starts at every login (stop it with \`systemctl --user disable --now ${SYSTEMD_UNIT}\`)`;
+  }
+  throw new Error(`Automatic start isn't supported on ${process.platform}.`);
+}
+
 // src/commands/configure.ts
 function parseAiMode(value) {
   if (value === "claude-subscription" || value === "api-key") {
@@ -6550,13 +7016,13 @@ Device pairing failed: ${message}`));
 Device already paired as "${config.machineName ?? config.machineId}".`));
     }
     const defaultDir = isGitRepoDir(process.cwd()) ? process.cwd() : void 0;
-    console.log("\n" + chalk7.bold("Project directory for dispatched runs:"));
+    console.log("\n" + chalk7.bold("Project folder:"));
     console.log(
       chalk7.gray(
-        "  This is where dispatched @planner/@orchestrator runs read, edit, and commit \u2014 leave blank to skip."
+        "  The folder with your code (a git project) where the AI plans, edits and commits.\n  Leave blank to skip; add folders per project later with `compbox machines dirs add`."
       )
     );
-    const projectDirQuestion = "Which local repository should dispatched plan/orchestrate runs use?";
+    const projectDirQuestion = "Which project folder should the AI work in?";
     const MAX_PROJECT_DIR_ATTEMPTS = 5;
     let projectDirPersisted = false;
     let projectDirSkipped = false;
@@ -6673,8 +7139,8 @@ Device already paired as "${config.machineName ?? config.machineId}".`));
         "  Agent traffic would pass through it; if it is not running, calls fall back to a direct connection automatically."
       )
     );
-    updateConfig({ pxpipeEnabled: enablePxpipe === true });
-    if (enablePxpipe === true) {
+    updateConfig({ pxpipeEnabled: enablePxpipe });
+    if (enablePxpipe) {
       console.log(chalk7.green("\u2714 pxpipe routing enabled for this machine."));
       console.log(
         chalk7.yellow("  Note: which models are actually compressed is pxpipe's own setting, not CompBox's.")
@@ -6693,9 +7159,26 @@ Device already paired as "${config.machineName ?? config.machineId}".`));
         chalk7.gray("  Re-run `compbox configure` to change this later.")
       );
     }
-    const startServiceCmd = process.platform === "darwin" ? "brew services start compbox" : process.platform === "win32" ? "compbox service install" : "compbox run";
+    const scriptInstall = process.platform !== "win32" && isScriptInstall();
+    const startServiceCmd = process.platform === "win32" ? "compbox service install" : process.platform === "darwin" && !scriptInstall ? "brew services start compbox" : "compbox run";
     let daemonStarted = false;
-    if (process.platform === "darwin") {
+    if (scriptInstall) {
+      const startNow = await promptConfirm(
+        "Start the Agent Runner now and at every login? (lets CompBox send work to this computer)",
+        true
+      );
+      if (startNow) {
+        try {
+          const how = installAutostart();
+          daemonStarted = true;
+          console.log(chalk7.green(`\u2714 Agent Runner started \u2014 ${how}.`));
+        } catch (error) {
+          const message = (error instanceof Error ? error.message.split("\n")[0] : void 0) ?? "unknown error";
+          console.warn(chalk7.yellow(`\u26A0 Could not start the Agent Runner automatically: ${message}`));
+          console.warn(chalk7.gray("  Run `compbox run` in a terminal and keep it open instead."));
+        }
+      }
+    } else if (process.platform === "darwin") {
       const brew = findBrew();
       if (brew !== null) {
         const startNow = await promptConfirm(
@@ -6704,7 +7187,7 @@ Device already paired as "${config.machineName ?? config.machineId}".`));
         );
         if (startNow) {
           try {
-            execFileSync3(brew, ["services", "start", "compbox"], {
+            execFileSync4(brew, ["services", "start", "compbox"], {
               encoding: "utf-8",
               timeout: 3e4,
               stdio: ["ignore", "pipe", "pipe"]
@@ -6716,7 +7199,7 @@ Device already paired as "${config.machineName ?? config.machineId}".`));
               )
             );
           } catch (error) {
-            const message = error instanceof Error ? error.message.split("\n")[0] : "unknown error";
+            const message = (error instanceof Error ? error.message.split("\n")[0] : void 0) ?? "unknown error";
             console.warn(chalk7.yellow(`\u26A0 Could not start the service: ${message}`));
             console.warn(chalk7.gray(`  Start it manually with \`${startServiceCmd}\`.`));
           }
@@ -6743,22 +7226,22 @@ Configuration failed: ${error.message}`));
 });
 
 // src/commands/doctor.ts
-import { execFileSync as execFileSync5, spawn as spawn2 } from "child_process";
+import { execFileSync as execFileSync6, spawn as spawn2 } from "child_process";
 import { existsSync as existsSync8 } from "fs";
 import { Command as Command7 } from "commander";
 import chalk8 from "chalk";
 
 // src/utils/claude-runtime.ts
 import { spawn } from "node:child_process";
-import { execFileSync as execFileSync4 } from "node:child_process";
+import { execFileSync as execFileSync5 } from "node:child_process";
 import { accessSync, constants as fsConstants, statSync as statSync2 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
-import { delimiter, join as join7 } from "node:path";
+import { homedir as homedir4 } from "node:os";
+import { delimiter, join as join8 } from "node:path";
 var WELL_KNOWN_DIRS = buildWellKnownDirs();
 function buildWellKnownDirs() {
-  const home = homedir3();
+  const home = homedir4();
   const dirs = [
-    join7(home, ".local", "bin"),
+    join8(home, ".local", "bin"),
     // default Claude Code install location
     "/opt/homebrew/bin",
     // Homebrew on Apple Silicon
@@ -6766,14 +7249,14 @@ function buildWellKnownDirs() {
     // Homebrew on Intel / common Unix prefix
   ];
   if (process.env.npm_config_prefix) {
-    dirs.push(join7(process.env.npm_config_prefix, "bin"));
+    dirs.push(join8(process.env.npm_config_prefix, "bin"));
   }
-  dirs.push(join7(home, ".npm-global", "bin"));
+  dirs.push(join8(home, ".npm-global", "bin"));
   if (process.env.PNPM_HOME) {
     dirs.push(process.env.PNPM_HOME);
   }
-  dirs.push(join7(home, "Library", "pnpm"));
-  dirs.push(join7(home, ".local", "share", "pnpm"));
+  dirs.push(join8(home, "Library", "pnpm"));
+  dirs.push(join8(home, ".local", "share", "pnpm"));
   return dirs;
 }
 var LOGIN_SHELL_PATH_TIMEOUT_MS = 2e3;
@@ -6801,7 +7284,7 @@ function getLoginShellPath(exec = defaultExecFileSync) {
   return cachedLoginShellPath;
 }
 function defaultExecFileSync(file, args, options) {
-  return execFileSync4(file, args, {
+  return execFileSync5(file, args, {
     timeout: options.timeout,
     encoding: options.encoding,
     stdio: ["ignore", "pipe", "ignore"]
@@ -6839,7 +7322,7 @@ function resolveClaudeBinary(deps = {}) {
       continue;
     }
     seen.add(dir);
-    const candidate = join7(dir, "claude");
+    const candidate = join8(dir, "claude");
     if (isExec(candidate)) {
       return candidate;
     }
@@ -6878,7 +7361,7 @@ function probeAgentRuntime(deps = {}) {
       checkedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
   }
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     let settled = false;
     let child;
     let stdout2 = "";
@@ -6893,7 +7376,7 @@ function probeAgentRuntime(deps = {}) {
         child.kill("SIGKILL");
       } catch {
       }
-      resolve2({ ...result, checkedAt: (/* @__PURE__ */ new Date()).toISOString() });
+      resolve3({ ...result, checkedAt: (/* @__PURE__ */ new Date()).toISOString() });
     };
     const timer = setTimeout(() => {
       settle({
@@ -6905,7 +7388,7 @@ function probeAgentRuntime(deps = {}) {
       child = spawnFn(abs, ["--version"], { stdio: ["ignore", "pipe", "pipe"] });
     } catch (error) {
       clearTimeout(timer);
-      resolve2({
+      resolve3({
         status: "error",
         detail: error instanceof Error ? error.message : "failed to spawn claude",
         checkedAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -6997,7 +7480,7 @@ function countFailures(results) {
 }
 var LAUNCH_PROBE_TIMEOUT_MS = 5e3;
 function probeLaunchTarget(command, args, timeoutMs = LAUNCH_PROBE_TIMEOUT_MS) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     let settled = false;
     const child = spawn2(command, args, {
       stdio: ["ignore", "pipe", "pipe"],
@@ -7019,7 +7502,7 @@ function probeLaunchTarget(command, args, timeoutMs = LAUNCH_PROBE_TIMEOUT_MS) {
         child.kill("SIGKILL");
       } catch {
       }
-      resolve2(result);
+      resolve3(result);
     };
     const timer = setTimeout(() => {
       settle({ status: "timeout" });
@@ -7108,7 +7591,7 @@ var BREW_SERVICE_LABEL = "homebrew.mxcl.compbox";
 function checkBrewService(deps = {}) {
   const name = "Homebrew service running (macOS)";
   const locateBrew = deps.findBrewFn ?? findBrew;
-  const exec = deps.execFn ?? ((file, args) => execFileSync5(file, args, {
+  const exec = deps.execFn ?? ((file, args) => execFileSync6(file, args, {
     encoding: "utf-8",
     timeout: 1e4,
     stdio: ["ignore", "pipe", "ignore"]
@@ -7126,7 +7609,7 @@ function checkBrewService(deps = {}) {
   try {
     output = exec(brew, ["services", "list"]);
   } catch (error) {
-    const cause = error instanceof Error ? error.message.split("\n")[0] : "unknown error";
+    const cause = (error instanceof Error ? error.message.split("\n")[0] : void 0) ?? "unknown error";
     try {
       exec("launchctl", ["list", BREW_SERVICE_LABEL]);
       return {
@@ -7416,16 +7899,67 @@ import chalk9 from "chalk";
 // src/utils/agent-invoker.ts
 import Anthropic from "@anthropic-ai/sdk";
 import { spawn as spawn3, spawnSync } from "node:child_process";
-import { mkdirSync as mkdirSync4 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { join as join8 } from "node:path";
+import { mkdirSync as mkdirSync5 } from "node:fs";
+import { homedir as homedir5 } from "node:os";
+import { join as join9 } from "node:path";
+
+// src/utils/key-run.ts
+function keyRunEnv(env, keyRun) {
+  const next = { ...env, ANTHROPIC_API_KEY: keyRun.apiKey, ANTHROPIC_MODEL: keyRun.model };
+  delete next.ANTHROPIC_AUTH_TOKEN;
+  delete next.CLAUDE_CODE_OAUTH_TOKEN;
+  return next;
+}
+function keyRunArgs(args) {
+  return [...args, "--output-format", "json"];
+}
+function num(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function parseClaudeJsonResult(stdout2, fallbackModel) {
+  let data;
+  try {
+    const start = stdout2.indexOf("{");
+    if (start === -1) return null;
+    data = JSON.parse(stdout2.slice(start));
+  } catch {
+    return null;
+  }
+  if (typeof data.result !== "string" && data.type !== "result") return null;
+  const usage = {
+    model: fallbackModel,
+    inputTokens: 0,
+    outputTokens: 0,
+    cacheReadTokens: 0,
+    cacheWriteTokens: 0,
+    costUsd: typeof data.total_cost_usd === "number" ? data.total_cost_usd : null
+  };
+  const byModel = data.modelUsage;
+  if (typeof byModel === "object" && byModel !== null && Object.keys(byModel).length > 0) {
+    let topCost = -1;
+    for (const [model, raw] of Object.entries(byModel)) {
+      usage.inputTokens += num(raw.inputTokens);
+      usage.outputTokens += num(raw.outputTokens);
+      usage.cacheReadTokens += num(raw.cacheReadInputTokens);
+      usage.cacheWriteTokens += num(raw.cacheCreationInputTokens);
+      if (num(raw.costUSD) > topCost) {
+        topCost = num(raw.costUSD);
+        usage.model = model;
+      }
+    }
+  } else if (typeof data.usage === "object" && data.usage !== null) {
+    const u = data.usage;
+    usage.inputTokens = num(u.input_tokens);
+    usage.outputTokens = num(u.output_tokens);
+    usage.cacheReadTokens = num(u.cache_read_input_tokens);
+    usage.cacheWriteTokens = num(u.cache_creation_input_tokens);
+  }
+  return { text: typeof data.result === "string" ? data.result : "", usage };
+}
+
+// src/utils/agent-invoker.ts
 var ANTHROPIC_MODEL = "claude-fable-5";
-var MAX_INTERVIEW_TURNS = 18;
-var MAX_QUALITY_ROUNDS = 4;
-var TARGET_COMPLIANCE_TIER = "pass";
-var REPLY_POLL_INTERVAL_MS = 3e3;
-var REPLY_TIMEOUT_MS = 10 * 60 * 1e3;
-var CLAUDE_CLI_TURN_TIMEOUT_MS = 2 * 60 * 1e3;
+var CLAUDE_CLI_TURN_TIMEOUT_MS = 4 * 60 * 1e3;
 function anthropicClientOptions(apiKey, routing) {
   return routing.mode === "proxy" ? { apiKey, baseURL: routing.anthropicBaseUrl } : { apiKey };
 }
@@ -7438,11 +7972,7 @@ var SUPPORTED_IMAGE_MEDIA_TYPES = [
   "image/gif",
   "image/webp"
 ];
-var MAX_IMAGES_PER_TURN = 8;
 var MAX_IMAGE_BYTES_PER_TURN = 20 * 1024 * 1024;
-var defaultWarn = (message) => {
-  console.warn(`  \u26A0 ${message}`);
-};
 function normalizeImageMediaType(mime) {
   const base = (mime.split(";")[0] ?? "").trim().toLowerCase();
   return SUPPORTED_IMAGE_MEDIA_TYPES.includes(base) ? base : null;
@@ -7450,67 +7980,10 @@ function normalizeImageMediaType(mime) {
 function isSupportedImageMediaType(mime) {
   return normalizeImageMediaType(mime) !== null;
 }
-function selectImageAttachments(attachments) {
-  if (!attachments || attachments.length === 0) return [];
-  const selected = [];
-  let declaredBytes = 0;
-  for (const att of attachments) {
-    if (selected.length >= MAX_IMAGES_PER_TURN) break;
-    if (!isSupportedImageMediaType(att.mimeType)) continue;
-    const size = typeof att.sizeBytes === "number" && att.sizeBytes > 0 ? att.sizeBytes : 0;
-    if (declaredBytes + size > MAX_IMAGE_BYTES_PER_TURN) continue;
-    declaredBytes += size;
-    selected.push(att);
-  }
-  return selected;
-}
 function imageAttachmentCount(attachments) {
   if (!attachments || attachments.length === 0) return 0;
   return attachments.filter((a) => isSupportedImageMediaType(a.mimeType)).length;
 }
-async function fetchImageBlocks(attachments, warn = defaultWarn, fetchImpl = fetch) {
-  const blocks = [];
-  let totalBytes = 0;
-  for (const att of attachments) {
-    const mediaType = normalizeImageMediaType(att.mimeType);
-    if (!mediaType) continue;
-    try {
-      const res = await fetchImpl(att.signedUrl);
-      if (!res.ok) {
-        warn(`Skipping image attachment ${att.id}: fetch failed (HTTP ${String(res.status)}).`);
-        continue;
-      }
-      const bytes = Buffer.from(await res.arrayBuffer());
-      if (bytes.byteLength === 0) {
-        warn(`Skipping image attachment ${att.id}: empty response body.`);
-        continue;
-      }
-      if (totalBytes + bytes.byteLength > MAX_IMAGE_BYTES_PER_TURN) {
-        warn(`Skipping image attachment ${att.id}: exceeds the per-turn image byte budget.`);
-        continue;
-      }
-      totalBytes += bytes.byteLength;
-      blocks.push({
-        type: "image",
-        source: { type: "base64", media_type: mediaType, data: bytes.toString("base64") }
-      });
-    } catch (error) {
-      const message = error instanceof Error ? error.message : "unknown error";
-      warn(`Skipping image attachment ${att.id}: ${message}.`);
-    }
-  }
-  return blocks;
-}
-function buildApiUserContent(text, imageBlocks) {
-  if (imageBlocks.length === 0) return text;
-  return [...imageBlocks, { type: "text", text }];
-}
-async function apiUserTurnContent(turn, warn = defaultWarn, fetchImpl = fetch) {
-  const selected = selectImageAttachments(turn.attachments);
-  if (selected.length === 0) return turn.content;
-  const blocks = await fetchImageBlocks(selected, warn, fetchImpl);
-  return buildApiUserContent(turn.content, blocks);
-}
 function appendAttachmentNote(text, imageCount) {
   if (imageCount <= 0) return text;
   const noun = imageCount === 1 ? "image" : "images";
@@ -7519,7 +7992,6 @@ function appendAttachmentNote(text, imageCount) {
 
 ${note}` : note;
 }
-var SYSTEM_PROMPT = buildInterviewSystemPrompt();
 function parseSeedPayload(payload) {
   if (typeof payload !== "object" || payload === null) return null;
   const p = payload;
@@ -7535,11 +8007,6 @@ function parseSeedPayload(payload) {
     priorTranscript
   };
 }
-function resolveSystemPrompt(seed) {
-  return seed ? buildInterviewSystemPrompt(INTERVIEW_DEFINITION, {
-    priorTranscript: seed.priorTranscript
-  }) : SYSTEM_PROMPT;
-}
 async function submitAndScore(ctx, currentErId, draft) {
   if (currentErId) {
     const compliance = await updatePersonalEpicRequest(
@@ -7553,248 +8020,21 @@ async function submitAndScore(ctx, currentErId, draft) {
   const created = await createPersonalEpicRequest(ctx.apiBaseUrl, ctx.userApiToken, draft);
   return { erId: created.id, compliance: created.compliance };
 }
-function meetsComplianceTarget(compliance) {
-  return !compliance || compliance.tier === TARGET_COMPLIANCE_TIER;
-}
-function buildAuditFeedback(compliance) {
-  const ordered = [
-    ...compliance.issues.filter((i) => i.tier === "critical"),
-    ...compliance.issues.filter((i) => i.tier === "advisory")
-  ].slice(0, 8);
-  const list = ordered.length > 0 ? ordered.map((i) => `- ${i.message}`).join("\n") : "- (no specific issues returned; expand the required fields with more concrete detail)";
-  return `The epic request you just produced scored ${String(compliance.overall)}/100 (tier: ${compliance.tier}). It must reach 90/100 with ZERO critical issues before the interview can finish. Fix these:
-${list}
-
-If you can resolve these by EXPANDING what the employee already told you \u2014 a longer, more complete and concrete problemStatement / proposedSolution / impactAssessment / description that comfortably clear the length minimums \u2014 re-emit the completion JSON now with richer fields. Do NOT re-ask something you already have an answer for. Only if you genuinely need NEW information from the employee, ask ONE focused question to get it.`;
-}
-var OPTIONAL_DRAFT_KEYS = [
-  "successMetrics",
-  "targetAudience",
-  "alternatives",
-  "dependencies",
-  "estimatedEffort"
-];
-function isEpicRequestDraft(value) {
-  if (typeof value !== "object" || value === null) return false;
-  const v = value;
-  const nonEmpty = (x) => typeof x === "string" && x.trim().length > 0;
-  const requiredOk = nonEmpty(v.title) && nonEmpty(v.problemStatement) && nonEmpty(v.proposedSolution) && nonEmpty(v.impactAssessment) && nonEmpty(v.description);
-  if (!requiredOk) return false;
-  for (const key of OPTIONAL_DRAFT_KEYS) {
-    if (key in v && v[key] !== void 0 && typeof v[key] !== "string") return false;
-  }
-  return true;
-}
-function stripTrailingCommas(json) {
-  return json.replace(/,(\s*[}\]])/g, "$1");
-}
-function escapeRawControlCharsInStrings(json) {
-  let out = "";
-  let inString = false;
-  let escaped = false;
-  for (const ch of json) {
-    if (escaped) {
-      out += ch;
-      escaped = false;
-      continue;
-    }
-    if (ch === "\\") {
-      out += ch;
-      escaped = true;
-      continue;
-    }
-    if (ch === '"') {
-      inString = !inString;
-      out += ch;
-      continue;
-    }
-    if (inString && (ch === "\n" || ch === "\r" || ch === "	")) {
-      out += ch === "\n" ? "\\n" : ch === "\r" ? "\\r" : "\\t";
-      continue;
-    }
-    out += ch;
-  }
-  return out;
-}
-function completionJsonCandidates(text) {
-  const candidates = [];
-  const fenced = /```(?:json)?\s*([\s\S]*?)```/i.exec(text);
-  if (fenced?.[1]) candidates.push(fenced[1]);
-  const trimmed = text.trim();
-  if (trimmed.startsWith("{")) candidates.push(trimmed);
-  const first = text.indexOf("{");
-  const last = text.lastIndexOf("}");
-  if (first !== -1 && last > first) candidates.push(text.slice(first, last + 1));
-  return candidates;
-}
-function toDraft(parsed) {
-  const draft = {
-    title: parsed.title,
-    problemStatement: parsed.problemStatement,
-    proposedSolution: parsed.proposedSolution,
-    impactAssessment: parsed.impactAssessment,
-    description: parsed.description
-  };
-  for (const key of OPTIONAL_DRAFT_KEYS) {
-    const raw = parsed[key];
-    if (typeof raw === "string" && raw.trim().length > 0) {
-      draft[key] = raw;
-    }
-  }
-  return draft;
-}
-function extractCompletionJson(text) {
-  for (const candidate of completionJsonCandidates(text)) {
-    for (const variant of [
-      candidate,
-      stripTrailingCommas(candidate),
-      escapeRawControlCharsInStrings(candidate),
-      escapeRawControlCharsInStrings(stripTrailingCommas(candidate))
-    ]) {
-      try {
-        const parsed = JSON.parse(variant);
-        if (isEpicRequestDraft(parsed)) return toDraft(parsed);
-      } catch {
-      }
-    }
-  }
-  return null;
-}
-function looksLikeCompletionAttempt(text) {
-  const hasObject = /```(?:json)?\s*\{/i.test(text) || text.trim().startsWith("{");
-  if (!hasObject) return false;
-  return /"(?:done|title|problemStatement|proposedSolution|impactAssessment|description)"\s*:/i.test(
-    text
-  );
-}
-var COMPLETION_REPAIR_INSTRUCTION = 'Your last message looked like a completion but I could NOT parse it as a valid JSON object with all required fields. Re-emit ONLY a single valid JSON object inside a ```json code fence \u2014 no other text \u2014 with every string value properly escaped (escape any internal double-quotes as \\" and any line breaks as \\n), and make sure title, problemStatement, proposedSolution, impactAssessment, and description are all present and non-empty:\n```json\n{"done": true, "title": "...", "problemStatement": "...", "proposedSolution": "...", "impactAssessment": "...", "description": "..."}\n```';
-var MAX_JSON_REPAIRS = 3;
-function sleep(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
-}
-async function waitForUserReply(client, machineToken, jobId, turnsSoFar) {
-  const deadline = Date.now() + REPLY_TIMEOUT_MS;
-  while (Date.now() < deadline) {
-    await sleep(REPLY_POLL_INTERVAL_MS);
-    const job = await client.nextJob(machineToken, 0);
-    if (job?.id !== jobId) continue;
-    const last = job.turns[job.turns.length - 1];
-    if (job.turns.length > turnsSoFar && last?.role === "user") {
-      return job;
-    }
-  }
-  return null;
-}
-async function invokeEpicRequestViaApi(job, ctx) {
-  const routing = await resolveRouting();
-  const anthropic = new Anthropic(anthropicClientOptions(ctx.anthropicApiKey, routing));
-  const seed = parseSeedPayload(job.payload);
-  const systemPrompt = resolveSystemPrompt(seed);
-  let currentErId = seed?.targetEpicRequestId ?? null;
-  let qualityRounds = 0;
-  let jsonRepairs = 0;
-  const messages = [];
-  for (const turn of job.turns) {
-    if (turn.role === "agent") {
-      messages.push({ role: "assistant", content: turn.content });
-    } else {
-      messages.push({ role: "user", content: await apiUserTurnContent(turn) });
-    }
-  }
-  let turnsSoFar = job.turns.length;
-  for (let i = 0; i < MAX_INTERVIEW_TURNS; i++) {
-    let reply;
-    try {
-      const response = await anthropic.messages.create({
-        model: ANTHROPIC_MODEL,
-        max_tokens: 1024,
-        system: systemPrompt,
-        messages: messages.length > 0 ? messages : [{ role: "user", content: "Let's get started." }]
-      });
-      const textBlock = response.content.find((b) => b.type === "text");
-      reply = textBlock?.type === "text" ? textBlock.text : "";
-    } catch (error) {
-      const message = error instanceof Error ? error.message : "Anthropic API request failed";
-      return { status: "failed", result: { error: `Agent invocation failed: ${message}` } };
-    }
-    const draft = extractCompletionJson(reply);
-    if (draft) {
-      let submitted;
-      try {
-        submitted = await submitAndScore(ctx, currentErId, draft);
-      } catch (error) {
-        const message = error instanceof Error ? error.message : "Failed to save the epic request";
-        return { status: "failed", result: { error: message } };
-      }
-      currentErId = submitted.erId;
-      const compliance = submitted.compliance;
-      if (meetsComplianceTarget(compliance) || qualityRounds >= MAX_QUALITY_ROUNDS) {
-        return { status: "done", result: { epicRequestId: currentErId } };
-      }
-      qualityRounds++;
-      if (compliance !== null) {
-        messages.push({ role: "assistant", content: reply });
-        messages.push({ role: "user", content: buildAuditFeedback(compliance) });
-      }
-      continue;
-    }
-    if (looksLikeCompletionAttempt(reply)) {
-      if (jsonRepairs >= MAX_JSON_REPAIRS) {
-        return {
-          status: "failed",
-          result: {
-            error: "The interview produced malformed completion data and could not be finalized after several attempts."
-          }
-        };
-      }
-      jsonRepairs++;
-      messages.push({ role: "assistant", content: reply });
-      messages.push({ role: "user", content: COMPLETION_REPAIR_INSTRUCTION });
-      continue;
-    }
-    messages.push({ role: "assistant", content: reply });
-    let updated;
-    try {
-      updated = await ctx.mailboxClient.postTurn(ctx.machineToken, job.id, reply);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : "post-turn failed";
-      return { status: "failed", result: { error: message } };
-    }
-    turnsSoFar = updated.turns.length;
-    const answered = await waitForUserReply(ctx.mailboxClient, ctx.machineToken, job.id, turnsSoFar);
-    if (!answered) {
-      return {
-        status: "failed",
-        result: { error: "Timed out waiting for a reply \u2014 no response within 10 minutes." }
-      };
-    }
-    const lastTurn = answered.turns[answered.turns.length - 1];
-    messages.push({
-      role: "user",
-      content: lastTurn ? await apiUserTurnContent(lastTurn) : ""
-    });
-    turnsSoFar = answered.turns.length;
-  }
-  return currentErId ? { status: "done", result: { epicRequestId: currentErId } } : {
-    status: "failed",
-    result: { error: `Interview did not converge after ${String(MAX_INTERVIEW_TURNS)} turns.` }
-  };
-}
 function claudeCliSessionCwd() {
-  const dir = join8(homedir4(), ".compbox", "claude-sessions");
+  const dir = join9(homedir5(), ".compbox", "claude-sessions");
   try {
-    mkdirSync4(dir, { recursive: true });
+    mkdirSync5(dir, { recursive: true });
   } catch {
   }
   return dir;
 }
 function runClaudeCliTurn(prompt, opts) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
+    const model = opts.model === void 0 ? ANTHROPIC_MODEL : opts.model;
     const args = [
       "-p",
       prompt,
-      "--model",
-      ANTHROPIC_MODEL,
+      ...model ? ["--model", model] : [],
       "--output-format",
       "json",
       "--tools",
@@ -7864,100 +8104,98 @@ function runClaudeCliTurn(prompt, opts) {
         reject(new Error("claude CLI returned an unexpected JSON shape (missing result/session_id)."));
         return;
       }
-      resolve2({ text: shaped.result, sessionId: shaped.session_id });
+      resolve3({ text: shaped.result, sessionId: shaped.session_id });
     });
   });
 }
-async function invokeEpicRequestViaSubscription(job, ctx) {
-  let sessionId;
-  let turnsSoFar = job.turns.length;
+async function loadSavedRequest(apiBaseUrl, userApiToken, epicRequestId) {
+  const res = await fetch(
+    `${apiBaseUrl.replace(/\/+$/, "")}/api/v1/epic-requests/${encodeURIComponent(epicRequestId)}`,
+    { headers: { Authorization: `Bearer ${userApiToken}` } }
+  );
+  if (!res.ok) return null;
+  const body = await res.json().catch(() => null);
+  return savedContextFromRecord(body?.data);
+}
+function needsDefaultModel(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return /requires usage credits|switch to another model|model.*not available|not have access to/i.test(message);
+}
+function savedRequestIdOf(job) {
+  const result = job.result;
+  if (typeof result?.epicRequestId === "string") return result.epicRequestId;
+  return parseSeedPayload(job.payload)?.targetEpicRequestId ?? null;
+}
+async function invokeEpicRequestStep(job, ctx) {
+  try {
+    return await takeConversationStep(job, ctx);
+  } catch (error) {
+    const reason = error instanceof Error ? error.message : "something went wrong";
+    await ctx.mailboxClient.postTurn(
+      ctx.machineToken,
+      job.id,
+      `I couldn't continue: ${reason}
+
+Send another message (for example "try again") and I'll pick up where we left off.`
+    );
+    return { status: "yield" };
+  }
+}
+async function takeConversationStep(job, ctx) {
   const routing = await resolveRouting();
-  const seed = parseSeedPayload(job.payload);
-  const systemPrompt = resolveSystemPrompt(seed);
-  let currentErId = seed?.targetEpicRequestId ?? null;
-  let qualityRounds = 0;
-  let jsonRepairs = 0;
-  let nextPrompt = job.turns.length > 0 ? job.turns.map(
-    (t) => t.role === "agent" ? `You asked: ${t.content}` : (
-      // ENG-153 (A4): subscription mode has no inline-image channel, so a
-      // user turn's images degrade to an explicit textual note.
-      `They replied: ${appendAttachmentNote(t.content, imageAttachmentCount(t.attachments))}`
-    )
-  ).join("\n") + "\n\nContinue the interview from exactly where this left off \u2014 ask the next question, or if you already have everything, respond with the completion JSON." : "Let's begin the interview.";
-  for (let i = 0; i < MAX_INTERVIEW_TURNS; i++) {
-    let turn;
-    try {
-      turn = await runClaudeCliTurn(nextPrompt, {
-        systemPrompt,
-        resumeSessionId: sessionId,
-        routing
-      });
-    } catch (error) {
-      const message = error instanceof Error ? error.message : "claude CLI invocation failed";
-      return { status: "failed", result: { error: `Agent invocation failed: ${message}` } };
-    }
-    sessionId = turn.sessionId;
-    const draft = extractCompletionJson(turn.text);
-    if (draft) {
-      let submitted;
-      try {
-        submitted = await submitAndScore(ctx, currentErId, draft);
-      } catch (error) {
-        const message = error instanceof Error ? error.message : "Failed to save the epic request";
-        return { status: "failed", result: { error: message } };
-      }
-      currentErId = submitted.erId;
-      const compliance = submitted.compliance;
-      if (meetsComplianceTarget(compliance) || qualityRounds >= MAX_QUALITY_ROUNDS) {
-        return { status: "done", result: { epicRequestId: currentErId } };
-      }
-      qualityRounds++;
-      if (compliance !== null) {
-        nextPrompt = buildAuditFeedback(compliance);
-      }
-      continue;
-    }
-    if (looksLikeCompletionAttempt(turn.text)) {
-      if (jsonRepairs >= MAX_JSON_REPAIRS) {
-        return {
-          status: "failed",
-          result: {
-            error: "The interview produced malformed completion data and could not be finalized after several attempts."
-          }
-        };
+  const requestId = savedRequestIdOf(job);
+  const saved = requestId ? await loadSavedRequest(ctx.apiBaseUrl, ctx.userApiToken, requestId) : null;
+  const turns = job.turns.map((t) => ({
+    role: t.role,
+    content: t.role === "user" ? appendAttachmentNote(t.content, imageAttachmentCount(t.attachments)) : t.content
+  }));
+  const anthropic = ctx.anthropicApiKey ? new Anthropic(anthropicClientOptions(ctx.anthropicApiKey, routing)) : null;
+  let cliModel = ANTHROPIC_MODEL;
+  const outcome = await runConversationStep(
+    { turns, saved },
+    {
+      reply: async (system, messages) => {
+        if (anthropic) {
+          const response = await anthropic.messages.create({ model: ANTHROPIC_MODEL, max_tokens: 4096, system, messages });
+          const text = response.content.find((b) => b.type === "text");
+          return text?.type === "text" ? text.text : "";
+        }
+        const prompt = renderConversationPrompt(messages);
+        try {
+          return (await runClaudeCliTurn(prompt, { systemPrompt: system, resumeSessionId: void 0, routing, model: cliModel })).text;
+        } catch (error) {
+          if (cliModel === null || !needsDefaultModel(error)) throw error;
+          cliModel = null;
+          return (await runClaudeCliTurn(prompt, { systemPrompt: system, resumeSessionId: void 0, routing, model: null })).text;
+        }
+      },
+      save: async (existingId, draft) => {
+        const submitted = await submitAndScore(ctx, existingId, draft);
+        return { id: submitted.erId, title: draft.title, compliance: submitted.compliance };
       }
-      jsonRepairs++;
-      nextPrompt = COMPLETION_REPAIR_INSTRUCTION;
-      continue;
-    }
-    let updated;
-    try {
-      updated = await ctx.mailboxClient.postTurn(ctx.machineToken, job.id, turn.text);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : "post-turn failed";
-      return { status: "failed", result: { error: message } };
     }
-    turnsSoFar = updated.turns.length;
-    const answered = await waitForUserReply(ctx.mailboxClient, ctx.machineToken, job.id, turnsSoFar);
-    if (!answered) {
-      return {
-        status: "failed",
-        result: { error: "Timed out waiting for a reply \u2014 no response within 10 minutes." }
-      };
-    }
-    const lastTurn = answered.turns[answered.turns.length - 1];
-    nextPrompt = lastTurn ? appendAttachmentNote(lastTurn.content, imageAttachmentCount(lastTurn.attachments)) : "";
-    turnsSoFar = answered.turns.length;
+  );
+  if (outcome.kind === "saved") {
+    await ctx.mailboxClient.markRequestSaved(ctx.machineToken, job.id, outcome.saved.id);
   }
-  return currentErId ? { status: "done", result: { epicRequestId: currentErId } } : {
-    status: "failed",
-    result: { error: `Interview did not converge after ${String(MAX_INTERVIEW_TURNS)} turns.` }
-  };
+  await ctx.mailboxClient.postTurn(ctx.machineToken, job.id, outcome.text);
+  return { status: "yield" };
 }
 var PLANNER_RUN_TIMEOUT_MS = 30 * 60 * 1e3;
 var PLANNER_HEARTBEAT_INTERVAL_MS = 20 * 1e3;
 var PLANNER_FINAL_TURN_MAX_CHARS = 4e3;
 var ORCHESTRATOR_REVIEW_MARKER = "COMPBOX_NEEDS_HUMAN_REVIEW";
+function takeKeyRunResult(ctx, keyRun, stdout2) {
+  const parsed = parseClaudeJsonResult(stdout2, keyRun.model);
+  if (!parsed) return { text: stdout2, reported: Promise.resolve() };
+  const reported = ctx.mailboxClient.reportAiUsage(ctx.machineToken, ctx.jobId, parsed.usage).catch(() => void 0);
+  return { text: parsed.text, reported };
+}
+async function settleKeyRun(ctx, keyRun, stdout2) {
+  const { text, reported } = takeKeyRunResult(ctx, keyRun, stdout2);
+  await reported;
+  return text;
+}
 function buildPlannerArgs(epicRequestId) {
   return [
     "-p",
@@ -8078,13 +8316,14 @@ async function invokeStartExecutionPlan(ctx, deps = {}) {
   }
   const routing = await resolveRoutingImpl();
   const command = resolveClaudeBinary() ?? "claude";
-  const args = buildPlannerArgs(ctx.epicRequestId);
+  const args = ctx.keyRun ? keyRunArgs(buildPlannerArgs(ctx.epicRequestId)) : buildPlannerArgs(ctx.epicRequestId);
   const routedEnv = claudeSpawnEnv(process.env, routing);
-  const childEnv = {
+  const baseEnv = {
     ...routedEnv,
     COMPBOX_NONINTERACTIVE: "1",
     PATH: claudeChildEnvPath(routedEnv.PATH)
   };
+  const childEnv = ctx.keyRun ? keyRunEnv(baseEnv, ctx.keyRun) : baseEnv;
   try {
     await ctx.mailboxClient.postTurn(
       ctx.machineToken,
@@ -8093,7 +8332,7 @@ async function invokeStartExecutionPlan(ctx, deps = {}) {
     );
   } catch {
   }
-  const outcome = await new Promise((resolve2) => {
+  const outcome = await new Promise((resolve3) => {
     let stdout2 = "";
     let stderr = "";
     let settled = false;
@@ -8111,7 +8350,7 @@ async function invokeStartExecutionPlan(ctx, deps = {}) {
       settled = true;
       if (heartbeatTimer) clearInterval(heartbeatTimer);
       clearTimeout(timer);
-      resolve2(result);
+      resolve3(result);
     };
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
@@ -8138,6 +8377,7 @@ async function invokeStartExecutionPlan(ctx, deps = {}) {
     });
     child.on("close", (code) => {
       void (async () => {
+        if (ctx.keyRun) stdout2 = await settleKeyRun(ctx, ctx.keyRun, stdout2);
         const combined = `${stdout2}
 ${stderr}`;
         const review = detectNeedsHumanReview(combined);
@@ -8248,6 +8488,13 @@ function defaultToolchainPresent(_dir) {
   }
   return false;
 }
+function describeRunBranch(finish) {
+  if (finish.prUrl) return `Pull request: ${finish.prUrl}`;
+  if (finish.compareUrl) return `Branch ${finish.branch} was pushed. Open the pull request here: ${finish.compareUrl}`;
+  if (finish.commits === 0) return "No code changes were made.";
+  if (finish.pushed) return `Branch ${finish.branch} was pushed.`;
+  return `The work is on branch ${finish.branch}${finish.keptWorktree ? ` (in ${finish.keptWorktree})` : ""}.`;
+}
 function markerString(marker, key) {
   const v = marker?.[key];
   return typeof v === "string" && v.length > 0 ? v : void 0;
@@ -8289,29 +8536,41 @@ async function invokeStartExecutionOrchestrate(ctx, deps = {}) {
   if (!toolchainPresent(projectDir)) {
     return { status: "failed", result: { error: toolchainMissingMessage(projectDir) } };
   }
+  let workspace = null;
+  let workspaceNotes = [];
+  if (deps.workspace) {
+    const prepared = await deps.workspace.prepare(projectDir, ctx.epicId);
+    if (!prepared.ok) {
+      return { status: "failed", result: { error: prepared.error } };
+    }
+    workspace = prepared.workspace;
+    workspaceNotes = prepared.notes;
+  }
+  const runDir = workspace?.dir ?? projectDir;
   const routing = await resolveRoutingImpl();
   const command = resolveClaudeBinary() ?? "claude";
-  const args = buildOrchestratorArgs(ctx.epicId);
+  const args = ctx.keyRun ? keyRunArgs(buildOrchestratorArgs(ctx.epicId)) : buildOrchestratorArgs(ctx.epicId);
   const routedEnv = claudeSpawnEnv(process.env, routing);
-  const childEnv = {
+  const baseEnv = {
     ...routedEnv,
     COMPBOX_NONINTERACTIVE: "1",
     PATH: claudeChildEnvPath(routedEnv.PATH)
   };
+  const childEnv = ctx.keyRun ? keyRunEnv(baseEnv, ctx.keyRun) : baseEnv;
   try {
     await ctx.mailboxClient.postTurn(
       ctx.machineToken,
       ctx.jobId,
-      `Started the orchestrator for epic ${ctx.epicId} (headless, non-interactive). This executes the full epic \u2014 every phase and feature \u2014 and may take a long time.`
+      `Started the orchestrator for epic ${ctx.epicId} (headless, non-interactive). This executes the full epic \u2014 every phase and feature \u2014 and may take a long time.` + (workspace ? ` Working on a new branch, ${workspace.branch}, which will end as a pull request into ${workspace.baseBranch}.` : "") + (workspaceNotes.length > 0 ? ` Note: ${workspaceNotes.join(" ")}` : "")
     );
   } catch {
   }
-  const outcome = await new Promise((resolve2) => {
+  const outcome = await new Promise((resolve3) => {
     let stdout2 = "";
     let stderr = "";
     let settled = false;
     const child = spawnImpl(command, args, {
-      cwd: projectDir,
+      cwd: runDir,
       stdio: ["ignore", "pipe", "pipe"],
       env: childEnv
     });
@@ -8324,7 +8583,7 @@ async function invokeStartExecutionOrchestrate(ctx, deps = {}) {
       settled = true;
       if (heartbeatTimer) clearInterval(heartbeatTimer);
       clearTimeout(timer);
-      resolve2(result);
+      resolve3(result);
     };
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
@@ -8350,6 +8609,7 @@ async function invokeStartExecutionOrchestrate(ctx, deps = {}) {
       });
     });
     child.on("close", (code) => {
+      if (ctx.keyRun) stdout2 = takeKeyRunResult(ctx, ctx.keyRun, stdout2).text;
       const combined = `${stdout2}
 ${stderr}`;
       const review = detectNeedsHumanReview(combined);
@@ -8372,8 +8632,31 @@ ${stderr}`;
       finish({ status: "done", result: { epicId: ctx.epicId } });
     });
   });
+  let branchLine = "";
+  if (deps.workspace && workspace) {
+    const resultError = outcome.result;
+    const stopReason = typeof resultError.message === "string" ? resultError.message : typeof resultError.error === "string" ? resultError.error.split("\n")[0] : void 0;
+    const finished = await deps.workspace.finish({
+      workspace,
+      epicId: ctx.epicId,
+      jobId: ctx.jobId,
+      completed: outcome.status === "done",
+      ...stopReason ? { stopReason } : {}
+    });
+    branchLine = describeRunBranch(finished);
+    outcome.result = {
+      ...outcome.result,
+      branch: finished.branch,
+      commits: finished.commits,
+      pushed: finished.pushed,
+      ...finished.prUrl ? { prUrl: finished.prUrl } : {},
+      ...finished.compareUrl ? { compareUrl: finished.compareUrl } : {},
+      ...finished.notes.length > 0 ? { branchNotes: finished.notes } : {}
+    };
+  }
   try {
-    const summary = outcome.status === "done" ? `Execution complete \u2014 epic ${ctx.epicId} finished all phases.` : `Orchestrator run ended: ${JSON.stringify(outcome.result).slice(0, ORCHESTRATOR_FINAL_TURN_MAX_CHARS)}`;
+    const summary = (outcome.status === "done" ? `Execution complete \u2014 epic ${ctx.epicId} finished all phases.` : `Orchestrator run ended: ${JSON.stringify(outcome.result).slice(0, ORCHESTRATOR_FINAL_TURN_MAX_CHARS)}`) + (branchLine ? `
+${branchLine}` : "");
     await ctx.mailboxClient.postTurn(ctx.machineToken, ctx.jobId, summary);
   } catch {
   }
@@ -8462,14 +8745,419 @@ async function updatePersonalEpicRequest(apiBaseUrl, userApiToken, epicRequestId
   return parseComplianceFromData(data?.data);
 }
 
+// src/utils/run-workspace.ts
+import { spawn as spawn4 } from "node:child_process";
+import { copyFileSync, existsSync as existsSync9, mkdirSync as mkdirSync6 } from "node:fs";
+import { basename as basename2, dirname as dirname4, join as join10 } from "node:path";
+var RUN_PUSH_ENV = "COMPBOX_RUN_PUSH";
+var INSTALL_TIMEOUT_MS = 20 * 60 * 1e3;
+var GIT_TIMEOUT_MS = 5 * 60 * 1e3;
+var defaultCommandRunner = (command, args, cwd) => new Promise((resolve3) => {
+  let stdout2 = "";
+  let stderr = "";
+  let settled = false;
+  const done = (result) => {
+    if (settled) return;
+    settled = true;
+    clearTimeout(timer);
+    resolve3(result);
+  };
+  const child = spawn4(command, args, {
+    cwd,
+    stdio: ["ignore", "pipe", "pipe"],
+    env: { ...process.env, PATH: claudeChildEnvPath(process.env.PATH), GIT_TERMINAL_PROMPT: "0" }
+  });
+  const timer = setTimeout(
+    () => {
+      child.kill("SIGKILL");
+      done({ status: 1, stdout: stdout2, stderr: `${command} timed out` });
+    },
+    command === "git" || command === "gh" ? GIT_TIMEOUT_MS : INSTALL_TIMEOUT_MS
+  );
+  child.stdout.on("data", (chunk) => {
+    stdout2 += chunk.toString("utf-8");
+  });
+  child.stderr.on("data", (chunk) => {
+    stderr += chunk.toString("utf-8");
+  });
+  child.on("error", (error) => {
+    done({ status: 1, stdout: stdout2, stderr: error.message });
+  });
+  child.on("close", (code) => {
+    done({ status: code ?? 1, stdout: stdout2, stderr });
+  });
+});
+function isLocalConfigFile(path3) {
+  if (path3.split("/").includes("node_modules")) return false;
+  const name = basename2(path3);
+  return name === ".mcp.json" || name === "CLAUDE.local.md" || path3 === ".claude/settings.local.json" || name === ".env" || name.startsWith(".env.") && !name.endsWith(".example") && !name.endsWith(".sample");
+}
+function slugForBranch(value) {
+  return value.replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40) || "run";
+}
+function stamp(now) {
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${String(now.getFullYear())}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
+}
+function firstLine(text) {
+  return text.trim().split("\n")[0] ?? "";
+}
+function installCommand2(dir, exists = existsSync9) {
+  if (exists(join10(dir, "pnpm-lock.yaml"))) return ["pnpm", ["install", "--frozen-lockfile", "--prefer-offline"]];
+  if (exists(join10(dir, "package-lock.json"))) return ["npm", ["ci", "--prefer-offline"]];
+  if (exists(join10(dir, "yarn.lock"))) return ["yarn", ["install", "--frozen-lockfile"]];
+  return null;
+}
+function githubCompareUrl(remoteUrl, baseBranch, branch) {
+  const m = /^https?:\/\/(?:[^@/]+@)?github\.com\/([^/]+)\/(.+?)(?:\.git)?\/?$/.exec(remoteUrl.trim()) ?? /^(?:ssh:\/\/)?git@github\.com[:/]([^/]+)\/(.+?)(?:\.git)?\/?$/.exec(remoteUrl.trim());
+  if (!m) return null;
+  return `https://github.com/${m[1] ?? ""}/${m[2] ?? ""}/compare/${encodeURIComponent(baseBranch)}...${encodeURIComponent(branch)}?expand=1`;
+}
+var repoQueues = /* @__PURE__ */ new Map();
+function withRepoLock(projectDir, task) {
+  const previous = repoQueues.get(projectDir) ?? Promise.resolve();
+  const result = previous.catch(() => void 0).then(task);
+  const tail = result.catch(() => void 0);
+  repoQueues.set(projectDir, tail);
+  void tail.then(() => {
+    if (repoQueues.get(projectDir) === tail) repoQueues.delete(projectDir);
+  });
+  return result;
+}
+var RunWorkspaceManager = class {
+  run;
+  now;
+  runsRoot;
+  exists;
+  copyFile;
+  env;
+  constructor(deps = {}) {
+    this.run = deps.run ?? defaultCommandRunner;
+    this.now = deps.now ?? (() => /* @__PURE__ */ new Date());
+    this.runsRoot = deps.runsRoot ?? join10(getConfigDir(), "runs");
+    this.exists = deps.exists ?? existsSync9;
+    this.copyFile = deps.copyFile ?? ((from, to) => {
+      mkdirSync6(dirname4(to), { recursive: true });
+      copyFileSync(from, to);
+    });
+    this.env = deps.env ?? process.env;
+  }
+  git(args, cwd) {
+    return this.run("git", args, cwd);
+  }
+  /** Creates the branch + worktree for a run. Never touches the person's checkout. */
+  async prepare(projectDir, epicId) {
+    const created = await withRepoLock(projectDir, () => this.createWorktree(projectDir, epicId));
+    if (!created.ok) return created;
+    const { workspace, notes } = created;
+    const { dir, branch } = workspace;
+    const install = installCommand2(dir, this.exists);
+    if (install) {
+      const [command, args] = install;
+      const res = await this.run(command, args, dir);
+      if (res.status !== 0) {
+        await withRepoLock(projectDir, async () => {
+          await this.git(["worktree", "remove", "--force", dir], projectDir);
+          await this.git(["branch", "-D", branch], projectDir);
+        });
+        return {
+          ok: false,
+          error: [
+            `Installing the project's dependencies failed (${command} ${args.join(" ")}): ${firstLine(res.stderr) || firstLine(res.stdout) || "unknown error"}`,
+            "The run was not started. Check that the same command works in your project folder."
+          ].join("\n")
+        };
+      }
+    }
+    return { ok: true, workspace, notes };
+  }
+  async createWorktree(projectDir, epicId) {
+    const notes = [];
+    const remotes = (await this.git(["remote"], projectDir)).stdout.split("\n").map((r) => r.trim()).filter(Boolean);
+    const remote = remotes.includes("origin") ? "origin" : remotes[0] ?? null;
+    let baseBranch = "";
+    let baseRef = "HEAD";
+    if (remote) {
+      if ((await this.git(["fetch", remote, "--quiet"], projectDir)).status !== 0) {
+        notes.push(`Couldn't fetch from ${remote}, so the run starts from the last fetched copy.`);
+      }
+      const head = await this.git(["symbolic-ref", "--quiet", "--short", `refs/remotes/${remote}/HEAD`], projectDir);
+      if (head.status === 0 && head.stdout.trim().startsWith(`${remote}/`)) {
+        baseBranch = head.stdout.trim().slice(remote.length + 1);
+      } else {
+        for (const candidate of ["main", "master"]) {
+          if ((await this.git(["rev-parse", "--verify", "--quiet", `${remote}/${candidate}`], projectDir)).status === 0) {
+            baseBranch = candidate;
+            break;
+          }
+        }
+      }
+      if (baseBranch) baseRef = `${remote}/${baseBranch}`;
+    }
+    if (!baseBranch) {
+      baseBranch = (await this.git(["rev-parse", "--abbrev-ref", "HEAD"], projectDir)).stdout.trim() || "main";
+      baseRef = "HEAD";
+    }
+    const when = stamp(this.now());
+    const branch = `compbox/epic-${slugForBranch(epicId)}-${when}`;
+    const dir = join10(this.runsRoot, `${slugForBranch(basename2(projectDir))}-${slugForBranch(epicId)}-${when}`);
+    mkdirSync6(this.runsRoot, { recursive: true });
+    const add = await this.git(["worktree", "add", "-b", branch, dir, baseRef], projectDir);
+    if (add.status !== 0) {
+      return {
+        ok: false,
+        error: [
+          `Couldn't create a separate workspace for this run (git worktree add failed): ${firstLine(add.stderr) || "unknown error"}`,
+          "The run was not started, and your project folder was not changed."
+        ].join("\n")
+      };
+    }
+    const ignored = await this.git(["ls-files", "--others", "--ignored", "--exclude-standard", "--directory"], projectDir);
+    const untracked = await this.git(["ls-files", "--others", "--exclude-standard"], projectDir);
+    const candidates = new Set(
+      `${ignored.stdout}
+${untracked.stdout}`.split("\n").map((p) => p.trim()).filter((p) => p && !p.endsWith("/"))
+    );
+    for (const path3 of candidates) {
+      if (!isLocalConfigFile(path3)) continue;
+      try {
+        this.copyFile(join10(projectDir, path3), join10(dir, path3));
+      } catch {
+        notes.push(`Couldn't copy ${path3} into the run workspace.`);
+      }
+    }
+    return { ok: true, workspace: { dir, projectDir, branch, baseRef, baseBranch, remote }, notes };
+  }
+  /** Commits, pushes and opens the pull request; then cleans up the worktree. */
+  finish(input) {
+    return withRepoLock(input.workspace.projectDir, () => this.finishLocked(input));
+  }
+  async finishLocked(input) {
+    const { workspace: ws } = input;
+    const notes = [];
+    if ((await this.git(["status", "--porcelain"], ws.dir)).stdout.trim()) {
+      await this.git(["add", "-A"], ws.dir);
+      const commit = await this.git(
+        ["commit", "-m", `chore(compbox): save work left uncommitted by the orchestrator (epic ${input.epicId})`],
+        ws.dir
+      );
+      if (commit.status !== 0) {
+        notes.push(`Couldn't commit the remaining changes: ${firstLine(commit.stderr) || firstLine(commit.stdout)}`);
+      }
+    }
+    const commits = Number.parseInt((await this.git(["rev-list", "--count", `${ws.baseRef}..HEAD`], ws.dir)).stdout.trim(), 10) || 0;
+    const base = { branch: ws.branch, commits, pushed: false, notes };
+    if (commits === 0) {
+      await this.git(["worktree", "remove", "--force", ws.dir], ws.projectDir);
+      await this.git(["branch", "-D", ws.branch], ws.projectDir);
+      notes.push("The run made no code changes, so there is nothing to review.");
+      return base;
+    }
+    if (!ws.remote || this.env[RUN_PUSH_ENV] === "0") {
+      await this.git(["worktree", "remove", "--force", ws.dir], ws.projectDir);
+      notes.push(
+        ws.remote ? `Pushing is turned off (${RUN_PUSH_ENV}=0). The work is on the local branch ${ws.branch}.` : `The repository has no remote, so the work is on the local branch ${ws.branch}.`
+      );
+      return base;
+    }
+    const push = await this.git(["push", "--set-upstream", ws.remote, ws.branch], ws.dir);
+    if (push.status !== 0) {
+      notes.push(
+        `Couldn't push the branch to ${ws.remote}: ${firstLine(push.stderr) || "unknown error"}. The work is safe in ${ws.dir} on branch ${ws.branch}.`
+      );
+      return { ...base, keptWorktree: ws.dir };
+    }
+    const title = `CompBox: epic ${input.epicId}${input.completed ? "" : " (stopped early, needs review)"}`;
+    const body = [
+      `Code written by the CompBox orchestrator for epic **${input.epicId}** (job \`${input.jobId}\`).`,
+      "",
+      input.completed ? "The orchestrator finished every phase. Review the changes, check that CI passes, then merge." : `The orchestrator stopped before finishing${input.stopReason ? `: ${input.stopReason}` : "."} This is a draft so the partial work can be reviewed.`,
+      "",
+      `${String(commits)} commit${commits === 1 ? "" : "s"} on \`${ws.branch}\`, based on \`${ws.baseBranch}\`.`
+    ].join("\n");
+    const prArgs = ["pr", "create", "--base", ws.baseBranch, "--head", ws.branch, "--title", title, "--body", body];
+    if (!input.completed) prArgs.push("--draft");
+    const pr = await this.run("gh", prArgs, ws.dir);
+    const prUrl = pr.status === 0 ? /https:\/\/\S+/.exec(pr.stdout)?.[0] : void 0;
+    let compareUrl;
+    if (!prUrl) {
+      const remoteUrl = (await this.git(["remote", "get-url", ws.remote], ws.dir)).stdout.trim();
+      compareUrl = githubCompareUrl(remoteUrl, ws.baseBranch, ws.branch) ?? void 0;
+      notes.push(
+        `The branch was pushed, but the pull request couldn't be opened automatically${firstLine(pr.stderr) ? ` (${firstLine(pr.stderr)})` : ""}.` + (compareUrl ? " Use the link to open it." : ` Open a pull request for ${ws.branch} on your git host.`)
+      );
+    }
+    await this.git(["worktree", "remove", "--force", ws.dir], ws.projectDir);
+    return { ...base, pushed: true, ...prUrl ? { prUrl } : {}, ...compareUrl ? { compareUrl } : {} };
+  }
+};
+
+// src/utils/repo-setup.ts
+import { spawn as spawn5 } from "node:child_process";
+import { existsSync as existsSync10, mkdirSync as mkdirSync7, readdirSync } from "node:fs";
+import { homedir as homedir6 } from "node:os";
+import { dirname as dirname5, isAbsolute as isAbsolute2, join as join11, resolve as resolve2 } from "node:path";
+var CLONE_TIMEOUT_MS = 15 * 60 * 1e3;
+var defaultGitCloner = (url, target) => new Promise((done) => {
+  let stderr = "";
+  const child = spawn5("git", ["clone", "--quiet", url, target], {
+    stdio: ["ignore", "ignore", "pipe"],
+    // Never hang on a username/password prompt: fail and explain instead.
+    env: { ...process.env, PATH: claudeChildEnvPath(process.env.PATH), GIT_TERMINAL_PROMPT: "0" }
+  });
+  const timer = setTimeout(() => {
+    child.kill("SIGKILL");
+    stderr += "git clone timed out";
+  }, CLONE_TIMEOUT_MS);
+  child.stderr.on("data", (chunk) => {
+    stderr += chunk.toString("utf-8");
+  });
+  child.on("error", (error) => {
+    clearTimeout(timer);
+    done({ status: 1, stderr: error.message });
+  });
+  child.on("close", (code) => {
+    clearTimeout(timer);
+    done({ status: code ?? 1, stderr });
+  });
+});
+function repoFolderName(remote) {
+  const last = remote.replace(/\/+$/, "").split("/").pop() ?? "";
+  return last.replace(/[^A-Za-z0-9._-]+/g, "-") || "project";
+}
+function resolveFolder(folder, home) {
+  const trimmed = folder.trim();
+  if (trimmed === "~") return home;
+  if (trimmed.startsWith("~/")) return join11(home, trimmed.slice(2));
+  return isAbsolute2(trimmed) ? resolve2(trimmed) : join11(home, trimmed);
+}
+function cloneUrls(remote) {
+  const urls = [`${remote}.git`];
+  const gh = /^https:\/\/github\.com\/([^/]+)\/([^/]+)$/.exec(remote);
+  if (gh) urls.push(`git@github.com:${gh[1] ?? ""}/${gh[2] ?? ""}.git`);
+  return urls;
+}
+function parsePayload(payload) {
+  if (typeof payload !== "object" || payload === null) return null;
+  const p = payload;
+  if (typeof p.teamId !== "string" || typeof p.projectRemote !== "string") return null;
+  if (!p.projectRemote.startsWith("https://")) return null;
+  return {
+    teamId: p.teamId,
+    projectRemote: p.projectRemote,
+    ...typeof p.folder === "string" ? { folder: p.folder } : {},
+    ...typeof p.projectName === "string" ? { projectName: p.projectName } : {}
+  };
+}
+function firstLine2(text) {
+  return text.trim().split("\n").filter(Boolean).pop() ?? "";
+}
+async function invokeConnectRepo(payload, deps = {}) {
+  const clone = deps.clone ?? defaultGitCloner;
+  const home = deps.home ?? homedir6();
+  const exists = deps.exists ?? existsSync10;
+  const isEmptyDir = deps.isEmptyDir ?? ((path3) => {
+    try {
+      return readdirSync(path3).length === 0;
+    } catch {
+      return false;
+    }
+  });
+  const isGitRepo = deps.isGitRepo ?? isGitRepoDir;
+  const readOrigin = deps.readOrigin ?? readOriginRemote;
+  const listDirs = deps.listDirs ?? listProjectDirs;
+  const addDir = deps.addDir ?? ((path3) => addProjectDir(path3));
+  const mkdir2 = deps.mkdir ?? ((path3) => void mkdirSync7(path3, { recursive: true }));
+  const p = parsePayload(payload);
+  if (!p) {
+    return { status: "failed", result: { error: "The job was missing the project repository. Try again from the project page." } };
+  }
+  const remote = normalizeGitRemote(p.projectRemote);
+  const name = p.projectName ?? repoFolderName(remote);
+  const existing = listDirs().find((entry) => entry.remote === remote && exists(entry.path));
+  if (existing) {
+    return {
+      status: "done",
+      result: { path: existing.path, remote, outcome: "already_set_up", message: `${name} is already set up on this computer at ${existing.path}.` }
+    };
+  }
+  const target = resolveFolder(p.folder ?? join11("CompBox", repoFolderName(remote)), home);
+  try {
+    if (exists(target) && !isEmptyDir(target)) {
+      let origin = "";
+      try {
+        origin = isGitRepo(target) ? normalizeGitRemote(readOrigin(target)) : "";
+      } catch {
+        origin = "";
+      }
+      if (origin !== remote) {
+        return {
+          status: "failed",
+          result: {
+            error: `The folder ${target} already exists and isn't a copy of ${remote}. Choose a different folder and try again.`
+          }
+        };
+      }
+      const entry2 = addDir(target);
+      return {
+        status: "done",
+        result: { path: entry2.path, remote, outcome: "adopted", message: `Found an existing copy of ${name} at ${entry2.path} and set it up.` }
+      };
+    }
+    mkdir2(dirname5(target));
+    const errors = [];
+    let cloned = false;
+    for (const url of cloneUrls(remote)) {
+      const res = await clone(url, target);
+      if (res.status === 0) {
+        cloned = true;
+        break;
+      }
+      errors.push(firstLine2(res.stderr));
+    }
+    if (!cloned) {
+      return {
+        status: "failed",
+        result: {
+          error: [
+            `This computer couldn't download ${remote}: ${errors.filter(Boolean).join(" / ") || "unknown error"}.`,
+            "Make sure this computer can access the repository, for example by signing in with `gh auth login` or adding an SSH key to your Git account, then try again."
+          ].join(" ")
+        }
+      };
+    }
+    const entry = addDir(target);
+    return {
+      status: "done",
+      result: { path: entry.path, remote, outcome: "cloned", message: `Downloaded ${name} to ${entry.path} and set it up.` }
+    };
+  } catch (error) {
+    return {
+      status: "failed",
+      result: { error: `Setting up ${name} failed: ${error instanceof Error ? error.message : String(error)}` }
+    };
+  }
+}
+
 // src/commands/run.ts
 var POLL_WAIT_MS = 0;
 var IDLE_POLL_INTERVAL_MS = 15e3;
 var ACTIVE_POLL_INTERVAL_MS = 2e3;
 var ACTIVE_WINDOW_MS = 6e4;
-function idleDelay(now, lastJobAt) {
+var CONVERSATION_POLL_INTERVAL_MS = 3e3;
+var CONVERSATION_WINDOW_MS = 10 * 6e4;
+function idleDelay(now, lastJobAt, lastConversationAt = 0) {
   const warm = lastJobAt > 0 && now - lastJobAt < ACTIVE_WINDOW_MS;
-  return warm ? ACTIVE_POLL_INTERVAL_MS : IDLE_POLL_INTERVAL_MS;
+  if (warm) return ACTIVE_POLL_INTERVAL_MS;
+  const talking = lastConversationAt > 0 && now - lastConversationAt < CONVERSATION_WINDOW_MS;
+  return talking ? CONVERSATION_POLL_INTERVAL_MS : IDLE_POLL_INTERVAL_MS;
+}
+var DEFAULT_MAX_PARALLEL_JOBS = 3;
+var MAX_JOBS_ENV = "COMPBOX_MAX_JOBS";
+function maxParallelJobs(env = process.env) {
+  const raw = Number.parseInt(env[MAX_JOBS_ENV] ?? "", 10);
+  if (!Number.isFinite(raw) || raw < 1) return DEFAULT_MAX_PARALLEL_JOBS;
+  return Math.min(raw, 10);
 }
 var BACKOFF_BASE_MS = 1e3;
 var BACKOFF_MAX_MS = 3e4;
@@ -8477,8 +9165,8 @@ var HEARTBEAT_INTERVAL_MS = 2e4;
 function runtimeHeartbeatDue(nowMs, lastRuntimeSentMs, intervalMs = HEARTBEAT_INTERVAL_MS) {
   return nowMs - lastRuntimeSentMs >= intervalMs;
 }
-function sleep2(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+function sleep(ms) {
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 function backoffDelay(consecutiveErrors) {
   return Math.min(BACKOFF_MAX_MS, BACKOFF_BASE_MS * 2 ** (consecutiveErrors - 1));
@@ -8523,11 +9211,12 @@ function parseStartExecutionPayload(payload) {
   const p = parsed;
   if (!START_EXECUTION_KINDS.includes(p.kind)) return null;
   const projectRemote = typeof p.projectRemote === "string" && p.projectRemote.length > 0 ? p.projectRemote : void 0;
+  const useAiKey = p.useAiKey === true;
   if (p.kind === "plan" && typeof p.epicRequestId === "string" && p.epicRequestId.length > 0) {
-    return { kind: "plan", epicRequestId: p.epicRequestId, ...projectRemote && { projectRemote } };
+    return { kind: "plan", epicRequestId: p.epicRequestId, ...projectRemote && { projectRemote }, ...useAiKey && { useAiKey } };
   }
   if (p.kind === "orchestrate" && typeof p.epicId === "string" && p.epicId.length > 0) {
-    return { kind: "orchestrate", epicId: p.epicId, ...projectRemote && { projectRemote } };
+    return { kind: "orchestrate", epicId: p.epicId, ...projectRemote && { projectRemote }, ...useAiKey && { useAiKey } };
   }
   return null;
 }
@@ -8550,6 +9239,18 @@ async function handleStartExecution(ctx, job) {
     return;
   }
   const jobProjectDir = routed.status === "registered" || routed.status === "fallback" ? routed.path : void 0;
+  let keyRun;
+  if (payload.useAiKey) {
+    try {
+      const key = await ctx.client.getAiKey(ctx.machineToken, job.id);
+      keyRun = { apiKey: key.apiKey, model: key.model };
+      console.log(chalk9.gray(`  Running on your saved API key (${key.provider}, ${key.model}).`));
+    } catch (error) {
+      const message = error instanceof MailboxClientError ? error.message : "the key request failed";
+      await completeWithFailure(ctx, job, `Couldn't get your saved API key from CompBox (${message}). Check Settings \u2192 AI, or run with this computer's own sign-in.`);
+      return;
+    }
+  }
   if (payload.kind === "plan") {
     const userApiToken2 = ctx.userApiToken;
     if (!userApiToken2) {
@@ -8572,7 +9273,8 @@ async function handleStartExecution(ctx, job) {
           apiBaseUrl: ctx.apiBaseUrl,
           userApiToken: userApiToken2,
           epicRequestId: payload.epicRequestId,
-          projectDir: jobProjectDir
+          projectDir: jobProjectDir,
+          ...keyRun && { keyRun }
         },
         {
           // H4: keep this machine online during the long planner run — the poll
@@ -8602,12 +9304,15 @@ async function handleStartExecution(ctx, job) {
         machineToken: ctx.machineToken,
         jobId: job.id,
         epicId: payload.epicId,
-        projectDir: jobProjectDir
+        projectDir: jobProjectDir,
+        ...keyRun && { keyRun }
       },
       {
         // H4: keep this machine online during the long orchestrator run — the
         // poll loop (its own heartbeat) is blocked for the whole job.
-        heartbeat: () => ctx.client.heartbeat(ctx.machineToken).catch(() => void 0)
+        heartbeat: () => ctx.client.heartbeat(ctx.machineToken).catch(() => void 0),
+        // Own branch + worktree per run, finishing with a pull request.
+        workspace: new RunWorkspaceManager()
       }
     )
   );
@@ -8615,6 +9320,10 @@ async function handleStartExecution(ctx, job) {
 async function runInvokerAndComplete(ctx, job, invoke) {
   try {
     const outcome = await invoke();
+    if (outcome.status === "yield") {
+      console.log(chalk9.gray(`  Job ${job.id}: replied; waiting for the person.`));
+      return;
+    }
     await ctx.client.completeJob(ctx.machineToken, job.id, outcome.status, outcome.result);
     console.log(
       outcome.status === "done" ? chalk9.green(`  Job ${job.id} completed: ${JSON.stringify(outcome.result)}`) : chalk9.yellow(`  Job ${job.id} failed: ${JSON.stringify(outcome.result)}`)
@@ -8639,42 +9348,38 @@ async function handleJob(ctx, job) {
 \u2192 Claimed job ${job.id} (type: ${job.type}, status: ${job.status})`)
   );
   const userApiToken = ctx.userApiToken;
-  const isEpicRequest = job.type === "epic_request" && !!userApiToken;
-  if (isEpicRequest && userApiToken) {
+  if (job.type === "epic_request" && userApiToken) {
+    let anthropicApiKey;
     if (ctx.aiMode === "api-key") {
-      const { value: anthropicApiKey } = await retrieveSecret(AI_KEY_ACCOUNT);
-      if (anthropicApiKey) {
-        console.log(chalk9.gray("  Running the request-formulator interview (api mode)..."));
-        await runInvokerAndComplete(
-          ctx,
-          job,
-          () => invokeEpicRequestViaApi(job, {
-            mailboxClient: ctx.client,
-            machineToken: ctx.machineToken,
-            apiBaseUrl: ctx.apiBaseUrl,
-            userApiToken,
-            anthropicApiKey
-          })
-        );
-        return;
-      }
-    } else if (ctx.aiMode === "claude-subscription") {
-      console.log(
-        chalk9.gray("  Running the request-formulator interview (claude-subscription mode, local `claude` CLI)...")
-      );
+      anthropicApiKey = (await retrieveSecret(AI_KEY_ACCOUNT)).value ?? void 0;
+    }
+    if (ctx.aiMode === "claude-subscription" || anthropicApiKey) {
+      console.log(chalk9.gray(`  Replying in the request conversation (${anthropicApiKey ? "api mode" : "local claude CLI"})...`));
       await runInvokerAndComplete(
         ctx,
         job,
-        () => invokeEpicRequestViaSubscription(job, {
+        () => invokeEpicRequestStep(job, {
           mailboxClient: ctx.client,
           machineToken: ctx.machineToken,
           apiBaseUrl: ctx.apiBaseUrl,
-          userApiToken
+          userApiToken,
+          ...anthropicApiKey && { anthropicApiKey }
         })
       );
       return;
     }
   }
+  if (job.type === "connect_repo") {
+    console.log(chalk9.gray("  Setting up a project repository on this computer (connect_repo)..."));
+    await runInvokerAndComplete(ctx, job, async () => {
+      const outcome = await invokeConnectRepo(job.payload);
+      if (outcome.status === "done") {
+        await ctx.client.heartbeat(ctx.machineToken, void 0, gatherServicedRemotes()).catch(() => void 0);
+      }
+      return outcome;
+    });
+    return;
+  }
   if (job.type === "start_execution") {
     await handleStartExecution(ctx, job);
     return;
@@ -8756,6 +9461,9 @@ var runCommand = new Command8("run").description("Start the Agent Runner daemon
 `
     )
   );
+  const maxJobs = maxParallelJobs();
+  console.log(chalk9.gray(`  Runs up to ${String(maxJobs)} job${maxJobs === 1 ? "" : "s"} at once (${MAX_JOBS_ENV} to change).
+`));
   const runtimeProbe = () => probeAgentRuntime();
   let agentRuntime = await safeProbeAgentRuntime(runtimeProbe, void 0);
   if (agentRuntime) {
@@ -8786,10 +9494,14 @@ Received ${signal}, shutting down...`));
   });
   let consecutiveErrors = 0;
   let lastJobAt = 0;
+  let lastConversationAt = 0;
+  const inFlight = /* @__PURE__ */ new Map();
   do {
     let job = null;
     try {
-      job = await client.nextJob(machineToken, waitMs);
+      if (inFlight.size < maxJobs) {
+        job = await client.nextJob(machineToken, waitMs, [...inFlight.keys()]);
+      }
       consecutiveErrors = 0;
     } catch (error) {
       consecutiveErrors += 1;
@@ -8803,12 +9515,21 @@ Received ${signal}, shutting down...`));
       );
       console.error(chalk9.gray(`  Reconnecting in ${String(Math.round(delay / 1e3))}s...`));
       if (options.once) break;
-      await sleep2(delay);
+      await sleep(delay);
       continue;
     }
+    if (job && inFlight.has(job.id)) job = null;
     if (job) {
-      await handleJob(jobContext, job);
-      lastJobAt = Date.now();
+      const jobId = job.id;
+      const isConversation = job.type === "epic_request";
+      const work = handleJob(jobContext, job).catch((error) => {
+        console.error(chalk9.red(`  Job ${jobId} stopped unexpectedly: ${error instanceof Error ? error.message : String(error)}`));
+      }).finally(() => {
+        inFlight.delete(jobId);
+        lastJobAt = Date.now();
+        if (isConversation) lastConversationAt = lastJobAt;
+      });
+      inFlight.set(jobId, work);
     }
     if (runtimeHeartbeatDue(Date.now(), lastRuntimeSentAt)) {
       const cycle = await runHeartbeatCycle({
@@ -8825,9 +9546,12 @@ Received ${signal}, shutting down...`));
         lastRuntimeSentAt = Date.now();
       }
     }
-    if (options.once) break;
+    if (options.once) {
+      await Promise.all(inFlight.values());
+      break;
+    }
     if (!job) {
-      await sleep2(idleDelay(Date.now(), lastJobAt));
+      await sleep(idleDelay(Date.now(), lastJobAt, lastConversationAt));
     }
   } while (running);
   console.log(chalk9.gray("Agent Runner stopped."));
@@ -9090,7 +9814,7 @@ machinesCommand.command("rm <id>").description("Remove (revoke) a paired machine
 // src/index.ts
 function resolveCliVersion() {
   if (true) {
-    return "1.18.0";
+    return "1.20.0";
   }
   const require2 = createRequire(import.meta.url);
   const pkg = require2("../package.json");