@lumi.ai/runner 0.3.0 → 0.3.2

package/dist/cli.js

@@ -532,7 +532,7 @@ function mcpUrl(config2) {
 }
 
 // src/version.ts
-var RUNNER_VERSION = true ? "0.3.0" : "0.0.0-dev";
+var RUNNER_VERSION = true ? "0.3.2" : "0.0.0-dev";
 
 // src/auth.ts
 import { signInWithCustomToken } from "firebase/auth";
@@ -2639,10 +2639,10 @@ function serviceStatus() {
     };
   }
   if (process.platform === "win32") {
-    const query6 = run("schtasks", ["/Query", "/TN", WINDOWS_TASK]);
-    if (!query6.ok) return { state: "not-installed", detail: "No scheduled task installed." };
+    const query5 = run("schtasks", ["/Query", "/TN", WINDOWS_TASK]);
+    if (!query5.ok) return { state: "not-installed", detail: "No scheduled task installed." };
     return {
-      state: /\bRunning\b/i.test(query6.out) ? "running" : "installed",
+      state: /\bRunning\b/i.test(query5.out) ? "running" : "installed",
       detail: "Scheduled task installed (runs at logon).",
       unitPath: WINDOWS_TASK
     };
@@ -2751,21 +2751,6 @@ async function openShipSession(shipId) {
   const user = await signInToShip(fb, config2, shipId);
   return { shipId, config: config2, fb, user };
 }
-async function openSession() {
-  const config2 = requireConfig();
-  if (config2.ships.length === 0) {
-    throw new AuthError("No Ships assigned. Run: lumi-runner ship add <shipId>");
-  }
-  let last;
-  for (const shipId of config2.ships) {
-    try {
-      return await openShipSession(shipId);
-    } catch (e) {
-      last = e;
-    }
-  }
-  throw last instanceof Error ? last : new AuthError("Could not sign in to any Ship.");
-}
 
 // src/cli/commands/doctor.ts
 var ok = (id, label, detail) => ({ id, label, level: "ok", detail });
@@ -3001,6 +2986,26 @@ function report(checks) {
 import { spawn as spawn4 } from "node:child_process";
 import os5 from "node:os";
 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 config2 = {
+    ...existing,
+    apiKey: approved.apiKey || existing?.apiKey || "",
+    projectId: approved.projectId || fallbackProjectId,
+    runnerId: approved.runnerId || existing?.runnerId || "",
+    shipKeys: { ...existing?.shipKeys ?? {}, ...approved.shipKeys ?? {} },
+    ships: selectedShips.length > 0 ? selectedShips : existing?.ships ?? [],
+    ...mcpUrl2 ? { mcpUrl: mcpUrl2 } : {}
+  };
+  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))
+  };
+}
 function openBrowser(url) {
   const [command, args] = process.platform === "darwin" ? ["open", [url]] : process.platform === "win32" ? ["cmd", ["/c", "start", "", url]] : ["xdg-open", [url]];
   try {
@@ -3063,36 +3068,25 @@ Code: ${pc.bold(start.displayCode)}`,
     throw new CliError("The approval window expired. Run `lumi-runner login` again.");
   }
   progress.stop("Approved.");
-  const config2 = {
-    ...existingConfig,
-    apiKey: approved.apiKey || existingConfig?.apiKey || "",
-    projectId: approved.projectId || projectId,
-    runnerId: approved.runnerId,
-    // THE CREDENTIALS (PRD §8.1) — one Ship key per approved Ship, handed over on this one hop
-    // and nowhere else. Merged over any we already held so that approving a SECOND Ship does not
-    // silently revoke the first: this response only carries keys for what was just approved.
-    shipKeys: { ...existingConfig?.shipKeys ?? {}, ...approved.shipKeys },
-    // What the human PICKED on the approval page. Their choice replaces whatever this machine
-    // was serving — that page is where the decision is now made.
-    ships: approved.selectedShips.length > 0 ? approved.selectedShips : existingConfig?.ships ?? [],
-    ...options.mcpUrl ? { mcpUrl: options.mcpUrl } : {}
-  };
+  const { config: config2, approvedShips, pendingShips } = buildLoginResult(
+    approved,
+    existingConfig,
+    projectId,
+    options.mcpUrl
+  );
+  if (!config2.runnerId) {
+    throw new CliError("The approval did not name this machine. Run `lumi-runner login` again.");
+  }
   if (!config2.apiKey) {
     throw new CliError(
       "The approval did not include a Firebase apiKey. Update the web app, or pass --api-key with --token."
     );
   }
   const fb = initFirebase(config2);
-  const first = approved.approvedShips[0];
+  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 report2({
-    runnerId: config2.runnerId,
-    uid: uid2,
-    ships: config2.ships,
-    approvedShips: approved.approvedShips,
-    pendingShips: approved.pendingShips.filter((id) => config2.ships.includes(id))
-  });
+  return report2({ runnerId: config2.runnerId, uid: uid2, ships: config2.ships, approvedShips, pendingShips });
 }
 async function exchange(config2, shipId) {
   return callPublicFunction(
@@ -3271,17 +3265,19 @@ async function runUninstall(options) {
 }
 
 // src/cli/commands/ship.ts
-import { collectionGroup, doc as doc9, getDoc as getDoc7, getDocs as getDocs5, query as query4, where as where4 } from "firebase/firestore";
+import { doc as doc9, getDoc as getDoc7 } from "firebase/firestore";
 async function listMyShips() {
-  const { fb, user } = await openSession();
-  const memberships = await getDocs5(
-    query4(collectionGroup(fb.db, COLLECTIONS.members), where4("uid", "==", user.uid))
-  );
-  const shipIds = memberships.docs.map((d) => d.ref.parent.parent?.id).filter((id) => !!id);
+  const config2 = requireConfig();
+  const ids = Object.keys(config2.shipKeys ?? {});
   const ships = await Promise.all(
-    shipIds.map(async (id) => {
-      const snap = await getDoc7(doc9(fb.db, COLLECTIONS.ships, id));
-      return snap.exists() ? { id: snap.id, ...snap.data() } : null;
+    ids.map(async (id) => {
+      try {
+        const { fb } = await openShipSession(id);
+        const snap = await getDoc7(doc9(fb.db, COLLECTIONS.ships, id));
+        return { id, ...snap.data() };
+      } catch {
+        return null;
+      }
     })
   );
   return ships.filter((s) => s !== null).sort((a, b) => (b.createdAt ?? 0) - (a.createdAt ?? 0));
@@ -3289,7 +3285,9 @@ async function listMyShips() {
 async function pickShips(current) {
   const ships = await listMyShips();
   if (ships.length === 0) {
-    throw new CliError("You are not a member of any Ship yet \u2014 create one in the web app first.");
+    throw new CliError(
+      "This machine holds no Ship keys. Run `lumi-runner login` and have a captain approve it \u2014 a daemon can only serve Ships it was approved for."
+    );
   }
   return promptMultiSelect({
     message: "Which Ships should this machine serve?",
@@ -3399,9 +3397,9 @@ import {
   doc as doc10,
   getCountFromServer as getCountFromServer2,
   getDoc as getDoc8,
-  getDocs as getDocs6,
-  query as query5,
-  where as where5
+  getDocs as getDocs5,
+  query as query4,
+  where as where4
 } from "firebase/firestore";
 async function runStatus() {
   const config2 = loadConfig();
@@ -3415,16 +3413,33 @@ async function runStatus() {
   }
   const progress = spinner2();
   progress.start("Reading Ship state\u2026");
-  const { fb } = await openSession();
   const ships = [];
   for (const shipId of config2.ships) {
+    let fb;
+    try {
+      ({ fb } = await openShipSession(shipId));
+    } catch {
+      ships.push({
+        shipId,
+        enrolled: false,
+        approved: false,
+        online: false,
+        lastSeenAt: null,
+        currentJob: null,
+        queued: 0,
+        today: { ...EMPTY_USAGE_TOTALS },
+        engineLimits: [],
+        unreachable: true
+      });
+      continue;
+    }
     const shipRef = doc10(fb.db, COLLECTIONS.ships, shipId);
     const mirrorSnap = await getDoc8(doc10(shipRef, COLLECTIONS.runners, config2.runnerId));
     const mirror = mirrorSnap.data();
     let queued = 0;
     try {
       const counted = await getCountFromServer2(
-        query5(collection7(shipRef, COLLECTIONS.jobs), where5("status", "==", "queued"))
+        query4(collection7(shipRef, COLLECTIONS.jobs), where4("status", "==", "queued"))
       );
       queued = counted.data().count;
     } catch {
@@ -3433,7 +3448,7 @@ async function runStatus() {
     const usageSnap = await getDoc8(doc10(shipRef, COLLECTIONS.usageDaily, utcDay(Date.now())));
     const today = { ...EMPTY_USAGE_TOTALS, ...usageSnap.data()?.totals ?? {} };
     const now = Date.now();
-    const limitsSnap = await getDocs6(collection7(shipRef, COLLECTIONS.engineLimits));
+    const limitsSnap = await getDocs5(collection7(shipRef, COLLECTIONS.engineLimits));
     const engineLimits = limitsSnap.docs.map((d) => ({ id: d.id, ...d.data() })).filter((l) => isEngineLimited(l, now));
     ships.push({
       shipId,
@@ -3470,8 +3485,12 @@ async function runStatus() {
     return 0;
   }
   for (const ship2 of ships) {
-    const state = !ship2.enrolled ? pc.dim("not enrolled") : !ship2.approved ? pc.yellow("awaiting approval") : ship2.online ? pc.green("online") : pc.red("offline");
+    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 (ship2.unreachable) {
+      say.line(`    ${pc.dim("this machine\u2019s key for that Ship was revoked \u2014 re-approve it on the Daemons page")}`);
+      continue;
+    }
     if (ship2.lastSeenAt) say.line(`    last seen   ${new Date(ship2.lastSeenAt).toLocaleString()}`);
     say.line(
       ship2.currentJob ? `    running     job ${ship2.currentJob.jobId} on task ${ship2.currentJob.taskId} (agent ${ship2.currentJob.agentId})` : "    running     nothing"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumi.ai/runner",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "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.",