pi-landstrip 0.18.32 → 0.18.34

package/README.md

@@ -136,12 +136,16 @@ forms at one scope is an error.
 Agent definitions accept `name`, `description`, `prompt`, `mode`, `model`,
 `variant`, `temperature`, `top_p`, `steps`, `color`, `hidden`, `disable`,
 `options`, and `permission`. `mode` is `primary`, `subagent`, or `all` and
-defaults to `all`.
+defaults to `all`. `/agents` Primary lists only `mode: primary` agents. The
+Subagent tab lists `mode: subagent` and `mode: all` agents, including JSON and
+Markdown definitions.
 
 The built-in primary agents are `build` and `plan`; built-in subagents are
 `general`, `scout`, and `explore`. Pi also loads Markdown agents from
-`~/.pi/agent/agents/` and `.pi/agents/`. Project definitions override global
-definitions, and configured agents override Markdown agents with the same name.
+`~/.pi/agent/agents/` and `.pi/agents/`. Project definitions overlay global
+definitions. Configured fields overlay Markdown agents with the same name, so a
+model-only `landstrip.json` entry keeps the Markdown agent's mode, prompt, and
+permissions.
 
 ## Commands and tasks
 

package/api.ts

@@ -6,6 +6,8 @@ import type { Readable, Writable } from 'node:stream';
 
 import type { ExtensionAPI, ExtensionContext } from '@earendil-works/pi-coding-agent';
 
+import { isRecord } from '@landstrip/landstrip/shared';
+
 export const LANDSTRIP_CONTEXT_ENV = 'LANDSTRIP_CONTEXT';
 export const LANDSTRIP_RUNTIME_VERSION = 2;
 
