pi-landstrip 0.18.23 → 0.18.25

package/dist/index.ts

@@ -80,6 +80,7 @@ import {
   mkdirSync as mkdirSync3,
   mkdtempSync,
   readFileSync as readFileSync5,
+  readdirSync as readdirSync2,
   readlinkSync,
   realpathSync,
   rmSync,
@@ -1605,7 +1606,6 @@ 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 Primary, Subagent, or Settings"],
   ["↑ / ↓", "Select item or scroll when follow is off"],
   ["F", "Toggle task log follow"],
   ["Page Up / Down", "Scroll task output by page"],
@@ -1618,7 +1618,7 @@ var AGENTS_HELP_ROWS = [
   ["E", "Edit project agent"],
   ["X", "Delete project agent"],
   ["Y / N", "Confirm or cancel deletion"],
-  ["Empty + Enter", "Use global setting in Project scope"],
+  ["Empty + Enter", "Inherit global setting"],
   ["Backspace", "Open parent task or edit setting"]
 ];
 var MIN_SUPPORTED_PI_VERSION = [0, 82, 0];
@@ -1809,6 +1809,96 @@ function formatTaskUsageSummary(usage) {
     parts.push(`$${usage.cost.toFixed(4)}`);
   return parts.length > 0 ? parts.join(" ") : undefined;
 }
+function findFilesRecursively(dir) {
+  const results = [];
+  try {
+    const entries = readdirSync2(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const fullPath = join6(dir, entry.name);
+      if (entry.isDirectory()) {
+        results.push(...findFilesRecursively(fullPath));
+      } else if (entry.isFile()) {
+        results.push(fullPath);
+      }
+    }
+  } catch {}
+  return results;
+}
+function extractCwdFromSessionFile(filePath) {
+  try {
+    const content = readFileSync5(filePath, "utf8");
+    const firstNewline = content.indexOf(`
+`);
+    const firstLine = firstNewline >= 0 ? content.slice(0, firstNewline) : content;
+    if (!firstLine.trim())
+      return;
+    const header = JSON.parse(firstLine);
+    if (typeof header.cwd === "string") {
+      return header.cwd;
+    }
+  } catch {}
+  return;
+}
+function extractCwdFromTaskJsonFile(filePath) {
+  try {
+    const content = readFileSync5(filePath, "utf8");
+    const data = JSON.parse(content);
+    return {
+      cwd: typeof data.cwd === "string" ? data.cwd : undefined,
+      parentSessionFile: typeof data.parentSessionFile === "string" ? data.parentSessionFile : undefined
+    };
+  } catch {
+    return {};
+  }
+}
+function defaultSessionDirForCwd(cwd, agentDir = getAgentDir4()) {
+  const resolvedCwd = resolve2(cwd);
+  const safePath = `--${resolvedCwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
+  return join6(agentDir, "sessions", safePath);
+}
+function isSubagentSessionDirForCwd(parentSessionDir, targetCwd) {
+  const files = findFilesRecursively(parentSessionDir);
+  if (files.length === 0) {
+    return true;
+  }
+  const resolvedTarget = resolve2(targetCwd);
+  const targetSessionDir = resolve2(defaultSessionDirForCwd(targetCwd));
+  let hasTargetCwd = false;
+  let hasOtherCwd = false;
+  for (const file of files) {
+    if (file.endsWith(".jsonl")) {
+      const cwd = extractCwdFromSessionFile(file);
+      if (cwd) {
+        if (resolve2(cwd) === resolvedTarget) {
+          hasTargetCwd = true;
+        } else {
+          hasOtherCwd = true;
+        }
+      }
+    } else if (file.endsWith(".json")) {
+      const { cwd, parentSessionFile } = extractCwdFromTaskJsonFile(file);
+      if (cwd) {
+        if (resolve2(cwd) === resolvedTarget) {
+          hasTargetCwd = true;
+        } else {
+          hasOtherCwd = true;
+        }
+      } else if (parentSessionFile) {
+        const resolvedParent = resolve2(parentSessionFile);
+        if (resolvedParent.startsWith(targetSessionDir)) {
+          hasTargetCwd = true;
+        } else {
+          hasOtherCwd = true;
+        }
+      }
+    }
+  }
+  if (hasOtherCwd)
+    return false;
+  if (hasTargetCwd)
+    return true;
+  return true;
+}
 function activeTaskRecords(tasks) {
   const byId = new Map(tasks.map((task) => [task.id, task]));
   const visibleIds = new Set;
@@ -2312,6 +2402,7 @@ class SubagentRuntime {
       this.broker.reset();
       this.restore(ctx);
       await this.restorePrimaryAgent(ctx);
+      await this.cleanupOrphanSubagentSessions(ctx);
       const activeTools = this.pi.getActiveTools();
       const withoutTask = activeTools.filter((tool) => tool !== "task");
       const nextTools = this.maxSubagents > 0 ? [...withoutTask, "task"] : withoutTask;
@@ -2391,16 +2482,12 @@ ${this.primaryAgent.prompt}` };
     const projectTrusted = isProjectTrusted(ctx);
     let tasks = [...this.tasks.values()];
     const requested = args.trim();
-    let scope = projectTrusted ? "project" : "global";
     let catalog = this.getAgentCatalog(ctx);
     for (const diagnostic of catalog.diagnostics)
       ctx.ui.notify(diagnostic, "warning");
-    let globalCatalog = this.loadCatalog(ctx.cwd, getAgentDir4(), false);
     let agents = [...catalog.agents.values()].filter((agent) => !agent.hidden).sort((left, right) => left.name.localeCompare(right.name));
     let disabledOverrides = loadAgentDisabledOverrides(ctx.cwd, projectTrusted);
     let maxSubagentsSettings = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
-    const sandboxCallbacks = this.integration.sandboxCallbacks;
-    let sandboxSettings = sandboxCallbacks?.load(ctx.cwd, projectTrusted) ?? { global: true };
     let tab = requested ? "log" : "primary";
     const agentsForTab = () => agents.filter((agent) => agentSupportsMode(agent, tab === "subagent" ? "subagent" : "primary"));
     let selectedAgent = Math.max(0, agentsForTab().findIndex((agent) => agent.name === this.primaryAgent?.name));
@@ -2420,7 +2507,6 @@ ${this.primaryAgent.prompt}` };
     const reloadAgents = () => {
       const selectedName = agentsForTab()[selectedAgent]?.name;
       catalog = this.getAgentCatalog(ctx);
-      globalCatalog = this.loadCatalog(ctx.cwd, getAgentDir4(), false);
       agents = [...catalog.agents.values()].filter((agent) => !agent.hidden).sort((left, right) => left.name.localeCompare(right.name));
       disabledOverrides = loadAgentDisabledOverrides(ctx.cwd, projectTrusted);
       const listedAgents = agentsForTab();
@@ -2429,7 +2515,6 @@ ${this.primaryAgent.prompt}` };
     };
     const reloadSettings = () => {
       maxSubagentsSettings = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
-      sandboxSettings = sandboxCallbacks?.load(ctx.cwd, projectTrusted) ?? { global: true };
     };
     const refreshTasks = () => {
       const selectedId = tasks[selectedTask]?.id;
@@ -2457,11 +2542,7 @@ ${this.primaryAgent.prompt}` };
         this.pi.registerTool(this.createTaskTool(undefined, this.primaryRules, ctx));
       }
     };
-    const scopedAgent = (agent) => scope === "global" ? globalCatalog.agents.get(agent.name) : agent;
-    const selectedMaxSubagents = () => scope === "global" ? maxSubagentsSettings.global : maxSubagentsSettings.project ?? maxSubagentsSettings.global;
-    const settingField = (setting) => setting === 0 ? "maxSubagents" : "sandboxEnabled";
-    const settingLabel = (settingScope, field) => `${settingScope === "global" ? "Global" : "Project"} ${field}`;
-    const selectedSandboxEnabled = () => scope === "global" ? sandboxSettings.global : sandboxSettings.project ?? sandboxSettings.global;
+    const selectedMaxSubagents = () => maxSubagentsSettings.project ?? maxSubagentsSettings.global;
     await ctx.ui.custom((tui, theme, _keybindings, done) => ({
       render: (width) => {
         const contentWidth = Math.max(1, width - 4);
@@ -2475,7 +2556,7 @@ ${this.primaryAgent.prompt}` };
           return `${clipped}${" ".repeat(Math.max(0, cellWidth - visibleWidth2(clipped)))}`;
         };
         refreshTasks();
