pi-landstrip 0.18.7 → 0.18.9

package/dist/index.ts

@@ -1006,19 +1006,33 @@ function loadAgentCatalog(cwd, piAgentDir = getAgentDir2(), includeProject = tru
   }
   return { agents: normalized, permissions, diagnostics, maxSubagents };
 }
+function permissionMatches(pattern, permission) {
+  return pattern === "*" || minimatch(permission, pattern, { dot: true });
+}
 function permissionDecision(rules, permission, resource = "*") {
   let decision = "ask";
   for (const rule of rules) {
-    const matchesPermission = rule.permission === "*" || minimatch(permission, rule.permission, { dot: true });
     const matchesResource = rule.pattern === "*" || minimatch(normalizeAbsolutePath(resource), normalizeAbsolutePath(rule.pattern), {
       dot: true,
       matchBase: false
     });
-    if (matchesPermission && matchesResource)
+    if (permissionMatches(rule.permission, permission) && matchesResource)
       decision = rule.action;
   }
   return decision;
 }
+function permissionAlwaysDenied(rules, permission) {
+  let denied = false;
+  for (const rule of rules) {
+    if (!permissionMatches(rule.permission, permission))
+      continue;
+    if (rule.pattern === "*")
+      denied = rule.action === "deny";
+    else if (rule.action !== "deny")
+      denied = false;
+  }
+  return denied;
+}
 function mergePermissionRules(...values) {
   return values.flatMap((value) => value);
 }
@@ -1734,6 +1748,25 @@ 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 / S", "Switch scope in Agents or Settings"],
+  ["↑ / ↓", "Select item or scroll when follow is off"],
+  ["F", "Toggle task log follow"],
+  ["Page Up / Down", "Scroll task output by page"],
+  ["Home / End", "Jump to task output boundary"],
+  ["Enter", "Open logs, set primary, or save"],
+  ["Esc", "Back or close"],
+  ["Ctrl+C", "Close"],
+  ["Space", "Enable agent or toggle sandbox"],
+  ["E", "Edit project agent"],
+  ["X", "Delete project agent"],
+  ["Y / N", "Confirm or cancel deletion"],
+  ["I", "Use global value"],
+  ["R", "Discard setting changes"],
+  ["0-9 / + / -", "Set subagent limit"],
+  ["Backspace", "Open parent task"]
+];
 var MIN_SUPPORTED_PI_VERSION = [0, 82, 0];
 var cachedPiPackage;
 var piPackageResolved = false;
@@ -1845,6 +1878,40 @@ function taskDuration(details) {
   const seconds = Math.max(0, end - details.startedAt) / 1000;
   return seconds < 10 ? `${seconds.toFixed(1)}s` : `${Math.round(seconds)}s`;
 }
+function activeTaskRecords(tasks) {
+  const byId = new Map(tasks.map((task) => [task.id, task]));
+  const visibleIds = new Set;
+  for (const task of tasks) {
+    if (task.state !== "queued" && task.state !== "running")
+      continue;
+    const seen = new Set;
+    let current = task;
+    while (current && !seen.has(current.id)) {
+      seen.add(current.id);
+      visibleIds.add(current.id);
+      current = current.parentTaskId ? byId.get(current.parentTaskId) : undefined;
+    }
+  }
+  return tasks.filter((task) => visibleIds.has(task.id));
+}
+function taskProgress(task) {
+  if (task.state === "queued")
+    return ["waiting for slot"];
+  if (task.state !== "running")
+    return [];
+  const progress = [];
+  if (task.currentTool)
+    progress.push(`→ ${task.currentTool}`);
+  if (task.toolCalls !== undefined) {
+    progress.push(`${task.toolCalls} call${task.toolCalls === 1 ? "" : "s"}`);
+  }
+  const duration = taskDuration(taskDetails(task));
+  if (duration)
+    progress.push(duration);
+  if (task.retryAttempt)
+    progress.push(`retry ${task.retryAttempt}`);
+  return progress;
+}
 function taskOutput(details, fallback) {
   return details.error ?? details.output ?? fallback;
 }
@@ -2099,6 +2166,15 @@ function permissionName(tool) {
     return "list";
   return tool;
 }
