pi-landstrip 0.18.17 → 0.18.18

package/dist/index.ts

@@ -1604,12 +1604,12 @@ var INSPECTOR_BODY_LINES = 16;
 var PI_THINKING_LEVELS = new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
 var AGENTS_HELP_ROWS = [
   ["Tab", "Next tab"],
-  ["Shift+Tab / S", "Switch scope in Agents or Settings"],
+  ["Shift+Tab / S", "Switch scope in Primary, Subagent, or Settings"],
   ["↑ / ↓", "Select item or scroll when follow is off"],
   ["F", "Toggle task log follow"],
   ["Page Up / Down", "Scroll task output by page"],
   ["Home / End", "Jump to task output boundary"],
-  ["Enter", "Open logs, set primary, or save"],
+  ["Enter", "Open log, set primary, or save"],
   ["Esc", "Back or close"],
   ["Ctrl+C", "Close"],
   ["Space", "Enable agent or toggle sandbox"],
@@ -2397,8 +2397,9 @@ ${this.primaryAgent.prompt}` };
     let maxSubagentsSettings = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
     const sandboxCallbacks = this.integration.sandboxCallbacks;
     let sandboxSettings = sandboxCallbacks?.load(ctx.cwd, projectTrusted) ?? { global: true };
-    let tab = requested ? "logs" : "agents";
-    let selectedAgent = Math.max(0, agents.findIndex((agent) => agent.name === this.primaryAgent?.name));
+    let tab = requested ? "log" : "primary";
+    const agentsForTab = () => agents.filter((agent) => agentSupportsMode(agent, tab === "subagent" ? "subagent" : "primary"));
+    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) {
       ctx.ui.notify(`Unknown task session: ${requested}`, "error");
@@ -2412,13 +2413,14 @@ ${this.primaryAgent.prompt}` };
     let follow = requested.length > 0;
     let scroll = 0;
     const reloadAgents = () => {
-      const selectedName = agents[selectedAgent]?.name;
+      const selectedName = agentsForTab()[selectedAgent]?.name;
       catalog = this.getAgentCatalog(ctx);
       globalCatalog = this.loadCatalog(ctx.cwd, getAgentDir4(), false);
       agents = [...catalog.agents.values()].filter((agent) => !agent.hidden).sort((left, right) => left.name.localeCompare(right.name));
       disabledOverrides = loadAgentDisabledOverrides(ctx.cwd, projectTrusted);
-      const nextSelected = selectedName ? agents.findIndex((agent) => agent.name === selectedName) : selectedAgent;
-      selectedAgent = Math.max(0, Math.min(nextSelected < 0 ? 0 : nextSelected, agents.length - 1));
+      const listedAgents = agentsForTab();
+      const nextSelected = selectedName ? listedAgents.findIndex((agent) => agent.name === selectedName) : selectedAgent;
+      selectedAgent = Math.max(0, Math.min(nextSelected < 0 ? 0 : nextSelected, listedAgents.length - 1));
     };
     const reloadSettings = () => {
       maxSubagentsSettings = loadMaxSubagentsSettings(ctx.cwd, projectTrusted);
@@ -2462,27 +2464,25 @@ ${this.primaryAgent.prompt}` };
           return `${clipped}${" ".repeat(Math.max(0, cellWidth - visibleWidth2(clipped)))}`;
         };
         refreshTasks();
-        const tabs = `${dialogTabs(theme, ["Agents", "Tasks", "Logs", "Settings", "Help"], `${tab[0]?.toUpperCase()}${tab.slice(1)}`)}${tab === "tasks" || tab === "logs" ? "" : theme.fg("dim", `  ·  Scope: ${scope === "project" ? "Project" : "Global"}`)}`;
-        if (tab === "agents") {
-          const start = Math.max(0, Math.min(selectedAgent - 3, agents.length - 7));
-          const shown2 = agents.slice(start, start + 7);
-          const nameWidth = Math.min(20, Math.max(5, ...agents.map((agent2) => visibleWidth2(`@${agent2.name}`))));
-          const primaryWidth = 7;
-          const modeWidth = 8;
+        const tabs = `${dialogTabs(theme, ["Primary", "Subagent", "Tasks", "Log", "Settings", "Help"], `${tab[0]?.toUpperCase()}${tab.slice(1)}`)}${tab === "tasks" || tab === "log" ? "" : theme.fg("dim", `  ·  Scope: ${scope === "project" ? "Project" : "Global"}`)}`;
+        if (tab === "primary" || tab === "subagent") {
+          const listedAgents = agentsForTab();
+          const start = Math.max(0, Math.min(selectedAgent - 3, listedAgents.length - 7));
+          const shown2 = listedAgents.slice(start, start + 7);
+          const nameWidth = Math.min(20, Math.max(5, ...listedAgents.map((agent2) => visibleWidth2(`@${agent2.name}`))));
           const sourceWidth = 8;
           const stateWidth = 13;
-          const fixedWidth = 2 + primaryWidth + 1 + nameWidth + 1 + modeWidth + 1 + sourceWidth + 1 + stateWidth;
+          const fixedWidth = 2 + nameWidth + 1 + sourceWidth + 1 + stateWidth;
           const modelWidth = Math.max(10, Math.min(30, contentWidth - fixedWidth - 1));
           const lines2 = [
             tabs,
             "",
-            theme.fg("dim", `  ${pad("Primary", primaryWidth)} ${pad("Agent", nameWidth)} ${pad("Mode", modeWidth)} ${pad("Source", sourceWidth)} ${pad("Model", modelWidth)} ${pad("State", stateWidth)}`)
+            theme.fg("dim", `  ${pad("Agent", nameWidth)} ${pad("Source", sourceWidth)} ${pad("Model", modelWidth)} ${pad("State", stateWidth)}`)
           ];
           for (const [offset, agent2] of shown2.entries()) {
             const index = start + offset;
             const selected = index === selectedAgent;
             const cursor = selected ? theme.fg("accent", "›") : " ";
-            const primary = agent2.name === this.primaryAgent?.name ? "yes" : "";
             const current = scopedAgent(agent2);
             const unavailable = current === undefined;
             const scopedDisabled = current?.disabled ?? false;
@@ -2493,11 +2493,13 @@ ${this.primaryAgent.prompt}` };
             const color = deleting ? "error" : disabled ? "muted" : "text";
             const plainName = pad(`@${agent2.name}`, nameWidth);
             const name = deleting ? theme.fg("error", plainName) : disabled ? theme.fg("muted", plainName) : colorizeAgentText(agent2.color, plainName, (agentColor, text) => theme.fg(agentColor, text));
