pi-landstrip 0.18.6 → 0.18.7

package/dist/index.ts

@@ -88,7 +88,13 @@ import {
   keyHint,
   SessionManager
 } from "@earendil-works/pi-coding-agent";
-import { matchesKey, Text, truncateToWidth as truncateToWidth2, visibleWidth as visibleWidth2 } from "@earendil-works/pi-tui";
+import {
+  matchesKey,
+  Text,
+  truncateToWidth as truncateToWidth2,
+  visibleWidth as visibleWidth2,
+  wrapTextWithAnsi
+} from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 
 // agents.ts
@@ -1273,6 +1279,13 @@ function prepareProjectAgentEditor(cwd, agent, agentDir = getAgentDir3()) {
 
 // box.ts
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+function dialogTabs(theme, tabs, active) {
+  return tabs.map((tab) => tab === active ? theme.fg("accent", theme.bold(`[${tab}]`)) : theme.fg("muted", tab)).join("  ");
+}
+function dialogKeys(theme, hints) {
+  const separator = theme.fg("dim", "  ·  ");
+  return hints.map(([key, description]) => `${theme.fg("accent", key)} ${theme.fg("muted", description)}`).join(separator);
+}
 function boxTop(theme, width, title) {
   if (width < 5)
     return truncateToWidth(theme.fg("accent", title), Math.max(1, width));
@@ -1721,22 +1734,6 @@ var packageDir = dirname4(fileURLToPath(import.meta.url));
 var MAX_TASK_OUTPUT_BYTES = 64 * 1024;
 var INSPECTOR_BODY_LINES = 16;
 var PI_THINKING_LEVELS = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
-var AGENTS_HELP_ROWS = [
-  ["Tab", "Next tab"],
-  ["Shift+Tab", "Change scope"],
-  ["↑ / ↓", "Select or scroll"],
-  ["← / →", "Sibling task"],
-  ["Enter", "Open / activate / save"],
-  ["Esc", "Back / close"],
-  ["Ctrl+C", "Close"],
-  ["D / Space", "Toggle agent"],
-  ["Space", "Toggle sandbox"],
-  ["I", "Use global value"],
-  ["0-9 / + / -", "Set subagent limit"],
-  ["P / Backspace", "Parent task"],
-  ["Ctrl+G", "Edit agent"],
-  ["Ctrl+D", "Delete agent"]
-];
 var MIN_SUPPORTED_PI_VERSION = [0, 82, 0];
 var cachedPiPackage;
 var piPackageResolved = false;
@@ -1993,7 +1990,7 @@ class PermissionBroker {
       if (signal?.aborted)
         throw new Error("Permission request cancelled");
       const choice = await ctx.ui.select(`${task}: permission required
-${permission}: ${resource}`, ["Allow once", "Allow for this session", "Reject"], { signal });
+${permission}: ${resource}`, ["Allow once", "Allow for this session", "Keep blocked"], { signal });
       if (choice === "Allow for this session")
         this.grants.add(key);
       if (choice !== "Allow once" && choice !== "Allow for this session") {
@@ -2370,7 +2367,7 @@ ${this.primaryAgent.prompt}` };
       return;
     }
     const projectTrusted = isProjectTrusted(ctx);
-    const tasks = [...this.tasks.values()];
+    let tasks = [...this.tasks.values()];
     const requested = args.trim();
     let scope = projectTrusted ? "project" : "global";
     let catalog = this.getAgentCatalog(ctx);
@@ -2409,6 +2406,12 @@ ${this.primaryAgent.prompt}` };
       maxSubagentsSettings = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
       sandboxSettings = sandboxCallbacks?.load(ctx.cwd, projectTrusted) ?? { global: true };
     };
+    const refreshTasks = () => {
+      const selectedId = tasks[selectedTask]?.id;
+      tasks = [...this.tasks.values()];
+      const nextSelected = selectedId ? tasks.findIndex((task) => task.id === selectedId) : selectedTask;
+      selectedTask = Math.max(0, Math.min(nextSelected < 0 ? 0 : nextSelected, tasks.length - 1));
+    };
     const refreshAgentRuntime = async (name) => {
       reloadAgents();
       if (this.primaryAgent?.name === name) {
@@ -2440,38 +2443,39 @@ ${this.primaryAgent.prompt}` };
           const clipped = truncateToWidth2(value, cellWidth);
           return `${clipped}${" ".repeat(Math.max(0, cellWidth - visibleWidth2(clipped)))}`;
         };
