@drisp/cli 0.6.2 → 0.6.3

package/dist/{chunk-ANYY7XRT.js → chunk-7YXGHTA7.js}

@@ -15084,6 +15084,14 @@ function createDashboardFeedOutbox(options = {}) {
 		SET acked_at = ?
 		WHERE event_id = ?
 	`);
+  const deleteOtherInstances = db.prepare(`
+		DELETE FROM dashboard_feed_outbox
+		WHERE delivery_seq IN (
+			SELECT delivery_seq FROM dashboard_feed_outbox
+			WHERE instance_id < ? OR instance_id > ?
+			LIMIT ?
+		)
+	`);
   const enqueueTx = db.transaction(
     (input) => {
       for (const feedEvent of input.feedEvents) {
@@ -15148,6 +15156,13 @@ function createDashboardFeedOutbox(options = {}) {
         ackByEventId.run(now, input.eventId);
       }
     },
+    pruneOtherInstances(input) {
+      return deleteOtherInstances.run(
+        input.instanceId,
+        input.instanceId,
+        input.limit
+      ).changes;
+    },
     close() {
       owned2?.close();
     }
@@ -15156,15 +15171,20 @@ function createDashboardFeedOutbox(options = {}) {
 
 // src/app/dashboard/pairedFeedPublisher.ts
 var DEFAULT_DRAIN_INTERVAL_MS = 1e3;
+var DEFAULT_PRUNE_BATCH_SIZE = 500;
 function createPairedFeedPublisher(options = {}) {
   const readConfig2 = options.readConfig ?? (() => readDashboardClientConfig());
   const now = options.now ?? (() => Date.now());
   const onError = options.onError ?? (() => {
   });
+  const onInfo = options.onInfo ?? (() => {
+  });
   const drainIntervalMs = options.drainIntervalMs ?? DEFAULT_DRAIN_INTERVAL_MS;
+  const pruneBatchSize = options.pruneBatchSize ?? DEFAULT_PRUNE_BATCH_SIZE;
   let ownedOutbox = null;
   let transport = null;
   let drainTimer = null;
+  let prunedSoFar = null;
   function getOutbox() {
     if (options.outbox) return options.outbox;
     ownedOutbox ??= createDashboardFeedOutbox();
@@ -15176,7 +15196,7 @@ function createPairedFeedPublisher(options = {}) {
     drainTimer = null;
   }
   function drain(force = false) {
-    if (!transport) return;
+    if (!transport) return null;
     let config2;
     try {
       config2 = readConfig2();
@@ -15184,9 +15204,9 @@ function createPairedFeedPublisher(options = {}) {
       onError(
         `paired feed drain failed: ${err instanceof Error ? err.message : String(err)}`
       );
-      return;
+      return null;
     }
-    if (!config2) return;
+    if (!config2) return null;
     const rows = getOutbox().pendingBatch({
       instanceId: config2.instanceId,
       limit: 100,
@@ -15202,13 +15222,41 @@ function createPairedFeedPublisher(options = {}) {
         nextAttemptAt: now() + Math.min(3e4, (row.attempt + 1) * 1e3)
       });
     }
+    return config2;
+  }
+  function tick(force = false) {
+    const config2 = drain(force);
+    if (config2) pruneStep(config2.instanceId);
+  }
+  function pruneStep(instanceId) {
+    if (prunedSoFar === null) return;
+    try {
+      const deleted = getOutbox().pruneOtherInstances({
+        instanceId,
+        limit: pruneBatchSize
+      });
+      prunedSoFar += deleted;
+      if (deleted < pruneBatchSize) {
+        if (prunedSoFar > 0) {
+          onInfo(
+            `paired feed: pruned ${prunedSoFar} outbox row(s) left by previous pairings`
+          );
+        }
+        prunedSoFar = null;
+      }
+    } catch (err) {
+      prunedSoFar = null;
+      onError(
+        `paired feed prune failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
   }
   function startDrainTimer() {
     clearDrainTimer();
-    const timer = setInterval(drain, drainIntervalMs);
+    const timer = setInterval(() => tick(), drainIntervalMs);
     timer.unref();
     drainTimer = timer;
-    drain(true);
+    tick(true);
   }
   return {
     publish(input) {
@@ -15232,6 +15280,7 @@ function createPairedFeedPublisher(options = {}) {
     },
     attachTransport(nextTransport) {
       transport = nextTransport;
+      prunedSoFar ??= 0;
       startDrainTimer();
     },
     detachTransport() {
@@ -33210,6 +33259,8 @@ var DEFAULT_REFRESH_LEAD_SEC = 60;
 var DEFAULT_REFRESH_FAILURE_LIMIT = 5;
 var DEFAULT_REFRESH_FAILURE_WINDOW_MS = 5 * 6e4;
 var DEFAULT_REFRESH_COOLDOWN_MS = 5 * 6e4;
+var DEFAULT_COOLDOWN_PROBE_DELAYS_MS = [2e3, 5e3, 1e4, 15e3];
+var HUB_PROBE_TIMEOUT_MS = 5e3;
 var DEFAULT_RUN_HISTORY_LIMIT2 = 100;
 function delay(ms) {
   return new Promise((resolve) => {
@@ -33217,6 +33268,28 @@ function delay(ms) {
     timer.unref();
   });
 }
+async function probeHubReachable(dashboardUrl, signal) {
+  const controller = new AbortController();
+  const onAbort = () => controller.abort();
+  signal.addEventListener("abort", onAbort, { once: true });
+  const timer = setTimeout(onAbort, HUB_PROBE_TIMEOUT_MS);
+  timer.unref();
+  try {
+    const response = await fetch(`${dashboardUrl}/api/instances/refresh`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: "{}",
+      redirect: "manual",
+      signal: controller.signal
+    });
+    return response.status < 500;
+  } catch {
+    return false;
+  } finally {
+    clearTimeout(timer);
+    signal.removeEventListener("abort", onAbort);
+  }
+}
 async function runDashboardRuntimeDaemon(options = {}) {
   const readConfig2 = options.readConfig ?? (() => readDashboardClientConfig());
   const refreshAccessTokenFn = options.refreshAccessToken ?? (async () => refreshDashboardAccessToken({}));
@@ -33237,6 +33310,8 @@ async function runDashboardRuntimeDaemon(options = {}) {
   const refreshFailureLimit = options.refreshFailureLimit ?? DEFAULT_REFRESH_FAILURE_LIMIT;
   const refreshFailureWindowMs = options.refreshFailureWindowMs ?? DEFAULT_REFRESH_FAILURE_WINDOW_MS;
   const refreshCooldownMs = options.refreshCooldownMs ?? DEFAULT_REFRESH_COOLDOWN_MS;
+  const cooldownProbeDelays = options.cooldownProbeDelaysMs ?? DEFAULT_COOLDOWN_PROBE_DELAYS_MS;
+  const probeHub = options.probeHub ?? probeHubReachable;
   const runHistoryLimit = options.runHistoryLimit ?? DEFAULT_RUN_HISTORY_LIMIT2;
   const now = options.now ?? (() => Date.now());
   const writeMirror = options.writeMirror ?? writeAttachmentMirror;
@@ -33262,6 +33337,9 @@ async function runDashboardRuntimeDaemon(options = {}) {
   let refreshTimer = null;
   const refreshFailures = [];
   let cooldownUntil = 0;
+  let cooldownEndedEarly = false;
+  let hubUnreachable = false;
+  const probeAbort = new AbortController();
   const executionClient = {
     sendRunEvent(event) {
       const current = client ?? lastSocketClient;
@@ -33378,8 +33456,9 @@ async function runDashboardRuntimeDaemon(options = {}) {
     while (refreshFailures.length > 0 && ts - (refreshFailures[0] ?? 0) > refreshFailureWindowMs) {
       refreshFailures.shift();
     }
-    if (refreshFailures.length >= refreshFailureLimit) {
+    if (refreshFailures.length >= refreshFailureLimit || cooldownEndedEarly) {
       cooldownUntil = ts + refreshCooldownMs;
+      cooldownEndedEarly = false;
       refreshFailures.length = 0;
       log(
         "warn",
@@ -33389,6 +33468,38 @@ async function runDashboardRuntimeDaemon(options = {}) {
       );
     }
   }
+  async function waitOutCooldown(dashboardUrl) {
+    let attempt = 0;
+    let sawHubDown = false;
+    try {
+      while (!stopped && cooldownUntil > now()) {
+        const remainingMs = cooldownUntil - now();
+        if (cooldownProbeDelays.length === 0) {
+          await delay(remainingMs);
+          return;
+        }
+        const probeDelayMs = cooldownProbeDelays[Math.min(attempt, cooldownProbeDelays.length - 1)] ?? remainingMs;
+        attempt += 1;
+        await delay(Math.min(remainingMs, probeDelayMs));
+        if (stopped || cooldownUntil <= now()) return;
+        const reachable = await probeHub(dashboardUrl, probeAbort.signal);
+        hubUnreachable = !reachable;
+        if (!reachable) {
+          sawHubDown = true;
+        } else if (sawHubDown) {
+          cooldownUntil = 0;
+          cooldownEndedEarly = true;
+          log(
+            "info",
+            "runtime daemon: hub is reachable again; ending refresh cooldown early"
+          );
+          return;
+        }
+      }
+    } finally {
+      hubUnreachable = false;
+    }
+  }
   async function connectOnce() {
     const config2 = readConfig2();
     if (!config2) {
@@ -33398,17 +33509,18 @@ async function runDashboardRuntimeDaemon(options = {}) {
       const remainingMs = Math.max(0, cooldownUntil - now());
       log(
         "warn",
-        `runtime daemon: refresh cooldown active, sleeping ${Math.ceil(
+        `runtime daemon: refresh cooldown active for ${Math.ceil(
           remainingMs / 1e3
-        )}s`
+        )}s; probing the hub meanwhile`
       );
-      await delay(remainingMs);
+      await waitOutCooldown(config2.dashboardUrl);
       if (stopped) return;
     }
     let token;
     try {
       token = await refreshAccessTokenFn();
       refreshFailures.length = 0;
+      cooldownEndedEarly = false;
     } catch (err) {
       noteRefreshFailure();
       throw err;
@@ -33540,7 +33652,8 @@ async function runDashboardRuntimeDaemon(options = {}) {
       const executionSnapshot = pairedExecution.snapshot();
       const refreshState = refreshFailures.length > 0 || cooldownUntil > now() ? {
         recentFailures: refreshFailures.length,
-        ...cooldownUntil > now() ? { cooldownUntilMs: cooldownUntil } : {}
+        ...cooldownUntil > now() ? { cooldownUntilMs: cooldownUntil } : {},
+        ...hubUnreachable ? { hubUnreachable: true } : {}
       } : void 0;
       return {
         startedAt,
@@ -33560,6 +33673,7 @@ async function runDashboardRuntimeDaemon(options = {}) {
     async stop(reason = "stopped") {
       stopped = true;
       clearRefreshTimer();
+      probeAbort.abort();
       workflowWatcher.close();
       pairedFeedPublisher.close();
       const current = client;
@@ -33962,6 +34076,7 @@ async function startRunnerProcess(options = {}) {
       outbox,
       now,
       onError: (message) => log("warn", message),
+      onInfo: (message) => log("info", message),
       ...options.feedDrainIntervalMs !== void 0 ? { drainIntervalMs: options.feedDrainIntervalMs } : {}
     });
     daemon = await runDashboardRuntimeDaemon({
@@ -34136,4 +34251,4 @@ export {
   startRunnerProcess,
   waitForShutdownSignal
 };
-//# sourceMappingURL=chunk-ANYY7XRT.js.map
+//# sourceMappingURL=chunk-7YXGHTA7.js.map

package/dist/{chunk-VETXW62U.js → chunk-DQE7XYTJ.js}

@@ -1,7 +1,7 @@
 import {
   startRunnerProcess,
   waitForShutdownSignal
-} from "./chunk-ANYY7XRT.js";
+} from "./chunk-7YXGHTA7.js";
 
 // src/app/entry/runnerDaemon.ts
 import path from "path";
@@ -46,4 +46,4 @@ if (process.argv.includes("--help")) {
 export {
   runRunnerDaemonEntry
 };
-//# sourceMappingURL=chunk-VETXW62U.js.map
+//# sourceMappingURL=chunk-DQE7XYTJ.js.map

package/dist/cli.js

@@ -102,7 +102,7 @@ import {
   wrapText,
   writeAttachmentMirror,
   writeDashboardClientConfig
-} from "./chunk-ANYY7XRT.js";
+} from "./chunk-7YXGHTA7.js";
 import {
   generateId as generateId2
 } from "./chunk-USK5VSQ7.js";
@@ -13148,7 +13148,7 @@ var cachedVersion = null;
 function readPackageVersion() {
   if (cachedVersion !== null) return cachedVersion;
   try {
-    const injected = "0.6.2";
+    const injected = "0.6.3";
     if (typeof injected === "string" && injected.length > 0) {
       cachedVersion = injected;
       return cachedVersion;
@@ -13467,11 +13467,19 @@ async function runRunnerCommand(input, deps = {}) {
             const remainingSec = Math.ceil(
               (r.refreshState.cooldownUntilMs - now()) / 1e3
             );
-            logError(
-              `refresh:   circuit-broken \u2014 sleeping for ${formatDuration2(
-                remainingSec
-              )} before retry. Re-pair if this persists.`
-            );
+            if (r.refreshState.hubUnreachable) {
+              logError(
+                `refresh:   circuit-broken \u2014 hub unreachable; probing it and reconnecting as soon as it answers (retries anyway in ${formatDuration2(
+                  remainingSec
+                )})`
+              );
+            } else {
+              logError(
+                `refresh:   circuit-broken \u2014 sleeping for ${formatDuration2(
+                  remainingSec
+                )} before retry. Re-pair if this persists.`
+              );
+            }
           } else {
             logOut(
               `refresh:   ${r.refreshState.recentFailures} recent failure(s); next reconnect will retry`

package/dist/dashboard-daemon.js

@@ -1,7 +1,7 @@
 import {
   runRunnerDaemonEntry
-} from "./chunk-VETXW62U.js";
-import "./chunk-ANYY7XRT.js";
+} from "./chunk-DQE7XYTJ.js";
+import "./chunk-7YXGHTA7.js";
 import "./chunk-USK5VSQ7.js";
 import "./chunk-QVRTU2MM.js";
 import "./chunk-PZ5AY32C.js";

package/dist/runner.js

@@ -1,7 +1,7 @@
 import {
   runRunnerDaemonEntry
-} from "./chunk-VETXW62U.js";
-import "./chunk-ANYY7XRT.js";
+} from "./chunk-DQE7XYTJ.js";
+import "./chunk-7YXGHTA7.js";
 import "./chunk-USK5VSQ7.js";
 import "./chunk-QVRTU2MM.js";
 import "./chunk-PZ5AY32C.js";

package/package.json

@@ -17,7 +17,7 @@
 		"hooks",
 		"dashboard"
 	],
-	"version": "0.6.2",
+	"version": "0.6.3",
 	"license": "MIT",
 	"bin": {
 		"athena": "dist/cli.js",