+function permittedToolNames(tools, rules) {
+  return tools.filter((tool) => !permissionAlwaysDenied(rules, permissionName(tool)));
+}
+function enforcePermittedTools(pi, rules) {
+  const active = pi.getActiveTools();
+  const permitted = permittedToolNames(active, rules);
+  if (permitted.join("\x00") !== active.join("\x00"))
+    pi.setActiveTools(permitted);
+}
 function canonicalPermissionPath(path, seen = new Set) {
   const missing = [];
   let existing = path;
@@ -2188,6 +2264,10 @@ function parseControlResponse(value) {
 function registerSubagentWorker(pi, config) {
   pi.on("session_start", () => {
     delete process.env[WORKER_ENV];
+    enforcePermittedTools(pi, config.rules);
+  });
+  pi.on("before_agent_start", () => {
+    enforcePermittedTools(pi, config.rules);
   });
   pi.on("tool_call", async (event, ctx) => {
     if (event.toolName === "task")
@@ -2379,7 +2459,7 @@ ${this.primaryAgent.prompt}` };
     let maxSubagentsSettings = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
     const sandboxCallbacks = this.integration.sandboxCallbacks;
     let sandboxSettings = sandboxCallbacks?.load(ctx.cwd, projectTrusted) ?? { global: true };
-    let tab = requested ? "tasks" : "agents";
+    let tab = requested ? "logs" : "agents";
     let selectedAgent = Math.max(0, agents.findIndex((agent) => agent.name === this.primaryAgent?.name));
     let selectedTask = requested ? tasks.findIndex((task) => task.id === requested || task.id.startsWith(requested)) : 0;
     if (selectedTask < 0) {
@@ -2391,7 +2471,7 @@ ${this.primaryAgent.prompt}` };
     let saving = false;
     let editing = false;
     let confirmingDeleteAgent;
-    let detail = requested.length > 0;
+    let follow = requested.length > 0;
     let scroll = 0;
     const reloadAgents = () => {
       const selectedName = agents[selectedAgent]?.name;
@@ -2444,7 +2524,7 @@ ${this.primaryAgent.prompt}` };
           return `${clipped}${" ".repeat(Math.max(0, cellWidth - visibleWidth2(clipped)))}`;
         };
         refreshTasks();
-        const tabs = `${dialogTabs(theme, ["Agents", "Tasks", "Settings"], `${tab[0]?.toUpperCase()}${tab.slice(1)}`)}${tab === "tasks" ? "" : theme.fg("dim", `  ·  Scope: ${scope === "project" ? "Project" : "Global"}`)}`;
+        const tabs = `${dialogTabs(theme, ["Agents", "Tasks", "Logs", "Settings", "Help"], `${tab[0]?.toUpperCase()}${tab.slice(1)}`)}${tab === "tasks" || tab === "logs" ? "" : 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);
@@ -2513,45 +2593,30 @@ ${this.primaryAgent.prompt}` };
               lines2.push(`  ${theme.fg("error", diagnostic)}`);
             }
           }
-          lines2.push("");
           if (confirmingDeleteAgent) {
-            lines2.push(theme.fg("error", `Delete @${confirmingDeleteAgent}? This removes its project file.`), dialogKeys(theme, [
+            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…"));
-          } 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));
+            lines2.push("", theme.fg("dim", "Saving…"));
           }
           return box(lines2);
         }
         if (tab === "settings") {
-          const maxSubagents = scope === "project" && maxSubagentsSettings.project === undefined ? "-" : String(selectedMaxSubagents());
-          const sandbox = scope === "project" && sandboxSettings.project === undefined ? "-" : selectedSandboxEnabled() ? "on" : "off";
+          const maxSubagentsInherited = scope === "project" && maxSubagentsSettings.project === undefined;
+          const sandboxInherited = scope === "project" && sandboxSettings.project === undefined;
           const rows = [
-            { label: "Maximum subagents", value: maxSubagents, unavailable: false },
+            {
+              label: "Maximum subagents",
+              value: String(selectedMaxSubagents()),
+              inherited: maxSubagentsInherited,
+              unavailable: false
+            },
             {
               label: "Sandbox enabled",
-              value: sandbox,
+              value: selectedSandboxEnabled() ? "on" : "off",
+              inherited: sandboxInherited,
               unavailable: sandboxCallbacks === undefined
             }
           ];
@@ -2560,39 +2625,31 @@ ${this.primaryAgent.prompt}` };
             const selected = index === selectedSetting;
             const cursor = selected ? theme.fg("accent", "›") : " ";
             const text = `[ ${row.value} ]`;
-            const value = selected ? theme.fg("accent", text) : theme.fg(row.unavailable ? "muted" : "text", text);
+            const value = row.inherited ? theme.fg("dim", text) : selected ? theme.fg("accent", text) : theme.fg(row.unavailable ? "muted" : "text", text);
             const label = theme.fg(row.unavailable ? "muted" : "text", row.label);
             const dirty = dirtySettings.has(index) ? theme.fg("warning", " *") : "";
             lines2.push(`${cursor} ${value} ${label}${dirty}`);
           }
-          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", 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 (saving)
             lines2.push("", theme.fg("dim", "Saving…"));
-          } 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) {
-          const lines2 = [tabs, ""];
+        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))}`)
+          ];
+          return box(lines2);
+        }
+        if (tab === "tasks") {
+          const listLines = [];
           if (tasks.length === 0) {
-            lines2.push("No task sessions in this session.");
+            listLines.push("No task sessions in this session.");
           } else {
             const start = Math.max(0, Math.min(selectedTask - 5, tasks.length - 11));
             const shown2 = tasks.slice(start, start + 11);
@@ -2600,23 +2657,17 @@ ${this.primaryAgent.prompt}` };
               const index = start + offset;
               const cursor = index === selectedTask ? theme.fg("accent", "›") : " ";
               const indent = "  ".repeat(Math.max(0, task2.depth - 1));
