byollm 0.1.0-alpha.76 → 0.1.0-alpha.78

package/README.md

@@ -1,5 +1,5 @@
 > [!WARNING]
-> **Alpha (`0.1.0-alpha.76`) — under active development. Don't use this yet.**
+> **Alpha (`0.1.0-alpha.78`) — under active development. Don't use this yet.**
 >
 > Install it deliberately: `npx byollm@alpha`, or `npm install byollm@alpha`.
 >

package/dist/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   main
-} from "./chunk-MSRBBLRQ.js";
+} from "./chunk-ZROCDZDA.js";
 
 // src/bin.ts
 process.exitCode = await main(process.argv.slice(2));

package/dist/{chunk-MSRBBLRQ.js → chunk-ZROCDZDA.js}

@@ -59,7 +59,8 @@ var BOLD = "\x1B[1m";
 var RESET = "\x1B[0m";
 function emphasisAllowed(context2) {
   if (context2.env["NO_COLOR"] !== void 0) return false;
-  if (context2.env["FORCE_COLOR"] !== void 0) return true;
+  const forced = context2.env["FORCE_COLOR"];
+  if (forced !== void 0) return forced !== "0" && forced !== "";
   return context2.tty;
 }
 function emphasise(value, context2) {
@@ -3597,6 +3598,7 @@ function joinSections(sections) {
 }
 
 // src/runner.ts
+var AUTH_RECHECK_MS = 6e4;
 var DEFAULT_HEARTBEAT_MS = 1e4;
 function sameKey(a, b) {
   return a.identity === b.identity && a.encryption === b.encryption && a.encryptionSig === b.encryptionSig;
@@ -3665,6 +3667,10 @@ var Runner = class {
    * service was blocked.
    */
   #blockedReport = /* @__PURE__ */ new Map();
+  /** Signed-out services' reports, kept for the same reason blocked ones are. */
+  #withdrawnReport = /* @__PURE__ */ new Map();
+  /** Earliest moment each withdrawn service may be asked again — T2-S1. */
+  #authRecheckAt = /* @__PURE__ */ new Map();
   /** What was last handed to the writer, so an unchanged pass writes nothing. */
   #lastWritten;
   /**
@@ -3779,7 +3785,29 @@ var Runner = class {
     const capabilities = [];
     const probed = /* @__PURE__ */ new Map();
     for (const route of this.#options.loaded.routes) {
-      if (this.#unauthenticated.has(route.service)) continue;
+      if (this.#unauthenticated.has(route.service)) {
+        const recheckAt = this.#authRecheckAt.get(route.service) ?? 0;
+        const backend = this.#backendFor(route);
+        const lifted = this.#now() >= recheckAt && backend.canary !== void 0 && (await backend.canary(route.model)).healthy;
+        if (!lifted) {
+          if (this.#now() >= recheckAt) {
+            this.#authRecheckAt.set(
+              route.service,
+              this.#now() + AUTH_RECHECK_MS
+            );
+          }
+          const kept = this.#withdrawnReport.get(route.service);
+          if (kept !== void 0) this.serviceStates.set(route.service, kept);
+          continue;
+        }
+        this.#unauthenticated.delete(route.service);
+        this.#withdrawnReport.delete(route.service);
+        this.#authRecheckAt.delete(route.service);
+        this.#options.onEvent?.({
+          type: "service-signed-in",
+          service: route.service
+        });
+      }
       const blockedUntil = this.#blocked.get(route.service);
       if (this.#blocked.has(route.service)) {
         if (blockedUntil !== void 0 && this.#now() < blockedUntil) {
@@ -4235,12 +4263,14 @@ var Runner = class {
       });
       if (!result.ok && result.code === "unauthorized") {
         this.#unauthenticated.add(route.service);
-        this.#noteServiceState(route.service, {
+        const withdrawn = this.#noteServiceState(route.service, {
+          ...this.serviceStates.get(route.service),
           state: {
             kind: "signed-out",
             detail: result.message
           }
         });
+        this.#withdrawnReport.set(route.service, withdrawn);
         this.#options.onEvent?.({
           type: "service-not-signed-in",
           service: route.service,
@@ -4391,9 +4421,19 @@ var Runner = class {
   #writeServiceStates() {
     const now = JSON.stringify([...this.serviceStates]);
     if (now === this.#lastWritten) return;
-    this.#lastWritten = now;
     const noted = this.#options.onServiceStates?.(this.serviceStates);
-    if (noted !== void 0) void noted.catch(() => void 0);
+    if (noted === void 0) {
+      this.#lastWritten = now;
+      return;
+    }
+    void noted.then(
+      () => {
+        this.#lastWritten = now;
+      },
+      () => {
+        this.#lastWritten = void 0;
+      }
+    );
   }
   /**
    * Note a refusal that means the relationship is over.
@@ -4548,6 +4588,20 @@ var Runner = class {
     }
     const fetched = await this.#fetchWhenSealed(job);
     if (!fetched) return;
+    if ("gone" in fetched) {
+      this.#options.onEvent?.({
+        type: "error",
+        message: `${job.id} is not ours to run: ${fetched.gone}`
+      });
+      await this.#safely(
+        () => this.#options.client.release({
+          runnerId: this.#options.runnerId,
+          leases: [{ jobId: job.id, leaseId: job.lease.id }],
+          reason: "refused"
+        })
+      );
+      return;
+    }
     const payload = await this.#openPayload(job, fetched.envelope);
     const resolved = job.grant?.service;
     const route = this.#routeFor(job.kind, resolved);
@@ -4643,6 +4697,28 @@ var Runner = class {
    * the job up quietly — the upstream's `awaiting-payload` timer will requeue
    * it, and the stub was never lost.
    */
+  /**
+   * Wait for the payload, or say the job is over for this device — B038.
+   *
+   * The stuck-daemon loop, reported live on a real user's Windows machine: a
+   * claimed job came back "unknown job", the daemon abandoned it **without
+   * releasing the lease**, the hub re-offered it, and the same daemon
+   * re-claimed the same id every twenty seconds forever. The log spammed
+   * claim, unknown job, reclaim; the device looked wedged while fresh jobs on
+   * a live site still ran fine.
+   *
+   * Both exits leaked. A terminal error threw straight out of `#handle` into
+   * the background `catch`, and the give-up-at-deadline path returned `null`
+   * into `if (!fetched) return`. Neither released anything, and the comment on
+   * that `catch` explains why nobody noticed: letting the lease lapse *is*
+   * the recovery the protocol is built around — for a transient failure. For
+   * a permanent one it is an invitation to be offered the same job again.
+   *
+   * So this reports *why* it stopped instead of throwing, and the caller
+   * releases. `refused` is the shape the relay already has for exactly this:
+   * a permanent decline, which means the job is never offered to this device
+   * again. Nothing new on the wire.
+   */
   async #fetchWhenSealed(job) {
     const deadline = Math.min(job.lease.expiresAt, this.#now() + 3e4);
     let delay = 50;
@@ -4655,13 +4731,18 @@ var Runner = class {
         });
       } catch (error) {
         const notReady = error instanceof ClientError && error.kind === "not-ready";
-        if (!notReady) throw error;
+        if (!notReady) {
+          if (error instanceof ClientError && error.kind === "rejected") {
+            return { gone: error.message };
+          }
+          throw error;
+        }
         if (this.#now() + delay >= deadline) {
           this.#options.onEvent?.({
             type: "error",
             message: `gave up waiting for the payload of ${job.id}`
           });
-          return null;
+          return { gone: `the payload never arrived for ${job.id}` };
         }
         await new Promise((resolve) => setTimeout(resolve, delay));
         delay = Math.min(delay * 2, 1e3);
@@ -6317,6 +6398,12 @@ function report(origin, event, io) {
         `${at} ${host} ${event.service} is not signed in \u2014 it has stopped taking work.
     ${event.detail}
     Sign in with that tool, then restart: \`byollm run\` re-checks on start.
+`
+      );
+      break;
+    case "service-signed-in":
+      io.err(
+        `${at} ${host} ${event.service} is signed in again \u2014 it is taking work.
 `
       );
       break;
@@ -7029,7 +7116,7 @@ async function exists(path) {
 }
 
 // src/index.ts
-var DAEMON_VERSION = "0.1.0-alpha.76";
+var DAEMON_VERSION = "0.1.0-alpha.78";
 function daemonVersion() {
   return {
     daemon: DAEMON_VERSION,
@@ -7081,4 +7168,4 @@ export {
   runCli,
   main
 };
-//# sourceMappingURL=chunk-MSRBBLRQ.js.map
+//# sourceMappingURL=chunk-ZROCDZDA.js.map