@ai-coders/context 0.3.1 → 0.4.0

package/dist/index.js

@@ -37,31 +37,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.runInit = runInit;
 exports.runGenerate = runGenerate;
 exports.runAnalyze = runAnalyze;
 exports.runUpdate = runUpdate;
 exports.runPreview = runPreview;
 exports.runGuidelines = runGuidelines;
-exports.runInit = runInit;
+exports.runLlmFill = runLlmFill;
 const commander_1 = require("commander");
 const path = __importStar(require("path"));
-const fs = __importStar(require("fs-extra"));
-const glob_1 = require("glob");
 const dotenv = __importStar(require("dotenv"));
 const chalk_1 = __importDefault(require("chalk"));
 const inquirer_1 = __importDefault(require("inquirer"));
-const fileMapper_1 = require("./utils/fileMapper");
-const documentationGenerator_1 = require("./generators/documentation/documentationGenerator");
-const agentGenerator_1 = require("./generators/agents/agentGenerator");
 const planGenerator_1 = require("./generators/plans/planGenerator");
-const shared_1 = require("./generators/shared");
 const cliUI_1 = require("./utils/cliUI");
-const promptLoader_1 = require("./utils/promptLoader");
 const versionChecker_1 = require("./utils/versionChecker");
 const i18n_1 = require("./utils/i18n");
-const llmClientFactory_1 = require("./services/llmClientFactory");
-const guideRegistry_1 = require("./generators/documentation/guideRegistry");
-const agentTypes_1 = require("./generators/agents/agentTypes");
+const initService_1 = require("./services/init/initService");
+const fillService_1 = require("./services/fill/fillService");
+const planService_1 = require("./services/plan/planService");
 dotenv.config();
 const initialLocale = (0, i18n_1.detectLocale)(process.argv.slice(2), process.env.AI_CONTEXT_LANG);
 let currentLocale = initialLocale;
@@ -73,17 +67,26 @@ const localeLabelKeys = {
 };
 const program = new commander_1.Command();
 const ui = new cliUI_1.CLIInterface(t);
-const VERSION = '0.3.1';
+const VERSION = '0.4.0';
 const PACKAGE_NAME = '@ai-coders/context';
-const DEFAULT_MODEL = 'x-ai/grok-4-fast:free';
-const DOC_CHOICES = guideRegistry_1.DOCUMENT_GUIDES.map(guide => ({
-    name: `${guide.title} (${guide.key})`,
-    value: guide.key
-}));
-const AGENT_CHOICES = agentTypes_1.AGENT_TYPES.map(agent => ({
-    name: formatAgentLabel(agent),
-    value: agent
-}));
+const DEFAULT_MODEL = 'x-ai/grok-4-fast';
+const initService = new initService_1.InitService({
+    ui,
+    t,
+    version: VERSION
+});
+const fillService = new fillService_1.FillService({
+    ui,
+    t,
+    version: VERSION,
+    defaultModel: DEFAULT_MODEL
+});
+const planService = new planService_1.PlanService({
+    ui,
+    t,
+    version: VERSION,
+    defaultModel: DEFAULT_MODEL
+});
 program
     .name('ai-context')
     .description(t('cli.description'))
@@ -111,34 +114,12 @@ program
     .argument('<repo-path>', t('commands.init.arguments.repoPath'))
     .argument('[type]', t('commands.init.arguments.type'), 'both')
     .option('-o, --output <dir>', t('commands.init.options.output'), './.context')
