pi-landstrip 0.18.41 → 0.18.43

package/api.ts

@@ -213,13 +213,13 @@ export function useLandstrip(
   }
 }
 
-export function provideLandstripShell(
+function provideExtensionProvider(
   pi: ExtensionAPI,
-  provider: LandstripShellProvider,
+  register: (runtime: PiLandstripRuntimeV2) => () => void,
 ): () => void {
   let unregisterProvider: (() => void) | undefined;
   const stopDiscovery = useLandstrip(pi, (runtime) => {
-    const unregisterNext = runtime.registerShellProvider(provider);
+    const unregisterNext = register(runtime);
     unregisterProvider?.();
     unregisterProvider = unregisterNext;
   });
@@ -229,20 +229,18 @@ export function provideLandstripShell(
   };
 }
 
+export function provideLandstripShell(
+  pi: ExtensionAPI,
+  provider: LandstripShellProvider,
+): () => void {
+  return provideExtensionProvider(pi, (runtime) => runtime.registerShellProvider(provider));
+}
+
 export function provideLandstripPermissionAsk(
   pi: ExtensionAPI,
   provider: LandstripPermissionAskProvider,
 ): () => void {
-  let unregisterProvider: (() => void) | undefined;
-  const stopDiscovery = useLandstrip(pi, (runtime) => {
-    const unregisterNext = runtime.registerPermissionAskProvider(provider);
-    unregisterProvider?.();
-    unregisterProvider = unregisterNext;
-  });
-  return () => {
-    stopDiscovery();
-    unregisterProvider?.();
-  };
+  return provideExtensionProvider(pi, (runtime) => runtime.registerPermissionAskProvider(provider));
 }
 
 export function publishLandstripRuntime(
@@ -288,7 +286,7 @@ export function contextFromEnvironment(
       !['enabled', 'disabled', 'unavailable'].includes(String(value.sandbox)) ||
       typeof value.cwd !== 'string' ||
       !Number.isInteger(value.depth) ||
-      Number(value.depth) < 0 ||
+      (value.depth as number) < 0 ||
       ['sessionId', 'taskId', 'parentTaskId', 'agent'].some(
         (key) => value[key] !== undefined && typeof value[key] !== 'string',
       )

package/dist/index.ts

@@ -111,10 +111,11 @@ import {
   SelectList,
   SettingsList,
   Text,
-  truncateToWidth as truncateToWidth2,
-  visibleWidth as visibleWidth2,
+  truncateToWidth,
+  visibleWidth,
   wrapTextWithAnsi
 } from "@earendil-works/pi-tui";
+import { canonicalizeHost } from "@landstrip/landstrip-api/shared";
 import { Type } from "typebox";
 
 // agents.ts
@@ -133,78 +134,6 @@ import {
   printParseErrorCode
 } from "jsonc-parser";
 
-// built-in-agents.ts
-var BUILT_IN_LANDSTRIP_CONFIG = {
-  maxSubagents: 0,
-  toolFilesystemPolicy: "host",
-  agent: {
-    build: {
-      description: "Implement and test requested changes",
-      mode: "primary",
-      color: "success",
-      prompt: "Implement, test, and complete the request."
-    },
-    plan: {
-      description: "Plan before running commands or editing files",
-      mode: "primary",
-      color: "warning",
-      prompt: "Analyze the request and produce a clear plan before making changes.",
-      permission: { edit: "ask", bash: "ask", task: "ask" }
-    },
-    general: {
-      description: "General-purpose agent for complex tasks",
-      mode: "subagent",
-      prompt: "Complete the task and return a concise result.",
-      permission: { todowrite: "deny" }
-    },
-    scout: {
-      description: "Read-only codebase reconnaissance",
-      mode: "subagent",
-      prompt: "Inspect the codebase without editing. Return concise findings with exact file references and a recommended starting point.",
-      permission: {
-        "*": "deny",
-        read: {
-          "*": "allow",
-          "**/*.env": "ask",
-          "**/*.env.*": "ask",
-          "**/*.env.example": "allow"
-        },
-        glob: "allow",
-        grep: "allow",
-        list: "allow"
-      }
-    },
-    explore: {
-      description: "Codebase research with shell and web access",
-      mode: "subagent",
-      prompt: "Explore without editing. Use shell or web tools when needed, then return concise findings with file references.",
-      permission: {
-        "*": "deny",
-        read: {
-          "*": "allow",
-          "**/*.env": "ask",
-          "**/*.env.*": "ask",
-          "**/*.env.example": "allow"
-        },
-        glob: "allow",
-        grep: "allow",
-        list: "allow",
-        bash: "allow",
-        webfetch: "allow",
-        websearch: "allow"
-      }
-    }
-  },
-  permission: {
-    "*": "allow",
-    read: {
-      "**/*.env": "ask",
-      "**/*.env.*": "ask",
-      "**/*.env.example": "allow"
-    }
-  }
-};
-
 // util.ts
 import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
@@ -272,17 +201,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];
@@ -412,6 +339,76 @@ class PermissionPromptCoordinator {
 }
 
 // config.ts
+var BUILT_IN_LANDSTRIP_CONFIG = {
+  maxSubagents: 0,
+  toolFilesystemPolicy: "host",
+  agent: {
+    build: {
+      description: "Implement and test requested changes",
+      mode: "primary",
+      color: "success",
+      prompt: "Implement, test, and complete the request."
+    },
+    plan: {
+      description: "Plan before running commands or editing files",
+      mode: "primary",
+      color: "warning",
+      prompt: "Analyze the request and produce a clear plan before making changes.",
+      permission: { edit: "ask", bash: "ask", task: "ask" }
+    },
+    general: {
+      description: "General-purpose agent for complex tasks",
+      mode: "subagent",
+      prompt: "Complete the task and return a concise result.",
+      permission: { todowrite: "deny" }
+    },
+    scout: {
+      description: "Read-only codebase reconnaissance",
+      mode: "subagent",
+      prompt: "Inspect the codebase without editing. Return concise findings with exact file references and a recommended starting point.",
+      permission: {
+        "*": "deny",
+        read: {
+          "*": "allow",
+          "**/*.env": "ask",
+          "**/*.env.*": "ask",
+          "**/*.env.example": "allow"
+        },
+        glob: "allow",
+        grep: "allow",
+        list: "allow"
+      }
+    },
+    explore: {
+      description: "Codebase research with shell and web access",
+      mode: "subagent",
+      prompt: "Explore without editing. Use shell or web tools when needed, then return concise findings with file references.",
+      permission: {
+        "*": "deny",
+        read: {
+          "*": "allow",
+          "**/*.env": "ask",
+          "**/*.env.*": "ask",
+          "**/*.env.example": "allow"
+        },
+        glob: "allow",
+        grep: "allow",
+        list: "allow",
+        bash: "allow",
+        webfetch: "allow",
+        websearch: "allow"
+      }
+    }
+  },
+  permission: {
+    "*": "allow",
+    read: {
+      "**/*.env": "ask",
+      "**/*.env.*": "ask",
+      "**/*.env.example": "allow"
+    }
+  }
+};
 function isProjectTrusted(ctx) {
   const trustContext = ctx;
   return trustContext.isProjectTrusted?.() ?? false;
@@ -420,9 +417,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 +459,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 +755,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 +853,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 +889,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 +900,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 +1123,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 +1226,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 +1255,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 +1284,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 raw = relocateGlobalPrompt(sourceRaw ? sourceRaw : agent.raw ? { ...agent.raw } : normalizedAgentRaw(agent), agent);
-  const target = projectConfigTarget(cwd, agentDir);
+  const sourceRaw = origin?.kind === "config" && sourcePath ? readAgentNode(sourcePath, basename(sourcePath) === "landstrip.json" ? "dedicated" : "settings", agent.name) : undefined;
+  const raw = relocateGlobalPrompt(sourceRaw ?? (agent.raw ? { ...agent.raw } : normalizedAgentRaw(agent)), agent);
+  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);
@@ -1326,28 +1299,6 @@ function prepareProjectAgentEditor(cwd, agent, agentDir = getAgentDir3()) {
   };
 }
 
-// box.ts
-import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-function dialogTabs(theme, tabs, active) {
-  return tabs.map((tab) => tab === active ? theme.fg("accent", theme.bold(`[${tab}]`)) : theme.fg("muted", tab)).join("  ");
-}
-function dialogKeys(theme, hints) {
-  const separator = theme.fg("dim", "  ·  ");
-  return hints.map(([key, description]) => `${theme.fg("accent", key)} ${theme.fg("muted", description)}`).join(separator);
-}
-function paneTop(theme, width, title) {
-  if (width < 3)
-    return truncateToWidth(theme.fg("accent", title), Math.max(1, width));
-  const label = theme.fg("accent", theme.bold(` ${title} `));
-  return `${label}${theme.fg("border", "─".repeat(Math.max(0, width - visibleWidth(label))))}`;
-}
-function paneRow(_theme, width, content = "") {
-  if (width < 2)
-    return " ".repeat(Math.max(0, width));
-  const line = truncateToWidth(content, Math.max(1, width - 2));
-  return ` ${line}${" ".repeat(Math.max(0, width - visibleWidth(line) - 1))}`;
-}
-
 // commands.ts
 import { fuzzyFilter } from "@earendil-works/pi-tui";
 var DEFAULT_SUBCOMMAND = "status";
@@ -1362,9 +1313,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 +1331,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 +1347,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 +1404,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 +1415,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 +1430,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 +1495,6 @@ Scope: ${scope} configuration`);
     }
   }
 ];
-function visibleAgents(catalog) {
-  return [...catalog.agents.values()].filter((agent) => !agent.hidden);
-}
 function itemText(item) {
   return item.search ?? item.label;
 }
@@ -2049,6 +1994,25 @@ function listRowBudget(terminalRows, floor, chrome) {
     return floor;
   return Math.max(floor, Math.floor(terminalRows * OVERLAY_HEIGHT_RATIO) - chrome);
 }
+function dialogTabs(theme, tabs, active) {
+  return tabs.map((tab) => tab === active ? theme.fg("accent", theme.bold(`[${tab}]`)) : theme.fg("muted", tab)).join("  ");
+}
+function dialogKeys(theme, hints) {
+  const separator = theme.fg("dim", "  ·  ");
+  return hints.map(([key, description]) => `${theme.fg("accent", key)} ${theme.fg("muted", description)}`).join(separator);
+}
+function paneTop(theme, width, title) {
+  if (width < 3)
+    return truncateToWidth(theme.fg("accent", title), Math.max(1, width));
+  const label = theme.fg("accent", theme.bold(` ${title} `));
+  return `${label}${theme.fg("border", "─".repeat(Math.max(0, width - visibleWidth(label))))}`;
+}
+function paneRow(_theme, width, content = "") {
+  if (width < 2)
+    return " ".repeat(Math.max(0, width));
+  const line = truncateToWidth(content, Math.max(1, width - 2));
+  return ` ${line}${" ".repeat(Math.max(0, width - visibleWidth(line) - 1))}`;
+}
 var PI_THINKING_LEVELS = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
 var AGENTS_HELP_ROWS = [
   ["Tab", "Next tab"],
@@ -2314,18 +2278,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 +2359,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}`;
@@ -2456,8 +2413,27 @@ function dependencyRoot(path) {
   const index = path.lastIndexOf(marker);
   return index < 0 ? undefined : path.slice(0, index + marker.length - 1);
 }
+function endpointHost(baseUrl) {
+  if (!baseUrl)
+    return;
+  try {
+    return canonicalizeHost(new URL(baseUrl).hostname) ?? undefined;
+  } catch {
+    return;
+  }
+}
+function modelEndpointDomains(ctx, selectedModel) {
+  const models = ctx.modelRegistry?.getAll() ?? [];
+  const qualified = models.find((model) => `${model.provider}/${model.id}` === selectedModel);
+  const byId = models.filter((model) => model.id === selectedModel);
+  const registered = qualified ?? (byId.length === 1 ? byId[0] : undefined);
+  const activeName = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined;
+  const active = selectedModel === activeName || selectedModel === ctx.model?.id ? ctx.model : undefined;
+  const host = endpointHost(registered?.baseUrl ?? active?.baseUrl);
+  return host ? [host] : [];
+}
 function agentBootstrapPaths(agentDir) {
-  return [
+  const entries = [
     "settings.json",
     "landstrip.json",
     "models.json",
@@ -2474,7 +2450,8 @@ function agentBootstrapPaths(agentDir) {
     "bin",
     "npm",
     "git"
-  ].map((path) => join6(agentDir, path));
+  ];
+  return [agentDir, ...entries.map((entry) => join6(agentDir, entry))];
 }
 
 class Semaphore {
@@ -3312,7 +3289,7 @@ ${this.primaryAgent.prompt}` };
         const listedAgents = agentsForTab();
         const agentRows = listRowBudget(tui.terminal?.rows, AGENT_LIST_ROWS, AGENT_TAB_CHROME_ROWS);
         const { shown, start, status } = listWindow(listedAgents, selectedAgent, agentRows);
-        const nameWidth = Math.min(20, Math.max(5, ...listedAgents.map((agent2) => visibleWidth2(`@${agent2.name}`))));
+        const nameWidth = Math.min(20, Math.max(5, ...listedAgents.map((agent2) => visibleWidth(`@${agent2.name}`))));
         const modelWidth = Math.max(10, Math.min(24, Math.floor((contentWidth - 2) / 3)));
         const enabledWidth = 13;
         const runtimeWidth = Math.max(12, contentWidth - 2 - nameWidth - 1 - modelWidth - 1 - enabledWidth - 1);
@@ -3531,7 +3508,7 @@ ${this.primaryAgent.prompt}` };
           const shellReadMode = overview.windowsMode !== undefined ? "Policy (required)" : overview.shellReadMode === "host" ? "Host-aligned" : "Policy";
           const changePath = overview.changeScope === "project" ? overview.paths.project : overview.paths.global;
           const item = (label, value) => `  ${theme.fg("dim", label.padEnd(16))} ${value}`;
-          lines.push(`${theme.fg(status.color, "●")} ${theme.fg("text", status.label)}`, item("Configured", overview.enabled ? theme.fg("text", "Enabled") : theme.fg("warning", "Disabled")), item("Runtime", overview.running ? theme.fg("success", "Running") : theme.fg("dim", "Not running")), "", theme.fg("accent", "Protection"), item("Network", networkMode), item("Shell reads", shellReadMode), item("Read rules", `${overview.config.filesystem.denyRead.length + overview.config.filesystem.allowRead.length} · ${overview.readRuleScope}`), item("Write rules", String(overview.config.filesystem.allowWrite.length + overview.config.filesystem.denyWrite.length)), item("Session grants", String(overview.sessionDomains.length + overview.sessionReadPaths.length + overview.sessionWritePaths.length)), "", theme.fg("accent", "Configuration"), item("Change scope", overview.changeScope === "project" ? "Project" : "Global"), item("Change file", truncateToWidth2(changePath, Math.max(10, contentWidth - 20))), item("Project file", truncateToWidth2(overview.paths.project, Math.max(10, contentWidth - 20))), item("Global file", truncateToWidth2(overview.paths.global, Math.max(10, contentWidth - 20))), item("Landstrip binary", truncateToWidth2(overview.paths.binary, Math.max(10, contentWidth - 20))));
+          lines.push(`${theme.fg(status.color, "●")} ${theme.fg("text", status.label)}`, item("Configured", overview.enabled ? theme.fg("text", "Enabled") : theme.fg("warning", "Disabled")), item("Runtime", overview.running ? theme.fg("success", "Running") : theme.fg("dim", "Not running")), "", theme.fg("accent", "Protection"), item("Network", networkMode), item("Shell reads", shellReadMode), item("Read rules", `${overview.config.filesystem.denyRead.length + overview.config.filesystem.allowRead.length} · ${overview.readRuleScope}`), item("Write rules", String(overview.config.filesystem.allowWrite.length + overview.config.filesystem.denyWrite.length)), item("Session grants", String(overview.sessionDomains.length + overview.sessionReadPaths.length + overview.sessionWritePaths.length)), "", theme.fg("accent", "Configuration"), item("Change scope", overview.changeScope === "project" ? "Project" : "Global"), item("Change file", truncateToWidth(changePath, Math.max(10, contentWidth - 20))), item("Project file", truncateToWidth(overview.paths.project, Math.max(10, contentWidth - 20))), item("Global file", truncateToWidth(overview.paths.global, Math.max(10, contentWidth - 20))), item("Landstrip binary", truncateToWidth(overview.paths.binary, Math.max(10, contentWidth - 20))));
           if (overview.windowsMode !== undefined)
             lines.push(item("Windows mode", overview.windowsMode));
           lines.push("", theme.fg("accent", "Network"), item("Allowed domains", listValue(overview.config.network.allowedDomains)), item("Denied domains", listValue(overview.config.network.deniedDomains)), item("Unix sockets", overview.config.network.allowAllUnixSockets ? "all" : listValue(overview.config.network.allowUnixSockets)), "", theme.fg("accent", "Filesystem"), item("Shell reads", shellReadMode), item("Read rules for", overview.readRuleScope), item("Denied reads", listValue(overview.config.filesystem.denyRead)), item("Allowed reads", listValue(overview.config.filesystem.allowRead)), item("Allowed writes", listValue(overview.config.filesystem.allowWrite)), item("Denied writes", listValue(overview.config.filesystem.denyWrite)), "", theme.fg("accent", "Session grants"), item("Domains", listValue(overview.sessionDomains)), item("Read paths", listValue(overview.sessionReadPaths)), item("Write paths", listValue(overview.sessionWritePaths)));
@@ -3636,7 +3613,7 @@ ${this.primaryAgent.prompt}` };
             lines.push(theme.fg("dim", `${scroll + 1}–${scroll + shown.length} of ${transcript.length}`));
           }
           if (steering) {
-            const input = steering.render(Math.max(2, contentWidth - visibleWidth2("Steer ")))[0] ?? "";
+            const input = steering.render(Math.max(2, contentWidth - visibleWidth("Steer ")))[0] ?? "";
             lines.push(`${theme.fg("accent", "Steer")} ${input.replace(/^>/, "›")}`);
           } else if (task.state === "queued" || task.state === "running") {
             lines.push(dialogKeys(theme, [
@@ -3645,17 +3622,17 @@ ${this.primaryAgent.prompt}` };
               ["Esc", "tasks"]
             ]));
           }
