pi-landstrip 0.18.8 → 0.18.10

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);
 }
@@ -1733,8 +1747,6 @@ var MAX_DEPTH = 3;
 var packageDir = dirname4(fileURLToPath(import.meta.url));
 var MAX_TASK_OUTPUT_BYTES = 64 * 1024;
 var INSPECTOR_BODY_LINES = 16;
-var TASK_PREVIEW_MIN_WIDTH = 92;
-var TASK_PREVIEW_LINES = 7;
 var PI_THINKING_LEVELS = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
 var AGENTS_HELP_ROWS = [
   ["Tab", "Next tab"],
@@ -1743,7 +1755,7 @@ var AGENTS_HELP_ROWS = [
   ["F", "Toggle task log follow"],
   ["Page Up / Down", "Scroll task output by page"],
   ["Home / End", "Jump to task output boundary"],
-  ["Enter", "Inspect task, set primary, or save"],
+  ["Enter", "Open logs, set primary, or save"],
   ["Esc", "Back or close"],
   ["Ctrl+C", "Close"],
   ["Space", "Enable agent or toggle sandbox"],
@@ -1853,6 +1865,7 @@ function taskDetails(task, state = task.state) {
     currentTool: task.currentTool,
     toolCalls: task.toolCalls,
     retryAttempt: task.retryAttempt,
+    usage: task.usage ? { ...task.usage } : undefined,
     startedAt: task.startedAt,
     finishedAt: task.finishedAt,
     output: task.output,
@@ -1866,6 +1879,78 @@ function taskDuration(details) {
   const seconds = Math.max(0, end - details.startedAt) / 1000;
   return seconds < 10 ? `${seconds.toFixed(1)}s` : `${Math.round(seconds)}s`;
 }
+function usageNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0;
+}
+function isTaskUsage(value) {
+  return isRecord2(value) && usageNumber(value.input) && usageNumber(value.output) && usageNumber(value.cacheRead) && usageNumber(value.cacheWrite) && usageNumber(value.cost) && usageNumber(value.turns) && Number.isInteger(value.turns);
+}
+function taskUsageFromMessage(message) {
+  if (!isRecord2(message) || message.role !== "assistant" || !isRecord2(message.usage))
+    return;
+  const usage = message.usage;
+  if (!usageNumber(usage.input) || !usageNumber(usage.output) || !usageNumber(usage.cacheRead) || !usageNumber(usage.cacheWrite) || !isRecord2(usage.cost) || !usageNumber(usage.cost.total)) {
+    return;
+  }
+  return {
+    input: usage.input,
+    output: usage.output,
+    cacheRead: usage.cacheRead,
+    cacheWrite: usage.cacheWrite,
+    cost: usage.cost.total,
+    turns: 1
+  };
+}
+function addTaskUsage(current, added) {
+  return {
+    input: (current?.input ?? 0) + added.input,
+    output: (current?.output ?? 0) + added.output,
+    cacheRead: (current?.cacheRead ?? 0) + added.cacheRead,
+    cacheWrite: (current?.cacheWrite ?? 0) + added.cacheWrite,
+    cost: (current?.cost ?? 0) + added.cost,
+    turns: (current?.turns ?? 0) + added.turns
+  };
+}
+function formatTokens(count) {
+  if (count < 1000)
+    return String(count);
+  if (count < 1e4)
+    return `${(count / 1000).toFixed(1)}k`;
+  if (count < 1e6)
+    return `${Math.round(count / 1000)}k`;
+  if (count < 1e7)
+    return `${(count / 1e6).toFixed(1)}M`;
+  return `${Math.round(count / 1e6)}M`;
+}
+function formatTaskUsage(usage) {
+  if (!usage)
+    return;
+  const parts = [];
+  if (usage.turns)
+    parts.push(`${usage.turns} turn${usage.turns === 1 ? "" : "s"}`);
+  if (usage.input)
+    parts.push(`in:${formatTokens(usage.input)}`);
+  if (usage.output)
+    parts.push(`out:${formatTokens(usage.output)}`);
+  if (usage.cacheRead)
+    parts.push(`R${formatTokens(usage.cacheRead)}`);
+  if (usage.cacheWrite)
+    parts.push(`W${formatTokens(usage.cacheWrite)}`);
+  if (usage.cost)
+    parts.push(`$${usage.cost.toFixed(4)}`);
+  return parts.length > 0 ? parts.join(" ") : undefined;
+}
+function formatTaskUsageSummary(usage) {
+  if (!usage)
+    return;
+  const parts = [];
+  const tokens = usage.input + usage.output;
+  if (tokens)
+    parts.push(`${formatTokens(tokens)} tok`);
+  if (usage.cost)
+    parts.push(`$${usage.cost.toFixed(4)}`);
+  return parts.length > 0 ? parts.join(" ") : undefined;
+}
 function activeTaskRecords(tasks) {
   const byId = new Map(tasks.map((task) => [task.id, task]));
   const visibleIds = new Set;
@@ -1893,6 +1978,9 @@ function taskProgress(task) {
   if (task.toolCalls !== undefined) {
     progress.push(`${task.toolCalls} call${task.toolCalls === 1 ? "" : "s"}`);
   }
+  const usage = formatTaskUsageSummary(task.usage);
+  if (usage)
+    progress.push(usage);
   const duration = taskDuration(taskDetails(task));
   if (duration)
     progress.push(duration);
@@ -2154,6 +2242,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;
@@ -2235,14 +2332,20 @@ function parseControlResponse(value) {
   if (response.value !== undefined && typeof response.value !== "string") {
     throw new Error("Invalid supervisor response value");
   }
-  if (response.task !== undefined && (!isRecord2(response.task) || typeof response.task.taskId !== "string" || typeof response.task.state !== "string" || !TASK_STATES.has(response.task.state) || typeof response.task.agent !== "string")) {
-    throw new Error("Invalid supervisor task response");
+  if (response.task !== undefined) {
+    if (!isRecord2(response.task) || typeof response.task.taskId !== "string" || typeof response.task.state !== "string" || !TASK_STATES.has(response.task.state) || typeof response.task.agent !== "string" || response.task.usage !== undefined && !isTaskUsage(response.task.usage)) {
+      throw new Error("Invalid supervisor task response");
+    }
   }
   return response;
 }
 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")
@@ -2434,7 +2537,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) {
@@ -2446,8 +2549,7 @@ ${this.primaryAgent.prompt}` };
     let saving = false;
     let editing = false;
     let confirmingDeleteAgent;
-    let detail = requested.length > 0;
-    let follow = detail;
+    let follow = requested.length > 0;
     let scroll = 0;
     const reloadAgents = () => {
       const selectedName = agents[selectedAgent]?.name;
@@ -2500,7 +2602,7 @@ ${this.primaryAgent.prompt}` };
           return `${clipped}${" ".repeat(Math.max(0, cellWidth - visibleWidth2(clipped)))}`;
         };
         refreshTasks();
-        const tabs = `${dialogTabs(theme, ["Agents", "Tasks", "Settings", "Help"], `${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);
@@ -2580,13 +2682,19 @@ ${this.primaryAgent.prompt}` };
           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
             }
           ];
@@ -2595,12 +2703,12 @@ ${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."));
+          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…"));
           return box(lines2);
@@ -2616,51 +2724,21 @@ ${this.primaryAgent.prompt}` };
           ];
           return box(lines2);
         }