-        const tabLabel = (label, active) => active ? theme.fg("accent", theme.bold(`[${label}]`)) : theme.fg("muted", label);
-        const tabs = `${tabLabel("Agents", tab === "agents")}  ${tabLabel("Tasks", tab === "tasks")}  ${tabLabel("Settings", tab === "settings")}  ${tabLabel("Help", tab === "help")}  ${theme.fg("dim", `· ${scope === "project" ? "Project" : "Global"} scope`)}`;
+        refreshTasks();
+        const tabs = `${dialogTabs(theme, ["Agents", "Tasks", "Settings"], `${tab[0]?.toUpperCase()}${tab.slice(1)}`)}${tab === "tasks" ? "" : theme.fg("dim", `  ·  Scope: ${scope === "project" ? "Project" : "Global"}`)}`;
         if (tab === "agents") {
           const start = Math.max(0, Math.min(selectedAgent - 3, agents.length - 7));
           const shown2 = agents.slice(start, start + 7);
           const nameWidth = Math.min(20, Math.max(5, ...agents.map((agent2) => visibleWidth2(`@${agent2.name}`))));
+          const primaryWidth = 7;
           const modeWidth = 8;
           const sourceWidth = 8;
-          const disabledWidth = 8;
-          const fixedWidth = 4 + nameWidth + 1 + modeWidth + 1 + sourceWidth + 1 + disabledWidth;
+          const stateWidth = 13;
+          const fixedWidth = 2 + primaryWidth + 1 + nameWidth + 1 + modeWidth + 1 + sourceWidth + 1 + stateWidth;
           const modelWidth = Math.max(10, Math.min(30, contentWidth - fixedWidth - 1));
           const lines2 = [
             tabs,
             "",
-            theme.fg("dim", `    ${pad("Agent", nameWidth)} ${pad("Mode", modeWidth)} ${pad("Source", sourceWidth)} ${pad("Model", modelWidth)} ${pad("Disabled", disabledWidth)}`)
+            theme.fg("dim", `  ${pad("Primary", primaryWidth)} ${pad("Agent", nameWidth)} ${pad("Mode", modeWidth)} ${pad("Source", sourceWidth)} ${pad("Model", modelWidth)} ${pad("State", stateWidth)}`)
           ];
           for (const [offset, agent2] of shown2.entries()) {
             const index = start + offset;
             const selected = index === selectedAgent;
             const cursor = selected ? theme.fg("accent", "›") : " ";
-            const active = agent2.name === this.primaryAgent?.name ? theme.fg("success", "●") : theme.fg("dim", "○");
+            const primary = agent2.name === this.primaryAgent?.name ? "yes" : "";
             const current = scopedAgent(agent2);
             const unavailable = current === undefined;
             const scopedDisabled = current?.disabled ?? false;
             const disabled = agent2.disabled;
             const deleting = confirmingDeleteAgent === agent2.name;
             const inherited = scope === "project" && !disabledOverrides.project.has(agent2.name);
-            const toggle = unavailable ? "n/a" : inherited ? "[-]" : scopedDisabled ? "[x]" : "[ ]";
+            const state = unavailable ? "unavailable" : inherited ? `inherited ${scopedDisabled ? "off" : "on"}` : scopedDisabled ? "disabled" : "enabled";
             const color = deleting ? "error" : disabled ? "muted" : "text";
             const plainName = pad(`@${agent2.name}`, nameWidth);
             const name = deleting ? theme.fg("error", plainName) : disabled ? theme.fg("muted", plainName) : colorizeAgentText(agent2.color, plainName, (agentColor, text) => theme.fg(agentColor, text));
-            lines2.push(`${cursor} ${active} ${name} ${theme.fg(color, pad(agent2.mode, modeWidth))} ${theme.fg(color, pad(agent2.source, sourceWidth))} ${theme.fg(color, pad(agent2.model ?? "current model", modelWidth))} ${theme.fg(deleting ? "error" : unavailable ? "muted" : scopedDisabled ? "warning" : color, pad(toggle, disabledWidth))}`);
+            lines2.push(`${cursor} ${theme.fg(primary ? "success" : "dim", pad(primary, primaryWidth))} ${name} ${theme.fg(color, pad(agent2.mode, modeWidth))} ${theme.fg(color, pad(agent2.source, sourceWidth))} ${theme.fg(color, pad(agent2.model ?? "current model", modelWidth))} ${theme.fg(deleting ? "error" : unavailable ? "muted" : scopedDisabled ? "warning" : color, pad(state, stateWidth))}`);
           }
           if (agents.length === 0)
             lines2.push(theme.fg("muted", "  No agents configured."));
@@ -2499,7 +2503,9 @@ ${this.primaryAgent.prompt}` };
             if (agent.variant && !PI_THINKING_LEVELS.has(agent.variant)) {
               unsupported.push(`variant=${agent.variant}`);
             }
-            lines2.push(`${theme.fg("dim", "Unsupported RPC options:")} ${theme.fg("text", unsupported.join(", ") || "none")}`);
+            if (unsupported.length > 0) {
+              lines2.push(`${theme.fg("dim", "Unsupported RPC options:")} ${theme.fg("text", unsupported.join(", "))}`);
+            }
           }
           if (catalog.diagnostics.length > 0) {
             lines2.push(theme.fg("error", "Catalog diagnostics"));
@@ -2507,10 +2513,34 @@ ${this.primaryAgent.prompt}` };
               lines2.push(`  ${theme.fg("error", diagnostic)}`);
             }
           }
