@lumi.ai/runner 0.6.3 → 0.7.0

package/README.md

@@ -50,12 +50,31 @@ It prints the approval link and an 8-character code. Open the link anywhere you
 approve this Ship, and the server finishes on its own — nothing is pasted back.
 
 For CI or unattended provisioning, where nobody is at a terminal at all, paste a Ship key from the
-Daemons page instead:
+Daemons page instead — that page prints this command with the two values already filled in:
 
 ```bash
 lumi-runner login --key <shipKey> --api-key <firebaseWebApiKey> --project <projectId>
 ```
 
+A key exists only once a captain has approved the machine on that Ship's Daemons page, and it only
+appears in that list after one of the two flows above. So this is the **second** visit to a machine,
+not the first.
+
+### More than one account
+
+One machine can serve Ships belonging to **different people**. Run `setup` again and choose *Add
+Ships, from this or another account*; the second person approves in their own browser, with their
+own sign-in.
+
+Nothing is taken away by that. Approving only ever ADDS Ships, so the machine keeps every key and
+every Ship it already had — the `/connect` page can only see the Ships of whoever is signed in to
+it, so it is never allowed to decide that the others should go. To stop serving one, say so
+explicitly: `lumi-runner ship remove <shipId>`.
+
+A machine ends up with one identity per account that approved it — `status` lists them — because a
+runner id belongs to an account rather than to hardware. Only `setup`'s *Disconnect and start over*
+removes anything, and it asks twice.
+
 ## Commands
 
 | Command | What it does |
@@ -246,9 +265,10 @@ npm i -g @lumi.ai/runner && lumi-runner uninstall && npm rm -g @lumi.ai/runner
 
 `lumi-runner doctor` reports a machine that is already in this state, naming the missing path.
 
-Neither command touches `~/.lumi-runner`. That directory is this machine's **identity** — its
-runner id and your session — so uninstalling and reinstalling keeps the approvals your captains
-already granted. Add `--purge` to delete it too, and expect to be approved again from scratch.
+Neither command touches `~/.lumi-runner`. That directory is this machine's **identity** — the
+runner id each account knows it by, and its Ship keys — so uninstalling and reinstalling keeps the
+approvals your captains already granted. Add `--purge` to delete it too, and expect to be approved
+again from scratch, by every account.
 
 ## Upgrading from `crew-runner`
 

package/dist/cli.js

@@ -230,6 +230,8 @@ function jobTarget(job) {
     return { kind: "chat", chatId: job.chatId };
   return null;
 }
+var MAX_RUN_REPORT_CHARS = 6e3;
+var MAX_RUN_REPORT_SUMMARY_CHARS = 300;
 
 // ../shared/dist/jobProgress.js
 var MAX_JOB_STEPS = 10;
@@ -754,8 +756,35 @@ function forgetShip(config2, shipId) {
   if (next.allowLocalMcp) {
     next.allowLocalMcp = next.allowLocalMcp.filter((id) => id !== shipId);
   }
+  if (next.shipRunnerIds) {
+    const ids = { ...next.shipRunnerIds };
+    delete ids[shipId];
+    next.shipRunnerIds = ids;
+  }
   return next;
 }
+function forgetAllShips(config2) {
+  const everything = [.../* @__PURE__ */ new Set([...config2.ships, ...Object.keys(config2.shipKeys ?? {})])];
+  return everything.reduce(forgetShip, config2);
+}
+function shipRunnerId(config2, shipId) {
+  return config2.shipRunnerIds?.[shipId] || config2.runnerId || "";
+}
+function runnerIdentities(primary, pairs) {
+  const byId = /* @__PURE__ */ new Map();
+  if (primary) byId.set(primary, []);
+  for (const { shipId, runnerId } of pairs) {
+    if (!runnerId) continue;
+    byId.set(runnerId, [...byId.get(runnerId) ?? [], shipId]);
+  }
+  return [...byId.entries()].map(([runnerId, shipIds]) => ({ runnerId, shipIds, primary: runnerId === primary })).sort((a, b) => Number(b.primary) - Number(a.primary) || a.runnerId.localeCompare(b.runnerId));
+}
+function configRunnerIdentities(config2) {
+  return runnerIdentities(
+    config2.runnerId,
+    config2.ships.map((shipId) => ({ shipId, runnerId: shipRunnerId(config2, shipId) }))
+  );
+}
 function allowsLocalMcp(config2, shipId) {
   return Array.isArray(config2.allowLocalMcp) && config2.allowLocalMcp.includes(shipId);
 }
@@ -772,7 +801,7 @@ function mcpUrl(config2) {
 }
 
 // src/version.ts
-var RUNNER_VERSION = true ? "0.6.3" : "0.0.0-dev";
+var RUNNER_VERSION = true ? "0.7.0" : "0.0.0-dev";
 
 // src/auth.ts
 import { signInWithCustomToken } from "firebase/auth";
@@ -867,7 +896,7 @@ async function signInToShip(fb, config2, shipId) {
     );
   }
   const cred = await signInWithCustomToken(fb.auth, session.customToken);