-        if (!detail) {
+        if (tab === "tasks") {
           const listLines = [];
           if (tasks.length === 0) {
             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);
-            for (const [offset, task3] of shown2.entries()) {
+            for (const [offset, task2] of shown2.entries()) {
               const index = start + offset;
               const cursor = index === selectedTask ? theme.fg("accent", "›") : " ";
-              const indent = "  ".repeat(Math.max(0, task3.depth - 1));
-              listLines.push(`${cursor} ${indent}${taskState(theme, task3)} ${theme.fg("accent", `@${task3.agent}`)} ${theme.fg("text", task3.description)} ${theme.fg("dim", task3.id.slice(0, 8))}`);
+              const indent = "  ".repeat(Math.max(0, task2.depth - 1));
+              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))}`);
             }
           }
-          if (width < TASK_PREVIEW_MIN_WIDTH || tasks.length === 0) {
-            return box([tabs, "", ...listLines]);
-          }
-          const task2 = tasks[selectedTask];
-          if (!task2)
-            return box([tabs, "", ...listLines]);
-          const leftWidth = Math.max(44, Math.min(64, Math.floor(contentWidth * 0.52)));
-          const rightWidth = Math.max(1, contentWidth - leftWidth - 3);
-          const transcript2 = taskTranscript(task2).flatMap((line) => wrapTextWithAnsi(line, rightWidth));
-          const duration2 = taskDuration(taskDetails(task2));
-          const metrics2 = [
-            task2.currentTool ? `→ ${task2.currentTool}` : undefined,
-            task2.toolCalls === undefined ? undefined : `${task2.toolCalls} tool call${task2.toolCalls === 1 ? "" : "s"}`,
-            duration2,
-            task2.retryAttempt ? `retry ${task2.retryAttempt}` : undefined
-          ].filter(Boolean);
-          const previewLines = [
-            `${theme.fg("accent", theme.bold(`@${task2.agent}`))} ${theme.fg("text", task2.description)}`,
-            `${taskState(theme, task2)} ${theme.fg("dim", task2.id)}`,
-            metrics2.length > 0 ? theme.fg("dim", metrics2.join(" · ")) : "",
-            theme.fg("dim", "Latest activity"),
-            ...transcript2.slice(-TASK_PREVIEW_LINES).map((line) => theme.fg("toolOutput", line))
-          ];
-          const divider = theme.fg("border", "│");
-          const rowCount = Math.max(listLines.length, previewLines.length);
-          const lines2 = Array.from({ length: rowCount }, (_, index) => {
-            const left = pad(listLines[index] ?? "", leftWidth);
-            const right = truncateToWidth2(previewLines[index] ?? "", rightWidth);
-            return `${left} ${divider} ${right}`;
-          });
-          return box([tabs, "", ...lines2]);
+          return box([tabs, "", ...listLines]);
         }
         const task = tasks[selectedTask];
         if (!task)
@@ -2675,11 +2753,13 @@ ${this.primaryAgent.prompt}` };
           task.toolCalls === undefined ? undefined : `${task.toolCalls} tool call${task.toolCalls === 1 ? "" : "s"}`,
           duration
         ].filter(Boolean);
