@opengsd/gsd-core 1.4.2 → 1.5.0-rc.1

package/gsd-core/bin/lib/core.cjs

@@ -10,12 +10,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const node_fs_1 = __importDefault(require("node:fs"));
-const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 const shell_command_projection_cjs_1 = require("./shell-command-projection.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
+const ioModule = require("./io.cjs");
+const { output, error, ERROR_REASON, setJsonErrorMode, getJsonErrorMode, GSD_TEMP_DIR, reapStaleTempFiles } = ioModule;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const phaseIdModule = require("./phase-id.cjs");
+const { escapeRegex, normalizePhaseName, getMilestoneFromPhaseId, getPhaseDirFromPhaseId, phaseMarkdownRegexSource, phaseMarkdownRegexSourceExact, comparePhaseNum, extractPhaseToken, phaseTokenMatches } = phaseIdModule;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const roadmapParserModule = require("./roadmap-parser.cjs");
+const { stripShippedMilestones, extractCurrentMilestone, replaceInCurrentMilestone, getRoadmapPhaseInternal, getMilestoneInfo, getMilestonePhaseFilter } = roadmapParserModule;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const modelProfiles = require("./model-profiles.cjs");
-const { MODEL_PROFILES, AGENT_TO_PHASE_TYPE, VALID_PHASE_TYPES: _VALID_PHASE_TYPES, AGENT_DEFAULT_TIERS, VALID_AGENT_TIERS, nextTier } = modelProfiles;
+const { MODEL_PROFILES, VALID_PHASE_TYPES: _VALID_PHASE_TYPES } = modelProfiles;
 const model_catalog_cjs_1 = require("./model-catalog.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const worktreeSafety = require("./worktree-safety.cjs");
@@ -23,557 +31,32 @@ const { resolveWorktreeContext, parseWorktreePorcelain: parseWorktreePorcelainPo
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const planningWorkspace = require("./planning-workspace.cjs");
 // Compatibility shim: new imports should use planning-workspace.cjs directly.
-const { planningDir, planningRoot, planningPaths, withPlanningLock, getActiveWorkstream, setActiveWorkstream, findContextMdIn, } = planningWorkspace;
+const { planningDir, planningRoot, planningPaths, withPlanningLock, getActiveWorkstream, setActiveWorkstream, } = planningWorkspace;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const coreUtilsModule = require("./core-utils.cjs");
+const { toPosixPath, detectSubRepos, extractOneLinerFromBody, pathExistsInternal, generateSlugInternal, filterPlanFiles, filterSummaryFiles, getPhaseFileStats, readSubdirectories, timeAgo, } = coreUtilsModule;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const phaseLocatorModule = require("./phase-locator.cjs");
+const { searchPhaseInDir, findPhaseInternal, getArchivedPhaseDirs } = phaseLocatorModule;
 const project_root_cjs_1 = require("./project-root.cjs");
 const runtime_homes_cjs_1 = require("./runtime-homes.cjs");
-// ─── Configuration Module (generated CJS mirror) ────────────────────────────
-const configuration_cjs_1 = require("./configuration.cjs");
+// ─── Config Loader Module (extracted from core, ADR-857 phase 2e / #885) ─────
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-const configSchema = require("./config-schema.cjs");
-const { VALID_CONFIG_KEYS, DYNAMIC_KEY_PATTERNS } = configSchema;
+const configLoaderModule = require("./config-loader.cjs");
+const { loadConfig, isGitIgnored, CONFIG_DEFAULTS, _warnUnknownProfileOverrides, _resetRuntimeWarningCacheForTests, RUNTIME_OVERRIDE_TIERS, } = configLoaderModule;
+// ─── Model Resolver Module (extracted from core, ADR-857 phase 2f / #888) ────
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const modelResolverModule = require("./model-resolver.cjs");
+const { resolveTierEntry, resolveModelPolicy, resolveModelInternal, VALID_GRANULARITIES, resolveGranularityInternal, assertValidGranularityOverride, resolveModelForTier, VALID_EFFORTS, EFFORT_SET, nextEffort, resolveEffortInternal, resolveFastModeInternal, resolveEffortForTier, } = modelResolverModule;
 // ─── Path helpers ────────────────────────────────────────────────────────────
-/** Normalize a relative path to always use forward slashes (cross-platform). */
-function toPosixPath(p) {
-    return p.split(node_path_1.default.sep).join('/');
-}
-/**
- * Scan immediate child directories for separate git repos.
- * Returns a sorted array of directory names that have their own `.git`.
- * Excludes hidden directories and node_modules.
- */
-function detectSubRepos(cwd) {
-    const results = [];
-    try {
-        const entries = node_fs_1.default.readdirSync(cwd, { withFileTypes: true });
-        for (const entry of entries) {
-            if (!entry.isDirectory())
-                continue;
-            if (entry.name.startsWith('.') || entry.name === 'node_modules')
-                continue;
-            const gitPath = node_path_1.default.join(cwd, entry.name, '.git');
-            try {
-                if (node_fs_1.default.existsSync(gitPath)) {
-                    results.push(entry.name);
-                }
-            }
-            catch { /* ignore */ }
-        }
-    }
-    catch { /* ignore */ }
-    return results.sort();
-}
+// toPosixPath and detectSubRepos moved to core-utils.cjs (ADR-857 phase 2c / #877).
+// The destructured bindings above (from coreUtilsModule) make them available to
+// core-internal callers; core.cjs re-exports toPosixPath and detectSubRepos for back-compat.
 // findProjectRoot is now re-exported from the generated CJS module above.
-// ─── Output helpers ───────────────────────────────────────────────────────────
-/**
- * Dedicated GSD temp directory: path.join(os.tmpdir(), 'gsd').
- * Created on first use. Keeps GSD temp files isolated from the system
- * temp directory so reap scans only GSD files (#1975).
- */
-const GSD_TEMP_DIR = node_path_1.default.join(node_os_1.default.tmpdir(), 'gsd');
-function ensureGsdTempDir() {
-    (0, shell_command_projection_cjs_1.platformEnsureDir)(GSD_TEMP_DIR);
-}
-/**
- * Remove stale gsd-* temp files/dirs older than maxAgeMs (default: 5 minutes).
- * Runs opportunistically before each new temp file write to prevent unbounded accumulation.
- * @param prefix - filename prefix to match (e.g., 'gsd-')
- * @param opts
- * @param opts.maxAgeMs - max age in ms before removal (default: 5 min)
- * @param opts.dirsOnly - if true, only remove directories (default: false)
- */
-function reapStaleTempFiles(prefix = 'gsd-', { maxAgeMs = 5 * 60 * 1000, dirsOnly = false } = {}) {
-    try {
-        ensureGsdTempDir();
-        const now = Date.now();
-        const entries = node_fs_1.default.readdirSync(GSD_TEMP_DIR);
-        for (const entry of entries) {
-            if (!entry.startsWith(prefix))
-                continue;
-            const fullPath = node_path_1.default.join(GSD_TEMP_DIR, entry);
-            try {
-                const stat = node_fs_1.default.statSync(fullPath);
-                if (now - stat.mtimeMs > maxAgeMs) {
-                    if (stat.isDirectory()) {
-                        node_fs_1.default.rmSync(fullPath, { recursive: true, force: true });
-                    }
-                    else if (!dirsOnly) {
-                        node_fs_1.default.unlinkSync(fullPath);
-                    }
-                }
-            }
-            catch {
-                // File may have been removed between readdir and stat — ignore
-            }
-        }
-    }
-    catch {
-        // Non-critical — don't let cleanup failures break output
-    }
-}
-function output(result, raw, rawValue) {
-    let data;
-    if (raw && rawValue !== undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-base-to-string
-        data = String(rawValue);
-    }
-    else {
-        const json = JSON.stringify(result, null, 2);
-        // Large payloads exceed Claude Code's Bash tool buffer (~50KB).
-        // Write to tmpfile and output the path prefixed with @file: so callers can detect it.
-        if (json.length > 50000) {
-            reapStaleTempFiles();
-            ensureGsdTempDir();
-            const tmpPath = node_path_1.default.join(GSD_TEMP_DIR, `gsd-${Date.now()}.json`);
-            (0, shell_command_projection_cjs_1.platformWriteSync)(tmpPath, json);
-            data = '@file:' + tmpPath;
-        }
-        else {
-            data = json;
-        }
-    }
-    // process.stdout.write() is async when stdout is a pipe — process.exit()
-    // can tear down the process before the reader consumes the buffer.
-    // fs.writeSync(1, ...) blocks until the kernel accepts the bytes, and
-    // skipping process.exit() lets the event loop drain naturally.
-    node_fs_1.default.writeSync(1, data);
-}
-/**
- * Frozen enum of typed reason codes used by error() for structured errors.
- * Each subcommand contributes its own codes; the enum exists so tests can
- * assert against typed values instead of grepping stderr (#2974).
- *
- * Adding a new code:
- *   - Pick a snake_case lowercase value (the JSON wire form)
- *   - Group by subsystem prefix (CONFIG_*, SDK_*, etc)
- *   - Pass it to error(msg, ERROR_REASON.NEW_CODE) at the call site
- */
-const ERROR_REASON = Object.freeze({
-    // config-get / config-set
-    CONFIG_KEY_NOT_FOUND: 'config_key_not_found',
-    CONFIG_NO_FILE: 'config_no_file',
-    CONFIG_PARSE_FAILED: 'config_parse_failed',
-    CONFIG_INVALID_KEY: 'config_invalid_key',
-    // SDK / gsd-tools dispatch
-    SDK_FAIL_FAST: 'sdk_fail_fast',
-    SDK_UNKNOWN_COMMAND: 'sdk_unknown_command',
-    SDK_MISSING_ARG: 'sdk_missing_arg',
-    // workflow / phase
-    PHASE_NOT_FOUND: 'phase_not_found',
-    SUMMARY_NO_PLANNING: 'summary_no_planning',
-    // graphify
-    GRAPHIFY_NO_GRAPH: 'graphify_no_graph',
-    GRAPHIFY_INVALID_QUERY: 'graphify_invalid_query',
-    // hooks
-    HOOKS_OPT_OUT: 'hooks_opt_out',
-    // security-scan
-    SECURITY_SCAN_FAILED: 'security_scan_failed',
-    // generic
-    USAGE: 'usage',
-    UNKNOWN: 'unknown',
-});
-/**
- * Process-level flag: when true, error() emits structured JSON to stderr
- * instead of plain "Error: <message>" text. Set by gsd-tools.cjs when the
- * CLI is invoked with `--json-errors`. Tests opt in to typed-IR error
- * assertions by passing that flag and parsing the JSON.
- *
- * Default off so existing callers and human operators keep their plain-text
- * diagnostics. The structured form is opt-in for tooling and tests (#2974).
- */
-let _jsonErrorMode = false;
-function setJsonErrorMode(v) { _jsonErrorMode = !!v; }
-function getJsonErrorMode() { return _jsonErrorMode; }
-/**
- * Emit an error and exit. When the second argument is provided it must be
- * a value from ERROR_REASON; tests can assert on `result.reason`. When the
- * process is in JSON-error mode, stderr receives `{ ok: false, reason,
- * message }` so callers can parse it; otherwise stderr keeps the plain
- * text form for human operators.
- */
-function error(message, reason = ERROR_REASON.UNKNOWN) {
-    if (_jsonErrorMode) {
-        const payload = JSON.stringify({ ok: false, reason, message }) + '\n';
-        node_fs_1.default.writeSync(2, payload);
-    }
-    else {
-        node_fs_1.default.writeSync(2, 'Error: ' + message + '\n');
-    }
-    process.exit(1);
-}
-// ─── File & Config utilities ──────────────────────────────────────────────────
-/**
- * Canonical config defaults — flat-key projection for CJS consumers.
- *
- * Cycle 4: Values are sourced from CANONICAL_CONFIG_DEFAULTS (the nested
- * manifest loaded by configuration.generated.cjs). The flat shape is
- * preserved here so legacy consumers (config.cjs, verify.cjs, tests that
- * regex-parse this source) continue to work without changes. The key names
- * and the `const CONFIG_DEFAULTS = {` pattern are intentionally kept.
- *
- * Mapping notes:
- *  - workflow.plan_check  → plan_checker (CJS flat name; verify.cjs uses this)
- *  - git.*               → flat git keys (branching_strategy, templates)
- *  - workflow.*          → flat names (research, verifier, …)
- *  - planning.sub_repos  → sub_repos
- *  - planning.commit_docs / search_gitignored → top-level flat keys
- */
-// CANONICAL_CONFIG_DEFAULTS is typed as Record<string, unknown> from configuration.cjs;
-// we use a typed accessor to avoid repeated casts.
-function _getConfigDefault(key) {
-    return (configuration_cjs_1.CONFIG_DEFAULTS)[key];
-}
-function _getNestedConfigDefault(section, field) {
-    const sec = (configuration_cjs_1.CONFIG_DEFAULTS)[section];
-    if (sec && typeof sec === 'object' && !Array.isArray(sec)) {
-        return sec[field];
-    }
-    return undefined;
-}
-const CONFIG_DEFAULTS = {
-    model_profile: _getConfigDefault('model_profile'),
-    commit_docs: _getConfigDefault('commit_docs'),
-    search_gitignored: _getConfigDefault('search_gitignored'),
-    branching_strategy: _getNestedConfigDefault('git', 'branching_strategy'),
-    phase_branch_template: _getNestedConfigDefault('git', 'phase_branch_template'),
-    milestone_branch_template: _getNestedConfigDefault('git', 'milestone_branch_template'),
-    quick_branch_template: _getNestedConfigDefault('git', 'quick_branch_template'),
-    research: _getNestedConfigDefault('workflow', 'research'),
-    plan_checker: _getNestedConfigDefault('workflow', 'plan_check'), // flat CJS name maps to workflow.plan_check
-    verifier: _getNestedConfigDefault('workflow', 'verifier'),
-    nyquist_validation: _getNestedConfigDefault('workflow', 'nyquist_validation'),
-    ai_integration_phase: _getNestedConfigDefault('workflow', 'ai_integration_phase'),
-    parallelization: _getConfigDefault('parallelization'),
-    brave_search: _getConfigDefault('brave_search'),
-    firecrawl: _getConfigDefault('firecrawl'),
-    exa_search: _getConfigDefault('exa_search'),
-    text_mode: _getNestedConfigDefault('workflow', 'text_mode'),
-    sub_repos: _getNestedConfigDefault('planning', 'sub_repos'),
-    resolve_model_ids: _getConfigDefault('resolve_model_ids'),
-    context_window: _getConfigDefault('context_window'),
-    phase_naming: _getConfigDefault('phase_naming'),
-    project_code: _getConfigDefault('project_code'),
-    subagent_timeout: _getNestedConfigDefault('workflow', 'subagent_timeout'),
-    security_enforcement: _getNestedConfigDefault('workflow', 'security_enforcement'),
-    security_asvs_level: _getNestedConfigDefault('workflow', 'security_asvs_level'),
-    security_block_on: _getNestedConfigDefault('workflow', 'security_block_on'),
-    post_planning_gaps: _getNestedConfigDefault('workflow', 'post_planning_gaps'),
-};
-/**
- * Deep-merge two plain config objects. `overlay` wins on key conflict.
- * Explicit `null` in overlay overrides base (null means "unset this key").
- * Arrays are replaced, not merged. Non-object primitives use overlay value.
- *
- * Note: `undefined` in overlay is treated as "no value provided" and falls
- * back to base (preserves inheritance). Explicit `null` overrides base.
- */
-function _deepMergeConfig(base, overlay) {
-    if (overlay === null || overlay === undefined)
-        return overlay;
-    if (typeof base !== 'object' || typeof overlay !== 'object')
-        return overlay;
-    const result = { ...base };
-    for (const key of Object.keys(overlay)) {
-        if (overlay[key] !== null && typeof overlay[key] === 'object' && !Array.isArray(overlay[key])) {
-            result[key] = _deepMergeConfig((base[key] ?? {}), overlay[key]);
-        }
-        else {
-            result[key] = overlay[key];
-        }
-    }
-    return result;
-}
-// Module-level deduplication for unknown-key warnings (#3523).
-// A single `init phase-op N` call invokes loadConfig more than once; this Set
-// prevents the same warning from being echoed on each invocation.
-const _warnedUnknownConfigKeys = new Set();
-function loadConfig(cwd, options = {}) {
-    const activeWorkstream = Object.prototype.hasOwnProperty.call(options, 'workstream')
-        ? options['workstream']
-        : (options['workstreamContext'] && Object.prototype.hasOwnProperty.call(options['workstreamContext'], 'ws'))
-            ? options['workstreamContext']['ws']
-            : (process.env['GSD_WORKSTREAM'] || null);
-    // When GSD_WORKSTREAM is set, load root config first so workstream config
-    // can inherit from it. This prevents users from duplicating model_overrides,
-    // workflow.*, etc. across every workstream config (#2714).
-    const ws = typeof activeWorkstream === 'string' ? activeWorkstream : (activeWorkstream === null ? null : null);
-    // #315 — per-call lazy memo: all three detection sites inside this loadConfig
-    // call operate on the same cwd and the subrepo set cannot change mid-call, so
-    // a single scan is sufficient. The memo is scoped to THIS call (not module-level)
-    // so separate loadConfig invocations each get a fresh scan.
-    let cachedSubRepos;
-    const getDetectedSubRepos = () => {
-        if (cachedSubRepos === undefined)
-            cachedSubRepos = detectSubRepos(cwd);
-        // Return a copy: original detectSubRepos returned a fresh array per call,
-        // so each site must keep an independent array (avoid cross-site aliasing).
-        return cachedSubRepos.slice();
-    };
-    let rootParsed = null;
-    if (ws) {
-        const rootConfigPath = node_path_1.default.join(planningRoot(cwd), 'config.json');
-        try {
-            const raw = (0, shell_command_projection_cjs_1.platformReadSync)(rootConfigPath);
-            if (raw === null)
-                throw new Error('missing');
-            rootParsed = JSON.parse(raw);
-            // Cycle 4: delegate all legacy-key normalization to the Configuration Module.
-            const { parsed: rootNormalized, normalizations: rootNorms } = (0, configuration_cjs_1.normalizeLegacyKeys)(rootParsed);
-            if (rootNorms.length > 0) {
-                // Resolve filesystem-dependent normalizations (multiRepo → planning.sub_repos)
-                for (const norm of rootNorms) {
-                    if (norm.requiresFilesystem && !rootNormalized.planning?.['sub_repos']) {
-                        const detected = getDetectedSubRepos();
-                        if (detected.length > 0) {
-                            if (!rootNormalized.planning)
-                                rootNormalized.planning = {};
-                            rootNormalized.planning['sub_repos'] = detected;
-                            rootNormalized.planning['commit_docs'] = false;
-                        }
-                    }
-                }
-                rootParsed = rootNormalized;
-                try {
-                    (0, shell_command_projection_cjs_1.platformWriteSync)(rootConfigPath, JSON.stringify(rootParsed, null, 2));
-                }
-                catch { /* ignore */ }
-            }
-            else {
-                rootParsed = rootNormalized;
-            }
-        }
-        catch {
-            // Root config missing or unparseable — workstream config stands alone
-        }
-    }
-    const configPath = node_path_1.default.join(planningDir(cwd, ws), 'config.json');
-    const defaults = CONFIG_DEFAULTS;
-    try {
-        const raw = (0, shell_command_projection_cjs_1.platformReadSync)(configPath);
-        if (raw === null)
-            throw new Error('missing');
-        // `fileData` is the parsed content of the config.json file on disk — used
-        // for migrations and writes so we never persist merged values back to disk.
-        const fileData = JSON.parse(raw);
-        // Cycle 4: Single normalizeLegacyKeys call replaces all four inline migration
-        // blocks (depth→granularity, multiRepo→planning.sub_repos, sub_repos→planning.sub_repos,
-        // branching_strategy→git.branching_strategy). The Module is pure (no I/O); disk
-        // writeback is handled below with the existing platformWriteSync pattern.
-        let configDirty = false;
-        {
-            const { parsed: normalized, normalizations } = (0, configuration_cjs_1.normalizeLegacyKeys)(fileData);
-            if (normalizations.length > 0) {
-                // Merge normalized values back into fileData (mutation-in-place for legacy code below)
-                Object.keys(fileData).forEach(k => delete fileData[k]);
-                Object.assign(fileData, normalized);
-                configDirty = true;
-                // Resolve filesystem-dependent normalizations (multiRepo → planning.sub_repos).
-                for (const norm of normalizations) {
-                    if (norm.requiresFilesystem && !fileData.planning?.['sub_repos']) {
-                        const detected = getDetectedSubRepos();
-                        if (detected.length > 0) {
-                            if (!fileData.planning)
-                                fileData.planning = {};
-                            fileData.planning['sub_repos'] = detected;
-                            fileData.planning['commit_docs'] = false;
-                        }
-                    }
-                }
-            }
-        }
-        // Keep planning.sub_repos in sync with actual filesystem
-        const currentSubRepos = fileData.planning?.['sub_repos'] || [];
-        if (Array.isArray(currentSubRepos) && currentSubRepos.length > 0) {
-            const detected = getDetectedSubRepos();
-            if (detected.length > 0) {
-                const sorted = [...currentSubRepos].sort();
-                if (JSON.stringify(sorted) !== JSON.stringify(detected)) {
-                    if (!fileData.planning)
-                        fileData.planning = {};
-                    fileData.planning['sub_repos'] = detected;
-                    configDirty = true;
-                }
-            }
-        }
-        // Persist sub_repos changes (migration or sync) — write only the on-disk
-        // file contents, never the merged result, to avoid polluting workstream configs.
-        if (configDirty) {
-            try {
-                (0, shell_command_projection_cjs_1.platformWriteSync)(configPath, JSON.stringify(fileData, null, 2));
-            }
-            catch { /* ignore */ }
-        }
-        // Now apply root→workstream inheritance. `parsed` is the effective config
-        // used for value extraction below; fileData is kept for disk writes only.
-        const parsed = rootParsed
-            ? (_deepMergeConfig(rootParsed, fileData) ?? fileData)
-            : fileData;
-        // Warn about unrecognized top-level keys so users don't silently lose config.
-        const KNOWN_TOP_LEVEL = new Set([
-            // Extract top-level key names from dot-notation paths (e.g., 'workflow.research' → 'workflow')
-            ...[...VALID_CONFIG_KEYS].map((k) => k.split('.')[0]),
-            // Dynamic-pattern top-level containers (e.g. review, model_profile_overrides)
-            ...DYNAMIC_KEY_PATTERNS.map(p => p.topLevel),
-            // Internal keys loadConfig reads but config-set doesn't expose
-            'model_overrides', 'context_window', 'resolve_model_ids', 'claude_md_path', 'effort', 'fast_mode',
-            // Deprecated keys (still accepted for migration, not in config-set)
-            'depth', 'multiRepo', 'branching_strategy',
-        ]);
-        const unknownKeys = Object.keys(parsed).filter(k => !KNOWN_TOP_LEVEL.has(k));
-        if (unknownKeys.length > 0) {
-            const warnKey = unknownKeys.join(',');
-            if (!_warnedUnknownConfigKeys.has(warnKey)) {
-                _warnedUnknownConfigKeys.add(warnKey);
-                process.stderr.write(`gsd-tools: warning: unknown config key(s) in .planning/config.json: ${unknownKeys.join(', ')} — these will be ignored\n`);
-            }
-        }
-        // #2517 — Validate runtime/tier values
-        _warnUnknownProfileOverrides(parsed, '.planning/config.json');
-        const get = (key, nested) => {
-            if (parsed[key] !== undefined)
-                return parsed[key];
-            if (nested && parsed[nested.section] && typeof parsed[nested.section] === 'object' && parsed[nested.section] !== null) {
-                const sec = parsed[nested.section];
-                if (sec[nested.field] !== undefined) {
-                    return sec[nested.field];
-                }
-            }
-            return undefined;
-        };
-        const parallelization = (() => {
-            const val = get('parallelization');
-            if (typeof val === 'boolean')
-                return val;
-            if (typeof val === 'object' && val !== null && 'enabled' in (val))
-                return val['enabled'];
-            return defaults.parallelization;
-        })();
-        return {
-            model_profile: get('model_profile') ?? defaults.model_profile,
-            commit_docs: (() => {
-                const explicit = get('commit_docs', { section: 'planning', field: 'commit_docs' });
-                // If explicitly set in config, respect the user's choice
-                if (explicit !== undefined)
-                    return explicit;
-                // Auto-detection: when no explicit value and .planning/ is gitignored,
-                // default to false instead of true
-                if (isGitIgnored(cwd, '.planning/'))
-                    return false;
-                return defaults.commit_docs;
-            })(),
-            search_gitignored: get('search_gitignored', { section: 'planning', field: 'search_gitignored' }) ?? defaults.search_gitignored,
-            branching_strategy: get('branching_strategy', { section: 'git', field: 'branching_strategy' }) ?? defaults.branching_strategy,
-            phase_branch_template: get('phase_branch_template', { section: 'git', field: 'phase_branch_template' }) ?? defaults.phase_branch_template,
-            milestone_branch_template: get('milestone_branch_template', { section: 'git', field: 'milestone_branch_template' }) ?? defaults.milestone_branch_template,
-            quick_branch_template: get('quick_branch_template', { section: 'git', field: 'quick_branch_template' }) ?? defaults.quick_branch_template,
-            research: get('research', { section: 'workflow', field: 'research' }) ?? defaults.research,
-            plan_checker: get('plan_checker', { section: 'workflow', field: 'plan_check' }) ?? defaults.plan_checker,
-            verifier: get('verifier', { section: 'workflow', field: 'verifier' }) ?? defaults.verifier,
-            nyquist_validation: get('nyquist_validation', { section: 'workflow', field: 'nyquist_validation' }) ?? defaults.nyquist_validation,
-            post_planning_gaps: get('post_planning_gaps', { section: 'workflow', field: 'post_planning_gaps' }) ?? defaults.post_planning_gaps,
-            parallelization,
-            brave_search: get('brave_search') ?? defaults.brave_search,
-            firecrawl: get('firecrawl') ?? defaults.firecrawl,
-            exa_search: get('exa_search') ?? defaults.exa_search,
-            tdd_mode: get('tdd_mode', { section: 'workflow', field: 'tdd_mode' }) ?? false,
-            mvp_mode: get('mvp_mode', { section: 'workflow', field: 'mvp_mode' }) ?? false,
-            text_mode: get('text_mode', { section: 'workflow', field: 'text_mode' }) ?? defaults.text_mode,
-            auto_advance: get('auto_advance', { section: 'workflow', field: 'auto_advance' }) ?? false,
-            _auto_chain_active: get('_auto_chain_active', { section: 'workflow', field: '_auto_chain_active' }) ?? false,
-            mode: get('mode') ?? 'interactive',
-            sub_repos: get('sub_repos', { section: 'planning', field: 'sub_repos' }) ?? defaults.sub_repos,
-            resolve_model_ids: get('resolve_model_ids') ?? defaults.resolve_model_ids,
-            context_window: get('context_window') ?? defaults.context_window,
-            phase_naming: get('phase_naming') ?? defaults.phase_naming,
-            project_code: get('project_code') ?? defaults.project_code,
-            subagent_timeout: get('subagent_timeout', { section: 'workflow', field: 'subagent_timeout' }) ?? defaults.subagent_timeout,
-            model_overrides: (parsed['model_overrides']) || null,
-            // #3023 — per-phase-type model map.
-            models: (parsed['models']) || null,
-            // #68 — top-level granularity
-            granularity: parsed['granularity'] !== undefined ? parsed['granularity'] : null,
-            // #68 — per-phase-type granularity map.
-            granularities: (parsed['granularities']) || null,
-            // #68 — planning sub-object
-            planning: (parsed['planning']) || null,
-            // #3024 — dynamic routing block.
-            dynamic_routing: (parsed['dynamic_routing']) || null,
-            // #2517 — runtime-aware profiles.
-            runtime: (parsed['runtime']) || null,
-            model_profile_overrides: (parsed['model_profile_overrides']) || null,
-            // #49 — provider-neutral model policy presets.
-            model_policy: (parsed['model_policy']) || null,
-            // #443 — effort/fast_mode
-            effort: (parsed['effort']) || null,
-            fast_mode: (parsed['fast_mode']) || null,
-            agent_skills: (parsed['agent_skills']) || {},
-            agent_skills_security: (parsed['agent_skills_security']) || null,
-            manager: (parsed['manager']) || {},
-            response_language: get('response_language') || null,
-            claude_md_path: get('claude_md_path') || null,
-            claude_md_assembly: (parsed['claude_md_assembly']) || null,
-        };
-    }
-    catch {
-        // Fall back to ~/.gsd/defaults.json only for truly pre-project contexts (#1683)
-        if (node_fs_1.default.existsSync(planningDir(cwd, ws))) {
-            if (rootParsed) {
-                // Workstream has no config.json: re-parse using root config as the sole source.
-                return loadConfig(cwd, { workstream: null });
-            }
-            return defaults;
-        }
-        try {
-            const home = process.env['GSD_HOME'] || node_os_1.default.homedir();
-            const globalDefaultsPath = node_path_1.default.join(home, '.gsd', 'defaults.json');
-            const raw = (0, shell_command_projection_cjs_1.platformReadSync)(globalDefaultsPath);
-            if (raw === null)
-                throw new Error('missing');
-            const globalDefaults = JSON.parse(raw);
-            return {
-                ...defaults,
-                model_profile: (globalDefaults['model_profile']) ?? defaults.model_profile,
-                commit_docs: (globalDefaults['commit_docs']) ?? defaults.commit_docs,
-                research: (globalDefaults['research']) ?? defaults.research,
-                plan_checker: (globalDefaults['plan_checker']) ?? defaults.plan_checker,
-                verifier: (globalDefaults['verifier']) ?? defaults.verifier,
-                nyquist_validation: (globalDefaults['nyquist_validation']) ?? defaults.nyquist_validation,
-                post_planning_gaps: (globalDefaults['post_planning_gaps'])
-                    ?? globalDefaults['workflow']?.['post_planning_gaps']
-                    ?? defaults.post_planning_gaps,
-                parallelization: (globalDefaults['parallelization']) ?? defaults.parallelization,
-                text_mode: (globalDefaults['text_mode']) ?? defaults.text_mode,
-                resolve_model_ids: (globalDefaults['resolve_model_ids']) ?? defaults.resolve_model_ids,
-                context_window: (globalDefaults['context_window']) ?? defaults.context_window,
-                subagent_timeout: (globalDefaults['subagent_timeout']) ?? defaults.subagent_timeout,
-                model_overrides: (globalDefaults['model_overrides']) || null,
-                models: (globalDefaults['models']) || null,
-                granularity: (globalDefaults['granularity']) !== undefined ? globalDefaults['granularity'] : null,
-                granularities: (globalDefaults['granularities']) || null,
-                planning: (globalDefaults['planning']) || null,
-                dynamic_routing: (globalDefaults['dynamic_routing']) || null,
-                effort: (globalDefaults['effort']) || null,
-                fast_mode: (globalDefaults['fast_mode']) || null,
-                agent_skills: (globalDefaults['agent_skills']) || {},
-                response_language: (globalDefaults['response_language']) || null,
-            };
-        }
-        catch {
-            return defaults;
-        }
-    }
-}
-// ─── Git utilities ────────────────────────────────────────────────────────────
-const _gitIgnoredCache = new Map();
-function isGitIgnored(cwd, targetPath) {
-    const key = cwd + '::' + targetPath;
-    if (_gitIgnoredCache.has(key))
-        return _gitIgnoredCache.get(key);
-    // --no-index checks .gitignore rules regardless of whether the file is tracked.
-    const result = (0, shell_command_projection_cjs_1.execGit)(['check-ignore', '-q', '--no-index', '--', targetPath], { cwd });
-    const ignored = result.exitCode === 0;
-    _gitIgnoredCache.set(key, ignored);
-    return ignored;
-}
+// loadConfig, isGitIgnored, CONFIG_DEFAULTS, and related helpers moved to
+// config-loader.cjs (ADR-857 phase 2e / #885). The destructured bindings above
+// (from configLoaderModule) make them available to core-internal callers;
+// core.cjs re-exports loadConfig and isGitIgnored for back-compat.
 // ─── Common path helpers ──────────────────────────────────────────────────────
 /**
  * Resolve the main worktree root when running inside a git worktree.
@@ -620,500 +103,23 @@ function pruneOrphanedWorktrees(repoRoot) {
     return [];
 }
 // ─── Planning workspace (pathing + active workstream + lock) moved to planning-workspace.cjs ───
-// ─── Phase utilities ──────────────────────────────────────────────────────────
-function escapeRegex(value) {
-    return String(value).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-function normalizePhaseName(phase) {
-    const str = String(phase);
-    // Strip optional project_code prefix (e.g., 'CK-01' → '01')
-    const stripped = str.replace(/^[A-Z]{1,6}-(?=\d)/, '');
-    // Milestone-prefixed phase IDs: M-NN or M-N-N (deep decomposition).
-    const milestoneMatch = stripped.match(/^(\d+)((?:-\d+)+)([A-Z]?(?:\.\d+)*)$/i);
-    if (milestoneMatch) {
-        const major = milestoneMatch[1].padStart(2, '0');
-        const subSegments = milestoneMatch[2].slice(1).split('-').map(s => s.padStart(2, '0'));
-        const suffix = milestoneMatch[3] || '';
-        return `${major}-${subSegments.join('-')}${suffix}`;
-    }
-    // Standard numeric phases: 1, 01, 12A, 12.1
-    const match = stripped.match(/^(\d+)([A-Z])?((?:\.\d+)*)/i);
-    if (match) {
-        const padded = match[1].padStart(2, '0');
-        // Preserve original case of letter suffix (#1962).
-        const letter = match[2] || '';
-        const decimal = match[3] || '';
-        return padded + letter + decimal;
-    }
-    // Custom phase IDs (e.g. PROJ-42, AUTH-101): return as-is
-    return str;
-}
-function getMilestoneFromPhaseId(phaseId) {
-    const str = String(phaseId);
-    const stripped = str.replace(/^[A-Z]{1,6}-(?=\d)/i, '');
-    const m = stripped.match(/^0*(\d+)-\d/);
-    if (!m)
-        return null;
-    const major = parseInt(m[1], 10);
-    if (major === 0 || major === 999)
-        return null;
-    return `v${major}.0`;
-}
-function getPhaseDirFromPhaseId(phaseId, phaseName, projectCode) {
-    const str = String(phaseId);
-    const stripped = str.replace(/^[A-Z]{1,6}-(?=\d)/i, '');
-    const m = stripped.match(/^0*(\d+)-(0*(\d+(?:-\d+)*))$/);
-    if (!m)
-        return null;
-    const milestone = String(parseInt(m[1], 10)).padStart(2, '0');
-    const subParts = m[2].split('-').map(p => String(parseInt(p, 10)).padStart(2, '0'));
-    const sub = subParts.join('-');
-    const slug = phaseName
-        ? phaseName.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '')
-        : '';
-    const parts = [milestone, sub, slug].filter(Boolean);
-    const base = parts.join('-');
-    return projectCode ? `${projectCode}-${base}` : base;
-}
-/**
- * Render a regex source fragment matching a phase number against ROADMAP/STATE
- * prose regardless of zero-padding on either side.
- */
-function phaseMarkdownRegexSource(phaseNum) {
-    const stripped = String(phaseNum).replace(/^[A-Z]{1,6}-(?=\d)/i, '');
-    // Milestone-prefixed IDs: M-NN or M-N-N (deep).
-    const milestoneSegments = stripped.match(/^(\d+)((?:-\d+)*)([A-Z]?(?:\.\d+)*)$/i);
-    if (milestoneSegments && milestoneSegments[2]) {
-        const majorUnpadded = milestoneSegments[1].replace(/^0+/, '') || '0';
-        const subParts = milestoneSegments[2].slice(1).split('-');
-        const subFragments = subParts.map(s => {
-            const unpadded = s.replace(/^0+/, '') || '0';
-            return `0*${escapeRegex(unpadded)}`;
-        });
-        const suffix = milestoneSegments[3] || '';
-        const suffixFragment = suffix ? escapeRegex(suffix) : '';
-        return `0*${escapeRegex(majorUnpadded)}-${subFragments.join('-')}${suffixFragment}`;
-    }
-    // Plain numeric phase: 1, 01, 12A, 12.1
-    const match = stripped.match(/^0*(\d+)([A-Z])?((?:\.\d+)*)$/i);
-    if (!match)
-        return escapeRegex(phaseNum);
-    const integer = match[1].replace(/^0+/, '') || '0';
-    const letter = match[2] ? escapeRegex(match[2]) : '';
-    const decimal = match[3] ? escapeRegex(match[3]) : '';
-    return `0*${escapeRegex(integer)}${letter}${decimal}`;
-}
-/**
- * #3599: when the caller passed a project-code-prefixed ID like `PROJ-42`,
- * return the exact-escaped form.
- */
-function phaseMarkdownRegexSourceExact(phaseNum) {
-    const raw = String(phaseNum);
-    if (!/^[A-Z]{1,6}-(?=\d)/i.test(raw))
-        return null;
-    return escapeRegex(raw);
-}
-function comparePhaseNum(a, b) {
-    // Strip optional project_code prefix before comparing
-    const sa = String(a).replace(/^[A-Z]{1,6}-(?=\d)/i, '');
-    const sb = String(b).replace(/^[A-Z]{1,6}-(?=\d)/i, '');
-    const milestoneA = sa.match(/^(\d+)((?:-\d+)+)([A-Z]?(?:\.\d+)*)$/i);
-    const milestoneB = sb.match(/^(\d+)((?:-\d+)+)([A-Z]?(?:\.\d+)*)$/i);
-    if (milestoneA && milestoneB) {
-        const segsA = [parseInt(milestoneA[1], 10), ...milestoneA[2].slice(1).split('-').map(s => parseInt(s, 10))];
-        const segsB = [parseInt(milestoneB[1], 10), ...milestoneB[2].slice(1).split('-').map(s => parseInt(s, 10))];
-        const maxSegs = Math.max(segsA.length, segsB.length);
-        for (let i = 0; i < maxSegs; i++) {
-            const av = segsA[i] !== undefined ? segsA[i] : 0;
-            const bv = segsB[i] !== undefined ? segsB[i] : 0;
-            if (av !== bv)
-                return av - bv;
-        }
-        const sufA = milestoneA[3] || '';
-        const sufB = milestoneB[3] || '';
-        if (sufA !== sufB)
-            return sufA < sufB ? -1 : 1;
-        return 0;
-    }
-    if (milestoneA || milestoneB)
-        return String(a).localeCompare(String(b));
-    const pa = sa.match(/^(\d+)([A-Z])?((?:\.\d+)*)/i);
-    const pb = sb.match(/^(\d+)([A-Z])?((?:\.\d+)*)/i);
-    if (!pa || !pb)
-        return String(a).localeCompare(String(b));
-    const intDiff = parseInt(pa[1], 10) - parseInt(pb[1], 10);
-    if (intDiff !== 0)
-        return intDiff;
-    const la = (pa[2] || '').toUpperCase();
-    const lb = (pb[2] || '').toUpperCase();
-    if (la !== lb) {
-        if (!la)
-            return -1;
-        if (!lb)
-            return 1;
-        return la < lb ? -1 : 1;
-    }
-    const aDecParts = pa[3] ? pa[3].slice(1).split('.').map(p => parseInt(p, 10)) : [];
-    const bDecParts = pb[3] ? pb[3].slice(1).split('.').map(p => parseInt(p, 10)) : [];
-    const maxLen = Math.max(aDecParts.length, bDecParts.length);
-    if (aDecParts.length === 0 && bDecParts.length > 0)
-        return -1;
-    if (bDecParts.length === 0 && aDecParts.length > 0)
-        return 1;
-    for (let i = 0; i < maxLen; i++) {
-        const av = Number.isFinite(aDecParts[i]) ? aDecParts[i] : 0;
-        const bv = Number.isFinite(bDecParts[i]) ? bDecParts[i] : 0;
-        if (av !== bv)
-            return av - bv;
-    }
-    return 0;
-}
-/**
- * Extract the phase token from a directory name.
- */
-function extractPhaseToken(dirName) {
-    const codePrefixMatch = dirName.match(/^([A-Z]{1,6})-(\d.*)/i);
-    let prefix = '';
-    let rest = dirName;
-    if (codePrefixMatch) {
-        prefix = codePrefixMatch[1] + '-';
-        rest = codePrefixMatch[2];
-    }
-    const segments = rest.split('-');
-    const tokenSegments = [];
-    for (let i = 0; i < segments.length; i++) {
-        const seg = segments[i];
-        if (/^\d/.test(seg)) {
-            tokenSegments.push(seg);
-        }
-        else {
-            break;
-        }
-    }
-    if (tokenSegments.length === 0) {
-        return dirName;
-    }
-    return prefix + tokenSegments.join('-');
-}
-/**
- * Check if a directory name's phase token matches the normalized phase exactly.
- */
-function phaseTokenMatches(dirName, normalized) {
-    const token = extractPhaseToken(dirName);
-    if (token.toUpperCase() === normalized.toUpperCase())
-        return true;
-    const stripped = dirName.replace(/^[A-Z]{1,6}-(?=\d)/i, '');
-    if (stripped !== dirName) {
-        const strippedToken = extractPhaseToken(stripped);
-        if (strippedToken.toUpperCase() === normalized.toUpperCase())
-            return true;
-    }
-    return false;
-}
-function extractCanonicalPlanId(filename) {
-    const base = filename.replace(/-PLAN\.md$/i, '').replace(/-SUMMARY\.md$/i, '').replace(/\.md$/i, '');
-    const parts = base.split('-').filter(Boolean);
-    const tokenRe = /^\d+[A-Z]?(?:\.\d+)*$/i;
-    const phaseIdx = parts.findIndex(p => tokenRe.test(p));
-    if (phaseIdx >= 0 && phaseIdx + 1 < parts.length && tokenRe.test(parts[phaseIdx + 1])) {
-        return `${parts[phaseIdx]}-${parts[phaseIdx + 1]}`;
-    }
-    return base;
-}
-function searchPhaseInDir(baseDir, relBase, normalized) {
-    try {
-        const dirs = readSubdirectories(baseDir, true);
-        const match = dirs.find(d => phaseTokenMatches(d, normalized));
-        if (!match)
-            return null;
-        const phaseToken = extractPhaseToken(match);
-        const phaseNumber = phaseToken || normalized;
-        const afterToken = match.slice(phaseToken ? phaseToken.length : 0).replace(/^-/, '');
-        const phaseName = afterToken || null;
-        const phaseDir = node_path_1.default.join(baseDir, match);
-        const { plans: unsortedPlans, summaries: unsortedSummaries, hasResearch, hasContext, hasVerification, hasReviews } = getPhaseFileStats(phaseDir);
-        const plans = unsortedPlans.sort();
-        const summaries = unsortedSummaries.sort();
-        const completedPlanIds = new Set(summaries.flatMap(s => {
-            const exact = s.replace('-SUMMARY.md', '').replace('SUMMARY.md', '');
-            const canonical = extractCanonicalPlanId(s);
-            return canonical === exact ? [exact] : [exact, canonical];
-        }));
-        const incompletePlans = plans.filter(p => {
-            const planId = p.replace('-PLAN.md', '').replace('PLAN.md', '');
-            const canonical = extractCanonicalPlanId(p);
-            return !completedPlanIds.has(planId) && !completedPlanIds.has(canonical);
-        });
-        return {
-            found: true,
-            directory: toPosixPath(node_path_1.default.join(relBase, match)),
-            phase_number: phaseNumber,
-            phase_name: phaseName,
-            phase_slug: phaseName ? phaseName.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '') : null,
-            plans,
-            summaries,
-            incomplete_plans: incompletePlans,
-            has_research: hasResearch,
-            has_context: hasContext,
-            has_verification: hasVerification,
-            has_reviews: hasReviews,
-        };
-    }
-    catch {
-        return null;
-    }
-}
-function findPhaseInternal(cwd, phase) {
-    if (!phase)
-        return null;
-    const phasesDir = node_path_1.default.join(planningDir(cwd), 'phases');
-    const normalized = normalizePhaseName(phase);
-    const relPhasesDir = toPosixPath(node_path_1.default.relative(cwd, phasesDir));
-    const current = searchPhaseInDir(phasesDir, relPhasesDir, normalized);
-    if (current)
-        return current;
-    const milestonesDir = node_path_1.default.join(cwd, '.planning', 'milestones');
-    if (!node_fs_1.default.existsSync(milestonesDir))
-        return null;
-    try {
-        const milestoneEntries = node_fs_1.default.readdirSync(milestonesDir, { withFileTypes: true });
-        const archiveDirs = milestoneEntries
-            .filter(e => e.isDirectory() && /^v[\d.]+-phases$/.test(e.name))
-            .map(e => e.name)
-            .sort()
-            .reverse();
-        for (const archiveName of archiveDirs) {
-            const versionMatch = archiveName.match(/^(v[\d.]+)-phases$/);
-            const version = versionMatch[1];
-            const archivePath = node_path_1.default.join(milestonesDir, archiveName);
-            const relBase = '.planning/milestones/' + archiveName;
-            const result = searchPhaseInDir(archivePath, relBase, normalized);
-            if (result) {
-                result.archived = version;
-                return result;
-            }
-        }
-    }
-    catch { /* intentionally empty */ }
-    return null;
-}
-function getArchivedPhaseDirs(cwd) {
-    const milestonesDir = node_path_1.default.join(cwd, '.planning', 'milestones');
-    const results = [];
-    if (!node_fs_1.default.existsSync(milestonesDir))
-        return results;
-    try {
-        const milestoneEntries = node_fs_1.default.readdirSync(milestonesDir, { withFileTypes: true });
-        const phaseDirs = milestoneEntries
-            .filter(e => e.isDirectory() && /^v[\d.]+-phases$/.test(e.name))
-            .map(e => e.name)
-            .sort()
-            .reverse();
-        for (const archiveName of phaseDirs) {
-            const versionMatch = archiveName.match(/^(v[\d.]+)-phases$/);
-            const version = versionMatch[1];
-            const archivePath = node_path_1.default.join(milestonesDir, archiveName);
-            const dirs = readSubdirectories(archivePath, true);
-            for (const dir of dirs) {
-                results.push({
-                    name: dir,
-                    milestone: version,
-                    basePath: node_path_1.default.join('.planning', 'milestones', archiveName),
-                    fullPath: node_path_1.default.join(archivePath, dir),
-                });
-            }
-        }
-    }
-    catch { /* intentionally empty */ }
-    return results;
-}
-// ─── Roadmap milestone scoping ───────────────────────────────────────────────
-/**
- * Strip shipped milestone content wrapped in <details> blocks.
- */
-function stripShippedMilestones(content) {
-    return content.replace(/<details>[\s\S]*?<\/details>/gi, '');
-}
-/**
- * Extract the current milestone section from ROADMAP.md by positive lookup.
- */
-function extractCurrentMilestone(content, cwd) {
-    if (!cwd)
-        return stripShippedMilestones(content);
-    let version = null;
-    try {
-        const statePath = node_path_1.default.join(planningDir(cwd), 'STATE.md');
-        const stateRaw = (0, shell_command_projection_cjs_1.platformReadSync)(statePath);
-        if (stateRaw !== null) {
-            const milestoneMatch = stateRaw.match(/^milestone:\s*(.+)/m);
-            if (milestoneMatch) {
-                version = milestoneMatch[1].trim();
-            }
-        }
-    }
-    catch { /* ignore */ }
-    if (!version) {
-        const inProgressMatch = content.match(/(?:🚧|🔄)\s*\*\*v(\d+\.\d+)\s/);
-        if (inProgressMatch) {
-            version = 'v' + inProgressMatch[1];
-        }
-    }
-    if (!version)
-        return stripShippedMilestones(content);
-    const escapedVersion = escapeRegex(version);
-    const sectionPattern = new RegExp(`(^#{1,3}\\s+(?!Phase\\s+\\S).*${escapedVersion}\\b[^\\n]*)`, 'gmi');
-    const summaryPattern = new RegExp(`<summary[^>]*>([^<]*${escapedVersion}[^<]*)<\\/summary>`, 'i');
-    const headingMatches = [...content.matchAll(sectionPattern)];
-    if (headingMatches.length === 0) {
-        const summaryMatch = content.match(summaryPattern);
-        if (summaryMatch) {
-            const summaryIdx = content.indexOf(summaryMatch[0]);
-            const beforeSummary = content.slice(0, summaryIdx);
-            const detailsOpenIdx = beforeSummary.lastIndexOf('<details');
-            if (detailsOpenIdx !== -1) {
-                const afterDetails = content.slice(detailsOpenIdx);
-                const closingMatch = afterDetails.match(/<\/details>/i);
-                const detailsEnd = closingMatch
-                    ? detailsOpenIdx + (closingMatch.index ?? 0) + '</details>'.length
-                    : content.length;
-                const anyMilestoneOrDetails = /^#{1,3}\s+(?!Phase\s+\S)(?:.*v\d+\.\d+|✅|📋|🚧|🔄)|<details/im;
-                const firstMilestoneMatch = content.match(anyMilestoneOrDetails);
-                const preambleCutoff = firstMilestoneMatch ? firstMilestoneMatch.index : detailsOpenIdx;
-                const preamble = content.slice(0, preambleCutoff)
-                    .replace(/<details>[\s\S]*?<\/details>/gi, '')
-                    .replace(/^#{2,4}\s*Phase\s+[\w][\w.-]*\s*:[^\n]*(?:\n(?!#{1,6}\s)[^\n]*)*\n?/gim, '')
-                    .replace(/^#{1,4}\s*Phase Details\b[^\n]*\n?/gim, '');
-                return preamble + content.slice(detailsOpenIdx, detailsEnd);
-            }
-        }
-        return stripShippedMilestones(content);
-    }
-    const allMatches = headingMatches;
-    const closedMarkerPattern = /\b(?:CLOSED|ARCHIVED|ABANDONED|SHIPPED|FAILED)\b|✅|🗄/i;
-    const activeMarkerPattern = /\b(?:STARTED|ACTIVE|WIP)\b|in\s+progress|🚧|🔄/i;
-    const isClosed = (h) => closedMarkerPattern.test(h) && !activeMarkerPattern.test(h);
-    const firstMatch = allMatches[0];
-    const selected = allMatches.find((m) => !isClosed(m[1])) || firstMatch;
-    const sectionStart = selected.index;
-    const computeSectionEnd = (headingText, headingStart) => {
-        const level = (headingText.match(/^(#{1,3})\s/) ?? ['', '#'])[1].length;
-        const rest = content.slice(headingStart + headingText.length);
-        const stopPattern = new RegExp(`^#{1,${level}}\\s+(?!Phase\\s+\\S)(?:.*v\\d+\\.\\d+|✅|📋|🚧)`, 'i');
-        let end = content.length;
-        let fc = null;
-        let fl = 0;
-        let off = 0;
-        for (const line of rest.split('\n')) {
-            const fm = line.match(/^\s{0,3}((?:`{3,}|~{3,}))(.*)/);
-            if (fm) {
-                const ch = fm[1][0];
-                const ln = fm[1].length;
-                const trailing = fm[2] || '';
-                if (!fc) {
-                    fc = ch;
-                    fl = ln;
-                }
-                else if (ch === fc && ln >= fl && /^\s*$/.test(trailing)) {
-                    fc = null;
-                    fl = 0;
-                }
-            }
-            else if (!fc && stopPattern.test(line)) {
-                end = headingStart + headingText.length + off;
-                break;
-            }
-            off += line.length + 1;
-        }
-        return end;
-    };
-    const sectionEnd = computeSectionEnd(selected[0], sectionStart);
-    const anyMilestonePattern = /^#{1,3}\s+(?!Phase\s+\S)(?:.*v\d+\.\d+|✅|📋|🚧)/im;
-    const firstMilestoneMatch = content.match(anyMilestonePattern);
-    const preambleCutoff = firstMilestoneMatch
-        ? firstMilestoneMatch.index
-        : firstMatch.index;
-    const beforeMilestones = content.slice(0, preambleCutoff);
-    const currentSection = content.slice(sectionStart, sectionEnd);
-    // Multi-milestone roadmaps split each added milestone across two version-bearing
-    // headings: a `## Phases` checklist subsection (early) and a dedicated
-    // `## Milestone … (Phase Details)` section (late) holding the `### Phase N:`
-    // detail headers. The scope window above stops at the next version-bearing
-    // heading — the current milestone's OWN Phase Details heading — leaving those
-    // detail headers outside `currentSection`. Append that section so phase
-    // resolution and counting see the current milestone's phases. Anchor the lookup
-    // to the SELECTED heading's specific version token (boundary-aware, so a
-    // `v3.0` state does not match a `v3.0-A` sub-milestone) so sibling milestones
-    // that share a version prefix do not cross-pollinate. (#730)
-    const selectedVersionToken = selected[1].match(/v\d+(?:\.\d+)+(?:[-.][A-Za-z0-9]+)*/i)?.[0];
-    const detailsVersionBoundary = selectedVersionToken
-        ? new RegExp(`${escapeRegex(selectedVersionToken)}(?![\\w.-])`, 'i')
-        : null;
-    let detailsSection = '';
-    const detailsMatch = allMatches.find((m) => /\(Phase\s+Details\)/i.test(m[1]) &&
-        !isClosed(m[1]) &&
-        (!detailsVersionBoundary || detailsVersionBoundary.test(m[1])) &&
-        (m.index ?? 0) >= sectionEnd);
-    if (detailsMatch) {
-        const detailsStart = detailsMatch.index ?? 0;
-        detailsSection = content.slice(detailsStart, computeSectionEnd(detailsMatch[0], detailsStart));
-    }
-    const preamble = beforeMilestones
-        .replace(/<details>[\s\S]*?<\/details>/gi, '')
-        .replace(/^#{2,4}\s*Phase\s+[\w][\w.-]*\s*:[^\n]*(?:\n(?!#{1,6}\s)[^\n]*)*\n?/gim, '')
-        .replace(/^#{1,4}\s*Phase Details\b[^\n]*\n?/gim, '');
-    return detailsSection
-        ? preamble + currentSection + '\n' + detailsSection
-        : preamble + currentSection;
-}
-/**
- * Replace a pattern only in the current milestone section of ROADMAP.md.
- */
-function replaceInCurrentMilestone(content, pattern, replacement) {
-    const lastDetailsClose = content.lastIndexOf('</details>');
-    if (lastDetailsClose === -1) {
-        return content.replace(pattern, replacement);
-    }
-    const offset = lastDetailsClose + '</details>'.length;
-    const before = content.slice(0, offset);
-    const after = content.slice(offset);
-    return before + after.replace(pattern, replacement);
-}
-function getRoadmapPhaseInternal(cwd, phaseNum) {
-    if (!phaseNum)
-        return null;
-    const roadmapPath = node_path_1.default.join(planningDir(cwd), 'ROADMAP.md');
-    if (!node_fs_1.default.existsSync(roadmapPath))
-        return null;
-    try {
-        const roadmapRaw = (0, shell_command_projection_cjs_1.platformReadSync)(roadmapPath);
-        if (roadmapRaw === null)
-            throw new Error('missing');
-        const content = extractCurrentMilestone(roadmapRaw, cwd);
-        const phasePattern = new RegExp(`#{2,4}\\s*(?:\\[[^\\]]+\\]\\s*)?Phase\\s+${phaseMarkdownRegexSource(phaseNum)}:\\s*([^\\n]+)`, 'i');
-        const headerMatch = content.match(phasePattern);
-        if (!headerMatch)
-            return null;
-        const phaseName = headerMatch[1].trim();
-        const headerIndex = headerMatch.index;
-        const restOfContent = content.slice(headerIndex);
-        const nextHeaderMatch = restOfContent.match(/\n#{2,4}\s+(?:\[[^\]]+\]\s*)?Phase\s+[\w]/i);
-        const sectionEnd = nextHeaderMatch ? headerIndex + nextHeaderMatch.index : content.length;
-        const section = content.slice(headerIndex, sectionEnd).trim();
-        const goalMatch = section.match(/\*\*Goal(?:\*\*:|\*?\*?:\*\*)\s*([^\n]+)/i);
-        const goal = goalMatch ? goalMatch[1].trim() : null;
-        return {
-            found: true,
-            // eslint-disable-next-line @typescript-eslint/no-base-to-string
-            phase_number: String(phaseNum),
-            phase_name: phaseName,
-            goal,
-            section,
-        };
-    }
-    catch {
-        return null;
-    }
-}
+// ─── Phase utilities (pure helpers re-exported from phase-id.cjs) ─────────────
+// escapeRegex, normalizePhaseName, getMilestoneFromPhaseId, getPhaseDirFromPhaseId,
+// phaseMarkdownRegexSource, phaseMarkdownRegexSourceExact, comparePhaseNum,
+// extractPhaseToken, phaseTokenMatches
+// — all imported via `phaseIdModule` above; internal callers use the destructured bindings.
+// extractCanonicalPlanId moved to core-utils.cjs (ADR-857 phase 2c / #877).
+// It is consumed exclusively by phase-locator.cjs, which imports it from
+// core-utils.cjs directly. It is NOT destructured in core.cts and is NOT
+// in core.cjs's public export = block (it was never public).
+// searchPhaseInDir, findPhaseInternal, getArchivedPhaseDirs moved to phase-locator.cjs
+// (ADR-857 phase 2d / #881). The destructured bindings above (from phaseLocatorModule)
+// make them available to core-internal callers; core.cjs re-exports findPhaseInternal,
+// getArchivedPhaseDirs, and searchPhaseInDir for back-compat.
+// ─── Roadmap milestone scoping (re-exported from roadmap-parser.cjs) ──────────
+// stripShippedMilestones, extractCurrentMilestone, replaceInCurrentMilestone,
+// getRoadmapPhaseInternal, getMilestoneInfo, getMilestonePhaseFilter
+// — all imported via `roadmapParserModule` above; internal callers use the destructured bindings.
 // ─── Agent installation validation (#1371) ───────────────────────────────────
 /**
  * Resolve the agents directory for the given runtime.
@@ -1161,7 +167,15 @@ function checkAgentsInstalled(runtime) {
         const agentFile = node_path_1.default.join(agentsDir, `${agent}.md`);
         const agentFileCopilot = node_path_1.default.join(agentsDir, `${agent}.agent.md`);
         const agentFileCodex = node_path_1.default.join(agentsDir, `${agent}.toml`);
-        if (node_fs_1.default.existsSync(agentFile) || node_fs_1.default.existsSync(agentFileCopilot) || node_fs_1.default.existsSync(agentFileCodex)) {
+        const agentFileKimiYaml = node_path_1.default.join(agentsDir, 'subagents', `${agent}.yaml`);
+        const agentFileKimiPrompt = node_path_1.default.join(agentsDir, 'subagents', `${agent}.md`);
+        const kimiAgentInstalled = resolvedRuntime === 'kimi' &&
+            node_fs_1.default.existsSync(agentFileKimiYaml) &&
+            node_fs_1.default.existsSync(agentFileKimiPrompt);
+        if (node_fs_1.default.existsSync(agentFile) ||
+            node_fs_1.default.existsSync(agentFileCopilot) ||
+            node_fs_1.default.existsSync(agentFileCodex) ||
+            kimiAgentInstalled) {
             installed.push(agent);
         }
         else {
@@ -1176,527 +190,6 @@ function checkAgentsInstalled(runtime) {
         agent_runtime: resolvedRuntime,
     };
 }
-// ─── Model alias resolution ───────────────────────────────────────────────────
-const RUNTIME_OVERRIDE_TIERS = new Set(['opus', 'sonnet', 'haiku']);
-const _warnedConfigKeys = new Set();
-function _warnUnknownProfileOverrides(parsed, configLabel) {
-    if (!parsed || typeof parsed !== 'object')
-        return;
-    const runtime = parsed['runtime'];
-    if (runtime && typeof runtime === 'string' && !(model_catalog_cjs_1.KNOWN_RUNTIMES).has(runtime)) {
-        const key = `${configLabel}::runtime::${runtime}`;
-        if (!_warnedConfigKeys.has(key)) {
-            _warnedConfigKeys.add(key);
-            try {
-                process.stderr.write(`gsd: warning — config key "runtime" has unknown value "${runtime}". ` +
-                    `Known runtimes: ${[...(model_catalog_cjs_1.KNOWN_RUNTIMES)].sort().join(', ')}. ` +
-                    `Resolution will fall back to safe defaults. (#2517)\n`);
-            }
-            catch { /* stderr might be closed in some test harnesses */ }
-        }
-    }
-    const overrides = parsed['model_profile_overrides'];
-    if (overrides && typeof overrides === 'object' && !Array.isArray(overrides)) {
-        for (const [overrideRuntime, tierMap] of Object.entries(overrides)) {
-            if (!(model_catalog_cjs_1.KNOWN_RUNTIMES).has(overrideRuntime)) {
-                const key = `${configLabel}::override-runtime::${overrideRuntime}`;
-                if (!_warnedConfigKeys.has(key)) {
-                    _warnedConfigKeys.add(key);
-                    try {
-                        process.stderr.write(`gsd: warning — model_profile_overrides.${overrideRuntime}.* uses ` +
-                            `unknown runtime "${overrideRuntime}". Known runtimes: ` +
-                            `${[...(model_catalog_cjs_1.KNOWN_RUNTIMES)].sort().join(', ')}. (#2517)\n`);
-                    }
-                    catch { /* ok */ }
-                }
-            }
-            if (!tierMap || typeof tierMap !== 'object')
-                continue;
-            for (const tierName of Object.keys(tierMap)) {
-                if (!RUNTIME_OVERRIDE_TIERS.has(tierName)) {
-                    const key = `${configLabel}::override-tier::${overrideRuntime}.${tierName}`;
-                    if (!_warnedConfigKeys.has(key)) {
-                        _warnedConfigKeys.add(key);
-                        try {
-                            process.stderr.write(`gsd: warning — model_profile_overrides.${overrideRuntime}.${tierName} ` +
-                                `uses unknown tier "${tierName}". Allowed tiers: opus, sonnet, haiku. (#2517)\n`);
-                        }
-                        catch { /* ok */ }
-                    }
-                }
-            }
-        }
-    }
-    const policy = parsed['model_policy'];
-    if (policy && typeof policy === 'object' && !Array.isArray(policy)) {
-        const policyObj = policy;
-        const provider = policyObj['provider'];
-        const _POLICY_SENTINEL_PROVIDERS = new Set(['generic', 'custom']);
-        if (provider && typeof provider === 'string' &&
-            !(model_catalog_cjs_1.KNOWN_PROVIDERS).has(provider) && !_POLICY_SENTINEL_PROVIDERS.has(provider)) {
-            const pkey = `${configLabel}::model_policy::provider::${provider}`;
-            if (!_warnedConfigKeys.has(pkey)) {
-                _warnedConfigKeys.add(pkey);
-                try {
-                    process.stderr.write(`gsd: warning — model_policy.provider has unknown value "${provider}". ` +
-                        `Known providers: ${[...(model_catalog_cjs_1.KNOWN_PROVIDERS)].sort().join(', ')}. ` +
-                        `For manual model IDs use provider="custom". (#49)\n`);
-                }
-                catch { /* ok */ }
-            }
-        }
-        const rtOverrides = policyObj['runtime_tiers'];
-        if (rtOverrides && typeof rtOverrides === 'object' && !Array.isArray(rtOverrides)) {
-            for (const [pruntime, tierMap] of Object.entries(rtOverrides)) {
-                if (!(model_catalog_cjs_1.KNOWN_RUNTIMES).has(pruntime)) {
-                    const key = `${configLabel}::model_policy.runtime_tiers::${pruntime}`;
-                    if (!_warnedConfigKeys.has(key)) {
-                        _warnedConfigKeys.add(key);
-                        try {
-                            process.stderr.write(`gsd: warning — model_policy.runtime_tiers.${pruntime}.* uses ` +
-                                `unknown runtime "${pruntime}". Known runtimes: ` +
-                                `${[...(model_catalog_cjs_1.KNOWN_RUNTIMES)].sort().join(', ')}. (#49)\n`);
-                        }
-                        catch { /* ok */ }
-                    }
-                }
-                if (!tierMap || typeof tierMap !== 'object')
-                    continue;
-                for (const tierName of Object.keys(tierMap)) {
-                    if (!RUNTIME_OVERRIDE_TIERS.has(tierName)) {
-                        const key = `${configLabel}::model_policy.runtime_tiers::${pruntime}.${tierName}`;
-                        if (!_warnedConfigKeys.has(key)) {
-                            _warnedConfigKeys.add(key);
-                            try {
-                                process.stderr.write(`gsd: warning — model_policy.runtime_tiers.${pruntime}.${tierName} ` +
-                                    `uses unknown tier "${tierName}". Allowed: opus, sonnet, haiku. (#49)\n`);
-                            }
-                            catch { /* ok */ }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-// Internal helper exposed for tests so per-process warning state can be reset
-// between cases that intentionally exercise the warning path repeatedly.
-function _resetRuntimeWarningCacheForTests() {
-    _warnedConfigKeys.clear();
-}
-/**
- * #2517 — Resolve the runtime-aware tier entry for (runtime, tier).
- */
-function resolveTierEntry({ runtime, tier, overrides }) {
-    if (!runtime || !tier)
-        return null;
-    const runtimeMap = model_catalog_cjs_1.RUNTIME_PROFILE_MAP;
-    const builtin = runtimeMap[runtime]?.[tier] || null;
-    const overridesMap = overrides;
-    const userRaw = overridesMap?.[runtime]?.[tier];
-    let userEntry = null;
-    if (userRaw) {
-        userEntry = typeof userRaw === 'string' ? { model: userRaw } : userRaw;
-    }
-    if (!builtin && !userEntry)
-        return null;
-    return { ...(builtin || {}), ...(userEntry || {}) };
-}
-/**
- * Convenience wrapper used by resolveModelInternal.
- */
-function _resolveRuntimeTier(config, tier) {
-    return resolveTierEntry({
-        runtime: config['runtime'],
-        tier,
-        overrides: config['model_profile_overrides'],
-    });
-}
-/**
- * #49 — Provider-neutral model policy preset resolution.
- */
-function resolveModelPolicy(policy, tier) {
-    if (!policy || typeof policy !== 'object')
-        return null;
-    if (!tier)
-        return null;
-    const runtime = policy['runtime'];
-    const rtOverrides = policy['runtime_tiers'];
-    if (runtime && typeof runtime === 'string' && rtOverrides && typeof rtOverrides === 'object') {
-        const rtOverridesMap = rtOverrides;
-        if (Object.hasOwn(rtOverridesMap, runtime)) {
-            const runtimeEntry = rtOverridesMap[runtime];
-            if (runtimeEntry && typeof runtimeEntry === 'object' && Object.hasOwn(runtimeEntry, tier)) {
-                const raw = runtimeEntry[tier];
-                if (raw != null) {
-                    const entry = typeof raw === 'string' ? { model: raw } : raw;
-                    if (entry && entry['model'])
-                        return entry['model'];
-                }
-            }
-        }
-    }
-    const provider = policy['provider'];
-    if (!provider || typeof provider !== 'string')
-        return null;
-    if (provider === 'generic' || provider === 'custom') {
-        const TIER_TO_POLICY_KEY = { opus: 'high', sonnet: 'medium', haiku: 'low' };
-        const policyKey = TIER_TO_POLICY_KEY[tier];
-        if (!policyKey)
-            return null;
-        const v = policy[policyKey];
-        return (v && typeof v === 'string') ? v : null;
-    }
-    const presetsMap = model_catalog_cjs_1.PROVIDER_PRESETS;
-    if (!Object.hasOwn(presetsMap, provider))
-        return null;
-    const presetForProvider = presetsMap[provider];
-    if (!presetForProvider || typeof presetForProvider !== 'object')
-        return null;
-    if (!Object.hasOwn(presetForProvider, tier))
-        return null;
-    const tierPresets = presetForProvider[tier];
-    if (!tierPresets || typeof tierPresets !== 'object')
-        return null;
-    const budget = (policy['budget'] && typeof policy['budget'] === 'string') ? policy['budget'] : 'medium';
-    if (!Object.hasOwn(tierPresets, budget))
-        return null;
-    const budgetEntry = tierPresets[budget];
-    if (!budgetEntry || !budgetEntry.model)
-        return null;
-    return budgetEntry.model;
-}
-function resolveModelInternal(cwd, agentType) {
-    const config = loadConfig(cwd);
-    // 1. Per-agent override
-    const modelOverrides = config['model_overrides'];
-    const override = modelOverrides?.[agentType];
-    if (override) {
-        return override;
-    }
-    // 2. Compute the tier
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
-    const profile = String(config['model_profile'] || 'balanced').toLowerCase();
-    const agentModels = MODEL_PROFILES[agentType];
-    const phaseType = (AGENT_TO_PHASE_TYPE)[agentType];
-    const configModels = config['models'];
-    const phaseTypeTier = (phaseType && configModels && typeof configModels === 'object')
-        ? configModels[phaseType]
-        : undefined;
-    const VALID_TIERS = new Set(['opus', 'sonnet', 'haiku', 'inherit']);
-    const tier = (phaseTypeTier && VALID_TIERS.has(phaseTypeTier))
-        ? phaseTypeTier
-        : (profile === 'inherit'
-            ? 'inherit'
-            : (agentModels ? (agentModels[profile] || agentModels['balanced']) : null));
-    // 2.5. model_policy preset (#49)
-    const configRuntime = config['runtime'];
-    if (configRuntime && configRuntime !== 'claude' && tier && tier !== 'inherit') {
-        const mergedPolicy = config['model_policy']
-            ? { ...config['model_policy'], runtime: configRuntime }
-            : null;
-        const policyModel = resolveModelPolicy(mergedPolicy, tier);
-        if (policyModel)
-            return policyModel;
-    }
-    // 3. Runtime-aware resolution (#2517)
-    if (configRuntime && configRuntime !== 'claude' && tier && tier !== 'inherit') {
-        const entry = _resolveRuntimeTier(config, tier);
-        if (entry?.model)
-            return entry.model;
-    }
-    // 4. resolve_model_ids: "omit"
-    if (config['resolve_model_ids'] === 'omit') {
-        return '';
-    }
-    // 5. Profile lookup (Claude-native default).
-    if (!agentModels) {
-        return profile === 'quality' ? 'opus'
-            : profile === 'budget' ? 'haiku'
-                : profile === 'inherit' ? 'inherit'
-                    : 'sonnet';
-    }
-    if (tier === 'inherit')
-        return 'inherit';
-    const alias = tier;
-    if (config['resolve_model_ids']) {
-        return model_catalog_cjs_1.MODEL_ALIAS_MAP[alias] || alias;
-    }
-    return alias;
-}
-const VALID_GRANULARITIES = new Set(['coarse', 'standard', 'fine']);
-/**
- * Resolve the planning granularity for a phase type (#68).
- */
-function resolveGranularityInternal(cwd, phaseType, override) {
-    if (override !== undefined && override !== null && override !== '') {
-        if (VALID_GRANULARITIES.has(override)) {
-            return override;
-        }
-    }
-    const config = loadConfig(cwd);
-    const configGranularities = config['granularities'];
-    const perPhase = (phaseType && configGranularities && typeof configGranularities === 'object')
-        ? configGranularities[phaseType]
-        : undefined;
-    if (perPhase && VALID_GRANULARITIES.has(perPhase)) {
-        return perPhase;
-    }
-    if (config['granularity'] !== undefined && config['granularity'] !== null && config['granularity'] !== '') {
-        return config['granularity'];
-    }
-    const planning = config['planning'];
-    const planningGran = planning && planning['granularity'];
-    if (planningGran !== undefined && planningGran !== null && planningGran !== '') {
-        return planningGran;
-    }
-    return 'standard';
-}
-/**
- * Validate a CLI granularity override at the command boundary. Empty/null/undefined
- * are treated as "no override" (no-op). An invalid non-empty value calls `fail`.
- */
-function assertValidGranularityOverride(override, fail) {
-    if (override !== undefined && override !== null && override !== '' && !VALID_GRANULARITIES.has(override)) {
-        fail(`invalid granularity '${override}' (valid: ${[...VALID_GRANULARITIES].join(', ')})`);
-    }
-}
-/**
- * #3024 — Resolve a model for a specific dynamic-routing attempt.
- */
-function resolveModelForTier(cwd, agentType, attempt) {
-    const config = loadConfig(cwd);
-    const attemptN = Number.isInteger(attempt) && attempt > 0 ? attempt : 0;
-    const modelOverrides = config['model_overrides'];
-    const override = modelOverrides?.[agentType];
-    if (override)
-        return override;
-    if (config['model_policy'] && config['runtime'] && config['runtime'] !== 'claude') {
-        return resolveModelInternal(cwd, agentType);
-    }
-    const dr = config['dynamic_routing'];
-    if (!dr || typeof dr !== 'object' || dr['enabled'] !== true) {
-        return resolveModelInternal(cwd, agentType);
-    }
-    const tierModels = dr['tier_models'];
-    if (!tierModels || typeof tierModels !== 'object') {
-        return resolveModelInternal(cwd, agentType);
-    }
-    const defaultTier = (AGENT_DEFAULT_TIERS)[agentType];
-    if (!defaultTier || !(VALID_AGENT_TIERS).has(defaultTier)) {
-        return resolveModelInternal(cwd, agentType);
-    }
-    const maxEscalations = Number.isInteger(dr['max_escalations']) && dr['max_escalations'] >= 0
-        ? dr['max_escalations']
-        : 1;
-    const escalationEnabled = dr['escalate_on_failure'] !== false;
-    const effectiveAttempt = escalationEnabled
-        ? Math.min(attemptN, maxEscalations)
-        : 0;
-    let tier = defaultTier;
-    for (let i = 0; i < effectiveAttempt; i += 1) {
-        const next = (nextTier)(tier);
-        if (!next || next === tier)
-            break;
-        tier = next;
-    }
-    const alias = tierModels[tier];
-    if (typeof alias !== 'string' || alias.length === 0) {
-        return resolveModelInternal(cwd, agentType);
-    }
-    return alias;
-}
-// ─── #443 — Unified effort + fast_mode resolvers ─────────────────────────────
-const VALID_EFFORTS = ['minimal', 'low', 'medium', 'high', 'xhigh', 'max'];
-const EFFORT_SET = new Set(VALID_EFFORTS);
-/**
- * Walk one step up the effort ladder from `e`.
- */
-function nextEffort(e) {
-    const i = VALID_EFFORTS.indexOf(e);
-    if (i < 0)
-        return null;
-    return VALID_EFFORTS[Math.min(i + 1, VALID_EFFORTS.length - 1)];
-}
-/**
- * #443 — Resolve a universal effort string for (cwd, agentType).
- */
-function resolveEffortInternal(cwd, agentType, opts) {
-    // Step 1: invocation override
-    if (opts && typeof opts.override === 'string' && EFFORT_SET.has(opts.override)) {
-        return opts.override;
-    }
-    const config = loadConfig(cwd);
-    const effortCfg = (config['effort'] && typeof config['effort'] === 'object' && !Array.isArray(config['effort']))
-        ? config['effort']
-        : null;
-    // Step 2: agent_overrides
-    if (effortCfg) {
-        const ao = effortCfg['agent_overrides'];
-        if (ao && typeof ao === 'object' && !Array.isArray(ao)) {
-            const v = ao[agentType];
-            if (typeof v === 'string' && EFFORT_SET.has(v))
-                return v;
-        }
-    }
-    else {
-        const canonicalEffort = (configuration_cjs_1.CONFIG_DEFAULTS)['effort'];
-        const mao = canonicalEffort && typeof canonicalEffort === 'object'
-            ? canonicalEffort['agent_overrides']
-            : undefined;
-        if (mao && typeof mao === 'object' && !Array.isArray(mao)) {
-            const v = mao[agentType];
-            if (typeof v === 'string' && EFFORT_SET.has(v))
-                return v;
-        }
-    }
-    // Step 3: routing_tier_defaults by agent's default tier.
-    const agentTier = (AGENT_DEFAULT_TIERS)[agentType];
-    if (agentTier) {
-        if (effortCfg && effortCfg['routing_tier_defaults'] &&
-            typeof effortCfg['routing_tier_defaults'] === 'object' &&
-            !Array.isArray(effortCfg['routing_tier_defaults'])) {
-            const v = effortCfg['routing_tier_defaults'][agentTier];
-            if (typeof v === 'string' && EFFORT_SET.has(v))
-                return v;
-        }
-        else if (!effortCfg) {
-            const canonicalEffort = (configuration_cjs_1.CONFIG_DEFAULTS)['effort'];
-            const manifestDefaults = canonicalEffort && typeof canonicalEffort === 'object'
-                ? canonicalEffort['routing_tier_defaults']
-                : undefined;
-            if (manifestDefaults && typeof manifestDefaults === 'object') {
-                const v = manifestDefaults[agentTier];
-                if (typeof v === 'string' && EFFORT_SET.has(v))
-                    return v;
-            }
-        }
-    }
-    // Step 4: effort.default
-    if (effortCfg) {
-        const d = effortCfg['default'];
-        if (typeof d === 'string' && EFFORT_SET.has(d))
-            return d;
-    }
-    else {
-        const canonicalEffort = (configuration_cjs_1.CONFIG_DEFAULTS)['effort'];
-        const d = canonicalEffort && typeof canonicalEffort === 'object'
-            ? canonicalEffort['default']
-            : undefined;
-        if (typeof d === 'string' && EFFORT_SET.has(d))
-            return d;
-    }
-    // Step 5: hardcoded default
-    return 'high';
-}
-/**
- * #443 — Resolve fast_mode boolean for (cwd, agentType).
- */
-function resolveFastModeInternal(cwd, agentType, opts) {
-    // Step 1: invocation override
-    if (opts && typeof opts.override === 'boolean') {
-        return opts.override;
-    }
-    const config = loadConfig(cwd);
-    const fmCfg = (config['fast_mode'] && typeof config['fast_mode'] === 'object' && !Array.isArray(config['fast_mode']))
-        ? config['fast_mode']
-        : null;
-    // Step 2: agent_overrides
-    if (fmCfg) {
-        const ao = fmCfg['agent_overrides'];
-        if (ao && typeof ao === 'object' && !Array.isArray(ao)) {
-            const v = ao[agentType];
-            if (typeof v === 'boolean')
-                return v;
-        }
-    }
-    // Step 3: routing_tier_defaults by agent's default tier.
-    const agentTier = (AGENT_DEFAULT_TIERS)[agentType];
-    if (agentTier) {
-        if (fmCfg && fmCfg['routing_tier_defaults'] &&
-            typeof fmCfg['routing_tier_defaults'] === 'object' &&
-            !Array.isArray(fmCfg['routing_tier_defaults'])) {
-            const v = fmCfg['routing_tier_defaults'][agentTier];
-            if (typeof v === 'boolean')
-                return v;
-        }
-        else if (!fmCfg) {
-            const canonicalFm = (configuration_cjs_1.CONFIG_DEFAULTS)['fast_mode'];
-            const manifestDefaults = canonicalFm && typeof canonicalFm === 'object'
-                ? canonicalFm['routing_tier_defaults']
-                : undefined;
-            if (manifestDefaults && typeof manifestDefaults === 'object') {
-                const v = manifestDefaults[agentTier];
-                if (typeof v === 'boolean')
-                    return v;
-            }
-        }
-    }
-    // Step 4: fast_mode.enabled
-    if (fmCfg && typeof fmCfg['enabled'] === 'boolean') {
-        return fmCfg['enabled'];
-    }
-    // Step 5: hardcoded default
-    return false;
-}
-/**
- * #443 — Resolve effort for a dynamic-routing attempt (with escalation).
- */
-function resolveEffortForTier(cwd, agentType, attempt) {
-    const base = resolveEffortInternal(cwd, agentType);
-    const config = loadConfig(cwd);
-    const dr = config['dynamic_routing'];
-    if (!dr || typeof dr !== 'object' || dr['enabled'] !== true) {
-        return base;
-    }
-    if (dr['escalate_on_failure'] === false) {
-        return base;
-    }
-    const maxEscalations = Number.isInteger(dr['max_escalations']) && dr['max_escalations'] >= 0
-        ? dr['max_escalations']
-        : 1;
-    const attemptN = Number.isInteger(attempt) && attempt > 0 ? attempt : 0;
-    const effectiveAttempt = Math.min(attemptN, maxEscalations);
-    let current = base;
-    for (let i = 0; i < effectiveAttempt; i++) {
-        const next = nextEffort(current);
-        if (!next || next === current)
-            break;
-        current = next;
-    }
-    return current;
-}
-// ─── Summary body helpers ─────────────────────────────────────────────────
-/**
- * Extract a one-liner from the summary body when it's not in frontmatter.
- */
-function extractOneLinerFromBody(content) {
-    if (!content)
-        return null;
-    const normalized = content.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
-    const body = normalized.replace(/^---\n[\s\S]*?\n---\n*/, '');
-    const match = body.match(/^#[^\n]*\n+\*\*([^*\n]+)\*\*([^\n]*)/m);
-    if (!match)
-        return null;
-    const boldInner = match[1].trim();
-    const afterBold = match[2];
-    if (/:\s*$/.test(boldInner)) {
-        const prose = afterBold.trim();
-        return prose.length > 0 ? prose : null;
-    }
-    return boldInner.length > 0 ? boldInner : null;
-}
-// ─── Misc utilities ───────────────────────────────────────────────────────────
-function pathExistsInternal(cwd, targetPath) {
-    const fullPath = node_path_1.default.isAbsolute(targetPath) ? targetPath : node_path_1.default.join(cwd, targetPath);
-    try {
-        node_fs_1.default.statSync(fullPath);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 /**
  * Detect whether `cwd` sits inside a git worktree, and if so, return the
  * absolute path of the worktree root.
@@ -1722,258 +215,6 @@ function gitWorktreeInfoInternal(cwd) {
         return { inside: false, worktreeRoot: null };
     }
 }
-function generateSlugInternal(text) {
-    if (!text)
-        return null;
-    return text.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '').substring(0, 60);
-}
-function getMilestoneInfo(cwd) {
-    try {
-        const roadmap = (0, shell_command_projection_cjs_1.platformReadSync)(node_path_1.default.join(planningDir(cwd), 'ROADMAP.md'));
-        if (roadmap === null)
-            throw new Error('missing');
-        let stateVersion = null;
-        if (cwd) {
-            try {
-                const statePath = node_path_1.default.join(planningDir(cwd), 'STATE.md');
-                const stateRaw = (0, shell_command_projection_cjs_1.platformReadSync)(statePath);
-                if (stateRaw !== null) {
-                    const m = stateRaw.match(/^milestone:\s*(.+)/m);
-                    if (m)
-                        stateVersion = m[1].trim();
-                }
-            }
-            catch { /* intentionally empty */ }
-        }
-        if (stateVersion) {
-            const escapedVer = escapeRegex(stateVersion);
-            const headingMatch = roadmap.match(new RegExp(`##[^\\n]*${escapedVer}[:\\s]+([^\\n(]+)`, 'i'));
-            if (headingMatch) {
-                if (!headingMatch[0].includes('✅')) {
-                    return { version: stateVersion, name: headingMatch[1].trim() };
-                }
-            }
-            else {
-                const listMatch = roadmap.match(new RegExp(`🚧\\s*\\*?\\*?${escapedVer}\\s+([^*\\n]+)`, 'i'));
-                if (listMatch) {
-                    return { version: stateVersion, name: listMatch[1].trim() };
-                }
-                return { version: stateVersion, name: 'milestone' };
-            }
-        }
-        const inProgressMatch = roadmap.match(/🚧\s*\*\*v(\d+(?:\.\d+)+)\s+([^*]+)\*\*/);
-        if (inProgressMatch) {
-            return {
-                version: 'v' + inProgressMatch[1],
-                name: inProgressMatch[2].trim(),
-            };
-        }
-        const cleaned = stripShippedMilestones(roadmap);
-        const headingMatch = cleaned.match(/## (?!.*✅).*v(\d+(?:\.\d+)+)[:\s]+([^\n(]+)/);
-        if (headingMatch) {
-            return {
-                version: 'v' + headingMatch[1],
-                name: headingMatch[2].trim(),
-            };
-        }
-        const versionMatch = cleaned.match(/v(\d+(?:\.\d+)+)/);
-        return {
-            version: versionMatch ? versionMatch[0] : 'v1.0',
-            name: 'milestone',
-        };
-    }
-    catch {
-        return { version: 'v1.0', name: 'milestone' };
-    }
-}
-/**
- * Returns a filter function that checks whether a phase directory belongs
- * to the current milestone based on ROADMAP.md phase headings.
- */
-function getMilestonePhaseFilter(cwd, versionOverride) {
-    const milestonePhaseNums = new Set();
-    let missingExplicitVersion = false;
-    try {
-        const roadmapPath = node_path_1.default.join(planningDir(cwd), 'ROADMAP.md');
-        const roadmapContent = (0, shell_command_projection_cjs_1.platformReadSync)(roadmapPath);
-        if (roadmapContent === null)
-            throw new Error('missing');
-        let roadmap = extractCurrentMilestone(roadmapContent, cwd);
-        const hasVersionedMilestonesGlobal = /^#{1,3}\s+.*v\d+\.\d+/mi.test(roadmapContent);
-        const hasPhaseHeadings = /#{2,4}\s*(?:\[[^\]]+\]\s*)?Phase\s+[\w]/i.test(roadmapContent);
-        if (!hasVersionedMilestonesGlobal && hasPhaseHeadings) {
-            console.warn('[gsd] Deprecated: free-form ROADMAP.md detected (no versioned milestone headings). ' +
-                'Set phase_id_convention in config.json to suppress this warning.');
-        }
-        if (versionOverride) {
-            const escapedVersion = escapeRegex(versionOverride);
-            const sectionPattern = new RegExp(`(^#{1,3}\\s+(?!Phase\\s+\\S).*${escapedVersion}[^\\n]*)`, 'mi');
-            let sectionMatch = roadmapContent.match(sectionPattern);
-            if (!sectionMatch) {
-                const summaryPat = new RegExp(`<summary[^>]*>[^<]*${escapedVersion}[^<]*<\\/summary>`, 'i');
-                const summaryHit = roadmapContent.match(summaryPat);
-                if (summaryHit) {
-                    const beforeSummary = roadmapContent.slice(0, summaryHit.index);
-                    const detailsIdx = beforeSummary.lastIndexOf('<details');
-                    if (detailsIdx !== -1) {
-                        sectionMatch = null;
-                    }
-                }
-            }
-            if (!sectionMatch) {
-                const hasVersionedMilestones = /^#{1,3}\s+(?!Phase\s+\S).*v\d+\.\d+/mi.test(roadmapContent);
-                const versionInSummary = new RegExp(`<summary[^>]*>[^<]*${escapedVersion}[^<]*<\\/summary>`, 'i').test(roadmapContent);
-                if (hasVersionedMilestones && !versionInSummary) {
-                    roadmap = '';
-                    missingExplicitVersion = true;
-                }
-            }
-            else {
-                const sectionStart = sectionMatch.index;
-                const headingLevel = (sectionMatch[1].match(/^(#{1,3})\s/) ?? ['', '#'])[1].length;
-                const restContent = roadmapContent.slice(sectionStart + sectionMatch[0].length);
-                const nextMilestonePattern = new RegExp(`^#{1,${headingLevel}}\\s+(?!Phase\\s+\\S)(?:.*v\\d+\\.\\d+|✅|📋|🚧)`, 'i');
-                let sectionEnd = roadmapContent.length;
-                let fenceChar = null;
-                let fenceLen = 0;
-                let charOffset = 0;
-                for (const line of restContent.split('\n')) {
-                    const fenceMatch = line.match(/^\s{0,3}((?:`{3,}|~{3,}))(.*)/);
-                    if (fenceMatch) {
-                        const char = fenceMatch[1][0];
-                        const len = fenceMatch[1].length;
-                        const trailing = fenceMatch[2] || '';
-                        if (!fenceChar) {
-                            fenceChar = char;
-                            fenceLen = len;
-                        }
-                        else if (char === fenceChar && len >= fenceLen && /^\s*$/.test(trailing)) {
-                            fenceChar = null;
-                            fenceLen = 0;
-                        }
-                    }
-                    else if (!fenceChar && nextMilestonePattern.test(line)) {
-                        sectionEnd = sectionStart + sectionMatch[0].length + charOffset;
-                        break;
-                    }
-                    charOffset += line.length + 1;
-                }
-                const currentSection = roadmapContent.slice(sectionStart, sectionEnd);
-                roadmap = currentSection;
-            }
-        }
-        const phasePattern = /#{2,4}\s*(?:\[[^\]]+\]\s*)?Phase\s+([\w][\w.-]*)\s*:/gi;
-        let m;
-        while ((m = phasePattern.exec(roadmap)) !== null) {
-            milestonePhaseNums.add(m[1]);
-        }
-    }
-    catch { /* intentionally empty */ }
-    if (milestonePhaseNums.size === 0) {
-        const passAll = (() => true);
-        passAll.phaseCount = 0;
-        passAll.missingExplicitVersion = missingExplicitVersion;
-        return passAll;
-    }
-    const normalized = new Set([...milestonePhaseNums].map(n => n.split('-').map(seg => (seg.replace(/^0+(?=\d)/, '') || '0')).join('-').toLowerCase()));
-    function normalizePhaseIdSegments(id) {
-        return id.split('-').map(seg => seg.replace(/^0+(?=\d)/, '') || '0').join('-');
-    }
-    const roadmapUsesHyphenedIds = [...normalized].some(n => n.includes('-'));
-    const numericRe = roadmapUsesHyphenedIds
-        ? /^0*(\d+(?:-0*\d+)*[A-Za-z]?(?:\.\d+)*)/
-        : /^0*(\d+[A-Za-z]?(?:\.\d+)*)/;
-    function isDirInMilestone(dirName) {
-        const m2 = dirName.match(numericRe);
-        if (m2 && normalized.has(normalizePhaseIdSegments(m2[1]).toLowerCase()))
-            return true;
-        const customMatch = dirName.match(/^([A-Za-z][A-Za-z0-9]*(?:-[A-Za-z0-9]+)*)/);
-        if (customMatch && normalized.has(customMatch[1].toLowerCase()))
-            return true;
-        const stripped = dirName.replace(/^[A-Z]{1,6}-(?=\d)/i, '');
-        if (stripped !== dirName) {
-            const sm = stripped.match(numericRe);
-            if (sm && normalized.has(normalizePhaseIdSegments(sm[1]).toLowerCase()))
-                return true;
-        }
-        return false;
-    }
-    isDirInMilestone.phaseCount = milestonePhaseNums.size;
-    isDirInMilestone.missingExplicitVersion = missingExplicitVersion;
-    return isDirInMilestone;
-}
-// ─── Phase file helpers ──────────────────────────────────────────────────────
-/** Filter a file list to just PLAN.md / *-PLAN.md entries. */
-function filterPlanFiles(files) {
-    return files.filter(f => f.endsWith('-PLAN.md') || f === 'PLAN.md');
-}
-/** Filter a file list to just SUMMARY.md / *-SUMMARY.md entries. */
-function filterSummaryFiles(files) {
-    return files.filter(f => f.endsWith('-SUMMARY.md') || f === 'SUMMARY.md');
-}
-/**
- * Read a phase directory and return counts/flags for common file types.
- */
-function getPhaseFileStats(phaseDir) {
-    const files = node_fs_1.default.readdirSync(phaseDir);
-    return {
-        plans: filterPlanFiles(files),
-        summaries: filterSummaryFiles(files),
-        hasResearch: files.some(f => f.endsWith('-RESEARCH.md') || f === 'RESEARCH.md'),
-        hasContext: findContextMdIn(files) !== null,
-        hasVerification: files.some(f => f.endsWith('-VERIFICATION.md') || f === 'VERIFICATION.md'),
-        hasReviews: files.some(f => f.endsWith('-REVIEWS.md') || f === 'REVIEWS.md'),
-    };
-}
-/**
- * Read immediate child directories from a path.
- * Returns [] if the path doesn't exist or can't be read.
- * Pass sort=true to apply comparePhaseNum ordering.
- */
-function readSubdirectories(dirPath, sort = false) {
-    try {
-        const entries = node_fs_1.default.readdirSync(dirPath, { withFileTypes: true });
-        const dirs = entries.filter(e => e.isDirectory()).map(e => e.name);
-        return sort ? dirs.sort((a, b) => comparePhaseNum(a, b)) : dirs;
-    }
-    catch {
-        return [];
-    }
-}
-/**
- * Format a Date as a fuzzy relative time string (e.g. "5 minutes ago").
- */
-function timeAgo(date) {
-    const seconds = Math.floor((Date.now() - date.getTime()) / 1000);
-    if (seconds < 5)
-        return 'just now';
-    if (seconds < 60)
-        return `${seconds} seconds ago`;
-    const minutes = Math.floor(seconds / 60);
-    if (minutes === 1)
-        return '1 minute ago';
-    if (minutes < 60)
-        return `${minutes} minutes ago`;
-    const hours = Math.floor(minutes / 60);
-    if (hours === 1)
-        return '1 hour ago';
-    if (hours < 24)
-        return `${hours} hours ago`;
-    const days = Math.floor(hours / 24);
-    if (days === 1)
-        return '1 day ago';
-    if (days < 30)
-        return `${days} days ago`;
-    const months = Math.floor(days / 30);
-    if (months === 1)
-        return '1 month ago';
-    if (months < 12)
-        return `${months} months ago`;
-    const years = Math.floor(days / 365);
-    if (years === 1)
-        return '1 year ago';
-    return `${years} years ago`;
-}
 module.exports = {
     output,
     error,
@@ -2031,7 +272,6 @@ module.exports = {
     findProjectRoot: project_root_cjs_1.findProjectRoot,
     detectSubRepos,
     reapStaleTempFiles,
-    ensureGsdTempDir,
     GSD_TEMP_DIR,
     MODEL_ALIAS_MAP: model_catalog_cjs_1.MODEL_ALIAS_MAP,
     CONFIG_DEFAULTS,