-          return pane(lines.map((line) => truncateToWidth2(line, contentWidth)));
+          return pane(lines.map((line) => truncateToWidth(line, contentWidth)));
         },
         help: (frame) => {
           const { tabs, pane, contentWidth, pad } = frame;
-          const shortcutWidth = Math.max(visibleWidth2("Shortcut"), ...AGENTS_HELP_ROWS.map(([shortcut]) => visibleWidth2(shortcut)));
+          const shortcutWidth = Math.max(visibleWidth("Shortcut"), ...AGENTS_HELP_ROWS.map(([shortcut]) => visibleWidth(shortcut)));
           const descriptionWidth = Math.max(1, contentWidth - shortcutWidth - 4);
           const lines = [
             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))}`)
+            ...AGENTS_HELP_ROWS.map(([shortcut, description]) => `  ${theme.fg("accent", pad(shortcut, shortcutWidth))}  ${theme.fg("text", truncateToWidth(description, descriptionWidth))}`)
           ];
           return pane(lines);
         }
@@ -3858,12 +3835,12 @@ ${this.primaryAgent.prompt}` };
             return rows.slice(0, paneHeight);
           };
           const pad = (value, cellWidth) => {
-            const clipped = truncateToWidth2(value, cellWidth);
-            return `${clipped}${" ".repeat(Math.max(0, cellWidth - visibleWidth2(clipped)))}`;
+            const clipped = truncateToWidth(value, cellWidth);
+            return `${clipped}${" ".repeat(Math.max(0, cellWidth - visibleWidth(clipped)))}`;
           };
           const listValue = (values) => {
             const value = values.join(", ") || "none";
-            return truncateToWidth2(value, Math.max(10, contentWidth - 20));
+            return truncateToWidth(value, Math.max(10, contentWidth - 20));
           };
           refreshTasks();
           const tabs = dialogTabs(theme, TAB_ORDER.map((key) => TAB_LABELS[key]), TAB_LABELS[tab]);