+        const usage = formatTaskUsage(task.usage);
         const lines = [
           tabs,
           "",
           `${theme.fg("accent", theme.bold(`@${task.agent}`))} ${theme.fg("text", task.description)}`,
           `${taskState(theme, task)} ${theme.fg("dim", metrics.join(" · "))} ${theme.fg("dim", "·")} ${theme.fg(follow ? "accent" : "muted", `Follow: ${follow ? "on" : "off"}`)}`,
+          ...usage ? [theme.fg("dim", usage)] : [],
           "",
           ...shown.map((line) => theme.fg("toolOutput", line))
         ];
@@ -2742,10 +2822,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", "help"];
+          const tabs = ["agents", "tasks", "logs", "settings", "help"];
           tab = tabs[(tabs.indexOf(tab) + 1) % tabs.length] ?? "agents";
-          detail = false;
-          follow = false;
+          if (tab === "logs" && tasks.length > 0)
+            follow = true;
+          else
+            follow = false;
           editing = false;
           scroll = 0;
           tui.requestRender();
@@ -2916,7 +2998,7 @@ ${this.primaryAgent.prompt}` };
             done();
           return;
         }
-        if (!detail) {
+        if (tab === "tasks") {
           if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c"))
             done();
           else if (matchesKey(data, "up"))
@@ -2924,7 +3006,7 @@ ${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
@@ -2932,11 +3014,16 @@ ${this.primaryAgent.prompt}` };
           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")) {
@@ -2961,7 +3048,7 @@ ${this.primaryAgent.prompt}` };
             selectedTask = parentIndex;
             follow = true;
           } else {
-            detail = false;
+            tab = "tasks";
             follow = false;
           }
           scroll = 0;
@@ -3079,6 +3166,9 @@ ${descriptions}` : ""),
         const duration = taskDuration(details);
         if (duration)
           metrics.push(duration);
+        const usage = formatTaskUsage(details.usage);
+        if (usage)
+          metrics.push(usage);
         if (metrics.length > 0)
           text += `
 ${theme.fg("dim", metrics.join(" · "))}`;
@@ -3327,6 +3417,15 @@ ${catalog.diagnostics.join(`
             update(streamedText);
           }
         }
+        if (event.type === "message_end") {
+          const usage = taskUsageFromMessage(event.message);
+          if (usage) {
+            task.usage = addTaskUsage(task.usage, usage);
+            this.persist(task);
+            this.updateTaskWidget(ctx);
+            update(streamedText || "Subagent running");
+          }
+        }
         if (event.type === "tool_execution_start" && typeof event.toolName === "string") {
           task.currentTool = event.toolName;
           task.toolCalls = (task.toolCalls ?? 0) + 1;
@@ -3434,7 +3533,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,
@@ -3742,11 +3842,15 @@ ${renderTaskResult(task.id, "error", message)}`);
       render: (width) => {
         const header = theme.fg("accent", theme.bold("Subagents")) + theme.fg("dim", `  ${summary}`);
         const tree = taskTreeLines(visible, (task) => {
+          const state = taskState(theme, task);
           const agent = theme.fg("accent", `@${task.agent}`);
-          const description = theme.fg("text", task.description);
-          const progress = taskProgress(byId.get(task.id));
+          const record = byId.get(task.id);
+          const progress = taskProgress(record);
           const suffix = progress.length > 0 ? theme.fg("dim", `  ·  ${progress.join(" · ")}`) : "";
-          return `${taskState(theme, task)}  ${agent}  ${description}${suffix}`;
+          const indentWidth = 3 + Math.max(0, record.depth) * 3;
+          const descriptionWidth = Math.max(1, width - indentWidth - visibleWidth2(`${state}  ${agent}  ${suffix}`));
+          const description = theme.fg("text", truncateToWidth2(task.description, descriptionWidth));
+          return `${state}  ${agent}  ${description}${suffix}`;
         });
         const shown = tree.slice(0, 8);
         if (tree.length > shown.length) {
@@ -3767,6 +3871,7 @@ ${renderTaskResult(task.id, "error", message)}`);
         continue;
       this.tasks.set(task.id, {
         ...task,
+        usage: isTaskUsage(task.usage) ? { ...task.usage } : undefined,
         state: task.state === "running" || task.state === "queued" ? "interrupted" : task.state
       });
     }

package/package.json

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