+          lines2.push("");
           if (confirmingDeleteAgent) {
-            lines2.push("", theme.fg("error", `Delete @${confirmingDeleteAgent}?  enter confirm  esc cancel`));
+            lines2.push(theme.fg("error", `Delete @${confirmingDeleteAgent}? This removes its project file.`), dialogKeys(theme, [
+              ["Y", "delete"],
+              ["N / Esc", "cancel"]
+            ]));
           } else if (saving) {
-            lines2.push("", theme.fg("dim", "Saving…"));
+            lines2.push(theme.fg("dim", "Saving…"));
+          } else {
+            const mainHints = [["↑↓", "select"]];
+            if (agent && !agent.disabled && agentSupportsMode(agent, "primary")) {
+              mainHints.push(["Enter", "set primary"]);
+            }
+            if (agent && scopedAgent(agent))
+              mainHints.push(["Space", "enable / disable"]);
+            const actionHints = [];
+            if (agent && projectTrusted)
+              actionHints.push(["E", "edit"]);
+            if (agent && projectTrusted && canDeleteProjectAgent(ctx.cwd, agent)) {
+              actionHints.push(["X", "delete"]);
+            }
+            if (agent && scope === "project" && disabledOverrides.project.has(agent.name)) {
+              actionHints.push(["I", "inherit"]);
+            }
+            if (projectTrusted)
+              actionHints.push(["S", "scope"]);
+            actionHints.push(["Tab", "next tab"], ["Esc", "close"]);
+            lines2.push(dialogKeys(theme, mainHints), dialogKeys(theme, actionHints));
           }
           return box(lines2);
         }
@@ -2532,24 +2562,31 @@ ${this.primaryAgent.prompt}` };
             const text = `[ ${row.value} ]`;
             const value = selected ? theme.fg("accent", text) : theme.fg(row.unavailable ? "muted" : "text", text);
             const label = theme.fg(row.unavailable ? "muted" : "text", row.label);
-            lines2.push(`${cursor} ${value} ${label}`);
+            const dirty = dirtySettings.has(index) ? theme.fg("warning", " *") : "";
+            lines2.push(`${cursor} ${value} ${label}${dirty}`);
           }
-          if (selectedMaxSubagents() === 0) {
-            lines2.push(`    ${theme.fg("dim", "Subagents disabled")}`);
-          }
-          if (saving)
+          lines2.push("", theme.fg("dim", selectedSetting === 0 ? "Sets concurrent subagents. Zero disables the task tool." : "Controls OS sandboxing. Use /sandbox to inspect its policy."));
+          if (saving) {
             lines2.push("", theme.fg("dim", "Saving…"));
-          return box(lines2);
-        }
-        if (tab === "help") {
-          const shortcutWidth = Math.max(visibleWidth2("Shortcut"), ...AGENTS_HELP_ROWS.map(([shortcut]) => visibleWidth2(shortcut)));
-          const descriptionWidth = Math.max(1, contentWidth - shortcutWidth - 4);
-          const lines2 = [
-            tabs,
-            "",
-            theme.fg("dim", `  ${pad("Shortcut", shortcutWidth)}  Description`),
-            ...AGENTS_HELP_ROWS.map(([shortcut, description]) => `  ${theme.fg("accent", pad(shortcut, shortcutWidth))}  ${theme.fg("text", truncateToWidth2(description, descriptionWidth))}`)
-          ];
+          } else {
+            const editHints = [["↑↓", "select"]];
+            if (selectedSetting === 0)
+              editHints.push(["0–9 / +−", "change limit"]);
+            else if (sandboxCallbacks)
+              editHints.push(["Space", "toggle"]);
+            const canInherit = scope === "project" && (selectedSetting === 0 ? maxSubagentsSettings.project !== undefined : sandboxSettings.project !== undefined);
+            if (canInherit)
+              editHints.push(["I", "inherit"]);
+            const actionHints = [];
+            if (dirtySettings.size > 0) {
+              if (dirtySettings.has(selectedSetting))
+                actionHints.push(["Enter", "save"]);
+              actionHints.push(["R", "discard"]);
+            } else {
+              actionHints.push(["S", "scope"], ["Tab", "next tab"], ["Esc", "close"]);
+            }
+            lines2.push("", dialogKeys(theme, editHints), dialogKeys(theme, actionHints));
+          }
           return box(lines2);
         }
         if (!detail) {
@@ -2566,22 +2603,24 @@ ${this.primaryAgent.prompt}` };
               lines2.push(`${cursor} ${indent}${taskState(theme, task2)} ${theme.fg("accent", `@${task2.agent}`)} ${theme.fg("text", task2.description)} ${theme.fg("dim", task2.id.slice(0, 8))}`);
             }
           }
