pi-landstrip 0.20.2 → 0.20.4

package/README.md

@@ -18,9 +18,10 @@ With sandboxing enabled, Bash (`bash`, `!`, `!!`) and workers are OS-isolated.
 Primary file tools run in trusted Pi and preflight paths against the sandbox
 filesystem policy. Tool approval never bypasses hard denials.
 
-Configuration: bundled [`sandbox.json`](sandbox.json) → `~/.pi/agent/sandbox.json`
-→ trusted-project `.pi/sandbox.json`. Arrays combine; later scalars win.
-Persistent approvals update global/project overrides. For policy-only shell reads:
+Configuration is loaded in order from the bundled [`sandbox.json`](sandbox.json),
+`~/.pi/agent/sandbox.json`, and `.pi/sandbox.json` in a trusted project. Later
+files append to list settings and override non-list settings. Persistent
+approvals are written to the global or project file. For policy-only shell reads:
 
 ```json
 { "shell": { "readAccess": "policy" } }
@@ -56,8 +57,8 @@ Configure `~/.pi/agent/landstrip.json`, trusted-project `.pi/landstrip.json`, or
 }
 ```
 
-`maxSubagents`: 0–16. Agent definitions can override model, prompt, mode, options,
-and permissions.
+`maxSubagents` accepts values from 0 to 16. Agent definitions can override
+model, prompt, mode, options, and permissions.
 
 Use `/landstrip-sandbox` for sandbox overview/policy (`Overview`, `Policy`, `Help`)
 and `/landstrip-subagents` for subagent/task management (`Tasks`, `Log`, `Subagent`,

package/dist/index.ts

@@ -3964,6 +3964,32 @@ ${this.primaryAgent.prompt}` };
         unsubscribe();
         done(undefined);
       };
+      const runSaving = (errorPrefix, action) => {
+        saving = true;
+        action().catch((error) => ctx.ui.notify(`${errorPrefix}: ${formatError(error)}`, "error")).finally(() => {
+          saving = false;
+          tui.requestRender();
+        });
+      };
+      const startSteering = (task) => {
+        const input = new Input;
+        input.focused = true;
+        input.onEscape = () => {
+          steering = undefined;
+          tui.requestRender();
+        };
+        input.onSubmit = (value) => {
+          const message = value.trim();
+          if (!message) {
+            ctx.ui.notify("Steering message must not be empty", "warning");
+            return;
+          }
+          steering = undefined;
+          this.steerTask(task, message).then(() => ctx.ui.notify(`Steered task ${task.id.slice(0, 8)}`, "info")).catch((error) => ctx.ui.notify(`Could not steer task: ${formatError(error)}`, "error")).finally(() => tui.requestRender());
+          tui.requestRender();
+        };
+        steering = input;
+      };
       const renderAgentsTab = (frame) => {
         const { tabs, pane, contentWidth, pad } = frame;
         const listedAgents = agentsForTab();
@@ -4118,8 +4144,7 @@ ${this.primaryAgent.prompt}` };
             ctx.ui.notify("Agent editing requires a trusted project", "warning");
             return;
           }
-          saving = true;
-          (async () => {
+          runSaving("Could not edit agent", async () => {
             const document = prepareProjectAgentEditor(ctx.cwd, agent);
             const edited = await ctx.ui.editor(document.title, document.content);
             if (edited === undefined)
@@ -4127,9 +4152,6 @@ ${this.primaryAgent.prompt}` };
             await document.save(edited);
             await refreshAgentRuntime(agent.name);
             ctx.ui.notify(`Updated project agent ${agent.name}`, "info");
-          })().catch((error) => ctx.ui.notify(`Could not edit agent: ${formatError(error)}`, "error")).finally(() => {
-            saving = false;
-            tui.requestRender();
           });
           return;
         } else if (data === " " && agent && !saving) {
@@ -4138,13 +4160,10 @@ ${this.primaryAgent.prompt}` };
             return;
           }
           const disabled = !agent.disabled;
-          saving = true;
-          setAgentDisabledForScope(ctx.cwd, agent.name, disabled, "project").then(async () => {
+          runSaving("Could not update agent", async () => {
+            await setAgentDisabledForScope(ctx.cwd, agent.name, disabled, "project");
             await refreshAgentRuntime(agent.name);
             ctx.ui.notify(`${agent.name} ${disabled ? "disabled" : "enabled"} in project settings`, "info");
-          }).catch((error) => ctx.ui.notify(`Could not update agent: ${formatError(error)}`, "error")).finally(() => {
-            saving = false;
-            tui.requestRender();
           });
           return;
         } else if (data.toLowerCase() === "i" && agent && !saving) {
@@ -4154,13 +4173,10 @@ ${this.primaryAgent.prompt}` };
           }
           if (!disabledOverrides.project.has(agent.name))
             return;
-          saving = true;
-          clearAgentDisabledForScope(ctx.cwd, agent.name, "project").then(async () => {
+          runSaving("Could not update agent", async () => {
+            await clearAgentDisabledForScope(ctx.cwd, agent.name, "project");
             await refreshAgentRuntime(agent.name);
             ctx.ui.notify(`${agent.name} now inherits its global state`, "info");
-          }).catch((error) => ctx.ui.notify(`Could not update agent: ${formatError(error)}`, "error")).finally(() => {
-            saving = false;
-            tui.requestRender();
           });
           return;
         } else if (tab === "primary" && matchesKey(data, "return") && agent && !agent.disabled && isPrimaryAgent(agent)) {
@@ -4218,16 +4234,16 @@ ${this.primaryAgent.prompt}` };
           ...footer
         ]);
       };