-        const tabs = `${dialogTabs(theme, ["Primary", "Subagent", "Tasks", "Log", "Settings", "Help"], `${tab[0]?.toUpperCase()}${tab.slice(1)}`)}${tab === "tasks" || tab === "log" ? "" : theme.fg("dim", `  ·  Scope: ${scope === "project" ? "Project" : "Global"}`)}`;
+        const tabs = dialogTabs(theme, ["Primary", "Subagent", "Tasks", "Log", "Settings", "Help"], `${tab[0]?.toUpperCase()}${tab.slice(1)}`);
         if (tab === "primary" || tab === "subagent") {
           const listedAgents = agentsForTab();
           const start = Math.max(0, Math.min(selectedAgent - 3, listedAgents.length - 7));
@@ -2494,17 +2575,14 @@ ${this.primaryAgent.prompt}` };
             const index = start + offset;
             const selected = index === selectedAgent;
             const cursor = selected ? theme.fg("accent", "›") : " ";
-            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 state = unavailable ? "unavailable" : inherited ? `inherited ${scopedDisabled ? "off" : "on"}` : scopedDisabled ? "disabled" : "enabled";
+            const inherited = !disabledOverrides.project.has(agent2.name);
+            const state = inherited ? `inherited ${disabled ? "off" : "on"}` : disabled ? "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));
-            const line = `${cursor} ${name} ${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))}`;
+            const line = `${cursor} ${name} ${theme.fg(color, pad(agent2.source, sourceWidth))} ${theme.fg(color, pad(agent2.model ?? "current model", modelWidth))} ${theme.fg(deleting ? "error" : disabled ? "warning" : color, pad(state, stateWidth))}`;
             lines2.push(agent2.name === this.primaryAgent?.name ? theme.bold(line) : line);
           }
           if (listedAgents.length === 0) {
@@ -2555,26 +2633,19 @@ ${this.primaryAgent.prompt}` };
           return box(lines2);
         }
         if (tab === "settings") {
-          const maxSubagentsInherited = scope === "project" && maxSubagentsSettings.project === undefined;
-          const sandboxInherited = scope === "project" && sandboxSettings.project === undefined;
+          const maxSubagentsInherited = maxSubagentsSettings.project === undefined;
           const rows = [
             {
               label: "maxSubagents",
               value: String(selectedMaxSubagents()),
               inherited: maxSubagentsInherited,
               unavailable: false
-            },
-            {
-              label: "sandboxEnabled",
-              value: selectedSandboxEnabled() ? "on" : "off",
-              inherited: sandboxInherited,
-              unavailable: sandboxCallbacks === undefined
             }
           ];
           const lines2 = [tabs, ""];
           if (settingEditor) {
-            const current = settingEditor.setting === 0 ? String(selectedMaxSubagents()) : selectedSandboxEnabled() ? "on" : "off";
-            lines2.push(theme.fg("dim", `  ${settingLabel(settingEditor.scope, settingEditor.field)} · current ${current}`), "", `  ${theme.fg("accent", "›")} [ ${settingEditor.value}${theme.fg("accent", "█")} ]`, "", theme.fg("dim", settingEditor.scope === "project" ? "  empty inherit  ·  enter submit  ·  esc cancel" : "  enter submit  ·  esc cancel"));
+            const current = String(selectedMaxSubagents());
+            lines2.push(theme.fg("dim", `  Project maxSubagents · current ${current}`), "", `  ${theme.fg("accent", "›")} [ ${settingEditor.value}${theme.fg("accent", "█")} ]`, "", theme.fg("dim", "  empty inherit  ·  enter submit  ·  esc cancel"));
             if (saving)
               lines2.push("", theme.fg("dim", "Saving…"));
             return box(lines2);
@@ -2587,9 +2658,6 @@ ${this.primaryAgent.prompt}` };
             const label = theme.fg(row.unavailable ? "muted" : "text", row.label);
             lines2.push(`${cursor} ${value} ${label}`);
           }
-          if (selectedSetting === 1) {
-            lines2.push("", theme.fg("dim", rows[1]?.inherited ? "Controls OS sandboxing. Use /sandbox to inspect its policy. Using the Global value." : "Controls OS sandboxing. Use /sandbox to inspect its policy."));
-          }
           if (saving)
             lines2.push("", theme.fg("dim", "Saving…"));
           return box(lines2);
@@ -2693,19 +2761,6 @@ ${this.primaryAgent.prompt}` };
           }
           return;
         }