@@ -168,10 +170,6 @@ function eventBus(pi: ExtensionAPI): EventBusLike | undefined {
   return (pi as ExtensionAPI & { events?: EventBusLike }).events;
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
 function isRuntime(value: unknown): value is PiLandstripRuntimeV2 {
   return (
     isRecord(value) &&

package/dist/index.ts

@@ -20,7 +20,7 @@ import {
   isIP,
   Socket as NetSocket
 } from "node:net";
-import { homedir as homedir3, tmpdir as tmpdir2 } from "node:os";
+import { tmpdir as tmpdir2 } from "node:os";
 import { basename as basename3, dirname as dirname4, isAbsolute as isAbsolute3, join as join7, parse, resolve as resolve3, sep as sep4 } from "node:path";
 import { StringDecoder as StringDecoder2 } from "node:string_decoder";
 import { fileURLToPath as fileURLToPath2, URL } from "node:url";
@@ -35,8 +35,22 @@ import { matchesKey as matchesKey2, truncateToWidth as truncateToWidth3 } from "
 import {
   binaryPath
 } from "@landstrip/landstrip";
+import {
+  allowsAllDomains,
+  controlResponseLine,
+  domainMatchesAny,
+  formatLandstripTraps,
+  isDenialTrap,
+  isFilesystemTrap,
+  isQueryTrap,
+  parseLandstripTraps,
+  parseTrapLine,
+  pathUnderDirectory,
+  sessionScopeFor
+} from "@landstrip/landstrip/shared";
 
 // api.ts
+import { isRecord } from "@landstrip/landstrip/shared";
 var LANDSTRIP_CONTEXT_ENV = "LANDSTRIP_CONTEXT";
 var LANDSTRIP_RUNTIME_VERSION = 2;
 var RUNTIME_REGISTER_EVENT = "landstrip:runtime:register:v2";
@@ -44,9 +58,6 @@ var RUNTIME_DISCOVER_EVENT = "landstrip:runtime:discover:v2";
 function eventBus(pi) {
   return pi.events;
 }
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function publishLandstripRuntime(pi, runtime) {
   const events = eventBus(pi);
   if (!events)
@@ -198,15 +209,7 @@ var BUILT_IN_LANDSTRIP_CONFIG = {
 import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
-function expandHomePath(path) {
-  if (path === "~" || path === "$HOME")
-    return homedir();
-  if (path.startsWith("~/"))
-    return join(homedir(), path.slice(2));
-  if (path.startsWith("$HOME/"))
-    return join(homedir(), path.slice(6));
-  return path;
-}
+import { expandHomePath, isRecord as isRecord2 } from "@landstrip/landstrip/shared";
 function expandFileReferences(text, baseDir) {
   if (!text.includes("{file:"))
     return text;
@@ -237,9 +240,6 @@ function expandFileReferences(text, baseDir) {
 function formatError(error) {
   return error instanceof Error ? error.message : String(error);
 }
-function isRecord2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 var OPENCODE_THEME_COLORS = new Set([
   "primary",
   "secondary",
@@ -996,16 +996,20 @@ function loadAgentCatalog(cwd, piAgentDir = getAgentDir2(), includeProject = tru
       continue;
     }
     const imported = normalized.get(name);
-    if (Object.keys(value).every((key) => key === "disable")) {
-      if (imported) {
-        normalized.set(name, {
-          ...imported,
-          disabled: value.disable === true,
-          raw: { ...imported.raw, disable: value.disable }
-        });
+    if (imported) {
+      try {
+        const source = agentSources.get(name) ?? imported.source;
+        normalized.set(name, normalizeAgent(name, { ...imported.raw, ...value }, source, imported.origin ?? {
+          kind: "pi-markdown",
+          source: imported.source
+        }));
+      } catch (error) {
+        diagnostics.push(formatError(error));
       }
       continue;
     }
+    if (Object.keys(value).every((key) => key === "disable"))
+      continue;
     try {
       const source = agentSources.get(name) ?? "built-in";
       normalized.set(name, normalizeAgent(name, value, source, {
@@ -1058,6 +1062,9 @@ function mergePermissionRules(...values) {
 function availableAgents(catalog) {
   return [...catalog.agents.values()].filter((agent) => !agent.hidden && !agent.disabled);
 }
+function isPrimaryAgent(agent) {
+  return agent.mode === "primary";
+}
 function agentSupportsMode(agent, mode) {
   return agent.mode === mode || agent.mode === "all";
 }
@@ -2744,7 +2751,7 @@ ${this.primaryAgent.prompt}` };
     let disabledOverrides = loadAgentDisabledOverrides(ctx.cwd, projectTrusted);
     let maxSubagentsSettings = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
     let tab = requested ? "log" : "primary";
-    const agentsForTab = () => agents.filter((agent) => agentSupportsMode(agent, tab === "subagent" ? "subagent" : "primary"));
+    const agentsForTab = () => agents.filter((agent) => tab === "subagent" ? agentSupportsMode(agent, "subagent") : isPrimaryAgent(agent));
     let selectedAgent = Math.max(0, agentsForTab().findIndex((agent) => agent.name === this.primaryAgent?.name));
     let selectedTask = requested ? tasks.findIndex((task) => task.id === requested || task.id.startsWith(requested)) : 0;
     if (selectedTask < 0) {
@@ -3105,7 +3112,7 @@ ${this.primaryAgent.prompt}` };
               tui.requestRender();
             });
             return;
-          } else if (tab === "primary" && matchesKey(data, "return") && agent && !agent.disabled && agentSupportsMode(agent, "primary")) {
+          } else if (tab === "primary" && matchesKey(data, "return") && agent && !agent.disabled && isPrimaryAgent(agent)) {
             this.selectPrimaryAgent(agent.name, ctx).then(() => tui.requestRender()).catch((error) => ctx.ui.notify(`Could not select primary agent: ${formatError(error)}`, "error"));
             return;
           } else if (tab === "primary" && matchesKey(data, "return") && agent) {
@@ -3314,7 +3321,7 @@ ${this.primaryAgent.prompt}` };
       ctx.ui.notify(diagnostic, "warning");
     if (catalog.diagnostics.length > 0)
       return false;
-    const agent = availableAgents(catalog).find((candidate) => candidate.name === name && agentSupportsMode(candidate, "primary"));
+    const agent = availableAgents(catalog).find((candidate) => candidate.name === name && isPrimaryAgent(candidate));
     if (!agent) {
       ctx.ui.notify(`Unknown primary agent: ${name}`, "error");
       return false;
@@ -3335,7 +3342,7 @@ ${this.primaryAgent.prompt}` };
       ctx.ui.notify(diagnostic, "warning");
     if (catalog.diagnostics.length > 0)
       return;
-    const agents = availableAgents(catalog).filter((agent) => agentSupportsMode(agent, "primary"));
+    const agents = availableAgents(catalog).filter(isPrimaryAgent);
     if (agents.length === 0) {
       ctx.ui.notify("No primary agents are available", "warning");
       return;
@@ -4256,7 +4263,7 @@ ${renderTaskResult(task.id, failed ? "error" : "completed", value)}`;
       if (typeof value?.name === "string")
         name = value.name;
     }
-    const agents = availableAgents(catalog).filter((agent2) => agentSupportsMode(agent2, "primary"));
+    const agents = availableAgents(catalog).filter(isPrimaryAgent);
     const agent = agents.find((candidate) => candidate.name === name) ?? agents[0];
     if (agent && !await this.activatePrimaryAgent(agent, catalog, ctx, false)) {
       this.invalidatePrimaryAgent(catalog, ctx);
@@ -4620,23 +4627,6 @@ function addWritePathToConfig(configPath, pathToAdd) {
 function mergeAllowances(base, session, execution) {
   return [...base, ...session, ...execution ?? []];
 }
-function domainMatchesPattern(domain, pattern) {
-  const normalizedDomain = domain.toLowerCase().replace(/\.+$/, "");
-  const normalizedPattern = pattern.toLowerCase().replace(/\.+$/, "");
-  if (normalizedPattern === "*")
-    return true;
-  if (normalizedPattern.startsWith("*.")) {
-    const base = normalizedPattern.slice(2);
-    return normalizedDomain === base || normalizedDomain.endsWith(`.${base}`);
-  }
-  return normalizedDomain === normalizedPattern;
-}
-function domainMatchesAny(domain, patterns) {
-  return patterns.some((pattern) => domainMatchesPattern(domain, pattern));
-}
-function allowsAllDomains(allowedDomains) {
-  return allowedDomains.includes("*");
-}
 function shouldPromptForWrite(path, allowWrite, cwd) {
   return allowWrite.length === 0 || !matchesPattern(path, allowWrite, cwd);
 }
@@ -4703,40 +4693,6 @@ function normalizeBlockedPath(path, cwd) {
   const nativePath = process.platform === "win32" && /^\/[a-zA-Z](?:\/|$)/.test(path) ? `${path[1]}:${path.slice(2)}` : path;
   return canonicalizePath(isAbsolute3(nativePath) ? nativePath : join7(cwd, nativePath), cwd);
 }
-function pathUnderDirectory(filePath, dir) {
-  const normalizedFilePath = normalizePathSeparators(filePath);
-  const normalizedDir = normalizePathSeparators(dir);
-  if (normalizedFilePath === normalizedDir)
-    return true;
-  const sep5 = normalizedDir.endsWith("/") ? "" : "/";
-  return normalizedFilePath.startsWith(normalizedDir + sep5);
-}
-function sessionScopeFor(filePath, baseDirectory) {
-  const dir = dirname4(filePath);
-  const normalizedDir = normalizePathSeparators(dir);
-  const home = homedir3();
-  const boundaries = new Set;
-  if (home)
-    boundaries.add(home);
-  try {
-    const realHome = realpathSync2.native(home);
-    if (realHome)
-      boundaries.add(realHome);
-  } catch {}
-  for (const boundary of boundaries) {
-    const normalizedBoundary = normalizePathSeparators(boundary);
-    if (pathUnderDirectory(dir, boundary)) {
-      const rest = normalizedDir.slice(normalizedBoundary.length).replace(/^\/+/, "");
-      const first = rest.split("/")[0];
-      if (!first)
-        return filePath;
-      return join7(boundary, first);
-    }
-  }
-  if (pathUnderDirectory(dir, baseDirectory))
-    return baseDirectory;
-  return dir;
-}
 function longestPrefixMatch(path, patterns, cwd) {
   let best = -1;
   for (const pattern of patterns) {
@@ -4761,15 +4717,6 @@ function isPathLike(value) {
 function normalizePathMatch(value, cwd) {
   return isPathLike(value) ? normalizeBlockedPath(value, cwd) : null;
 }
-function isFilesystemTrap(trap) {
-  return trap.kind === "filesystem";
-}
-function isDenialTrap(trap) {
-  return trap.kind === "filesystem" || trap.kind === "network";
-}
-function isQueryTrap(trap) {
-  return isDenialTrap(trap) && trap.state === "query";
-}
 function extractBlockedPath(trapOutput, cwd) {
   const landstripErrors = parseLandstripTraps(trapOutput).filter(isFilesystemTrap);
   if (landstripErrors.length > 0) {
@@ -4815,67 +4762,6 @@ function extractTrapBlockedPath(trapOutput, cwd, operation) {
   }
   return null;
 }
-function isLandstripTrap(value) {
-  if (typeof value !== "object" || value === null)
-    return false;
-  const obj = value;
-  switch (obj.kind) {
-    case "filesystem":
-      return (obj.operation === "read" || obj.operation === "write") && typeof obj.path === "string" && typeof obj.query_id === "string";
-    case "network":
-      return typeof obj.operation === "string" && typeof obj.target === "string" && typeof obj.query_id === "string";
-    case "launch":
-      return typeof obj.program === "string" && typeof obj.message === "string";
-    case "usage":
-      return typeof obj.message === "string";
-    case "internal":
-      return typeof obj.code === "string" && typeof obj.message === "string";
-    default:
-      return false;
-  }
-}
-function parseTrapLine(line) {
-  try {
-    const parsed = JSON.parse(line);
-    return isLandstripTrap(parsed) ? parsed : null;
-  } catch {
-    return null;
-  }
-}
-function parseLandstripTraps(output) {
-  const traps = [];
-  for (const line of output.trim().split(`
-`)) {
-    const trap = parseTrapLine(line);
-    if (trap)
-      traps.push(trap);
-  }
-  return traps;
-}
-function formatLandstripTraps(traps) {
-  return traps.map((trap) => {
-    switch (trap.kind) {
-      case "filesystem":
-        return `landstrip: filesystem ${trap.operation} denied: ${trap.path} (${trap.mechanism})`;
-      case "network":
-        return `landstrip: network ${trap.operation} denied: ${trap.target} (${trap.mechanism})`;
-      case "launch":
-        return `landstrip: launch failed: ${trap.program}: ${trap.message}`;
-      case "usage":
-        return `landstrip: usage error: ${trap.message}`;
-      case "internal": {
-        const mechanism = trap.mechanism ? ` (${trap.mechanism})` : "";
-        return `landstrip: ${trap.code}${mechanism}: ${trap.message}`;
-      }
-    }
-  }).join(`
-`);
-}
-function controlResponseLine(queryId, action) {
-  const response = { query_id: queryId, action };
-  return JSON.stringify(response) + `
-`;
-}
 function notify(ctx, message, level) {
   if (!ctx.hasUI)
     return;
@@ -5763,8 +5649,7 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
     if (options2.signal?.aborted)
       throw new Error("Task cancelled");
     if (!ensureSandboxState(options2.ctx)) {
-      const explicitlyDisabled = noSandboxFlag || !loadConfig(options2.cwd).enabled;
-      if (!explicitlyDisabled) {
+      if (sandboxState === "unavailable") {
         throw new Error("Sandbox is unavailable; refusing subagent process");
       }
       if (!unsandboxedWorkerWarningShown) {
@@ -5870,7 +5755,7 @@ function createLandstripIntegrationWithPrompts(options, permissionPrompts) {
     };
   }
   async function prepareProcess(options2) {
-    if (process.platform === "win32" && (noSandboxFlag || !loadConfig(options2.cwd).enabled)) {
+    if (process.platform === "win32" && (getNoSandboxFlag() || !loadConfig(options2.cwd).enabled)) {
       throw new Error("Generic process preparation requires sandboxing on Windows");
     }
     return prepareRpcWorker({
@@ -6450,7 +6335,7 @@ ${message}
     enableStatus(ctx, config);
     return true;
   }
-  let noSandboxFlag = false;
+  let getNoSandboxFlag = () => false;
   function disableSandbox(ctx) {
     sandboxEnabled = false;
     sandboxReady = false;
@@ -6458,7 +6343,7 @@ ${message}
     setTuiStatus(ctx, "sandbox", undefined);
   }
   function ensureSandboxState(ctx) {
-    if (noSandboxFlag) {
+    if (getNoSandboxFlag()) {
       disableSandbox(ctx);
       return false;
     }
@@ -6504,6 +6389,7 @@ ${message}
       type: "boolean",
       default: false
     });
+    getNoSandboxFlag = () => Boolean(maybePi.getFlag?.("no-sandbox"));
     unpublishRuntime?.();
     unpublishRuntime = publishLandstripRuntime(pi, integration);
     if (shouldRegisterBashTool)
@@ -6526,8 +6412,7 @@ ${message}
       resetSessionAllowances();
       const trustContext = ctx;
       projectConfigTrusted = trustContext.isProjectTrusted?.() ?? false;
-      noSandboxFlag = Boolean(maybePi.getFlag?.("no-sandbox"));
-      if (noSandboxFlag) {
+      if (getNoSandboxFlag()) {
         disableSandbox(ctx);
         notify(ctx, "Sandbox disabled via --no-sandbox", "warning");
         if (!unpublishRuntime)
@@ -6567,7 +6452,7 @@ ${message}
         const shouldToggle = await ctx.ui.custom((tui, theme, _kb, done) => {
           const { muted, accent, text } = themeColors(theme);
           const sandboxStatus = () => {
-            if (noSandboxFlag)
+            if (getNoSandboxFlag())
               return { color: "warning", label: "Disabled by --no-sandbox" };
             if (!config.enabled)
               return { color: "warning", label: "Disabled by configuration" };
@@ -6643,10 +6528,10 @@ ${target.path}`);
           const scope = await setSandboxConfigEnabled(ctx.cwd, enabled, projectTrusted);
           if (!enabled) {
             disableSandbox(ctx);
-          } else if (!noSandboxFlag) {
+          } else if (!getNoSandboxFlag()) {
             enableSandbox(ctx);
           }
-          if (enabled && noSandboxFlag) {
+          if (enabled && getNoSandboxFlag()) {
             notify(ctx, "Sandbox remains disabled via --no-sandbox", "warning");
           } else {
             notify(ctx, `Sandbox ${enabled ? "enabled" : "disabled"} in ${scope} config`, "info");
@@ -6662,7 +6547,7 @@ ${target.path}`);
     const effectiveEnabled = loadConfig(ctx.cwd).enabled;
     if (!effectiveEnabled) {
       disableSandbox(ctx);
-    } else if (!noSandboxFlag) {
+    } else if (!getNoSandboxFlag()) {
       enableSandbox(ctx);
     }
   }

package/package.json

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