@kilogent/runner-dev 0.1.7 → 0.1.9

package/dist/cli.js

@@ -1257,7 +1257,7 @@ import os from "node:os";
 import path from "node:path";
 
 // src/version.ts
-var RUNNER_VERSION = true ? "0.1.7" : "0.0.0-dev";
+var RUNNER_VERSION = true ? "0.1.9" : "0.0.0-dev";
 var RUNNER_PACKAGE = true ? "@kilogent/runner-dev" : "@kilogent/runner-dev";
 var RUNNER_BIN = true ? "kilogent-runner-dev" : "kilogent-runner-dev";
 
@@ -2495,7 +2495,7 @@ async function resolveAssistantCredential(db, shipId, machine) {
   const credentialId = settings?.assistant?.credentialId ?? settings?.defaultCredentialId;
   const credentials = await loadShipCredentials(db, shipId).catch(() => []);
   const credential = credentialId ? credentials.find((c) => c.id === credentialId) : void 0;
-  const engine2 = credential?.engine ?? DEFAULT_ENGINE_ID;
+  const engine2 = isKnownEngine(credential?.engine) ? credential.engine : DEFAULT_ENGINE_ID;
   const secrets = await resolveJobSecrets({
     db,
     shipId,
@@ -2506,6 +2506,7 @@ async function resolveAssistantCredential(db, shipId, machine) {
   });
   return {
     secrets,
+    engine: engine2,
     // A MODEL, ALWAYS. `engines/claude.ts` puts this straight onto `--model`, and an empty string
     // is an empty flag — a failure that reads as the model misbehaving rather than as a missing
     // value. The engine's own default is the right answer when nothing has been chosen.
@@ -2562,6 +2563,7 @@ var DEFAULT_ENGINE_POLICIES = {
 var MAX_BLOCKED_VERSIONS = 20;
 var ENGINE_FIRST_CHECK_MS = 6e4;
 var ENGINE_CHECK_MS = 6 * 36e5;
+var ENGINE_INSTALL_HOLD_MS = 15 * 6e4;
 function resolveEnginePolicy(engineId, doc13) {
   const shipped = DEFAULT_ENGINE_POLICIES[engineId] ?? { knownGood: "", blocked: [], minAgeHours: 24 };
   const raw = doc13?.[engineId];
@@ -5418,9 +5420,9 @@ async function refreshOne(engineId, input, now) {
 }
 async function ensureEngineReady(engineId, input) {
   const [state] = await refreshEngineTools({ ...input, engineIds: [engineId] });
-  if (!state) return { ok: false, detail: `This runner does not know the engine "${engineId}".` };
-  if (state.state === "ready" || state.state === "unmanaged") return { ok: true, detail: state.detail ?? "" };
-  return { ok: false, detail: state.detail ?? `The "${engineId}" CLI is not installed on this machine.` };
+  if (!state) return { ok: false, detail: `This runner does not know the engine "${engineId}".`, state: null };
+  if (state.state === "ready" || state.state === "unmanaged") return { ok: true, detail: state.detail ?? "", state };
+  return { ok: false, detail: state.detail ?? `The "${engineId}" CLI is not installed on this machine.`, state };
 }
 function describeCurrent(engineId, input, marker, record, reason) {
   if (marker && managedEngineBin(engineId, { root: input.root })) {
@@ -6291,7 +6293,9 @@ async function startDaemon() {
   function engineUsable(engineId) {
     const state = engineToolStates.get(engineId);
     if (!state) return true;
-    return state.state !== "installing";
+    if (state.state !== "installing") return true;
+    const since = engineInstallingSince.get(engineId);
+    return since !== void 0 && Date.now() - since > ENGINE_INSTALL_HOLD_MS;
   }
   let dispatching = false;
   let pokeRequested = false;
@@ -6303,6 +6307,8 @@ async function startDaemon() {
   let updatePhase = null;
   const engineToolStates = /* @__PURE__ */ new Map();
   let checkingEngines = false;
+  let engineCheckRequested = false;
+  const engineInstallingSince = /* @__PURE__ */ new Map();
   let nextEngineCheckAt = Date.now() + ENGINE_FIRST_CHECK_MS + Math.floor(Math.random() * UPDATE_JITTER_MS);
   const loggedEngineRefusals = /* @__PURE__ */ new Set();
   function poke() {
@@ -6576,7 +6582,7 @@ async function startDaemon() {
         );
       }
       const { ship: ship2, agent } = packed.ctx;
-      engineId = agentEngine(agent);
+      engineId = assistantCredential ? assistantCredential.engine : agentEngine(agent);
       usage = { ...usage, engine: engineId };
       statuses = shipTaskStatuses(ship2);
       const resolvedSecrets = assistantCredential ? assistantCredential.secrets : await resolveJobSecrets({
@@ -7010,15 +7016,26 @@ async function startDaemon() {
       policyDoc: policySnap?.exists() ? policySnap.data() : null,
       log: (line) => log2(line),
       onState: (state) => {
-        engineToolStates.set(state.engineId, state);
+        noteEngineState(state);
         void heartbeat();
       }
     });
-    void maybeCheckEnginesSoon();
-    return result;
+    if (result.state) noteEngineState(result.state);
+    void heartbeat();
+    maybeCheckEnginesSoon();
+    return { ok: result.ok, detail: result.detail };
+  }
+  function noteEngineState(state) {
+    engineToolStates.set(state.engineId, state);
+    if (state.state === "installing") {
+      if (!engineInstallingSince.has(state.engineId)) engineInstallingSince.set(state.engineId, Date.now());
+    } else {
+      engineInstallingSince.delete(state.engineId);
+    }
   }
   function maybeCheckEnginesSoon() {
     nextEngineCheckAt = 0;
+    engineCheckRequested = true;
   }
   async function rollBackEngine(engineId, fault, say2) {
     const root = configDir();
@@ -7077,7 +7094,7 @@ async function startDaemon() {
         policyDoc: policySnap?.exists() ? policySnap.data() : null,
         log: (line) => log2(line),
         onState: (state) => {
-          engineToolStates.set(state.engineId, state);
+          noteEngineState(state);
           void heartbeat();
         }
       });
@@ -7088,14 +7105,15 @@ async function startDaemon() {
           log2(`Engine "${state.engineId}": ${state.detail ?? "not installed on this machine"}`);
         }
         if (state.state === "ready") loggedEngineRefusals.delete(key);
-        engineToolStates.set(state.engineId, state);
+        noteEngineState(state);
       }
       poke();
     } catch (e) {
       log2(`Engine check failed: ${e instanceof Error ? e.message : e}`);
     } finally {
       checkingEngines = false;
-      nextEngineCheckAt = Date.now() + ENGINE_CHECK_MS;
+      nextEngineCheckAt = engineCheckRequested ? 0 : Date.now() + ENGINE_CHECK_MS;
+      engineCheckRequested = false;
     }
   }
   function beginUpdate(target) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kilogent/runner-dev",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "module",
   "description": "Lumi Crew runner daemon — claims jobs from your Ships and executes them as headless agent sessions (Claude Code today) 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.",