daedalus-cli 3.63.2 → 3.65.0

package/dist/commands/agents.js

@@ -4,158 +4,16 @@ import path from 'path';
 import pc from 'picocolors';
 import { executeToolCalls } from '../tools/executor.js';
 import { spawnBackgroundAgent } from '../agents/background.js';
-import { handleSpecCommand, getGitRepoInfo } from '../agents/loop.js';
+import { handleSpecCommand } from '../agents/loop.js';
 import { generateSpecContract, loadSpecContract, formatSpecForPrompt } from '../agents/spec.js';
 import { roleLabel } from '../agents/roles.js';
 import { turnSeparator } from '../formatting.js';
-import { execSync } from 'child_process';
-import { loadConfig } from '../config/index.js';
-import { scanStagedDiffForSecrets } from '../security/secret-detector.js';
 import { errMessage } from '../utils/errors.js';
-import { discoverLocalServers, saveConfig } from '../config/index.js';
-import { messageText } from '../types.js';
-import { safeGitResetHard, safeBranchDelete, safeBranchSwitch, allowDestroyFromArgs, detectBaseBranch, safeMergeToBase } from '../git/safe-git.js';
-/**
- * Normalize a raw /autopilot argument into a clean feature description.
- * Strips a leading slash-command token (e.g. if the user re-pastes
- * "/autopilot ...") so it never leaks into the orchestration goal, branch
- * slug, or delegated sub-task text. Returns '' for empty/whitespace input.
- */
-export function normalizeAutopilotIdea(raw) {
-    return raw.trim().replace(/^\/\S+\s*/, '').trim();
-}
-// Secret / credential filename patterns that must never be committed by an
-// autonomous run, even if a sub-agent stages them.
-const SECRET_FILE_PATTERN = /(\.env(\..*)?|.*\.key|.*\.pem|.*\.pfx|credentials.*|secrets?.*|.*id_rsa.*)$/i;
-function isGitIgnored(cwd, file) {
-    try {
-        execSync(`git check-ignore --quiet ${JSON.stringify(file)}`, { cwd, stdio: 'ignore', windowsHide: true });
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-// Stage all changes but always unstage secret-looking or gitignored files so an
-// autonomous run can never commit a .env / credential / build artifact the repo
-// intended to keep untracked.
-function safeGitAdd(cwd) {
-    try {
-        execSync('git add -A', { cwd, stdio: 'ignore', windowsHide: true });
-    }
-    catch {
-        return;
-    }
-    try {
-        const out = execSync('git diff --cached --name-only', { cwd, encoding: 'utf8', windowsHide: true });
-        const staged = out.split('\n').map((s) => s.trim()).filter(Boolean);
-        const exclude = staged.filter((f) => SECRET_FILE_PATTERN.test(f) || isGitIgnored(cwd, f));
-        if (exclude.length > 0) {
-            execSync(`git reset -q -- ${exclude.map((f) => JSON.stringify(f)).join(' ')}`, { cwd, stdio: 'ignore', windowsHide: true });
-            console.log(pc.dim(`[CHECK] Excluded ${exclude.length} secret/ignored file(s) from commit (e.g. .env) — not staged.`));
-        }
-    }
-    catch {
-        // best-effort
-    }
-    // Pre-commit guard: refuse to proceed if the remaining staged diff still
-    // contains a credential in an added line. The autopilot would otherwise
-    // commit a leaked key. We throw so the caller's catch logs and stops.
-    try {
-        const enabled = loadConfig().security?.preCommitGuard !== false;
-        if (enabled) {
-            const hits = scanStagedDiffForSecrets(cwd);
-            if (hits.length > 0) {
-                throw new Error(`pre-commit guard: staged diff contains ${hits.length} credential line(s). Unstage and remove them (rotate the secret) before committing.`);
-            }
-        }
-    }
-    catch (e) {
-        if (e instanceof Error && e.message.startsWith('pre-commit guard:'))
-            throw e;
-        // loadConfig/path failures are best-effort: don't block the commit on them
-    }
-}
-// Gate the autopilot commit on the target project's own build + test scripts.
-// Using the project's scripts (not a hand-rolled tsc invocation) keeps
-// tsconfig/module-resolution correct and catches broken or empty test files
-// that a sub-agent may have left behind. If the project declares no
-// build/test scripts (e.g. a bare repo), the gate is skipped — the
-// orchestrator already verified during the run.
-export async function runAutopilotVerify(cwd) {
-    // Locate the project(s) to verify. A greenfield scaffold may live in a subdirectory
-    // (e.g. ./daedalus-scan), not at the repo root — so if there's no package.json at
-    // cwd, scan immediate subdirectories for one. Checking only the repo root is a false
-    // negative: it returns "ok" with nothing verified, which let autopilot merge broken
-    // code (see sandbox run where the project lived in ./daedalus-scan).
-    const projects = [];
-    const rootPkg = path.join(cwd, 'package.json');
-    if (fs.existsSync(rootPkg)) {
-        projects.push(cwd);
-    }
-    else {
-        let entries = [];
-        try {
-            entries = fs.readdirSync(cwd, { withFileTypes: true });
-        }
-        catch { /* ignore */ }
-        for (const e of entries) {
-            if (!e.isDirectory() || e.name === 'node_modules' || e.name.startsWith('.'))
-                continue;
-            if (fs.existsSync(path.join(cwd, e.name, 'package.json')))
-                projects.push(path.join(cwd, e.name));
-        }
-    }
-    if (projects.length === 0) {
-        // No package.json anywhere — nothing to verify against.
-        return { ok: true, detail: '' };
-    }
-    for (const proj of projects) {
-        let scripts = {};
-        try {
-            scripts = JSON.parse(fs.readFileSync(path.join(proj, 'package.json'), 'utf8')).scripts ?? {};
-        }
-        catch {
-            continue;
-        }
-        // Ensure deps are installed so build/test tooling (tsc, vitest) exists. Skipping this
-        // means even a correct project fails verification because the binaries aren't on disk.
-        if (!fs.existsSync(path.join(proj, 'node_modules'))) {
-            try {
-                execSync('npm install', { cwd: proj, stdio: 'ignore', windowsHide: true });
-            }
-            catch (e) {
-                const msg = e instanceof Error ? errMessage(e) : String(e);
-                return { ok: false, detail: `npm install failed in ${path.relative(cwd, proj) || '.'}: ${msg.split('\n')[0]}` };
-            }
-        }
-        for (const script of ['build', 'test']) {
-            if (!scripts[script])
-                continue;
-            try {
-                execSync(`npm run ${script}`, { cwd: proj, stdio: 'ignore', windowsHide: true });
-            }
-            catch (e) {
-                const msg = e instanceof Error ? errMessage(e) : String(e);
-                return { ok: false, detail: `npm run ${script} failed in ${path.relative(cwd, proj) || '.'}: ${msg.split('\n')[0]}` };
-            }
-        }
-    }
-    return { ok: true, detail: '' };
-}
-function writeAutopilotManifest(m) {
-    try {
-        const dir = path.join(process.cwd(), '.daedalus');
-        fs.mkdirSync(dir, { recursive: true });
-        const file = path.join(dir, `run-${Date.now()}.json`);
-        fs.writeFileSync(file, JSON.stringify(m, null, 2), 'utf8');
-        console.log(pc.dim(`[INFO] Run manifest written to ${file}`));
-    }
-    catch {
-        // best-effort — manifest is a convenience, never block the session on it
-    }
-}
-export { writeAutopilotManifest };
+import { autopilotCommand, normalizeAutopilotIdea, runAutopilotVerify, writeAutopilotManifest, } from './autopilot.js';
+import { mcpCommand } from './mcp.js';
+import { huntCommand } from './hunt.js';
+import { onboardCommand } from './onboard.js';
+export { normalizeAutopilotIdea, runAutopilotVerify, writeAutopilotManifest, autopilotCommand, mcpCommand, huntCommand, onboardCommand, };
 export const agentCommands = [
     {
         name: '/spawn',
@@ -428,461 +286,18 @@ export const agentCommands = [
             console.log(pc.gray(`  Interfaces: ${spec.interfaces.length} | Functions: ${spec.functions.length} | Test Cases: ${spec.testCases.length}`));
             console.log(pc.gray(`  Saved to .daedalus/spec.md & .daedalus/spec.json`));
             if (!trimmed.toLowerCase().startsWith('generate ')) {
-                // Also run GitHub issue creation if desired
                 await handleSpecCommand(goal, ctx);
             }
         }
     },
-    {
-        name: '/mcp',
-        description: 'Manage MCP servers: explore, search, install, list, remove, info',
-        usage: '/mcp <subcommand> [args]',
-        helpText: 'Configure and interact with Model Context Protocol (MCP) servers.\n\nSubcommands:\n  explore, ex           Browse curated featured community MCP servers\n  list, l               List all installed MCP servers and their active state\n  search, s <query>     Search the public MCP Registry for available servers\n  install, i <name>     Install an MCP server from the registry\n  remove, rm <name>     Uninstall an MCP server\n  info <name>           Display metadata and information for a registry server\n  enable <name>         Enable a configured server\n  disable <name>        Disable a configured server without removing it',
-        execute: async (args, _ctx) => {
-            const parts = args.trim().split(/\s+/);
-            const sub = parts[0]?.toLowerCase();
-            const rest = parts.slice(1).join(' ').trim();
-            const { searchRegistry, fetchServerByName, fetchAllServers, registryEntryToConfig, addServerToConfig, removeServerFromConfig, listInstalledServers, toggleServer } = await import('../tools/mcp/manager.js');
-            const { mcpRegistry } = await import('../tools/mcp/registry.js');
-            switch (sub) {
-                case 'bundle':
-                case 'b': {
-                    const { listMcpBundles, getMcpBundle } = await import('../tools/mcp/bundles.js');
-                    const bundleSub = parts[1]?.toLowerCase();
-                    const bundleTarget = parts[2];
-                    if (bundleSub === 'list' || !bundleSub) {
-                        console.log(pc.cyan('\n=== One-Click MCP Tool Bundles ===\n'));
-                        for (const b of listMcpBundles()) {
-                            console.log(`  ${pc.bold(b.name.padEnd(16))} ${pc.dim(b.description)}`);
-                            for (const s of b.servers) {
-                                console.log(`    ${pc.dim('•')} ${pc.cyan(s.name)}: ${s.description}`);
-                            }
-                            console.log();
-                        }
-                        console.log(pc.dim('  Install a bundle: /mcp bundle install <name>\n'));
-                        return;
-                    }
-                    if (bundleSub === 'install') {
-                        if (!bundleTarget) {
-                            console.log(pc.yellow('  Usage: /mcp bundle install <name>'));
-                            return;
-                        }
-                        const bundle = getMcpBundle(bundleTarget);
-                        if (!bundle) {
-                            console.log(pc.red(`  Bundle "${bundleTarget}" not found. Run /mcp bundle list to see presets.`));
-                            return;
-                        }
-                        console.log(pc.cyan(`\n  [MCP BUNDLE] Installing preset bundle: ${pc.bold(bundle.name)}...`));
-                        for (const s of bundle.servers) {
-                            addServerToConfig({ name: s.name, transport: 'stdio', command: s.command, args: s.args, enabled: true });
-                            console.log(pc.green(`  [OK] Installed MCP server "${s.name}"`));
-                        }
-                        console.log(pc.dim('\n  Run /mcp reconnect to activate new servers.\n'));
-                        return;
-                    }
-                    console.log(pc.yellow('  Usage: /mcp bundle [list | install <name>]'));
-                    return;
-                }
-                case 'search':
-                case 's': {
-                    if (!rest) {
-                        console.log(pc.yellow('  Usage: /mcp search <query>'));
-                        return;
-                    }
-                    console.log(pc.dim(`  Searching registry for "${rest}"...`));
-                    try {
-                        const results = await searchRegistry(rest, 15);
-                        if (results.length === 0) {
-                            console.log(pc.yellow('  No servers found. Try a broader search.'));
-                            return;
-                        }
-                        console.log(`\n  ${pc.bold(`Found ${results.length} server(s):`)}`);
-                        for (const s of results) {
-                            const label = s.title || s.name;
-                            const desc = s.description.length > 80 ? s.description.slice(0, 80) + '…' : s.description;
-                            const remote = s.remotes?.[0]?.url || '';
-                            const pkg = s.packages?.[0]?.identifier || '';
-                            const source = remote || pkg || '(no install info)';
-                            const installType = s.packages ? 'stdio' : s.remotes ? 'http' : '?';
-                            console.log(`  ${pc.cyan(label)}`);
-                            console.log(`    ${pc.dim(desc)}`);
-                            console.log(`    ${pc.gray('Install:')} ${pc.dim(source)} (${installType})`);
-                            console.log();
-                        }
-                    }
-                    catch (err) {
-                        console.log(pc.red(`  Search failed: ${errMessage(err)}`));
-                    }
-                    return;
-                }
-                case 'install':
-                case 'i': {
-                    if (!rest) {
-                        console.log(pc.yellow('  Usage: /mcp install <server-name>'));
-                        console.log(pc.dim('  First search for a server with: /mcp search <query>'));
-                        return;
-                    }
-                    console.log(pc.dim(`  Fetching "${rest}" from registry...`));
-                    try {
-                        const entry = await fetchServerByName(rest);
-                        if (!entry) {
-                            console.log(pc.yellow(`  Server "${rest}" not found in registry. Try /mcp search first.`));
-                            return;
-                        }
-                        const config = registryEntryToConfig(entry);
-                        if (!config) {
-                            console.log(pc.yellow(`  Cannot install "${rest}": no stdio package or remote URL found.`));
-                            return;
-                        }
-                        const result = addServerToConfig(config);
-                        if (result.success) {
-                            console.log(pc.green(`  ${result.message}`));
-                            console.log(pc.dim('  Restart Daedalus or reconnect to load the new server.'));
-                        }
-                        else {
-                            console.log(pc.yellow(`  ${result.message}`));
-                        }
-                    }
-                    catch (err) {
-                        console.log(pc.red(`  Install failed: ${errMessage(err)}`));
-                    }
-                    return;
-                }
-                case 'explore':
-                case 'ex': {
-                    console.log(pc.dim('  Browsing the MCP registry...\n'));
-                    try {
-                        const all = await fetchAllServers(100);
-                        const local = all.filter(s => s.packages && s.packages.length > 0);
-                        const remote = all.filter(s => s.remotes && s.remotes.length > 0);
-                        console.log(`  ${pc.bold(`Found ${all.length} servers in registry`)}`);
-                        const showSample = (list, label, max = 5) => {
-                            if (list.length === 0)
-                                return;
-                            console.log(`\n  ${pc.underline(label)} (${list.length} available)`);
-                            for (const s of list.slice(0, max)) {
-                                const pkg = s.packages?.[0]?.identifier || '';
-                                const url = s.remotes?.[0]?.url || '';
-                                const source = pkg || url;
-                                const info = s.description.length > 55 ? s.description.slice(0, 53) + '…' : s.description;
-                                const showName = s.name.length > 28 ? s.name.slice(0, 26) + '…' : s.name;
-                                console.log(`  ${pc.cyan(showName.padEnd(30))} ${pc.dim(info)}`);
-                                console.log(`  ${' '.repeat(30)}  ${pc.gray('→')} ${pc.dim(source)}`);
-                            }
-                            if (list.length > max) {
-                                console.log(`  ${' '.repeat(30)} ${pc.dim(`… and ${list.length - max} more`)}`);
-                            }
-                        };
-                        showSample(local, 'Local (stdio — install & run)', 6);
-                        showSample(remote, 'Remote (HTTP — cloud API)', 6);
-                        console.log(`\n  ${pc.dim('Tip: /mcp search <query> to find specific servers')}`);
-                    }
-                    catch (err) {
-                        console.log(pc.red(`  Explore failed: ${errMessage(err)}`));
-                    }
-                    return;
-                }
-                case 'list':
-                case 'ls':
-                case 'l': {
-                    const servers = listInstalledServers();
-                    if (servers.length === 0) {
-                        console.log(pc.yellow('  No MCP servers installed.'));
-                        console.log(pc.dim('  Try /mcp explore to see what\'s available.'));
-                        return;
-                    }
-                    const connected = mcpRegistry.getConnectedServers();
-                    console.log(`\n  ${pc.bold('Installed MCP Servers:')}`);
-                    for (const s of servers) {
-                        const status = connected.includes(s.name) ? pc.green('●') : s.enabled ? pc.yellow('○') : pc.red('○');
-                        const state = connected.includes(s.name) ? pc.green('connected')
-                            : s.enabled ? pc.yellow('pending')
-                                : pc.red('disabled');
-                        console.log(`  ${status} ${pc.cyan(s.name.padEnd(20))} ${pc.dim(s.transport.padEnd(6))} ${state}`);
-                    }
-                    console.log();
-                    return;
-                }
-                case 'remove':
-                case 'rm':
-                case 'r': {
-                    if (!rest) {
-                        console.log(pc.yellow('  Usage: /mcp remove <server-name>'));
-                        return;
-                    }
-                    const result = removeServerFromConfig(rest);
-                    if (result.success) {
-                        console.log(pc.green(`  ${result.message}`));
-                    }
-                    else {
-                        console.log(pc.yellow(`  ${result.message}`));
-                    }
-                    return;
-                }
-                case 'info': {
-                    if (!rest) {
-                        console.log(pc.yellow('  Usage: /mcp info <server-name>'));
-                        return;
-                    }
-                    try {
-                        console.log(pc.dim(`  Fetching "${rest}" from registry...`));
-                        const entry = await fetchServerByName(rest);
-                        if (!entry) {
-                            console.log(pc.yellow(`  Server "${rest}" not found.`));
-                            return;
-                        }
-                        console.log(`\n  ${pc.bold(entry.title || entry.name)}`);
-                        console.log(`  ${pc.dim(entry.description)}`);
-                        console.log(`  ${pc.gray('Name:')}    ${entry.name}`);
-                        console.log(`  ${pc.gray('Version:')} ${entry.version}`);
-                        if (entry.websiteUrl)
-                            console.log(`  ${pc.gray('Website:')} ${entry.websiteUrl}`);
-                        if (entry.repository?.url)
-                            console.log(`  ${pc.gray('Source:')}  ${entry.repository.url}`);
-                        if (entry.remotes && entry.remotes.length > 0) {
-                            console.log(`\n  ${pc.bold('Remote endpoints:')}`);
-                            for (const r of entry.remotes) {
-                                console.log(`    ${pc.cyan(r.type)} ${pc.dim(r.url)}`);
-                                if (r.headers) {
-                                    for (const h of r.headers) {
-                                        const req = h.isRequired ? pc.yellow(' (required)') : '';
-                                        const secret = h.isSecret ? pc.dim(' [secret]') : '';
-                                        console.log(`      ${pc.gray('Header:')} ${h.name}${req}${secret}`);
-                                    }
-                                }
-                            }
-                        }
-                        if (entry.packages && entry.packages.length > 0) {
-                            console.log(`\n  ${pc.bold('Packages:')}`);
-                            for (const p of entry.packages) {
-                                const [cmd, ...args] = p.registryType === 'npm' ? ['npx', '-y', p.identifier]
-                                    : p.registryType === 'pypi' ? ['uvx', p.identifier]
-                                        : [p.identifier];
-                                console.log(`    ${pc.cyan(p.registryType)} ${pc.dim(`${cmd} ${args.join(' ')}`)}`);
-                                if (p.environmentVariables) {
-                                    for (const env of p.environmentVariables) {
-                                        const req = env.isRequired ? pc.yellow(' (required)') : '';
-                                        const secret = env.isSecret ? pc.dim(' [secret]') : '';
-                                        console.log(`      ${pc.gray('Env:')} ${env.name}${req}${secret}`);
-                                        if (env.description)
-                                            console.log(`      ${pc.dim(env.description)}`);
-                                    }
-                                }
-                            }
-                        }
-                        console.log();
-                    }
-                    catch (err) {
-                        console.log(pc.red(`  Info fetch failed: ${errMessage(err)}`));
-                    }
-                    return;
-                }
-                case 'reconnect':
-                case 'rc': {
-                    const { loadConfig } = await import('../config/index.js');
-                    const config = loadConfig();
-                    const mcpConfigs = Object.entries(config.tools.mcpServers)
-                        .filter(([_, s]) => s.enabled)
-                        .map(([name, s]) => ({
-                        name,
-                        transport: s.transport,
-                        command: s.command,
-                        args: s.args,
-                        url: s.url,
-                        headers: s.headers,
-                        enabled: s.enabled,
-                    }));
-                    const already = mcpRegistry.getConnectedServers();
-                    const newServers = mcpConfigs.filter(c => !already.includes(c.name));
-                    if (newServers.length === 0) {
-                        if (mcpConfigs.length === 0) {
-                            console.log(pc.yellow('  No enabled MCP servers configured. Install one with /mcp install'));
-                        }
-                        else {
-                            console.log(pc.dim('  All enabled MCP servers are already connected.'));
-                        }
-                        return;
-                    }
-                    mcpRegistry.setConfigs(mcpConfigs);
-                    const connected = [];
-                    const failed = [];
-                    for (const s of newServers) {
-                        try {
-                            await mcpRegistry.connectServer(s);
-                            connected.push(s.name);
-                        }
-                        catch (err) {
-                            failed.push(`${s.name} (${errMessage(err)})`);
-                        }
-                    }
-                    if (connected.length > 0) {
-                        const totalTools = mcpRegistry.getToolDefinitions().length;
-                        console.log(pc.green(`  Connected: ${connected.join(', ')} (${totalTools} MCP tools total)`));
-                    }
-                    if (failed.length > 0) {
-                        console.log(pc.yellow(`  Failed: ${failed.join(', ')}`));
-                    }
-                    return;
-                }
-                case 'enable':
-                case 'e': {
-                    if (!rest) {
-                        console.log(pc.yellow('  Usage: /mcp enable <server-name>'));
-                        return;
-                    }
-                    const enableResult = toggleServer(rest, true);
-                    console.log(enableResult.success ? pc.green(`  ${enableResult.message}`) : pc.yellow(`  ${enableResult.message}`));
-                    return;
-                }
-                case 'disable':
-                case 'd': {
-                    if (!rest) {
-                        console.log(pc.yellow('  Usage: /mcp disable <server-name>'));
-                        return;
-                    }
-                    const disableResult = toggleServer(rest, false);
-                    console.log(disableResult.success ? pc.green(`  ${disableResult.message}`) : pc.yellow(`  ${disableResult.message}`));
-                    return;
-                }
-                default:
-                    console.log(pc.bold('\n  MCP Server Manager'));
-                    console.log(`  ${pc.cyan('/mcp explore')}           ${pc.dim('Browse available servers in the registry')}`);
-                    console.log(`  ${pc.cyan('/mcp search <query>')}    ${pc.dim('Search MCP registry + Smithery')}`);
-                    console.log(`  ${pc.cyan('/mcp install <name>')}   ${pc.dim('Install a server from the registry')}`);
-                    console.log(`  ${pc.cyan('/mcp list')}             ${pc.dim('List installed servers')}`);
-                    console.log(`  ${pc.cyan('/mcp remove <name>')}    ${pc.dim('Remove an installed server')}`);
-                    console.log(`  ${pc.cyan('/mcp info <name>')}      ${pc.dim('Show server details')}`);
-                    console.log(`  ${pc.cyan('/mcp reconnect')}        ${pc.dim('Reconnect all enabled servers')}`);
-                    console.log(`  ${pc.cyan('/mcp enable <name>')}    ${pc.dim('Enable a disabled server')}`);
-                    console.log(`  ${pc.cyan('/mcp disable <name>')}   ${pc.dim('Disable a server without removing it')}`);
-                    console.log(`\n  ${pc.bold('Popular npm MCP servers (add to ~/.daedalus/config.json):')}`);
-                    console.log(`  ${pc.dim('  "server-name": { "transport": "stdio", "command": "npx", "args": ["-y", "@npm/package"], "enabled": true }')}`);
-                    console.log(`  ${pc.gray('→')} ${pc.cyan('filesystem')}       ${pc.dim('npx -y @modelcontextprotocol/server-filesystem <allowed-dir>')}`);
-                    console.log(`  ${pc.gray('→')} ${pc.cyan('puppeteer')}        ${pc.dim('npx -y @modelcontextprotocol/server-puppeteer')}`);
-                    console.log(`  ${pc.gray('→')} ${pc.cyan('memory')}           ${pc.dim('npx -y @modelcontextprotocol/server-memory')}`);
-                    console.log(`  ${pc.gray('→')} ${pc.cyan('fetch')}            ${pc.dim('npx -y @modelcontextprotocol/server-fetch')}`);
-                    console.log(`  ${pc.gray('→')} ${pc.cyan('sequential-thinking')} ${pc.dim('npx -y @modelcontextprotocol/server-sequential-thinking')}`);
-                    console.log(`  ${pc.gray('→')} ${pc.cyan('github')}           ${pc.dim('npx -y @github/github-mcp-server')}`);
-                    console.log(`  ${pc.gray('→')} ${pc.cyan('sqlite')}           ${pc.dim('npx -y @modelcontextprotocol/server-sqlite <db-path>')}`);
-                    console.log(`  ${pc.dim('  Then run /mcp reconnect to load them.')}`);
-                    console.log();
-            }
-        }
-    },
-    {
-        name: '/onboard',
-        description: 'First-time setup — discover local models, configure, and test',
-        usage: '/onboard',
-        helpText: 'Run the interactive setup wizard to scan your local network/environment for model servers, select a primary model tier, and test its output/diagnostics.',
-        execute: async (_args, ctx) => {
-            const config = ctx.config;
-            console.log(pc.bold(pc.cyan('\n╔══════════════════════════════════════╗')));
-            console.log(pc.bold(pc.cyan('║        Daedalus Onboarding          ║')));
-            console.log(pc.bold(pc.cyan('╚══════════════════════════════════════╝')));
-            console.log();
-            console.log('Daedalus runs AI models locally on your machine.');
-            console.log('First, I need to know which model server to use.');
-            console.log();
-            // Step 1: Discover local model servers
-            console.log(pc.bold('🔍 Scanning for local model servers...'));
-            const discovered = await discoverLocalServers();
-            let chosenEndpoint = '';
-            let chosenModel = '';
-            if (discovered.length > 0) {
-                console.log(pc.green(`\n  Found ${discovered.length} running server(s):\n`));
-                for (let i = 0; i < discovered.length; i++) {
-                    const s = discovered[i];
-                    console.log(`  ${i + 1}. ${pc.cyan(s.name)} at ${s.endpoint}`);
-                    for (const m of s.models.slice(0, 3)) {
-                        console.log(`     - ${m}`);
-                    }
-                    if (s.models.length > 3) {
-                        console.log(pc.gray(`     ... and ${s.models.length - 3} more`));
-                    }
-                }
-                console.log();
-                const serverChoice = await ctx.askLine(`Select a server (1-${discovered.length}) or press Enter to add manually: `);
-                const idx = parseInt(serverChoice) - 1;
-                if (idx >= 0 && idx < discovered.length) {
-                    const server = discovered[idx];
-                    chosenEndpoint = server.endpoint;
-                    if (server.models.length === 1) {
-                        chosenModel = server.models[0];
-                    }
-                    else {
-                        console.log(`\nModels on ${pc.cyan(server.name)}:`);
-                        for (let i = 0; i < server.models.length; i++) {
-                            console.log(`  ${i + 1}. ${server.models[i]}`);
-                        }
-                        const modelChoice = await ctx.askLine(`Select a model (1-${server.models.length}): `);
-                        const midx = parseInt(modelChoice) - 1;
-                        if (midx >= 0 && midx < server.models.length) {
-                            chosenModel = server.models[midx];
-                        }
-                    }
-                }
-            }
-            if (!chosenEndpoint) {
-                console.log(`\nEnter your model server details manually.`);
-                chosenEndpoint = await ctx.askLine('API endpoint (e.g. http://localhost:1234/v1): ');
-                if (!chosenEndpoint)
-                    chosenEndpoint = 'http://localhost:1234/v1';
-                chosenModel = await ctx.askLine('Model name (e.g. qwen2.5-coder-7b-instruct): ');
-                if (!chosenModel)
-                    chosenModel = 'auto';
-            }
-            if (!chosenModel)
-                chosenModel = 'auto';
-            // Step 2: Add to config
-            const entry = {
-                name: chosenModel,
-                endpoint: chosenEndpoint,
-                model: chosenModel,
-                priority: 1,
-                enabled: true,
-            };
-            // Replace any existing chain or add to it
-            config.router.chain = [entry, ...config.router.chain.filter((e) => e.endpoint !== chosenEndpoint)];
-            saveConfig(config);
-            console.log(pc.green(`\n✓ Added model "${pc.bold(chosenModel)}" at ${chosenEndpoint}`));
-            // Step 3: Test the model
-            const testPrompt = await ctx.askLine('\nRun a quick test? (Y/n): ');
-            if (testPrompt.toLowerCase() !== 'n') {
-                console.log(pc.dim('\nSending test request...'));
-                try {
-                    const start = Date.now();
-                    const testMessages = [
-                        { role: 'system', content: 'You are a helpful assistant. Respond in 1-2 sentences.' },
-                        { role: 'user', content: 'Say hello and confirm you are working.' },
-                    ];
-                    const testRouter = ctx.router;
-                    const completion = await testRouter.chat.completions.create({
-                        model: chosenModel,
-                        messages: testMessages,
-                        temperature: 0.1,
-                    });
-                    const elapsed = Date.now() - start;
-                    const text = messageText(completion.choices?.[0]?.message?.content ?? '') || '(no response)';
-                    console.log(pc.green(`\n✓ Response received in ${elapsed}ms:`));
-                    console.log(`  ${pc.white(text)}`);
-                }
-                catch (err) {
-                    console.log(pc.yellow(`\n⚠ Test failed: ${errMessage(err)}`));
-                    console.log('  The model is configured but may need troubleshooting.');
-                    console.log(`  Check ${pc.cyan(ctx.configDir + '/config.json')} and verify the endpoint.`);
-                }
-            }
-            console.log(pc.green(`\n✓ Onboarding complete! Configuration saved to:`));
-            console.log(`  ${pc.cyan(ctx.configDir + '/config.json')}`);
-            console.log(`\nType ${pc.cyan('?')} to see all available commands, or just start typing.`);
-        }
-    },
+    mcpCommand,
+    onboardCommand,
     {
         name: '/tui',
         description: 'Toggle the Terminal User Interface (TUI) dashboard',
         usage: '/tui',
         helpText: 'Switch between standard REPL chat mode and the side-by-side Terminal dashboard mode (which includes resource charts, model settings, and context monitors).',
-        execute: async (args, ctx) => {
+        execute: async (_args, ctx) => {
             if (!ctx.rl) {
                 throw new Error('SWITCH_MODE_CLI');
             }
@@ -937,433 +352,8 @@ export const agentCommands = [
             }
         }
     },
-    {
-        name: '/autopilot',
-        description: 'Autonomously implement a feature: branch, code, test, commit, and PR',
-        usage: '/autopilot <feature description> [--allow-destroy]',
-        helpText: 'End-to-end autonomous feature development. Creates a branch, plans and implements the feature, runs verification, commits, pushes, and opens a pull request.\\n\\nFlow:\\n  1. Interactive Q&A to refine the feature spec\\n  2. Creates a git branch (daedalus-autopilot-<slug>)\\n  3. Runs the multi-agent orchestrator to implement it\\n  4. Verifies with build/lint/tests\\n  5. Commits and pushes to GitHub\\n  6. Opens a Pull Request against main\\n\\nRequires a GitHub repository with a configured remote origin.\\n\\nSafety: in local-only mode (no remote), the working tree and branch are NEVER destroyed on failure — changes are kept for inspection. Pass --allow-destroy to override this and discard the branch on failure (only for throwaway repos).',
-        execute: async (args, ctx) => {
-            // Strip a leading slash-command token (e.g. if the user re-pasted
-            // "/autopilot ...") so it never leaks into the goal, branch slug, or
-            // delegated sub-tasks.
-            const idea = normalizeAutopilotIdea(args);
-            if (!idea) {
-                console.log(pc.yellow('[WARN] Usage: /autopilot <feature description>'));
-                return;
-            }
-            const manifest = {
-                feature: idea,
-                branch: '',
-                remote: null,
-                mode: 'non-git',
-                outcome: 'stopped-error',
-                tasksPlanned: 0,
-                tasksDone: 0,
-                filesChanged: [],
-                testResult: null,
-                finishedAt: '',
-            };
-            const emitManifest = () => {
-                manifest.finishedAt = new Date().toISOString();
-                writeAutopilotManifest(manifest);
-            };
-            try {
-                let isGitRepo = true;
-                try {
-                    execSync('git rev-parse --is-inside-work-tree', { cwd: ctx.toolContext.projectRoot, stdio: 'ignore', windowsHide: true });
-                }
-                catch {
-                    isGitRepo = false;
-                }
-                if (!isGitRepo) {
-                    console.log(pc.cyan('[INFO] Non-git directory detected. Auto-initializing Git repository for autonomous branch safety...'));
-                    try {
-                        const cwd = ctx.toolContext.projectRoot || process.cwd();
-                        execSync('git init', { cwd, windowsHide: true });
-                        const gitIgnorePath = path.join(cwd, '.gitignore');
-                        if (!fs.existsSync(gitIgnorePath)) {
-                            fs.writeFileSync(gitIgnorePath, "node_modules/\ndist/\n.daedalus/\n", 'utf8');
-                        }
-                        safeGitAdd(cwd);
-                        execSync('git commit -m "initial clean setup"', { cwd, windowsHide: true });
-                        isGitRepo = true;
-                        console.log(pc.green('[OK] Git repository initialized with tracking branch support.'));
-                    }
-                    catch {
-                        console.log(pc.yellow('[WARNING] Working directory is not a git repository. Autonomous changes will NOT be tracked in a git branch.'));
-                    }
-                }
-                const repoInfo = isGitRepo ? getGitRepoInfo(ctx.toolContext.projectRoot) : null;
-                if (!repoInfo) {
-                    console.log(pc.yellow('[INFO] No GitHub remote found. Running in local-only mode (no PR will be created).'));
-                }
-                const slug = idea.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '').slice(0, 40);
-                const branchName = `daedalus-autopilot-${slug}`;
-                manifest.remote = repoInfo ? `${repoInfo.owner}/${repoInfo.repo}` : null;
-                manifest.mode = !isGitRepo ? 'non-git' : repoInfo ? 'git' : 'local-only';
-                manifest.branch = branchName;
-                if (isGitRepo) {
-                    try {
-                        // Always branch from the repo's stable base (main/master) — not from
-                        // whatever branch the user happens to be on. This prevents run-to-run
-                        // cruft chaining: a prior autopilot branch would otherwise leak into
-                        // the next run. Detect and switch to base first.
-                        const baseBranch = detectBaseBranch(ctx.toolContext.projectRoot);
-                        execSync(`git checkout ${baseBranch}`, { cwd: ctx.toolContext.projectRoot, stdio: 'ignore', windowsHide: true });
-                        // Re-entering a run must not discard uncommitted work already on the
-                        // branch. safeBranchSwitch switches without -B unless --allow-destroy.
-                        const allowDestroy = allowDestroyFromArgs(idea) || !!repoInfo;
-                        safeBranchSwitch(branchName, { cwd: ctx.toolContext.projectRoot, allowDestroy, branch: branchName });
-                        console.log(pc.green(`[OK] Switched to branch: ${branchName} (from ${baseBranch})`));
-                    }
-                    catch (err) {
-                        const msg = err instanceof Error ? errMessage(err) : String(err);
-                        console.log(pc.red(`[ERROR] Failed to create branch: ${msg}`));
-                        return;
-                    }
-                }
-                const goal = `Implement the following feature: ${idea}`;
-                console.log(pc.cyan(`\n[AUTOPILOT] Starting autonomous implementation...`));
-                process.env.DAEDALUS_AUTO_APPROVE = 'true';
-                process.env.DAEDALUS_ALLOW_INSTALL = 'true';
-                try {
-                    const { Orchestrator } = await import('../agents/orchestrator.js');
-                    const orchestrator = new Orchestrator(ctx.router, ctx.messages, ctx.toolContext, ctx.sessionManager, ctx.config?.modelOverride);
-                    const result = await orchestrator.run(goal);
-                    console.log(pc.white(`\n${result}`));
-                    const orchestrationFailed = result.startsWith('Orchestration failed') || result.includes('## Orchestration Hit Verification Failures');
-                    const wasAborted = result.includes('## Orchestration Paused');
-                    if (orchestrationFailed || wasAborted) {
-                        // Print Self-Evaluating Autopilot Post-Mortem Report before rolling back
-                        const cols = process.stdout.columns || 80;
-                        const lineLen = Math.max(20, Math.min(70, cols - 6));
-                        console.log(`\n  ${pc.bold(pc.red('─ Autopilot Post-Mortem ─'))} ${pc.dim('─'.repeat(Math.max(10, lineLen - 25)))}`);
-                        const failed = orchestrator.results?.filter((r) => !r.success) || [];
-                        if (failed.length > 0) {
-                            failed.forEach((f, idx) => {
-                                console.log(`  ${pc.bold(pc.red(`❌ Failed Step ${idx + 1}:`))} ${pc.bold(`[${f.role}]`)} ${f.goal}`);
-                                console.log(`     ${pc.yellow(`📌 Diagnostic:`)} ${f.summary.split('\n')[0]}`);
-                            });
-                        }
-                        else {
-                            console.log(`  ${pc.yellow('❌ Verification check failed — required files failed artifact or build checks.')}`);
-                        }
-                        console.log(`\n  ${pc.cyan('Recommendations:')}`);
-                        console.log(`     - Target missing file: ${pc.bold(`/task create <file>`)}`);
-                        console.log(`     - Re-run autopilot:   ${pc.bold(`/autopilot ${idea}`)}`);
-                        console.log(`  ${pc.dim('─'.repeat(lineLen + 2))}\n`);
-                        throw new Error(orchestrationFailed ? 'Orchestration reported failure' : 'Orchestration was paused/aborted');
-                    }
-                }
-                catch (err) {
-                    const msg = err instanceof Error ? errMessage(err) : String(err);
-                    console.log(pc.red(`\n[ERROR] Run stopped: ${msg}`));
-                    manifest.outcome = 'stopped-error';
-                    if (isGitRepo) {
-                        console.log(pc.dim('[CHECK] Verification did not pass — keeping the implemented changes on the branch for review.'));
-                        // Never destroy the working tree or branch in local-only mode. Only a
-                        // remote-backed repo (throwaway branch) or an explicit --allow-destroy
-                        // opt-in may discard. Otherwise we keep the branch for inspection.
-                        const allowDestroy = allowDestroyFromArgs(idea) || !!repoInfo;
-                        if (allowDestroy) {
-                            try {
-                                safeGitResetHard({ cwd: ctx.toolContext.projectRoot, allowDestroy });
-                                execSync('git checkout main', { cwd: ctx.toolContext.projectRoot, stdio: 'ignore', windowsHide: true });
-                                safeBranchDelete(branchName, { cwd: ctx.toolContext.projectRoot, allowDestroy });
-                                console.log(pc.green('[OK] Branch cleaned up; main is untouched.'));
-                            }
-                            catch (rollbackErr) {
-                                const rbMsg = rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr);
-                                console.log(pc.red(`[ERROR] Cleanup failed: ${rbMsg}. Manual cleanup may be needed.`));
-                            }
-                        }
-                        else {
-                            console.log(pc.cyan(`[INFO] Local-only mode: keeping branch '${branchName}' with the implemented changes for inspection. Fix and commit manually.`));
-                        }
-                    }
-                    return;
-                }
-                if (isGitRepo) {
-                    console.log(pc.cyan('\n[AUTOPILOT] Verifying build & tests before commit...'));
-                    const verify = await runAutopilotVerify(ctx.toolContext.projectRoot);
-                    if (!verify.ok) {
-                        console.log(pc.red(`\n[ERROR] Verification did not pass — holding the changes on the branch instead of committing. ${verify.detail}`));
-                        console.log(pc.cyan(`[INFO] Branch '${branchName}' is kept with the implemented changes for inspection.`));
-                        manifest.outcome = 'stopped-verify';
-                        manifest.testResult = verify;
-                        return;
-                    }
-                    console.log(pc.green('[OK] Build & tests passed.'));
-                    console.log(pc.cyan('\n[AUTOPILOT] Committing changes...'));
-                    try {
-                        safeGitAdd(ctx.toolContext.projectRoot);
-                        const cleanTitle = idea.replace(/[^a-zA-Z0-9 ]/g, '').trim();
-                        execSync(`git commit -m "feat: ${cleanTitle}"`, { cwd: ctx.toolContext.projectRoot, windowsHide: true });
-                        console.log(pc.green('[OK] Changes committed.'));
-                        try {
-                            const diff = execSync(`git diff --name-only HEAD~1 HEAD`, { cwd: ctx.toolContext.projectRoot, encoding: 'utf8', windowsHide: true });
-                            manifest.filesChanged = diff.split('\n').map((s) => s.trim()).filter(Boolean);
-                        }
-                        catch { /* best-effort */ }
-                    }
-                    catch (err) {
-                        const msg = err instanceof Error ? errMessage(err) : String(err);
-                        if (msg.includes('nothing to commit')) {
-                            console.log(pc.yellow('[INFO] No changes to commit.'));
-                        }
-                        else {
-                            console.log(pc.red(`[ERROR] Failed to commit: ${msg}`));
-                            return;
-                        }
-                    }
-                }
-                else {
-                    console.log(pc.yellow('\n[INFO] Non-git working directory. Autonomous implementation completed directly on files.'));
-                }
-                if (repoInfo) {
-                    console.log(pc.cyan('\n[AUTOPILOT] Pushing branch and creating PR...'));
-                    let token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
-                    if (!token) {
-                        try {
-                            token = execSync('gh auth token', { encoding: 'utf8', windowsHide: true }).trim();
-                        }
-                        catch {
-                            console.log(pc.yellow('[INFO] No GitHub token found. Run `gh auth login` or set GITHUB_TOKEN.'));
-                            console.log(pc.yellow(`[INFO] Branch ${branchName} is ready locally. Push manually.`));
-                            return;
-                        }
-                    }
-                    try {
-                        execSync(`git push -u origin ${branchName} --force`, { cwd: ctx.toolContext.projectRoot, windowsHide: true });
-                        const prResponse = await fetch(`https://api.github.com/repos/${repoInfo.owner}/${repoInfo.repo}/pulls`, {
-                            method: 'POST',
-                            headers: {
-                                'Authorization': `Bearer ${token}`,
-                                'Content-Type': 'application/json',
-                            },
-                            body: JSON.stringify({
-                                title: `[Autopilot] ${idea}`,
-                                head: branchName,
-                                base: 'main',
-                                body: `## Description\n\nAutonomously implemented by Daedalus Autopilot.\n\n**Feature:** ${idea}\n\n---\n_Generated by \`/autopilot\`_`,
-                            }),
-                        });
-                        if (prResponse.ok) {
-                            const pr = await prResponse.json();
-                            console.log(pc.green(`\n[OK] Pull Request created: ${pr.html_url}`));
-                        }
-                        else {
-                            const errText = await prResponse.text();
-                            console.log(pc.red(`[ERROR] Failed to create PR: ${prResponse.status} ${errText}`));
-                            console.log(pc.yellow(`[INFO] Branch ${branchName} is pushed. Create PR manually.`));
-                        }
-                    }
-                    catch (err) {
-                        const msg = err instanceof Error ? errMessage(err) : String(err);
-                        console.log(pc.red(`[ERROR] Push/PR failed: ${msg}`));
-                        console.log(pc.yellow(`[INFO] Branch ${branchName} is ready locally.`));
-                    }
-                }
-                else {
-                    console.log(pc.yellow('\n[INFO] No GitHub remote configured. Implementation is committed locally.'));
-                    console.log(pc.yellow(`[INFO] Branch: ${branchName}`));
-                    // Local-only mode: merge the verified-green feature branch back into the
-                    // base branch so the working tree stays current and the user never has to
-                    // manually switch back. Never force-pushes; fast-forwards when possible.
-                    const baseBranch = detectBaseBranch(ctx.toolContext.projectRoot);
-                    if (baseBranch !== branchName && safeMergeToBase(branchName, baseBranch, ctx.toolContext.projectRoot)) {
-                        console.log(pc.green(`[OK] Merged ${branchName} into ${baseBranch}. You are now on ${baseBranch}.`));
-                    }
-                }
-                console.log(pc.cyan(`\n[AUTOPILOT] Done! The feature branch was merged into the base branch — no manual switching needed.`));
-                manifest.outcome = repoInfo ? 'pr-opened' : 'committed-local';
-            }
-            finally {
-                emitManifest();
-            }
-        }
-    },
-    {
-        name: '/hunt',
-        aliases: ['/bug'],
-        description: 'Autonomously hunt down and fix a bug: reproduce, locate root cause, fix, verify',
-        usage: '/hunt <failing-test-filepath> or <bug description>',
-        helpText: 'End-to-end autonomous bug fixing. If given a test file path, runs it to capture the failure, searches the codebase for root cause, implements a fix, verifies the test passes, commits, pushes, and opens a pull request.\n\nFlow:\n  1. (Optional) Runs the failing test to capture error output\n  2. Creates a git branch (daedalus-hunt-<slug>)\n  3. Runs the multi-agent orchestrator to find and fix the bug\n  4. Re-runs the test to confirm the fix\n  5. Commits and pushes to GitHub\n  6. Opens a Pull Request against main\n\nProvide a test file path to enable automated reproduction and verification.',
-        execute: async (args, ctx) => {
-            const input = args.trim();
-            if (!input) {
-                console.log(pc.yellow('[WARN] Usage: /hunt <failing-test-filepath> or <bug description>'));
-                return;
-            }
-            const repoInfo = getGitRepoInfo(ctx.toolContext.projectRoot);
-            if (!repoInfo) {
-                console.log(pc.yellow('[INFO] No GitHub remote found. Running in local-only mode (no PR will be created).'));
-            }
-            const slug = input.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '').slice(0, 40);
-            const branchName = `daedalus-hunt-${slug}`;
-            const testFilePattern = /\.(test|spec)\.(ts|tsx|js|jsx|mjs)$/i;
-            const isTestFile = testFilePattern.test(input.trim());
-            // Step 1: If input is a test file, run it to capture failure output
-            let testFailureOutput = '';
-            if (isTestFile) {
-                const testPath = input.trim();
-                console.log(pc.cyan(`\n[HUNT] Reproducing failure from: ${testPath}`));
-                try {
-                    const { execute: termExec } = await import('../tools/builtin/terminal.js');
-                    const testResult = await termExec({ command: `npx vitest run ${testPath} --reporter=verbose`, timeout: 120, workdir: process.cwd() }, ctx.toolContext);
-                    if (testResult.success) {
-                        console.log(pc.yellow(`\n[HUNT] Test passed — no bug to fix. Running on main branch only.`));
-                        return;
-                    }
-                    testFailureOutput = testResult.content || '';
-                    const errorLines = testFailureOutput.split('\n').filter(l => l.includes('FAIL') || l.includes('AssertionError') || l.includes('Error:') || l.includes('×')).slice(0, 20).join('\n');
-                    console.log(pc.red(`\n[HUNT] Failure reproduced:\n${errorLines.slice(0, 1000)}`));
-                }
-                catch (err) {
-                    const msg = err instanceof Error ? errMessage(err) : String(err);
-                    console.log(pc.yellow(`[HUNT] Could not run test: ${msg}. Continuing with description only.`));
-                }
-            }
-            // Step 2: Create branch
-            try {
-                const allowDestroy = allowDestroyFromArgs(input) || !!repoInfo;
-                safeBranchSwitch(branchName, { cwd: ctx.toolContext.projectRoot, allowDestroy, branch: branchName });
-                console.log(pc.green(`[OK] Switched to branch: ${branchName}`));
-            }
-            catch (err) {
-                const msg = err instanceof Error ? errMessage(err) : String(err);
-                console.log(pc.red(`[ERROR] Failed to create branch: ${msg}`));
-                return;
-            }
-            // Step 3: Build goal for orchestrator
-            const testContext = testFailureOutput ? `\n\nTest failure output:\n\`\`\`\n${testFailureOutput.slice(0, 4000)}\n\`\`\`` : '';
-            const goal = `Fix the following bug:\n${input}${testContext}\n\nFind the root cause, fix it, and ensure existing tests still pass.`;
-            console.log(pc.cyan(`\n[HUNT] Starting autonomous bug hunt...`));
-            process.env.DAEDALUS_AUTO_APPROVE = 'true';
-            let orchestratorResult = '';
-            try {
-                const { Orchestrator } = await import('../agents/orchestrator.js');
-                const orchestrator = new Orchestrator(ctx.router, ctx.messages, ctx.toolContext, ctx.sessionManager, ctx.config?.modelOverride);
-                orchestratorResult = await orchestrator.run(goal);
-                console.log(pc.white(`\n${orchestratorResult}`));
-                const orchestrationFailed = orchestratorResult.startsWith('Orchestration failed') || orchestratorResult.includes('## Orchestration Hit Verification Failures');
-                const wasAborted = orchestratorResult.includes('## Orchestration Paused');
-                if (orchestrationFailed || wasAborted) {
-                    throw new Error(orchestrationFailed ? 'Orchestration reported failure' : 'Orchestration was paused/aborted');
-                }
-            }
-            catch (err) {
-                const msg = err instanceof Error ? errMessage(err) : String(err);
-                console.log(pc.red(`\n[ERROR] Bug hunt stopped: ${msg}`));
-                console.log(pc.dim('[CHECK] Fix did not verify — discarding the attempt to keep main clean.'));
-                const allowDestroy = allowDestroyFromArgs(input) || !!repoInfo;
-                if (allowDestroy) {
-                    try {
-                        safeGitResetHard({ cwd: ctx.toolContext.projectRoot, allowDestroy });
-                        execSync('git checkout main', { cwd: ctx.toolContext.projectRoot, stdio: 'ignore', windowsHide: true });
-                        safeBranchDelete(branchName, { cwd: ctx.toolContext.projectRoot, allowDestroy });
-                        console.log(pc.green('[OK] Branch cleaned up; main is untouched.'));
-                    }
-                    catch (rollbackErr) {
-                        const rbMsg = rollbackErr instanceof Error ? rollbackErr.message : String(rollbackErr);
-                        console.log(pc.red(`[ERROR] Cleanup failed: ${rbMsg}. Manual cleanup may be needed.`));
-                    }
-                }
-                else {
-                    console.log(pc.cyan(`[INFO] Local-only mode: keeping branch '${branchName}' with the attempted fix for inspection. Fix and commit manually.`));
-                }
-                return;
-            }
-            // Step 4: Verify fix by re-running the test
-            if (isTestFile && testFailureOutput) {
-                console.log(pc.cyan('\n[HUNT] Verifying fix...'));
-                try {
-                    const { execute: termExec } = await import('../tools/builtin/terminal.js');
-                    const verifyResult = await termExec({ command: `npx vitest run ${input.trim()} --reporter=verbose`, timeout: 120, workdir: process.cwd() }, ctx.toolContext);
-                    if (verifyResult.success) {
-                        console.log(pc.green(`\n[HUNT] ✓ Fix verified — test passes.`));
-                    }
-                    else {
-                        console.log(pc.yellow(`\n[HUNT] ⚠ Fix verification failed. Test still failing. Continuing to commit partial fix.`));
-                    }
-                }
-                catch (err) {
-                    const msg = err instanceof Error ? errMessage(err) : String(err);
-                    console.log(pc.yellow(`[HUNT] Verification skipped: ${msg}`));
-                }
-            }
-            // Step 5: Commit
-            console.log(pc.cyan('\n[HUNT] Committing changes...'));
-            try {
-                execSync('git add .', { cwd: ctx.toolContext.projectRoot, windowsHide: true });
-                const cleanTitle = input.replace(/[^a-zA-Z0-9 ]/g, '').trim();
-                execSync(`git commit -m "fix: ${cleanTitle}"`, { cwd: ctx.toolContext.projectRoot, windowsHide: true });
-                console.log(pc.green('[OK] Changes committed.'));
-            }
-            catch (err) {
-                const msg = err instanceof Error ? errMessage(err) : String(err);
-                if (msg.includes('nothing to commit')) {
-                    console.log(pc.yellow('[INFO] No changes to commit.'));
-                }
-                else {
-                    console.log(pc.red(`[ERROR] Failed to commit: ${msg}`));
-                    return;
-                }
-            }
-            // Step 6: Push and PR
-            if (repoInfo) {
-                console.log(pc.cyan('\n[HUNT] Pushing branch and creating PR...'));
-                let token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
-                if (!token) {
-                    try {
-                        token = execSync('gh auth token', { encoding: 'utf8', windowsHide: true }).trim();
-                    }
-                    catch {
-                        console.log(pc.yellow('[INFO] No GitHub token found. Run `gh auth login` or set GITHUB_TOKEN.'));
-                        console.log(pc.yellow(`[INFO] Branch ${branchName} is ready locally. Push manually.`));
-                        return;
-                    }
-                }
-                try {
-                    execSync(`git push -u origin ${branchName} --force`, { cwd: ctx.toolContext.projectRoot, windowsHide: true });
-                    const hasSummary = orchestratorResult && !orchestratorResult.startsWith('Orchestration failed');
-                    const prBody = `## Description\n\nAutonomously fixed by Daedalus Hunt.\n\n**Bug:** ${input}\n${testFailureOutput ? `\n**Failure reproduced:**\n\`\`\`\n${testFailureOutput.slice(0, 1500)}\n\`\`\`\n` : ''}${hasSummary ? `\n**Summary:**\n${orchestratorResult.slice(0, 2000)}` : ''}\n\n---\n_Generated by \`/hunt\`_`;
-                    const prResponse = await fetch(`https://api.github.com/repos/${repoInfo.owner}/${repoInfo.repo}/pulls`, {
-                        method: 'POST',
-                        headers: {
-                            'Authorization': `Bearer ${token}`,
-                            'Content-Type': 'application/json',
-                        },
-                        body: JSON.stringify({
-                            title: `[Hunt] ${input}`,
-                            head: branchName,
-                            base: 'main',
-                            body: prBody,
-                        }),
-                    });
-                    if (prResponse.ok) {
-                        const pr = await prResponse.json();
-                        console.log(pc.green(`\n[OK] Pull Request created: ${pr.html_url}`));
-                    }
-                    else {
-                        const errText = await prResponse.text();
-                        console.log(pc.red(`[ERROR] Failed to create PR: ${prResponse.status} ${errText}`));
-                        console.log(pc.yellow(`[INFO] Branch ${branchName} is pushed. Create PR manually.`));
-                    }
-                }
-                catch (err) {
-                    const msg = err instanceof Error ? errMessage(err) : String(err);
-                    console.log(pc.red(`[ERROR] Push/PR failed: ${msg}`));
-                    console.log(pc.yellow(`[INFO] Branch ${branchName} is ready locally.`));
-                }
-            }
-            else {
-                console.log(pc.yellow('\n[INFO] No GitHub remote configured. Fix is committed locally.'));
-                console.log(pc.yellow(`[INFO] Branch: ${branchName}`));
-            }
-            console.log(pc.cyan(`\n[HUNT] Done! Run 'git checkout main' to return to main branch.`));
-        }
-    },
+    autopilotCommand,
+    huntCommand,
     {
         name: '/preview',
         description: 'Screenshot a local HTML file or URL and save the image',