@waishnav/devspace 1.0.3 → 1.0.4

package/dist/server.js

@@ -22,6 +22,8 @@ import { createReviewCheckpointManager } from "./review-checkpoints.js";
 import { formatPathForPrompt } from "./skills.js";
 import { createWorkspaceStore } from "./workspace-store.js";
 import { formatAgentsPath, WorkspaceRegistry } from "./workspaces.js";
+import { summarizeLocalAgentProfile } from "./local-agent-profiles.js";
+import { formatLocalAgentProviderAvailabilitySummary, getLocalAgentProviderAvailabilitySnapshot, } from "./local-agent-availability.js";
 const WORKSPACE_APP_URI = "ui://devspace/workspace-app.html";
 const WORKSPACE_APP_MANIFEST_ENTRY = "workspace-app.html";
 const WRITE_TOOL_ANNOTATIONS = {
@@ -64,32 +66,22 @@ function toolWidgetDescriptorMeta(config, kind) {
         },
     };
 }
-function toolNamesFor(config) {
-    return config.toolNaming === "short" || config.toolMode === "codex"
-        ? {
-            openWorkspace: "open_workspace",
-            read: "read",
-            write: "write",
-            edit: "edit",
-            grep: "grep",
-            glob: "glob",
-            ls: "ls",
-            shell: "bash",
-        }
-        : {
-            openWorkspace: "open_workspace",
-            read: "read_file",
-            write: "write_file",
-            edit: "edit_file",
-            grep: "grep_files",
-            glob: "find_files",
-            ls: "list_directory",
-            shell: "run_shell",
-        };
-}
-function serverInstructions(config, toolNames) {
+const toolNames = {
+    openWorkspace: "open_workspace",
+    read: "read",
+    write: "write",
+    edit: "edit",
+    grep: "grep",
+    glob: "glob",
+    ls: "ls",
+    shell: "bash",
+};
+function serverInstructions(config) {
+    const showChangesInstruction = config.widgets === "changes"
+        ? " If the turn successfully modifies files by creating, editing, overwriting, deleting, moving, or applying patches, call show_changes exactly once for that workspace after the final related file change and before your final response so the user can inspect the aggregate diff for that turn. Do not call it after every individual file change; do not skip it because individual file-change tools already returned diffs."
+        : "";
     if (config.toolMode === "codex") {
-        return `Use DevSpace as a local coding workspace. Call ${toolNames.openWorkspace} once per project folder or worktree and reuse its workspaceId. Use ${toolNames.read} for direct file reads, apply_patch for all file modifications, exec_command for inspection, tests, builds, and other commands, and write_stdin to poll or interact with running processes. Follow instructions returned by ${toolNames.openWorkspace}; read applicable instruction and skill files before working in their scope.`;
+        return `Use DevSpace as a local coding workspace. Call ${toolNames.openWorkspace} once per project folder or worktree and reuse its workspaceId. Use ${toolNames.read} for direct file reads, apply_patch for all file modifications, exec_command for inspection, tests, builds, and other commands, and write_stdin to poll or interact with running processes. Follow instructions returned by ${toolNames.openWorkspace}; read applicable instruction and skill files before working in their scope.${showChangesInstruction}`;
     }
     const inspection = config.toolMode !== "full"
         ? `In minimal tool mode, ${toolNames.grep}, ${toolNames.glob}, and ${toolNames.ls} are disabled; use ${toolNames.shell} with command-line tools such as grep, rg, find, ls, and tree for search and directory inspection. `
@@ -98,10 +90,18 @@ function serverInstructions(config, toolNames) {
         ? `When ${toolNames.openWorkspace} returns available skills and a task matches a skill, use ${toolNames.read} to read that skill's path before proceeding. Skill paths may be outside the workspace, but ${toolNames.read} only permits advertised SKILL.md files and files under already-loaded skill directories. `
         : "";
     const agentsMd = `Follow instructions returned by ${toolNames.openWorkspace}. Before working under a path listed in availableAgentsFiles, use ${toolNames.read} to inspect that instruction file and follow it. `;
-    const showChanges = config.widgets === "changes"
-        ? " After creating, editing, or overwriting files, call show_changes once after the related file changes are complete so the user can see the aggregate diff."
+    return `Use DevSpace as a local coding workspace. Call ${toolNames.openWorkspace} once per project folder or worktree to obtain a workspaceId. Reuse that same workspaceId for all later file, search, edit, write, show-changes, and shell tools in that folder; do not call ${toolNames.openWorkspace} again unless switching folders/worktrees, changing checkout/worktree mode, the workspaceId is rejected as unknown, or the user explicitly asks to reopen. ${agentsMd}${skills}${inspection}Prefer ${toolNames.edit} for targeted modifications, ${toolNames.write} only for new files or complete rewrites, and ${toolNames.shell} for tests, builds, git inspection, package scripts, and commands that are better executed by the shell. Do not create or modify files with ${toolNames.shell}; avoid shell redirection, heredocs, tee, sed -i, perl -i, node/python/ruby scripts, or any command whose purpose is to write project files.${showChangesInstruction}`;
+}
+function formatVisibleAgent(agent) {
+    const model = agent.model ? `, model ${agent.model}` : "";
+    const thinking = agent.thinking ? `, thinking ${agent.thinking}` : "";
+    const availability = agent.providerAvailable === false
+        ? `, unavailable: ${agent.providerUnavailableReason ?? "provider unavailable"}`
         : "";
-    return `Use DevSpace as a local coding workspace. Call ${toolNames.openWorkspace} once per project folder or worktree to obtain a workspaceId. Reuse that same workspaceId for all later file, search, edit, write, show-changes, and shell tools in that folder; do not call ${toolNames.openWorkspace} again unless switching folders/worktrees, changing checkout/worktree mode, the workspaceId is rejected as unknown, or the user explicitly asks to reopen. ${agentsMd}${skills}${inspection}Prefer ${toolNames.edit} for targeted modifications, ${toolNames.write} only for new files or complete rewrites, and ${toolNames.shell} for tests, builds, git inspection, package scripts, and commands that are better executed by the shell. Do not create or modify files with ${toolNames.shell}; avoid shell redirection, heredocs, tee, sed -i, perl -i, node/python/ruby scripts, or any command whose purpose is to write project files.${showChanges}`;
+    return `${agent.name} (${agent.provider}${model}${thinking}${availability})`;
+}
+function formatUnavailableAgentProvider(provider) {
+    return `${provider.name} (${provider.reason ?? "unavailable"})`;
 }
 function resultOutputSchema(extra = {}) {
     return {
@@ -120,6 +120,20 @@ const workspaceAgentsFileOutputSchema = z.object({
     path: z.string(),
     content: z.string(),
 });
+const workspaceLocalAgentOutputSchema = z.object({
+    name: z.string(),
+    description: z.string(),
+    provider: z.string(),
+    model: z.string().optional(),
+    thinking: z.string().optional(),
+    providerAvailable: z.boolean().optional(),
+    providerUnavailableReason: z.string().optional(),
+});
+const workspaceLocalAgentProviderOutputSchema = z.object({
+    name: z.string(),
+    available: z.boolean(),
+    reason: z.string().optional(),
+});
 const workspaceAvailableAgentsFileOutputSchema = z.object({
     path: z.string(),
 });
@@ -383,6 +397,7 @@ function registerCodexProcessTools(server, config, workspaces, processSessions)
             workspaceId,
             command: cmd,
             cwd,
+            workspaceRoot: workspace.root,
             tty,
             columns,
             rows,
@@ -460,15 +475,14 @@ function registerCodexProcessTools(server, config, workspaces, processSessions)
         });
     });
 }