-  return cred.user;
+  return { user: cred.user, runnerId: session.runnerId || shipRunnerId(config2, shipId) };
 }
 async function openShipSessions(config2, build) {
   const sessions = [];
@@ -875,8 +904,7 @@ async function openShipSessions(config2, build) {
   for (const shipId of config2.ships) {
     const fb = build(shipId);
     try {
-      const user = await signInToShip(fb, config2, shipId);
-      sessions.push({ shipId, fb, user });
+      sessions.push({ shipId, fb, ...await signInToShip(fb, config2, shipId) });
     } catch (e) {
       failures.push({
         shipId,
@@ -1196,6 +1224,13 @@ async function loadSettledBlockers(shipRef, task) {
     return [];
   }
 }
+function reportSummaryLine(r) {
+  if (r.summary?.trim()) return r.summary.trim();
+  const body = r.report?.trim();
+  if (!body) return "No report.";
+  const firstLine2 = body.split("\n").find((l) => l.trim())?.trim() ?? body;
+  return firstLine2.length <= MAX_RUN_REPORT_SUMMARY_CHARS ? firstLine2 : `${firstLine2.slice(0, MAX_RUN_REPORT_SUMMARY_CHARS - 1)}\u2026`;
+}
 async function loadJobContext(db, shipId, job) {
   const shipRef = doc(db, COLLECTIONS.ships, shipId);
   const taskRef = doc(shipRef, COLLECTIONS.tasks, job.taskId);
@@ -1276,7 +1311,13 @@ async function loadJobContext(db, shipId, job) {
     activity: activityDocs.map((d) => ({ id: d.id, ...d.data() })).reverse(),
     // read newest-first, rendered chronologically
     activityTruncated: activitySnap.docs.length > MAX_ACTIVITY_IN_PROMPT,
-    previousReports: jobsSnap.docs.filter((d) => d.id !== job.id).slice(0, MAX_PREVIOUS_JOBS_READ).map((d) => d.data().report).filter((r) => !!r).reverse()
+    // §15.41. No longer filtered down to jobs that HAVE a report: the catalog carries a line per
+    // previous run, and "that run left no report" is itself worth knowing — it is the difference
+    // between a task nobody has worked and one where three runs died without saying why.
+    previousReports: jobsSnap.docs.filter((d) => d.id !== job.id).slice(0, MAX_PREVIOUS_JOBS_READ).map((d) => {
+      const data = d.data();
+      return { jobId: d.id, summary: data.reportSummary ?? null, report: data.report ?? null };
+    }).reverse()
     // chronological
   };
 }
@@ -1301,7 +1342,11 @@ function standingRules(ship2, statuses, task, agent) {
     // Amended with the pointer clause, which is the only thing keeping the three tiers from
     // duplicating each other: without it a diligent agent writes the same fact into its report,
     // its notebook and the org brain, and the report grows into a transcript of the other two.
-    "End every session by calling run_report: what you did, what remains, what the next run must know. Do not repeat what you already put in your memory or in Ship knowledge \u2014 point at it instead (the entry id, or the slug)."
+    // §15.41 added the summary clause. It is second, not an afterthought at the end, because that
+    // one string is what every LATER run on this task reads instead of this report — and what a
+    // human sees in their notification. An agent that treats it as a label writes "Run report",
+    // and four runs later the catalog says nothing at all.
+    "End every session by calling run_report: what you did, what remains, what the next run must know. Give it a summary too \u2014 one or two sentences that stand in for the whole report in later runs, so write the sentence you would want the next run to read first. Do not repeat what you already put in your memory or in Ship knowledge \u2014 point at it instead (the entry id, or the slug)."
   ].join("\n- ");
 }
 function formatTaskDate(millis, now = Date.now()) {
@@ -1341,26 +1386,17 @@ function buildPrompt(ctx, reason, mcpServers = [], tokenRepos, githubUnavailable
   const parts = [];
   const statuses = shipTaskStatuses(ctx.ship);
   const playbook = usableWorkflow(ctx.workflow);
+  let preamble = null;
   if (reason === "activity") {
-    parts.push(
-      "# Why this session started\n\nSomeone posted on your task after your last run. Read the newest activity below" + (playbook ? ", then follow your playbook below." : ", respond via task_comment, do any follow-up work it asks for, and set the task status honestly if it needs to change.")
-    );
+    preamble = "# Why this session started\n\nSomeone posted on your task after your last run. Read the newest activity below" + (playbook ? ", then follow your playbook above." : ", respond via task_comment, do any follow-up work it asks for, and set the task status honestly if it needs to change.");
   } else if (reason === "watch") {
-    parts.push(
-      "# Why this session started\n\nOne of your playbooks watches the board, and this task matched it. Nobody assigned it to you and nobody else is working it right now \u2014 you are picking it up.\n\n**Leave it in a status that says what happened.** The board is how the watch decides what still needs attention, so a task you leave in the same status will come back to you on the next scan" + (playbook ? ", which your playbook below is written for." : ".")
-    );
+    preamble = "# Why this session started\n\nOne of your playbooks watches the board, and this task matched it. Nobody assigned it to you and nobody else is working it right now \u2014 you are picking it up.\n\n**Leave it in a status that says what happened.** The board is how the watch decides what still needs attention, so a task you leave in the same status will come back to you on the next scan" + (playbook ? ", which your playbook above is written for." : ".");
   } else if (reason === "resume_after_approval") {
-    parts.push(
-      "# Why this session started\n\nYou asked a captain for permission and stopped. They have now answered \u2014 their decision is the newest entry in the task activity below. Read it first.\n\n**If they approved it, do that thing now** \u2014 the permission is granted for this task and may be single-use, so do not ask again for the same thing. **If they refused, do not retry and do not look for a way around it**: say what you will do instead, or hand the task back with task_assign."
-    );
+    preamble = "# Why this session started\n\nYou asked a captain for permission and stopped. They have now answered \u2014 their decision is the newest entry in the task activity below. Read it first.\n\n**If they approved it, do that thing now** \u2014 the permission is granted for this task and may be single-use, so do not ask again for the same thing. **If they refused, do not retry and do not look for a way around it**: say what you will do instead, or hand the task back with task_assign.";
   } else if (reason === "unblocked") {
-    parts.push(
-      '# Why this session started\n\nThis task was blocked and is not any more: everything it was waiting on is now done. Nobody has just assigned it to you \u2014 you have had it all along, and the work has become startable.\n\n**Read "What you were waiting on" below before you do anything else.** It carries what those tasks produced, which is the input this work was held up for; starting without it means redoing or contradicting somebody else' + (playbook ? ", then follow your playbook below." : "'s work.")
-    );
+    preamble = '# Why this session started\n\nThis task was blocked and is not any more: everything it was waiting on is now done. Nobody has just assigned it to you \u2014 you have had it all along, and the work has become startable.\n\n**Read "What you were waiting on" below before you do anything else.** It carries what those tasks produced, which is the input this work was held up for; starting without it means redoing or contradicting somebody else' + (playbook ? ", then follow your playbook above." : "'s work.");
   } else if (reason === "schedule") {
-    parts.push(
-      "# Why this session started\n\nThis is a scheduled run: one of your own playbooks created this task on its cron and assigned it to you. It is routine work, not a request from a person, so nobody is waiting on a reply" + (playbook ? " \u2014 the playbook below is the work, and the task's description is only a record of why it exists." : ".")
-    );
+    preamble = "# Why this session started\n\nThis is a scheduled run: one of your own playbooks created this task on its cron and assigned it to you. It is routine work, not a request from a person, so nobody is waiting on a reply" + (playbook ? " \u2014 the playbook above is the work, and the task's description is only a record of why it exists." : ".");
   }
   parts.push(`# Who you are
 
@@ -1385,6 +1421,7 @@ This is the playbook for this kind of work \u2014 follow it. Your contract and t
 ${playbook.instructions}`
     );
   }
+  if (preamble) parts.push(preamble);
   const t = ctx.task;
   const now = Date.now();
   const statusLabel = statusById(statuses, t.status)?.label ?? t.status;
@@ -1436,12 +1473,28 @@ ${p.description || "(no description)"}`
 ${note2}${feed}`);
   }
   if (ctx.previousReports.length > 0) {
-    const reports = ctx.previousReports.map((r, i) => `## Run ${i + 1}
+    const runs = ctx.previousReports;
+    const latest = runs[runs.length - 1];
+    const older = runs.slice(0, -1);
+    const sections = [];
+    if (older.length > 0) {
+      const lines = older.map((r) => `- (\`${r.jobId}\`) ${reportSummaryLine(r)}`).join("\n");
+      sections.push(
+        `## Earlier runs
+
+Oldest first, one line each. To read one in full, call \`task_get\` with this task's id and \`reportJobId\` set to the id in brackets.
+
+${lines}`
+      );
+    }
+    sections.push(
+      `## Most recent run (\`${latest.jobId}\`)
 
-${r}`).join("\n\n");
+${latest.report ?? "That run left no report."}`
+    );
     parts.push(`# Reports from previous runs on this task
 
-${reports}`);
+${sections.join("\n\n")}`);
   }
   const githubRepos = tokenRepos ?? ctx.agent.tools.github.repos;
   if (ctx.agent.tools.github.enabled && githubUnavailable) {
@@ -1517,7 +1570,10 @@ async function loadChatContext(db, shipId, job) {
           limit2(MAX_CHAT_REPORTS + 1)
         )
       );
-      previousReports = jobsSnap.docs.filter((d) => d.id !== job.id).slice(0, MAX_CHAT_REPORTS).map((d) => d.data().report).filter((r) => !!r).reverse();
+      previousReports = jobsSnap.docs.filter((d) => d.id !== job.id).slice(0, MAX_CHAT_REPORTS).map((d) => {
+        const data = d.data();
+        return { jobId: d.id, summary: data.reportSummary ?? null, report: data.report ?? null };
+      }).reverse();
     } catch {
       previousReports = [];
     }
@@ -1553,7 +1609,7 @@ function chatStandingRules(ship2, agent) {
     scopeRule,
     registerRule,
     routingRule,
-    "End the session by calling run_report: what was discussed and anything the next run must know. Do not repeat what you already put in your memory or in Ship knowledge \u2014 point at it instead."
+    "End the session by calling run_report: what was discussed and anything the next run must know. Give it a summary too \u2014 one or two sentences that stand in for the whole report once this conversation is long enough to scroll out of the window. Do not repeat what you already put in your memory or in Ship knowledge \u2014 point at it instead."
   ].join("\n- ");
 }
 function buildChatPrompt(ctx, mcpServers = [], tokenRepos, githubUnavailable) {
@@ -1576,15 +1632,22 @@ ${ctx.agent.contract}`);
 
 - ${chatStandingRules(ctx.ship, ctx.agent)}`);
   if (ctx.previousReports.length > 0) {
-    const reports = ctx.previousReports.map((r, i) => `## Earlier run ${i + 1}
+    const runs = ctx.previousReports;
+    const latest = runs[runs.length - 1];
+    const older = runs.slice(0, -1);
+    const sections = [];
+    if (older.length > 0) {
+      sections.push(older.map((r) => `- ${reportSummaryLine(r)}`).join("\n"));
+    }
+    sections.push(`## Most recent run
 
-${r}`).join("\n\n");
+${latest.report ?? "That run left no report."}`);
     parts.push(
       `# Earlier in this chat
 
 The conversation is longer than the window below. These are your own notes from previous runs on this chat, oldest first.
 
-${reports}`
+${sections.join("\n\n")}`
     );
   }
   const title = ctx.chat.title?.trim();
@@ -2445,6 +2508,19 @@ async function uploadTranscript(storage, shipId, jobId, redacted) {
 function utcDay(millis) {
   return new Date(millis).toISOString().slice(0, 10);
 }
+function backstopReportContent(resultText) {
+  const text = resultText.trim();
+  if (!text) {
+    const none = "This run ended without writing a report, and left no final text to fall back on.";
+    return { report: none, summary: none };
+  }
+  const marker = "\n\n\u2026(truncated)";
+  const report4 = text.length <= MAX_RUN_REPORT_CHARS ? text : `${text.slice(0, MAX_RUN_REPORT_CHARS - marker.length)}${marker}`;
+  const firstLine2 = text.split("\n").find((l) => l.trim())?.trim() ?? text;
+  const ellipsis = "\u2026";
+  const summary = firstLine2.length <= MAX_RUN_REPORT_SUMMARY_CHARS ? firstLine2 : `${firstLine2.slice(0, MAX_RUN_REPORT_SUMMARY_CHARS - ellipsis.length)}${ellipsis}`;
+  return { report: report4, summary };
+}
 async function finalizeJob(db, shipId, job, input) {
   const shipRef = doc6(db, COLLECTIONS.ships, shipId);
   const jobRef = doc6(shipRef, COLLECTIONS.jobs, job.id);
@@ -2452,6 +2528,7 @@ async function finalizeJob(db, shipId, job, input) {
   const usageRef = doc6(shipRef, COLLECTIONS.usageDaily, utcDay(now));
   await runTransaction(db, async (tx) => {
     const usageSnap = await tx.get(usageRef);
+    const jobSnap = await tx.get(jobRef);
     const totals = { ...EMPTY_USAGE_TOTALS, ...usageSnap.data()?.totals ?? {} };
     const byAgent = usageSnap.data()?.byAgent ?? {};
     const agentAgg = {
@@ -2459,7 +2536,10 @@ async function finalizeJob(db, shipId, job, input) {
       ...byAgent[job.agentId] ?? {}
     };
     const u = input.usage;
+    const wroteReport = !!jobSnap.data()?.report;
+    const backstop = !wroteReport && input.resultText !== void 0 ? backstopReportContent(input.resultText) : null;
     tx.update(jobRef, {
+      ...backstop ? { report: backstop.report, reportSummary: backstop.summary } : {},
       status: input.status,
       endedAt: now,
       usage: u,
@@ -3407,8 +3487,9 @@ async function startDaemon() {
     return s;
   };
   const serving = new Set(sessions.map((s) => s.shipId));
+  const bannerIds = [...new Set(sessions.map((s) => s.runnerId))];
   console.log(
-    `Runner ${config2.runnerId} serving ${serving.size} Ship(s): ${[...serving].join(", ")}`
+    bannerIds.length <= 1 ? `Runner ${bannerIds[0] ?? config2.runnerId} serving ${serving.size} Ship(s): ${[...serving].join(", ")}` : `Runner ${bannerIds.length} identities serving ${serving.size} Ship(s): ` + sessions.map((s) => `${s.shipId} as ${s.runnerId}`).join(", ")
   );
   const logLines = [];
   const log2 = (line) => {
@@ -3429,7 +3510,10 @@ async function startDaemon() {
   const liveJobsOn = (shipId) => [...running.values()].filter((r) => r.shipId === shipId && r.mirror).map((r) => r.mirror).sort((a, b) => a.startedAt - b.startedAt);
   const approved = /* @__PURE__ */ new Map();
   const warnedUnapproved = /* @__PURE__ */ new Set();
-  const shipRunnerRef = (shipId) => doc7(sess(shipId).fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.runners, config2.runnerId);
+  const shipRunnerRef = (shipId) => {
+    const session = sess(shipId);
+    return doc7(session.fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.runners, session.runnerId);
+  };
   const needsRefill = /* @__PURE__ */ new Set();
   let beating = false;
   async function heartbeat() {
@@ -3794,8 +3878,9 @@ async function startDaemon() {
           return;
         }
         const startedAt2 = Date.now();
-        tx.update(jobRef, { status: "running", runnerId: config2.runnerId, startedAt: startedAt2 });
-        claimed = { id: snap.id, ...snap.data(), status: "running", runnerId: config2.runnerId, startedAt: startedAt2 };
+        const runnerId = sess(shipId).runnerId;
+        tx.update(jobRef, { status: "running", runnerId, startedAt: startedAt2 });
+        claimed = { id: snap.id, ...snap.data(), status: "running", runnerId, startedAt: startedAt2 };
       });
       return claimed;
     } catch (e) {
@@ -3912,7 +3997,7 @@ async function startDaemon() {
               doc7(sess(shipId).fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.jobs, job.id)
             );
             const fresh = snap.data();
-            if (!fresh || fresh.status !== "running" || fresh.runnerId !== config2.runnerId) {
+            if (!fresh || fresh.status !== "running" || fresh.runnerId !== sess(shipId).runnerId) {
               log2(`Job ${job.id} is no longer this machine's to run \u2014 ending the session.`);
               slot.abort.abort();
             }
@@ -4036,6 +4121,10 @@ async function startDaemon() {
           status: "stopped",
           usage,
           transcriptPath,
+          // §15.41. A stopped run is the case that needs the backstop MOST: it was cut off
+          // mid-thought, so it almost certainly never reached `run_report` — and whatever it had
+          // got to is what the next run on this task would otherwise have to rediscover.
+          resultText,
           mcpServers: extraMcpServers.map((s) => s.key)
         });
         const by = slot.stop.by;
