@lumi.ai/runner 0.15.9 → 0.15.10

package/dist/cli.js

@@ -830,6 +830,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 var DEFAULT_PROJECT_ID = "lumi-afb7d";
+var DEFAULT_MCP_URL = "https://crew.kilogent.com/mcp";
 var LEGACY_DIR_NAME = ".crew-runner";
 var DIR_NAME = ".lumi-runner";
 function configDir() {
@@ -935,11 +936,11 @@ function notificationsEnabled(config2) {
   return config2?.notifications ?? TOGGLE_DEFAULTS.notifications;
 }
 function mcpUrl(config2) {
-  return process.env.CREW_MCP_URL || config2.mcpUrl || `https://us-central1-${config2.projectId}.cloudfunctions.net/workspaceMcp`;
+  return process.env.CREW_MCP_URL || config2.mcpUrl || (config2.projectId === DEFAULT_PROJECT_ID ? DEFAULT_MCP_URL : `https://us-central1-${config2.projectId}.cloudfunctions.net/workspaceMcp`);
 }
 
 // src/version.ts
-var RUNNER_VERSION = true ? "0.15.9" : "0.0.0-dev";
+var RUNNER_VERSION = true ? "0.15.10" : "0.0.0-dev";
 
 // src/auth.ts
 import { signInWithCustomToken } from "firebase/auth";
@@ -1053,6 +1054,28 @@ async function openShipSessions(config2, build) {
   }
   return { sessions, failures };
 }