@@ -4051,7 +4028,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(`
 `);
@@ -4482,6 +4459,7 @@ ${catalog.diagnostics.join(`
           TEMP: temp
         },
         ctx,
+        domains: modelEndpointDomains(ctx, model),
         readPaths: [
           ...new Set([
             ctx.cwd,
@@ -4776,15 +4754,15 @@ ${renderTaskResult(task.id, "error", message)}`);
           const progress = taskProgress(record);
           const suffix = progress.length > 0 ? theme.fg("dim", `  ·  ${progress.join(" · ")}`) : "";
           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));
+          const descriptionWidth = Math.max(1, width - indentWidth - visibleWidth(`${state}  ${agent}  ${suffix}`));
+          const description = theme.fg("text", truncateToWidth(task.description, descriptionWidth));
           return `${state}  ${agent}  ${description}${suffix}`;
         });
         const shown = tree.slice(0, 8);
         if (tree.length > shown.length) {
           shown.push(theme.fg("dim", `   … ${tree.length - shown.length} more`));
         }
-        return [header, ...shown].map((line) => truncateToWidth2(line, Math.max(1, width)));
+        return [header, ...shown].map((line) => truncateToWidth(line, Math.max(1, width)));
       },
       invalidate() {}
     }));
@@ -5202,13 +5180,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")
@@ -5221,9 +5196,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 {};
@@ -5239,11 +5211,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);
@@ -5255,7 +5227,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 };
@@ -5272,25 +5244,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 ?? []];
 }