+          lines2.push("", dialogKeys(theme, [
+            ["↑↓", "select"],
+            ["Enter", "inspect"],
+            ["Tab", "next tab"],
+            ["Esc", "close"]
+          ]));
           return box(lines2);
         }
         const task = tasks[selectedTask];
         if (!task)
           return box([tabs, "", "No task sessions in this session."]);
-        const siblings = tasks.filter((candidate) => candidate.parentTaskId === task.parentTaskId);
-        const siblingIndex = siblings.findIndex((candidate) => candidate.id === task.id);
-        const transcript = taskTranscript(task).flatMap((line) => line.split(`
-`));
+        const transcript = taskTranscript(task).flatMap((line) => wrapTextWithAnsi(line, contentWidth));
         const maxScroll = Math.max(0, transcript.length - INSPECTOR_BODY_LINES);
         scroll = Math.min(scroll, maxScroll);
         const shown = transcript.slice(scroll, scroll + INSPECTOR_BODY_LINES);
         const duration = taskDuration(taskDetails(task));
         const metrics = [
           task.id,
-          `${siblingIndex + 1} of ${siblings.length}`,
           task.toolCalls === undefined ? undefined : `${task.toolCalls} tool call${task.toolCalls === 1 ? "" : "s"}`,
           duration
         ].filter(Boolean);
@@ -2596,18 +2635,24 @@ ${this.primaryAgent.prompt}` };
         while (lines.length < INSPECTOR_BODY_LINES + 5)
           lines.push("");
         if (transcript.length > INSPECTOR_BODY_LINES) {
-          lines.push(theme.fg("dim", `${scroll + 1}-${scroll + shown.length} of ${transcript.length}`));
+          lines.push(theme.fg("dim", `${scroll + 1}–${scroll + shown.length} of ${transcript.length}`));
         }
+        lines.push("", dialogKeys(theme, [
+          ["↑↓", "scroll"],
+          ...task.parentTaskId ? [["Backspace", "parent"]] : [],
+          ["Esc", "task list"],
+          ["Tab", "next tab"]
+        ]));
         return box(lines.map((line) => truncateToWidth2(line, contentWidth)));
       },
       handleInput: (data) => {
         if (confirmingDeleteAgent !== undefined) {
-          if (matchesKey(data, "escape")) {
+          if (matchesKey(data, "escape") || data.toLowerCase() === "n") {
             confirmingDeleteAgent = undefined;
             tui.requestRender();
             return;
           }
-          if (matchesKey(data, "return")) {
+          if (data.toLowerCase() === "y") {
             const name = confirmingDeleteAgent;
             const agent = agents.find((candidate) => candidate.name === name);
             confirmingDeleteAgent = undefined;
@@ -2629,15 +2674,18 @@ ${this.primaryAgent.prompt}` };
           }
           return;
         }
