@juancr11/sibu 0.16.0 → 0.17.0

package/bin/modules/sync-review/action-prompt.js

@@ -1,4 +1,4 @@
-import { cancel, isCancel, select } from '@clack/prompts';
+import { cancel, confirm, isCancel, select } from '@clack/prompts';
 export async function askForSyncAction(preview) {
     if (preview.status === 'update-available') {
         const action = await select({
@@ -56,6 +56,19 @@ export async function askForSyncAction(preview) {
     });
     return handleSyncActionCancel(action);
 }
+export async function askForUnsupportedAgentCleanup(plan) {
+    const shouldCleanUp = await confirm({
+        message: plan.removesSibuState
+            ? 'Remove unsupported agent state and all Sibu-managed workflow files?'
+            : 'Remove unsupported agent selections and obsolete Sibu-managed files?',
+        initialValue: true,
+    });
+    if (isCancel(shouldCleanUp)) {
+        cancel('Sync cancelled.');
+        process.exit(0);
+    }
+    return shouldCleanUp;
+}
 function handleSyncActionCancel(action) {
     if (isCancel(action)) {
         cancel('Sync cancelled.');

package/bin/modules/sync-review/handler.js

@@ -5,12 +5,22 @@ import { getProjectContext } from '../../shared/paths.js';
 import { askForMissingFrameworkSkills, askForNewArchitectureSkill, askForNewLanguageSkills, renderIntro } from '../interactive-guidance/index.js';
 import { readStateForDoctor, writeStateFile } from '../workflow-state-registry/index.js';
 import { readTemplateManifest } from '../template-catalog-rendering/index.js';
-import { askForSyncAction } from './action-prompt.js';
+import { askForSyncAction, askForUnsupportedAgentCleanup } from './action-prompt.js';
 import { applySyncAction } from './apply-action.js';
 import { logSyncPreview } from './log-preview.js';
 import { getSyncPreviews, isActionableSyncPreview, shouldAskForSyncAction } from './sync-preview.js';
-export async function handleSyncProject(_command) {
-    await renderIntro();
+import { applyUnsupportedAgentCleanup, getUnsupportedAgentCleanupPlan } from './unsupported-agent-cleanup.js';
+const defaultSyncProjectDependencies = {
+    renderIntro,
+    askForUnsupportedAgentCleanup,
+    askForNewLanguageSkills,
+    askForMissingFrameworkSkills,
+    askForNewArchitectureSkill,
+    askForSyncAction,
+};
+export async function handleSyncProject(_command, dependencies = {}) {
+    const syncDependencies = { ...defaultSyncProjectDependencies, ...dependencies };
+    await syncDependencies.renderIntro();
     intro(chalk.cyan('Reviewing workflow updates'));
     const { rootPath, statePath } = getProjectContext();
     const stateResult = readStateForDoctor(statePath);
@@ -21,9 +31,46 @@ export async function handleSyncProject(_command) {
         process.exitCode = 1;
         return;
     }
-    const languageSkillSelection = await askForNewLanguageSkills(stateResult.state);
-    const frameworkSkillSelection = await askForMissingFrameworkSkills(languageSkillSelection.state);
-    const architectureSkillSelection = await askForNewArchitectureSkill(frameworkSkillSelection.state);
+    const cleanupPlan = getUnsupportedAgentCleanupPlan({ rootPath, state: stateResult.state });
+    if (cleanupPlan) {
+        log.warn('This project has agent selections that are no longer supported by Sibu.');
+        log.info(`Unsupported selections: ${cleanupPlan.unsupportedAgentIds.join(', ')}`);
+        if (cleanupPlan.filePathsToDelete.length > 0) {
+            log.info('Sibu-managed files to remove:');
+            for (const relativePath of cleanupPlan.filePathsToDelete) {
+                log.info(`- ${relativePath}`);
+            }
+        }
+        else {
+            log.info('No Sibu-managed files need to be deleted for this cleanup.');
+        }
+        if (cleanupPlan.removesSibuState) {
+            log.warn(`No supported agents will remain, so ${STATE_RELATIVE_PATH} will be removed after cleanup.`);
+        }
+        const shouldCleanUp = await syncDependencies.askForUnsupportedAgentCleanup(cleanupPlan);
+        if (!shouldCleanUp) {
+            log.warn('Unsupported agent cleanup was skipped.');
+            log.info('Run `sibu sync` again and accept cleanup before reviewing other workflow updates.');
+            outro(chalk.yellow('Sync stopped.'));
+            process.exitCode = 1;
+            return;
+        }
+        const cleanupResult = applyUnsupportedAgentCleanup({ rootPath, statePath, state: stateResult.state, plan: cleanupPlan });
+        for (const relativePath of cleanupResult.removedFiles) {
+            log.success(`Removed ${relativePath}`);
+        }
+        if (cleanupResult.removedStateFile) {
+            log.success(`Removed ${STATE_RELATIVE_PATH}`);
+            outro(chalk.green('Unsupported agent cleanup complete.'));
+            return;
+        }
+        writeStateFile(statePath, cleanupResult.state);
+        log.success(`Updated ${STATE_RELATIVE_PATH}`);
+        stateResult.state = cleanupResult.state;
+    }
+    const languageSkillSelection = await syncDependencies.askForNewLanguageSkills(stateResult.state);
+    const frameworkSkillSelection = await syncDependencies.askForMissingFrameworkSkills(languageSkillSelection.state);
+    const architectureSkillSelection = await syncDependencies.askForNewArchitectureSkill(frameworkSkillSelection.state);
     let state = architectureSkillSelection.state;
     const manifest = readTemplateManifest();
     const previews = getSyncPreviews({ rootPath, state, manifest });
@@ -56,7 +103,7 @@ export async function handleSyncProject(_command) {
         if (!shouldAskForSyncAction(preview)) {
             continue;
         }
-        const action = await askForSyncAction(preview);
+        const action = await syncDependencies.askForSyncAction(preview);
         if (action === 'skip') {
             log.info(`Skipped ${preview.relativePath}.`);
             continue;

package/bin/modules/sync-review/index.js

@@ -3,3 +3,4 @@ export { applySyncAction } from './apply-action.js';
 export { handleSyncProject } from './handler.js';
 export { logSyncPreview } from './log-preview.js';
 export { getSyncPreviews, isActionableSyncPreview, shouldAskForSyncAction } from './sync-preview.js';
+export { applyUnsupportedAgentCleanup, getUnsupportedAgentCleanupPlan } from './unsupported-agent-cleanup.js';

package/bin/modules/sync-review/unsupported-agent-cleanup.js

@@ -0,0 +1,57 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { getSelectedAgentsFromState, getSelectedArchitectureSkillFromState, getSelectedDatabaseSkillsFromState, getSelectedFrameworkSkillsFromState, getSelectedLanguageSkillsFromState, getSelectedMcpServersFromState, getSelectedWorkflowSkillsFromState, getWorkflowTargets, SUPPORTED_AGENTS, } from '../workflow-target-planning/index.js';
+import { cloneState } from '../workflow-state-registry/index.js';
+export function getUnsupportedAgentCleanupPlan({ rootPath, state }) {
+    const supportedAgentIds = new Set(SUPPORTED_AGENTS.map((agent) => agent.id));
+    const unsupportedAgentIds = state.selectedAgents.filter((agentId) => !supportedAgentIds.has(agentId));
+    if (unsupportedAgentIds.length === 0) {
+        return undefined;
+    }
+    const remainingSupportedAgents = getSelectedAgentsFromState(state);
+    const obsoleteManagedFilePaths = getObsoleteManagedFilePaths({ rootPath, state, remainingSupportedAgents });
+    const filePathsToDelete = obsoleteManagedFilePaths.filter((relativePath) => state.managedFiles[relativePath]?.status !== 'unmanaged');
+    return {
+        unsupportedAgentIds,
+        remainingSupportedAgents,
+        obsoleteManagedFilePaths,
+        filePathsToDelete,
+        removesSibuState: remainingSupportedAgents.length === 0,
+    };
+}
+export function applyUnsupportedAgentCleanup({ rootPath, statePath, state, plan, }) {
+    const removedFiles = [];
+    for (const relativePath of plan.filePathsToDelete) {
+        const targetPath = path.join(rootPath, relativePath);
+        if (!fs.existsSync(targetPath)) {
+            continue;
+        }
+        fs.rmSync(targetPath, { recursive: true, force: true });
+        removedFiles.push(relativePath);
+    }
+    if (plan.removesSibuState) {
+        fs.rmSync(statePath, { force: true });
+        return { removedStateFile: true, removedFiles };
+    }
+    const unsupportedAgentIds = new Set(plan.unsupportedAgentIds);
+    const obsoleteManagedFilePaths = new Set(plan.obsoleteManagedFilePaths);
+    const nextState = cloneState(state);
+    nextState.selectedAgents = nextState.selectedAgents.filter((agentId) => !unsupportedAgentIds.has(agentId));
+    nextState.updatedAt = new Date().toISOString();
+    for (const relativePath of obsoleteManagedFilePaths) {
+        delete nextState.managedFiles[relativePath];
+    }
+    return {
+        removedStateFile: false,
+        removedFiles,
+        state: nextState,
+    };
+}
+function getObsoleteManagedFilePaths({ rootPath, state, remainingSupportedAgents, }) {
+    if (remainingSupportedAgents.length === 0) {
+        return Object.keys(state.managedFiles);
+    }
+    const expectedTargets = getWorkflowTargets(rootPath, remainingSupportedAgents, getSelectedLanguageSkillsFromState(state), getSelectedFrameworkSkillsFromState(state), getSelectedArchitectureSkillFromState(state), getSelectedWorkflowSkillsFromState(state), getSelectedDatabaseSkillsFromState(state), getSelectedMcpServersFromState(state));
+    const expectedManagedFilePaths = new Set(expectedTargets.map((target) => path.relative(rootPath, target.targetPath)));
+    return Object.keys(state.managedFiles).filter((relativePath) => !expectedManagedFilePaths.has(relativePath));
+}

package/bin/modules/template-catalog-rendering/index.js

@@ -1 +1 @@
-export { extractProjectOverview, getTemplateVersion, readTemplate, readTemplateManifest, renderMcpConfig, renderSkillRouting, renderTemplateForSync, } from './templates.js';
+export { extractProjectOverview, getTemplateVersion, readTemplate, readTemplateManifest, renderMcpConfig, renderSkillRouting, renderTemplateForSync, renderWorkerToolboxRoutingPlaceholders, renderWorkerToolboxRouting, } from './templates.js';

package/bin/modules/template-catalog-rendering/templates.js

@@ -27,7 +27,9 @@ export function renderTemplateForSync({ templateRelativePath, currentPath, selec
     if (contents.includes('{{PROJECT_OVERVIEW}}')) {
         contents = contents.replace('{{PROJECT_OVERVIEW}}', extractProjectOverview(currentPath) ?? 'Describe this project.');
     }
-    return renderSkillRouting(contents, selectedLanguageSkills, selectedFrameworkSkills, selectedArchitectureSkill, selectedWorkflowSkills, selectedDatabaseSkills);
+    contents = renderSkillRouting(contents, selectedLanguageSkills, selectedFrameworkSkills, selectedArchitectureSkill, selectedWorkflowSkills, selectedDatabaseSkills);
+    contents = renderWorkerToolboxRoutingPlaceholders(contents, selectedLanguageSkills, selectedFrameworkSkills, selectedArchitectureSkill, selectedWorkflowSkills, selectedDatabaseSkills);
+    return contents;
 }
 export function renderSkillRouting(contents, selectedLanguageSkills, selectedFrameworkSkills, selectedArchitectureSkill, selectedWorkflowSkills = [], selectedDatabaseSkills = []) {
     if (!contents.includes('{{OPTIONAL_SKILL_ROUTING}}')) {
@@ -38,6 +40,51 @@ export function renderSkillRouting(contents, selectedLanguageSkills, selectedFra
         .join('\n');
     return contents.replace('{{OPTIONAL_SKILL_ROUTING}}', optionalRouting);
 }
+export function renderWorkerToolboxRouting({ profile, selectedLanguageSkills, selectedFrameworkSkills, selectedArchitectureSkill, selectedWorkflowSkills = [], selectedDatabaseSkills = [], }) {
+    const selectedSkills = collectWorkerRelevantSkills({
+        selectedLanguageSkills,
+        selectedFrameworkSkills,
+        selectedArchitectureSkill,
+        selectedWorkflowSkills,
+        selectedDatabaseSkills,
+    });
+    const selectedSkillLines = selectedSkills.map((skill) => `- ${skill.name}: read \`${getSharedSkillTargetPath(skill)}\` when relevant. ${skill.routingInstruction}`);
+    const selectedSkillsSection = selectedSkillLines.length > 0
+        ? selectedSkillLines.join('\n')
+        : '- No optional implementation-relevant Sibu skills are selected for this project. Use source artifacts and flag unmapped patterns as risks instead of guessing silently.';
+    return `## Focused ${profile} worker routing
+
+- Always read and apply \`.agents/skills/clean-code/SKILL.md\` before ${profile === 'planner' ? 'writing implementation plan steps' : 'editing code or running story execution'}.
+- Read the worker toolbox skill path provided in the main-agent packet before doing work.
+- Read every required skill path listed in the packet. If a required skill path is missing, stop and report the blocker to the main agent.
+- Read optional installed skill paths only when they are relevant to the story, touched files, source artifacts, or validation work.
+- Treat distilled skill constraints from the packet as binding task constraints.
+- If an optional relevant skill is not installed and you encounter an unmapped language, framework, database, or architecture pattern, do not guess silently; continue only when safe and flag the gap as a ${profile === 'planner' ? 'plan risk' : 'Review Gate risk'}.
+
+### Optional installed skills relevant to ${profile} work
+${selectedSkillsSection}`;
+}
+export function renderWorkerToolboxRoutingPlaceholders(contents, selectedLanguageSkills, selectedFrameworkSkills, selectedArchitectureSkill, selectedWorkflowSkills = [], selectedDatabaseSkills = []) {
+    const placeholderProfiles = [
+        { placeholder: '{{PLANNER_WORKER_ROUTING}}', profile: 'planner' },
+        { placeholder: '{{EXECUTOR_WORKER_ROUTING}}', profile: 'executor' },
+    ];
+    let renderedContents = contents;
+    for (const { placeholder, profile } of placeholderProfiles) {
+        if (!renderedContents.includes(placeholder)) {
+            continue;
+        }
+        renderedContents = renderedContents.replace(placeholder, renderWorkerToolboxRouting({
+            profile,
+            selectedLanguageSkills,
+            selectedFrameworkSkills,
+            selectedArchitectureSkill,
+            selectedWorkflowSkills,
+            selectedDatabaseSkills,
+        }));
+    }
+    return renderedContents;
+}
 export function renderMcpConfig({ agentId, baseContents, selectedMcpServers, }) {
     if (selectedMcpServers.length === 0) {
         return baseContents ?? renderJsonMcpConfig({});
@@ -47,6 +94,23 @@ export function renderMcpConfig({ agentId, baseContents, selectedMcpServers, })
     }
     return renderJsonMcpConfig(buildJsonMcpServerConfigs(agentId, selectedMcpServers), baseContents);
 }
+function collectWorkerRelevantSkills({ selectedLanguageSkills, selectedFrameworkSkills, selectedArchitectureSkill, selectedWorkflowSkills, selectedDatabaseSkills, }) {
+    const implementationRelevantWorkflowSkills = selectedWorkflowSkills.filter((skill) => skill.id === 'ai-prompt-engineer-master' || skill.id === 'ux-expert');
+    return [
+        ...selectedLanguageSkills,
+        ...selectedFrameworkSkills,
+        ...selectedDatabaseSkills,
+        ...(selectedArchitectureSkill ? [selectedArchitectureSkill] : []),
+        ...implementationRelevantWorkflowSkills,
+    ];
+}
+function getSharedSkillTargetPath(skill) {
+    const sharedTargetPath = Object.values(skill.targetRelativePathsByAgent).find((targetPath) => targetPath !== undefined);
+    if (!sharedTargetPath) {
+        throw new Error(`Selectable skill ${skill.id} has no target path.`);
+    }
+    return sharedTargetPath;
+}
 export function extractProjectOverview(filePath) {
     if (!fs.existsSync(filePath)) {
         return undefined;

package/bin/modules/workflow-mutation-readiness/workflow-mutation-readiness.js

@@ -1,5 +1,6 @@
 import { readStateForDoctor } from '../workflow-state-registry/index.js';
 import { getSyncPreviews, isActionableSyncPreview } from '../sync-review/index.js';
+import { getUnsupportedAgentCleanupPlan } from '../sync-review/unsupported-agent-cleanup.js';
 import { readTemplateManifest } from '../template-catalog-rendering/index.js';
 export function getWorkflowMutationReadiness({ rootPath, statePath }) {
     const stateResult = readStateForDoctor(statePath);
@@ -11,6 +12,14 @@ export function getWorkflowMutationReadiness({ rootPath, statePath }) {
         };
     }
     const manifest = readTemplateManifest();
+    const unsupportedAgentCleanupPlan = getUnsupportedAgentCleanupPlan({ rootPath, state: stateResult.state });
+    if (unsupportedAgentCleanupPlan) {
+        return {
+            ok: false,
+            message: 'Workflow state is not clean enough to select a skill safely.',
+            hint: 'Run `sibu sync` to review workflow state before selecting a skill.',
+        };
+    }
     const previews = getSyncPreviews({ rootPath, state: stateResult.state, manifest });
     const actionablePreviews = previews.filter(isActionableSyncPreview);
     if (actionablePreviews.length > 0) {

package/bin/modules/workflow-target-planning/catalog.js

@@ -5,7 +5,6 @@ export const MANDATORY_SKILLS = [
             codex: '.agents/skills/clean-code/SKILL.md',
             gemini: '.agents/skills/clean-code/SKILL.md',
             claude: '.agents/skills/clean-code/SKILL.md',
-            windsurf: '.agents/skills/clean-code/SKILL.md',
         },
     },
     {
@@ -14,7 +13,22 @@ export const MANDATORY_SKILLS = [
             codex: '.agents/skills/product-vision-writer/SKILL.md',
             gemini: '.agents/skills/product-vision-writer/SKILL.md',
             claude: '.agents/skills/product-vision-writer/SKILL.md',
-            windsurf: '.agents/skills/product-vision-writer/SKILL.md',
+        },
+    },
+    {
+        templateRelativePath: 'skills/business-domain-model-writer/SKILL.md',
+        targetRelativePathsByAgent: {
+            codex: '.agents/skills/business-domain-model-writer/SKILL.md',
+            gemini: '.agents/skills/business-domain-model-writer/SKILL.md',
+            claude: '.agents/skills/business-domain-model-writer/SKILL.md',
+        },
+    },
+    {
+        templateRelativePath: 'skills/capabilities-map-writer/SKILL.md',
+        targetRelativePathsByAgent: {
+            codex: '.agents/skills/capabilities-map-writer/SKILL.md',
+            gemini: '.agents/skills/capabilities-map-writer/SKILL.md',
+            claude: '.agents/skills/capabilities-map-writer/SKILL.md',
         },
     },
     {
@@ -23,7 +37,6 @@ export const MANDATORY_SKILLS = [
             codex: '.agents/skills/deep-module-map-writer/SKILL.md',
             gemini: '.agents/skills/deep-module-map-writer/SKILL.md',
             claude: '.agents/skills/deep-module-map-writer/SKILL.md',
-            windsurf: '.agents/skills/deep-module-map-writer/SKILL.md',
         },
     },
     {
@@ -32,7 +45,6 @@ export const MANDATORY_SKILLS = [
             codex: '.agents/skills/feature-brief-writer/SKILL.md',
             gemini: '.agents/skills/feature-brief-writer/SKILL.md',
             claude: '.agents/skills/feature-brief-writer/SKILL.md',
-            windsurf: '.agents/skills/feature-brief-writer/SKILL.md',
         },
     },
     {
@@ -41,7 +53,6 @@ export const MANDATORY_SKILLS = [
             codex: '.agents/skills/technical-design-writer/SKILL.md',
             gemini: '.agents/skills/technical-design-writer/SKILL.md',
             claude: '.agents/skills/technical-design-writer/SKILL.md',
-            windsurf: '.agents/skills/technical-design-writer/SKILL.md',
         },
     },
     {
@@ -50,7 +61,6 @@ export const MANDATORY_SKILLS = [
             codex: '.agents/skills/scrum-master-planner/SKILL.md',
             gemini: '.agents/skills/scrum-master-planner/SKILL.md',
             claude: '.agents/skills/scrum-master-planner/SKILL.md',
-            windsurf: '.agents/skills/scrum-master-planner/SKILL.md',
         },
     },
     {
@@ -59,7 +69,38 @@ export const MANDATORY_SKILLS = [
             codex: '.agents/skills/ai-implementation-planner/SKILL.md',
             gemini: '.agents/skills/ai-implementation-planner/SKILL.md',
             claude: '.agents/skills/ai-implementation-planner/SKILL.md',
-            windsurf: '.agents/skills/ai-implementation-planner/SKILL.md',
+        },
+        supplementalTargetsByAgent: {
+            codex: [
+                {
+                    templateRelativePath: 'skills/ai-implementation-planner-toolbox/SKILL.md',
+                    targetRelativePath: '.agents/skills/ai-implementation-planner-toolbox/SKILL.md',
+                },
+                {
+                    templateRelativePath: '.codex/agents/sibu-implementation-planner.toml',
+                    targetRelativePath: '.codex/agents/sibu-implementation-planner.toml',
+                },
+            ],
+            gemini: [
+                {
+                    templateRelativePath: 'skills/ai-implementation-planner-toolbox/SKILL.md',
+                    targetRelativePath: '.agents/skills/ai-implementation-planner-toolbox/SKILL.md',
+                },
+                {
+                    templateRelativePath: '.gemini/agents/sibu-implementation-planner.md',
+                    targetRelativePath: '.gemini/agents/sibu-implementation-planner.md',
+                },
+            ],
+            claude: [
+                {
+                    templateRelativePath: 'skills/ai-implementation-planner-toolbox/SKILL.md',
+                    targetRelativePath: '.agents/skills/ai-implementation-planner-toolbox/SKILL.md',
+                },
+                {
+                    templateRelativePath: '.claude/agents/sibu-implementation-planner.md',
+                    targetRelativePath: '.claude/agents/sibu-implementation-planner.md',
+                },
+            ],
         },
     },
     {
@@ -68,7 +109,38 @@ export const MANDATORY_SKILLS = [
             codex: '.agents/skills/ai-implementation-plan-executor/SKILL.md',
             gemini: '.agents/skills/ai-implementation-plan-executor/SKILL.md',
             claude: '.agents/skills/ai-implementation-plan-executor/SKILL.md',
-            windsurf: '.agents/skills/ai-implementation-plan-executor/SKILL.md',
+        },
+        supplementalTargetsByAgent: {
+            codex: [
+                {
+                    templateRelativePath: 'skills/ai-implementation-executor-toolbox/SKILL.md',
+                    targetRelativePath: '.agents/skills/ai-implementation-executor-toolbox/SKILL.md',
+                },
+                {
+                    templateRelativePath: '.codex/agents/sibu-implementation-executor.toml',
+                    targetRelativePath: '.codex/agents/sibu-implementation-executor.toml',
+                },
+            ],
+            gemini: [
+                {
+                    templateRelativePath: 'skills/ai-implementation-executor-toolbox/SKILL.md',
+                    targetRelativePath: '.agents/skills/ai-implementation-executor-toolbox/SKILL.md',
+                },
+                {
+                    templateRelativePath: '.gemini/agents/sibu-implementation-executor.md',
+                    targetRelativePath: '.gemini/agents/sibu-implementation-executor.md',
+                },
+            ],
+            claude: [
+                {
+                    templateRelativePath: 'skills/ai-implementation-executor-toolbox/SKILL.md',
+                    targetRelativePath: '.agents/skills/ai-implementation-executor-toolbox/SKILL.md',
+                },
+                {
+                    templateRelativePath: '.claude/agents/sibu-implementation-executor.md',
+                    targetRelativePath: '.claude/agents/sibu-implementation-executor.md',
+                },
+            ],
         },
     },
     {
@@ -77,7 +149,6 @@ export const MANDATORY_SKILLS = [
             codex: '.agents/skills/feature-idea-capture/SKILL.md',
             gemini: '.agents/skills/feature-idea-capture/SKILL.md',
             claude: '.agents/skills/feature-idea-capture/SKILL.md',
-            windsurf: '.agents/skills/feature-idea-capture/SKILL.md',
         },
     },
 ];
@@ -109,7 +180,6 @@ export const SELECTABLE_LANGUAGE_SKILLS = [
             codex: '.agents/skills/typescript/SKILL.md',
             gemini: '.agents/skills/typescript/SKILL.md',
             claude: '.agents/skills/typescript/SKILL.md',
-            windsurf: '.agents/skills/typescript/SKILL.md',
         },
     },
     {
@@ -122,7 +192,6 @@ export const SELECTABLE_LANGUAGE_SKILLS = [
             codex: '.agents/skills/golang/SKILL.md',
             gemini: '.agents/skills/golang/SKILL.md',
             claude: '.agents/skills/golang/SKILL.md',
-            windsurf: '.agents/skills/golang/SKILL.md',
         },
     },
 ];
@@ -137,7 +206,6 @@ export const SELECTABLE_DATABASE_SKILLS = [
             codex: '.agents/skills/postgresql-expert/SKILL.md',
             gemini: '.agents/skills/postgresql-expert/SKILL.md',
             claude: '.agents/skills/postgresql-expert/SKILL.md',
-            windsurf: '.agents/skills/postgresql-expert/SKILL.md',
         },
     },
 ];
@@ -152,7 +220,6 @@ export const SELECTABLE_FRAMEWORK_SKILLS = [
             codex: '.agents/skills/react/SKILL.md',
             gemini: '.agents/skills/react/SKILL.md',
             claude: '.agents/skills/react/SKILL.md',
-            windsurf: '.agents/skills/react/SKILL.md',
         },
     },
     {
@@ -165,7 +232,6 @@ export const SELECTABLE_FRAMEWORK_SKILLS = [
             codex: '.agents/skills/nextjs/SKILL.md',
             gemini: '.agents/skills/nextjs/SKILL.md',
             claude: '.agents/skills/nextjs/SKILL.md',
-            windsurf: '.agents/skills/nextjs/SKILL.md',
         },
     },
 ];
@@ -180,7 +246,6 @@ export const SELECTABLE_ARCHITECTURE_SKILLS = [
             codex: '.agents/skills/ddd-hexagonal/SKILL.md',
             gemini: '.agents/skills/ddd-hexagonal/SKILL.md',
             claude: '.agents/skills/ddd-hexagonal/SKILL.md',
-            windsurf: '.agents/skills/ddd-hexagonal/SKILL.md',
         },
     },
     {
@@ -193,7 +258,6 @@ export const SELECTABLE_ARCHITECTURE_SKILLS = [
             codex: '.agents/skills/command-pattern/SKILL.md',
             gemini: '.agents/skills/command-pattern/SKILL.md',
             claude: '.agents/skills/command-pattern/SKILL.md',
-            windsurf: '.agents/skills/command-pattern/SKILL.md',
         },
     },
     {
@@ -206,7 +270,6 @@ export const SELECTABLE_ARCHITECTURE_SKILLS = [
             codex: '.agents/skills/layered-architecture/SKILL.md',
             gemini: '.agents/skills/layered-architecture/SKILL.md',
             claude: '.agents/skills/layered-architecture/SKILL.md',
-            windsurf: '.agents/skills/layered-architecture/SKILL.md',
         },
     },
 ];
@@ -221,7 +284,6 @@ export const SELECTABLE_WORKFLOW_SKILLS = [
             codex: '.agents/skills/ai-prompt-engineer-master/SKILL.md',
             gemini: '.agents/skills/ai-prompt-engineer-master/SKILL.md',
             claude: '.agents/skills/ai-prompt-engineer-master/SKILL.md',
-            windsurf: '.agents/skills/ai-prompt-engineer-master/SKILL.md',
         },
     },
     {
@@ -234,7 +296,6 @@ export const SELECTABLE_WORKFLOW_SKILLS = [
             codex: '.agents/skills/ux-expert/SKILL.md',
             gemini: '.agents/skills/ux-expert/SKILL.md',
             claude: '.agents/skills/ux-expert/SKILL.md',
-            windsurf: '.agents/skills/ux-expert/SKILL.md',
         },
     },
     {
@@ -247,7 +308,6 @@ export const SELECTABLE_WORKFLOW_SKILLS = [
             codex: '.agents/skills/export-to-github/SKILL.md',
             gemini: '.agents/skills/export-to-github/SKILL.md',
             claude: '.agents/skills/export-to-github/SKILL.md',
-            windsurf: '.agents/skills/export-to-github/SKILL.md',
         },
         supplementalTargetsByAgent: {
             codex: [
@@ -280,7 +340,6 @@ export const SELECTABLE_WORKFLOW_SKILLS = [
             codex: '.agents/skills/export-to-notion/SKILL.md',
             gemini: '.agents/skills/export-to-notion/SKILL.md',
             claude: '.agents/skills/export-to-notion/SKILL.md',
-            windsurf: '.agents/skills/export-to-notion/SKILL.md',
         },
         supplementalTargetsByAgent: {
             codex: [
@@ -352,6 +411,7 @@ export const SUPPORTED_AGENTS = [
         description: 'Create .codex/config.toml pointing Codex to AGENTS.md',
         targetRelativePath: '.codex/config.toml',
         templateRelativePath: '.codex/config.toml',
+        supportsForegroundWorkers: true,
     },
     {
         id: 'gemini',
@@ -359,6 +419,7 @@ export const SUPPORTED_AGENTS = [
         description: 'Create GEMINI.md that delegates to AGENTS.md',
         targetRelativePath: 'GEMINI.md',
         templateRelativePath: 'GEMINI.md',
+        supportsForegroundWorkers: true,
     },
     {
         id: 'claude',
@@ -366,11 +427,7 @@ export const SUPPORTED_AGENTS = [
         description: 'Create CLAUDE.md that delegates to AGENTS.md',
         targetRelativePath: 'CLAUDE.md',
         templateRelativePath: 'CLAUDE.md',
-    },
-    {
-        id: 'windsurf',
-        name: 'Windsurf',
-        description: 'Use root AGENTS.md and shared .agents/skills/ discovery',
+        supportsForegroundWorkers: true,
     },
 ];
 export function resolveSelectableMcpServerById(serverId) {

package/bin/modules/workflow-target-planning/workflow-targets.js

@@ -5,7 +5,7 @@ import { MANDATORY_SKILLS, SELECTABLE_ARCHITECTURE_SKILLS, SELECTABLE_DATABASE_S
 import { sha256 } from '../../shared/hash.js';
 import { removeUndefinedFields } from '../../shared/object.js';
 import { readExistingState } from '../workflow-state-registry/index.js';
-import { getTemplateVersion, readTemplate, readTemplateManifest, renderMcpConfig, renderSkillRouting } from '../template-catalog-rendering/index.js';
+import { getTemplateVersion, readTemplate, readTemplateManifest, renderMcpConfig, renderSkillRouting, renderWorkerToolboxRoutingPlaceholders } from '../template-catalog-rendering/index.js';
 export function getSelectedLanguageSkillsFromState(state) {
     return SELECTABLE_LANGUAGE_SKILLS.filter((skill) => state.selectedLanguageSkills?.includes(skill.id));
 }
@@ -183,6 +183,7 @@ export function renderMissingWorkflowFiles({ missingTargets, overview, selectedL
             contents = contents.replace('{{PROJECT_OVERVIEW}}', overview.trim());
         }
         contents = renderSkillRouting(contents, selectedLanguageSkills, selectedFrameworkSkills, selectedArchitectureSkill, selectedWorkflowSkills, selectedDatabaseSkills);
+        contents = renderWorkerToolboxRoutingPlaceholders(contents, selectedLanguageSkills, selectedFrameworkSkills, selectedArchitectureSkill, selectedWorkflowSkills, selectedDatabaseSkills);
         return {
             label: target.label,
             targetPath: target.targetPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juancr11/sibu",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "CLI for setting up a local AI-augmented development workflow.",
   "repository": {
     "type": "git",

package/templates/.claude/agents/sibu-implementation-executor.md

@@ -0,0 +1,30 @@
+---
+name: sibu-implementation-executor
+description: Executes one Sibu story plan in a fresh, bounded context using the executor toolbox skill.
+---
+
+You are the Sibu implementation executor worker.
+
+Communication mode: use light verbose mode for all progress updates and final reporting.
+
+Light verbose mode rules:
+- Show the plan once at the beginning, with at most 5 bullets.
+- Announce only major phase changes.
+- Mention skills or tools only when first used.
+- Do not explain obvious file reads.
+- Summarize batches of work instead of every action.
+- Report decisions, not thought processes.
+- Show only test failures and final test results.
+- Give a concise final summary that satisfies the worker's required final output format.
+
+Use only the narrow executor packet from the main agent. Do not rely on or request the main agent's full conversation context.
+
+The packet must include exactly one User Story path or one story-local `.impl_plan/` folder, required source artifact paths, the executor toolbox skill path, required and optional skill paths, distilled constraints, approval and commit rules, and the expected final output format. If required packet fields are missing or ambiguous, stop and ask the main agent for the missing packet fields.
+
+Before execution:
+- Read and follow the executor toolbox skill from the packet.
+- Read required skill files listed in the packet, including clean-code.
+- Read optional installed skill files only when relevant to the story, step files, source artifacts, or touched files.
+- Treat distilled constraints as binding for this task.
+
+Execute exactly one story plan. You may edit the local working tree and run validation. Never approve your own work, write approval metadata, run git commit, run git stash, or run git reset.

package/templates/.claude/agents/sibu-implementation-planner.md

@@ -0,0 +1,30 @@
+---
+name: sibu-implementation-planner
+description: Plans one Sibu User Story in a fresh, bounded context using the planner toolbox skill.
+---
+
+You are the Sibu implementation planner worker.
+
+Communication mode: use light verbose mode for all progress updates and final reporting.
+
+Light verbose mode rules:
+- Show the plan once at the beginning, with at most 5 bullets.
+- Announce only major phase changes.
+- Mention skills or tools only when first used.
+- Do not explain obvious file reads.
+- Summarize batches of work instead of every action.
+- Report decisions, not thought processes.
+- Show only test failures and final test results.
+- Give a concise final summary that satisfies the worker's required final output format.
+
+Use only the narrow planner packet from the main agent. Do not rely on or request the main agent's full conversation context.
+
+The packet must include exactly one User Story path, required source artifact paths, the planner toolbox skill path, required and optional skill paths, distilled constraints, and the expected final output format. If required packet fields are missing or ambiguous, stop and ask the main agent for the missing packet fields.
+
+Before planning:
+- Read and follow the planner toolbox skill from the packet.
+- Read required skill files listed in the packet, including clean-code.
+- Read optional installed skill files only when relevant to the story or source artifacts.
+- Treat distilled constraints as binding for this task.
+
+Plan exactly one story. Write only story-local implementation plan files. Never write production code or unrelated artifacts.