-            lines2.push(`${cursor} ${theme.fg(primary ? "success" : "dim", pad(primary, primaryWidth))} ${name} ${theme.fg(color, pad(agent2.mode, modeWidth))} ${theme.fg(color, pad(agent2.source, sourceWidth))} ${theme.fg(color, pad(agent2.model ?? "current model", modelWidth))} ${theme.fg(deleting ? "error" : unavailable ? "muted" : scopedDisabled ? "warning" : color, pad(state, stateWidth))}`);
+            const line = `${cursor} ${name} ${theme.fg(color, pad(agent2.source, sourceWidth))} ${theme.fg(color, pad(agent2.model ?? "current model", modelWidth))} ${theme.fg(deleting ? "error" : unavailable ? "muted" : scopedDisabled ? "warning" : color, pad(state, stateWidth))}`;
+            lines2.push(agent2.name === this.primaryAgent?.name ? theme.bold(line) : line);
           }
-          if (agents.length === 0)
-            lines2.push(theme.fg("muted", "  No agents configured."));
-          const agent = agents[selectedAgent];
+          if (listedAgents.length === 0) {
+            lines2.push(theme.fg("muted", `  No ${tab} agents configured.`));
+          }
+          const agent = listedAgents[selectedAgent];
           if (agent) {
             lines2.push("", theme.fg(agent.disabled ? "muted" : "text", agent.description ?? "No description"));
             const details = [
@@ -2661,7 +2663,7 @@ ${this.primaryAgent.prompt}` };
           }
           return;
         }
-        if ((matchesKey(data, "shift+tab") || data.toLowerCase() === "s") && (tab === "agents" || tab === "settings")) {
+        if ((matchesKey(data, "shift+tab") || data.toLowerCase() === "s") && (tab === "primary" || tab === "subagent" || tab === "settings")) {
           if (saving)
             return;
           if (dirtySettings.size > 0) {
@@ -2684,9 +2686,16 @@ ${this.primaryAgent.prompt}` };
             ctx.ui.notify("Save changes with Enter or discard them with R before leaving", "warning");
             return;
           }
