pi-landstrip 0.18.11 → 0.18.12

package/dist/index.ts

@@ -275,38 +275,69 @@ function colorizeAgentText(color, text, themeFg, fallback = "accent") {
 
 class AsyncQueue {
   tail = Promise.resolve();
+  generation = 0;
+  resetWaiters = [];
   async acquire(signal, cancellationMessage = "Request cancelled") {
     if (signal?.aborted)
       throw new Error(cancellationMessage);
+    const generation = this.generation;
     let release;
     const previous = this.tail;
     this.tail = new Promise((resolve2) => {
       release = resolve2;
     });
-    if (!signal) {
-      await previous;
-      return release;
-    }
-    let abort;
+    const finish = () => {
+      release?.();
+    };
+    let wakeReset;
+    const resetSignal = new Promise((resolve2) => {
+      wakeReset = resolve2;
+      this.resetWaiters.push(resolve2);
+    });
+    const dropResetWaiter = () => {
+      if (!wakeReset)
+        return;
+      const index = this.resetWaiters.indexOf(wakeReset);
+      if (index >= 0)
+        this.resetWaiters.splice(index, 1);
+      wakeReset = undefined;
+    };
     try {
-      await Promise.race([
-        previous,
-        new Promise((_resolve, reject) => {
-          abort = () => reject(new Error(cancellationMessage));
-          signal.addEventListener("abort", abort, { once: true });
-        })
-      ]);
+      if (!signal) {
+        await Promise.race([previous, resetSignal]);
+      } else {
+        let abort;
+        try {
+          await Promise.race([
+            previous,
+            resetSignal,
+            new Promise((_resolve, reject) => {
+              abort = () => reject(new Error(cancellationMessage));
+              signal.addEventListener("abort", abort, { once: true });
+            })
+          ]);
+        } finally {
+          if (abort)
+            signal.removeEventListener("abort", abort);
+        }
+      }
+      if (this.generation !== generation) {
+        throw new Error(cancellationMessage);
+      }
+      return finish;
     } catch (error) {
-      previous.finally(() => release?.());
+      previous.finally(finish);
       throw error;
     } finally {
-      if (abort)
-        signal.removeEventListener("abort", abort);
+      dropResetWaiter();
     }
-    return release;
   }
   reset() {
+    this.generation += 1;
     this.tail = Promise.resolve();
+    const waiters = this.resetWaiters.splice(0);
+    for (const wake of waiters)
+      wake();
   }
 }
 
@@ -2085,14 +2116,14 @@ class Semaphore {
     if (this.active >= this.limit)
       return;
     this.active += 1;
-    return () => this.release();
+    return this.releaseOnce();
   }
   async acquire(signal) {
     if (signal?.aborted)
       throw new Error("Task cancelled");
     if (this.active < this.limit) {
       this.active += 1;
-      return () => this.release();
+      return this.releaseOnce();
     }
     await new Promise((resolve3, reject) => {
       const abort = () => {
@@ -2109,11 +2140,17 @@ class Semaphore {
       this.waiters.push(start);
       signal?.addEventListener("abort", abort, { once: true });
     });
-    return () => this.release();
+    return this.releaseOnce();
   }
-  release() {
-    this.active -= 1;
-    this.waiters.shift()?.();
+  releaseOnce() {
+    let released = false;
+    return () => {
+      if (released)
+        return;
+      released = true;
+      this.active -= 1;
+      this.waiters.shift()?.();
+    };
   }
 }
 
@@ -2708,7 +2745,9 @@ ${this.primaryAgent.prompt}` };
             const dirty = dirtySettings.has(index) ? theme.fg("warning", " *") : "";
             lines2.push(`${cursor} ${value} ${label}${dirty}`);
           }
-          lines2.push("", theme.fg("dim", selectedSetting === 0 ? rows[0]?.inherited ? "Sets concurrent subagents. Zero disables the task tool. Using the Global value." : "Sets concurrent subagents. Zero disables the task tool." : rows[1]?.inherited ? "Controls OS sandboxing. Use /sandbox to inspect its policy. Using the Global value." : "Controls OS sandboxing. Use /sandbox to inspect its policy."));
+          if (selectedSetting === 1) {
+            lines2.push("", theme.fg("dim", rows[1]?.inherited ? "Controls OS sandboxing. Use /sandbox to inspect its policy. Using the Global value." : "Controls OS sandboxing. Use /sandbox to inspect its policy."));
+          }
           if (saving)
             lines2.push("", theme.fg("dim", "Saving…"));
           return box(lines2);
@@ -3718,7 +3757,9 @@ ${catalog.diagnostics.join(`
             });
           } finally {
             if (handedOff)
-              await this.restoreLease(task.id, signal);
+              await this.restoreLease(task.id).catch(() => {
+                return;
+              });
           }
           response = {
             ok: true,
@@ -4015,11 +4056,11 @@ ${renderTaskResult(task.id, failed ? "error" : "completed", value)}`;
     lease.release = undefined;
     return true;
   }
-  async restoreLease(taskId, signal) {
+  async restoreLease(taskId) {
     const lease = this.leases.get(taskId);
     if (!lease || lease.release)
       return;
-    const release = await this.semaphore.acquire(signal);
+    const release = await this.semaphore.acquire();
     const current = this.leases.get(taskId);
     if (!current || current.release) {
       release();
@@ -4194,8 +4235,8 @@ function readOrEmptyConfig(configPath) {
     return {};
   try {
     return JSON.parse(readFileSync6(configPath, "utf-8"));
-  } catch {
-    return {};
+  } catch (error) {
+    throw new Error(`${configPath}: ${formatError(error)}`);
   }
 }
 function writeConfigFile(configPath, config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-landstrip",
-  "version": "0.18.11",
+  "version": "0.18.12",
   "description": "Sandboxed Bash and process-backed agents for Pi",
   "keywords": [
     "landstrip",
@@ -39,7 +39,7 @@
     "ci:test": "npm run test"
   },
   "dependencies": {
-    "@landstrip/landstrip": "^0.18.11",
+    "@landstrip/landstrip": "^0.18.12",
     "jsonc-parser": "^3.3.1",
     "minimatch": "^10.2.5",
     "yaml": "^2.9.0"