-function createMcpServer(config, workspaces, reviewCheckpoints, processSessions) {
-    const toolNames = toolNamesFor(config);
+function createMcpServer(config, workspaces, reviewCheckpoints, processSessions, localAgentProviders) {
     const server = new McpServer({
         name: "devspace",
         title: "DevSpace",
         version: "0.1.0",
         description: "Secure local coding workspace for MCP clients. Provides workspace-scoped file, search, edit, write, and shell tools.",
     }, {
-        instructions: serverInstructions(config, toolNames),
+        instructions: serverInstructions(config),
     });
     registerAppResource(server, "DevSpace Diff Card", WORKSPACE_APP_URI, {
         description: "Interactive card for viewing DevSpace file diffs.",
@@ -528,6 +542,8 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
             agentsFiles: z.array(workspaceAgentsFileOutputSchema),
             availableAgentsFiles: z.array(workspaceAvailableAgentsFileOutputSchema),
             skills: z.array(workspaceSkillOutputSchema),
+            agentProviders: z.array(workspaceLocalAgentProviderOutputSchema),
+            agents: z.array(workspaceLocalAgentOutputSchema),
             skillDiagnostics: z.array(z.unknown()),
             instruction: z.string(),
         },
@@ -549,6 +565,16 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
             description: skill.description,
             path: formatPathForPrompt(skill.filePath),
         }));