@@ -4057,7 +4146,13 @@ async function startDaemon() {
       } else if (sessionLimit) {
         const engineLabel = getEngine(engineId).label;
         const resetsAt = new Date(sessionLimit.resetsAt).toISOString();
-        await noteEngineLimit(sess(shipId).fb.db, shipId, engineId, sessionLimit, config2.runnerId);
+        await noteEngineLimit(
+          sess(shipId).fb.db,
+          shipId,
+          engineId,
+          sessionLimit,
+          sess(shipId).runnerId
+        );
         await releaseJob(
           sess(shipId).fb.db,
           shipId,
@@ -4077,6 +4172,9 @@ async function startDaemon() {
           status: "done",
           usage,
           transcriptPath,
+          // §15.41. Only used when the session never called `run_report` — the ordinary path is
+          // that it did, and a real report always wins inside the transaction.
+          resultText,
           mcpServers: extraMcpServers.map((s) => s.key)
         });
         log2(`Job ${job.id} done (${usage.inputTokens}in/${usage.outputTokens}out tokens).`);
@@ -4130,6 +4228,10 @@ async function startDaemon() {
           usage,
           transcriptPath,
           error: failure,
+          // §15.41. A failed run still did work, and the retry — or the next run after the retry
+          // is spent — starts from the context pack alone. `error` is the tail for a human; this
+          // is the continuity for the next session, and they are read by different readers.
+          resultText,
           mcpServers: extraMcpServers.map((s) => s.key)
         });
         if (target.kind === "chat") {
@@ -4187,7 +4289,7 @@ async function startDaemon() {
     try {
       for (const shipId of serving) {
         await setDoc2(
-          doc7(sess(shipId).fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.runners, config2.runnerId),
+          shipRunnerRef(shipId),
           {
             status: "offline",
             lastSeenAt: now,
@@ -4455,6 +4557,16 @@ async function promptMultiSelect(options) {
     })
   );
 }
+async function promptSelect(options) {
+  requireInteractive(options.message, options.flagHint);
+  return unwrap(
+    await clack.select({
+      message: options.message,
+      options: options.choices,
+      initialValue: options.initialValue
+    })
+  );
+}
 async function promptConfirm(options) {
   if (assumeYes && options.yesFlagApplies !== false) return true;
   requireInteractive(options.message, "--yes");
@@ -4685,8 +4797,7 @@ import { collection as collection6, doc as doc8, getDoc as getDoc7, getDocs as g
 async function openShipSession(shipId) {
   const config2 = requireConfig();
   const fb = initFirebase(config2, `cli-${shipId}`);
-  const user = await signInToShip(fb, config2, shipId);
-  return { shipId, config: config2, fb, user };
+  return { shipId, config: config2, fb, ...await signInToShip(fb, config2, shipId) };
 }
 
 // src/cli/commands/doctor.ts
@@ -4825,6 +4936,7 @@ async function checkShips(config2) {
   const checks = [];
   const engines = /* @__PURE__ */ new Set();
   let needsGithub = false;
+  const manyIdentities = configRunnerIdentities(config2).length > 1;
   if (config2.ships.length === 0) {
     checks.push(
       fail("ships", "Ships", "This machine serves no Ships.", "Run `lumi-runner ship add` to pick one.")
@@ -4832,9 +4944,9 @@ async function checkShips(config2) {
     return { checks, engines, needsGithub };
   }
   for (const shipId of config2.ships) {
-    let fb;
+    let session;
     try {
-      ({ fb } = await openShipSession(shipId));
+      session = await openShipSession(shipId);
       checks.push(ok(`key:${shipId}`, `Ship ${shipId} \u2014 key`, "Runner key accepted."));
     } catch (e) {
       checks.push(
@@ -4849,7 +4961,7 @@ async function checkShips(config2) {
     }
     try {
       const snap = await getDoc7(
-        doc8(fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.runners, config2.runnerId)
+        doc8(session.fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.runners, session.runnerId)
       );
       if (!snap.exists()) {
         checks.push(
@@ -4870,7 +4982,13 @@ async function checkShips(config2) {
           )
         );
       } else {
-        checks.push(ok(`approval:${shipId}`, `Ship ${shipId} \u2014 approval`, "Approved by a captain."));
+        checks.push(
+          ok(
+            `approval:${shipId}`,
+            `Ship ${shipId} \u2014 approval`,
+            manyIdentities ? `Approved by a captain (as ${session.runnerId}).` : "Approved by a captain."
+          )
+        );
       }
     } catch (e) {
       checks.push(
@@ -4884,7 +5002,7 @@ async function checkShips(config2) {
     }
     let agents = [];
     try {
-      const snap = await getDocs5(collection6(fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.agents));
+      const snap = await getDocs5(collection6(session.fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.agents));
       agents = snap.docs.map((d) => ({ id: d.id, ...d.data() }));
     } catch {
     }
@@ -4893,7 +5011,7 @@ async function checkShips(config2) {
     for (const id of shipEngines) engines.add(id);
     if (agents.some((agent) => effectiveAgentTools(agent).github.enabled)) needsGithub = true;
     try {
-      const secrets = await loadRunnerSecrets(fb.db, shipId);
+      const secrets = await loadRunnerSecrets(session.fb.db, shipId);
       const missing = [...new Set([...shipEngines].flatMap((id) => missingSecretsFor(id, secrets)))];
       checks.push(
         missing.length === 0 ? ok(`secrets:${shipId}`, `Ship ${shipId} \u2014 credentials`, "All required secrets are saved.") : fail(
@@ -4915,7 +5033,7 @@ async function checkShips(config2) {
     }
     try {
       const snap = await getDocs5(
-        collection6(fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.mcpServers)
+        collection6(session.fb.db, COLLECTIONS.ships, shipId, COLLECTIONS.mcpServers)
       );
       const servers = snap.docs.map(
         (d) => ({ id: d.id, ...d.data() })
@@ -4936,7 +5054,14 @@ async function runDoctor() {
     );
     return report2(checks);
   }
-  checks.push(ok("config", "Configuration", `Runner ${config2.runnerId} on project ${config2.projectId}`));
+  const identities = configRunnerIdentities(config2);
+  checks.push(
+    ok(
+      "config",
+      "Configuration",
+      identities.length <= 1 ? `Runner ${config2.runnerId} on project ${config2.projectId}` : `${identities.length} runner identities on project ${config2.projectId} \u2014 ` + identities.map((i) => i.runnerId).join(", ")
+    )
+  );
   const progress = spinner2();
   progress.start("Running checks\u2026");
   const engines = /* @__PURE__ */ new Set([DEFAULT_ENGINE_ID]);
@@ -5016,21 +5141,37 @@ import { signInWithCustomToken as signInWithCustomToken2 } from "firebase/auth";
 function buildLoginResult(approved, existing, fallbackProjectId, mcpUrl2) {
   const approvedShips = approved.approvedShips ?? Object.keys(approved.shipKeys ?? {});
   const selectedShips = approved.selectedShips ?? [];
+  const stampId = approved.runnerId || existing?.runnerId || "";
+  const shipRunnerIds = { ...existing?.shipRunnerIds ?? {} };
+  if (stampId) {
+    for (const shipId of Object.keys(approved.shipKeys ?? {})) shipRunnerIds[shipId] = stampId;
+  }
   const config2 = {
     ...existing,
     apiKey: approved.apiKey || existing?.apiKey || "",
     projectId: approved.projectId || fallbackProjectId,
-    runnerId: approved.runnerId || existing?.runnerId || "",
+    runnerId: existing?.runnerId || approved.runnerId || "",
     shipKeys: { ...existing?.shipKeys ?? {}, ...approved.shipKeys ?? {} },
-    ships: selectedShips.length > 0 ? selectedShips : existing?.ships ?? [],
+    ships: [.../* @__PURE__ */ new Set([...existing?.ships ?? [], ...selectedShips])],
+    // Only when there is something to say, following `shipParallelJobs`: writing an empty map into
+    // every config would be a key nobody asked for.
+    ...Object.keys(shipRunnerIds).length > 0 ? { shipRunnerIds } : {},
     ...mcpUrl2 ? { mcpUrl: mcpUrl2 } : {}
   };
+  const occupiedShips = (approved.occupiedShips ?? []).filter((id) => config2.ships.includes(id));
   return {
     config: config2,
     approvedShips,
     // Fall back to deriving it, so an older backend that omits the field reports accurately
-    // rather than crashing or claiming nothing is pending.
-    pendingShips: (approved.pendingShips ?? selectedShips.filter((id) => !approvedShips.includes(id))).filter((id) => config2.ships.includes(id))
+    // rather than crashing or claiming nothing is pending. Occupied Ships are subtracted for the
+    // web page's reason: they come back in BOTH sets, and printing both tells a captain they are
+    // waiting on a captain.
+    pendingShips: (approved.pendingShips ?? selectedShips.filter((id) => !approvedShips.includes(id))).filter((id) => config2.ships.includes(id) && !occupiedShips.includes(id)),
+    occupiedShips,
+    newIdentity: Boolean(
+      approved.runnerId && existing?.runnerId && approved.runnerId !== existing.runnerId
+    ),
+    otherShips: (existing?.ships ?? []).filter((id) => !selectedShips.includes(id))
   };
 }
 function openBrowser(url) {
@@ -5053,11 +5194,13 @@ async function loginWithDeviceFlow(options) {
   const existingConfig = loadConfig();
   const projectId = options.project || existingConfig?.projectId || DEFAULT_PROJECT_ID;
   const baseUrl = functionsBaseUrlFor(projectId);
+  const candidates = existingConfig ? configRunnerIdentities(existingConfig).map((i) => i.runnerId) : [];
   const start = await callPublicFunction(baseUrl, "startRunnerLogin", {
     hostname: os5.hostname(),
-    // Offer the id this machine already has: re-logging in should keep its identity, and with
-    // it the captain approvals it has already earned.
-    ...existingConfig?.runnerId ? { runnerId: existingConfig.runnerId } : {}
+    // The singular field stays, always: it is what an older deployment reads, and dropping it
+    // would silently turn every re-login into a new enrolment for the length of a rollout.
+    ...existingConfig?.runnerId ? { runnerId: existingConfig.runnerId } : {},
+    ...candidates.length > 0 ? { runnerIds: candidates } : {}
   });
   if (!options.noBrowser) openBrowser(start.verificationUrl);
   say.note(
@@ -5095,7 +5238,7 @@ Code: ${pc.bold(start.displayCode)}`,
     throw new CliError("The approval window expired. Run `lumi-runner login` again.");
   }
   progress.stop("Approved.");
-  const { config: config2, approvedShips, pendingShips } = buildLoginResult(
+  const { config: config2, approvedShips, pendingShips, occupiedShips, newIdentity, otherShips } = buildLoginResult(
     approved,
     existingConfig,
     projectId,
@@ -5113,7 +5256,18 @@ Code: ${pc.bold(start.displayCode)}`,
   const first = approvedShips[0];
   const uid2 = first ? (await signInWithCustomToken2(fb.auth, (await exchange(config2, first)).customToken)).user.uid : "(no Ship approved yet)";
   saveConfig(config2);
-  return report3({ runnerId: config2.runnerId, uid: uid2, ships: config2.ships, approvedShips, pendingShips });
+  return report3({
+    // What THIS login did, which on a second account is not the machine's primary.
+    runnerId: approved.runnerId || config2.runnerId,
+    primaryRunnerId: config2.runnerId,
+    newIdentity,
+    uid: uid2,
+    ships: config2.ships,
+    approvedShips,
+    pendingShips,
+    occupiedShips,
+    otherShips
+  });
 }
 async function exchange(config2, shipId) {
   return callPublicFunction(
@@ -5131,30 +5285,37 @@ async function loginWithKey(options) {
     throw new CliError("That does not look like a runner key. Expected `crewrunner_<shipId>_<secret>`.");
   }
   const existing = loadConfig();
+  const session = await callPublicFunction(
+    functionsBaseUrlFor(options.project),
+    "exchangeRunnerKey",
+    { key: options.key }
+  );
+  const runnerId = session.runnerId || options.runnerId || existing?.runnerId || "";
   const config2 = {
     ...existing,
     apiKey: options.apiKey,
     projectId: options.project,
-    runnerId: options.runnerId || existing?.runnerId || `runner-${os5.hostname().toLowerCase().replace(/[^a-z0-9]/g, "").slice(0, 12)}-${Math.random().toString(36).slice(2, 6)}`,
+    // The FIRST identity keeps the machine's name, exactly as in `buildLoginResult`: a key issued
+    // by another account names another machine, and adopting it would strand every Ship this one
+    // already serves.
+    runnerId: existing?.runnerId || runnerId,
     shipKeys: { ...existing?.shipKeys ?? {}, [parsed]: options.key },
     ships: [.../* @__PURE__ */ new Set([...existing?.ships ?? [], parsed])],
+    ...runnerId ? { shipRunnerIds: { ...existing?.shipRunnerIds ?? {}, [parsed]: runnerId } } : {},
     ...options.mcpUrl ? { mcpUrl: options.mcpUrl } : {}
   };
-  const session = await callPublicFunction(
-    functionsBaseUrlFor(config2.projectId),
-    "exchangeRunnerKey",
-    { key: options.key }
-  );
-  config2.runnerId = session.runnerId;
   const fb = initFirebase(config2);
   const cred = await signInWithCustomToken2(fb.auth, session.customToken);
   saveConfig(config2);
   return report3({
-    runnerId: config2.runnerId,
+    runnerId,
+    primaryRunnerId: config2.runnerId,
+    newIdentity: Boolean(runnerId && config2.runnerId && runnerId !== config2.runnerId),
     uid: cred.user.uid,
     ships: config2.ships,
     approvedShips: [parsed],
-    pendingShips: []
+    pendingShips: [],
+    otherShips: (existing?.ships ?? []).filter((id) => id !== parsed)
   });
 }
 function parseKeyShipId(key) {
@@ -5167,12 +5328,27 @@ function report3(result) {
     return 0;
   }
   say.success(`Connected as ${result.uid} \u2014 runner ${result.runnerId}`);
+  if (result.newIdentity && result.primaryRunnerId) {
+    say.info(
+      `That is a new identity for this machine \u2014 it is still runner ${result.primaryRunnerId} on the Ships it already served.`
+    );
+  }
   if (result.ships.length > 0) say.info(`Serving: ${result.ships.join(", ")}`);
   if (result.pendingShips && result.pendingShips.length > 0) {
     say.warn(
       `Awaiting captain approval on: ${result.pendingShips.join(", ")} \u2014 a captain approves this machine on the Ship's Daemons page.`
     );
   }
+  if (result.occupiedShips && result.occupiedShips.length > 0) {
+    say.warn(
+      `Already running another daemon: ${result.occupiedShips.join(", ")} \u2014 a Ship runs one. Remove the old machine on that Ship's Daemons page, then approve this one there.`
+    );
+  }
+  if (result.otherShips && result.otherShips.length > 0) {
+    say.info(
+      `Still serving ${result.otherShips.join(", ")} \u2014 this approval did not mention them. \`lumi-runner ship remove <shipId>\` to stop.`
+    );
+  }
   if (serviceStatus().state === "running") {
     say.info("Restart the daemon for this to take effect: `lumi-runner service restart`.");
   }
@@ -5390,13 +5566,42 @@ async function runSetup(options) {
   const moved = migrateLegacyDir();
   if (moved?.migrated) say.info(`Moved your runner config from ${moved.from} to ${moved.to}.`);
   const existing = loadConfig();
-  const reuse = Object.keys(existing?.shipKeys ?? {}).length > 0 && await promptConfirm({
-    message: `This machine is already connected as ${existing?.runnerId}. Keep its Ship keys?`,
-    initialValue: true,
-    yesFlagApplies: false
-  });
-  if (!reuse) {
+  if (!existing || Object.keys(existing.shipKeys ?? {}).length === 0) {
     await runLogin(options);
+  } else {
+    const identities = configRunnerIdentities(existing);
+    const who = identities.length === 1 ? `as ${identities[0].runnerId}` : `under ${identities.length} accounts (${identities.map((i) => i.runnerId).join(", ")})`;
+    const action2 = await promptSelect({
+      message: `This machine is already connected ${who}, serving ${existing.ships.join(", ") || "no Ships"}. What now?`,
+      choices: [
+        { value: "keep", label: "Nothing \u2014 keep what it has", hint: "re-check it and restart the daemon" },
+        {
+          value: "add",
+          label: "Add Ships, from this or another account",
+          hint: "opens the browser; everything it already serves is kept"
+        },
+        {
+          value: "reset",
+          label: "Disconnect and start over",
+          hint: "forgets every Ship key on this machine"
+        }
+      ],
+      initialValue: "keep",
+      flagHint: "lumi-runner login"
+    });
+    if (action2 === "add") {
+      await runLogin(options);
+    } else if (action2 === "reset") {
+      const sure = await promptConfirm({
+        message: `Forget all ${Object.keys(existing.shipKeys ?? {}).length} Ship key(s) on this machine and connect from scratch?`,
+        initialValue: false,
+        yesFlagApplies: false
+        // destructive: `--yes` must not answer this one
+      });
+      if (!sure) throw new CliError("Cancelled.", 130);
+      saveConfig(forgetAllShips(existing));
+      await runLogin(options);
+    }
   }
   const config2 = loadConfig();
   if (!config2) throw new CliError("Login did not complete.");
@@ -5467,12 +5672,13 @@ async function runStatus() {
   progress.start("Reading Ship state\u2026");
   const ships = [];
   for (const shipId of config2.ships) {
-    let fb;
+    let session;
     try {
-      ({ fb } = await openShipSession(shipId));
+      session = await openShipSession(shipId);
     } catch {
       ships.push({
         shipId,
+        runnerId: shipRunnerId(config2, shipId),
         enrolled: false,
         approved: false,
         online: false,
@@ -5485,8 +5691,8 @@ async function runStatus() {
       });
       continue;
     }
-    const shipRef = doc10(fb.db, COLLECTIONS.ships, shipId);
-    const mirrorSnap = await getDoc9(doc10(shipRef, COLLECTIONS.runners, config2.runnerId));
+    const shipRef = doc10(session.fb.db, COLLECTIONS.ships, shipId);
+    const mirrorSnap = await getDoc9(doc10(shipRef, COLLECTIONS.runners, session.runnerId));
     const mirror = mirrorSnap.data();
     let queued = 0;
     try {
@@ -5504,6 +5710,7 @@ async function runStatus() {
     const engineLimits = limitsSnap.docs.map((d) => ({ id: d.id, ...d.data() })).filter((l) => isEngineLimited(l, now));
     ships.push({
       shipId,
+      runnerId: session.runnerId,
       enrolled: mirrorSnap.exists(),
       approved: mirror?.approved === true,
       online: mirror?.status === "online" && Date.now() - (mirror?.lastSeenAt ?? 0) < RUNNER_OFFLINE_AFTER_MS,
@@ -5516,11 +5723,19 @@ async function runStatus() {
   }
   progress.stop("");
   const service2 = serviceStatus();
+  const identities = runnerIdentities(
+    config2.runnerId,
+    ships.map((s) => ({ shipId: s.shipId, runnerId: s.runnerId }))
+  );
   if (isJson()) {
     emitJson({
       version: RUNNER_VERSION,
       connected: true,
+      // KEPT, and kept meaning the same thing: this is a published contract, and on the machine
+      // that has one identity — every machine before this release — the primary IS that identity.
       runnerId: config2.runnerId,
+      /** Every name this machine answers to, and the Ships each one covers. */
+      runnerIds: identities,
       projectId: config2.projectId,
       service: { state: service2.state, detail: service2.detail },
       ships
@@ -5528,7 +5743,16 @@ async function runStatus() {
     return 0;
   }
   say.line("");
-  say.line(`  ${pc.bold("Runner")}   ${config2.runnerId}  ${pc.dim(`v${RUNNER_VERSION}`)}`);
+  if (identities.length <= 1) {
+    say.line(`  ${pc.bold("Runner")}   ${config2.runnerId}  ${pc.dim(`v${RUNNER_VERSION}`)}`);
+  } else {
+    say.line(`  ${pc.bold("Runner")}   ${identities.length} identities  ${pc.dim(`v${RUNNER_VERSION}`)}`);
+    for (const identity of identities) {
+      say.line(
+        `           ${identity.runnerId}  ${pc.dim(identity.shipIds.join(", ") || "no Ships")}`
+      );
+    }
+  }
   say.line(`  ${pc.bold("Project")}  ${config2.projectId}`);
   say.line(`  ${pc.bold("Service")}  ${service2.detail}`);
   say.line("");
@@ -5539,6 +5763,9 @@ async function runStatus() {
   for (const ship2 of ships) {
     const state = ship2.unreachable ? pc.red("no access") : !ship2.enrolled ? pc.dim("not enrolled") : !ship2.approved ? pc.yellow("awaiting approval") : ship2.online ? pc.green("online") : pc.red("offline");
     say.line(`  ${pc.bold(ship2.shipId)}  ${state}`);
+    if (identities.length > 1 && ship2.runnerId) {
+      say.line(`    ${pc.dim(`runner      ${ship2.runnerId}`)}`);
+    }
     if (ship2.unreachable) {
       say.line(`    ${pc.dim("this machine\u2019s key for that Ship was revoked \u2014 re-approve it on the Daemons page")}`);
       continue;
@@ -5685,7 +5912,7 @@ function action(handler) {
 program.command("setup").description("Connect this machine and set it up to run jobs (interactive)").option("--project <projectId>", "Firebase project to connect to").option("--no-browser", "print the approval URL instead of opening a browser").action(action(
   async (options) => runSetup({ project: options.project, noBrowser: options.browser === false })
 ));
-program.command("login").description("Connect this machine (opens a browser to approve it)").option("--project <projectId>", "Firebase project to connect to").option("--no-browser", "print the approval URL instead of opening a browser").option("--key <shipKey>", "skip the browser: paste a Ship key from the Daemons page (CI)").option("--api-key <key>", "Firebase web API key (only with --key)").option("--runner-id <id>", "reuse an existing runner id (only with --key)").option("--mcp-url <url>", "override the Workspace MCP endpoint").action(
+program.command("login").description("Connect this machine (opens a browser to approve it)").option("--project <projectId>", "Firebase project to connect to").option("--no-browser", "print the approval URL instead of opening a browser").option("--key <shipKey>", "skip the browser: paste a Ship key from the Daemons page (CI)").option("--api-key <key>", "Firebase web API key (only with --key)").option("--runner-id <id>", "runner id to fall back on if the backend does not name one (only with --key)").option("--mcp-url <url>", "override the Workspace MCP endpoint").action(
   action(
     async (options) => runLogin({
       project: options.project,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumi.ai/runner",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "type": "module",
   "description": "Lumi Crew runner daemon — claims jobs from your Ships and executes them as headless Claude sessions on your own machine.",
   "//name": "The ONLY package in this monorepo published to the public registry, so it is the one that does not follow the internal @lumi/crew-* convention: `@lumi` is not a scope we own, `@lumi.ai` is (the npm org). The workspace DIRECTORY stays packages/crew/runner — renaming the package is not renaming the folder.",