-              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))}`);
+              listLines.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);
+          return box([tabs, "", ...listLines]);
         }
         const task = tasks[selectedTask];
         if (!task)
           return box([tabs, "", "No task sessions in this session."]);
         const transcript = taskTranscript(task).flatMap((line) => wrapTextWithAnsi(line, contentWidth));
         const maxScroll = Math.max(0, transcript.length - INSPECTOR_BODY_LINES);
-        scroll = Math.min(scroll, maxScroll);
+        scroll = follow ? maxScroll : Math.min(scroll, maxScroll);
         const shown = transcript.slice(scroll, scroll + INSPECTOR_BODY_LINES);
         const duration = taskDuration(taskDetails(task));
         const metrics = [
@@ -2628,7 +2679,7 @@ ${this.primaryAgent.prompt}` };
           tabs,
           "",
           `${theme.fg("accent", theme.bold(`@${task.agent}`))} ${theme.fg("text", task.description)}`,
-          `${taskState(theme, task)} ${theme.fg("dim", metrics.join(" · "))}`,
+          `${taskState(theme, task)} ${theme.fg("dim", metrics.join(" · "))} ${theme.fg("dim", "·")} ${theme.fg(follow ? "accent" : "muted", `Follow: ${follow ? "on" : "off"}`)}`,
           "",
           ...shown.map((line) => theme.fg("toolOutput", line))
         ];
@@ -2637,12 +2688,6 @@ ${this.primaryAgent.prompt}` };
         if (transcript.length > INSPECTOR_BODY_LINES) {
           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) => {
@@ -2674,7 +2719,7 @@ ${this.primaryAgent.prompt}` };
           }
           return;
         }