+function idTokenLifeMs(idToken, now) {
+  const payload = idToken.split(".")[1];
+  if (!payload) return null;
+  try {
+    const json = Buffer.from(payload.replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf8");
+    const exp = JSON.parse(json).exp;
+    if (typeof exp !== "number" || !Number.isFinite(exp)) return null;
+    return exp * 1e3 - now;
+  } catch {
+    return null;
+  }
+}
+async function sessionIdToken(user, opts) {
+  const idToken = await user.getIdToken(true);
+  const life = idTokenLifeMs(idToken, opts.now ?? Date.now());
+  if (life !== null && life < opts.timeoutMs) {
+    opts.log?.(
+      `This session's credential expires in ${Math.round(life / 1e3)}s but the job may run for ${Math.round(opts.timeoutMs / 1e3)}s. It is frozen into the session config at spawn, so the agent will lose every Crew tool when it lapses. Check this machine's clock.`
+    );
+  }
+  return idToken;
+}
 
 // src/firebase.ts
 import { deleteApp, getApps, initializeApp } from "firebase/app";
@@ -1877,6 +1900,61 @@ function stepsFromClaudeEvent(event, opts) {
   return [];
 }
 
+// src/engines/mcpHealth.ts
+var CONSECUTIVE_LIMIT = 2;
+var AUTH_MARKER = /\b401\b|unauthoriz|invalid[_ ]token|token .{0,20}expired|expired .{0,20}token|protected resource/i;
+var WORKSPACE_TOOL_PREFIX = `mcp__${WORKSPACE_MCP_KEY}__`;
+function resultText(block) {
+  const content = block.content;
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content.map(
+      (part) => part && typeof part === "object" && typeof part.text === "string" ? part.text : ""
+    ).join(" ");
+  }
+  return "";
+}
+function blocksOf(event) {
+  const message2 = event.message;
+  return Array.isArray(message2?.content) ? message2.content : [];
+}
+function createWorkspaceMcpWatch() {
+  const toolNames = /* @__PURE__ */ new Map();
+  let consecutive = 0;
+  let reported = false;
+  return {
+    observe(event) {
+      if (reported) return null;
+      const type = typeof event?.type === "string" ? event.type : "";
+      if (type === "assistant") {
+        for (const block of blocksOf(event)) {
+          if (!block || typeof block !== "object") continue;
+          if (block.type === "tool_use" && typeof block.id === "string" && typeof block.name === "string") {
+            toolNames.set(block.id, block.name);
+          }
+        }
+        return null;
+      }
+      if (type !== "user") return null;
+      for (const block of blocksOf(event)) {
+        if (!block || typeof block !== "object") continue;
+        if (block.type !== "tool_result" || typeof block.tool_use_id !== "string") continue;
+        const name = toolNames.get(block.tool_use_id);
+        if (!name || !name.startsWith(WORKSPACE_TOOL_PREFIX)) continue;
+        if (!block.is_error || !AUTH_MARKER.test(resultText(block))) {
+          consecutive = 0;
+          continue;
+        }
+        consecutive += 1;
+        if (consecutive < CONSECUTIVE_LIMIT) continue;
+        reported = true;
+        return `The Workspace MCP ("${WORKSPACE_MCP_KEY}") stopped accepting this session's credential part-way through the run: ${CONSECUTIVE_LIMIT} consecutive calls came back refused ("${resultText(block).slice(0, 160).trim()}"). Everything after that point would have run with none of this Ship's tools \u2014 no task_comment, no run_report, no chat_send \u2014 so the session was stopped rather than allowed to finish blind. The run is retried with a fresh credential.`;
+      }
+      return null;
+    }
+  };
+}
+
 // src/engines/claude.ts
 function normalizeClaudeUsage(resultEvent, model, fallbackDurationS) {
   const result = resultEvent ?? {};
@@ -2052,6 +2130,7 @@ async function runSession(input, bin, dirs) {
   let resultEvent = null;
   let mcpProblem = null;
   const workspaceRequired = effectiveAgentTools(input.agent).workspaceMcp;
+  const mcpWatch = createWorkspaceMcpWatch();
   const exitCode = await new Promise((resolve) => {
     const child = spawn3(bin, args, { cwd: dirs.workdir, env, stdio: ["ignore", "pipe", "pipe"] });
     const killTimer = setTimeout(() => {
@@ -2066,6 +2145,13 @@ async function runSession(input, bin, dirs) {
     };
     input.signal?.addEventListener("abort", onAbort, { once: true });
     const detachAbort = () => input.signal?.removeEventListener("abort", onAbort);
+    const stopBlindSession = (problem) => {
+      if (!problem) return;
+      mcpProblem = problem;
+      input.log(problem);
+      child.kill("SIGTERM");
+      setTimeout(() => child.kill("SIGKILL"), 3e3).unref();
+    };
     let buffer = "";
     child.stdout.on("data", (chunk) => {
       buffer += chunk.toString("utf8");
@@ -2081,12 +2167,10 @@ async function runSession(input, bin, dirs) {
           if (event.type === "result") resultEvent = event;
           if (event.type === "assistant") input.log("claude: assistant turn");
           if (event.type === "system" && event.subtype === "init" && !mcpProblem) {
-            mcpProblem = workspaceMcpProblem(event, workspaceRequired);
-            if (mcpProblem) {
-              input.log(mcpProblem);
-              child.kill("SIGTERM");
-              setTimeout(() => child.kill("SIGKILL"), 3e3).unref();
-            }
+            stopBlindSession(workspaceMcpProblem(event, workspaceRequired));
+          }
+          if (workspaceRequired && !mcpProblem) {
+            stopBlindSession(mcpWatch.observe(event));
           }
           if (input.onStep) {
             for (const step2 of stepsFromClaudeEvent(event, { mcpNames })) input.onStep(step2);
@@ -2118,9 +2202,9 @@ async function runSession(input, bin, dirs) {
   const durationS = Math.round((Date.now() - startedAt) / 1e3);
   const { usage, result } = normalizeClaudeUsage(resultEvent, input.agent.model, durationS);
   const ok2 = !mcpProblem && exitCode === 0 && !!resultEvent && !result.is_error;
-  const resultText = mcpProblem ?? result.result ?? (ok2 ? "" : `Session ended with exit code ${exitCode}${resultEvent ? "" : " and no result event"}.`);
+  const resultText2 = mcpProblem ?? result.result ?? (ok2 ? "" : `Session ended with exit code ${exitCode}${resultEvent ? "" : " and no result event"}.`);
   const limit3 = ok2 ? void 0 : detectClaudeLimit(
-    `${resultText}
+    `${resultText2}
 ${stderrLines.slice(-20).join("\n")}`,
     Date.now(),
     engineUsageWindows(CLAUDE_DRIVER_ID)?.fallbackMs ?? 5 * 60 * 60 * 1e3
@@ -2130,7 +2214,7 @@ ${stderrLines.slice(-20).join("\n")}`,
     transcript: `${lines.join("\n")}
 `,
     usage,
-    resultText,
+    resultText: resultText2,
     ...limit3 ? { limit: limit3 } : {}
   };
 }
@@ -2721,8 +2805,8 @@ 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();
+function backstopReportContent(resultText2) {
+  const text = resultText2.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 };
@@ -2752,7 +2836,11 @@ async function finalizeJob(db, shipId, job, input) {
     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 } : {},
+      // `reportBackstop` rides with the pair rather than being derived later, because after the
+      // write there is nothing left to derive it FROM: a synthesized report and a written one are
+      // the same two strings. It is what stops a screen labelling a session's closing message
+      // "Report" — see the field's docblock in @lumi/crew-shared.
+      ...backstop ? { report: backstop.report, reportSummary: backstop.summary, reportBackstop: true } : {},
       status: input.status,
       endedAt: now,
       usage: u,
@@ -2890,8 +2978,8 @@ Write again to start a fresh run.`;
   });
 }
 var REPLY_SCAN_LIMIT = 20;
-function backstopReplyContent(resultText) {
-  const text = resultText.trim();
+function backstopReplyContent(resultText2) {
+  const text = resultText2.trim();
   if (!text) {
     return "I finished that run without writing a reply. Write again to start a fresh one.";
   }
@@ -2899,7 +2987,7 @@ function backstopReplyContent(resultText) {
   const marker = "\n\n\u2026(truncated)";
   return `${text.slice(0, MAX_CHAT_MESSAGE_CHARS - marker.length)}${marker}`;
 }
-async function ensureChatReply(db, shipId, job, resultText) {
+async function ensureChatReply(db, shipId, job, resultText2) {
   const chatRef = doc6(db, COLLECTIONS.ships, shipId, COLLECTIONS.chats, job.chatId);
   const messagesCol = collection5(chatRef, COLLECTIONS.chatMessages);
   const snap = await getDocs4(
@@ -2915,14 +3003,14 @@ async function ensureChatReply(db, shipId, job, resultText) {
     return author?.type === "agent" && author.id === job.agentId;
   });
   if (replied) return "agent-replied";
-  const content = backstopReplyContent(resultText);
+  const content = backstopReplyContent(resultText2);
   await addDoc(messagesCol, {
     author: { type: "agent", id: job.agentId },
     content,
     chars: content.length,
     createdAt: Date.now()
   });
-  return resultText.trim() ? "posted-final-text" : "posted-silence-note";
+  return resultText2.trim() ? "posted-final-text" : "posted-silence-note";
 }
 
 // src/jobs/progress.ts
@@ -4177,7 +4265,7 @@ async function startDaemon() {
     let sessionLimit = null;
     let engineId = DEFAULT_ENGINE_ID;
     let transcript = "";
-    let resultText = "";
+    let resultText2 = "";
     let usage = {
       engine: DEFAULT_ENGINE_ID,
       inputTokens: 0,
@@ -4239,7 +4327,10 @@ async function startDaemon() {
           `Runner credentials are not configured for this Ship \u2014 a captain must save the following in Ship Settings: ${missing.join(", ")}.`
         );
       }
-      const idToken = await sess(shipId).user.getIdToken();
+      const idToken = await sessionIdToken(sess(shipId).user, {
+        timeoutMs: JOB_TIMEOUT_MS,
+        log: log2
+      });
       extraMcpServers = await resolveMcpServers({
         config: config2,
         idToken,
@@ -4338,7 +4429,7 @@ async function startDaemon() {
         });
         armLimitTimer();
       }
-      resultText = session.resultText;
+      resultText2 = session.resultText;
       if (!session.ok) failure = session.resultText || "Session failed.";
     } catch (e) {
       failure = e instanceof Error ? e.message : String(e);
@@ -4361,7 +4452,7 @@ async function startDaemon() {
           // §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,
+          resultText: resultText2,
           mcpServers: extraMcpServers.map((s) => s.key)
         });
         const by = slot.stop.by;
@@ -4411,7 +4502,7 @@ async function startDaemon() {
           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,
+          resultText: resultText2,
           mcpServers: extraMcpServers.map((s) => s.key)
         });
         log2(`Job ${job.id} done (${usage.inputTokens}in/${usage.outputTokens}out tokens).`);
@@ -4422,7 +4513,7 @@ async function startDaemon() {
               sess(shipId).fb.db,
               shipId,
               { ...job, chatId: target.chatId },
-              resultText
+              resultText2
             );
             if (delivery === "posted-final-text") {
               log2(
@@ -4468,7 +4559,7 @@ async function startDaemon() {
           // §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,
+          resultText: resultText2,
           mcpServers: extraMcpServers.map((s) => s.key)
         });
         if (target.kind === "chat") {

package/package.json

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