@shepai/cli 1.169.1 → 1.170.0

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.js

@@ -221,31 +221,50 @@ export function createMergeNode(deps) {
                 }
             }
             // --- Fork-and-PR flow ---
-            // When forkAndPr=true, fork the repo, push to the fork, create upstream PR,
-            // then transition to AwaitingUpstream instead of merging.
+            // When forkAndPr=true, fork the repo (or create a new repo as fallback),
+            // push to the fork, create upstream PR, then transition to AwaitingUpstream.
+            // If no upstream exists (created via fallback), skip PR and transition to Completed.
             if (state.forkAndPr && deps.gitForkService) {
                 log.info('Fork-and-PR flow: forking repo and creating upstream PR');
                 await deps.gitForkService.forkRepository(cwd);
-                log.info('Repository forked, remotes remapped');
+                log.info('Repository forked/created, remotes configured');
                 await deps.gitForkService.pushToFork(cwd, branch);
                 log.info(`Branch ${branch} pushed to fork`);
-                const upstreamPr = await deps.gitForkService.createUpstreamPr(cwd, feature?.name ?? branch, feature?.description ?? '', branch, baseBranch);
-                log.info(`Upstream PR created: ${upstreamPr.url}`);
-                messages.push(`[merge] Upstream PR created: ${upstreamPr.url}`);
-                if (feature) {
-                    await deps.featureRepository.update({
-                        ...feature,
-                        lifecycle: SdlcLifecycle.AwaitingUpstream,
-                        pr: {
-                            ...(feature.pr ?? { url: '', number: 0, status: PrStatus.Open }),
-                            ...(commitHash ? { commitHash } : {}),
-                            upstreamPrUrl: upstreamPr.url,
-                            upstreamPrNumber: upstreamPr.number,
-                            upstreamPrStatus: PrStatus.Open,
-                        },
-                        updatedAt: new Date(),
-                    });
-                    messages.push(`[merge] Feature lifecycle → AwaitingUpstream`);
+                // Try to create upstream PR. This will fail gracefully if forkRepository
+                // fell back to creating a new repo (no upstream remote to target).
+                try {
+                    const upstreamPr = await deps.gitForkService.createUpstreamPr(cwd, feature?.name ?? branch, feature?.description ?? '', branch, baseBranch);
+                    log.info(`Upstream PR created: ${upstreamPr.url}`);
+                    messages.push(`[merge] Upstream PR created: ${upstreamPr.url}`);
+                    if (feature) {
+                        await deps.featureRepository.update({
+                            ...feature,
+                            lifecycle: SdlcLifecycle.AwaitingUpstream,
+                            pr: {
+                                ...(feature.pr ?? { url: '', number: 0, status: PrStatus.Open }),
+                                ...(commitHash ? { commitHash } : {}),
+                                upstreamPrUrl: upstreamPr.url,
+                                upstreamPrNumber: upstreamPr.number,
+                                upstreamPrStatus: PrStatus.Open,
+                            },
+                            updatedAt: new Date(),
+                        });
+                        messages.push(`[merge] Feature lifecycle → AwaitingUpstream`);
+                    }
+                }
+                catch {
+                    // No upstream remote — repo was created fresh, not forked.
+                    // Code is pushed to origin; transition to Maintain.
+                    log.info('No upstream remote — skipping upstream PR (repo created, not forked)');
+                    messages.push(`[merge] Code pushed to origin (no upstream to PR against)`);
+                    if (feature) {
+                        await deps.featureRepository.update({
+                            ...feature,
+                            lifecycle: SdlcLifecycle.Maintain,
+                            updatedAt: new Date(),
+                        });
+                        messages.push(`[merge] Feature lifecycle → Maintain`);
+                    }
                 }
                 const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
                 await recordPhaseEnd(mergeTimingId, Date.now() - startTime, {

package/dist/packages/core/src/infrastructure/services/git/git-fork.service.d.ts

@@ -13,6 +13,11 @@ export declare class GitForkService implements IGitForkService {
     private readonly execFile;
     constructor(execFile: ExecFunction);
     forkRepository(cwd: string): Promise<void>;
+    /**
+     * Fallback when gh repo fork fails due to missing remotes.
+     * Creates a new private GitHub repository and sets it as origin.
+     */
+    private createRepositoryFallback;
     pushToFork(cwd: string, branch: string): Promise<void>;
     createUpstreamPr(cwd: string, title: string, body: string, head: string, base: string): Promise<UpstreamPrResult>;
     getUpstreamPrStatus(upstreamRepo: string, prNumber: number): Promise<PrStatus>;

package/dist/packages/core/src/infrastructure/services/git/git-fork.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-fork.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-fork.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0EAA0E,CAAC;AAChH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0EAA0E,CAAC;AAKjH,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBACa,cAAe,YAAW,eAAe;IAChB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0C1C,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD,gBAAgB,CACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,gBAAgB,CAAC;IAkDtB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAsBpF;;;OAGG;IACH,OAAO,CAAC,kBAAkB;CAU3B"}
+{"version":3,"file":"git-fork.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-fork.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0EAA0E,CAAC;AAChH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0EAA0E,CAAC;AAKjH,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAG1D,qBACa,cAAe,YAAW,eAAe;IAChB,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDhD;;;OAGG;YACW,wBAAwB;IAgChC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD,gBAAgB,CACpB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,gBAAgB,CAAC;IAkDtB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAsBpF;;;OAGG;IACH,OAAO,CAAC,kBAAkB;CAU3B"}

package/dist/packages/core/src/infrastructure/services/git/git-fork.service.js

@@ -17,6 +17,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+import { basename } from 'node:path';
 import { injectable, inject } from 'tsyringe';
 import { GitForkError, GitForkErrorCode, } from '../../../application/ports/output/services/git-fork-service.interface.js';
 import { PrStatus } from '../../../domain/generated/output.js';
@@ -58,9 +59,42 @@ let GitForkService = class GitForkService {
             if (message.includes('auth') || message.includes('login')) {
                 throw new GitForkError('GitHub authentication required to fork', GitForkErrorCode.AUTH_FAILURE, err instanceof Error ? err : undefined);
             }
+            // Fallback: when fork fails because there are no remotes (e.g. freshly-init'd repo),
+            // create a new GitHub repository instead.
+            if (message.includes('unable to determine base repository')) {
+                await this.createRepositoryFallback(cwd);
+                return;
+            }
             throw new GitForkError(`Failed to fork repository: ${message}`, GitForkErrorCode.FORK_FAILED, err instanceof Error ? err : undefined);
         }
     }
+    /**
+     * Fallback when gh repo fork fails due to missing remotes.
+     * Creates a new private GitHub repository and sets it as origin.
+     */
+    async createRepositoryFallback(cwd) {
+        const { stdout: ghUser } = await this.execFile('gh', ['api', 'user', '--jq', '.login'], {
+            cwd,
+        });
+        const username = ghUser.trim();
+        const repoName = basename(cwd);
+        try {
+            await this.execFile('gh', [
+                'repo',
+                'create',
+                `${username}/${repoName}`,
+                '--source',
+                '.',
+                '--remote',
+                'origin',
+                '--private',
+            ], { cwd });
+        }
+        catch (createErr) {
+            const createMessage = createErr instanceof Error ? createErr.message : String(createErr);
+            throw new GitForkError(`Failed to create repository: ${createMessage}`, GitForkErrorCode.FORK_FAILED, createErr instanceof Error ? createErr : undefined);
+        }
+    }
     async pushToFork(cwd, branch) {
         try {
             await this.execFile('git', ['push', '-u', 'origin', branch], { cwd });

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts

@@ -53,6 +53,7 @@ export declare class GitPrService implements IGitPrService {
     rebaseAbort(cwd: string): Promise<void>;
     stash(cwd: string, message?: string): Promise<boolean>;
     stashPop(cwd: string): Promise<void>;
+    stashDrop(cwd: string): Promise<void>;
     getBranchSyncStatus(cwd: string, featureBranch: string, baseBranch: string): Promise<{
         ahead: number;
         behind: number;

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"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"}

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.js

@@ -814,6 +814,14 @@ let GitPrService = class GitPrService {
             throw this.parseGitError(error);
         }
     }
+    async stashDrop(cwd) {
+        try {
+            await this.execFile('git', ['stash', 'drop'], { cwd });
+        }
+        catch (error) {
+            throw this.parseGitError(error);
+        }
+    }
     async getBranchSyncStatus(cwd, featureBranch, baseBranch) {
         try {
             const remoteRef = `origin/${baseBranch}`;

package/dist/packages/core/src/infrastructure/services/skill-injector.service.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Skill Injector Service Implementation
+ *
+ * Injects curated agent skills into worktrees during feature creation.
+ * Handles local skill copying via fs.cp, remote skill installation via npx,
+ * SKILL.md idempotency checks, and .gitignore management.
+ *
+ * Uses constructor-injected ExecFunction for process execution (npx, git)
+ * and direct fs/promises imports for filesystem operations, following
+ * the established codebase conventions.
+ */
+import type { SkillInjectionConfig } from '../../domain/generated/output.js';
+import type { ISkillInjectorService, SkillInjectionResult } from '../../application/ports/output/services/skill-injector.interface.js';
+import type { ExecFunction } from './git/worktree.service.js';
+export declare class SkillInjectorService implements ISkillInjectorService {
+    private readonly execFile;
+    constructor(execFile: ExecFunction);
+    inject(worktreePath: string, config: SkillInjectionConfig, repoRoot?: string): Promise<SkillInjectionResult>;
+    private validateSkill;
+    private isSkillPresent;
+    private injectLocalSkill;
+    private injectRemoteSkill;
+    private isTrackedInGit;
+    private updateGitignore;
+}
+//# sourceMappingURL=skill-injector.service.d.ts.map

package/dist/packages/core/src/infrastructure/services/skill-injector.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-injector.service.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/services/skill-injector.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,KAAK,EAAE,oBAAoB,EAAe,MAAM,kCAAkC,CAAC;AAE1F,OAAO,KAAK,EACV,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,qEAAqE,CAAC;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAY9D,qBACa,oBAAqB,YAAW,qBAAqB;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,YAAY;IAErE,MAAM,CACV,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,oBAAoB,EAC5B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,oBAAoB,CAAC;IAgDhC,OAAO,CAAC,aAAa;YAoBP,cAAc;YASd,gBAAgB;YAkBhB,iBAAiB;YAiCjB,cAAc;YAWd,eAAe;CA4C9B"}

package/dist/packages/core/src/infrastructure/services/skill-injector.service.js

@@ -0,0 +1,201 @@
+/**
+ * Skill Injector Service Implementation
+ *
+ * Injects curated agent skills into worktrees during feature creation.
+ * Handles local skill copying via fs.cp, remote skill installation via npx,
+ * SKILL.md idempotency checks, and .gitignore management.
+ *
+ * Uses constructor-injected ExecFunction for process execution (npx, git)
+ * and direct fs/promises imports for filesystem operations, following
+ * the established codebase conventions.
+ */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+import { access, cp, mkdir, readFile, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { injectable, inject } from 'tsyringe';
+import { SkillSourceType } from '../../domain/generated/output.js';
+const SKILLS_DIR = '.claude/skills';
+const SKILL_MARKER = 'SKILL.md';
+const REMOTE_SKILL_TIMEOUT_MS = 30_000;
+/** Shell metacharacters that must not appear in skill source strings */
+const SHELL_METACHAR_PATTERN = /[;|&$`\\(){}< >]/;
+/** Patterns that indicate path traversal in skill names */
+const PATH_TRAVERSAL_PATTERN = /\.\./;
+let SkillInjectorService = class SkillInjectorService {
+    execFile;
+    constructor(execFile) {
+        this.execFile = execFile;
+    }
+    async inject(worktreePath, config, repoRoot) {
+        // Validate worktree path exists
+        await access(worktreePath);
+        const result = {
+            injected: [],
+            skipped: [],
+            failed: [],
+        };
+        if (!config.skills.length) {
+            return result;
+        }
+        // Bootstrap .claude/skills/ directory
+        const skillsDir = join(worktreePath, SKILLS_DIR);
+        await mkdir(skillsDir, { recursive: true });
+        // Process each skill
+        for (const skill of config.skills) {
+            // Validate skill name and source
+            const validationError = this.validateSkill(skill);
+            if (validationError) {
+                result.failed.push({ name: skill.name, error: validationError });
+                continue;
+            }
+            // Idempotency check: skip if SKILL.md already exists
+            if (await this.isSkillPresent(worktreePath, skill.name)) {
+                result.skipped.push(skill.name);
+                continue;
+            }
+            // Inject based on type
+            if (skill.type === SkillSourceType.Local) {
+                await this.injectLocalSkill(worktreePath, skill, repoRoot, result);
+            }
+            else {
+                await this.injectRemoteSkill(worktreePath, skill, result);
+            }
+        }
+        // Update .gitignore for injected and skipped untracked skills
+        const allSkillNames = [...result.injected, ...result.skipped];
+        await this.updateGitignore(worktreePath, allSkillNames);
+        return result;
+    }
+    validateSkill(skill) {
+        // Validate skill name
+        if (PATH_TRAVERSAL_PATTERN.test(skill.name)) {
+            return `invalid skill name '${skill.name}': contains path traversal`;
+        }
+        if (skill.name.startsWith('/')) {
+            return `invalid skill name '${skill.name}': absolute path not allowed`;
+        }
+        if (skill.name.includes('\\')) {
+            return `invalid skill name '${skill.name}': backslash not allowed`;
+        }
+        // Validate source for remote skills (shell injection prevention)
+        if (skill.type === SkillSourceType.Remote && SHELL_METACHAR_PATTERN.test(skill.source)) {
+            return `invalid source '${skill.source}': contains shell metacharacters`;
+        }
+        return undefined;
+    }
+    async isSkillPresent(worktreePath, skillName) {
+        try {
+            await access(join(worktreePath, SKILLS_DIR, skillName, SKILL_MARKER));
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    async injectLocalSkill(worktreePath, skill, repoRoot, result) {
+        const sourcePath = repoRoot ? join(repoRoot, skill.source) : skill.source;
+        const destPath = join(worktreePath, SKILLS_DIR, skill.name);
+        try {
+            await cp(sourcePath, destPath, { recursive: true });
+            result.injected.push(skill.name);
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            result.failed.push({ name: skill.name, error: message });
+        }
+    }
+    async injectRemoteSkill(worktreePath, skill, result) {
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), REMOTE_SKILL_TIMEOUT_MS);
+        try {
+            const args = ['skills', 'add', skill.source, '--yes'];
+            if (skill.remoteSkillName) {
+                args.push('--skill', skill.remoteSkillName);
+            }
+            await this.execFile('npx', args, {
+                cwd: worktreePath,
+                signal: controller.signal,
+            });
+            result.injected.push(skill.name);
+        }
+        catch (error) {
+            const isTimeout = error instanceof Error && error.name === 'AbortError';
+            const message = isTimeout
+                ? `timeout: remote skill installation exceeded ${REMOTE_SKILL_TIMEOUT_MS / 1000}s`
+                : error instanceof Error
+                    ? error.message
+                    : String(error);
+            result.failed.push({ name: skill.name, error: message });
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
+    async isTrackedInGit(worktreePath, skillName) {
+        try {
+            await this.execFile('git', ['ls-files', '--error-unmatch', `${SKILLS_DIR}/${skillName}/`], {
+                cwd: worktreePath,
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    async updateGitignore(worktreePath, skillNames) {
+        if (!skillNames.length)
+            return;
+        // Determine which skills need .gitignore entries (untracked only)
+        const untrackedSkills = [];
+        for (const name of skillNames) {
+            if (!(await this.isTrackedInGit(worktreePath, name))) {
+                untrackedSkills.push(name);
+            }
+        }
+        if (!untrackedSkills.length)
+            return;
+        const gitignorePath = join(worktreePath, '.gitignore');
+        // Read existing .gitignore (or start with empty string)
+        let existingContent = '';
+        try {
+            const content = await readFile(gitignorePath, 'utf-8');
+            existingContent = typeof content === 'string' ? content : '';
+        }
+        catch {
+            // File doesn't exist — will create it
+        }
+        // Determine which entries are new
+        const existingLines = new Set(existingContent.split('\n').map((line) => line.trim()));
+        const newEntries = [];
+        for (const name of untrackedSkills) {
+            const pattern = `${SKILLS_DIR}/${name}/`;
+            if (!existingLines.has(pattern)) {
+                newEntries.push(pattern);
+            }
+        }
+        if (!newEntries.length)
+            return;
+        // Append new entries, ensuring trailing newline
+        const needsNewline = existingContent.length > 0 && !existingContent.endsWith('\n');
+        const separator = needsNewline ? '\n' : '';
+        const updatedContent = `${existingContent + separator + newEntries.join('\n')}\n`;
+        await writeFile(gitignorePath, updatedContent);
+    }
+};
+SkillInjectorService = __decorate([
+    injectable(),
+    __param(0, inject('ExecFunction')),
+    __metadata("design:paramtypes", [Function])
+], SkillInjectorService);
+export { SkillInjectorService };

package/dist/src/presentation/cli/commands/feat/new.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/new.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwEpC;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAmK1C"}
+{"version":3,"file":"new.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/new.command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyEpC;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAsK1C"}

package/dist/src/presentation/cli/commands/feat/new.command.js

@@ -70,6 +70,8 @@ export function createNewCommand() {
         .option('--no-fast', t('cli:commands.feat.new.noFastOption'))
         .option('--model <model>', t('cli:commands.feat.new.modelOption'))
         .option('--no-rebase', t('cli:commands.feat.new.noRebaseOption'))
+        .option('--inject-skills', t('cli:commands.feat.new.injectSkillsOption'))
+        .option('--no-inject-skills', t('cli:commands.feat.new.noInjectSkillsOption'))
         .option('--attach <path>', t('cli:commands.feat.new.attachOption'), collect, [])
         .action(async (description, options) => {
         try {
@@ -131,6 +133,7 @@ export function createNewCommand() {
                 ...(fast && { fast: true }),
                 ...(options.model !== undefined && { model: options.model }),
                 ...(attachmentPaths.length > 0 && { attachmentPaths }),
+                ...(options.injectSkills !== undefined && { injectSkills: options.injectSkills }),
                 rebaseBeforeBranch: options.rebase,
             }));
             const { feature, warning } = result;

package/dist/src/presentation/web/app/actions/add-injected-skill.d.ts

@@ -0,0 +1,7 @@
+import type { SkillSource } from '../../../../../packages/core/src/domain/generated/output.js';
+export interface AddInjectedSkillResult {
+    success: boolean;
+    error?: string;
+}
+export declare function addInjectedSkill(skill: SkillSource): Promise<AddInjectedSkillResult>;
+//# sourceMappingURL=add-injected-skill.d.ts.map

package/dist/src/presentation/web/app/actions/add-injected-skill.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-injected-skill.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/add-injected-skill.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAExE,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAgC1F"}

package/dist/src/presentation/web/app/actions/add-injected-skill.js

@@ -0,0 +1,34 @@
+'use server';
+import { revalidatePath } from 'next/cache';
+import { resolve } from '../../lib/server-container.js';
+import { updateSettings as updateSettingsSingleton } from '../../../../../packages/core/src/infrastructure/services/settings.service.js';
+export async function addInjectedSkill(skill) {
+    try {
+        const loadUseCase = resolve('LoadSettingsUseCase');
+        const current = await loadUseCase.execute();
+        const existingSkills = current.workflow.skillInjection?.skills ?? [];
+        if (existingSkills.some((s) => s.name === skill.name)) {
+            return { success: false, error: `Skill "${skill.name}" is already configured` };
+        }
+        const updated = {
+            ...current,
+            workflow: {
+                ...current.workflow,
+                skillInjection: {
+                    enabled: current.workflow.skillInjection?.enabled ?? true,
+                    skills: [...existingSkills, skill],
+                },
+            },
+            updatedAt: new Date(),
+        };
+        const updateUseCase = resolve('UpdateSettingsUseCase');
+        await updateUseCase.execute(updated);
+        updateSettingsSingleton(updated);
+        revalidatePath('/skills');
+        return { success: true };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'Failed to add skill';
+        return { success: false, error: message };
+    }
+}

package/dist/src/presentation/web/app/actions/create-feature.d.ts

@@ -37,6 +37,8 @@ interface CreateFeatureInput {
     model?: string;
     /** Sync main from remote before creating the feature branch (default: true). */
     rebaseBeforeBranch?: boolean;
+    /** Inject curated skills into the feature worktree. */
+    injectSkills?: boolean;
 }
 export declare function createFeature(input: CreateFeatureInput): Promise<{
     feature?: Feature;

package/dist/src/presentation/web/app/actions/create-feature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/create-feature.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAGpE,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAQD,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,yEAAyE;IACzE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,yDAAyD;IACzD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uFAAuF;IACvF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2CAA2C;IAC3C,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,uDAAuD;IACvD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6BAA6B;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiGhD"}
+{"version":3,"file":"create-feature.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/create-feature.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAGpE,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAQD,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,yEAAyE;IACzE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,yDAAyD;IACzD,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uFAAuF;IACvF,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2CAA2C;IAC3C,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,uDAAuD;IACvD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6BAA6B;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,uDAAuD;IACvD,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAoGhD"}

package/dist/src/presentation/web/app/actions/create-feature.js

@@ -2,7 +2,7 @@
 import { resolve } from '../../lib/server-container.js';
 import { composeUserInput } from './compose-user-input.js';
 export async function createFeature(input) {
-    const { description, repositoryPath, attachments, sessionId, approvalGates, push, openPr, parentId, fast, pending, forkAndPr, commitSpecs, ciWatchEnabled, enableEvidence, commitEvidence, agentType, model, rebaseBeforeBranch, } = input;
+    const { description, repositoryPath, attachments, sessionId, approvalGates, push, openPr, parentId, fast, pending, forkAndPr, commitSpecs, ciWatchEnabled, enableEvidence, commitEvidence, agentType, model, rebaseBeforeBranch, injectSkills, } = input;
     if (!description?.trim()) {
         return { error: 'description is required' };
     }
@@ -36,6 +36,7 @@ export async function createFeature(input) {
             ...(agentType ? { agentType } : {}),
             ...(model ? { model } : {}),
             ...(rebaseBeforeBranch != null ? { rebaseBeforeBranch } : {}),
+            ...(injectSkills != null ? { injectSkills } : {}),
         });
         // Phase 2 (background): metadata generation, worktree, spec, agent spawn
         // Fire-and-forget — the UI gets the real feature ID immediately
@@ -58,6 +59,7 @@ export async function createFeature(input) {
             ...(model ? { model } : {}),
             ...(sessionId ? { sessionId } : {}),
             ...(rebaseBeforeBranch != null ? { rebaseBeforeBranch } : {}),
+            ...(injectSkills != null ? { injectSkills } : {}),
         }, shouldSpawn)
             .catch((err) => {
             // eslint-disable-next-line no-console

package/dist/src/presentation/web/app/actions/get-workflow-defaults.d.ts

@@ -10,6 +10,7 @@ export interface WorkflowDefaults {
     enableEvidence: boolean;
     commitEvidence: boolean;
     fast: boolean;
+    injectSkills: boolean;
 }
 export declare function getWorkflowDefaults(): Promise<WorkflowDefaults>;
 //# sourceMappingURL=get-workflow-defaults.d.ts.map

package/dist/src/presentation/web/app/actions/get-workflow-defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-workflow-defaults.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-workflow-defaults.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE;QACb,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC;IACF,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAiBrE"}
+{"version":3,"file":"get-workflow-defaults.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-workflow-defaults.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE;QACb,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC;IACF,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,OAAO,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAkBrE"}

package/dist/src/presentation/web/app/actions/get-workflow-defaults.js

@@ -15,5 +15,6 @@ export async function getWorkflowDefaults() {
         enableEvidence: workflow.enableEvidence,
         commitEvidence: workflow.commitEvidence,
         fast: workflow.defaultFastMode,
+        injectSkills: workflow.skillInjection?.enabled ?? false,
     };
 }

package/dist/src/presentation/web/app/actions/remove-injected-skill.d.ts

@@ -0,0 +1,6 @@
+export interface RemoveInjectedSkillResult {
+    success: boolean;
+    error?: string;
+}
+export declare function removeInjectedSkill(skillName: string): Promise<RemoveInjectedSkillResult>;
+//# sourceMappingURL=remove-injected-skill.d.ts.map

package/dist/src/presentation/web/app/actions/remove-injected-skill.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-injected-skill.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/remove-injected-skill.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,wBAAsB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAkC/F"}

package/dist/src/presentation/web/app/actions/remove-injected-skill.js

@@ -0,0 +1,35 @@
+'use server';
+import { revalidatePath } from 'next/cache';
+import { resolve } from '../../lib/server-container.js';
+import { updateSettings as updateSettingsSingleton } from '../../../../../packages/core/src/infrastructure/services/settings.service.js';
+export async function removeInjectedSkill(skillName) {
+    try {
+        const loadUseCase = resolve('LoadSettingsUseCase');
+        const current = await loadUseCase.execute();
+        const existingSkills = current.workflow.skillInjection?.skills ?? [];
+        const filtered = existingSkills.filter((s) => s.name !== skillName);
+        if (filtered.length === existingSkills.length) {
+            return { success: false, error: `Skill "${skillName}" not found in configuration` };
+        }
+        const updated = {
+            ...current,
+            workflow: {
+                ...current.workflow,
+                skillInjection: {
+                    enabled: current.workflow.skillInjection?.enabled ?? false,
+                    skills: filtered,
+                },
+            },
+            updatedAt: new Date(),
+        };
+        const updateUseCase = resolve('UpdateSettingsUseCase');
+        await updateUseCase.execute(updated);
+        updateSettingsSingleton(updated);
+        revalidatePath('/skills');
+        return { success: true };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'Failed to remove skill';
+        return { success: false, error: message };
+    }
+}

package/dist/src/presentation/web/app/build-feature-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-feature-node-data.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/build-feature-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAS9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,MAAM,WAAW,2BAA2B;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qEAAqE;IACrE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yEAAyE;IACzE,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,GAAG,IAAI,EACpB,OAAO,CAAC,EAAE,2BAA2B,GACpC,eAAe,CAsDjB"}
+{"version":3,"file":"build-feature-node-data.d.ts","sourceRoot":"","sources":["../../../../../src/presentation/web/app/build-feature-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAS9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,MAAM,WAAW,2BAA2B;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,uEAAuE;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,qEAAqE;IACrE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yEAAyE;IACzE,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,GAAG,IAAI,EACpB,OAAO,CAAC,EAAE,2BAA2B,GACpC,eAAe,CAwDjB"}

package/dist/src/presentation/web/app/build-feature-node-data.js

@@ -43,6 +43,8 @@ export function buildFeatureNodeData(feature, run, options) {
         ...(run?.error && { errorMessage: run.error }),
         ...(feature.agentRunId != null && { hasAgentRun: true }),
         ...(feature.plan != null && { hasPlan: true }),
+        ...(feature.injectSkills && { injectSkills: true }),
+        ...(feature.injectedSkills?.length && { injectedSkills: feature.injectedSkills }),
         ...(feature.pr && {
             pr: {
                 url: feature.pr.url,

package/dist/src/presentation/web/app/skills/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/skills/page.tsx"],"names":[],"mappings":"AAKA,wBAA8B,UAAU,qDAMvC"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/skills/page.tsx"],"names":[],"mappings":"AASA,wBAA8B,UAAU,qDAQvC"}