@@ -5456,28 +5409,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)) {
@@ -5569,11 +5504,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";
@@ -5709,16 +5639,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")
@@ -5760,11 +5680,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);
@@ -5774,24 +5700,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);
@@ -5827,7 +5757,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" };
       }
@@ -5846,14 +5782,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);
@@ -5929,7 +5866,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;
@@ -5954,7 +5891,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") {
@@ -6061,7 +5998,7 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
       return prepareUnsandboxedRpcWorker(options2);
     }
     const allowances = {
-      domains: [],
+      domains: [...options2.domains ?? []],
       readPaths: [...options2.readPaths],
       writePaths: [...options2.writePaths],
       targets: []
@@ -6554,7 +6491,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)) {
@@ -6565,7 +6502,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") {
@@ -6664,7 +6601,7 @@ ${message}
       return;
     let implementation;
     try {
-      implementation = activeWindowsImplementation();
+      implementation = windowsStatus().active;
     } catch (error) {
       notify(ctx, formatError(error), "error");
       return;
@@ -6684,7 +6621,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) {
@@ -6759,7 +6696,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)",
@@ -6811,7 +6750,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()) {
@@ -6849,10 +6792,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,
@@ -6873,7 +6816,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,
@@ -6895,25 +6838,25 @@ ${message}
   return integration;
 }
 export {
-  writeEnvFile,
-  shouldPromptForWrite,
-  sessionScopeFor,
-  resolveProcessReadPolicy,
-  readAllowed,
-  parseTrapLine,
-  matchesPattern,
-  isQueryTrap,
-  formatLandstripTraps,
-  extractRetryableNativeReadDeniedPath,
-  extractNativeWriteDeniedPath,
-  extractNativeDeniedPath,
-  enforcesShellReadPolicy,
-  domainMatchesAny,
-  pi_landstrip_default as default,
-  createWindowsDenyRead,
-  createPosixShellProvider,
-  createLandstripLauncherEnvironment,
-  createLandstripIntegration,
+  POSIX_SHELL_PROVIDER_ID,
   controlResponseLine,
-  POSIX_SHELL_PROVIDER_ID
+  createLandstripIntegration,
+  createLandstripLauncherEnvironment,
+  createPosixShellProvider,
+  createWindowsDenyRead,
+  pi_landstrip_default as default,
+  domainMatchesAny,
+  enforcesShellReadPolicy,
+  extractNativeDeniedPath,
+  extractNativeWriteDeniedPath,
+  extractRetryableNativeReadDeniedPath,
+  formatLandstripTraps,
+  isQueryTrap,
+  matchesPattern,
+  parseTrapLine,
+  readAllowed,
+  resolveProcessReadPolicy,
+  sessionScopeFor,
+  shouldPromptForWrite,
+  writeEnvFile
 };

package/package.json

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