+        const visibleAgentProviders = config.subagents ? localAgentProviders : [];
+        const visibleAgents = workspace.agentProfiles.map((profile) => {
+            const summary = summarizeLocalAgentProfile(profile);
+            const availability = visibleAgentProviders.find((provider) => provider.name === summary.provider);
+            return {
+                ...summary,
+                providerAvailable: availability?.available,
+                providerUnavailableReason: availability?.reason,
+            };
+        });
         const loadedAgentsFiles = agentsFiles.map((file) => ({
             path: formatAgentsPath(file.path, workspace.root),
             content: file.content,
@@ -575,6 +601,15 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
                     visibleSkills.length > 0
                         ? `Available skills: ${visibleSkills.map((skill) => skill.name).join(", ")}`
                         : undefined,
+                    visibleAgentProviders.some((provider) => provider.available)
+                        ? `Available subagent providers: ${visibleAgentProviders.filter((provider) => provider.available).map((provider) => provider.name).join(", ")}`
+                        : undefined,
+                    visibleAgentProviders.some((provider) => !provider.available)
+                        ? `Unavailable subagent providers: ${visibleAgentProviders.filter((provider) => !provider.available).map(formatUnavailableAgentProvider).join(", ")}`
+                        : undefined,
+                    visibleAgents.length > 0
+                        ? `Available subagent profiles: ${visibleAgents.map(formatVisibleAgent).join(", ")}`
+                        : undefined,
                     instruction,
                 ].filter(Boolean).join("\n"),
             },
@@ -598,6 +633,8 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
                         agentsFiles: loadedAgentsFiles.length,
                         availableAgentsFiles: availableAgentsFileOutputs.length,
                         skills: visibleSkills.length,
+                        agentProviders: visibleAgentProviders.length,
+                        agents: visibleAgents.length,
                         skillDiagnostics: workspace.skillDiagnostics.length,
                     },
                 },
@@ -611,6 +648,8 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
                 agentsFiles: loadedAgentsFiles,
                 availableAgentsFiles: availableAgentsFileOutputs,
                 skills: visibleSkills,
+                agentProviders: visibleAgentProviders,
+                agents: visibleAgents,
                 skillDiagnostics: workspace.skillDiagnostics,
                 instruction,
             },
