@pennixrv/trellis 0.7.1-beta.8 → 0.7.1-beta.9

package/dist/commands/init.js

@@ -6,6 +6,7 @@ import chalk from "chalk";
 import figlet from "figlet";
 import inquirer from "inquirer";
 import { createWorkflowStructure } from "../configurators/workflow.js";
+import { withAssetMaintenance } from "../utils/asset-backup.js";
 import { getInitToolChoices, resolveCliFlag, configurePlatform, getConfiguredPlatforms, getPlatformsWithPythonHooks, } from "../configurators/index.js";
 import { getPythonCommandForPlatform, setResolvedPythonCommand, } from "../configurators/shared.js";
 import { AI_TOOLS } from "../types/ai-tools.js";
@@ -837,744 +838,746 @@ function writeMonorepoConfig(cwd, packages) {
     fs.writeFileSync(configPath, content.trimEnd() + "\n" + lines.join("\n") + "\n", "utf-8");
 }
 export async function init(options) {
-    // Refuse to run in $HOME — running here would scoop platform runtime data
-    // (Claude/Codex/OpenCode session histories etc.) into the trellis hash
-    // manifest, and a subsequent `trellis uninstall` would wipe it.
-    if (isCwdHomedir() && !homedirBypassEnabled()) {
-        console.error(chalk.red(homedirGuardMessage("init")));
-        process.exit(1);
-    }
-    // Deprecated alias: --windsurf → --devin (Windsurf was renamed to Devin).
-    // Normalize here too so programmatic callers (not just the CLI action) map
-    // correctly. The CLI action prints the deprecation notice.
-    if (options.windsurf) {
-        options.devin = true;
-        delete options.windsurf;
-    }
-    const cwd = process.cwd();
-    const isFirstInit = !fs.existsSync(path.join(cwd, DIR_NAMES.WORKFLOW));
-    // Captured here (before createWorkflowStructure + init_developer run) so
-    // the three-branch dispatch at the bottom can tell "fresh clone joiner"
-    // (.trellis/ exists, .developer missing) apart from "creator first init".
-    const hadDeveloperFileAtStart = fs.existsSync(path.join(cwd, DIR_NAMES.WORKFLOW, FILE_NAMES.DEVELOPER));
-    // Generate ASCII art banner dynamically using FIGlet "Rebel" font
-    const banner = figlet.textSync("Trellis", { font: "Rebel" });
-    console.log(chalk.cyan(`\n${banner.trimEnd()}`));
-    console.log(chalk.gray("\n   All-in-one AI framework & toolkit for Claude Code & Cursor\n"));
-    // Set up proxy before any network calls
-    const proxyUrl = setupProxy();
-    if (proxyUrl) {
-        console.log(chalk.gray(`   Using proxy: ${maskProxyUrl(proxyUrl)}\n`));
-    }
-    // Set write mode based on options
-    let writeMode = "ask";
-    if (options.force) {
-        writeMode = "force";
-        console.log(chalk.gray("Mode: Force overwrite existing files\n"));
-    }
-    else if (options.skipExisting) {
-        writeMode = "skip";
-        console.log(chalk.gray("Mode: Skip existing files\n"));
-    }
-    else if (options.yes) {
-        // -y implies non-interactive: never prompt on conflicts. Default to skip
-        // (preserve user files) — explicit --force is required to overwrite.
-        writeMode = "skip";
-        console.log(chalk.gray("Mode: Non-interactive (skip existing files)\n"));
-    }
-    setWriteMode(writeMode);
-    // Detect developer name from git config or options
-    let developerName = options.user;
-    if (!developerName) {
-        // Only detect from git if current directory is a git repo
-        const isGitRepo = fs.existsSync(path.join(cwd, ".git"));
-        if (isGitRepo) {
-            try {
-                developerName = execSync("git config user.name", {
-                    cwd,
-                    encoding: "utf-8",
-                }).trim();
-            }
-            catch {
-                // Git not available or no user.name configured
+    return withAssetMaintenance(process.cwd(), async () => {
+        // Refuse to run in $HOME — running here would scoop platform runtime data
+        // (Claude/Codex/OpenCode session histories etc.) into the trellis hash
+        // manifest, and a subsequent `trellis uninstall` would wipe it.
+        if (isCwdHomedir() && !homedirBypassEnabled()) {
+            console.error(chalk.red(homedirGuardMessage("init")));
+            process.exit(1);
+        }
+        // Deprecated alias: --windsurf → --devin (Windsurf was renamed to Devin).
+        // Normalize here too so programmatic callers (not just the CLI action) map
+        // correctly. The CLI action prints the deprecation notice.
+        if (options.windsurf) {
+            options.devin = true;
+            delete options.windsurf;
+        }
+        const cwd = process.cwd();
+        const isFirstInit = !fs.existsSync(path.join(cwd, DIR_NAMES.WORKFLOW));
+        // Captured here (before createWorkflowStructure + init_developer run) so
+        // the three-branch dispatch at the bottom can tell "fresh clone joiner"
+        // (.trellis/ exists, .developer missing) apart from "creator first init".
+        const hadDeveloperFileAtStart = fs.existsSync(path.join(cwd, DIR_NAMES.WORKFLOW, FILE_NAMES.DEVELOPER));
+        // Generate ASCII art banner dynamically using FIGlet "Rebel" font
+        const banner = figlet.textSync("Trellis", { font: "Rebel" });
+        console.log(chalk.cyan(`\n${banner.trimEnd()}`));
+        console.log(chalk.gray("\n   All-in-one AI framework & toolkit for Claude Code & Cursor\n"));
+        // Set up proxy before any network calls
+        const proxyUrl = setupProxy();
+        if (proxyUrl) {
+            console.log(chalk.gray(`   Using proxy: ${maskProxyUrl(proxyUrl)}\n`));
+        }
+        // Set write mode based on options
+        let writeMode = "ask";
+        if (options.force) {
+            writeMode = "force";
+            console.log(chalk.gray("Mode: Force overwrite existing files\n"));
+        }
+        else if (options.skipExisting) {
+            writeMode = "skip";
+            console.log(chalk.gray("Mode: Skip existing files\n"));
+        }
+        else if (options.yes) {
+            // -y implies non-interactive: never prompt on conflicts. Default to skip
+            // (preserve user files) — explicit --force is required to overwrite.
+            writeMode = "skip";
+            console.log(chalk.gray("Mode: Non-interactive (skip existing files)\n"));
+        }
+        setWriteMode(writeMode);
+        // Detect developer name from git config or options
+        let developerName = options.user;
+        if (!developerName) {
+            // Only detect from git if current directory is a git repo
+            const isGitRepo = fs.existsSync(path.join(cwd, ".git"));
+            if (isGitRepo) {
+                try {
+                    developerName = execSync("git config user.name", {
+                        cwd,
+                        encoding: "utf-8",
+                    }).trim();
+                }
+                catch {
+                    // Git not available or no user.name configured
+                }
             }
         }
-    }
-    if (developerName) {
-        console.log(chalk.blue("👤 Developer:"), chalk.gray(developerName));
-    }
-    const { command: pythonCmd } = resolveSupportedPython();
-    // ==========================================================================
-    // Re-init fast path: skip full flow when .trellis/ already exists
-    // ==========================================================================
-    // Aborted-init recovery (issue #204): if .trellis/ exists but tasks/ is
-    // empty, the previous init never reached bootstrap creation. Fall through
-    // to the full flow so the main-dispatch tasksEmpty fallback fires —
-    // handleReinit's joiner branch would otherwise mis-route the recovery.
-    const tasksEmptyEarly = tasksAreEmpty(cwd);
-    const hasTemplateRequest = !!options.template || !!options.registry;
-    if (!isFirstInit &&
-        !options.force &&
-        !options.skipExisting &&
-        !tasksEmptyEarly &&
-        !hasTemplateRequest) {
-        const reinitDone = await handleReinit(cwd, options, developerName, pythonCmd);
-        if (reinitDone)
-            return;
-        // reinitDone === false means user chose "full re-initialize" → fall through
-    }
-    if (!developerName && !options.yes) {
-        // Ask for developer name if not detected and not in yes mode
-        console.log(chalk.gray("\nTrellis supports team collaboration - each developer has their own\n" +
-            `workspace directory (${PATHS.WORKSPACE}/{name}/) to track AI sessions.\n` +
-            "Tip: Usually this is your git username (git config user.name).\n"));
-        developerName = await askInput("Your name: ");
-        while (!developerName) {
-            console.log(chalk.yellow("Name is required"));
+        if (developerName) {
+            console.log(chalk.blue("👤 Developer:"), chalk.gray(developerName));
+        }
+        const { command: pythonCmd } = resolveSupportedPython();
+        // ==========================================================================
+        // Re-init fast path: skip full flow when .trellis/ already exists
+        // ==========================================================================
+        // Aborted-init recovery (issue #204): if .trellis/ exists but tasks/ is
+        // empty, the previous init never reached bootstrap creation. Fall through
+        // to the full flow so the main-dispatch tasksEmpty fallback fires —
+        // handleReinit's joiner branch would otherwise mis-route the recovery.
+        const tasksEmptyEarly = tasksAreEmpty(cwd);
+        const hasTemplateRequest = !!options.template || !!options.registry;
+        if (!isFirstInit &&
+            !options.force &&
+            !options.skipExisting &&
+            !tasksEmptyEarly &&
+            !hasTemplateRequest) {
+            const reinitDone = await handleReinit(cwd, options, developerName, pythonCmd);
+            if (reinitDone)
+                return;
+            // reinitDone === false means user chose "full re-initialize" → fall through
+        }
+        if (!developerName && !options.yes) {
+            // Ask for developer name if not detected and not in yes mode
+            console.log(chalk.gray("\nTrellis supports team collaboration - each developer has their own\n" +
+                `workspace directory (${PATHS.WORKSPACE}/{name}/) to track AI sessions.\n` +
+                "Tip: Usually this is your git username (git config user.name).\n"));
             developerName = await askInput("Your name: ");
+            while (!developerName) {
+                console.log(chalk.yellow("Name is required"));
+                developerName = await askInput("Your name: ");
+            }
+            console.log(chalk.blue("👤 Developer:"), chalk.gray(developerName));
         }
-        console.log(chalk.blue("👤 Developer:"), chalk.gray(developerName));
-    }
-    // Detect project type (silent - no output)
-    const detectedType = detectProjectType(cwd);
-    // Parse custom registry source early (needed by both monorepo + single-repo flows)
-    let registry;
-    let registrySourceForConfig;
-    if (options.registry) {
-        try {
-            registry = parseRegistrySource(options.registry);
-            registrySourceForConfig = options.registry;
+        // Detect project type (silent - no output)
+        const detectedType = detectProjectType(cwd);
+        // Parse custom registry source early (needed by both monorepo + single-repo flows)
+        let registry;
+        let registrySourceForConfig;
+        if (options.registry) {
+            try {
+                registry = parseRegistrySource(options.registry);
+                registrySourceForConfig = options.registry;
+            }
+            catch (error) {
+                console.log(chalk.red(error instanceof Error ? error.message : "Invalid registry source"));
+                return;
+            }
         }
-        catch (error) {
-            console.log(chalk.red(error instanceof Error ? error.message : "Invalid registry source"));
-            return;
+        // Determine template strategy from flags (needed before monorepo template downloads)
+        let templateStrategy = "skip";
+        if (options.overwrite) {
+            templateStrategy = "overwrite";
         }
-    }
-    // Determine template strategy from flags (needed before monorepo template downloads)
-    let templateStrategy = "skip";
-    if (options.overwrite) {
-        templateStrategy = "overwrite";
-    }
-    else if (options.append) {
-        templateStrategy = "append";
-    }
-    // ==========================================================================
-    // Monorepo Detection
-    // ==========================================================================
-    let monorepoPackages;
-    let remoteSpecPackages;
-    if (options.monorepo !== false) {
-        // options.monorepo: true = --monorepo, false = --no-monorepo, undefined = auto
-        const detected = detectMonorepo(cwd);
-        if (options.monorepo === true && !detected) {
-            console.log(chalk.red("Error: --monorepo specified but no multi-package layout detected."));
-            console.log("");
-            console.log(chalk.gray("Checked:"));
-            console.log(chalk.gray("  ✗ pnpm-workspace.yaml"));
-            console.log(chalk.gray("  ✗ package.json workspaces"));
-            console.log(chalk.gray("  ✗ Cargo.toml [workspace]"));
-            console.log(chalk.gray("  ✗ go.work"));
-            console.log(chalk.gray("  ✗ pyproject.toml [tool.uv.workspace]"));
-            console.log(chalk.gray("  ✗ .gitmodules"));
-            console.log(chalk.gray("  ✗ sibling .git directories (need ≥ 2)"));
-            console.log("");
-            console.log("To configure manually, add to .trellis/config.yaml:");
-            console.log("");
-            console.log(chalk.cyan("  packages:"));
-            console.log(chalk.cyan("    frontend:"));
-            console.log(chalk.cyan("      path: ./frontend"));
-            console.log(chalk.cyan("      git: true       # if it has its own .git"));
-            console.log(chalk.cyan("    backend:"));
-            console.log(chalk.cyan("      path: ./backend"));
-            console.log(chalk.cyan("      git: true"));
-            return;
+        else if (options.append) {
+            templateStrategy = "append";
         }
-        if (detected && detected.length > 0) {
-            let enableMonorepo = false;
-            if (options.monorepo === true || options.yes) {
-                enableMonorepo = true;
-            }
-            else {
-                // Show detected packages and ask
-                console.log(chalk.blue("\n🔍 Detected monorepo packages:"));
-                for (const pkg of detected) {
-                    const tag = pkg.isSubmodule
-                        ? chalk.gray(" (submodule)")
-                        : pkg.isGitRepo
-                            ? chalk.gray(" (git repo)")
-                            : "";
-                    console.log(chalk.gray(`   - ${pkg.name}`) +
-                        chalk.gray(` (${pkg.path})`) +
-                        chalk.gray(` [${pkg.type}]`) +
-                        tag);
-                }
+        // ==========================================================================
+        // Monorepo Detection
+        // ==========================================================================
+        let monorepoPackages;
+        let remoteSpecPackages;
+        if (options.monorepo !== false) {
+            // options.monorepo: true = --monorepo, false = --no-monorepo, undefined = auto
+            const detected = detectMonorepo(cwd);
+            if (options.monorepo === true && !detected) {
+                console.log(chalk.red("Error: --monorepo specified but no multi-package layout detected."));
                 console.log("");
-                const { useMonorepo } = await inquirer.prompt([
-                    {
-                        type: "confirm",
-                        name: "useMonorepo",
-                        message: "Enable monorepo mode?",
-                        default: true,
-                    },
-                ]);
-                enableMonorepo = useMonorepo;
+                console.log(chalk.gray("Checked:"));
+                console.log(chalk.gray("  ✗ pnpm-workspace.yaml"));
+                console.log(chalk.gray("  ✗ package.json workspaces"));
+                console.log(chalk.gray("  ✗ Cargo.toml [workspace]"));
+                console.log(chalk.gray("  ✗ go.work"));
+                console.log(chalk.gray("  ✗ pyproject.toml [tool.uv.workspace]"));
+                console.log(chalk.gray("  ✗ .gitmodules"));
+                console.log(chalk.gray("  ✗ sibling .git directories (need ≥ 2)"));
+                console.log("");
+                console.log("To configure manually, add to .trellis/config.yaml:");
+                console.log("");
+                console.log(chalk.cyan("  packages:"));
+                console.log(chalk.cyan("    frontend:"));
+                console.log(chalk.cyan("      path: ./frontend"));
+                console.log(chalk.cyan("      git: true       # if it has its own .git"));
+                console.log(chalk.cyan("    backend:"));
+                console.log(chalk.cyan("      path: ./backend"));
+                console.log(chalk.cyan("      git: true"));
+                return;
             }
-            if (enableMonorepo) {
-                monorepoPackages = detected;
-                remoteSpecPackages = new Set();
-                // Per-package template selection (unless -y mode: all use blank spec)
-                if (!options.yes && !options.template) {
+            if (detected && detected.length > 0) {
+                let enableMonorepo = false;
+                if (options.monorepo === true || options.yes) {
+                    enableMonorepo = true;
+                }
+                else {
+                    // Show detected packages and ask
+                    console.log(chalk.blue("\n🔍 Detected monorepo packages:"));
                     for (const pkg of detected) {
-                        const { specSource } = await inquirer.prompt([
-                            {
-                                type: "list",
-                                name: "specSource",
-                                message: `Spec source for ${pkg.name} (${pkg.path}):`,
-                                choices: [
-                                    { name: "From scratch (Trellis default)", value: "blank" },
-                                    { name: "Download remote template", value: "remote" },
-                                ],
-                                default: "blank",
-                            },
-                        ]);
-                        if (specSource === "remote") {
-                            // Use existing template download flow, targeting spec/<name>/
-                            const destDir = path.join(cwd, PATHS.SPEC, sanitizePkgName(pkg.name));
-                            console.log(chalk.blue(`📦 Select template for ${pkg.name}...`));
-                            // Fetch templates if not already done
-                            const templates = await fetchTemplateIndex();
-                            const specTemplates = templates
-                                .filter((t) => t.type === "spec")
-                                .map((t) => ({
-                                name: `${t.id} (${t.name})`,
-                                value: t.id,
-                            }));
-                            if (specTemplates.length > 0) {
-                                const { templateId } = await inquirer.prompt([
-                                    {
-                                        type: "list",
-                                        name: "templateId",
-                                        message: `Select template for ${pkg.name}:`,
-                                        choices: specTemplates,
-                                    },
-                                ]);
-                                const result = await downloadTemplateById(cwd, templateId, templateStrategy, templates.find((t) => t.id === templateId), undefined, destDir);
-                                if (result.success) {
-                                    console.log(chalk.green(`   ${result.message}`));
-                                    remoteSpecPackages.add(sanitizePkgName(pkg.name));
+                        const tag = pkg.isSubmodule
+                            ? chalk.gray(" (submodule)")
+                            : pkg.isGitRepo
+                                ? chalk.gray(" (git repo)")
+                                : "";
+                        console.log(chalk.gray(`   - ${pkg.name}`) +
+                            chalk.gray(` (${pkg.path})`) +
+                            chalk.gray(` [${pkg.type}]`) +
+                            tag);
+                    }
+                    console.log("");
+                    const { useMonorepo } = await inquirer.prompt([
+                        {
+                            type: "confirm",
+                            name: "useMonorepo",
+                            message: "Enable monorepo mode?",
+                            default: true,
+                        },
+                    ]);
+                    enableMonorepo = useMonorepo;
+                }
+                if (enableMonorepo) {
+                    monorepoPackages = detected;
+                    remoteSpecPackages = new Set();
+                    // Per-package template selection (unless -y mode: all use blank spec)
+                    if (!options.yes && !options.template) {
+                        for (const pkg of detected) {
+                            const { specSource } = await inquirer.prompt([
+                                {
+                                    type: "list",
+                                    name: "specSource",
+                                    message: `Spec source for ${pkg.name} (${pkg.path}):`,
+                                    choices: [
+                                        { name: "From scratch (Trellis default)", value: "blank" },
+                                        { name: "Download remote template", value: "remote" },
+                                    ],
+                                    default: "blank",
+                                },
+                            ]);
+                            if (specSource === "remote") {
+                                // Use existing template download flow, targeting spec/<name>/
+                                const destDir = path.join(cwd, PATHS.SPEC, sanitizePkgName(pkg.name));
+                                console.log(chalk.blue(`📦 Select template for ${pkg.name}...`));
+                                // Fetch templates if not already done
+                                const templates = await fetchTemplateIndex();
+                                const specTemplates = templates
+                                    .filter((t) => t.type === "spec")
+                                    .map((t) => ({
+                                    name: `${t.id} (${t.name})`,
+                                    value: t.id,
+                                }));
+                                if (specTemplates.length > 0) {
+                                    const { templateId } = await inquirer.prompt([
+                                        {
+                                            type: "list",
+                                            name: "templateId",
+                                            message: `Select template for ${pkg.name}:`,
+                                            choices: specTemplates,
+                                        },
+                                    ]);
+                                    const result = await downloadTemplateById(cwd, templateId, templateStrategy, templates.find((t) => t.id === templateId), undefined, destDir);
+                                    if (result.success) {
+                                        console.log(chalk.green(`   ${result.message}`));
+                                        remoteSpecPackages.add(sanitizePkgName(pkg.name));
+                                    }
+                                    else {
+                                        console.log(chalk.yellow(`   ${result.message}`));
+                                        console.log(chalk.gray("   Falling back to blank spec..."));
+                                    }
                                 }
                                 else {
-                                    console.log(chalk.yellow(`   ${result.message}`));
-                                    console.log(chalk.gray("   Falling back to blank spec..."));
+                                    console.log(chalk.gray("   No templates available. Using blank spec."));
                                 }
                             }
-                            else {
-                                console.log(chalk.gray("   No templates available. Using blank spec."));
-                            }
                         }
                     }
-                }
-                else if (options.template) {
-                    // --template as default for all packages
-                    for (const pkg of detected) {
-                        const destDir = path.join(cwd, PATHS.SPEC, sanitizePkgName(pkg.name));
-                        const result = await downloadTemplateById(cwd, options.template, templateStrategy, undefined, registry, destDir);
-                        if (result.success && !result.skipped) {
-                            remoteSpecPackages.add(sanitizePkgName(pkg.name));
+                    else if (options.template) {
+                        // --template as default for all packages
+                        for (const pkg of detected) {
+                            const destDir = path.join(cwd, PATHS.SPEC, sanitizePkgName(pkg.name));
+                            const result = await downloadTemplateById(cwd, options.template, templateStrategy, undefined, registry, destDir);
+                            if (result.success && !result.skipped) {
+                                remoteSpecPackages.add(sanitizePkgName(pkg.name));
+                            }
                         }
                     }
                 }
             }
         }
-    }
-    // Tool definitions derived from platform registry
-    const TOOLS = getInitToolChoices();
-    // Build tools from explicit flags
-    const explicitTools = TOOLS.filter((t) => options[t.key]).map((t) => t.key);
-    let tools;
-    if (explicitTools.length > 0) {
-        // Explicit flags take precedence (works with or without -y)
-        tools = explicitTools;
-    }
-    else if (options.yes) {
-        // No explicit tools + -y: default to Cursor and Claude
-        tools = TOOLS.filter((t) => t.defaultChecked).map((t) => t.key);
-    }
-    else {
-        // Interactive mode
-        const answers = await inquirer.prompt([
-            {
-                type: "checkbox",
-                name: "tools",
-                message: "Select AI tools to configure:",
-                choices: TOOLS.map((t) => ({
-                    name: t.name,
-                    value: t.key,
-                    checked: t.defaultChecked,
-                })),
-            },
-        ]);
-        tools = answers.tools;
-    }
-    // Treat unknown project type as fullstack
-    const projectType = detectedType === "unknown" ? "fullstack" : detectedType;
-    if (tools.length === 0) {
-        console.log(chalk.yellow("No tools selected. At least one tool is required."));
-        return;
-    }
-    // Opt-in Claude Code statusLine: confirm interactively when the flag wasn't passed
-    await maybePromptStatuslineOptIn(options, tools);
-    // ==========================================================================
-    // Template Selection (single-repo only; monorepo handles templates above)
-    // ==========================================================================
-    let selectedTemplate = null;
-    // Pre-fetched templates list (used to pass selected SpecTemplate to downloadTemplateById)
-    let fetchedTemplates = [];
-    let registryBackend;
-    // Determine the index URL based on registry
-    const indexUrl = registry
-        ? `${registry.rawBaseUrl}/index.json`
-        : TEMPLATE_INDEX_URL;
-    if (monorepoPackages) {
-        // Monorepo: template selection already handled above
-    }
-    else if (options.template) {
-        // Template specified via --template flag
-        selectedTemplate = options.template;
-        if (registry) {
-            const probeResult = await probeRegistryIndex(indexUrl, registry);
-            registryBackend = probeResult.backend;
-            if (probeResult.error) {
-                console.log(chalk.red(`Error: ${probeResult.error.message}`));
-                return;
-            }
-            if (probeResult.isNotFound) {
-                console.log(chalk.red("Error: Registry has no index.json. Remove --template to use direct download mode."));
-                return;
-            }
-            fetchedTemplates = probeResult.templates;
+        // Tool definitions derived from platform registry
+        const TOOLS = getInitToolChoices();
+        // Build tools from explicit flags
+        const explicitTools = TOOLS.filter((t) => options[t.key]).map((t) => t.key);
+        let tools;
+        if (explicitTools.length > 0) {
+            // Explicit flags take precedence (works with or without -y)
+            tools = explicitTools;
         }
-    }
-    else if (!options.yes) {
-        // Interactive mode: show template selection
-        const timeoutSec = TIMEOUTS.INDEX_FETCH_MS / 1000;
-        const sourceLabel = registry ? registry.gigetSource : TEMPLATE_INDEX_URL;
-        console.log(chalk.gray(`   Fetching available templates from ${sourceLabel}`));
-        let elapsed = 0;
-        const ticker = setInterval(() => {
-            elapsed++;
-            process.stdout.write(`\r${chalk.gray(`   Loading... ${elapsed}s/${timeoutSec}s`)}`);
-        }, 1000);
-        process.stdout.write(chalk.gray(`   Loading... 0s/${timeoutSec}s`));
-        let templates;
-        let registryProbeNotFound = false;
-        let registryProbeError;
-        if (registry) {
-            const probeResult = await probeRegistryIndex(indexUrl, registry);
-            templates = probeResult.templates;
-            registryProbeNotFound = probeResult.isNotFound;
-            registryProbeError = probeResult.error;
-            registryBackend = probeResult.backend;
+        else if (options.yes) {
+            // No explicit tools + -y: default to Cursor and Claude
+            tools = TOOLS.filter((t) => t.defaultChecked).map((t) => t.key);
         }
         else {
-            templates = await fetchTemplateIndex(indexUrl);
+            // Interactive mode
+            const answers = await inquirer.prompt([
+                {
+                    type: "checkbox",
+                    name: "tools",
+                    message: "Select AI tools to configure:",
+                    choices: TOOLS.map((t) => ({
+                        name: t.name,
+                        value: t.key,
+                        checked: t.defaultChecked,
+                    })),
+                },
+            ]);
+            tools = answers.tools;
         }
-        clearInterval(ticker);
-        // Clear the loading line
-        process.stdout.write("\r\x1b[2K");
-        fetchedTemplates = templates;
-        if (templates.length === 0 && registry && registryProbeNotFound) {
-            // Custom registry: confirmed no index.json — will try direct download later
-            console.log(chalk.gray("   No index.json found at registry. Will download as direct spec template."));
-        }
-        else if (templates.length === 0 && registry) {
-            // Custom registry: transient error (not a 404) — abort, don't misclassify
-            console.log(chalk.red(`   ${registryProbeError?.message ?? "Could not reach registry. Check your connection and try again."}`));
+        // Treat unknown project type as fullstack
+        const projectType = detectedType === "unknown" ? "fullstack" : detectedType;
+        if (tools.length === 0) {
+            console.log(chalk.yellow("No tools selected. At least one tool is required."));
             return;
         }
-        else if (templates.length === 0) {
-            console.log(chalk.gray("   Could not fetch templates (offline or server unavailable)."));
-            console.log(chalk.gray("   Using blank templates.\n"));
+        // Opt-in Claude Code statusLine: confirm interactively when the flag wasn't passed
+        await maybePromptStatuslineOptIn(options, tools);
+        // ==========================================================================
+        // Template Selection (single-repo only; monorepo handles templates above)
+        // ==========================================================================
+        let selectedTemplate = null;
+        // Pre-fetched templates list (used to pass selected SpecTemplate to downloadTemplateById)
+        let fetchedTemplates = [];
+        let registryBackend;
+        // Determine the index URL based on registry
+        const indexUrl = registry
+            ? `${registry.rawBaseUrl}/index.json`
+            : TEMPLATE_INDEX_URL;
+        if (monorepoPackages) {
+            // Monorepo: template selection already handled above
         }
-        if (templates.length > 0) {
-            // Build template choices
-            const specTemplates = templates
-                .filter((t) => t.type === "spec")
-                .map((t) => ({
-                name: `${t.id} (${t.name})`,
-                value: t.id,
-            }));
-            const templateChoices = registry
-                ? specTemplates
-                : [
-                    {
-                        name: "from scratch (default)",
-                        value: "blank",
-                    },
-                    ...specTemplates,
-                    {
-                        name: "custom (enter a registry source)",
-                        value: "__custom__",
-                    },
-                ];
-            // Loop to allow returning from custom source input back to the picker
-            let templatePicked = false;
-            while (templateChoices.length > 0 && !templatePicked) {
-                const templateAnswer = await inquirer.prompt([
-                    {
-                        type: "list",
-                        name: "template",
-                        message: "Select a spec template:",
-                        choices: templateChoices,
-                        default: registry ? undefined : "blank",
-                    },
-                ]);
-                if (templateAnswer.template === "__custom__") {
-                    // Prompt for custom registry source (empty → back to picker)
-                    const customSource = await askInput("Enter registry source (e.g., gh:myorg/myrepo/specs), or press Enter to go back: ");
-                    if (!customSource) {
-                        continue; // Back to picker
-                    }
-                    try {
-                        registry = parseRegistrySource(customSource);
-                        registrySourceForConfig = customSource;
-                        fetchedTemplates = []; // Reset so direct-download guard works correctly
-                        // Probe index.json to detect marketplace vs direct download
-                        const customIndexUrl = `${registry.rawBaseUrl}/index.json`;
-                        console.log(chalk.gray(`   Checking for templates at ${registry.gigetSource}...`));
-                        const customProbe = await probeRegistryIndex(customIndexUrl, registry);
-                        const customTemplates = customProbe.templates;
-                        registryBackend = customProbe.backend;
-                        if (customTemplates.length > 0) {
-                            // Marketplace mode: show picker with custom templates
-                            fetchedTemplates = customTemplates;
-                            const customChoices = customTemplates
-                                .filter((t) => t.type === "spec")
-                                .map((t) => ({
-                                name: `${t.id} (${t.name})`,
-                                value: t.id,
-                            }));
-                            if (customChoices.length > 0) {
-                                const customAnswer = await inquirer.prompt([
-                                    {
-                                        type: "list",
-                                        name: "template",
-                                        message: "Select a spec template:",
-                                        choices: customChoices,
-                                    },
-                                ]);
-                                selectedTemplate = customAnswer.template;
-                                // Check if spec directory already exists and ask what to do
-                                const specDir = path.join(cwd, PATHS.SPEC);
-                                if (fs.existsSync(specDir) &&
-                                    !options.overwrite &&
-                                    !options.append) {
-                                    const actionAnswer = await inquirer.prompt([
+        else if (options.template) {
+            // Template specified via --template flag
+            selectedTemplate = options.template;
+            if (registry) {
+                const probeResult = await probeRegistryIndex(indexUrl, registry);
+                registryBackend = probeResult.backend;
+                if (probeResult.error) {
+                    console.log(chalk.red(`Error: ${probeResult.error.message}`));
+                    return;
+                }
+                if (probeResult.isNotFound) {
+                    console.log(chalk.red("Error: Registry has no index.json. Remove --template to use direct download mode."));
+                    return;
+                }
+                fetchedTemplates = probeResult.templates;
+            }
+        }
+        else if (!options.yes) {
+            // Interactive mode: show template selection
+            const timeoutSec = TIMEOUTS.INDEX_FETCH_MS / 1000;
+            const sourceLabel = registry ? registry.gigetSource : TEMPLATE_INDEX_URL;
+            console.log(chalk.gray(`   Fetching available templates from ${sourceLabel}`));
+            let elapsed = 0;
+            const ticker = setInterval(() => {
+                elapsed++;
+                process.stdout.write(`\r${chalk.gray(`   Loading... ${elapsed}s/${timeoutSec}s`)}`);
+            }, 1000);
+            process.stdout.write(chalk.gray(`   Loading... 0s/${timeoutSec}s`));
+            let templates;
+            let registryProbeNotFound = false;
+            let registryProbeError;
+            if (registry) {
+                const probeResult = await probeRegistryIndex(indexUrl, registry);
+                templates = probeResult.templates;
+                registryProbeNotFound = probeResult.isNotFound;
+                registryProbeError = probeResult.error;
+                registryBackend = probeResult.backend;
+            }
+            else {
+                templates = await fetchTemplateIndex(indexUrl);
+            }
+            clearInterval(ticker);
+            // Clear the loading line
+            process.stdout.write("\r\x1b[2K");
+            fetchedTemplates = templates;
+            if (templates.length === 0 && registry && registryProbeNotFound) {
+                // Custom registry: confirmed no index.json — will try direct download later
+                console.log(chalk.gray("   No index.json found at registry. Will download as direct spec template."));
+            }
+            else if (templates.length === 0 && registry) {
+                // Custom registry: transient error (not a 404) — abort, don't misclassify
+                console.log(chalk.red(`   ${registryProbeError?.message ?? "Could not reach registry. Check your connection and try again."}`));
+                return;
+            }
+            else if (templates.length === 0) {
+                console.log(chalk.gray("   Could not fetch templates (offline or server unavailable)."));
+                console.log(chalk.gray("   Using blank templates.\n"));
+            }
+            if (templates.length > 0) {
+                // Build template choices
+                const specTemplates = templates
+                    .filter((t) => t.type === "spec")
+                    .map((t) => ({
+                    name: `${t.id} (${t.name})`,
+                    value: t.id,
+                }));
+                const templateChoices = registry
+                    ? specTemplates
+                    : [
+                        {
+                            name: "from scratch (default)",
+                            value: "blank",
+                        },
+                        ...specTemplates,
+                        {
+                            name: "custom (enter a registry source)",
+                            value: "__custom__",
+                        },
+                    ];
+                // Loop to allow returning from custom source input back to the picker
+                let templatePicked = false;
+                while (templateChoices.length > 0 && !templatePicked) {
+                    const templateAnswer = await inquirer.prompt([
+                        {
+                            type: "list",
+                            name: "template",
+                            message: "Select a spec template:",
+                            choices: templateChoices,
+                            default: registry ? undefined : "blank",
+                        },
+                    ]);
+                    if (templateAnswer.template === "__custom__") {
+                        // Prompt for custom registry source (empty → back to picker)
+                        const customSource = await askInput("Enter registry source (e.g., gh:myorg/myrepo/specs), or press Enter to go back: ");
+                        if (!customSource) {
+                            continue; // Back to picker
+                        }
+                        try {
+                            registry = parseRegistrySource(customSource);
+                            registrySourceForConfig = customSource;
+                            fetchedTemplates = []; // Reset so direct-download guard works correctly
+                            // Probe index.json to detect marketplace vs direct download
+                            const customIndexUrl = `${registry.rawBaseUrl}/index.json`;
+                            console.log(chalk.gray(`   Checking for templates at ${registry.gigetSource}...`));
+                            const customProbe = await probeRegistryIndex(customIndexUrl, registry);
+                            const customTemplates = customProbe.templates;
+                            registryBackend = customProbe.backend;
+                            if (customTemplates.length > 0) {
+                                // Marketplace mode: show picker with custom templates
+                                fetchedTemplates = customTemplates;
+                                const customChoices = customTemplates
+                                    .filter((t) => t.type === "spec")
+                                    .map((t) => ({
+                                    name: `${t.id} (${t.name})`,
+                                    value: t.id,
+                                }));
+                                if (customChoices.length > 0) {
+                                    const customAnswer = await inquirer.prompt([
                                         {
                                             type: "list",
-                                            name: "action",
-                                            message: `Directory ${PATHS.SPEC} already exists. What do you want to do?`,
-                                            choices: [
-                                                { name: "Skip (keep existing)", value: "skip" },
-                                                {
-                                                    name: "Overwrite (replace all)",
-                                                    value: "overwrite",
-                                                },
-                                                {
-                                                    name: "Append (add missing files only)",
-                                                    value: "append",
-                                                },
-                                            ],
-                                            default: "skip",
+                                            name: "template",
+                                            message: "Select a spec template:",
+                                            choices: customChoices,
                                         },
                                     ]);
-                                    templateStrategy = actionAnswer.action;
+                                    selectedTemplate = customAnswer.template;
+                                    // Check if spec directory already exists and ask what to do
+                                    const specDir = path.join(cwd, PATHS.SPEC);
+                                    if (fs.existsSync(specDir) &&
+                                        !options.overwrite &&
+                                        !options.append) {
+                                        const actionAnswer = await inquirer.prompt([
+                                            {
+                                                type: "list",
+                                                name: "action",
+                                                message: `Directory ${PATHS.SPEC} already exists. What do you want to do?`,
+                                                choices: [
+                                                    { name: "Skip (keep existing)", value: "skip" },
+                                                    {
+                                                        name: "Overwrite (replace all)",
+                                                        value: "overwrite",
+                                                    },
+                                                    {
+                                                        name: "Append (add missing files only)",
+                                                        value: "append",
+                                                    },
+                                                ],
+                                                default: "skip",
+                                            },
+                                        ]);
+                                        templateStrategy = actionAnswer.action;
+                                    }
                                 }
+                                templatePicked = true;
+                            }
+                            else if (customProbe.isNotFound) {
+                                // No index.json → direct download mode
+                                templatePicked = true;
+                            }
+                            else {
+                                // Transient error (not 404) — loop back, don't misclassify
+                                console.log(chalk.yellow(`   ${customProbe.error?.message ?? "Could not reach registry. Try again or enter a different source."}`));
+                                registry = undefined; // Reset so we don't fall through to direct download
+                                registrySourceForConfig = undefined;
                             }
-                            templatePicked = true;
-                        }
-                        else if (customProbe.isNotFound) {
-                            // No index.json → direct download mode
-                            templatePicked = true;
                         }
-                        else {
-                            // Transient error (not 404) — loop back, don't misclassify
-                            console.log(chalk.yellow(`   ${customProbe.error?.message ?? "Could not reach registry. Try again or enter a different source."}`));
-                            registry = undefined; // Reset so we don't fall through to direct download
-                            registrySourceForConfig = undefined;
+                        catch (error) {
+                            console.log(chalk.red(error instanceof Error
+                                ? error.message
+                                : "Invalid registry source"));
+                            // Loop back to picker
                         }
                     }
-                    catch (error) {
-                        console.log(chalk.red(error instanceof Error
-                            ? error.message
-                            : "Invalid registry source"));
-                        // Loop back to picker
-                    }
-                }
-                else {
-                    templatePicked = true;
-                    if (templateAnswer.template !== "blank") {
-                        selectedTemplate = templateAnswer.template;
-                        // Check if spec directory already exists and ask what to do
-                        const specDir = path.join(cwd, PATHS.SPEC);
-                        if (fs.existsSync(specDir) &&
-                            !options.overwrite &&
-                            !options.append) {
-                            const actionAnswer = await inquirer.prompt([
-                                {
-                                    type: "list",
-                                    name: "action",
-                                    message: `Directory ${PATHS.SPEC} already exists. What do you want to do?`,
-                                    choices: [
-                                        { name: "Skip (keep existing)", value: "skip" },
-                                        { name: "Overwrite (replace all)", value: "overwrite" },
-                                        {
-                                            name: "Append (add missing files only)",
-                                            value: "append",
-                                        },
-                                    ],
-                                    default: "skip",
-                                },
-                            ]);
-                            templateStrategy = actionAnswer.action;
+                    else {
+                        templatePicked = true;
+                        if (templateAnswer.template !== "blank") {
+                            selectedTemplate = templateAnswer.template;
+                            // Check if spec directory already exists and ask what to do
+                            const specDir = path.join(cwd, PATHS.SPEC);
+                            if (fs.existsSync(specDir) &&
+                                !options.overwrite &&
+                                !options.append) {
+                                const actionAnswer = await inquirer.prompt([
+                                    {
+                                        type: "list",
+                                        name: "action",
+                                        message: `Directory ${PATHS.SPEC} already exists. What do you want to do?`,
+                                        choices: [
+                                            { name: "Skip (keep existing)", value: "skip" },
+                                            { name: "Overwrite (replace all)", value: "overwrite" },
+                                            {
+                                                name: "Append (add missing files only)",
+                                                value: "append",
+                                            },
+                                        ],
+                                        default: "skip",
+                                    },
+                                ]);
+                                templateStrategy = actionAnswer.action;
+                            }
                         }
                     }
                 }
             }
         }
-    }
-    // -y mode with --registry (no --template): probe index.json to detect mode
-    // Skip when monorepo mode already handled templates above
-    if (options.yes && registry && !selectedTemplate && !monorepoPackages) {
-        const probeResult = await probeRegistryIndex(`${registry.rawBaseUrl}/index.json`, registry);
-        registryBackend = probeResult.backend;
-        if (probeResult.templates.length > 0) {
-            // Marketplace mode requires interactive selection — can't auto-select
-            console.log(chalk.red("Error: Registry is a marketplace with multiple templates. " +
-                "Use --template <id> to specify which one, or remove -y for interactive selection."));
-            return;
-        }
-        if (!probeResult.isNotFound) {
-            // Transient error (not 404) — abort, don't misclassify as direct-download
-            console.log(chalk.red(`Error: ${probeResult.error?.message ?? "Could not reach registry. Check your connection and try again."}`));
-            return;
+        // -y mode with --registry (no --template): probe index.json to detect mode
+        // Skip when monorepo mode already handled templates above
+        if (options.yes && registry && !selectedTemplate && !monorepoPackages) {
+            const probeResult = await probeRegistryIndex(`${registry.rawBaseUrl}/index.json`, registry);
+            registryBackend = probeResult.backend;
+            if (probeResult.templates.length > 0) {
+                // Marketplace mode requires interactive selection — can't auto-select
+                console.log(chalk.red("Error: Registry is a marketplace with multiple templates. " +
+                    "Use --template <id> to specify which one, or remove -y for interactive selection."));
+                return;
+            }
+            if (!probeResult.isNotFound) {
+                // Transient error (not 404) — abort, don't misclassify as direct-download
+                console.log(chalk.red(`Error: ${probeResult.error?.message ?? "Could not reach registry. Check your connection and try again."}`));
+                return;
+            }
+            // isNotFound=true → no index.json, proceed with direct download (fetchedTemplates stays empty)
         }
-        // isNotFound=true → no index.json, proceed with direct download (fetchedTemplates stays empty)
-    }
-    // ==========================================================================
-    // Download Remote Template (if selected or direct registry download)
-    // ==========================================================================
-    let useRemoteTemplate = false;
-    let registrySpecConfigToPersist = null;
-    if (selectedTemplate) {
-        // Marketplace mode: download specific template by ID
-        console.log(chalk.blue(`📦 Downloading template "${selectedTemplate}"...`));
-        console.log(chalk.gray("   This may take a moment on slow connections."));
-        // Find pre-fetched SpecTemplate to avoid double-fetch
-        const prefetched = fetchedTemplates.find((t) => t.id === selectedTemplate);
-        const result = await downloadTemplateById(cwd, selectedTemplate, templateStrategy, prefetched, registry, undefined, registryBackend);
-        if (result.success) {
-            if (result.skipped) {
-                console.log(chalk.gray(`   ${result.message}`));
+        // ==========================================================================
+        // Download Remote Template (if selected or direct registry download)
+        // ==========================================================================
+        let useRemoteTemplate = false;
+        let registrySpecConfigToPersist = null;
+        if (selectedTemplate) {
+            // Marketplace mode: download specific template by ID
+            console.log(chalk.blue(`📦 Downloading template "${selectedTemplate}"...`));
+            console.log(chalk.gray("   This may take a moment on slow connections."));
+            // Find pre-fetched SpecTemplate to avoid double-fetch
+            const prefetched = fetchedTemplates.find((t) => t.id === selectedTemplate);
+            const result = await downloadTemplateById(cwd, selectedTemplate, templateStrategy, prefetched, registry, undefined, registryBackend);
+            if (result.success) {
+                if (result.skipped) {
+                    console.log(chalk.gray(`   ${result.message}`));
+                }
+                else {
+                    console.log(chalk.green(`   ${result.message}`));
+                    useRemoteTemplate = true;
+                    if (registry) {
+                        registrySpecConfigToPersist = {
+                            source: registrySourceForConfig ?? registry.gigetSource,
+                            template: selectedTemplate,
+                        };
+                    }
+                }
             }
             else {
-                console.log(chalk.green(`   ${result.message}`));
-                useRemoteTemplate = true;
-                if (registry) {
+                console.log(chalk.yellow(`   ${result.message}`));
+                console.log(chalk.gray("   Falling back to blank templates..."));
+                const retryCmd = registry
+                    ? `trellis init --registry ${registry.gigetSource} --template ${selectedTemplate}`
+                    : `trellis init --template ${selectedTemplate}`;
+                console.log(chalk.gray(`   You can retry later: ${retryCmd}`));
+            }
+        }
+        else if (registry && fetchedTemplates.length === 0) {
+            // Direct download mode: registry has no index.json, download directory directly
+            console.log(chalk.blue(`📦 Downloading spec from ${registry.gigetSource}...`));
+            console.log(chalk.gray("   This may take a moment on slow connections."));
+            // Ask about existing spec dir in interactive mode
+            if (!options.yes && !options.overwrite && !options.append) {
+                const specDir = path.join(cwd, PATHS.SPEC);
+                if (fs.existsSync(specDir)) {
+                    const actionAnswer = await inquirer.prompt([
+                        {
+                            type: "list",
+                            name: "action",
+                            message: `Directory ${PATHS.SPEC} already exists. What do you want to do?`,
+                            choices: [
+                                { name: "Skip (keep existing)", value: "skip" },
+                                { name: "Overwrite (replace all)", value: "overwrite" },
+                                { name: "Append (add missing files only)", value: "append" },
+                            ],
+                            default: "skip",
+                        },
+                    ]);
+                    templateStrategy = actionAnswer.action;
+                }
+            }
+            const result = await downloadRegistryDirect(cwd, registry, templateStrategy, undefined, registryBackend);
+            if (result.success) {
+                if (result.skipped) {
+                    console.log(chalk.gray(`   ${result.message}`));
+                }
+                else {
+                    console.log(chalk.green(`   ${result.message}`));
+                    useRemoteTemplate = true;
                     registrySpecConfigToPersist = {
                         source: registrySourceForConfig ?? registry.gigetSource,
-                        template: selectedTemplate,
                     };
                 }
             }
-        }
-        else {
-            console.log(chalk.yellow(`   ${result.message}`));
-            console.log(chalk.gray("   Falling back to blank templates..."));
-            const retryCmd = registry
-                ? `trellis init --registry ${registry.gigetSource} --template ${selectedTemplate}`
-                : `trellis init --template ${selectedTemplate}`;
-            console.log(chalk.gray(`   You can retry later: ${retryCmd}`));
-        }
-    }
-    else if (registry && fetchedTemplates.length === 0) {
-        // Direct download mode: registry has no index.json, download directory directly
-        console.log(chalk.blue(`📦 Downloading spec from ${registry.gigetSource}...`));
-        console.log(chalk.gray("   This may take a moment on slow connections."));
-        // Ask about existing spec dir in interactive mode
-        if (!options.yes && !options.overwrite && !options.append) {
-            const specDir = path.join(cwd, PATHS.SPEC);
-            if (fs.existsSync(specDir)) {
-                const actionAnswer = await inquirer.prompt([
-                    {
-                        type: "list",
-                        name: "action",
-                        message: `Directory ${PATHS.SPEC} already exists. What do you want to do?`,
-                        choices: [
-                            { name: "Skip (keep existing)", value: "skip" },
-                            { name: "Overwrite (replace all)", value: "overwrite" },
-                            { name: "Append (add missing files only)", value: "append" },
-                        ],
-                        default: "skip",
-                    },
-                ]);
-                templateStrategy = actionAnswer.action;
-            }
-        }
-        const result = await downloadRegistryDirect(cwd, registry, templateStrategy, undefined, registryBackend);
-        if (result.success) {
-            if (result.skipped) {
-                console.log(chalk.gray(`   ${result.message}`));
-            }
             else {
-                console.log(chalk.green(`   ${result.message}`));
-                useRemoteTemplate = true;
-                registrySpecConfigToPersist = {
-                    source: registrySourceForConfig ?? registry.gigetSource,
-                };
+                console.log(chalk.yellow(`   ${result.message}`));
+                console.log(chalk.gray("   Falling back to blank templates..."));
+                console.log(chalk.gray(`   You can retry later: trellis init --registry ${registry.gigetSource}`));
             }
         }
-        else {
-            console.log(chalk.yellow(`   ${result.message}`));
-            console.log(chalk.gray("   Falling back to blank templates..."));
-            console.log(chalk.gray(`   You can retry later: trellis init --registry ${registry.gigetSource}`));
-        }
-    }
-    // ==========================================================================
-    // Resolve workflow template (default: native bundled)
-    // ==========================================================================
-    const workflowIdInput = options.workflow?.trim();
-    const workflowId = workflowIdInput && workflowIdInput.length > 0
-        ? workflowIdInput
-        : NATIVE_WORKFLOW_ID;
-    let workflowMdOverride;
-    if (workflowId !== NATIVE_WORKFLOW_ID || options.workflowSource) {
-        const resolved = await resolveWorkflowTemplate(workflowId, {
-            source: options.workflowSource,
-        });
-        if (resolved.id !== NATIVE_WORKFLOW_ID) {
-            workflowMdOverride = resolved.content;
-            console.log(chalk.blue(`🧭 Using workflow template: ${chalk.cyan(resolved.id)}`));
-        }
-    }
-    // ==========================================================================
-    // Create Workflow Structure
-    // ==========================================================================
-    // Record every successful write from here through createRootFiles. The
-    // captured set is the source of truth for `.template-hashes.json`'s
-    // platform/root entries — replacing the previous "walk every managed dir"
-    // approach that swept user-owned runtime files into the manifest
-    // (.codex/sessions/, .claude/projects/, pre-existing AGENTS.md).
-    const writtenPaths = startRecordingWrites(cwd);
-    try {
-        // Create workflow structure with project type
-        console.log(chalk.blue("📁 Creating workflow structure..."));
-        await createWorkflowStructure(cwd, {
-            projectType,
-            skipSpecTemplates: useRemoteTemplate,
-            packages: monorepoPackages,
-            remoteSpecPackages,
-            workflowMdOverride,
-        });
-        // Write monorepo packages to config.yaml (non-destructive patch)
-        if (monorepoPackages) {
-            writeMonorepoConfig(cwd, monorepoPackages);
-            console.log(chalk.blue("📦 Monorepo packages written to config.yaml"));
+        // ==========================================================================
+        // Resolve workflow template (default: native bundled)
+        // ==========================================================================
+        const workflowIdInput = options.workflow?.trim();
+        const workflowId = workflowIdInput && workflowIdInput.length > 0
+            ? workflowIdInput
+            : NATIVE_WORKFLOW_ID;
+        let workflowMdOverride;
+        if (workflowId !== NATIVE_WORKFLOW_ID || options.workflowSource) {
+            const resolved = await resolveWorkflowTemplate(workflowId, {
+                source: options.workflowSource,
+            });
+            if (resolved.id !== NATIVE_WORKFLOW_ID) {
+                workflowMdOverride = resolved.content;
+                console.log(chalk.blue(`🧭 Using workflow template: ${chalk.cyan(resolved.id)}`));
+            }
         }
-        // Write version file for update tracking
-        const versionPath = path.join(cwd, DIR_NAMES.WORKFLOW, ".version");
-        fs.writeFileSync(versionPath, VERSION);
-        // Configure selected tools by copying entire directories (dogfooding)
-        for (const tool of tools) {
-            const platformId = resolveCliFlag(tool);
-            if (platformId) {
-                console.log(chalk.blue(`📝 Configuring ${AI_TOOLS[platformId].name}...`));
-                await configurePlatform(platformId, cwd, {
-                    withStatusline: options.withStatusline,
-                });
-                if (platformId === "claude-code" && options.withStatusline) {
-                    console.log(chalk.gray("   ↳ Trellis statusLine installed (--with-statusline)"));
+        // ==========================================================================
+        // Create Workflow Structure
+        // ==========================================================================
+        // Record every successful write from here through createRootFiles. The
+        // captured set is the source of truth for `.template-hashes.json`'s
+        // platform/root entries — replacing the previous "walk every managed dir"
+        // approach that swept user-owned runtime files into the manifest
+        // (.codex/sessions/, .claude/projects/, pre-existing AGENTS.md).
+        const writtenPaths = startRecordingWrites(cwd);
+        try {
+            // Create workflow structure with project type
+            console.log(chalk.blue("📁 Creating workflow structure..."));
+            await createWorkflowStructure(cwd, {
+                projectType,
+                skipSpecTemplates: useRemoteTemplate,
+                packages: monorepoPackages,
+                remoteSpecPackages,
+                workflowMdOverride,
+            });
+            // Write monorepo packages to config.yaml (non-destructive patch)
+            if (monorepoPackages) {
+                writeMonorepoConfig(cwd, monorepoPackages);
+                console.log(chalk.blue("📦 Monorepo packages written to config.yaml"));
+            }
+            // Write version file for update tracking
+            const versionPath = path.join(cwd, DIR_NAMES.WORKFLOW, ".version");
+            fs.writeFileSync(versionPath, VERSION);
+            // Configure selected tools by copying entire directories (dogfooding)
+            for (const tool of tools) {
+                const platformId = resolveCliFlag(tool);
+                if (platformId) {
+                    console.log(chalk.blue(`📝 Configuring ${AI_TOOLS[platformId].name}...`));
+                    await configurePlatform(platformId, cwd, {
+                        withStatusline: options.withStatusline,
+                    });
+                    if (platformId === "claude-code" && options.withStatusline) {
+                        console.log(chalk.gray("   ↳ Trellis statusLine installed (--with-statusline)"));
+                    }
                 }
             }
+            const pythonPlatforms = getPlatformsWithPythonHooks();
+            const hasSelectedPythonPlatform = pythonPlatforms.some((id) => tools.includes(AI_TOOLS[id].cliFlag));
+            if (hasSelectedPythonPlatform) {
+                logPythonAdaptationNotice(pythonCmd);
+            }
+            // Create root files (skip if exists)
+            await createRootFiles(cwd);
         }
-        const pythonPlatforms = getPlatformsWithPythonHooks();
-        const hasSelectedPythonPlatform = pythonPlatforms.some((id) => tools.includes(AI_TOOLS[id].cliFlag));
-        if (hasSelectedPythonPlatform) {
-            logPythonAdaptationNotice(pythonCmd);
-        }
-        // Create root files (skip if exists)
-        await createRootFiles(cwd);
-    }
-    finally {
-        stopRecordingWrites();
-    }
-    if (registrySpecConfigToPersist) {
-        writeSpecRegistryConfig(cwd, registrySpecConfigToPersist);
-    }
-    // Initialize template hashes for modification tracking
-    const hashedCount = initializeHashes(cwd, { trackedPaths: writtenPaths });
-    if (useRemoteTemplate) {
-        const specFilesToHash = new Map();
-        for (const relativePath of collectSpecPaths(cwd)) {
-            const content = fs.readFileSync(path.join(cwd, relativePath), "utf-8");
-            specFilesToHash.set(relativePath, content);
+        finally {
+            stopRecordingWrites();
         }
-        if (specFilesToHash.size > 0) {
-            updateHashes(cwd, specFilesToHash);
+        if (registrySpecConfigToPersist) {
+            writeSpecRegistryConfig(cwd, registrySpecConfigToPersist);
         }
-    }
-    if (hashedCount > 0) {
-        console.log(chalk.gray(`📋 Tracking ${hashedCount} template files for updates`));
-    }
-    // Non-native workflow is user-managed local content. Drop the
-    // `.trellis/workflow.md` hash entry so `trellis update` classifies it as
-    // modified and does not silently restore native bytes. See design.md
-    // "Durable-state contract".
-    if (workflowMdOverride !== undefined && workflowId !== NATIVE_WORKFLOW_ID) {
-        removeHash(cwd, PATHS.WORKFLOW_GUIDE_FILE);
-    }
-    // Initialize developer identity (silent - no output)
-    if (developerName) {
-        try {
-            const scriptPath = path.join(cwd, PATHS.SCRIPTS, "init_developer.py");
-            execSync(`${pythonCmd} "${scriptPath}" "${developerName}"`, {
-                cwd,
-                stdio: "pipe", // Silent
-            });
+        // Initialize template hashes for modification tracking
+        const hashedCount = initializeHashes(cwd, { trackedPaths: writtenPaths });
+        if (useRemoteTemplate) {
+            const specFilesToHash = new Map();
+            for (const relativePath of collectSpecPaths(cwd)) {
+                const content = fs.readFileSync(path.join(cwd, relativePath), "utf-8");
+                specFilesToHash.set(relativePath, content);
+            }
+            if (specFilesToHash.size > 0) {
+                updateHashes(cwd, specFilesToHash);
+            }
         }
-        catch {
-            // Silent failure - user can run init_developer.py manually
+        if (hashedCount > 0) {
+            console.log(chalk.gray(`📋 Tracking ${hashedCount} template files for updates`));
         }
-        // Three-branch dispatch using flags captured at init() start (before
-        // createWorkflowStructure/init_developer ran, so they reflect the disk
-        // state of the user's checkout, not the state this init just produced):
-        //   isFirstInit=true                       → creator bootstrap (new project)
-        //   isFirstInit=false + no .developer file → joiner onboarding (fresh clone)
-        //   isFirstInit=false + .developer exists  → same-dev re-init, no task
-        //
-        // Tasks-empty fallback (issue #204): if .trellis/ exists but tasks dir is
-        // empty, the previous init aborted before creating the bootstrap task. Run
-        // bootstrap creation regardless of isFirstInit. writeTaskSkeleton is
-        // idempotent so repeated triggers are safe.
-        //
-        // Runs OUTSIDE the init_developer try/catch (which uses stdio: "pipe")
-        // so joiner failures surface as warnings instead of being silently
-        // swallowed.
-        const tasksEmpty = tasksAreEmpty(cwd);
-        if (isFirstInit || tasksEmpty) {
-            createBootstrapTask(cwd, developerName, pythonCmd, projectType, monorepoPackages);
+        // Non-native workflow is user-managed local content. Drop the
+        // `.trellis/workflow.md` hash entry so `trellis update` classifies it as
+        // modified and does not silently restore native bytes. See design.md
+        // "Durable-state contract".
+        if (workflowMdOverride !== undefined && workflowId !== NATIVE_WORKFLOW_ID) {
+            removeHash(cwd, PATHS.WORKFLOW_GUIDE_FILE);
         }
-        else if (!hadDeveloperFileAtStart) {
+        // Initialize developer identity (silent - no output)
+        if (developerName) {
             try {
-                if (!createJoinerOnboardingTask(cwd, developerName, pythonCmd)) {
-                    console.warn(chalk.yellow("⚠ Failed to create joiner onboarding task"));
-                }
+                const scriptPath = path.join(cwd, PATHS.SCRIPTS, "init_developer.py");
+                execSync(`${pythonCmd} "${scriptPath}" "${developerName}"`, {
+                    cwd,
+                    stdio: "pipe", // Silent
+                });
             }
-            catch (err) {
-                console.warn(chalk.yellow(`⚠ Joiner onboarding setup failed: ${err instanceof Error ? err.message : String(err)}`));
+            catch {
+                // Silent failure - user can run init_developer.py manually
+            }
+            // Three-branch dispatch using flags captured at init() start (before
+            // createWorkflowStructure/init_developer ran, so they reflect the disk
+            // state of the user's checkout, not the state this init just produced):
+            //   isFirstInit=true                       → creator bootstrap (new project)
+            //   isFirstInit=false + no .developer file → joiner onboarding (fresh clone)
+            //   isFirstInit=false + .developer exists  → same-dev re-init, no task
+            //
+            // Tasks-empty fallback (issue #204): if .trellis/ exists but tasks dir is
+            // empty, the previous init aborted before creating the bootstrap task. Run
+            // bootstrap creation regardless of isFirstInit. writeTaskSkeleton is
+            // idempotent so repeated triggers are safe.
+            //
+            // Runs OUTSIDE the init_developer try/catch (which uses stdio: "pipe")
+            // so joiner failures surface as warnings instead of being silently
+            // swallowed.
+            const tasksEmpty = tasksAreEmpty(cwd);
+            if (isFirstInit || tasksEmpty) {
+                createBootstrapTask(cwd, developerName, pythonCmd, projectType, monorepoPackages);
+            }
+            else if (!hadDeveloperFileAtStart) {
+                try {
+                    if (!createJoinerOnboardingTask(cwd, developerName, pythonCmd)) {
+                        console.warn(chalk.yellow("⚠ Failed to create joiner onboarding task"));
+                    }
+                }
+                catch (err) {
+                    console.warn(chalk.yellow(`⚠ Joiner onboarding setup failed: ${err instanceof Error ? err.message : String(err)}`));
+                }
             }
         }
-    }
+    });
 }
 /**
  * Simple readline-based input (no flickering like inquirer)