@herdingchats/friday 0.1.538 → 0.1.541

package/herd.mjs

@@ -18,7 +18,7 @@ var __export = (target, all) => {
 var define_HERD_PACKAGE_default;
 var init_define_HERD_PACKAGE = __esm({
   "<define:HERD_PACKAGE>"() {
-    define_HERD_PACKAGE_default = { version: "0.1.538", gitHead: "ddb7331693c41a23a60c6f16eefa82f7adc09860" };
+    define_HERD_PACKAGE_default = { version: "0.1.541", gitHead: "ca2d136a1b409a0d993ead45879528bb25fd4ac5" };
   }
 });
 
@@ -4733,6 +4733,7 @@ async function permissionHook(raw, options = {}) {
 var ACTIVATION_DEADLINE_MS = 3 * 60 * 1e3;
 var ACTIVATION_POLL_MS = 500;
 var SIGN_IN_RESTART_MS = 20 * 1e3;
+var KILL_WAIT_MS = 5e3;
 var BUSY_POLL_MS = 2e3;
 var activationPrompt = (code) => `herd is checking that you can work from its terminals. Run \`herd activate ${code}\` now, then stop.`;
 var CODE_LETTERS = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
@@ -4939,10 +4940,19 @@ var Activator = class {
     let startedAt = 0;
     let prompted = false;
     let signingIn = wasSignedOut;
+    const stillRunning = async () => (await terminals.list().catch(() => [])).some(
+      (t) => t.name === current.terminal && !t.exited
+    );
     const start = async () => {
-      const existing = (await terminals.list()).find((t) => t.name === current.terminal);
-      if (existing) await terminals.kill(current.terminal).catch(() => {
-      });
+      if (await stillRunning()) {
+        await terminals.kill(current.terminal).catch(() => {
+        });
+        const until = Date.now() + (this.options.killWaitMs ?? KILL_WAIT_MS);
+        while (await stillRunning()) {
+          if (Date.now() >= until) return;
+          await new Promise((resolve6) => setTimeout(resolve6, Math.min(pollMs, 100)));
+        }
+      }
       const shell = process.env.SHELL ?? "/bin/sh";
       await terminals.create({
         name: current.terminal,
@@ -5918,8 +5928,8 @@ var Supervisor = class {
   failures = 0;
   restartTimer = null;
   checkTimer = null;
-  /** Releases that failed to install, so each is logged once rather than every check. */
-  failed = /* @__PURE__ */ new Set();
+  /** Releases that failed to install, and when, so each is retried rather than tried every check. */
+  failed = /* @__PURE__ */ new Map();
   status;
   log;
   /** Starts the daemon and the release checks. */
@@ -6066,7 +6076,11 @@ var Supervisor = class {
       return "none";
     }
     const key = `${target} ${integrity ?? ""}`;
-    if (this.failed.has(key)) return "failed";
+    const now = this.options.now?.() ?? Date.now();
+    const failedAt = this.failed.get(key);
+    if (failedAt !== void 0 && now - failedAt < (this.options.retryFailedMs ?? 10 * 6e4)) {
+      return "failed";
+    }
     const release = takeLock(paths.updateLock);
     if (!release) return "busy";
     try {
@@ -6076,7 +6090,9 @@ var Supervisor = class {
         log: this.log
       });
       if (!installed.ok) {
-        this.failed.add(key);
+        const again = failedAt !== void 0;
+        this.failed.set(key, now);
+        if (again) return "failed";
         return this.problem(`Staying on ${current}: ${target} ${installed.reason}`);
       }
       activate(paths, target);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herdingchats/friday",
-  "version": "0.1.538",
+  "version": "0.1.541",
   "description": "Friday, HerdingChats' agent daemon, and the herd command it runs agents with.",
   "license": "MIT",
   "type": "module",
@@ -22,5 +22,5 @@
     "satori": "0.32.0",
     "zod": "4.6.7"
   },
-  "gitHead": "ddb7331693c41a23a60c6f16eefa82f7adc09860"
+  "gitHead": "ca2d136a1b409a0d993ead45879528bb25fd4ac5"
 }