-        if (data.toLowerCase() === "s" && tab !== "tasks") {
+        if ((matchesKey(data, "shift+tab") || data.toLowerCase() === "s") && (tab === "agents" || tab === "settings")) {
           if (saving)
             return;
           if (dirtySettings.size > 0) {
@@ -2697,9 +2742,12 @@ ${this.primaryAgent.prompt}` };
             ctx.ui.notify("Save changes with Enter or discard them with R before leaving", "warning");
             return;
           }
-          const tabs = ["agents", "tasks", "settings"];
+          const tabs = ["agents", "tasks", "logs", "settings", "help"];
           tab = tabs[(tabs.indexOf(tab) + 1) % tabs.length] ?? "agents";
-          detail = false;
+          if (tab === "logs" && tasks.length > 0)
+            follow = true;
+          else
+            follow = false;
           editing = false;
           scroll = 0;
           tui.requestRender();
@@ -2865,7 +2913,12 @@ ${this.primaryAgent.prompt}` };
           tui.requestRender();
           return;
         }
-        if (!detail) {
+        if (tab === "help") {
+          if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c"))
+            done();
+          return;
+        }
+        if (tab === "tasks") {
           if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c"))
             done();
           else if (matchesKey(data, "up"))
@@ -2873,31 +2926,51 @@ ${this.primaryAgent.prompt}` };
           else if (matchesKey(data, "down") && tasks.length > 0) {
             selectedTask = Math.min(tasks.length - 1, selectedTask + 1);
           } else if (matchesKey(data, "return") && tasks.length > 0) {
-            detail = true;
+            tab = "logs";
+            follow = true;
             scroll = 0;
           } else
             return;
           tui.requestRender();
           return;
         }
+        if (tab !== "logs")
+          return;
         const task = tasks[selectedTask];
-        if (!task)
+        if (!task) {
+          if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c"))
+            done();
           return;
+        }
         if (matchesKey(data, "escape")) {
-          detail = false;
+          tab = "tasks";
+          follow = false;
           scroll = 0;
         } else if (matchesKey(data, "ctrl+c")) {
           done();
-        } else if (matchesKey(data, "up")) {
+        } else if (data.toLowerCase() === "f") {
+          follow = !follow;
+        } else if (!follow && matchesKey(data, "up")) {
           scroll = Math.max(0, scroll - 1);
-        } else if (matchesKey(data, "down")) {
+        } else if (!follow && matchesKey(data, "down")) {
           scroll += 1;
+        } else if (!follow && matchesKey(data, "pageUp")) {
+          scroll = Math.max(0, scroll - INSPECTOR_BODY_LINES);
+        } else if (!follow && matchesKey(data, "pageDown")) {
+          scroll += INSPECTOR_BODY_LINES;
+        } else if (!follow && matchesKey(data, "home")) {
+          scroll = 0;
+        } else if (!follow && matchesKey(data, "end")) {
+          scroll = Number.MAX_SAFE_INTEGER;
         } else if (matchesKey(data, "backspace")) {
           const parentIndex = task.parentTaskId ? tasks.findIndex((candidate) => candidate.id === task.parentTaskId) : -1;
-          if (parentIndex >= 0)
+          if (parentIndex >= 0) {
             selectedTask = parentIndex;
-          else
-            detail = false;
+            follow = true;
+          } else {
+            tab = "tasks";
+            follow = false;
+          }
           scroll = 0;
         } else
           return;
@@ -3368,7 +3441,8 @@ ${catalog.diagnostics.join(`
       ctx.ui.notify(`Agent ${agent.name} options are not supported by Pi RPC mode: ${providerOptionNames.join(", ")}`, "warning");
     }
     const taskEnabled = agent.permissions.some((rule) => rule.permission === "task" && rule.action !== "deny");
-    const tools = taskEnabled ? [...new Set([...this.pi.getActiveTools(), "task"])] : this.pi.getActiveTools().filter((tool) => tool !== "task");
+    const activeTools = taskEnabled ? [...new Set([...this.pi.getActiveTools(), "task"])] : this.pi.getActiveTools().filter((tool) => tool !== "task");
+    const tools = permittedToolNames(activeTools, rules);
     const workerExtensions = this.integration.getWorkerExtensions?.() ?? [];
     const args = [
       ...invocation.args,
@@ -3661,33 +3735,26 @@ ${renderTaskResult(task.id, "error", message)}`);
     if (!ctx.hasUI || ctx.mode !== undefined && ctx.mode !== "tui")
       return;
     const tasks = [...this.tasks.values()];
-    const byId = new Map(tasks.map((task) => [task.id, task]));
-    const rootId = (task) => {
-      const seen = new Set;
-      let current = task;
-      while (current.parentTaskId && !seen.has(current.id)) {
-        seen.add(current.id);
-        const parent = byId.get(current.parentTaskId);
-        if (!parent)
-          break;
-        current = parent;
-      }
-      return current.id;
-    };
     const active = tasks.filter((task) => task.state === "queued" || task.state === "running");
-    const activeRoots = new Set(active.map(rootId));
-    if (activeRoots.size === 0) {
+    if (active.length === 0) {
       ctx.ui.setWidget(TASK_WIDGET, undefined);
       return;
     }
-    const visible = tasks.filter((task) => activeRoots.has(rootId(task)));
+    const visible = activeTaskRecords(tasks);
+    const byId = new Map(tasks.map((task) => [task.id, task]));
+    const running = active.filter((task) => task.state === "running").length;
+    const queued = active.length - running;
+    const runningSummary = this.maxSubagents > 0 ? `${running}/${this.maxSubagents} running` : `${running} running`;
+    const summary = queued > 0 ? `${runningSummary} · ${queued} queued` : runningSummary;
     ctx.ui.setWidget(TASK_WIDGET, (_tui, theme) => ({
       render: (width) => {
-        const header = theme.fg("accent", theme.bold("Subagents")) + theme.fg("dim", `  ${active.length} active`);
+        const header = theme.fg("accent", theme.bold("Subagents")) + theme.fg("dim", `  ${summary}`);
         const tree = taskTreeLines(visible, (task) => {
           const agent = theme.fg("accent", `@${task.agent}`);
           const description = theme.fg("text", task.description);
-          return `${taskState(theme, task)}  ${agent}  ${description}`;
+          const progress = taskProgress(byId.get(task.id));
+          const suffix = progress.length > 0 ? theme.fg("dim", `  ·  ${progress.join(" · ")}`) : "";
+          return `${taskState(theme, task)}  ${agent}  ${description}${suffix}`;
         });
         const shown = tree.slice(0, 8);
         if (tree.length > shown.length) {

package/package.json

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