-        if ((matchesKey(data, "shift+tab") || data.toLowerCase() === "s") && (tab === "primary" || tab === "subagent" || tab === "settings") && settingEditor === undefined) {
-          if (saving)
-            return;
-          if (!projectTrusted && scope === "global") {
-            ctx.ui.notify("Project settings require a trusted project", "warning");
-            return;
-          }
-          scope = scope === "project" ? "global" : "project";
-          reloadAgents();
-          reloadSettings();
-          tui.requestRender();
-          return;
-        }
         if (matchesKey(data, "tab")) {
           if (settingEditor !== undefined)
             return;
@@ -2765,22 +2820,25 @@ ${this.primaryAgent.prompt}` };
             });
             return;
           } else if (data === " " && agent && !saving) {
-            const current = scopedAgent(agent);
-            if (!current) {
-              ctx.ui.notify("Local-only agents are unavailable in Global scope", "warning");
+            if (!projectTrusted) {
+              ctx.ui.notify("Project settings require a trusted project", "warning");
               return;
             }
-            const disabled = !current.disabled;
+            const disabled = !agent.disabled;
             saving = true;
-            setAgentDisabledForScope(ctx.cwd, agent.name, disabled, scope).then(async () => {
+            setAgentDisabledForScope(ctx.cwd, agent.name, disabled, "project").then(async () => {
               await refreshAgentRuntime(agent.name);
-              ctx.ui.notify(`${agent.name} ${disabled ? "disabled" : "enabled"} in ${scope} settings`, "info");
+              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" && scope === "project" && agent && !saving) {
+          } else if (data.toLowerCase() === "i" && agent && !saving) {
+            if (!projectTrusted) {
+              ctx.ui.notify("Project settings require a trusted project", "warning");
+              return;
+            }
             if (!disabledOverrides.project.has(agent.name))
               return;
             saving = true;
@@ -2822,19 +2880,21 @@ ${this.primaryAgent.prompt}` };
               return;
             }
             if (matchesKey(data, "return")) {
-              const editor = settingEditor;
-              const input = editor.value.trim();
+              const input = settingEditor.value.trim();
               let save;
               let notifyMessage;
               if (input === "") {
-                if (editor.scope !== "project") {
-                  settingEditor = undefined;
-                  tui.requestRender();
+                if (!projectTrusted) {
+                  ctx.ui.notify("Project settings require a trusted project", "warning");
+                  return;
+                }
+                save = clearMaxSubagentsConfigForScope(ctx.cwd, "project");
+                notifyMessage = "Project maxSubagents inherits Global";
+              } else {
+                if (!projectTrusted) {
+                  ctx.ui.notify("Project settings require a trusted project", "warning");
                   return;
                 }
-                save = editor.setting === 0 ? clearMaxSubagentsConfigForScope(ctx.cwd, "project") : sandboxCallbacks?.clearProject(ctx);
-                notifyMessage = `${settingLabel(editor.scope, editor.field)} inherits Global`;
-              } else if (editor.setting === 0) {
                 if (!/^\d+$/.test(input)) {
                   ctx.ui.notify(`Enter a whole number between 0 and ${MAX_SUBAGENTS}`, "error");
                   return;
@@ -2844,21 +2904,8 @@ ${this.primaryAgent.prompt}` };
                   ctx.ui.notify(`Enter a whole number between 0 and ${MAX_SUBAGENTS}`, "error");
                   return;
                 }
-                save = setMaxSubagentsConfigForScope(ctx.cwd, parsed, editor.scope);
-                notifyMessage = `${settingLabel(editor.scope, editor.field)} = ${parsed}`;
-              } else {
-                const normalized = input.toLowerCase();
-                const parsed = ["1", "on", "true", "yes"].includes(normalized) ? true : ["0", "off", "false", "no"].includes(normalized) ? false : undefined;
-                if (parsed === undefined) {
-                  ctx.ui.notify("Enter on/off, true/false, or 1/0", "error");
-                  return;
-                }
-                save = sandboxCallbacks?.setEnabled(ctx, parsed, editor.scope);
-                notifyMessage = `${settingLabel(editor.scope, editor.field)} = ${parsed ? "on" : "off"}`;
-              }
-              if (!save) {
-                ctx.ui.notify("Sandbox settings are unavailable", "warning");
-                return;
+                save = setMaxSubagentsConfigForScope(ctx.cwd, parsed, "project");
+                notifyMessage = `Project maxSubagents = ${parsed}`;
               }
               saving = true;
               settingEditor = undefined;
@@ -2868,9 +2915,6 @@ ${this.primaryAgent.prompt}` };
                 const loadedMaxSubagents = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
                 this.setMaxSubagents(loadedMaxSubagents.project ?? loadedMaxSubagents.global);
                 maxSubagentsSettings = loadedMaxSubagents;
-                sandboxSettings = sandboxCallbacks?.load(ctx.cwd, projectTrusted) ?? {
-                  global: true
-                };
                 ctx.ui.notify(notifyMessage ?? "Setting updated", "info");
               }).catch((error) => ctx.ui.notify(`Could not save setting: ${formatError(error)}`, "error")).finally(() => {
                 saving = false;
@@ -2882,9 +2926,7 @@ ${this.primaryAgent.prompt}` };
             const printable = kittyChar ?? (data.length === 1 && !isControlChar(data) ? data : undefined);
             if (printable === undefined)
               return;
-            if (settingEditor.setting === 0 && !/^\d$/.test(printable))
-              return;
-            if (settingEditor.setting === 1 && !/^[a-zA-Z0-9]$/.test(printable))
+            if (!/^\d$/.test(printable))
               return;
             settingEditor.value += printable;
             tui.requestRender();
@@ -2895,19 +2937,16 @@ ${this.primaryAgent.prompt}` };
             return;
           }
           if (matchesKey(data, "up"))
-            selectedSetting = Math.max(0, selectedSetting - 1);
+            selectedSetting = 0;
           else if (matchesKey(data, "down"))
-            selectedSetting = Math.min(1, selectedSetting + 1);
+            selectedSetting = 0;
           else if (matchesKey(data, "return")) {
-            if (selectedSetting === 1 && !sandboxCallbacks) {
-              ctx.ui.notify("Sandbox settings are unavailable", "warning");
+            if (!projectTrusted) {
+              ctx.ui.notify("Project settings require a trusted project", "warning");
               return;
             }
             settingEditor = {
-              setting: selectedSetting,
-              scope,
-              field: settingField(selectedSetting),
-              value: ""
+              value: maxSubagentsSettings.project !== undefined ? String(maxSubagentsSettings.project) : ""
             };
           } else
             return;
@@ -3827,6 +3866,9 @@ ${renderTaskResult(task.id, "error", message)}`);
       task.deleted = true;
       task.delivered = true;
       this.controllers.get(taskId)?.abort();
+      if (task.sessionDir && existsSync4(task.sessionDir)) {
+        rmSync(task.sessionDir, { recursive: true, force: true });
+      }
       this.tasks.delete(taskId);
       this.pendingPrompts.delete(taskId);
       this.foregroundClaims.delete(taskId);
@@ -3837,6 +3879,42 @@ ${renderTaskResult(task.id, "error", message)}`);
       this.updateTaskWidget(ctx);
     return deleted;
   }
