pi-landstrip 0.18.32 → 0.18.33

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/dist/index.ts

@@ -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);

package/package.json

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