-    .option('--docs <keys...>', t('commands.init.options.docs'))
-    .option('--agents <keys...>', t('commands.init.options.agents'))
-    .option('--exclude <patterns...>', t('commands.init.options.exclude'))
-    .option('--include <patterns...>', t('commands.init.options.include'))
-    .option('-v, --verbose', t('commands.init.options.verbose'))
-    .action(async (repoPath, type, options) => {
-    try {
-        await runInit(repoPath, type, options);
-    }
-    catch (error) {
-        ui.displayError(t('errors.init.scaffoldFailed'), error);
-        process.exit(1);
-    }
-});
-program
-    .command('scaffold')
-    .description(t('commands.scaffold.description'))
-    .argument('<repo-path>', t('commands.init.arguments.repoPath'))
-    .argument('[type]', t('commands.init.arguments.type'), 'both')
-    .option('-o, --output <dir>', t('commands.init.options.output'), './.context')
-    .option('--docs <keys...>', t('commands.init.options.docs'))
-    .option('--agents <keys...>', t('commands.init.options.agents'))
     .option('--exclude <patterns...>', t('commands.init.options.exclude'))
     .option('--include <patterns...>', t('commands.init.options.include'))
     .option('-v, --verbose', t('commands.init.options.verbose'))
     .action(async (repoPath, type, options) => {
     try {
-        await runInit(repoPath, type, options);
+        await initService.run(repoPath, type, options);
     }
     catch (error) {
         ui.displayError(t('errors.init.scaffoldFailed'), error);
@@ -155,17 +136,13 @@ program
     .option('-p, --provider <provider>', t('commands.fill.options.provider'))
     .option('--base-url <url>', t('commands.fill.options.baseUrl'))
     .option('--prompt <file>', t('commands.fill.options.prompt'))
-    .option('--dry-run', t('commands.fill.options.dryRun'), false)
-    .option('--all', t('commands.fill.options.all'), false)
     .option('--limit <number>', t('commands.fill.options.limit'), (value) => parseInt(value, 10))
-    .option('--docs <keys...>', t('commands.fill.options.docs'))
-    .option('--agents <keys...>', t('commands.fill.options.agents'))
     .option('--exclude <patterns...>', t('commands.fill.options.exclude'))
     .option('--include <patterns...>', t('commands.fill.options.include'))
     .option('-v, --verbose', t('commands.fill.options.verbose'))
     .action(async (repoPath, options) => {
     try {
-        await runLlmFill(repoPath, options);
+        await fillService.run(repoPath, options);
     }
     catch (error) {
         ui.displayError(t('errors.fill.failed'), error);
@@ -179,8 +156,6 @@ program
     .option('-o, --output <dir>', t('commands.plan.options.output'), './.context')
     .option('--title <title>', t('commands.plan.options.title'))
     .option('--summary <text>', t('commands.plan.options.summary'))
-    .option('--agents <types...>', t('commands.plan.options.agents'))
-    .option('--docs <keys...>', t('commands.plan.options.docs'))
     .option('-f, --force', t('commands.plan.options.force'))
     .option('--fill', t('commands.plan.options.fill'))
     .option('-r, --repo <path>', t('commands.plan.options.repo'))
@@ -194,26 +169,16 @@ program
     .option('--exclude <patterns...>', t('commands.plan.options.exclude'))
     .option('-v, --verbose', t('commands.plan.options.verbose'))
     .action(async (planName, rawOptions) => {
-    const agentSelection = parseAgentSelection(rawOptions.agents);
-    if (agentSelection.invalid.length > 0) {
-        ui.displayWarning(t('warnings.agents.unknown', { values: agentSelection.invalid.join(', ') }));
-    }
-    const docSelection = parseDocSelection(rawOptions.docs);
-    if (docSelection.invalid.length > 0) {
-        ui.displayWarning(t('warnings.docs.unknown', { values: docSelection.invalid.join(', ') }));
-    }
     const outputDir = path.resolve(rawOptions.output || './.context');
     if (rawOptions.fill) {
         try {
-            await scaffoldPlanIfNeeded(planName, outputDir, {
+            await planService.scaffoldPlanIfNeeded(planName, outputDir, {
                 title: rawOptions.title,
                 summary: rawOptions.summary,
-                agentSelection,
-                docSelection,
                 force: Boolean(rawOptions.force),
                 verbose: Boolean(rawOptions.verbose)
             });
-            await runPlanFill(planName, { ...rawOptions, output: outputDir });
+            await planService.fillPlan(planName, { ...rawOptions, output: outputDir });
         }
         catch (error) {
             ui.displayError(t('errors.plan.fillFailed'), error);
@@ -229,8 +194,6 @@ program
             outputDir,
             title: rawOptions.title,
             summary: rawOptions.summary,
-            selectedAgentTypes: agentSelection.explicitNone ? null : agentSelection.selected,
-            selectedDocKeys: docSelection.explicitNone ? null : docSelection.selected,
             force: Boolean(rawOptions.force),
             verbose: Boolean(rawOptions.verbose)
         });
@@ -247,90 +210,15 @@ program
     }
 });
 async function runInit(repoPath, type, rawOptions) {
-    const resolvedType = resolveScaffoldType(type, rawOptions);
-    const docSelection = parseDocSelection(rawOptions.docs);
-    const agentSelection = parseAgentSelection(rawOptions.agents);
-    if (docSelection.invalid.length > 0) {
-        ui.displayWarning(t('warnings.docs.unknown', { values: docSelection.invalid.join(', ') }));
-    }
-    if (agentSelection.invalid.length > 0) {
-        ui.displayWarning(t('warnings.agents.unknown', { values: agentSelection.invalid.join(', ') }));
-    }
-    const options = {
-        repoPath: path.resolve(repoPath),
-        outputDir: path.resolve(rawOptions.output || './.context'),
-        include: rawOptions.include,
-        exclude: rawOptions.exclude || [],
-        verbose: rawOptions.verbose || false,
-        scaffoldDocs: shouldGenerateDocs(resolvedType, docSelection),
-        scaffoldAgents: shouldGenerateAgents(resolvedType, agentSelection),
-        selectedDocKeys: docSelection.selected,
-        selectedAgentTypes: agentSelection.selected
-    };
-    if (!options.scaffoldDocs && !options.scaffoldAgents) {
-        ui.displayWarning(t('warnings.scaffold.noneSelected'));
-        return;
-    }
-    await ensurePaths(options);
-    ui.displayWelcome(VERSION);
-    ui.displayProjectInfo(options.repoPath, options.outputDir, resolvedType);
-    const fileMapper = new fileMapper_1.FileMapper(options.exclude);
-    ui.displayStep(1, 3, t('steps.init.analyze'));
-    ui.startSpinner(t('spinner.repo.scanning'));
-    const repoStructure = await fileMapper.mapRepository(options.repoPath, options.include);
-    ui.updateSpinner(t('spinner.repo.scanComplete', {
-        fileCount: repoStructure.totalFiles,
-        directoryCount: repoStructure.directories.length
-    }), 'success');
-    let docsGenerated = 0;
-    let agentsGenerated = 0;
-    const docGenerator = new documentationGenerator_1.DocumentationGenerator();
-    const agentGenerator = new agentGenerator_1.AgentGenerator();
-    if (options.scaffoldDocs) {
-        ui.displayStep(2, 3, t('steps.init.docs'));
-        ui.startSpinner(t('spinner.docs.creating'));
-        docsGenerated = await docGenerator.generateDocumentation(repoStructure, options.outputDir, { selectedDocs: options.selectedDocKeys }, options.verbose);
-        ui.updateSpinner(t('spinner.docs.created', { count: docsGenerated }), 'success');
-    }
-    if (options.scaffoldAgents) {
-        ui.displayStep(3, options.scaffoldDocs ? 3 : 2, t('steps.init.agents'));
-        ui.startSpinner(t('spinner.agents.creating'));
-        agentsGenerated = await agentGenerator.generateAgentPrompts(repoStructure, options.outputDir, options.selectedAgentTypes, options.verbose);
-        ui.updateSpinner(t('spinner.agents.created', { count: agentsGenerated }), 'success');
-    }
-    ui.displayGenerationSummary(docsGenerated, agentsGenerated);
-    ui.displaySuccess(t('success.scaffold.ready', { path: chalk_1.default.cyan(options.outputDir) }));
-}
-function resolveScaffoldType(type, rawOptions) {
-    const normalized = (type || 'both').toLowerCase();
-    const allowed = ['docs', 'agents', 'both'];
-    if (!allowed.includes(normalized)) {
-        throw new Error(t('errors.init.invalidType', { value: type, allowed: allowed.join(', ') }));
-    }
-    if (rawOptions.docsOnly) {
-        return 'docs';
-    }
-    if (rawOptions.agentsOnly) {
-        return 'agents';
-    }
-    return normalized;
-}
-async function ensurePaths(options) {
-    const exists = await fs.pathExists(options.repoPath);
-    if (!exists) {
-        throw new Error(t('errors.common.repoMissing', { path: options.repoPath }));
-    }
-    await fs.ensureDir(options.outputDir);
+    await initService.run(repoPath, type, rawOptions);
 }
 async function runGenerate(repoPath, options) {
     const type = options?.docsOnly ? 'docs' : options?.agentsOnly ? 'agents' : (options?.type || 'both');
-    await runInit(repoPath, type, {
+    await initService.run(repoPath, type, {
         output: options?.output ?? options?.outputDir ?? './.context',
         include: options?.include,
         exclude: options?.exclude,
         verbose: options?.verbose,
-        docs: options?.docs,
-        agents: options?.agents,
         docsOnly: options?.docsOnly,
         agentsOnly: options?.agentsOnly
     });
@@ -347,621 +235,8 @@ async function runPreview(..._args) {
 async function runGuidelines(..._args) {
     throw new Error(t('errors.commands.guidelinesRemoved'));
 }
-async function resolveLlmConfig(rawOptions, defaults) {
-    const providerEnvMap = llmClientFactory_1.LLMClientFactory.getEnvironmentVariables();
-    const defaultModels = llmClientFactory_1.LLMClientFactory.getDefaultModels();
-    let provider = rawOptions.provider;
-    let model = rawOptions.model;
-    let apiKey = rawOptions.apiKey;
-    if (!apiKey) {
-        if (provider) {
-            for (const envVar of providerEnvMap[provider]) {
-                const value = process.env[envVar];
-                if (value) {
-                    apiKey = value;
-                    break;
-                }
-            }
-        }
-        else {
-            outer: for (const [prov, envVars] of Object.entries(providerEnvMap)) {
-                for (const envVar of envVars) {
-                    const value = process.env[envVar];
-                    if (value) {
-                        apiKey = value;
-                        provider = prov;
-                        break outer;
-                    }
-                }
-            }
-        }
-    }
-    if (!provider) {
-        if (model) {
-            provider = llmClientFactory_1.LLMClientFactory.detectProviderFromModel(model);
-        }
-        else if (apiKey) {
-            provider = llmClientFactory_1.LLMClientFactory.getProviderFromApiKey(apiKey);
-        }
-    }
-    if (!model) {
-        if (provider === 'openrouter' && process.env.OPENROUTER_MODEL) {
-            model = process.env.OPENROUTER_MODEL;
-        }
-        else if (provider && defaultModels[provider]?.length) {
-            model = defaultModels[provider][0];
-        }
-        else {
-            model = defaults.fallbackModel;
-            provider = llmClientFactory_1.LLMClientFactory.detectProviderFromModel(model);
-        }
-    }
-    if (!provider) {
-        provider = llmClientFactory_1.LLMClientFactory.detectProviderFromModel(model || defaults.fallbackModel);
-    }
-    if (!apiKey) {
-        for (const envVar of providerEnvMap[provider]) {
-            const value = process.env[envVar];
-            if (value) {
-                apiKey = value;
-                break;
-            }
-        }
-    }
-    if (!apiKey) {
-        const envVars = providerEnvMap[provider];
-        throw new Error(t('errors.fill.apiKeyMissing', {
-            provider: provider.toUpperCase(),
-            envVars: envVars.join(', ')
-        }));
-    }
-    return {
-        provider,
-        model: model || defaults.fallbackModel,
-        apiKey,
-        baseUrl: rawOptions.baseUrl
-    };
-}
 async function runLlmFill(repoPath, rawOptions) {
-    const resolvedRepo = path.resolve(repoPath);
-    const outputDir = path.resolve(rawOptions.output || './.context');
-    const docsDir = path.join(outputDir, 'docs');
-    const agentsDir = path.join(outputDir, 'agents');
-    await ensureDirectoryExists(docsDir, t('errors.fill.missingDocsScaffold'));
-    await ensureDirectoryExists(agentsDir, t('errors.fill.missingAgentsScaffold'));
-    const docSelection = parseDocSelection(rawOptions.docs);
-    const agentSelection = parseAgentSelection(rawOptions.agents);
-    if (docSelection.invalid.length > 0) {
-        ui.displayWarning(t('warnings.docs.unknown', { values: docSelection.invalid.join(', ') }));
-    }
-    if (agentSelection.invalid.length > 0) {
-        ui.displayWarning(t('warnings.agents.unknown', { values: agentSelection.invalid.join(', ') }));
-    }
-    const { provider, model, apiKey, baseUrl } = await resolveLlmConfig(rawOptions, {
-        fallbackModel: DEFAULT_MODEL
-    });
-    const scaffoldPrompt = await (0, promptLoader_1.resolveScaffoldPrompt)(rawOptions.prompt, missingPath => t('errors.fill.promptMissing', { path: missingPath }));
-    const docAllowlist = docSelection.explicitNone
-        ? new Set()
-        : (0, guideRegistry_1.getDocFilesByKeys)(docSelection.selected);
-    const agentAllowlist = agentSelection.explicitNone
-        ? new Set()
-        : getAgentFilesByTypes(agentSelection.selected);
-    const options = {
-        repoPath: resolvedRepo,
-        outputDir,
-        provider,
-        model,
-        apiKey,
-        baseUrl,
-        include: rawOptions.include,
-        exclude: rawOptions.exclude,
-        verbose: rawOptions.verbose || false,
-        dryRun: rawOptions.dryRun || false,
-        processAll: rawOptions.all || false,
-        limit: rawOptions.limit,
-        selectedDocKeys: docSelection.selected,
-        selectedAgentTypes: agentSelection.selected,
-        selectedDocFiles: docAllowlist,
-        selectedAgentFiles: agentAllowlist
-    };
-    const scaffoldPromptDisplayPath = scaffoldPrompt.path
-        ? path.relative(process.cwd(), scaffoldPrompt.path) || scaffoldPrompt.path
-        : undefined;
-    if (scaffoldPrompt.source === 'custom' && scaffoldPromptDisplayPath) {
-        ui.displayInfo(t('info.prompt.title'), t('info.prompt.usingCustom', { path: scaffoldPromptDisplayPath }));
-    }
-    else if (scaffoldPrompt.source === 'package' && scaffoldPromptDisplayPath) {
-        ui.displayInfo(t('info.prompt.title'), t('info.prompt.usingPackage', { path: scaffoldPromptDisplayPath }));
-    }
-    else {
-        ui.displayInfo(t('info.prompt.title'), t('info.prompt.usingBundled'));
-    }
-    ui.displayWelcome(VERSION);
-    ui.displayProjectInfo(options.repoPath, options.outputDir, `fill:${options.provider}`);
-    const fileMapper = new fileMapper_1.FileMapper(options.exclude);
-    ui.displayStep(1, 3, t('steps.fill.analyze'));
-    ui.startSpinner(t('spinner.repo.scanning'));
-    const repoStructure = await fileMapper.mapRepository(options.repoPath, options.include);
-    ui.updateSpinner(t('spinner.repo.scanComplete', {
-        fileCount: repoStructure.totalFiles,
-        directoryCount: repoStructure.directories.length
-    }), 'success');
-    const systemPrompt = scaffoldPrompt.content;
-    const llmClient = llmClientFactory_1.LLMClientFactory.createClient({
-        apiKey: options.apiKey,
-        model: options.model,
-        provider: options.provider,
-        baseUrl: options.baseUrl
-    });
-    const targets = await collectTargets(docsDir, agentsDir, options.processAll, options.limit, options.selectedDocFiles, options.selectedAgentFiles);
-    if (targets.length === 0) {
-        ui.displayWarning(t('warnings.fill.noTargets'));
-        return;
-    }
-    const contextSummary = buildContextSummary(repoStructure);
-    const results = [];
-    ui.displayStep(2, 3, t('steps.fill.processFiles', { count: targets.length, model: options.model }));
-    for (const target of targets) {
-        const relativePath = path.relative(options.outputDir, target.fullPath);
-        ui.startSpinner(t('spinner.fill.processing', { path: relativePath }));
-        try {
-            const currentContent = await fs.readFile(target.fullPath, 'utf-8');
-            const userPrompt = buildUserPrompt(relativePath, currentContent, contextSummary, target.isAgent);
-            const updatedContent = await llmClient.generateText(userPrompt, systemPrompt);
-            if (!updatedContent || !updatedContent.trim()) {
-                ui.updateSpinner(t('spinner.fill.noContent', { path: relativePath }), 'warn');
-                results.push({ file: relativePath, status: 'skipped', message: t('messages.fill.emptyResponse') });
-                continue;
-            }
-            if (options.dryRun) {
-                ui.updateSpinner(t('spinner.fill.dryRunPreview', { path: relativePath }), 'info');
-                console.log(chalk_1.default.gray(`\n${t('messages.fill.previewStart')}`));
-                console.log(updatedContent.trim());
-                console.log(chalk_1.default.gray(`${t('messages.fill.previewEnd')}\n`));
-            }
-            else {
-                await fs.writeFile(target.fullPath, ensureTrailingNewline(updatedContent));
-                ui.updateSpinner(t('spinner.fill.updated', { path: relativePath }), 'success');
-            }
-            results.push({ file: relativePath, status: options.dryRun ? 'skipped' : 'updated' });
-        }
-        catch (error) {
-            ui.updateSpinner(t('spinner.fill.failed', { path: relativePath }), 'fail');
-            results.push({
-                file: relativePath,
-                status: 'failed',
-                message: error instanceof Error ? error.message : String(error)
-            });
-        }
-    }
-    ui.displayStep(3, 3, t('steps.fill.summary'));
-    printLlmSummary(llmClient.getUsageStats(), results, options.dryRun);
-    ui.displaySuccess(t('success.fill.completed'));
-}
-async function scaffoldPlanIfNeeded(planName, outputDir, options) {
-    const resolvedOutput = path.resolve(outputDir);
-    const plansDir = path.join(resolvedOutput, 'plans');
-    const normalizedInput = planName.replace(/\.md$/i, '');
-    const slug = shared_1.GeneratorUtils.slugify(normalizedInput);
-    if (!slug) {
-        throw new Error(t('errors.plan.invalidName'));
-    }
-    const planPath = path.join(plansDir, `${slug}.md`);
-    const planExists = await fs.pathExists(planPath);
-    if (planExists && !options.force) {
-        return;
-    }
-    const generator = new planGenerator_1.PlanGenerator();
-    const result = await generator.generatePlan({
-        planName,
-        outputDir: resolvedOutput,
-        title: options.title,
-        summary: options.summary,
-        selectedAgentTypes: options.agentSelection
-            ? options.agentSelection.explicitNone
-                ? null
-                : options.agentSelection.selected
-            : undefined,
-        selectedDocKeys: options.docSelection
-            ? options.docSelection.explicitNone
-                ? null
-                : options.docSelection.selected
-            : undefined,
-        force: Boolean(options.force),
-        verbose: Boolean(options.verbose)
-    });
-    const relativePath = result.relativePath;
-    const message = planExists && options.force
-        ? t('messages.plan.regenerated', { path: relativePath })
-        : t('messages.plan.created', { path: relativePath });
-    ui.displayInfo(t('info.plan.scaffolded.title'), message);
-}
-async function runPlanFill(planName, rawOptions) {
-    const outputDir = path.resolve(rawOptions.output || './.context');
-    const plansDir = path.join(outputDir, 'plans');
-    await ensureDirectoryExists(plansDir, t('errors.plan.missingPlansDir'));
-    const normalizedInput = planName.replace(/\.md$/i, '');
-    const slug = shared_1.GeneratorUtils.slugify(normalizedInput);
-    if (!slug) {
-        throw new Error(t('errors.plan.invalidName'));
-    }
-    const candidateFiles = new Set();
-    candidateFiles.add(path.join(plansDir, `${slug}.md`));
-    if (planName.toLowerCase().endsWith('.md')) {
-        candidateFiles.add(path.join(plansDir, planName));
-    }
-    let planPath;
-    for (const candidate of candidateFiles) {
-        if (await fs.pathExists(candidate)) {
-            planPath = candidate;
-            break;
-        }
-    }
-    if (!planPath) {
-        const expected = Array.from(candidateFiles).map(file => path.relative(process.cwd(), file)).join(' or ');
-        throw new Error(t('errors.plan.notFound', { expected }));
-    }
-    const docsDir = path.join(outputDir, 'docs');
-    const agentsDir = path.join(outputDir, 'agents');
-    await ensureDirectoryExists(docsDir, t('errors.fill.missingDocsScaffold'));
-    await ensureDirectoryExists(agentsDir, t('errors.fill.missingAgentsScaffold'));
-    const repoPath = path.resolve(rawOptions.repo || process.cwd());
-    if (!(await fs.pathExists(repoPath))) {
-        throw new Error(t('errors.common.repoMissing', { path: repoPath }));
-    }
-    const { provider, model, apiKey, baseUrl } = await resolveLlmConfig(rawOptions, {
-        fallbackModel: DEFAULT_MODEL
-    });
-    const planPrompt = await (0, promptLoader_1.resolvePlanPrompt)(rawOptions.prompt, missingPath => t('errors.fill.promptMissing', { path: missingPath }));
-    const planContent = await fs.readFile(planPath, 'utf-8');
-    const docsIndexPath = path.join(docsDir, 'README.md');
-    const agentsIndexPath = path.join(agentsDir, 'README.md');
-    const docsIndex = (await fs.pathExists(docsIndexPath)) ? await fs.readFile(docsIndexPath, 'utf-8') : undefined;
-    const agentsIndex = (await fs.pathExists(agentsIndexPath)) ? await fs.readFile(agentsIndexPath, 'utf-8') : undefined;
-    const referencedDocs = await loadReferencedMarkdown(docsDir, extractPlanReferences(planContent, 'docs'));
-    const referencedAgents = await loadReferencedMarkdown(agentsDir, extractPlanReferences(planContent, 'agents'));
-    const planPromptDisplayPath = planPrompt.path
-        ? path.relative(process.cwd(), planPrompt.path) || planPrompt.path
-        : undefined;
-    if (planPrompt.source === 'custom' && planPromptDisplayPath) {
-        ui.displayInfo(t('info.prompt.title'), t('info.prompt.usingCustom', { path: planPromptDisplayPath }));
-    }
-    else if (planPrompt.source === 'package' && planPromptDisplayPath) {
-        ui.displayInfo(t('info.prompt.title'), t('info.prompt.usingPackage', { path: planPromptDisplayPath }));
-    }
-    else {
-        ui.displayInfo(t('info.prompt.title'), t('info.prompt.usingBundled'));
-    }
-    ui.displayWelcome(VERSION);
-    ui.displayProjectInfo(repoPath, outputDir, `plan-fill:${provider}`);
-    const fileMapper = new fileMapper_1.FileMapper(rawOptions.exclude);
-    ui.displayStep(1, 3, t('steps.plan.summary'));
-    ui.startSpinner(t('spinner.planFill.analyzingRepo'));
-    const repoStructure = await fileMapper.mapRepository(repoPath, rawOptions.include);
-    const contextSummary = buildContextSummary(repoStructure);
-    ui.updateSpinner(t('spinner.planFill.summaryReady'), 'success');
-    const systemPrompt = planPrompt.content;
-    const llmClient = llmClientFactory_1.LLMClientFactory.createClient({
-        apiKey,
-        model,
-        provider,
-        baseUrl
-    });
-    const planRelativePath = path.relative(outputDir, planPath);
-    const results = [];
-    ui.displayStep(2, 3, t('steps.plan.update', { path: planRelativePath, model }));
-    ui.startSpinner(t('spinner.planFill.updating', { path: planRelativePath }));
-    try {
-        const userPrompt = buildPlanUserPrompt({
-            relativePath: planRelativePath,
-            planContent,
-            contextSummary,
-            docsIndex,
-            agentsIndex,
-            docs: referencedDocs,
-            agents: referencedAgents
-        });
-        const updatedContent = await llmClient.generateText(userPrompt, systemPrompt);
-        if (!updatedContent || !updatedContent.trim()) {
-            ui.updateSpinner(t('spinner.planFill.noContent'), 'warn');
-            results.push({ file: planRelativePath, status: 'skipped', message: t('messages.fill.emptyResponse') });
-        }
-        else if (rawOptions.dryRun) {
-            ui.updateSpinner(t('spinner.planFill.dryRun'), 'info');
-            console.log(chalk_1.default.gray(`\n${t('messages.fill.previewStart')}`));
-            console.log(updatedContent.trim());
-            console.log(chalk_1.default.gray(`${t('messages.fill.previewEnd')}\n`));
-            results.push({ file: planRelativePath, status: 'skipped', message: 'dry-run' });
-        }
-        else {
-            await fs.writeFile(planPath, ensureTrailingNewline(updatedContent));
-            ui.updateSpinner(t('spinner.planFill.updated', { path: planRelativePath }), 'success');
-            results.push({ file: planRelativePath, status: 'updated' });
-        }
-    }
-    catch (error) {
-        ui.updateSpinner(t('spinner.planFill.failed'), 'fail');
-        results.push({
-            file: planRelativePath,
-            status: 'failed',
-            message: error instanceof Error ? error.message : String(error)
-        });
-    }
-    finally {
-        ui.stopSpinner();
-    }
-    ui.displayStep(3, 3, t('steps.plan.summaryResults'));
-    printLlmSummary(llmClient.getUsageStats(), results, Boolean(rawOptions.dryRun));
-    ui.displaySuccess(t('success.plan.filled'));
-}
-async function ensureDirectoryExists(dir, message) {
-    const exists = await fs.pathExists(dir);
-    if (!exists) {
-        throw new Error(message);
-    }
-}
-async function collectTargets(docsDir, agentsDir, processAll, limit, docAllowlist, agentAllowlist) {
-    const docFiles = await (0, glob_1.glob)('**/*.md', { cwd: docsDir, absolute: true });
-    const agentFiles = await (0, glob_1.glob)('**/*.md', { cwd: agentsDir, absolute: true });
-    const candidates = [...docFiles, ...agentFiles];
-    const targets = [];
-    for (const fullPath of candidates) {
-        const content = await fs.readFile(fullPath, 'utf-8');
-        const hasMarkers = /<!--\s*ai-task:/.test(content) || /<!--\s*ai-slot:/.test(content) || /TODO/.test(content);
-        const isAgent = fullPath.includes(`${path.sep}agents${path.sep}`);
-        const fileName = path.basename(fullPath);
-        if (isAgent) {
-            if (agentAllowlist && !agentAllowlist.has(fileName)) {
-                continue;
-            }
-        }
-        else {
-            if (docAllowlist && !docAllowlist.has(fileName)) {
-                continue;
-            }
-        }
-        const explicitSelection = isAgent ? !!agentAllowlist : !!docAllowlist;
-        const shouldInclude = processAll ||
-            hasMarkers ||
-            (explicitSelection && (isAgent ? agentAllowlist.has(fileName) : docAllowlist.has(fileName)));
-        if (!shouldInclude) {
-            continue;
-        }
-        targets.push({ fullPath, hasMarkers, isAgent });
-        if (limit && targets.length >= limit) {
-            break;
-        }
-    }
-    return targets;
-}
-function buildContextSummary(repoStructure) {
-    const directories = new Set();
-    repoStructure.directories.forEach(dir => {
-        const [first] = dir.relativePath.split(/[\\/]/).filter(Boolean);
-        if (first) {
-            directories.add(first);
-        }
-    });
-    const topDirs = Array.from(directories).sort().slice(0, 12);
-    const totalSizeMb = (repoStructure.totalSize / (1024 * 1024)).toFixed(2);
-    return [
-        `Top-level directories: ${topDirs.length ? topDirs.join(', ') : 'n/a'}`,
-        `Total files scanned: ${repoStructure.totalFiles}`,
-        `Repository size (approx.): ${totalSizeMb} MB`
-    ].join('\n');
-}
-function buildUserPrompt(relativePath, currentContent, contextSummary, isAgent) {
-    const guidance = [
-        '- Preserve YAML front matter and existing `ai-task` sections.',
-        '- Replace TODOs and resolve `ai-slot` placeholders with concrete information.',
-        '- Ensure success criteria in the front matter are satisfied.',
-        '- Return only the full updated Markdown for this file.'
-    ];
-    if (isAgent) {
-        guidance.push('- Keep agent responsibilities, best practices, and documentation touchpoints aligned with the latest docs.');
-    }
-    else {
-        guidance.push('- Maintain accurate cross-links between docs and referenced resources.');
-    }
-    return [
-        `Target file: ${relativePath}`,
-        'Repository summary:',
-        contextSummary,
-        '',
-        'Guidance:',
-        ...guidance,
-        '',
-        'Current content:',
-        '<file>',
-        currentContent,
-        '</file>'
-    ].join('\n');
-}
-function buildPlanUserPrompt(context) {
-    const guidance = [
-        '- Preserve the YAML front matter and `ai-task` wrapper already in the plan.',
-        '- Replace TODOs with concrete steps that align with the provided documentation and agent playbooks.',
-        '- Keep the Agent Lineup and Documentation Touchpoints tables accurate and sorted.',
-        '- Ensure the work is segmented into phases, each with numbered steps, named owners, deliverables, evidence expectations, and a concluding Git commit checkpoint.',
-        '- Return only the full updated Markdown for this plan.'
-    ];
-    const sections = [
-        `Target file: ${context.relativePath}`,
-        'Repository summary:',
-        context.contextSummary,
-        '',
-        'Guidance:',
-        ...guidance,
-        '',
-        'Current plan:',
-        '<plan>',
-        context.planContent,
-        '</plan>'
-    ];
-    if (context.docsIndex) {
-        sections.push('', 'Documentation index (docs/README.md):', '<docs-index>', context.docsIndex, '</docs-index>');
-    }
-    if (context.agentsIndex) {
-        sections.push('', 'Agent handbook (agents/README.md):', '<agents-index>', context.agentsIndex, '</agents-index>');
-    }
-    context.docs.forEach(doc => {
-        sections.push('', `Referenced documentation (${doc.path}):`, '<doc>', doc.content, '</doc>');
-    });
-    context.agents.forEach(agent => {
-        sections.push('', `Referenced agent playbook (${agent.path}):`, '<agent>', agent.content, '</agent>');
-    });
-    return sections.join('\n');
-}
-function extractPlanReferences(content, type) {
-    const regex = type === 'docs'
-        ? /\]\(\.\.\/docs\/([^)#]+)(?:#[^)]*)?\)/g
-        : /\]\(\.\.\/agents\/([^)#]+)(?:#[^)]*)?\)/g;
-    const references = [];
-    let match;
-    while ((match = regex.exec(content)) !== null) {
-        const rawPath = match[1].trim();
-        if (!rawPath)
-            continue;
-        const normalized = rawPath.replace(/^\.\//, '').replace(/#.*$/, '');
-        if (!normalized || normalized.includes('..'))
-            continue;
-        if (!references.includes(normalized)) {
-            references.push(normalized);
-        }
-    }
-    return references;
-}
-async function loadReferencedMarkdown(baseDir, fileNames) {
-    const results = [];
-    const seen = new Set();
-    for (const name of fileNames) {
-        const cleanName = name.replace(/#.*$/, '');
-        if (!cleanName || seen.has(cleanName)) {
-            continue;
-        }
-        const normalized = path.normalize(cleanName).replace(/^\.\//, '');
-        if (normalized.includes('..')) {
-            continue;
-        }
-        const fullPath = path.join(baseDir, normalized);
-        if (!(await fs.pathExists(fullPath))) {
-            continue;
-        }
-        const content = await fs.readFile(fullPath, 'utf-8');
-        results.push({ path: normalized, content });
-        seen.add(cleanName);
-    }
-    return results;
-}
-function ensureTrailingNewline(content) {
-    return content.endsWith('\n') ? content : `${content}\n`;
-}
-function printLlmSummary(usage, results, dryRun) {
-    const updated = results.filter(r => r.status === 'updated').length;
-    const skipped = results.filter(r => r.status === 'skipped').length;
-    const failed = results.filter(r => r.status === 'failed');
-    console.log('\n' + chalk_1.default.bold('📄 LLM Fill Summary'));
-    console.log(chalk_1.default.gray('─'.repeat(50)));
-    console.log(`${chalk_1.default.blue('Updated files:')} ${chalk_1.default.white(updated.toString())}`);
-    console.log(`${chalk_1.default.blue('Skipped files:')} ${chalk_1.default.white(skipped.toString())}${dryRun ? chalk_1.default.gray(' (dry run)') : ''}`);
-    console.log(`${chalk_1.default.blue('Failures:')} ${failed.length}`);
-    if (usage.totalCalls > 0) {
-        console.log(chalk_1.default.gray('─'.repeat(50)));
-        console.log(`${chalk_1.default.blue('LLM calls:')} ${usage.totalCalls}`);
-        console.log(`${chalk_1.default.blue('Prompt tokens:')} ${usage.totalPromptTokens}`);
-        console.log(`${chalk_1.default.blue('Completion tokens:')} ${usage.totalCompletionTokens}`);
-        console.log(`${chalk_1.default.blue('Estimated cost:')} ${usage.estimatedCost.toFixed(4)}`);
-        console.log(`${chalk_1.default.blue('Model:')} ${usage.model}`);
-    }
-    if (failed.length > 0) {
-        console.log(chalk_1.default.gray('─'.repeat(50)));
-        failed.forEach(f => {
-            console.log(`${chalk_1.default.red('✖')} ${chalk_1.default.white(f.file)} — ${chalk_1.default.gray(f.message || 'Unknown error')}`);
-        });
-    }
-}
-function parseDocSelection(input) {
-    if (input === undefined) {
-        return { selected: undefined, invalid: [], provided: false, explicitNone: false };
-    }
-    if (Array.isArray(input) && input.length === 0) {
-        return { selected: [], invalid: [], provided: true, explicitNone: true };
-    }
-    const values = toStringArray(input);
-    const normalized = values.map(value => value.toLowerCase().replace(/\.md$/, ''));
-    const valid = Array.from(new Set(normalized.filter(key => guideRegistry_1.DOCUMENT_GUIDE_KEYS.includes(key))));
-    const invalid = normalized.filter(key => !guideRegistry_1.DOCUMENT_GUIDE_KEYS.includes(key));
-    if (values.length > 0 && valid.length === 0 && invalid.length > 0) {
-        return { selected: undefined, invalid, provided: true, explicitNone: false };
-    }
-    return { selected: valid.length > 0 ? valid : undefined, invalid, provided: true, explicitNone: false };
-}
-function parseAgentSelection(input) {
-    if (input === undefined) {
-        return { selected: undefined, invalid: [], provided: false, explicitNone: false };
-    }
-    if (Array.isArray(input) && input.length === 0) {
-        return { selected: [], invalid: [], provided: true, explicitNone: true };
-    }
-    const values = toStringArray(input);
-    const normalized = values.map(value => value.toLowerCase().replace(/\.md$/, ''));
-    const allowed = new Set(agentTypes_1.AGENT_TYPES);
-    const valid = Array.from(new Set(normalized.filter(value => allowed.has(value))));
-    const invalid = normalized.filter(value => !allowed.has(value));
-    if (values.length > 0 && valid.length === 0 && invalid.length > 0) {
-        return { selected: undefined, invalid, provided: true, explicitNone: false };
-    }
-    return { selected: valid.length > 0 ? valid : undefined, invalid, provided: true, explicitNone: false };
-}
-function shouldGenerateDocs(resolvedType, selection) {
-    if (selection.explicitNone) {
-        return false;
-    }
-    if (resolvedType === 'agents') {
-        return false;
-    }
-    if (!selection.provided) {
-        return resolvedType === 'docs' || resolvedType === 'both';
-    }
-    if (selection.selected && selection.selected.length === 0) {
-        return false;
-    }
-    return resolvedType === 'docs' || resolvedType === 'both';
-}
-function shouldGenerateAgents(resolvedType, selection) {
-    if (selection.explicitNone) {
-        return false;
-    }
-    if (resolvedType === 'docs') {
-        return false;
-    }
-    if (!selection.provided) {
-        return resolvedType === 'agents' || resolvedType === 'both';
-    }
-    if (selection.selected && selection.selected.length === 0) {
-        return false;
-    }
-    return resolvedType === 'agents' || resolvedType === 'both';
-}
-function toStringArray(input) {
-    if (Array.isArray(input)) {
-        return input.map(item => item.toString().trim()).filter(Boolean);
-    }
-    if (input === null || input === undefined) {
-        return [];
-    }
-    return input
-        .toString()
-        .split(',')
-        .map((part) => part.trim())
-        .filter(Boolean);
-}
-function formatAgentLabel(value) {
-    return value
-        .split('-')
-        .map(segment => segment.charAt(0).toUpperCase() + segment.slice(1))
-        .join(' ');
+    await fillService.run(repoPath, rawOptions);
 }
 async function selectLocale(showWelcome) {
     const { locale } = await inquirer_1.default.prompt([
@@ -1041,58 +316,19 @@ async function runInteractiveScaffold() {
             default: defaultOutput
         }
     ]);
-    const { includeDocs } = await inquirer_1.default.prompt([
+    const { scaffoldType } = await inquirer_1.default.prompt([
         {
-            type: 'confirm',
-            name: 'includeDocs',
-            message: t('prompts.scaffold.includeDocs'),
-            default: true
-        }
-    ]);
-    let selectedDocs;
-    if (includeDocs) {
-        const { docs } = await inquirer_1.default.prompt([
-            {
-                type: 'checkbox',
-                name: 'docs',
-                message: t('prompts.scaffold.selectDocs'),
-                choices: DOC_CHOICES,
-                default: DOC_CHOICES.map(choice => choice.value)
-            }
-        ]);
-        selectedDocs = docs;
-    }
-    else {
-        selectedDocs = [];
-    }
-    const { includeAgents } = await inquirer_1.default.prompt([
-        {
-            type: 'confirm',
-            name: 'includeAgents',
-            message: t('prompts.scaffold.includeAgents'),
-            default: true
+            type: 'list',
+            name: 'scaffoldType',
+            message: t('prompts.scaffold.type'),
+            choices: [
+                { name: t('prompts.scaffold.typeBoth'), value: 'both' },
+                { name: t('prompts.scaffold.typeDocs'), value: 'docs' },
+                { name: t('prompts.scaffold.typeAgents'), value: 'agents' }
+            ],
+            default: 'both'
         }
     ]);
-    let selectedAgents;
-    if (includeAgents) {
-        const { agents } = await inquirer_1.default.prompt([
-            {
-                type: 'checkbox',
-                name: 'agents',
-                message: t('prompts.scaffold.selectAgents'),
-                choices: AGENT_CHOICES,
-                default: AGENT_CHOICES.map(choice => choice.value)
-            }
-        ]);
-        selectedAgents = agents;
-    }
-    else {
-        selectedAgents = [];
-    }
-    if ((selectedDocs?.length ?? 0) === 0 && (selectedAgents?.length ?? 0) === 0) {
-        ui.displayWarning(t('warnings.interactive.nothingSelected'));
-        return;
-    }
     const { verbose } = await inquirer_1.default.prompt([
         {
             type: 'confirm',
@@ -1101,23 +337,11 @@ async function runInteractiveScaffold() {
             default: false
         }
     ]);
-    const scaffoldType = determineScaffoldType(selectedDocs, selectedAgents);
     await runInit(resolvedRepo, scaffoldType, {
         output: outputDir,
-        docs: selectedDocs,
-        agents: selectedAgents,
         verbose
     });
 }
-function determineScaffoldType(docSelection, agentSelection) {
-    const docsSelected = docSelection === undefined ? true : docSelection.length > 0;
-    const agentsSelected = agentSelection === undefined ? true : agentSelection.length > 0;
-    if (docsSelected && agentsSelected)
-        return 'both';
-    if (docsSelected)
-        return 'docs';
-    return 'agents';
-}
 async function runInteractiveLlmFill() {
     const { repoPath } = await inquirer_1.default.prompt([
         {
@@ -1144,20 +368,6 @@ async function runInteractiveLlmFill() {
         }
     ]);
     const promptPath = promptPathInput.trim() ? path.resolve(promptPathInput.trim()) : undefined;
-    const { dryRun, processAll } = await inquirer_1.default.prompt([
-        {
-            type: 'confirm',
-            name: 'dryRun',
-            message: t('prompts.fill.dryRun'),
-            default: true
-        },
-        {
-            type: 'confirm',
-            name: 'processAll',
-            message: t('prompts.fill.processAll'),
-            default: false
-        }
-    ]);
     const { limit } = await inquirer_1.default.prompt([
         {
             type: 'input',
@@ -1168,58 +378,6 @@ async function runInteractiveLlmFill() {
     ]);
     const limitValue = limit ? parseInt(limit, 10) : undefined;
     const parsedLimit = Number.isNaN(limitValue) ? undefined : limitValue;
-    const { includeDocs } = await inquirer_1.default.prompt([
-        {
-            type: 'confirm',
-            name: 'includeDocs',
-            message: t('prompts.fill.includeDocs'),
-            default: true
-        }
-    ]);
-    let selectedDocs;
-    if (includeDocs) {
-        const { docs } = await inquirer_1.default.prompt([
-            {
-                type: 'checkbox',
-                name: 'docs',
-                message: t('prompts.fill.selectDocs'),
-                choices: DOC_CHOICES,
-                default: DOC_CHOICES.map(choice => choice.value)
-            }
-        ]);
-        selectedDocs = docs;
-    }
-    else {
-        selectedDocs = [];
-    }
-    const { includeAgents } = await inquirer_1.default.prompt([
-        {
-            type: 'confirm',
-            name: 'includeAgents',
-            message: t('prompts.fill.includeAgents'),
-            default: true
-        }
-    ]);
-    let selectedAgents;
-    if (includeAgents) {
-        const { agents } = await inquirer_1.default.prompt([
-            {
-                type: 'checkbox',
-                name: 'agents',
-                message: t('prompts.fill.selectAgents'),
-                choices: AGENT_CHOICES,
-                default: AGENT_CHOICES.map(choice => choice.value)
-            }
-        ]);
-        selectedAgents = agents;
-    }
-    else {
-        selectedAgents = [];
-    }
-    if ((selectedDocs?.length ?? 0) === 0 && (selectedAgents?.length ?? 0) === 0) {
-        ui.displayWarning(t('warnings.interactive.nothingSelected'));
-        return;
-    }
     const { specifyModel } = await inquirer_1.default.prompt([
         {
             type: 'confirm',
@@ -1231,15 +389,6 @@ async function runInteractiveLlmFill() {
     let provider;
     let model;
     if (specifyModel) {
-        const providerAnswer = await inquirer_1.default.prompt([
-            {
-                type: 'list',
-                name: 'provider',
-                message: t('prompts.fill.provider'),
-                choices: ['openrouter', 'openai', 'anthropic', 'gemini', 'grok']
-            }
-        ]);
-        provider = providerAnswer.provider;
         const modelAnswer = await inquirer_1.default.prompt([
             {
                 type: 'input',
@@ -1249,6 +398,7 @@ async function runInteractiveLlmFill() {
             }
         ]);
         model = modelAnswer.model.trim();
+        provider = 'openrouter';
     }
     const { provideApiKey } = await inquirer_1.default.prompt([
         {
@@ -1278,13 +428,9 @@ async function runInteractiveLlmFill() {
             default: false
         }
     ]);
-    await runLlmFill(resolvedRepo, {
+    await fillService.run(resolvedRepo, {
         output: outputDir,
         prompt: promptPath,
-        docs: selectedDocs,
-        agents: selectedAgents,
-        dryRun,
-        all: processAll,
         limit: parsedLimit,
         model,
         provider,
@@ -1331,50 +477,6 @@ async function runInteractivePlan() {
                 filter: (value) => value.trim()
             }
         ]);
-        const { includeAgents } = await inquirer_1.default.prompt([
-            {
-                type: 'confirm',
-                name: 'includeAgents',
-                message: t('prompts.plan.includeAgents'),
-                default: true
-            }
-        ]);
-        let selectedAgents = [];
-        if (includeAgents) {
-            const { agents } = await inquirer_1.default.prompt([
-                {
-                    type: 'checkbox',
-                    name: 'agents',
-                    message: t('prompts.plan.selectAgents'),
-                    choices: AGENT_CHOICES,
-                    default: AGENT_CHOICES.map(choice => choice.value)
-                }
-            ]);
-            selectedAgents = agents;
-        }
-        const { includeDocs } = await inquirer_1.default.prompt([
-            {
-                type: 'confirm',
-                name: 'includeDocs',
-                message: t('prompts.plan.includeDocs'),
-                default: true
-            }
-        ]);
-        let selectedDocs = [];
-        if (includeDocs) {
-            const { docs } = await inquirer_1.default.prompt([
-                {
-                    type: 'checkbox',
-                    name: 'docs',
-                    message: t('prompts.plan.selectDocs'),
-                    choices: DOC_CHOICES,
-                    default: DOC_CHOICES.map(choice => choice.value)
-                }
-            ]);
-            selectedDocs = docs;
-        }
-        const agentSelection = parseAgentSelection(selectedAgents);
-        const docSelection = parseDocSelection(selectedDocs);
         const { repoPath } = await inquirer_1.default.prompt([
             {
                 type: 'input',
@@ -1393,12 +495,10 @@ async function runInteractivePlan() {
         ]);
         try {
             const resolvedOutput = path.resolve(outputDir.trim() || defaultOutput);
-            await scaffoldPlanIfNeeded(planName, resolvedOutput, {
-                summary: summary || undefined,
-                agentSelection,
-                docSelection
+            await planService.scaffoldPlanIfNeeded(planName, resolvedOutput, {
+                summary: summary || undefined
             });
-            await runPlanFill(planName, {
+            await planService.fillPlan(planName, {
                 output: resolvedOutput,
                 repo: repoPath,
                 dryRun
@@ -1417,48 +517,6 @@ async function runInteractivePlan() {
             filter: (value) => value.trim()
         }
     ]);
-    const { includeAgents } = await inquirer_1.default.prompt([
-        {
-            type: 'confirm',
-            name: 'includeAgents',
-            message: t('prompts.plan.includeAgents'),
-            default: true
-        }
-    ]);
-    let selectedAgents = null;
-    if (includeAgents) {
-        const { agents } = await inquirer_1.default.prompt([
-            {
-                type: 'checkbox',
-                name: 'agents',
-                message: t('prompts.plan.selectAgents'),
-                choices: AGENT_CHOICES,
-                default: AGENT_CHOICES.map(choice => choice.value)
-            }
-        ]);
-        selectedAgents = agents.length > 0 ? agents : null;
-    }
-    const { includeDocs } = await inquirer_1.default.prompt([
-        {
-            type: 'confirm',
-            name: 'includeDocs',
-            message: t('prompts.plan.includeDocs'),
-            default: true
-        }
-    ]);
-    let selectedDocs = null;
-    if (includeDocs) {
-        const { docs } = await inquirer_1.default.prompt([
-            {
-                type: 'checkbox',
-                name: 'docs',
-                message: t('prompts.plan.selectDocs'),
-                choices: DOC_CHOICES,
-                default: DOC_CHOICES.map(choice => choice.value)
-            }
-        ]);
-        selectedDocs = docs.length > 0 ? docs : null;
-    }
     const generator = new planGenerator_1.PlanGenerator();
     ui.startSpinner(t('spinner.plan.creating'));
     try {
@@ -1466,8 +524,6 @@ async function runInteractivePlan() {
             planName,
             outputDir: path.resolve(outputDir.trim() || defaultOutput),
             summary: summary || undefined,
-            selectedAgentTypes: selectedAgents,
-            selectedDocKeys: selectedDocs,
             verbose: false
         });
         ui.updateSpinner(t('spinner.plan.created'), 'success');
@@ -1481,16 +537,6 @@ async function runInteractivePlan() {
         ui.stopSpinner();
     }
 }
-function getAgentFilesByTypes(types) {
-    if (!types || types.length === 0) {
-        return undefined;
-    }
-    const allowed = new Set(agentTypes_1.AGENT_TYPES);
-    const files = types
-        .filter(type => allowed.has(type))
-        .map(type => `${type}.md`);
-    return files.length ? new Set(files) : undefined;
-}
 function filterOutLocaleArgs(args) {
     const filtered = [];
     for (let index = 0; index < args.length; index += 1) {