@@ -841,7 +880,7 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
     if (config.toolMode === "codex") {
         registerAppTool(server, "apply_patch", {
             title: "Apply patch",
-            description: "Apply one Codex-style patch inside an open workspace. Supports adding, overwriting, updating, deleting, and moving files. Earlier successful file changes remain if a later patch action fails. Use this for all file modifications. Paths must be relative to the workspace. Call open_workspace first and pass workspaceId.",
+            description: "Apply one Codex-style patch inside an open workspace. Supports adding, overwriting, updating, deleting, and moving files. Use this for all file modifications. Paths must be relative to the workspace. Call open_workspace first and pass workspaceId.",
             inputSchema: {
                 workspaceId: z
                     .string()
@@ -904,31 +943,23 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
     if (config.widgets === "changes") {
         registerAppTool(server, "show_changes", {
             title: "Show changes",
-            description: "Show aggregate file changes in an open workspace since the last shown checkpoint or since the workspace was opened. After you create, edit, or overwrite files, call this once when the related file changes are complete so the user can inspect the combined diff.",
+            description: "Show aggregate file changes for an open workspace. If the current turn successfully modified files, call this exactly once after the final related file change and before your final response so the user can inspect the combined diff for the turn. Do not call it after every individual file change, and do not skip it because prior file-change tools already displayed per-tool diffs.",
             inputSchema: {
                 workspaceId: z
                     .string()
                     .describe("Workspace identifier returned by open_workspace."),
-                since: z
-                    .enum(["last_shown", "workspace_open"])
-                    .optional()
-                    .describe("Defaults to last_shown. Use workspace_open to compare against the initial open_workspace checkpoint."),
-                markReviewed: z
-                    .boolean()
-                    .optional()
-                    .describe("Defaults to true. When true, advances the last shown checkpoint to the current workspace state."),
             },
             outputSchema: resultOutputSchema(),
             ...toolWidgetDescriptorMeta(config, "show_changes"),
             annotations: { readOnlyHint: true },
-        }, async ({ workspaceId, since, markReviewed }) => {
+        }, async ({ workspaceId }) => {
             const startedAt = performance.now();
             const workspace = workspaces.getWorkspace(workspaceId);
             const review = await reviewCheckpoints.reviewChanges({
                 workspaceId,
                 root: workspace.root,
-                since: since ?? "last_shown",
-                markReviewed: markReviewed ?? true,
+                since: "last_shown",
+                markReviewed: true,
             });
             const content = [textBlock(review.result)];
             logToolCall(config, {
@@ -958,7 +989,7 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
     }
     if (config.toolMode === "full") {
         registerAppTool(server, toolNames.grep, {
-            title: config.toolNaming === "short" ? "Grep" : "Grep files",
+            title: "Grep",
             description: "Search file contents inside an open workspace. Use this before broad reads when looking for symbols, text, or usage sites. Respects project ignore rules. Call open_workspace first and pass workspaceId.",
             inputSchema: {
                 workspaceId: z
@@ -1020,7 +1051,7 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
             };
         });
         registerAppTool(server, toolNames.glob, {
-            title: config.toolNaming === "short" ? "Glob" : "Find files",
+            title: "Glob",
             description: "Find files by glob pattern inside an open workspace. Use this to discover filenames or narrow file sets before reading. Respects project ignore rules. Call open_workspace first and pass workspaceId.",
             inputSchema: {
                 workspaceId: z
@@ -1081,7 +1112,7 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
             };
         });
         registerAppTool(server, toolNames.ls, {
-            title: config.toolNaming === "short" ? "Ls" : "List directory",
+            title: "Ls",
             description: "List a directory inside an open workspace. Use this for directory inspection before reading files. Call open_workspace first and pass workspaceId.",
             inputSchema: {
                 workspaceId: z
@@ -1137,7 +1168,7 @@ function createMcpServer(config, workspaces, reviewCheckpoints, processSessions)
     }
     if (config.toolMode !== "codex") {
         registerAppTool(server, toolNames.shell, {
-            title: config.toolNaming === "short" ? "Bash" : "Run shell",
+            title: "Bash",
             description: config.toolMode !== "full"
                 ? `Run a shell command inside an open workspace. Use only for tests, builds, git inspection, package scripts, search, file discovery, and directory inspection. In minimal tool mode, ${toolNames.grep}, ${toolNames.glob}, and ${toolNames.ls} are disabled; use command-line tools such as grep, rg, find, ls, and tree for those read-only inspection actions. Do not use ${toolNames.shell} to create or modify files. Do not use shell redirection, heredocs, tee, sed -i, perl -i, node/python/ruby scripts, or generated scripts to write project files; use ${toolNames.edit} for targeted changes and ${toolNames.write} for new files or full rewrites. Prefer ${toolNames.read} for direct file reads. Call open_workspace first and pass workspaceId. This is powerful local execution and should only be exposed behind strong authentication.`
                 : `Run a shell command inside an open workspace. Use only for tests, builds, git inspection, package scripts, and commands that are better executed by the shell. Do not use ${toolNames.shell} to create or modify files. Do not use shell redirection, heredocs, tee, sed -i, perl -i, node/python/ruby scripts, or generated scripts to write project files; use ${toolNames.edit} for targeted changes and ${toolNames.write} for new files or full rewrites. Prefer ${toolNames.read}, ${toolNames.grep}, ${toolNames.glob}, and ${toolNames.ls} for file inspection. Call open_workspace first and pass workspaceId. This is powerful local execution and should only be exposed behind strong authentication.`,
@@ -1237,6 +1268,9 @@ export function createServer(config = loadConfig()) {
     const workspaces = new WorkspaceRegistry(config, workspaceStore);
     const reviewCheckpoints = createReviewCheckpointManager();
     const processSessions = new ProcessSessionManager();
+    const localAgentProviders = config.subagents
+        ? getLocalAgentProviderAvailabilitySnapshot()
+        : [];
     if (config.logging.trustProxy) {
         app.set("trust proxy", true);
     }
@@ -1345,7 +1379,7 @@ export function createServer(config = loadConfig()) {
                         });
                     }
                 };
-                const server = createMcpServer(config, workspaces, reviewCheckpoints, processSessions);
+                const server = createMcpServer(config, workspaces, reviewCheckpoints, processSessions, localAgentProviders);
                 await server.connect(transport);
             }
             else {
@@ -1368,6 +1402,7 @@ export function createServer(config = loadConfig()) {
     return {
         app,
         config,
+        localAgentProviders,
         close: () => {
             if (closed)
                 return;
@@ -1386,7 +1421,7 @@ async function isMainModule() {
     return modulePath === entrypointPath;
 }
 if (await isMainModule()) {
-    const { app, config, close } = createServer();
+    const { app, config, close, localAgentProviders } = createServer();
     const httpServer = app.listen(config.port, config.host, () => {
         console.log(`devspace listening on http://${config.host}:${config.port}/mcp`);
         console.log(`allowed roots: ${config.allowedRoots.join(", ")}`);
@@ -1395,6 +1430,9 @@ if (await isMainModule()) {
         console.log(`request logging: ${config.logging.requests ? "enabled" : "disabled"}`);
         console.log(`asset logging: ${config.logging.assets ? "enabled" : "disabled"}`);
         console.log(`trust proxy: ${config.logging.trustProxy ? "enabled" : "disabled"}`);
+        if (config.subagents) {
+            console.log(`subagent providers: ${formatLocalAgentProviderAvailabilitySummary(localAgentProviders)}`);
+        }
     });
     const shutdown = () => {
         httpServer.close(() => {

package/dist/skills.js

@@ -1,14 +1,29 @@
 import { existsSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve, sep } from "node:path";
+import { fileURLToPath } from "node:url";
 import { loadSkills, } from "@earendil-works/pi-coding-agent";
 import { expandHomePath, isPathInsideRoot } from "./roots.js";
+const SUBAGENT_DELEGATION_NAME = "subagent-delegation";
+const SUBAGENT_DELEGATION_SKILL = join(SUBAGENT_DELEGATION_NAME, "SKILL.md");
+function bundledSkillsDir() {
+    return fileURLToPath(new URL("../skills", import.meta.url));
+}
+function hasSubagentDelegationSkill(skillDir) {
+    return existsSync(join(skillDir, SUBAGENT_DELEGATION_SKILL));
+}
 export function effectiveSkillPaths(config, cwd) {
-    const defaultPaths = [
+    const bundledSkills = bundledSkillsDir();
+    const defaultPathCandidates = [
         join(homedir(), ".agents", "skills"),
         resolve(cwd, ".agents", "skills"),
+        config.devspaceSkillsDir,
         join(config.agentDir, "skills"),
-    ].filter((path) => existsSync(path));
+        config.subagents && !hasSubagentDelegationSkill(config.devspaceSkillsDir)
+            ? bundledSkills
+            : undefined,
+    ];
+    const defaultPaths = defaultPathCandidates.filter((path) => path !== undefined && existsSync(path));
     const seen = new Set();
     return [...defaultPaths, ...config.skillPaths]
         .map((path) => resolveSkillPath(path, cwd))
@@ -25,12 +40,21 @@ function resolveSkillPath(path, cwd) {
 export function loadWorkspaceSkills(config, cwd) {
     if (!config.skillsEnabled)
         return { skills: [], diagnostics: [] };
-    return loadSkills({
+    const result = loadSkills({
         cwd,
         agentDir: config.agentDir,
         skillPaths: effectiveSkillPaths(config, cwd),
         includeDefaults: false,
     });
+    if (config.subagents)
+        return result;
+    return {
+        skills: result.skills.filter((skill) => skill.name !== SUBAGENT_DELEGATION_NAME),
+        diagnostics: result.diagnostics.filter((diagnostic) => {
+            const collision = diagnostic.collision;
+            return !(collision?.resourceType === "skill" && collision.name === SUBAGENT_DELEGATION_NAME);
+        }),
+    };
 }
 export function resolveSkillReadPath(skills, activatedSkillDirs, inputPath) {
     const absolutePath = resolve(expandHomePath(inputPath));