-          const tabs = ["agents", "tasks", "logs", "settings", "help"];
-          tab = tabs[(tabs.indexOf(tab) + 1) % tabs.length] ?? "agents";
-          if (tab === "logs" && tasks.length > 0)
+          const selectedName = tab === "primary" || tab === "subagent" ? agentsForTab()[selectedAgent]?.name : undefined;
+          const tabs = ["primary", "subagent", "tasks", "log", "settings", "help"];
+          tab = tabs[(tabs.indexOf(tab) + 1) % tabs.length] ?? "primary";
+          if (tab === "primary" || tab === "subagent") {
+            const listedAgents = agentsForTab();
+            const preferredName = selectedName ?? (tab === "primary" ? this.primaryAgent?.name : undefined);
+            const nextSelected = preferredName ? listedAgents.findIndex((agent) => agent.name === preferredName) : 0;
+            selectedAgent = Math.max(0, Math.min(nextSelected < 0 ? 0 : nextSelected, listedAgents.length - 1));
+          }
+          if (tab === "log" && tasks.length > 0)
             follow = true;
           else
             follow = false;
@@ -2695,16 +2704,17 @@ ${this.primaryAgent.prompt}` };
           tui.requestRender();
           return;
         }
-        if (tab === "agents") {
-          const agent = agents[selectedAgent];
+        if (tab === "primary" || tab === "subagent") {
+          const listedAgents = agentsForTab();
+          const agent = listedAgents[selectedAgent];
           if (matchesKey(data, "escape") || matchesKey(data, "ctrl+c")) {
             done();
             return;
           }
           if (matchesKey(data, "up"))
             selectedAgent = Math.max(0, selectedAgent - 1);
-          else if (matchesKey(data, "down") && agents.length > 0) {
-            selectedAgent = Math.min(agents.length - 1, selectedAgent + 1);
+          else if (matchesKey(data, "down") && listedAgents.length > 0) {
+            selectedAgent = Math.min(listedAgents.length - 1, selectedAgent + 1);
           } else if (data.toLowerCase() === "x" && agent && !saving) {
             if (!projectTrusted || !canDeleteProjectAgent(ctx.cwd, agent)) {
               ctx.ui.notify("Only project agent files can be deleted here", "warning");
@@ -2760,10 +2770,10 @@ ${this.primaryAgent.prompt}` };
               tui.requestRender();
             });
             return;
-          } else if (matchesKey(data, "return") && agent && !agent.disabled && agentSupportsMode(agent, "primary")) {
+          } else if (tab === "primary" && matchesKey(data, "return") && agent && !agent.disabled && agentSupportsMode(agent, "primary")) {
             this.selectPrimaryAgent(agent.name, ctx).then(() => tui.requestRender()).catch((error) => ctx.ui.notify(`Could not select primary agent: ${formatError(error)}`, "error"));
             return;
-          } else if (matchesKey(data, "return") && agent) {
+          } else if (tab === "primary" && matchesKey(data, "return") && agent) {
             ctx.ui.notify(agent.disabled ? "Enable this agent before setting it as primary" : "This agent cannot be used as the primary agent", "warning");
             return;
           } else
@@ -2868,7 +2878,7 @@ ${this.primaryAgent.prompt}` };
           else if (matchesKey(data, "down") && tasks.length > 0) {
             selectedTask = Math.min(tasks.length - 1, selectedTask + 1);
           } else if (matchesKey(data, "return") && tasks.length > 0) {
-            tab = "logs";
+            tab = "log";
             follow = true;
             scroll = 0;
           } else
@@ -2876,7 +2886,7 @@ ${this.primaryAgent.prompt}` };
           tui.requestRender();
           return;
         }
-        if (tab !== "logs")
+        if (tab !== "log")
           return;
         const task = tasks[selectedTask];
         if (!task) {

package/package.json

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