-        if (matchesKey(data, "shift+tab")) {
+        if (data.toLowerCase() === "s" && tab !== "tasks") {
           if (saving)
             return;
+          if (dirtySettings.size > 0) {
+            ctx.ui.notify("Save or discard settings changes before changing scope", "warning");
+            return;
+          }
           if (!projectTrusted && scope === "global") {
             ctx.ui.notify("Project settings require a trusted project", "warning");
             return;
           }
           scope = scope === "project" ? "global" : "project";
-          dirtySettings.clear();
           editing = false;
           reloadAgents();
           reloadSettings();
@@ -2645,7 +2693,11 @@ ${this.primaryAgent.prompt}` };
           return;
         }
         if (matchesKey(data, "tab")) {
-          const tabs = ["agents", "tasks", "settings", "help"];
+          if (tab === "settings" && dirtySettings.size > 0) {
+            ctx.ui.notify("Save changes with Enter or discard them with R before leaving", "warning");
+            return;
+          }
+          const tabs = ["agents", "tasks", "settings"];
           tab = tabs[(tabs.indexOf(tab) + 1) % tabs.length] ?? "agents";
           detail = false;
           editing = false;
@@ -2663,15 +2715,19 @@ ${this.primaryAgent.prompt}` };
             selectedAgent = Math.max(0, selectedAgent - 1);
           else if (matchesKey(data, "down") && agents.length > 0) {
             selectedAgent = Math.min(agents.length - 1, selectedAgent + 1);
-          } else if (matchesKey(data, "ctrl+d") && agent && !saving) {
-            if (!projectTrusted || !canDeleteProjectAgent(ctx.cwd, agent))
+          } else if (data.toLowerCase() === "x" && agent && !saving) {
+            if (!projectTrusted || !canDeleteProjectAgent(ctx.cwd, agent)) {
+              ctx.ui.notify("Only project agent files can be deleted here", "warning");
               return;
+            }
             confirmingDeleteAgent = agent.name;
             tui.requestRender();
             return;
-          } else if (matchesKey(data, "ctrl+g") && agent && !saving) {
-            if (!projectTrusted)
+          } else if (data.toLowerCase() === "e" && agent && !saving) {
+            if (!projectTrusted) {
+              ctx.ui.notify("Agent editing requires a trusted project", "warning");
               return;
+            }
             saving = true;
             (async () => {
               const document = prepareProjectAgentEditor(ctx.cwd, agent);
@@ -2686,7 +2742,7 @@ ${this.primaryAgent.prompt}` };
               tui.requestRender();
             });
             return;
-          } else if ((data === "d" || data === " ") && agent && !saving) {
+          } else if (data === " " && agent && !saving) {
             const current = scopedAgent(agent);
             if (!current) {
               ctx.ui.notify("Local-only agents are unavailable in Global scope", "warning");
@@ -2702,7 +2758,7 @@ ${this.primaryAgent.prompt}` };
               tui.requestRender();
             });
             return;
-          } else if (data === "i" && scope === "project" && agent && !saving) {
+          } else if (data.toLowerCase() === "i" && scope === "project" && agent && !saving) {
             if (!disabledOverrides.project.has(agent.name))
               return;
             saving = true;
@@ -2717,6 +2773,9 @@ ${this.primaryAgent.prompt}` };
           } else if (matchesKey(data, "return") && agent && !agent.disabled && agentSupportsMode(agent, "primary")) {
             this.selectPrimaryAgent(agent.name, ctx).then(() => tui.requestRender()).catch((error) => ctx.ui.notify(`Could not select primary agent: ${formatError(error)}`, "error"));
             return;
+          } else if (matchesKey(data, "return") && agent) {
+            ctx.ui.notify(agent.disabled ? "Enable this agent before setting it as primary" : "This agent cannot be used as the primary agent", "warning");
+            return;
           } else
             return;
           tui.requestRender();
@@ -2726,9 +2785,20 @@ ${this.primaryAgent.prompt}` };
           if (saving)
             return;
           if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
+            if (dirtySettings.size > 0) {
+              ctx.ui.notify("Save changes with Enter or discard them with R before closing", "warning");
+              return;
+            }
             done();
             return;
           }
+          if (data.toLowerCase() === "r") {
+            reloadSettings();
+            dirtySettings.clear();
+            editing = false;
+            tui.requestRender();
+            return;
+          }
           if (matchesKey(data, "up")) {
             selectedSetting = Math.max(0, selectedSetting - 1);
             editing = false;
@@ -2795,18 +2865,9 @@ ${this.primaryAgent.prompt}` };
           tui.requestRender();
           return;
         }
-        if (tab === "help") {
-          if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c"))
-            done();
-          return;
-        }
         if (!detail) {
           if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c"))
             done();
-          else if (matchesKey(data, "left"))
-            tab = "agents";
-          else if (matchesKey(data, "right"))
-            tab = "settings";
           else if (matchesKey(data, "up"))
             selectedTask = Math.max(0, selectedTask - 1);
           else if (matchesKey(data, "down") && tasks.length > 0) {
@@ -2831,21 +2892,13 @@ ${this.primaryAgent.prompt}` };
           scroll = Math.max(0, scroll - 1);
         } else if (matchesKey(data, "down")) {
           scroll += 1;
-        } else if (data === "p" || matchesKey(data, "backspace")) {
+        } else if (matchesKey(data, "backspace")) {
           const parentIndex = task.parentTaskId ? tasks.findIndex((candidate) => candidate.id === task.parentTaskId) : -1;
           if (parentIndex >= 0)
             selectedTask = parentIndex;
           else
             detail = false;
           scroll = 0;
-        } else if (matchesKey(data, "left") || matchesKey(data, "right")) {
-          const siblings = tasks.filter((candidate) => candidate.parentTaskId === task.parentTaskId);
-          const siblingIndex = siblings.findIndex((candidate) => candidate.id === task.id);
-          const offset = matchesKey(data, "left") ? -1 : 1;
-          const sibling = siblings[siblingIndex + offset];
-          if (sibling)
-            selectedTask = tasks.indexOf(sibling);
-          scroll = 0;
         } else
           return;
         tui.requestRender();
