pi-landstrip 0.18.11 → 0.18.13

package/README.md

@@ -143,11 +143,6 @@ Pi Markdown agents are loaded from `~/.pi/agent/agents/` and `.pi/agents/`.
 `landstrip.agent` settings override Markdown agents with the same name.
 Project definitions override global definitions.
 
-OpenCode agent imports are enabled by default. Set
-`landstrip.opencode.showGlobalAgents` or `showLocalAgents` to `false` to disable
-a source. OpenCode agents fill missing names; Pi agents take precedence.
-Project imports require a trusted project.
-
 See the main [Landstrip documentation](https://github.com/landstrip/landstrip#readme)
 for `sandbox.json` fields and platform policy semantics.
 

package/dist/index.ts

@@ -18,8 +18,8 @@ import {
   isIP,
   Socket as NetSocket
 } from "node:net";
-import { homedir as homedir4, tmpdir as tmpdir2 } from "node:os";
-import { basename as basename3, dirname as dirname5, isAbsolute as isAbsolute3, join as join7, parse, resolve as resolve3 } from "node:path";
+import { homedir as homedir3, tmpdir as tmpdir2 } from "node:os";
+import { basename as basename2, dirname as dirname4, isAbsolute as isAbsolute3, join as join7, parse, resolve as resolve3 } from "node:path";
 import { StringDecoder as StringDecoder2 } from "node:string_decoder";
 import { fileURLToPath as fileURLToPath2, URL } from "node:url";
 import {
@@ -80,8 +80,8 @@ import {
   rmSync,
   writeFileSync as writeFileSync3
 } from "node:fs";
-import { homedir as homedir3, tmpdir } from "node:os";
-import { basename as basename2, dirname as dirname4, isAbsolute as isAbsolute2, join as join6, relative as relative3, resolve as resolve2, sep as sep3 } from "node:path";
+import { homedir as homedir2, tmpdir } from "node:os";
+import { basename, dirname as dirname3, isAbsolute as isAbsolute2, join as join6, relative as relative3, resolve as resolve2, sep as sep3 } from "node:path";
 import { fileURLToPath } from "node:url";
 import {
   getAgentDir as getAgentDir4,
@@ -275,38 +275,69 @@ function colorizeAgentText(color, text, themeFg, fallback = "accent") {
 
 class AsyncQueue {
   tail = Promise.resolve();
+  generation = 0;
+  resetWaiters = [];
   async acquire(signal, cancellationMessage = "Request cancelled") {
     if (signal?.aborted)
       throw new Error(cancellationMessage);
+    const generation = this.generation;
     let release;
     const previous = this.tail;
     this.tail = new Promise((resolve2) => {
       release = resolve2;
     });
-    if (!signal) {
-      await previous;
-      return release;
-    }
-    let abort;
+    const finish = () => {
+      release?.();
+    };
+    let wakeReset;
+    const resetSignal = new Promise((resolve2) => {
+      wakeReset = resolve2;
+      this.resetWaiters.push(resolve2);
+    });
+    const dropResetWaiter = () => {
+      if (!wakeReset)
+        return;
+      const index = this.resetWaiters.indexOf(wakeReset);
+      if (index >= 0)
+        this.resetWaiters.splice(index, 1);
+      wakeReset = undefined;
+    };
     try {
-      await Promise.race([
-        previous,
-        new Promise((_resolve, reject) => {
-          abort = () => reject(new Error(cancellationMessage));
-          signal.addEventListener("abort", abort, { once: true });
-        })
-      ]);
+      if (!signal) {
+        await Promise.race([previous, resetSignal]);
+      } else {
+        let abort;
+        try {
+          await Promise.race([
+            previous,
+            resetSignal,
+            new Promise((_resolve, reject) => {
+              abort = () => reject(new Error(cancellationMessage));
+              signal.addEventListener("abort", abort, { once: true });
+            })
+          ]);
+        } finally {
+          if (abort)
+            signal.removeEventListener("abort", abort);
+        }
+      }
+      if (this.generation !== generation) {
+        throw new Error(cancellationMessage);
+      }
+      return finish;
     } catch (error) {
-      previous.finally(() => release?.());
+      previous.finally(finish);
       throw error;
     } finally {
-      if (abort)
-        signal.removeEventListener("abort", abort);
+      dropResetWaiter();
     }
-    return release;
   }
   reset() {
+    this.generation += 1;
     this.tail = Promise.resolve();
+    const waiters = this.resetWaiters.splice(0);
+    for (const wake of waiters)
+      wake();
   }
 }
 
@@ -332,38 +363,7 @@ class PermissionPromptCoordinator {
 
 // config.ts
 var MAX_SUBAGENTS = 16;
-var DEFAULT_OPENCODE = {
-  showGlobalAgents: true,
-  showLocalAgents: true
-};
-var LANDSTRIP_KEYS = new Set(["maxSubagents", "agent", "permission", "opencode"]);
-var OPENCODE_KEYS = new Set(["showGlobalAgents", "showLocalAgents"]);
-function readBooleanField(section, key, path) {
-  if (!(key in section))
-    return;
-  const value = section[key];
-  if (typeof value === "boolean")
-    return value;
-  throw new Error(`${path}.${key} must be a boolean`);
-}
-function normalizeOpenCode(value, path) {
-  if (value === undefined)
-    return {};
-  if (!isRecord2(value))
-    throw new Error(`${path} must be a JSON object`);
-  for (const key of Object.keys(value)) {
-    if (!OPENCODE_KEYS.has(key))
-      throw new Error(`${path}: unknown field ${key}`);
-  }
-  const result = {};
-  const showGlobalAgents = readBooleanField(value, "showGlobalAgents", path);
-  if (showGlobalAgents !== undefined)
-    result.showGlobalAgents = showGlobalAgents;
-  const showLocalAgents = readBooleanField(value, "showLocalAgents", path);
-  if (showLocalAgents !== undefined)
-    result.showLocalAgents = showLocalAgents;
-  return result;
-}
+var LANDSTRIP_KEYS = new Set(["maxSubagents", "agent", "permission"]);
 function readJsonObject(path) {
   let value;
   try {
@@ -417,7 +417,6 @@ function readLandstripSettings(path) {
   }
   if ("permission" in settings.landstrip)
     config.permission = settings.landstrip.permission;
-  config.opencode = normalizeOpenCode(settings.landstrip.opencode, `${path}: landstrip.opencode`);
   expandAgentPromptReferences(config, path);
   return config;
 }
@@ -557,8 +556,7 @@ function loadLandstripConfig(cwd, includeProject = true, agentDir = getAgentDir(
   }
   if (!isRecord2(config.agent))
     throw new Error("landstrip.agent must be an object");
-  const opencode = { ...DEFAULT_OPENCODE, ...config.opencode };
-  return { ...config, maxSubagents, agent: config.agent, opencode, agentSources };
+  return { ...config, maxSubagents, agent: config.agent, agentSources };
 }
 function loadMaxSubagentsSettings(cwd, includeProject = true, agentDir = getAgentDir()) {
   const global = loadLandstripConfig(cwd, false, agentDir).maxSubagents;
@@ -574,17 +572,8 @@ function loadMaxSubagentsSettings(cwd, includeProject = true, agentDir = getAgen
 
 // opencode-agents.ts
 import { existsSync as existsSync2, readdirSync, readFileSync as readFileSync3, statSync } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { dirname as dirname2, extname, join as join3, relative, sep } from "node:path";
+import { extname, join as join3, relative, sep } from "node:path";
 import { parse as parseYaml } from "yaml";
-import { parse as parseJsonc, printParseErrorCode } from "jsonc-parser";
-var AGENT_DIR_PREFIXES = ["agent/", "agents/"];
-function openCodeGlobalConfigDir() {
-  if (process.env.OPENCODE_CONFIG_DIR)
-    return process.env.OPENCODE_CONFIG_DIR;
-  const xdg = process.env.XDG_CONFIG_HOME;
-  return join3(xdg && xdg.length > 0 ? xdg : join3(homedir2(), ".config"), "opencode");
-}
 function listMarkdownFiles(root) {
   if (!existsSync2(root))
     return [];
@@ -615,13 +604,6 @@ function listMarkdownFiles(root) {
 }
 function agentNameFromPath(dir, filePath) {
   const relativePath = relative(dir, filePath).split(sep).join("/");
-  for (const prefix of AGENT_DIR_PREFIXES) {
-    if (relativePath.startsWith(prefix)) {
-      const candidate = relativePath.slice(prefix.length);
-      const extension2 = extname(candidate);
-      return extension2.length > 0 ? candidate.slice(0, -extension2.length) : candidate;
-    }
-  }
   const extension = extname(relativePath);
   return extension.length > 0 ? relativePath.slice(0, -extension.length) : relativePath;
 }
@@ -653,7 +635,7 @@ function convertToolsToPermission(tools) {
   }
   return permission;
 }
-function normalizeOpenCodeAgentRaw(data, prompt) {
+function normalizeMarkdownAgentRaw(data, prompt) {
   const known = new Set([
     "name",
     "model",
@@ -713,98 +695,27 @@ function normalizeOpenCodeAgentRaw(data, prompt) {
 }
 function parseMarkdownAgentRaw(content) {
   const { data, body } = parseFrontmatter(content);
-  return normalizeOpenCodeAgentRaw(data, body.trim());
-}
-function parseOpenCodeConfig(path) {
-  const errors = [];
-  const value = parseJsonc(readFileSync3(path, "utf8"), errors, {
-    allowTrailingComma: true
-  });
-  if (errors.length > 0) {
-    const error = errors[0];
-    throw new Error(`${printParseErrorCode(error.error)} at offset ${error.offset}`);
-  }
-  if (!isRecord2(value))
-    throw new Error("config must contain a JSON object");
-  return value;
+  return normalizeMarkdownAgentRaw(data, body.trim());
 }
-function loadAgentsFromConfigFile(path, source, agents, diagnostics) {
-  if (!existsSync2(path))
-    return;
-  try {
-    const config = parseOpenCodeConfig(path);
-    if (config.agent === undefined)
-      return;
-    if (!isRecord2(config.agent))
-      throw new Error("agent must be a JSON object");
-    for (const [name, value] of Object.entries(config.agent)) {
+function loadPiMarkdownAgents(options) {
+  const agents = new Map;
+  const diagnostics = [];
+  for (const directory of options.directories) {
+    for (const filePath of listMarkdownFiles(directory.path)) {
       try {
-        if (!name)
-          throw new Error("agent name is empty");
-        if (!isRecord2(value))
-          throw new Error(`agent ${name} must be a JSON object`);
-        if (value.prompt !== undefined && typeof value.prompt !== "string") {
-          throw new Error(`agent ${name} prompt must be a string`);
+        const content = readFileSync3(filePath, "utf8");
+        const raw = parseMarkdownAgentRaw(content);
+        const name = agentNameFromPath(directory.path, filePath);
+        if (!name) {
+          diagnostics.push(`${filePath}: agent name is empty`);
+          continue;
         }
-        const prompt = typeof value.prompt === "string" ? expandFileReferences(value.prompt, dirname2(path)) : "";
-        const raw = normalizeOpenCodeAgentRaw(value, prompt);
-        agents.set(name, { name, source, path, format: "json", raw });
+        agents.set(name, { name, source: directory.source, path: filePath, raw });
       } catch (error) {
-        diagnostics.push(`${path}: ${formatError(error)}`);
-      }
-    }
-  } catch (error) {
-    diagnostics.push(`${path}: ${formatError(error)}`);
-  }
-}
-function loadConfigAgentsFromDir(dir, source, agents, diagnostics) {
-  for (const file of ["opencode.json", "opencode.jsonc"]) {
-    loadAgentsFromConfigFile(join3(dir, file), source, agents, diagnostics);
-  }
-}
-function loadAgentsFromRoot(root, nameRoot, source, agents, diagnostics) {
-  for (const filePath of listMarkdownFiles(root)) {
-    try {
-      const content = readFileSync3(filePath, "utf8");
-      const raw = parseMarkdownAgentRaw(content);
-      const name = agentNameFromPath(nameRoot, filePath);
-      if (!name) {
-        diagnostics.push(`${filePath}: agent name is empty`);
-        continue;
+        diagnostics.push(`${filePath}: ${formatError(error)}`);
       }
-      agents.set(name, { name, source, path: filePath, format: "markdown", raw });
-    } catch (error) {
-      diagnostics.push(`${filePath}: ${formatError(error)}`);
     }
   }
-}
-function loadAgentsFromDir(dir, source, agents, diagnostics) {
-  for (const subdir of ["agent", "agents"]) {
-    loadAgentsFromRoot(join3(dir, subdir), dir, source, agents, diagnostics);
-  }
-}
-function loadPiMarkdownAgents(options) {
-  const agents = new Map;
-  const diagnostics = [];
-  for (const directory of options.directories) {
-    loadAgentsFromRoot(directory.path, directory.path, directory.source, agents, diagnostics);
-  }
-  return { agents, diagnostics };
-}
-function loadOpenCodeAgents(options) {
-  const agents = new Map;
-  const diagnostics = [];
-  if (options.includeGlobal) {
-    const globalDir = options.globalConfigDir ?? openCodeGlobalConfigDir();
-    loadConfigAgentsFromDir(globalDir, "global", agents, diagnostics);
-    loadAgentsFromDir(globalDir, "global", agents, diagnostics);
-  }
-  if (options.includeProject) {
-    loadConfigAgentsFromDir(options.cwd, "local", agents, diagnostics);
-    const projectDir = join3(options.cwd, ".opencode");
-    loadConfigAgentsFromDir(projectDir, "local", agents, diagnostics);
-    loadAgentsFromDir(projectDir, "local", agents, diagnostics);
-  }
   return { agents, diagnostics };
 }
 
@@ -919,38 +830,16 @@ function loadAgentCatalog(cwd, piAgentDir = getAgentDir2(), includeProject = tru
   let configuredAgents = {};
   let configuredPermission;
   let agentSources = new Map;
-  let showGlobalAgents = false;
-  let showLocalAgents = false;
   try {
     const config = loadLandstripConfig(cwd, includeProject, piAgentDir);
     maxSubagents = config.maxSubagents;
     configuredAgents = config.agent;
     configuredPermission = config.permission;
     agentSources = new Map(config.agentSources);
-    showGlobalAgents = config.opencode.showGlobalAgents;
-    showLocalAgents = config.opencode.showLocalAgents;
   } catch (error) {
     diagnostics.push(formatError(error));
   }
-  const openCode = loadOpenCodeAgents({
-    cwd,
-    includeGlobal: showGlobalAgents,
-    includeProject: showLocalAgents && includeProject
-  });
-  diagnostics.push(...openCode.diagnostics);
   const normalized = new Map;
-  for (const imported of openCode.agents.values()) {
-    try {
-      const kind = imported.format === "markdown" ? "opencode-markdown" : "opencode-json";
-      normalized.set(imported.name, normalizeAgent(imported.name, imported.raw, imported.source, {
-        kind,
-        source: imported.source,
-        path: imported.path
-      }));
-    } catch (error) {
-      diagnostics.push(`${imported.path}: ${formatError(error)}`);
-    }
-  }
   const piMarkdown = loadPiMarkdownAgents({
     directories: [
       { path: join4(piAgentDir, "agents"), source: "global" },
@@ -1045,13 +934,13 @@ function agentSupportsMode(agent, mode) {
 
 // agent-files.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync4, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
-import { basename, dirname as dirname3, join as join5, relative as relative2, sep as sep2 } from "node:path";
+import { dirname as dirname2, join as join5, relative as relative2, sep as sep2 } from "node:path";
 import { getAgentDir as getAgentDir3, withFileMutationQueue as withFileMutationQueue2 } from "@earendil-works/pi-coding-agent";
 import {
   applyEdits,
   modify,
-  parse as parseJsonc2,
-  printParseErrorCode as printParseErrorCode2
+  parse as parseJsonc,
+  printParseErrorCode
 } from "jsonc-parser";
 var JSON_FORMAT = {
   formattingOptions: { insertSpaces: true, tabSize: 2, eol: `
@@ -1059,10 +948,10 @@ var JSON_FORMAT = {
 };
 function parseJsonDocument(content, label) {
   const errors = [];
-  const value = parseJsonc2(content, errors, { allowTrailingComma: true });
+  const value = parseJsonc(content, errors, { allowTrailingComma: true });
   if (errors.length > 0) {
     const error = errors[0];
-    throw new Error(`${label}: ${printParseErrorCode2(error.error)} at offset ${error.offset}`);
+    throw new Error(`${label}: ${printParseErrorCode(error.error)} at offset ${error.offset}`);
   }
   if (!isRecord2(value))
     throw new Error(`${label} must contain a JSON object`);
@@ -1077,38 +966,22 @@ function valueAtPath(root, path) {
   }
   return value;
 }
-function agentJsonPath(kind, name) {
-  return kind === "landstrip" ? ["landstrip", "agent", name] : ["agent", name];
+function agentJsonPath(name) {
+  return ["landstrip", "agent", name];
 }
-function agentContainerPath(kind) {
-  return kind === "landstrip" ? ["landstrip", "agent"] : ["agent"];
-}
-function editorSnippet(kind, name, raw) {
-  const value = kind === "landstrip" ? { landstrip: { agent: { [name]: raw } } } : { agent: { [name]: raw } };
-  return `${JSON.stringify(value, null, 2)}
+function editorSnippet(name, raw) {
+  return `${JSON.stringify({ landstrip: { agent: { [name]: raw } } }, null, 2)}
 `;
 }
-function parseEditorSnippet(content, kind, name) {
+function parseEditorSnippet(content, name) {
   const root = parseJsonDocument(content, "Edited agent");
-  const parent = kind === "landstrip" ? valueAtPath(root, ["landstrip"]) : root;
-  const container = valueAtPath(root, agentContainerPath(kind));
-  const rootKey = kind === "landstrip" ? "landstrip" : "agent";
-  if (Object.keys(root).length !== 1 || root[rootKey] === undefined || !isRecord2(parent) || Object.keys(parent).length !== 1 || parent.agent === undefined || !isRecord2(container) || Object.keys(container).length !== 1 || !isRecord2(container[name])) {
+  const parent = valueAtPath(root, ["landstrip"]);
+  const container = valueAtPath(root, ["landstrip", "agent"]);
+  if (Object.keys(root).length !== 1 || root.landstrip === undefined || !isRecord2(parent) || Object.keys(parent).length !== 1 || parent.agent === undefined || !isRecord2(container) || Object.keys(container).length !== 1 || !isRecord2(container[name])) {
     throw new Error(`Edited JSON must contain only agent ${name}`);
   }
   return container[name];
 }
-function validateEditedAgent(kind, name, raw) {
-  if (kind === "landstrip") {
-    validateAgentRaw(name, raw);
-    return;
-  }
-  const prompt = raw.prompt;
-  if (prompt !== undefined && typeof prompt !== "string") {
-    throw new Error(`agent ${name} prompt must be a string`);
-  }
-  validateAgentRaw(name, normalizeOpenCodeAgentRaw(raw, typeof prompt === "string" ? prompt : ""));
-}
 function ensureFinalNewline(content) {
   return content.endsWith(`
 `) ? content : `${content}
@@ -1120,7 +993,7 @@ async function writeJsonNode(path, nodePath, value) {
 `;
     parseJsonDocument(content, path);
     const edited = applyEdits(content, modify(content, nodePath, value, JSON_FORMAT));
-    mkdirSync2(dirname3(path), { recursive: true });
+    mkdirSync2(dirname2(path), { recursive: true });
     writeFileSync2(path, ensureFinalNewline(edited), { mode: 384 });
   });
 }
@@ -1146,11 +1019,11 @@ async function deleteJsonNode(path, nodePath, containerPaths) {
   });
   return deleted;
 }
-function readAgentNode(path, kind, name) {
+function readAgentNode(path, name) {
   if (!existsSync3(path))
     return;
   const root = parseJsonDocument(readFileSync4(path, "utf8"), path);
-  const value = valueAtPath(root, agentJsonPath(kind, name));
+  const value = valueAtPath(root, agentJsonPath(name));
   return isRecord2(value) ? { ...value } : undefined;
 }
 function permissionConfig(agent) {
@@ -1189,7 +1062,7 @@ function relocateGlobalPrompt(raw, agent) {
   if (agent.origin?.source !== "global" || !agent.origin.path || typeof raw.prompt !== "string") {
     return raw;
   }
-  return { ...raw, prompt: expandFileReferences(raw.prompt, dirname3(agent.origin.path)) };
+  return { ...raw, prompt: expandFileReferences(raw.prompt, dirname2(agent.origin.path)) };
 }
 function safeRelative(root, path) {
   const value = relative2(root, path);
@@ -1203,19 +1076,13 @@ function projectMarkdownPath(cwd, agentDir, agent) {
     const suffix = safeRelative(join5(agentDir, "agents"), origin.path) ?? `${agent.name}.md`;
     return join5(cwd, ".pi", "agents", suffix);
   }
-  if (origin.kind === "opencode-markdown" && origin.path) {
-    return join5(cwd, ".opencode", "agents", `${agent.name}.md`);
-  }
   throw new Error(`Agent ${agent.name} has no Markdown source`);
 }
-function openCodeProjectPath(cwd, sourcePath) {
-  return join5(cwd, ".opencode", basename(sourcePath));
-}
 function projectSettingsPath(cwd, agentDir) {
   return getPiConfigPaths(cwd, "settings.json", agentDir).projectPath;
 }
 function projectSettingsHasAgent(cwd, name, agentDir) {
-  return readAgentNode(projectSettingsPath(cwd, agentDir), "landstrip", name) !== undefined;
+  return readAgentNode(projectSettingsPath(cwd, agentDir), name) !== undefined;
 }
 function canDeleteProjectAgent(cwd, agent, agentDir = getAgentDir3()) {
   try {
@@ -1225,21 +1092,16 @@ function canDeleteProjectAgent(cwd, agent, agentDir = getAgentDir3()) {
     return false;
   }
   const origin = agent.origin;
-  return Boolean(origin?.source === "local" && origin.path && (origin.kind === "pi-markdown" || origin.kind === "opencode-markdown" || origin.kind === "opencode-json"));
+  return Boolean(origin?.source === "local" && origin.path && origin.kind === "pi-markdown");
 }
 async function deleteProjectAgent(cwd, agent, agentDir = getAgentDir3()) {
   const settingsPath = projectSettingsPath(cwd, agentDir);
-  const deletedOverride = await deleteJsonNode(settingsPath, agentJsonPath("landstrip", agent.name), [["landstrip", "agent"], ["landstrip"]]);
+  const deletedOverride = await deleteJsonNode(settingsPath, agentJsonPath(agent.name), [
+    ["landstrip", "agent"],
+    ["landstrip"]
+  ]);
   const origin = agent.origin;
-  if (origin?.source !== "local" || !origin.path)
-    return deletedOverride;
-  if (origin.kind === "opencode-json") {
-    const deletedSource = await deleteJsonNode(origin.path, agentJsonPath("opencode", agent.name), [
-      ["agent"]
-    ]);
-    return deletedOverride || deletedSource;
-  }
-  if (origin.kind !== "pi-markdown" && origin.kind !== "opencode-markdown") {
+  if (origin?.source !== "local" || !origin.path || origin.kind !== "pi-markdown") {
     return deletedOverride;
   }
   if (!existsSync3(origin.path))
@@ -1249,44 +1111,31 @@ async function deleteProjectAgent(cwd, agent, agentDir = getAgentDir3()) {
 }
 function prepareProjectAgentEditor(cwd, agent, agentDir = getAgentDir3()) {
   const origin = agent.origin;
-  const openCodeProjectEnabled = loadLandstripConfig(cwd, true, agentDir).opencode.showLocalAgents;
-  if (origin?.path && (origin.kind === "pi-markdown" || origin.kind === "opencode-markdown")) {
-    const useMarkdown = origin.kind === "pi-markdown" || origin.source === "local" || openCodeProjectEnabled;
-    const target2 = useMarkdown ? projectMarkdownPath(cwd, agentDir, agent) : projectSettingsPath(cwd, agentDir);
-    const projectOverride = useMarkdown ? undefined : readAgentNode(target2, "landstrip", agent.name);
-    const disabledOverride = projectOverride && Object.keys(projectOverride).length === 1 && typeof projectOverride.disable === "boolean" ? projectOverride.disable : undefined;
+  if (origin?.path && origin.kind === "pi-markdown") {
+    const target2 = projectMarkdownPath(cwd, agentDir, agent);
     return {
       title: `Edit @${agent.name}`,
       content: readFileSync4(origin.path, "utf8"),
       async save(content) {
-        const edited = parseMarkdownAgentRaw(content);
-        const raw2 = !useMarkdown && edited.disable === undefined && disabledOverride !== undefined ? { ...edited, disable: disabledOverride } : edited;
-        validateAgentRaw(agent.name, raw2);
-        if (!useMarkdown) {
-          await writeJsonNode(target2, agentJsonPath("landstrip", agent.name), raw2);
-          return;
-        }
+        validateAgentRaw(agent.name, parseMarkdownAgentRaw(content));
         await withFileMutationQueue2(target2, async () => {
-          mkdirSync2(dirname3(target2), { recursive: true });
+          mkdirSync2(dirname2(target2), { recursive: true });
           writeFileSync2(target2, ensureFinalNewline(content), { mode: 384 });
         });
       }
     };
   }
-  const useOpenCode = origin?.kind === "opencode-json" && origin.path !== undefined && (origin.source === "local" || openCodeProjectEnabled);
-  const kind = useOpenCode ? "opencode" : "landstrip";
   const sourcePath = origin?.path;
-  const sourceKind = origin?.kind === "opencode-json" ? "opencode" : "landstrip";
-  const sourceRaw = sourcePath ? readAgentNode(sourcePath, sourceKind, agent.name) : undefined;
-  const raw = relocateGlobalPrompt(sourceKind === kind && sourceRaw ? sourceRaw : agent.raw ? { ...agent.raw } : normalizedAgentRaw(agent), agent);
-  const target = kind === "opencode" && sourcePath ? origin?.source === "local" ? sourcePath : openCodeProjectPath(cwd, sourcePath) : projectSettingsPath(cwd, agentDir);
+  const sourceRaw = origin?.kind === "settings" && sourcePath ? readAgentNode(sourcePath, agent.name) : undefined;
+  const raw = relocateGlobalPrompt(sourceRaw ? sourceRaw : agent.raw ? { ...agent.raw } : normalizedAgentRaw(agent), agent);
+  const target = projectSettingsPath(cwd, agentDir);
   return {
     title: `Edit @${agent.name}`,
-    content: editorSnippet(kind, agent.name, raw),
+    content: editorSnippet(agent.name, raw),
     async save(content) {
-      const edited = parseEditorSnippet(content, kind, agent.name);
-      validateEditedAgent(kind, agent.name, edited);
-      await writeJsonNode(target, agentJsonPath(kind, agent.name), edited);
+      const edited = parseEditorSnippet(content, agent.name);
+      validateAgentRaw(agent.name, edited);
+      await writeJsonNode(target, agentJsonPath(agent.name), edited);
     }
   };
 }
@@ -1744,7 +1593,7 @@ var PRIMARY_AGENT_ENTRY = "landstrip.primary-agent";
 var WORKER_ENV = "PI_LANDSTRIP_WORKER";
 var CONTROL_TITLE = "pi-landstrip:control:v1";
 var MAX_DEPTH = 3;
-var packageDir = dirname4(fileURLToPath(import.meta.url));
+var packageDir = dirname3(fileURLToPath(import.meta.url));
 var MAX_TASK_OUTPUT_BYTES = 64 * 1024;
 var INSPECTOR_BODY_LINES = 16;
 var PI_THINKING_LEVELS = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
@@ -1790,7 +1639,7 @@ function resolvePiPackage() {
   piPackageResolved = true;
   try {
     const entry = fileURLToPath(import.meta.resolve("@earendil-works/pi-coding-agent"));
-    let dir2 = dirname4(entry);
+    let dir2 = dirname3(entry);
     for (;; ) {
       const pkgPath = join6(dir2, "package.json");
       if (existsSync4(pkgPath)) {
@@ -1798,7 +1647,7 @@ function resolvePiPackage() {
         if (pkg)
           return pkg;
       }
-      const parent = dirname4(dir2);
+      const parent = dirname3(dir2);
       if (parent === dir2)
         break;
       dir2 = parent;
@@ -1812,7 +1661,7 @@ function resolvePiPackage() {
       if (pkg)
         return pkg;
     }
-    const parent = dirname4(dir);
+    const parent = dirname3(dir);
     if (parent === dir)
       return;
     dir = parent;
@@ -1830,7 +1679,7 @@ function readPiPackage(pkgPath) {
     const binFile = typeof value.bin === "string" ? value.bin : isRecord2(value.bin) && typeof value.bin.pi === "string" ? value.bin.pi : undefined;
     if (!binFile)
       return;
-    const cliEntry = join6(dirname4(pkgPath), binFile);
+    const cliEntry = join6(dirname3(pkgPath), binFile);
     if (!existsSync4(cliEntry))
       return;
     cachedPiPackage = { cliEntry, version: parts.slice(0, 3) };
@@ -2085,14 +1934,14 @@ class Semaphore {
     if (this.active >= this.limit)
       return;
     this.active += 1;
-    return () => this.release();
+    return this.releaseOnce();
   }
   async acquire(signal) {
     if (signal?.aborted)
       throw new Error("Task cancelled");
     if (this.active < this.limit) {
       this.active += 1;
-      return () => this.release();
+      return this.releaseOnce();
     }
     await new Promise((resolve3, reject) => {
       const abort = () => {
@@ -2109,11 +1958,17 @@ class Semaphore {
       this.waiters.push(start);
       signal?.addEventListener("abort", abort, { once: true });
     });
-    return () => this.release();
+    return this.releaseOnce();
   }
-  release() {
-    this.active -= 1;
-    this.waiters.shift()?.();
+  releaseOnce() {
+    let released = false;
+    return () => {
+      if (released)
+        return;
+      released = true;
+      this.active -= 1;
+      this.waiters.shift()?.();
+    };
   }
 }
 
@@ -2261,15 +2116,15 @@ function canonicalPermissionPath(path, seen = new Set) {
         if (seen.has(existing))
           return path;
         seen.add(existing);
-        const target = resolve2(dirname4(existing), readlinkSync(existing), ...missing);
+        const target = resolve2(dirname3(existing), readlinkSync(existing), ...missing);
         return canonicalPermissionPath(target, seen);
       }
       break;
     } catch {
-      const parent = dirname4(existing);
+      const parent = dirname3(existing);
       if (parent === existing)
         return path;
-      missing.unshift(basename2(existing));
+      missing.unshift(basename(existing));
       existing = parent;
     }
   }
@@ -2708,7 +2563,9 @@ ${this.primaryAgent.prompt}` };
             const dirty = dirtySettings.has(index) ? theme.fg("warning", " *") : "";
             lines2.push(`${cursor} ${value} ${label}${dirty}`);
           }
-          lines2.push("", theme.fg("dim", selectedSetting === 0 ? rows[0]?.inherited ? "Sets concurrent subagents. Zero disables the task tool. Using the Global value." : "Sets concurrent subagents. Zero disables the task tool." : rows[1]?.inherited ? "Controls OS sandboxing. Use /sandbox to inspect its policy. Using the Global value." : "Controls OS sandboxing. Use /sandbox to inspect its policy."));
+          if (selectedSetting === 1) {
+            lines2.push("", theme.fg("dim", rows[1]?.inherited ? "Controls OS sandboxing. Use /sandbox to inspect its policy. Using the Global value." : "Controls OS sandboxing. Use /sandbox to inspect its policy."));
+          }
           if (saving)
             lines2.push("", theme.fg("dim", "Saving…"));
           return box(lines2);
@@ -3564,11 +3421,11 @@ ${catalog.diagnostics.join(`
       return;
     });
     try {
-      const sessionWritePath = task.sessionDir ?? (task.sessionFile ? dirname4(task.sessionFile) : undefined);
+      const sessionWritePath = task.sessionDir ?? (task.sessionFile ? dirname3(task.sessionFile) : undefined);
       if (!sessionWritePath)
         throw new Error("Subagent task has no session directory or file");
       const cliEntry = invocation.args[0] ?? invocation.command;
-      const cliRoot = dependencyRoot(cliEntry) ?? dirname4(dirname4(cliEntry));
+      const cliRoot = dependencyRoot(cliEntry) ?? dirname3(dirname3(cliEntry));
       const extensionRoot = dependencyRoot(packageDir);
       launch = await this.integration.prepareRpcWorker({
         command: invocation.command,
@@ -3588,7 +3445,7 @@ ${catalog.diagnostics.join(`
           ...new Set([
             ctx.cwd,
             ...agentBootstrapPaths(agentDir),
-            join6(homedir3(), ".agents", "skills"),
+            join6(homedir2(), ".agents", "skills"),
             packageDir,
             join6(packageDir, "node_modules"),
             invocation.command,
@@ -3596,7 +3453,7 @@ ${catalog.diagnostics.join(`
             extensionRoot,
             ...workerExtensions.flatMap((extension) => [
               extension.entry,
-              dirname4(extension.entry),
+              dirname3(extension.entry),
               dependencyRoot(extension.entry)
             ]),
             task.sessionDir,
@@ -3718,7 +3575,9 @@ ${catalog.diagnostics.join(`
             });
           } finally {
             if (handedOff)
-              await this.restoreLease(task.id, signal);
+              await this.restoreLease(task.id).catch(() => {
+                return;
+              });
           }
           response = {
             ok: true,
@@ -3808,7 +3667,7 @@ ${renderTaskResult(task.id, "error", message)}`);
   storeTaskText(task, value, kind) {
     if (Buffer.byteLength(value) <= MAX_TASK_OUTPUT_BYTES)
       return value;
-    const directory = task.sessionDir ?? (task.sessionFile ? dirname4(task.sessionFile) : undefined);
+    const directory = task.sessionDir ?? (task.sessionFile ? dirname3(task.sessionFile) : undefined);
     if (!directory)
       throw new Error(`Task ${task.id} has no artifact directory`);
     mkdirSync3(directory, { recursive: true });
@@ -4015,11 +3874,11 @@ ${renderTaskResult(task.id, failed ? "error" : "completed", value)}`;
     lease.release = undefined;
     return true;
   }
-  async restoreLease(taskId, signal) {
+  async restoreLease(taskId) {
     const lease = this.leases.get(taskId);
     if (!lease || lease.release)
       return;
-    const release = await this.semaphore.acquire(signal);
+    const release = await this.semaphore.acquire();
     const current = this.leases.get(taskId);
     if (!current || current.release) {
       release();
@@ -4070,7 +3929,7 @@ var PROXY_ENVIRONMENT_VARIABLES = [
   "https_proxy",
   "all_proxy"
 ];
-var packageDir2 = dirname5(fileURLToPath2(import.meta.url));
+var packageDir2 = dirname4(fileURLToPath2(import.meta.url));
 var PERMISSION_OPTIONS = [
   { label: "Allow once", action: "once" },
   { label: "Allow for this session", action: "session" },
@@ -4098,7 +3957,7 @@ function loadSandboxConfig(cwd, includeProject) {
   const globalConfigPath = join7(getAgentDir5(), "sandbox.json");
   if (!existsSync5(globalConfigPath)) {
     const templatePath = join7(packageDir2, "sandbox.json");
-    mkdirSync4(dirname5(globalConfigPath), { recursive: true });
+    mkdirSync4(dirname4(globalConfigPath), { recursive: true });
     writeFileSync4(globalConfigPath, readFileSync6(templatePath, "utf-8"), "utf-8");
   }
   let globalConfig = JSON.parse(readFileSync6(join7(packageDir2, "sandbox.json"), "utf-8"));
@@ -4194,12 +4053,12 @@ function readOrEmptyConfig(configPath) {
     return {};
   try {
     return JSON.parse(readFileSync6(configPath, "utf-8"));
-  } catch {
-    return {};
+  } catch (error) {
+    throw new Error(`${configPath}: ${formatError(error)}`);
   }
 }
 function writeConfigFile(configPath, config) {
-  mkdirSync4(dirname5(configPath), { recursive: true });
+  mkdirSync4(dirname4(configPath), { recursive: true });
   writeFileSync4(configPath, `${JSON.stringify(config, null, 2)}
 `, "utf-8");
 }
@@ -4295,10 +4154,10 @@ function canonicalizePath(filePath, cwd) {
     const tail = [];
     let probe = abs;
     while (!existsSync5(probe)) {
-      const parent = dirname5(probe);
+      const parent = dirname4(probe);
       if (parent === probe)
         return abs;
-      tail.unshift(basename3(probe));
+      tail.unshift(basename2(probe));
       probe = parent;
     }
     try {
@@ -4336,9 +4195,9 @@ function pathUnderDirectory(filePath, dir) {
   return normalizedFilePath.startsWith(normalizedDir + sep4);
 }
 function sessionScopeFor(filePath, baseDirectory) {
-  const dir = dirname5(filePath);
+  const dir = dirname4(filePath);
   const normalizedDir = normalizePathSeparators(dir);
-  const home = homedir4();
+  const home = homedir3();
   const boundaries = new Set;
   if (home)
     boundaries.add(home);

package/package.json

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