+  async cleanupOrphanSubagentSessions(ctx) {
+    try {
+      const subagentBaseDir = join6(getAgentDir4(), "sessions", "pi-landstrip");
+      if (!existsSync4(subagentBaseDir))
+        return;
+      const sessionFile = ctx.sessionManager.getSessionFile();
+      const sessionDir = sessionFile ? dirname3(sessionFile) : undefined;
+      const cwdSessions = sessionDir ? await SessionManager.list(ctx.cwd, sessionDir).catch(() => []) : await SessionManager.list(ctx.cwd).catch(() => []);
+      const allSessions = await SessionManager.listAll().catch(() => []);
+      const existingParentSessionIds = new Set;
+      for (const s of cwdSessions) {
+        if (s.id)
+          existingParentSessionIds.add(s.id);
+      }
+      for (const s of allSessions) {
+        if (s.id)
+          existingParentSessionIds.add(s.id);
+      }
+      const activeId = ctx.sessionManager.getSessionId();
+      if (activeId)
+        existingParentSessionIds.add(activeId);
+      const entries = readdirSync2(subagentBaseDir, { withFileTypes: true });
+      const targetCwd = ctx.cwd;
+      for (const entry of entries) {
+        if (!entry.isDirectory())
+          continue;
+        const parentSessionId = entry.name;
+        if (existingParentSessionIds.has(parentSessionId))
+          continue;
+        const parentSessionDir = join6(subagentBaseDir, parentSessionId);
+        if (isSubagentSessionDirForCwd(parentSessionDir, targetCwd)) {
+          rmSync(parentSessionDir, { recursive: true, force: true });
+        }
+      }
+    } catch {}
+  }
   restore(ctx) {
     this.tasks.clear();
     for (const entry of ctx.sessionManager.getBranch()) {

package/package.json

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