@@ -2917,7 +2970,7 @@ ${descriptions}` : ""),
         const background = input.background ? theme.fg("muted", " (background)") : "";
         const description = input.description?.trim() || "...";
         const agent = input.subagent_type?.trim() || "...";
-        const title = theme.fg("toolTitle", theme.bold("Agent Task"));
+        const title = theme.fg("toolTitle", theme.bold("Agent"));
         return new Text(`${title}${background}${theme.fg("muted", " — ")}${theme.fg("text", description)}
 ` + theme.fg("dim", `  @${agent}`), 0, 0);
       },
@@ -3855,28 +3908,26 @@ var PROXY_ENVIRONMENT_VARIABLES = [
 ];
 var packageDir2 = dirname5(fileURLToPath2(import.meta.url));
 var PERMISSION_OPTIONS = [
-  { label: "Allow once", key: "o", action: "once" },
-  { label: "Allow for this session only", key: "s", action: "session" },
-  { label: "Abort (keep blocked)", key: "esc", action: "abort" },
+  { label: "Allow once", action: "once" },
+  { label: "Allow for this session", action: "session" },
   {
     label: "Allow for this project",
-    key: "P",
     action: "project",
     confirm: true,
-    hint: "-> .pi/sandbox.json"
+    hint: "save to .pi/sandbox.json"
   },
   {
     label: "Allow for all projects",
-    key: "A",
     action: "global",
     confirm: true,
-    hint: "-> ~/.pi/agent/sandbox.json"
-  }
+    hint: "save to ~/.pi/agent/sandbox.json"
+  },
+  { label: "Keep blocked", action: "abort" }
 ];
 var NETWORK_PERMISSION_OPTIONS = [
-  { label: "Allow once", key: "o", action: "once" },
-  { label: "Allow for this session only", key: "s", action: "session" },
-  { label: "Abort (keep blocked)", key: "esc", action: "abort" }
+  { label: "Allow once", action: "once" },
+  { label: "Allow for this session", action: "session" },
+  { label: "Keep blocked", action: "abort" }
 ];
 function loadSandboxConfig(cwd, includeProject) {
   const projectConfigPath = join7(cwd, ".pi", "sandbox.json");
@@ -3990,10 +4041,7 @@ function writeConfigFile(configPath, config) {
 }
 function getSandboxConfigWriteTarget(cwd, includeProject = true) {
   const { globalPath, projectPath } = getConfigPaths(cwd);
-  if (includeProject && existsSync5(projectPath)) {
-    return { scope: "project", path: projectPath };
-  }
-  return { scope: "global", path: globalPath };
+  return includeProject ? { scope: "project", path: projectPath } : { scope: "global", path: globalPath };
 }
 async function writeSandboxConfigEnabled(cwd, enabled, scope) {
   const paths = getConfigPaths(cwd);
@@ -4350,21 +4398,23 @@ async function stopPreparedChild(child) {
 async function showPermissionPrompt(ctx, title, options, signal) {
   if (!ctx.hasUI)
     return "abort";
-  const labels = options.map((option2) => option2.hint ? `${option2.label} ${option2.hint}` : option2.label);
+  const labels = options.map((option2) => option2.hint ? `${option2.label} — ${option2.hint}` : option2.label);
   const selected = await ctx.ui.select(title, labels, { signal });
   const index = selected === undefined ? -1 : labels.indexOf(selected);
   const option = options[index];
   if (!option)
     return "abort";
   if (option.confirm) {
-    const confirmed = await ctx.ui.confirm(`Confirm ${option.label.toLowerCase()}`, option.hint ?? "This changes persisted sandbox policy.", { signal });
+    const confirmed = await ctx.ui.confirm("Save this permission?", `${title}
+
+${option.hint ?? "This changes persisted sandbox policy."}`, { signal });
     if (!confirmed)
       return "abort";
   }
   return option.action;
 }
 function promptDomainBlock(ctx, domain, signal) {
-  return showPermissionPrompt(ctx, `Network blocked: "${domain}" is not in allowedDomains`, PERMISSION_OPTIONS, signal);
+  return showPermissionPrompt(ctx, `Network blocked: "${domain}" is not in the allowed domains list`, PERMISSION_OPTIONS, signal);
 }
 function promptReadBlock(ctx, filePath, reason, signal) {
   const title = reason ? `Read blocked: "${filePath}" is in denyRead (${reason})` : `Read blocked: "${filePath}" is not in allowRead`;
@@ -4374,7 +4424,7 @@ function promptWriteBlock(ctx, filePath, signal) {
   return showPermissionPrompt(ctx, `Write blocked: "${filePath}" is not in allowWrite`, PERMISSION_OPTIONS, signal);
 }
 function promptNetworkBlock(ctx, operation, target, signal) {
-  return showPermissionPrompt(ctx, `Network blocked: ${operation} to "${target}"`, NETWORK_PERMISSION_OPTIONS, signal);
+  return showPermissionPrompt(ctx, `Network blocked: ${operation} "${target}"`, NETWORK_PERMISSION_OPTIONS, signal);
 }
 function landstripAvailable() {
   try {
@@ -5656,82 +5706,62 @@ ${message}
       handler: async (_args, ctx) => {
         if (!ctx.hasUI)
           return;
-        const config = loadConfig(ctx.cwd);
+        const trustContext = ctx;
+        const projectTrusted = trustContext.isProjectTrusted?.() ?? projectConfigTrusted;
+        const config = loadSandboxConfig(ctx.cwd, projectTrusted);
         const { globalPath, projectPath } = getConfigPaths(ctx.cwd);
         const windowsImplementation = process.platform === "win32" ? activeWindowsImplementation() : undefined;
-        const shouldToggle = await ctx.ui.custom((_tui, theme, _kb, done) => {
-          const { dim, muted, accent, text } = themeColors(theme);
-          function sandboxStatus() {
+        const target = getSandboxConfigWriteTarget(ctx.cwd, projectTrusted);
+        let tab = "Overview";
+        const shouldToggle = await ctx.ui.custom((tui, theme, _kb, done) => {
+          const { muted, accent, text } = themeColors(theme);
+          const sandboxStatus = () => {
             if (noSandboxFlag)
-              return { color: "warning", label: "Disabled (--no-sandbox)" };
+              return { color: "warning", label: "Disabled by --no-sandbox" };
             if (!config.enabled)
-              return { color: "warning", label: "Disabled" };
+              return { color: "warning", label: "Disabled by configuration" };
             if (!sandboxEnabled || !sandboxReady)
               return { color: "warning", label: "Inactive" };
             return { color: "success", label: "Active" };
-          }
-          function boolValue(value) {
-            return value ? theme.fg("warning", "yes") : theme.fg("success", "no");
-          }
+          };
+          const networkMode = config.network.allowNetwork ? "Unrestricted" : windowsImplementation === "appContainer" && !config.windows.allowLoopback ? "Blocked" : "Proxied";
           return {
             render(width) {
               const innerWidth = Math.max(1, width - 4);
-              const row = (content = "") => boxRow(theme, width, content);
-              const lines = [boxTop(theme, width, "Sandbox")];
               const status = sandboxStatus();
-              const statusDot = theme.fg(status.color, "●");
-              const pathSnippet = text(truncateToWidth3(landstripDisplayPath(), Math.max(20, innerWidth - 28)));
-              const section = (title, detail) => {
-                lines.push(row(""));
-                lines.push(row(`${accent(title)}${detail ? dim(` · ${detail}`) : ""}`));
-              };
-              const item = (label, value) => {
-                lines.push(row(`  ${dim("•")} ${muted(label.padEnd(13))} ${value}`));
-              };
+              const tabs = dialogTabs(theme, ["Overview", "Policy"], tab);
               const listValue = (values) => {
                 const value = values.join(", ") || "none";
-                return text(truncateToWidth3(value, Math.max(10, innerWidth - 17)));
+                return text(truncateToWidth3(value, Math.max(10, innerWidth - 20)));
               };
-              lines.push(row(`${statusDot} ${text(status.label)} ${dim("·")} ${muted("landstrip")} ${pathSnippet}`));
-              section("Config");
-              item("project", text(projectPath));
-              item("global", text(globalPath));
-              const networkMode = config.network.allowNetwork ? "unrestricted" : windowsImplementation === "appContainer" && !config.windows.allowLoopback ? "blocked" : "proxied";
-              section("Network", networkMode);
-              item("allow network", boolValue(config.network.allowNetwork));
-              item("allowed", listValue(config.network.allowedDomains));
-              item("denied", listValue(config.network.deniedDomains));
-              item("unix sockets", config.network.allowAllUnixSockets ? text("all") : listValue(config.network.allowUnixSockets));
-              if (sessionAllowedDomains.length > 0) {
-                item("session", theme.fg("accent", sessionAllowedDomains.join(", ")));
-              }
-              section("Filesystem");
-              item("deny read", listValue(config.filesystem.denyRead));
-              item("allow read", listValue(config.filesystem.allowRead));
-              item("allow write", listValue(config.filesystem.allowWrite));
-              item("deny write", listValue(config.filesystem.denyWrite));
-              if (windowsImplementation !== undefined) {
-                section("Windows");
-                item("implementation", text(windowsImplementation === "restrictedUser" ? "restricted user" : "AppContainer"));
-                if (windowsImplementation === "appContainer") {
-                  const mode = config.windows.appContainerMode;
-                  item("container", mode === "standard" ? theme.fg("warning", `${mode} (weaker)`) : text(mode));
-                  item("loopback", boolValue(config.windows.allowLoopback));
+              const item = (label, value) => `  ${muted(label.padEnd(16))} ${value}`;
+              const footer = dialogKeys(theme, [
+                ["Tab", "next tab"],
+                ["Enter", `${config.enabled ? "disable" : "enable"} in ${target.scope}`],
+                ["Esc", "close"]
+              ]);
+              const content = [tabs, ""];
+              if (tab === "Overview") {
+                content.push(`${theme.fg(status.color, "●")} ${text(status.label)}`, item("Configured", config.enabled ? text("Enabled") : theme.fg("warning", "Disabled")), item("Runtime", sandboxEnabled && sandboxReady ? theme.fg("success", "Running") : muted("Not running")), "", accent("Protection"), item("Network", text(networkMode)), item("Filesystem", text(`${config.filesystem.denyRead.length + config.filesystem.allowRead.length} read rules, ${config.filesystem.allowWrite.length + config.filesystem.denyWrite.length} write rules`)), item("Session grants", text(String(sessionAllowedDomains.length + sessionAllowedReadPaths.length + sessionAllowedWritePaths.length))), "", accent("Configuration"), item("Change scope", text(target.scope === "project" ? "Project" : "Global")), item("Change file", text(truncateToWidth3(target.path, Math.max(10, innerWidth - 20)))), item("Project file", text(truncateToWidth3(projectPath, Math.max(10, innerWidth - 20)))), item("Global file", text(truncateToWidth3(globalPath, Math.max(10, innerWidth - 20)))), item("Landstrip binary", text(truncateToWidth3(landstripDisplayPath(), Math.max(10, innerWidth - 20)))));
+                if (windowsImplementation !== undefined) {
+                  content.push(item("Windows mode", text(windowsImplementation === "restrictedUser" ? "Restricted user" : `AppContainer (${config.windows.appContainerMode})`)));
                 }
+              } else {
+                content.push(accent(`Network · ${networkMode}`), item("Allowed domains", listValue(config.network.allowedDomains)), item("Denied domains", listValue(config.network.deniedDomains)), item("Unix sockets", config.network.allowAllUnixSockets ? text("all") : listValue(config.network.allowUnixSockets)), "", accent("Filesystem"), item("Denied reads", listValue(config.filesystem.denyRead)), item("Allowed reads", listValue(config.filesystem.allowRead)), item("Allowed writes", listValue(config.filesystem.allowWrite)), item("Denied writes", listValue(config.filesystem.denyWrite)), "", accent("Session grants"), item("Domains", listValue(sessionAllowedDomains)), item("Read paths", listValue(sessionAllowedReadPaths)), item("Write paths", listValue(sessionAllowedWritePaths)));
               }
-              if (sessionAllowedReadPaths.length > 0 || sessionAllowedWritePaths.length > 0) {
-                section("Session grants");
-                if (sessionAllowedReadPaths.length > 0) {
-                  item("read", theme.fg("accent", sessionAllowedReadPaths.join(", ")));
-                }
-                if (sessionAllowedWritePaths.length > 0) {
-                  item("write", theme.fg("accent", sessionAllowedWritePaths.join(", ")));
-                }
-              }
-              lines.push(row(""), row(`${dim("enter")} ${muted(config.enabled ? "disable" : "enable")}  ${dim("esc")} ${muted("close")}`), boxBottom(theme, width));
-              return lines;
+              content.push("", footer);
+              return [
+                boxTop(theme, width, "Sandbox"),
+                ...content.map((line) => boxRow(theme, width, line)),
+                boxBottom(theme, width)
+              ];
             },
             handleInput(data) {
+              if (matchesKey2(data, "tab")) {
+                tab = tab === "Overview" ? "Policy" : "Overview";
+                tui.requestRender();
+                return;
+              }
               if (matchesKey2(data, "return")) {
                 done(true);
                 return;
@@ -5748,8 +5778,16 @@ ${message}
         if (!shouldToggle)
           return;
         const enabled = !config.enabled;
+        if (!enabled) {
+          const confirmed = await ctx.ui.confirm("Disable sandbox?", `Commands will run without OS isolation.
+
+Change: ${target.scope} configuration
+${target.path}`);
+          if (!confirmed)
+            return;
+        }
         try {
-          const scope = await setSandboxConfigEnabled(ctx.cwd, enabled, projectConfigTrusted);
+          const scope = await setSandboxConfigEnabled(ctx.cwd, enabled, projectTrusted);
           if (!enabled) {
             disableSandbox(ctx);
           } else if (!noSandboxFlag) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-landstrip",
-  "version": "0.18.6",
+  "version": "0.18.7",
   "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.6",
+    "@landstrip/landstrip": "^0.18.7",
     "jsonc-parser": "^3.3.1",
     "minimatch": "^10.2.5",
     "yaml": "^2.9.0"