lsd-pi 1.2.2 → 1.2.4

package/dist/resources/extensions/slash-commands/plan.js

@@ -226,13 +226,17 @@ function restoreStateFromSession(ctx) {
 }
 async function enablePlanModeWithModelSwitch(pi, ctx, currentModel, next = {}) {
     enablePlanMode(pi, currentModel, next);
-    // Signal that before_agent_start should switch to the reasoning model on next turn
+    // Keep fallback behavior in before_agent_start for restored sessions or when
+    // immediate switching cannot be completed at entry-time.
     reasoningModelSwitchDone = false;
     if (!readAutoSwitchPlanModelSetting())
         return;
-    if (!readPlanModeReasoningModel()) {
+    const reasoningModel = parseQualifiedModelRef(readPlanModeReasoningModel());
+    if (!reasoningModel) {
         ctx.ui?.notify?.("OpusPlan: set a Plan reasoning model in /settings to auto-switch on entry", "info");
+        return;
     }
+    reasoningModelSwitchDone = await setModelIfNeeded(pi, ctx, reasoningModel);
 }
 function enablePlanMode(pi, currentModel, next = {}) {
     const currentMode = getPermissionMode();
@@ -267,14 +271,15 @@ function leavePlanMode(pi, approvalStatus, nextPermissionMode, clearTask = false
 }
 async function setModelIfNeeded(pi, ctx, modelRef) {
     if (!modelRef)
-        return;
+        return false;
     const currentModel = parseQualifiedModelRef(ctx?.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined);
     if (sameModel(currentModel, modelRef))
-        return;
+        return true;
     const model = resolveModelFromContext(ctx, modelRef);
     if (!model)
-        return;
+        return false;
     await pi.setModel(model, { persist: false });
+    return true;
 }
 function buildExecutionKickoffMessage(options) {
     const { permissionMode, executeWithSubagent = false } = options;
@@ -531,8 +536,7 @@ export default function planCommand(pi) {
             if (!reasoningModelSwitchDone && readAutoSwitchPlanModelSetting()) {
                 const reasoningModel = parseQualifiedModelRef(readPlanModeReasoningModel());
                 if (reasoningModel) {
-                    reasoningModelSwitchDone = true;
-                    await setModelIfNeeded(pi, ctx, reasoningModel);
+                    reasoningModelSwitchDone = await setModelIfNeeded(pi, ctx, reasoningModel);
                 }
             }
             return { systemPrompt: buildPlanModeSystemPrompt() };

package/dist/resources/extensions/subagent/agents.js

@@ -3,6 +3,7 @@
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
+import { fileURLToPath } from "node:url";
 import { getAgentDir, parseFrontmatter } from "@gsd/pi-coding-agent";
 const PROJECT_AGENT_DIR_CANDIDATES = [".lsd", ".gsd", ".pi"];
 function normalizeAgentModel(model) {
@@ -50,7 +51,8 @@ function loadAgentsFromDir(dir, source) {
         const tools = frontmatter.tools
             ?.split(",")
             .map((t) => t.trim())
-            .filter(Boolean);
+            .filter(Boolean)
+            .filter((tool, index, all) => all.indexOf(tool) === index);
         agents.push({
             name: frontmatter.name,
             description: frontmatter.description,
@@ -87,25 +89,33 @@ function findNearestProjectAgentsDir(cwd) {
         currentDir = parentDir;
     }
 }
+function getBundledAgentsDir() {
+    const here = path.dirname(fileURLToPath(import.meta.url));
+    return path.resolve(here, "../../agents");
+}
 export function discoverAgents(cwd, scope) {
     const userDir = path.join(getAgentDir(), "agents");
+    const bundledDir = getBundledAgentsDir();
     const projectAgentsDir = findNearestProjectAgentsDir(cwd);
+    const bundledAgents = scope === "project" ? [] : loadAgentsFromDir(bundledDir, "bundled");
     const userAgents = scope === "project" ? [] : loadAgentsFromDir(userDir, "user");
     const projectAgents = scope === "user" || !projectAgentsDir ? [] : loadAgentsFromDir(projectAgentsDir, "project");
     const agentMap = new Map();
-    if (scope === "both") {
-        for (const agent of userAgents)
-            agentMap.set(agent.name, agent);
-        for (const agent of projectAgents)
+    const addAgents = (items) => {
+        for (const agent of items)
             agentMap.set(agent.name, agent);
+    };
+    if (scope === "both") {
+        addAgents(bundledAgents);
+        addAgents(userAgents);
+        addAgents(projectAgents);
     }
     else if (scope === "user") {
-        for (const agent of userAgents)
-            agentMap.set(agent.name, agent);
+        addAgents(bundledAgents);
+        addAgents(userAgents);
     }
     else {
-        for (const agent of projectAgents)
-            agentMap.set(agent.name, agent);
+        addAgents(projectAgents);
     }
     return { agents: Array.from(agentMap.values()), projectAgentsDir };
 }

package/dist/resources/extensions/subagent/index.js

@@ -18,9 +18,9 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { StringEnum } from "@gsd/pi-ai";
 import { getAgentDir, getMarkdownTheme, } from "@gsd/pi-coding-agent";
-import { Container, Markdown, Spacer, Text } from "@gsd/pi-tui";
+import { Container, Key, Markdown, Spacer, Text } from "@gsd/pi-tui";
 import { Type } from "@sinclair/typebox";
-import { formatTokenCount } from "../shared/mod.js";
+import { formatTokenCount, shortcutDesc } from "../shared/mod.js";
 import { discoverAgents } from "./agents.js";
 import { buildSubagentProcessArgs, getBundledExtensionPathsFromEnv } from "./launch-helpers.js";
 import { createIsolation, mergeDeltaPatches, readIsolationMode, } from "./isolation.js";
@@ -394,7 +394,7 @@ async function waitForFile(filePath, signal, timeoutMs = 30 * 60 * 1000) {
     }
     return false;
 }
-async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, modelOverride, parentModel, signal, onUpdate, makeDetails) {
+async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, modelOverride, parentModel, signal, onUpdate, makeDetails, foregroundHooks) {
     const agent = agents.find((a) => a.name === agentName);
     if (!agent) {
         const available = agents.map((a) => `"${a.name}"`).join(", ") || "none";
@@ -434,6 +434,28 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, mo
             });
         }
     };
+    let wasAborted = false;
+    let deferTempPromptCleanup = false;
+    let tempPromptCleanupDone = false;
+    const cleanupTempPromptFiles = () => {
+        if (tempPromptCleanupDone)
+            return;
+        tempPromptCleanupDone = true;
+        if (tmpPromptPath)
+            try {
+                fs.unlinkSync(tmpPromptPath);
+            }
+            catch {
+                /* ignore */
+            }
+        if (tmpPromptDir)
+            try {
+                fs.rmdirSync(tmpPromptDir);
+            }
+            catch {
+                /* ignore */
+            }
+    };
     try {
         if (agent.systemPrompt.trim()) {
             const tmp = writePromptToTempFile(agent.name, agent.systemPrompt);
@@ -441,7 +463,6 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, mo
             tmpPromptPath = tmp.filePath;
         }
         const args = buildSubagentProcessArgs(agent, task, tmpPromptPath, inferredModel);
-        let wasAborted = false;
         const exitCode = await new Promise((resolve) => {
             const bundledPaths = getBundledExtensionPathsFromEnv();
             const extensionArgs = bundledPaths.flatMap((p) => ["--extension", p]);
@@ -459,6 +480,7 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, mo
             let buffer = "";
             let completionSeen = false;
             let resolved = false;
+            let foregroundReleased = false;
             const procAbortController = new AbortController();
             let resolveBackgroundResult;
             let rejectBackgroundResult;
@@ -472,6 +494,27 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, mo
                 resolved = true;
                 resolve(code);
             };
+            const adoptToBackground = (jobId) => {
+                if (resolved || foregroundReleased)
+                    return false;
+                foregroundReleased = true;
+                deferTempPromptCleanup = true;
+                currentResult.backgroundJobId = jobId;
+                finishForeground(0);
+                return true;
+            };
+            backgroundResultPromise.finally(() => {
+                if (deferTempPromptCleanup)
+                    cleanupTempPromptFiles();
+            });
+            foregroundHooks?.onStart?.({
+                agentName,
+                task,
+                cwd: cwd ?? defaultCwd,
+                abortController: procAbortController,
+                resultPromise: backgroundResultPromise,
+                adoptToBackground,
+            });
             proc.stdout.on("data", (data) => {
                 buffer += data.toString();
                 const lines = buffer.split("\n");
@@ -505,11 +548,13 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, mo
                     exitCode: finalExitCode,
                     model: currentResult.model,
                 });
+                foregroundHooks?.onFinish?.();
                 finishForeground(finalExitCode);
             });
             proc.on("error", (error) => {
                 liveSubagentProcesses.delete(proc);
                 rejectBackgroundResult?.(error);
+                foregroundHooks?.onFinish?.();
                 finishForeground(1);
             });
             const killProc = () => {
@@ -546,20 +591,8 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, mo
         return currentResult;
     }
     finally {
-        if (tmpPromptPath)
-            try {
-                fs.unlinkSync(tmpPromptPath);
-            }
-            catch {
-                /* ignore */
-            }
-        if (tmpPromptDir)
-            try {
-                fs.rmdirSync(tmpPromptDir);
-            }
-            catch {
-                /* ignore */
-            }
+        if (!deferTempPromptCleanup)
+            cleanupTempPromptFiles();
     }
 }
 const TaskItem = Type.Object({
@@ -610,6 +643,9 @@ const SubagentParams = Type.Object({
 });
 export default function (pi) {
     let bgManager = null;
+    const foregroundSubagentStatusKey = "foreground-subagent";
+    const foregroundSubagentHint = "Ctrl+B: move foreground subagent to background";
+    let activeForegroundSubagent = null;
     function getBgManager() {
         if (!bgManager)
             throw new Error("BackgroundJobManager not initialized.");
@@ -642,6 +678,7 @@ export default function (pi) {
         });
     });
     pi.on("session_before_switch", async () => {
+        activeForegroundSubagent = null;
         if (bgManager) {
             for (const job of bgManager.getRunningJobs()) {
                 bgManager.cancel(job.id);
@@ -649,6 +686,7 @@ export default function (pi) {
         }
     });
     pi.on("session_shutdown", async () => {
+        activeForegroundSubagent = null;
         await stopLiveSubagents();
         if (bgManager) {
             bgManager.shutdown();
@@ -757,6 +795,38 @@ export default function (pi) {
             ctx.ui.notify(`Available agents (${discovery.agents.length}):\n${lines.join("\n")}`, "info");
         },
     });
+    pi.registerShortcut(Key.ctrl("b"), {
+        description: shortcutDesc("Move foreground subagent to background", "/subagents list"),
+        handler: async (ctx) => {
+            const running = activeForegroundSubagent;
+            if (!running || running.claimed)
+                return;
+            const manager = bgManager;
+            if (!manager) {
+                ctx.ui.notify("Background subagent manager is not available.", "error");
+                return;
+            }
+            running.claimed = true;
+            let jobId;
+            try {
+                jobId = manager.adoptRunning(running.agentName, running.task, running.cwd, running.abortController, running.resultPromise);
+            }
+            catch (error) {
+                running.claimed = false;
+                ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
+                return;
+            }
+            const released = running.adoptToBackground(jobId);
+            if (!released) {
+                running.claimed = false;
+                manager.cancel(jobId);
+                return;
+            }
+            activeForegroundSubagent = null;
+            ctx.ui.setStatus(foregroundSubagentStatusKey, undefined);
+            ctx.ui.notify(`Moved ${running.agentName} to background as ${jobId}. Use /subagents wait ${jobId}, /subagents output ${jobId}, or /subagents cancel ${jobId}.`, "info");
+        },
+    });
     pi.registerTool({
         name: "await_subagent",
         label: "Await Background Subagent",
@@ -785,13 +855,15 @@ export default function (pi) {
             "Model selection can be overridden per call, otherwise it is inferred from the agent config, delegated-task preferences, or the current session model.",
             "Modes: single ({ agent, task }), parallel ({ tasks: [{agent, task},...] }), chain ({ chain: [{agent, task},...] } with {previous} placeholder).",
             "Agents are defined as .md files in the configured user agent directory (for LSD this is typically ~/.lsd/agent/agents/) or project-local .lsd/agents/, with legacy support for .gsd/agents/ and .pi/agents/.",
+            "If the user asks for a named subagent such as scout, worker, reviewer, or planner, invoke this tool directly rather than the Skill tool.",
             "Use the /subagent command to list available agents and their descriptions.",
             "Set background: true (single mode only) to run detached — returns immediately with a sa_xxxx job ID. Completion is announced back into the session. Use await_subagent or /subagents to manage background jobs.",
         ].join(" "),
         promptGuidelines: [
             "Use subagent to delegate self-contained tasks that benefit from an isolated context window.",
-            "When scout is the right fit, call the subagent tool directly — do not type '/subagent' as a shell-like command.",
+            "The subagent tool is available directly as a tool call — invoke it programmatically like any other tool, not via a slash command. Do NOT type '/scout' or '/subagent' in the chat; call this tool with the correct parameters instead.",
             "Valid call shapes: single mode uses { agent, task }, parallel mode uses { tasks: [{ agent, task }, ...] }, and chain mode uses { chain: [{ agent, task }, ...] }.",
+            "If the user names a subagent such as scout, worker, reviewer, or planner, use this subagent tool directly rather than the Skill tool or ad-hoc search.",
             "Recon planning rule: use no scout for narrow known-file work, one scout for one broad unfamiliar subsystem, and parallel scouts only when the work spans multiple loosely-coupled subsystems.",
             "Use scout only for broad or unfamiliar codebase reconnaissance before you read many files yourself; save direct reads for targeted lookups once the relevant files are known.",
             "Do not use scout as the reviewer, auditor, or final judge. Scout should map architecture, files, ownership, and likely hotspots for another agent or the parent model to evaluate.",
@@ -1045,7 +1117,24 @@ export default function (pi) {
                         const taskId = crypto.randomUUID();
                         isolation = await createIsolation(effectiveCwd, taskId, isolationMode);
                     }
-                    const result = await runSingleAgent(ctx.cwd, agents, params.agent, params.task, isolation ? isolation.workDir : params.cwd, undefined, params.model, ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : undefined, signal, onUpdate, makeDetails("single"));
+                    const result = await runSingleAgent(ctx.cwd, agents, params.agent, params.task, isolation ? isolation.workDir : params.cwd, undefined, params.model, ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : undefined, signal, onUpdate, makeDetails("single"), !isolation
+                        ? {
+                            onStart: (control) => {
+                                activeForegroundSubagent = { ...control, claimed: false };
+                                ctx.ui.setStatus(foregroundSubagentStatusKey, foregroundSubagentHint);
+                            },
+                            onFinish: () => {
+                                activeForegroundSubagent = null;
+                                ctx.ui.setStatus(foregroundSubagentStatusKey, undefined);
+                            },
+                        }
+                        : undefined);
+                    if (result.backgroundJobId) {
+                        return {
+                            content: [{ type: "text", text: `Moved ${result.agent} to background as **${result.backgroundJobId}**. Use \`await_subagent\`, \`/subagents wait ${result.backgroundJobId}\`, or \`/subagents output ${result.backgroundJobId}\`.` }],
+                            details: makeDetails("single")([result]),
+                        };
+                    }
                     // Capture and merge delta if isolated
                     if (isolation) {
                         const patches = await isolation.captureDelta();
@@ -1197,6 +1286,9 @@ export default function (pi) {
                     if (displayItems.length > COLLAPSED_ITEM_COUNT)
                         text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
                 }
+                if (!isError && !r.backgroundJobId && !finalOutput) {
+                    text += `\n${theme.fg("muted", "Hint: Ctrl+B to move running foreground subagent to background")}`;
+                }
                 const usageStr = formatUsageStats(r.usage, r.model);
                 if (usageStr)
                     text += `\n${theme.fg("dim", usageStr)}`;

package/dist/resources/extensions/subagent/launch-helpers.js

@@ -15,8 +15,9 @@ export function buildSubagentProcessArgs(agent, task, tmpPromptPath, model) {
     const args = ["--mode", "json", "-p", "--no-session"];
     if (model)
         args.push("--model", model);
-    if (agent.tools && agent.tools.length > 0)
-        args.push("--tools", agent.tools.join(","));
+    const uniqueTools = agent.tools?.filter((tool, index, all) => all.indexOf(tool) === index);
+    if (uniqueTools && uniqueTools.length > 0)
+        args.push("--tools", uniqueTools.join(","));
     if (tmpPromptPath)
         args.push("--append-system-prompt", tmpPromptPath);
     args.push(`Task: ${task}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lsd-pi",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "LSD — Looks Sort of Done coding agent",
   "license": "MIT",
   "repository": {

package/packages/pi-ai/dist/providers/anthropic-shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic-shared.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic-shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"anthropic-shared.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic-shared.ts"],"names":[],"mappings":"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"}

package/packages/pi-ai/dist/providers/anthropic-shared.js

@@ -323,7 +323,17 @@ export function convertMessages(messages, model, isOAuthToken, cacheControl) {
 export function convertTools(tools, isOAuthToken) {
     if (!tools)
         return [];
-    return tools.map((tool) => {
+    const uniqueTools = [];
+    const seenToolNames = new Set();
+    for (const tool of tools) {
+        const mappedName = isOAuthToken ? toClaudeCodeName(tool.name) : tool.name;
+        if (seenToolNames.has(mappedName)) {
+            continue;
+        }
+        seenToolNames.add(mappedName);
+        uniqueTools.push(tool);
+    }
+    return uniqueTools.map((tool) => {
         const jsonSchema = tool.parameters;
         return {
             name: isOAuthToken ? toClaudeCodeName(tool.name) : tool.name,