pi-landstrip 0.18.40 → 0.18.42

package/dist/index.ts

@@ -272,17 +272,15 @@ function isAgentColor(value) {
     return true;
   return OPENCODE_THEME_COLORS.has(value);
 }
-function hexFg(hex, text) {
-  const r = Number.parseInt(hex.slice(1, 3), 16);
-  const g = Number.parseInt(hex.slice(3, 5), 16);
-  const b = Number.parseInt(hex.slice(5, 7), 16);
-  return `\x1B[38;2;${r};${g};${b}m${text}\x1B[39m`;
-}
 function colorizeAgentText(color, text, themeFg, fallback = "accent") {
   if (!color)
     return themeFg ? themeFg(fallback, text) : text;
-  if (color.startsWith("#"))
-    return hexFg(color, text);
+  if (color.startsWith("#")) {
+    const r = Number.parseInt(color.slice(1, 3), 16);
+    const g = Number.parseInt(color.slice(3, 5), 16);
+    const b = Number.parseInt(color.slice(5, 7), 16);
+    return `\x1B[38;2;${r};${g};${b}m${text}\x1B[39m`;
+  }
   if (themeFg)
     return themeFg(THEME_COLOR_ALIASES[color] ?? fallback, text);
   const ansi = NAMED_COLOR_ANSI[color];
@@ -420,9 +418,6 @@ var MAX_SUBAGENTS = 16;
 var LANDSTRIP_KEYS = ["maxSubagents", "agent", "permission", "toolFilesystemPolicy"];
 var JSON_FORMAT = { formattingOptions: { insertSpaces: true, tabSize: 2, eol: `
 ` } };
-function isLandstripKey(key) {
-  return LANDSTRIP_KEYS.includes(key);
-}
 function ensureFinalNewline(content) {
   return content.endsWith(`
 `) ? content : `${content}
@@ -465,8 +460,9 @@ function parseLandstripConfig(value, path, kind) {
   if (!isRecord2(value))
     throw new Error(`${path}: ${label} must be a JSON object`);
   for (const key of Object.keys(value)) {
-    if (!isLandstripKey(key))
+    if (!LANDSTRIP_KEYS.includes(key)) {
       throw new Error(`${path}: ${label} has an unknown field ${key}`);
+    }
   }
   const field = (name) => kind === "settings" ? `landstrip.${name}` : name;
   const config = {};
@@ -760,11 +756,6 @@ function listMarkdownFiles(root) {
   visit(root);
   return results;
 }
-function agentNameFromPath(dir, filePath) {
-  const relativePath = relative(dir, filePath).split(sep).join("/");
-  const extension = extname(relativePath);
-  return extension.length > 0 ? relativePath.slice(0, -extension.length) : relativePath;
-}
 function parseFrontmatter(content) {
   const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n([\s\S]*))?$/);
   if (!match)
@@ -863,7 +854,9 @@ function loadPiMarkdownAgents(options) {
       try {
         const content = readFileSync3(filePath, "utf8");
         const raw = parseMarkdownAgentRaw(content);
-        const name = agentNameFromPath(directory.path, filePath);
+        const relativePath = relative(directory.path, filePath).split(sep).join("/");
+        const extension = extname(relativePath);
+        const name = extension.length > 0 ? relativePath.slice(0, -extension.length) : relativePath;
         if (!name) {
           diagnostics.push(`${filePath}: agent name is empty`);
           continue;
@@ -897,9 +890,6 @@ var AGENT_FIELDS = new Set([
 function normalizeAbsolutePath(value) {
   return /^(?:[A-Za-z]:[\\/]|\\\\)/.test(value) ? value.replaceAll("\\", "/") : value;
 }
-function expandPattern(pattern) {
-  return normalizeAbsolutePath(expandHomePath(pattern));
-}
 function permissionEntries(permission, value) {
   if (value === "allow" || value === "ask" || value === "deny") {
     return [{ permission, pattern: "*", action: value }];
@@ -911,7 +901,7 @@ function permissionEntries(permission, value) {
     if (action !== "allow" && action !== "ask" && action !== "deny") {
       throw new Error(`permission ${permission} pattern ${pattern} has an invalid action`);
     }
-    return { permission, pattern: expandPattern(pattern), action };
+    return { permission, pattern: normalizeAbsolutePath(expandHomePath(pattern)), action };
   });
 }
 function normalizePermissions(value) {
@@ -1134,17 +1124,9 @@ function valueAtPath(root, path) {
   }
   return value;
 }
-function configKindForPath(path) {
-  return basename(path) === "landstrip.json" ? "dedicated" : "settings";
-}
 function agentJsonPath(kind, name) {
   return kind === "settings" ? ["landstrip", "agent", name] : ["agent", name];
 }
-function editorSnippet(name, raw, kind) {
-  const agent = { agent: { [name]: raw } };
-  return `${JSON.stringify(kind === "settings" ? { landstrip: agent } : agent, null, 2)}
-`;
-}
 function parseEditorSnippet(content, name, kind) {
   const root = parseJsonDocument(content, "Edited agent");
   const parentPath = kind === "settings" ? ["landstrip"] : [];
@@ -1245,36 +1227,27 @@ function relocateGlobalPrompt(raw, agent) {
   }
   return { ...raw, prompt: expandFileReferences(raw.prompt, dirname2(agent.origin.path)) };
 }
-function safeRelative(root, path) {
-  const value = relative2(root, path);
-  return value && value !== ".." && !value.startsWith(`..${sep2}`) ? value : undefined;
-}
 function projectMarkdownPath(cwd, agentDir, agent) {
   const origin = agent.origin;
   if (origin.source === "local" && origin.path)
     return origin.path;
   if (origin.kind === "pi-markdown" && origin.path) {
-    const suffix = safeRelative(join5(agentDir, "agents"), origin.path) ?? `${agent.name}.md`;
+    const relativePath = relative2(join5(agentDir, "agents"), origin.path);
+    const suffix = relativePath && relativePath !== ".." && !relativePath.startsWith(`..${sep2}`) ? relativePath : `${agent.name}.md`;
     return join5(cwd, ".pi", "agents", suffix);
   }
   throw new Error(`Agent ${agent.name} has no Markdown source`);
 }
-function projectConfigTarget(cwd, agentDir) {
-  return getLandstripConfigTarget(cwd, "project", agentDir);
-}
 function assertProjectConfigTarget(cwd, agentDir, target) {
-  const current = projectConfigTarget(cwd, agentDir);
+  const current = getLandstripConfigTarget(cwd, "project", agentDir);
   if (current.path !== target.path || current.kind !== target.kind) {
     throw new Error("Landstrip project configuration source changed while updating it");
   }
 }
-function projectConfigHasAgent(cwd, name, agentDir) {
-  const target = projectConfigTarget(cwd, agentDir);
-  return readAgentNode(target.path, target.kind, name) !== undefined;
-}
 function canDeleteProjectAgent(cwd, agent, agentDir = getAgentDir3()) {
   try {
-    if (projectConfigHasAgent(cwd, agent.name, agentDir))
+    const target = getLandstripConfigTarget(cwd, "project", agentDir);
+    if (readAgentNode(target.path, target.kind, agent.name) !== undefined)
       return true;
   } catch {
     return false;
@@ -1283,7 +1256,7 @@ function canDeleteProjectAgent(cwd, agent, agentDir = getAgentDir3()) {
   return Boolean(origin?.source === "local" && origin.path && origin.kind === "pi-markdown");
 }
 async function deleteProjectAgent(cwd, agent, agentDir = getAgentDir3()) {
-  const target = projectConfigTarget(cwd, agentDir);
+  const target = getLandstripConfigTarget(cwd, "project", agentDir);
   const containers = target.kind === "settings" ? [["landstrip", "agent"], ["landstrip"]] : [["agent"]];
   const deletedOverride = await deleteJsonNode(target.path, agentJsonPath(target.kind, agent.name), containers, () => assertProjectConfigTarget(cwd, agentDir, target), target.kind === "dedicated");
   const origin = agent.origin;
@@ -1312,12 +1285,13 @@ function prepareProjectAgentEditor(cwd, agent, agentDir = getAgentDir3()) {
     };
   }
   const sourcePath = origin?.path;
-  const sourceRaw = origin?.kind === "config" && sourcePath ? readAgentNode(sourcePath, configKindForPath(sourcePath), agent.name) : undefined;
+  const sourceRaw = origin?.kind === "config" && sourcePath ? readAgentNode(sourcePath, basename(sourcePath) === "landstrip.json" ? "dedicated" : "settings", agent.name) : undefined;
   const raw = relocateGlobalPrompt(sourceRaw ? sourceRaw : agent.raw ? { ...agent.raw } : normalizedAgentRaw(agent), agent);
-  const target = projectConfigTarget(cwd, agentDir);
+  const target = getLandstripConfigTarget(cwd, "project", agentDir);
   return {
     title: `Edit @${agent.name}`,
-    content: editorSnippet(agent.name, raw, target.kind),
+    content: `${JSON.stringify(target.kind === "settings" ? { landstrip: { agent: { [agent.name]: raw } } } : { agent: { [agent.name]: raw } }, null, 2)}
+`,
     async save(content) {
       const edited = parseEditorSnippet(content, agent.name, target.kind);
       validateAgentRaw(agent.name, edited);
@@ -1362,9 +1336,6 @@ function parseArgv(args) {
     trailing: /\s$/.test(args)
   };
 }
-function sandboxOverview(ctx, integration) {
-  return integration.sandboxCallbacks?.overview?.(ctx.cwd, isProjectTrusted(ctx));
-}
 function taskItems(tasks, prefix) {
   return tasks.map((task) => ({
     value: `${prefix}${task.id}`,
@@ -1383,7 +1354,7 @@ var SUBCOMMANDS = [
     summary: "Inspect sandbox & agent runtime status",
     pane: (argv) => argv.rest ? undefined : "overview",
     run: (_argv, { ctx, runtime, integration }) => {
-      const overview = sandboxOverview(ctx, integration);
+      const overview = integration.sandboxCallbacks?.overview?.(ctx.cwd, isProjectTrusted(ctx));
       const sandbox = !overview ? "unavailable" : !overview.enabled ? "disabled" : overview.running ? "active" : "enabled (inactive)";
       const primary = runtime.primaryAgentName();
       const tasks = runtime.getTasks();
@@ -1399,14 +1370,14 @@ var SUBCOMMANDS = [
   {
     name: "sandbox",
     summary: "Inspect or toggle sandbox OS isolation",
-    pane: (argv, { ctx, integration }) => !argv.rest && sandboxOverview(ctx, integration) ? "overview" : undefined,
+    pane: (argv, { ctx, integration }) => !argv.rest && integration.sandboxCallbacks?.overview?.(ctx.cwd, isProjectTrusted(ctx)) ? "overview" : undefined,
     complete: () => [
       { value: "sandbox on", label: "on", description: "Enable OS sandbox isolation" },
       { value: "sandbox off", label: "off", description: "Disable OS sandbox isolation" }
     ],
     run: async (argv, { ctx, integration }) => {
       const callbacks = integration.sandboxCallbacks;
-      const overview = sandboxOverview(ctx, integration);
+      const overview = integration.sandboxCallbacks?.overview?.(ctx.cwd, isProjectTrusted(ctx));
       if (!callbacks || !overview) {
         ctx.ui.notify("Sandbox controls are unavailable", "warning");
         return;
@@ -1456,7 +1427,7 @@ Scope: ${scope} configuration`);
       if (!runtime || !ctx)
         return [];
       try {
-        return visibleAgents(runtime.getAgentCatalog(ctx)).map((agent) => ({
+        return [...runtime.getAgentCatalog(ctx).agents.values()].filter((agent) => !agent.hidden).map((agent) => ({
           value: `agents @${agent.name}`,
           label: `@${agent.name}`,
           description: agent.description ?? (agent.model ? `Model: ${agent.model}` : "Primary agent")
@@ -1467,7 +1438,7 @@ Scope: ${scope} configuration`);
     },
     run: async (argv, { ctx, runtime }) => {
       if (!argv.rest) {
-        const names = visibleAgents(runtime.getAgentCatalog(ctx)).map((agent) => `@${agent.name}`).join(", ");
+        const names = [...runtime.getAgentCatalog(ctx).agents.values()].filter((agent) => !agent.hidden).map((agent) => `@${agent.name}`).join(", ");
         ctx.ui.notify(`Available agents: ${names || "none"}`, "info");
         return;
       }
@@ -1482,7 +1453,7 @@ Scope: ${scope} configuration`);
     summary: "Inspect configured process subagents",
     pane: (argv) => argv.rest ? undefined : "subagent",
     run: (_argv, { ctx, runtime }) => {
-      const names = visibleAgents(runtime.getAgentCatalog(ctx)).filter((agent) => agent.mode === "subagent").map((agent) => `@${agent.name}`).join(", ");
+      const names = [...runtime.getAgentCatalog(ctx).agents.values()].filter((agent) => !agent.hidden).filter((agent) => agent.mode === "subagent").map((agent) => `@${agent.name}`).join(", ");
       ctx.ui.notify(`Subagents: ${names || "none"}`, "info");
     }
   },
@@ -1547,9 +1518,6 @@ Scope: ${scope} configuration`);
     }
   }
 ];
-function visibleAgents(catalog) {
-  return [...catalog.agents.values()].filter((agent) => !agent.hidden);
-}
 function itemText(item) {
   return item.search ?? item.label;
 }
@@ -2314,18 +2282,14 @@ function extractCwdFromTaskJsonFile(filePath) {
     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));
+  const safePath = `--${resolvedTarget.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
+  const targetSessionDir = resolve2(join6(getAgentDir4(), "sessions", safePath));
   let hasTargetCwd = false;
   let hasOtherCwd = false;
   for (const file of files) {
@@ -2399,9 +2363,6 @@ function taskProgress(task) {
     progress.push(`retry ${task.retryAttempt}`);
   return progress;
 }
-function taskOutput(details, fallback) {
-  return details.error ?? details.output ?? fallback;
-}
 function workerDialogTitle(task, title) {
   return `@${task.agent} · ${task.description} · ${task.id.slice(0, 8)}
 ${title}`;
@@ -4051,7 +4012,7 @@ ${descriptions}` : ""),
         if (metrics.length > 0)
           text += `
 ${theme.fg("dim", metrics.join(" · "))}`;
-        const output = taskOutput(details, "");
+        const output = details.error ?? details.output ?? "";
         if (output) {
           const lines = output.trimEnd().split(`
 `);
@@ -4293,6 +4254,7 @@ ${catalog.diagnostics.join(`
         throw new Error("Task cancelled");
       let turns = 0;
       let streamedText = "";
+      let workerError;
       worker.rpc.onEvent((event) => {
         if (event.type === "message_update" && isRecord2(event.assistantMessageEvent)) {
           const messageEvent = event.assistantMessageEvent;
@@ -4301,7 +4263,10 @@ ${catalog.diagnostics.join(`
             update(streamedText);
           }
         }
-        if (event.type === "message_end") {
+        if (event.type === "message_end" && isRecord2(event.message)) {
+          if (event.message.role === "assistant") {
+            workerError = event.message.stopReason === "error" ? typeof event.message.errorMessage === "string" ? event.message.errorMessage : "Subagent model request failed" : undefined;
+          }
           const usage = taskUsageFromMessage(event.message);
           if (usage) {
             task.usage = addTaskUsage(task.usage, usage);
@@ -4362,6 +4327,8 @@ ${catalog.diagnostics.join(`
           await worker.rpc.request("follow_up", { message: pendingPrompt });
         }
         const output = await promise;
+        if (workerError)
+          throw new Error(workerError);
         if (signal.aborted)
           throw new Error("Task cancelled");
         task.state = "completed";
@@ -4458,6 +4425,7 @@ ${catalog.diagnostics.join(`
       if (!sessionWritePath)
         throw new Error("Subagent task has no session directory or file");
       const authPath = join6(agentDir, "auth.json");
+      const settingsPath = join6(agentDir, "settings.json");
       const cliEntry = invocation.args[0] ?? invocation.command;
       const cliRoot = dependencyRoot(cliEntry) ?? dirname3(dirname3(cliEntry));
       const extensionRoot = dependencyRoot(packageDir);
@@ -4495,7 +4463,7 @@ ${catalog.diagnostics.join(`
             temp
           ].filter((path) => path !== undefined))
         ],
-        writePaths: [sessionWritePath, temp, authPath, `${authPath}.lock`],
+        writePaths: [sessionWritePath, temp, authPath, `${authPath}.lock`, `${settingsPath}.lock`],
         signal
       });
       if (signal.aborted)
@@ -5195,13 +5163,10 @@ function windowsStatus() {
   }
   return status;
 }
-function activeWindowsImplementation() {
-  return windowsStatus().active;
-}
 function shouldStartProxy(config) {
   if (config.network.allowNetwork)
     return false;
-  return process.platform !== "win32" || activeWindowsImplementation() === "restrictedUser" || config.windows.allowLoopback;
+  return process.platform !== "win32" || windowsStatus().active === "restrictedUser" || config.windows.allowLoopback;
 }
 function restrictedUserProxyPortRange() {
   if (process.platform !== "win32")
@@ -5214,9 +5179,6 @@ function restrictedUserProxyPortRange() {
   }
   return { low: status.proxyPortLow, high: status.proxyPortHigh };
 }
-function getConfigPaths(cwd) {
-  return getPiConfigPaths(cwd, "sandbox.json");
-}
 function readOrEmptyConfig(configPath) {
   if (!existsSync5(configPath))
     return {};
@@ -5232,11 +5194,11 @@ function writeConfigFile(configPath, config) {
 `, "utf-8");
 }
 function getSandboxConfigWriteTarget(cwd, includeProject = true) {
-  const { globalPath, projectPath } = getConfigPaths(cwd);
+  const { globalPath, projectPath } = getPiConfigPaths(cwd, "sandbox.json");
   return includeProject ? { scope: "project", path: projectPath } : { scope: "global", path: globalPath };
 }
 async function writeSandboxConfigEnabled(cwd, enabled, scope) {
-  const paths = getConfigPaths(cwd);
+  const paths = getPiConfigPaths(cwd, "sandbox.json");
   const path = scope === "project" ? paths.projectPath : paths.globalPath;
   await withFileMutationQueue3(path, async () => {
     const config = readOrEmptyConfig(path);
@@ -5248,7 +5210,7 @@ async function writeSandboxConfigEnabled(cwd, enabled, scope) {
   });
 }
 function loadSandboxEnabledSettings(cwd, includeProject) {
-  const { projectPath } = getConfigPaths(cwd);
+  const { projectPath } = getPiConfigPaths(cwd, "sandbox.json");
   const global = loadSandboxConfig(cwd, false).enabled;
   if (!includeProject || !existsSync5(projectPath))
     return { global };
@@ -5265,25 +5227,6 @@ async function addConfigValue(configPath, value, readValues, writeValues) {
     writeConfigFile(configPath, config);
   });
 }
-function addDomainToConfig(configPath, domain) {
-  return addConfigValue(configPath, domain, (config) => config.network?.allowedDomains ?? [], (config, allowedDomains) => {
-    config.network = {
-      ...config.network,
-      allowedDomains,
-      deniedDomains: config.network?.deniedDomains ?? []
-    };
-  });
-}
-function addReadPathToConfig(configPath, pathToAdd) {
-  return addConfigValue(configPath, pathToAdd, (config) => config.filesystem?.allowRead ?? [], (config, allowRead) => {
-    config.filesystem = { ...config.filesystem, allowRead };
-  });
-}
-function addWritePathToConfig(configPath, pathToAdd) {
-  return addConfigValue(configPath, pathToAdd, (config) => config.filesystem?.allowWrite ?? [], (config, allowWrite) => {
-    config.filesystem = { ...config.filesystem, allowWrite };
-  });
-}
 function mergeAllowances(base, session, execution) {
   return [...base, ...session, ...execution ?? []];
 }
@@ -5449,28 +5392,10 @@ ${option.hint ?? "This changes persisted sandbox policy."}`, { signal });
   }
   return option.action;
 }
-function promptDomainBlock(ctx, domain, 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`;
   return showPermissionPrompt(ctx, title, PERMISSION_OPTIONS, signal);
 }
-function promptWriteBlock(ctx, filePath, signal) {
-  return showPermissionPrompt(ctx, `Write blocked: "${filePath}" is not in allowWrite`, PERMISSION_OPTIONS, signal);
-}
-function promptFilesystemToolBlock(ctx, accesses, authorizationNote, signal) {
-  const paths = accesses.map(({ operation, path }) => `${operation}: ${path}`).join(`
-`);
-  const note = authorizationNote ? `
-
-${authorizationNote}` : "";
-  return showPermissionPrompt(ctx, `Filesystem policy blocked this tool call:
-${paths}${note}`, PERMISSION_OPTIONS, signal);
-}
-function promptNetworkBlock(ctx, operation, target, signal) {
-  return showPermissionPrompt(ctx, `Network blocked: ${operation} "${target}"`, NETWORK_PERMISSION_OPTIONS, signal);
-}
 function writeEnvFile(env, proxyPort, proxyToken) {
   const lines = [];
   for (const [key, value] of Object.entries(env)) {
@@ -5562,11 +5487,6 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
   function loadConfig(cwd) {
     return loadSandboxConfig(cwd, projectConfigTrusted);
   }
-  function createPlainBashTool(cwd) {
-    return createBashToolDefinition(cwd, {
-      shellPath: SettingsManager.create(cwd).getShellPath()
-    });
-  }
   let sandboxEnabled = false;
   let sandboxReady = false;
   let sandboxState = "unavailable";
@@ -5702,16 +5622,6 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
   function getWorkerExtensions() {
     return [...workerExtensions].map(([id, extension]) => ({ id, entry: extension.entry }));
   }
-  function resetSessionAllowances() {
-    sessionAllowedDomains.length = 0;
-    sessionAllowedReadPaths.length = 0;
-    sessionAllowedWritePaths.length = 0;
-    sessionAllowedTargets.length = 0;
-    unsandboxedWorkerWarningShown = false;
-  }
-  function getEffectiveAllowedDomains(config, allowances) {
-    return mergeAllowances(config.network.allowedDomains, sessionAllowedDomains, allowances?.domains);
-  }
   function getEffectiveAllowRead(config, cwd, allowances) {
     const paths = mergeAllowances(config.filesystem.allowRead, sessionAllowedReadPaths, allowances?.readPaths);
     if (process.platform !== "win32")
@@ -5753,11 +5663,17 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
     };
   }
   async function applyDomainChoice(choice, domain, cwd, allowances) {
-    const { globalPath, projectPath } = getConfigPaths(cwd);
-    if (choice === "project")
-      await addDomainToConfig(projectPath, domain);
-    if (choice === "global")
-      await addDomainToConfig(globalPath, domain);
+    const { globalPath, projectPath } = getPiConfigPaths(cwd, "sandbox.json");
+    const configPath = choice === "project" ? projectPath : choice === "global" ? globalPath : undefined;
+    if (configPath) {
+      await addConfigValue(configPath, domain, (config) => config.network?.allowedDomains ?? [], (config, allowedDomains) => {
+        config.network = {
+          ...config.network,
+          allowedDomains,
+          deniedDomains: config.network?.deniedDomains ?? []
+        };
+      });
+    }
     const target = choice === "once" ? allowances?.domains : sessionAllowedDomains;
     if (target && !target.includes(domain))
       target.push(domain);
@@ -5767,24 +5683,28 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
       notify(ctx, `${verb} allowed (${choice}): ${scope}`, "info");
   }
   async function applyReadChoice(ctx, choice, filePath, cwd, allowances) {
-    const { globalPath, projectPath } = getConfigPaths(cwd);
+    const { globalPath, projectPath } = getPiConfigPaths(cwd, "sandbox.json");
     const scope = sessionScopeFor(filePath, cwd);
-    if (choice === "project")
-      await addReadPathToConfig(projectPath, scope);
-    if (choice === "global")
-      await addReadPathToConfig(globalPath, scope);
+    const configPath = choice === "project" ? projectPath : choice === "global" ? globalPath : undefined;
+    if (configPath) {
+      await addConfigValue(configPath, scope, (config) => config.filesystem?.allowRead ?? [], (config, allowRead) => {
+        config.filesystem = { ...config.filesystem, allowRead };
+      });
+    }
     const target = choice === "once" ? allowances?.readPaths : sessionAllowedReadPaths;
     if (target && !target.includes(scope))
       target.push(scope);
     noteScope(ctx, "Read", choice, filePath, scope);
   }
   async function applyWriteChoice(ctx, choice, filePath, cwd, allowances) {
-    const { globalPath, projectPath } = getConfigPaths(cwd);
+    const { globalPath, projectPath } = getPiConfigPaths(cwd, "sandbox.json");
     const scope = sessionScopeFor(filePath, cwd);
-    if (choice === "project")
-      await addWritePathToConfig(projectPath, scope);
-    if (choice === "global")
-      await addWritePathToConfig(globalPath, scope);
+    const configPath = choice === "project" ? projectPath : choice === "global" ? globalPath : undefined;
+    if (configPath) {
+      await addConfigValue(configPath, scope, (config) => config.filesystem?.allowWrite ?? [], (config, allowWrite) => {
+        config.filesystem = { ...config.filesystem, allowWrite };
+      });
+    }
     const target = choice === "once" ? allowances?.writePaths : sessionAllowedWritePaths;
     if (target && !target.includes(scope))
       target.push(scope);
@@ -5820,7 +5740,13 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
     return permissionPrompts.resolve(current, async (promptSignal) => {
       const config = loadConfig(ctx.cwd);
       const blocked = normalized.filter((access) => access.operation === "read" ? !readAllowed(access.path, getEffectiveAllowRead(config, ctx.cwd), getEffectiveDenyRead(config, ctx.cwd), ctx.cwd) : shouldPromptForWrite(access.path, getEffectiveAllowWrite(config), ctx.cwd));
-      const choice = await promptFilesystemToolBlock(ctx, blocked, options2.authorizationNote, promptSignal);
+      const paths = blocked.map(({ operation, path }) => `${operation}: ${path}`).join(`
+`);
+      const note = options2.authorizationNote ? `
+
+${options2.authorizationNote}` : "";
+      const choice = await showPermissionPrompt(ctx, `Filesystem policy blocked this tool call:
+${paths}${note}`, PERMISSION_OPTIONS, promptSignal);
       if (choice === "abort" || promptSignal.aborted) {
         return { allowed: false, prompted: true, reason: "Filesystem access denied" };
       }
@@ -5839,14 +5765,15 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
       const config = loadConfig(cwd);
       if (domainMatchesAny(domain, config.network.deniedDomains))
         return false;
-      if (domainMatchesAny(domain, getEffectiveAllowedDomains(config, allowances)))
+      const allowedDomains = mergeAllowances(config.network.allowedDomains, sessionAllowedDomains, allowances?.domains);
+      if (domainMatchesAny(domain, allowedDomains))
         return true;
       return;
     };
     if (!ctx.hasUI)
       return current() ?? false;
     return permissionPrompts.resolve(current, async (promptSignal) => {
-      const choice = await promptDomainBlock(ctx, domain, promptSignal);
+      const choice = await showPermissionPrompt(ctx, `Network blocked: "${domain}" is not in the allowed domains list`, PERMISSION_OPTIONS, promptSignal);
       if (choice === "abort" || promptSignal.aborted)
         return false;
       await applyDomainChoice(choice, domain, cwd, allowances);
@@ -5922,7 +5849,7 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
       if (!ctx.hasUI || !promptOnBlock)
         return { action: "deny", reason: "unprompted" };
       return permissionPrompts.resolve(current2, async (promptSignal) => {
-        const choice = await promptNetworkBlock(ctx, trap.operation, trap.target, promptSignal);
+        const choice = await showPermissionPrompt(ctx, `Network blocked: ${trap.operation} "${trap.target}"`, NETWORK_PERMISSION_OPTIONS, promptSignal);
         if (choice === "abort" || promptSignal.aborted)
           return { action: "deny", reason: "rejected" };
         const targets = choice === "once" ? allowances.targets : sessionAllowedTargets;
@@ -5947,7 +5874,7 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
       return { action: "deny", reason: "unprompted" };
     return permissionPrompts.resolve(current, async (promptSignal) => {
       const config = loadConfig(cwd);
-      const choice = trap.operation === "read" ? await promptReadBlock(ctx, path, matchesPattern(path, config.filesystem.denyRead, cwd) ? "granting allowRead will override it" : undefined, promptSignal) : await promptWriteBlock(ctx, path, promptSignal);
+      const choice = trap.operation === "read" ? await promptReadBlock(ctx, path, matchesPattern(path, config.filesystem.denyRead, cwd) ? "granting allowRead will override it" : undefined, promptSignal) : await showPermissionPrompt(ctx, `Write blocked: "${path}" is not in allowWrite`, PERMISSION_OPTIONS, promptSignal);
       if (choice === "abort" || promptSignal.aborted)
         return { action: "deny", reason: "rejected" };
       if (trap.operation === "read") {
@@ -6547,7 +6474,7 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
     const retryWithAccess = async (operation, blockedPath) => {
       if (!ctx.hasUI)
         return null;
-      const { globalPath, projectPath } = getConfigPaths(ctx.cwd);
+      const { globalPath, projectPath } = getPiConfigPaths(ctx.cwd, "sandbox.json");
       const current = () => {
         const config2 = loadConfig(ctx.cwd);
         if (operation === "write" && matchesPattern(blockedPath, config2.filesystem.denyWrite, ctx.cwd)) {
@@ -6558,7 +6485,7 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
       };
       const access = await permissionPrompts.resolve(current, async (promptSignal) => {
         const config2 = loadConfig(ctx.cwd);
-        const choice = operation === "read" ? await promptReadBlock(ctx, blockedPath, matchesPattern(blockedPath, config2.filesystem.denyRead, ctx.cwd) ? "granting allowRead will override it" : undefined, promptSignal) : await promptWriteBlock(ctx, blockedPath, promptSignal);
+        const choice = operation === "read" ? await promptReadBlock(ctx, blockedPath, matchesPattern(blockedPath, config2.filesystem.denyRead, ctx.cwd) ? "granting allowRead will override it" : undefined, promptSignal) : await showPermissionPrompt(ctx, `Write blocked: "${blockedPath}" is not in allowWrite`, PERMISSION_OPTIONS, promptSignal);
         if (choice === "abort" || promptSignal.aborted)
           return false;
         if (operation === "read") {
@@ -6657,7 +6584,7 @@ ${message}
       return;
     let implementation;
     try {
-      implementation = activeWindowsImplementation();
+      implementation = windowsStatus().active;
     } catch (error) {
       notify(ctx, formatError(error), "error");
       return;
@@ -6677,7 +6604,7 @@ ${message}
     const theme = ctx.ui.theme;
     const dot = theme.fg("success", "●");
     const label = theme.fg("text", "Sandbox");
-    const windowsImplementation = process.platform === "win32" ? activeWindowsImplementation() : undefined;
+    const windowsImplementation = process.platform === "win32" ? windowsStatus().active : undefined;
     let networkLabel;
     let networkColor;
     if (config.network.allowNetwork) {
@@ -6752,7 +6679,9 @@ ${message}
     return true;
   }
   function createBashTool(cwd) {
-    const localBash = createPlainBashTool(cwd);
+    const localBash = createBashToolDefinition(cwd, {
+      shellPath: SettingsManager.create(cwd).getShellPath()
+    });
     return {
       ...localBash,
       label: "bash (landstrip)",
@@ -6804,7 +6733,11 @@ ${message}
     pi.on("session_start", async (_event, ctx) => {
       activeContext = ctx;
       permissionPrompts.reset();
-      resetSessionAllowances();
+      sessionAllowedDomains.length = 0;
+      sessionAllowedReadPaths.length = 0;
+      sessionAllowedWritePaths.length = 0;
+      sessionAllowedTargets.length = 0;
+      unsandboxedWorkerWarningShown = false;
       const trustContext = ctx;
       projectConfigTrusted = trustContext.isProjectTrusted?.() ?? false;
       if (getNoSandboxFlag()) {
@@ -6842,10 +6775,10 @@ ${message}
       enableSandbox(ctx);
     }
   }
-  function sandboxOverview2(cwd, includeProject) {
+  function sandboxOverview(cwd, includeProject) {
     const config = loadSandboxConfig(cwd, includeProject);
-    const { globalPath, projectPath } = getConfigPaths(cwd);
-    const windowsImplementation = process.platform === "win32" ? activeWindowsImplementation() : undefined;
+    const { globalPath, projectPath } = getPiConfigPaths(cwd, "sandbox.json");
+    const windowsImplementation = process.platform === "win32" ? windowsStatus().active : undefined;
     return {
       enabled: config.enabled,
       running: sandboxEnabled && sandboxReady,
@@ -6866,7 +6799,7 @@ ${message}
     load: loadSandboxEnabledSettings,
     setEnabled: (ctx, enabled, scope) => applySandboxSetting(ctx, enabled, scope),
     clearProject: (ctx) => applySandboxSetting(ctx, undefined, "project"),
-    overview: sandboxOverview2
+    overview: sandboxOverview
   };
   const integration = {
     version: LANDSTRIP_RUNTIME_VERSION,

package/package.json

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