fix(skills): keep bundled agent skills package-managed

Author: Waishnav

src/cli.ts

@@ -29,7 +29,6 @@ import {
 import { resolveLocalAgentExecution } from "./local-agent-resolution.js";
 import { createLocalAgentStore, type LocalAgentRecord } from "./local-agent-store.js";
 import {
-  ensureDevspaceDefaultSkills,
   generateOwnerToken,
   loadDevspaceFiles,
   resolveSubagentsFlag,
@@ -186,12 +185,9 @@ async function runInit({ force }: { force: boolean }): Promise<void> {
 
     const configPath = writeDevspaceConfig(config);
     const authPath = writeDevspaceAuth(auth);
-    const seededSkillPaths = config.subagents ? ensureDevspaceDefaultSkills() : [];
-
     const lines = [
       `Config: ${configPath}`,
       `Auth: ${authPath}`,
-      ...seededSkillPaths.map((path) => `Default skill: ${path}`),
       `Local MCP URL: http://${config.host}:${config.port}/mcp`,
       ...(publicBaseUrl ? [`Public MCP URL: ${publicBaseUrl}/mcp`] : []),
     ];

src/config.test.ts

@@ -1,9 +1,9 @@
 import assert from "node:assert/strict";
-import { existsSync, mkdtempSync, readFileSync, writeFileSync } from "node:fs";
+import { mkdtempSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { loadConfig } from "./config.js";
-import { ensureDevspaceDefaultSkills, resolveSubagentsFlag } from "./user-config.js";
+import { resolveSubagentsFlag } from "./user-config.js";
 
 const emptyConfigDir = mkdtempSync(join(tmpdir(), "devspace-empty-config-test-"));
 const baseEnv = {
@@ -50,18 +50,6 @@ assert.equal(resolveSubagentsFlag({ subagents: true }, {}), true);
 assert.equal(resolveSubagentsFlag({ subagents: true }, { DEVSPACE_SUBAGENTS: "0" }), false);
 assert.equal(resolveSubagentsFlag({}, { DEVSPACE_SUBAGENTS: "1" }), true);
 
-const seededConfigDir = mkdtempSync(join(tmpdir(), "devspace-seeded-skills-test-"));
-const seededSkillPaths = ensureDevspaceDefaultSkills({ DEVSPACE_CONFIG_DIR: seededConfigDir });
-assert.deepEqual(seededSkillPaths, [
-  join(seededConfigDir, "skills", "subagents", "SKILL.md"),
-  join(seededConfigDir, "skills", "dynamic-workflows", "SKILL.md"),
-]);
-assert.equal(existsSync(seededSkillPaths[0]), true);
-assert.equal(existsSync(seededSkillPaths[1]), true);
-assert.match(readFileSync(seededSkillPaths[0], "utf8"), /name: subagents/);
-assert.match(readFileSync(seededSkillPaths[1], "utf8"), /name: dynamic-workflows/);
-assert.deepEqual(ensureDevspaceDefaultSkills({ DEVSPACE_CONFIG_DIR: seededConfigDir }), []);
-
 assert.throws(
   () => loadConfig({ ...baseEnv, DEVSPACE_WIDGETS: "invalid" }),
   /Invalid DEVSPACE_WIDGETS: invalid/,

src/skills.test.ts

@@ -199,16 +199,15 @@ try {
     DEVSPACE_ALLOWED_ROOTS: projectRoot,
     DEVSPACE_AGENT_DIR: agentDir,
     DEVSPACE_SUBAGENTS: "1",
+    DEVSPACE_WORKFLOWS: "0",
     DEVSPACE_OAUTH_OWNER_TOKEN: "test-owner-token-that-is-long-enough",
     PORT: "1",
   });
-  assert.equal(
-    loadWorkspaceSkills(experimentalConfig, projectRoot).skills.some(
-      (skill) => skill.name === "subagents",
-    ),
-    true,
-  );
-  const subagentsSkill = loadWorkspaceSkills(experimentalConfig, projectRoot).skills.find(
+  const subagentSkills = loadWorkspaceSkills(experimentalConfig, projectRoot).skills;
+  assert.equal(subagentSkills.some((skill) => skill.name === "subagents"), true);
+  assert.equal(subagentSkills.some((skill) => skill.name === "dynamic-workflows"), false);
+  assert.equal(subagentSkills.some((skill) => skill.name === "subagent-delegation"), false);
+  const subagentsSkill = subagentSkills.find(
     (skill) => skill.name === "subagents",
   );
   assert.ok(subagentsSkill);
@@ -220,6 +219,19 @@ try {
     codexReference,
   );
 
+  const workflowsOnlyConfig = loadConfig({
+    DEVSPACE_ALLOWED_ROOTS: projectRoot,
+    DEVSPACE_AGENT_DIR: agentDir,
+    DEVSPACE_SUBAGENTS: "0",
+    DEVSPACE_WORKFLOWS: "1",
+    DEVSPACE_OAUTH_OWNER_TOKEN: "test-owner-token-that-is-long-enough",
+    PORT: "1",
+  });
+  const workflowSkills = loadWorkspaceSkills(workflowsOnlyConfig, projectRoot).skills;
+  assert.equal(workflowSkills.some((skill) => skill.name === "subagents"), false);
+  assert.equal(workflowSkills.some((skill) => skill.name === "dynamic-workflows"), true);
+  assert.equal(workflowSkills.some((skill) => skill.name === "subagent-delegation"), false);
+
   const duplicateConfig = loadConfig({
     DEVSPACE_ALLOWED_ROOTS: projectRoot,
     DEVSPACE_AGENT_DIR: agentDir,

src/skills.ts

@@ -29,19 +29,14 @@ function bundledSkillsDir(): string {
   return fileURLToPath(new URL("../skills", import.meta.url));
 }
 
-/**
- * Always include the bundled skills root when subagents are enabled.
- * Previously the whole dir was dropped if the user had seeded
- * subagent-delegation — that hid later skills (e.g. dynamic-workflows).
- * User/devspace copies still win via earlier path order + name collisions.
- */
+/** Package skills are defaults; user/project copies win by path order. */
 export function effectiveSkillPaths(config: ServerConfig, cwd: string): string[] {
   const defaultPathCandidates = [
     join(homedir(), ".agents", "skills"),
     resolve(cwd, ".agents", "skills"),
     config.devspaceSkillsDir,
     join(config.agentDir, "skills"),
-    config.subagents ? bundledSkillsDir() : undefined,
+    config.subagents || config.workflows ? bundledSkillsDir() : undefined,
   ];
   const defaultPaths = defaultPathCandidates.filter(
     (path): path is string => path !== undefined && existsSync(path),
@@ -71,13 +66,9 @@ export function loadWorkspaceSkills(config: ServerConfig, cwd: string): LoadedSk
     includeDefaults: false,
   });
 
-  if (config.subagents) return result;
-
-  const gated = new Set<string>([
-    SUBAGENTS_NAME,
-    LEGACY_SUBAGENT_DELEGATION_NAME,
-    DYNAMIC_WORKFLOWS_NAME,
-  ]);
+  const gated = new Set<string>([LEGACY_SUBAGENT_DELEGATION_NAME]);
+  if (!config.subagents) gated.add(SUBAGENTS_NAME);
+  if (!config.workflows) gated.add(DYNAMIC_WORKFLOWS_NAME);
   return {
     skills: result.skills.filter((skill) => !gated.has(skill.name)),
     diagnostics: result.diagnostics.filter((diagnostic) => {

src/user-config.ts

@@ -6,7 +6,7 @@ import {
   writeFileSync,
 } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { join, resolve } from "node:path";
 import { expandHomePath } from "./roots.js";
 
 export interface DevspaceUserConfig {
@@ -97,25 +97,6 @@ export function generateOwnerToken(): string {
   return randomBytes(32).toString("base64url");
 }
 
-const DEFAULT_SKILLS = ["subagents", "dynamic-workflows"] as const;
-
-export function ensureDevspaceDefaultSkills(env: NodeJS.ProcessEnv = process.env): string[] {
-  const seeded: string[] = [];
-  for (const name of DEFAULT_SKILLS) {
-    const targetPath = join(devspaceSkillsDir(env), name, "SKILL.md");
-    if (existsSync(targetPath)) continue;
-    const sourcePath = new URL(`../skills/${name}/SKILL.md`, import.meta.url);
-    try {
-      mkdirSync(dirname(targetPath), { recursive: true });
-      writeFileSync(targetPath, readFileSync(sourcePath, "utf8"), { mode: 0o644 });
-      seeded.push(targetPath);
-    } catch {
-      // skill may not exist in package yet; skip
-    }
-  }
-  return seeded;
-}
-
 export function resolveSubagentsFlag(
   config: Pick<DevspaceUserConfig, "subagents">,
   env: NodeJS.ProcessEnv = process.env,