+      const item = (label, value) => `  ${theme.fg("dim", label.padEnd(20))} ${value}`;
+      const shellReadLabel = (current) => current.windowsMode !== undefined ? "Policy (required)" : current.shellReadMode === "host" ? "Host-aligned" : "Policy";
       const renderTab = {
         overview: (frame) => renderSandboxTab(frame, () => {
           if (!overview)
             return [];
           const { contentWidth } = frame;
           const status = overview.noSandboxFlag ? { color: "warning", label: "Disabled by --no-sandbox" } : !overview.enabled ? { color: "warning", label: "Disabled by configuration" } : !overview.running ? { color: "warning", label: "Inactive" } : { color: "success", label: "Active" };
-          const shellReadMode = overview.windowsMode !== undefined ? "Policy (required)" : overview.shellReadMode === "host" ? "Host-aligned" : "Policy";
           const changePath = overview.changeScope === "project" ? overview.paths.project : overview.paths.global;
           const valueWidth = Math.max(10, contentWidth - 23);
-          const item = (label, value) => `  ${theme.fg("dim", label.padEnd(20))} ${value}`;
           const body = [
             `${theme.fg(status.color, "●")} ${theme.fg("text", status.label)}`,
             item("Configured", overview.enabled ? theme.fg("text", "Enabled") : theme.fg("warning", "Disabled")),
@@ -4236,7 +4252,7 @@ ${this.primaryAgent.prompt}` };
             "",
             theme.fg("accent", "Protection"),
             item("Network", overview.networkMode),
-            item("Shell reads", shellReadMode),
+            item("Shell reads", shellReadLabel(overview)),
             item("Read rules", `${overview.config.filesystem.denyRead.length + overview.config.filesystem.denyReadAlways.length + overview.config.filesystem.allowRead.length} · ${overview.readRuleScope}`),
             item("Write rules", String(overview.config.filesystem.allowWrite.length + overview.config.filesystem.denyWrite.length + overview.config.filesystem.denyWriteAlways.length)),
             item("Session grants", String(overview.sessionDomains.length + overview.sessionReadPaths.length + overview.sessionWritePaths.length)),
@@ -4256,8 +4272,6 @@ ${this.primaryAgent.prompt}` };
           if (!overview)
             return [];
           const { listValue } = frame;
-          const shellReadMode = overview.windowsMode !== undefined ? "Policy (required)" : overview.shellReadMode === "host" ? "Host-aligned" : "Policy";
-          const item = (label, value) => `  ${theme.fg("dim", label.padEnd(20))} ${value}`;
           return [
             theme.fg("accent", "Network"),
             item("Mode", overview.networkMode),
@@ -4266,7 +4280,7 @@ ${this.primaryAgent.prompt}` };
             item("Unix sockets", overview.config.network.allowAllUnixSockets ? "all" : listValue(overview.config.network.allowUnixSockets)),
             "",
             theme.fg("accent", "Filesystem"),
-            item("Shell reads", shellReadMode),
+            item("Shell reads", shellReadLabel(overview)),
             item("Read rules for", overview.readRuleScope),
             item("Denied reads", listValue(overview.config.filesystem.denyRead)),
             item("Always denied reads", listValue(overview.config.filesystem.denyReadAlways)),
@@ -4557,35 +4571,7 @@ ${this.primaryAgent.prompt}` };
             tab = "log";
             follow = true;
             scroll = 0;
-            const input = new Input;
-            input.focused = true;
-            input.onEscape = () => {
-              steering = undefined;
-              tui.requestRender();
-            };
-            input.onSubmit = (value) => {
-              const message = value.trim();
-              if (!message) {
-                ctx.ui.notify("Steering message must not be empty", "warning");
-                return;
-              }
-              steering = undefined;
-              (async () => {
-                const running = this.running.get(task.id);
-                if (running) {
-                  await running.rpc.steer(message);
-                } else if ((task.state === "queued" || task.state === "running") && this.runPromises.has(task.id)) {
-                  const pending = this.pendingSteers.get(task.id) ?? [];
-                  pending.push(message);
-                  this.pendingSteers.set(task.id, pending);
-                } else {
-                  throw new Error("Task is no longer active");
-                }
-                ctx.ui.notify(`Steered task ${task.id.slice(0, 8)}`, "info");
-              })().catch((error) => ctx.ui.notify(`Could not steer task: ${formatError(error)}`, "error")).finally(() => tui.requestRender());
-              tui.requestRender();
-            };
-            steering = input;
+            startSteering(task);
           } else if (data.toLowerCase() === "r") {
             const finished = tasks.filter((t) => t.state === "completed" || t.state === "error" || t.state === "cancelled" || t.state === "interrupted");
             if (finished.length === 0) {
@@ -4634,35 +4620,7 @@ ${this.primaryAgent.prompt}` };
             });
             return;
           } else if (matchesKey(data, "return") && (task.state === "queued" || task.state === "running") && task.kind !== "command") {
-            const input = new Input;
-            input.focused = true;
-            input.onEscape = () => {
-              steering = undefined;
-              tui.requestRender();
-            };
-            input.onSubmit = (value) => {
-              const message = value.trim();
-              if (!message) {
-                ctx.ui.notify("Steering message must not be empty", "warning");
-                return;
-              }
-              steering = undefined;
-              (async () => {
-                const running = this.running.get(task.id);
-                if (running) {
-                  await running.rpc.steer(message);
-                } else if ((task.state === "queued" || task.state === "running") && this.runPromises.has(task.id)) {
-                  const pending = this.pendingSteers.get(task.id) ?? [];
-                  pending.push(message);
-                  this.pendingSteers.set(task.id, pending);
-                } else {
-                  throw new Error("Task is no longer active");
-                }
-                ctx.ui.notify(`Steered task ${task.id.slice(0, 8)}`, "info");
-              })().catch((error) => ctx.ui.notify(`Could not steer task: ${formatError(error)}`, "error")).finally(() => tui.requestRender());
-              tui.requestRender();
-            };
-            steering = input;
+            startSteering(task);
           } else if (data.toLowerCase() === "f") {
             follow = !follow;
           } else if (matchesKey(data, "up")) {
@@ -4760,15 +4718,12 @@ ${this.primaryAgent.prompt}` };
                 tui.requestRender();
                 return;
               }
-              saving = true;
-              deleteProjectAgent(ctx.cwd, agent).then(async (deleted) => {
+              runSaving("Could not delete agent", async () => {
+                const deleted = await deleteProjectAgent(ctx.cwd, agent);
                 if (!deleted)
                   return;
                 await refreshAgentRuntime(name);
                 ctx.ui.notify(`Deleted project agent ${name}`, "info");
-              }).catch((error) => ctx.ui.notify(`Could not delete agent: ${formatError(error)}`, "error")).finally(() => {
-                saving = false;
-                tui.requestRender();
               });
               return;
             }
@@ -5004,16 +4959,7 @@ ${outputText}` }
           if (task.state !== "running" && task.state !== "queued") {
             throw new Error(`Task ${task.id.slice(0, 8)} is no longer active (${task.state})`);
           }
-          const running = this.running.get(task.id);
-          if (running) {
-            await running.rpc.steer(message);
-          } else if (this.runPromises.has(task.id)) {
-            const pending = this.pendingSteers.get(task.id) ?? [];
-            pending.push(message);
-            this.pendingSteers.set(task.id, pending);
-          } else {
-            throw new Error(`Task ${task.id.slice(0, 8)} is no longer active`);
-          }
+          await this.steerTask(task, message, `Task ${task.id.slice(0, 8)} is no longer active`);
           return {
             content: [
               {
@@ -5041,6 +4987,18 @@ ${outputText}` }
       }
     };
   }
+  async steerTask(task, message, inactiveMessage = "Task is no longer active") {
+    const running = this.running.get(task.id);
+    if (running) {
+      await running.rpc.steer(message);
+    } else if ((task.state === "queued" || task.state === "running") && this.runPromises.has(task.id)) {
+      const pending = this.pendingSteers.get(task.id) ?? [];
+      pending.push(message);
+      this.pendingSteers.set(task.id, pending);
+    } else {
+      throw new Error(inactiveMessage);
+    }
+  }
   async runBackgroundShellTask(params, ctx) {
     const taskId = randomUUID();
     const sessionId = this.activeSessionId ?? ctx.sessionManager.getSessionId();

package/package.json

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