@zigrivers/scaffold 3.9.2 → 3.10.1

package/dist/project/adopt.js

@@ -1,13 +1,56 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import { parseDocument, isMap, isScalar } from 'yaml';
+import { z } from 'zod';
+import { assertNever } from './detectors/types.js';
 import { detectProjectMode } from './detector.js';
 import { discoverMetaPrompts } from '../core/assembly/meta-prompt-loader.js';
+import { createSignalContext } from './detectors/context.js';
+import { runDetectors } from './detectors/index.js';
+import { resolveDetection } from './detectors/resolve-detection.js';
+import { WebAppConfigSchema, BackendConfigSchema, CliConfigSchema, LibraryConfigSchema, MobileAppConfigSchema, DataPipelineConfigSchema, MlConfigSchema, BrowserExtensionConfigSchema, GameConfigSchema, } from '../config/schema.js';
+import { ExitCode } from '../types/enums.js';
+import { configParseError, configNotObject } from '../utils/errors.js';
+// CRITICAL: project-type → typed-config-key mapping. Do NOT derive via string transforms
+// — `'web-app'.replace('-','')` produces 'webapp', not 'webApp'.
+const TYPE_KEY = {
+    'web-app': 'webAppConfig',
+    'mobile-app': 'mobileAppConfig',
+    'backend': 'backendConfig',
+    'cli': 'cliConfig',
+    'library': 'libraryConfig',
+    'game': 'gameConfig',
+    'data-pipeline': 'dataPipelineConfig',
+    'ml': 'mlConfig',
+    'browser-extension': 'browserExtensionConfig',
+};
+// Exported for use by CLI handler's writeOrUpdateConfig
+export { TYPE_KEY };
+// Map project type to its Zod schema for parse/validation
+function schemaForType(type) {
+    switch (type) {
+        case 'web-app': return WebAppConfigSchema;
+        case 'backend': return BackendConfigSchema;
+        case 'cli': return CliConfigSchema;
+        case 'library': return LibraryConfigSchema;
+        case 'mobile-app': return MobileAppConfigSchema;
+        case 'data-pipeline': return DataPipelineConfigSchema;
+        case 'ml': return MlConfigSchema;
+        case 'browser-extension': return BrowserExtensionConfigSchema;
+        case 'game': return GameConfigSchema;
+        default: return assertNever(type);
+    }
+}
 /**
  * Scan projectRoot for existing artifacts, match to pipeline steps,
  * and pre-populate state.json.
  */
-export function runAdoption(options) {
+export async function runAdoption(options) {
     const { projectRoot, metaPromptDir, methodology } = options;
+    const auto = options.auto ?? false;
+    const force = options.force ?? false;
+    const explicitProjectType = options.explicitProjectType;
+    const flagOverrides = options.flagOverrides;
     // 1. Detect project mode
     const detection = detectProjectMode(projectRoot);
     // 2. Discover meta-prompts to get expected outputs per step
@@ -35,29 +78,6 @@ export function runAdoption(options) {
             stepsRemaining.push(slug);
         }
     }
-    // 4. Game engine detection
-    let detectedEngine;
-    if (fs.existsSync(path.join(projectRoot, 'Assets'))) {
-        try {
-            const assets = fs.readdirSync(path.join(projectRoot, 'Assets'));
-            if (assets.some(f => f.endsWith('.meta'))) {
-                detectedEngine = 'unity';
-            }
-        }
-        catch { /* ignore read errors */ }
-    }
-    if (!detectedEngine) {
-        try {
-            const files = fs.readdirSync(projectRoot);
-            if (files.some(f => f.endsWith('.uproject'))) {
-                detectedEngine = 'unreal';
-            }
-        }
-        catch { /* ignore */ }
-    }
-    if (!detectedEngine && fs.existsSync(path.join(projectRoot, 'project.godot'))) {
-        detectedEngine = 'godot';
-    }
     const result = {
         mode: detection.mode,
         artifactsFound: detectedArtifacts.length,
@@ -68,10 +88,181 @@ export function runAdoption(options) {
         errors: [],
         warnings: [],
     };
-    if (detectedEngine) {
-        result.projectType = 'game';
-        result.gameConfig = { engine: detectedEngine };
+    // 4. Project-type detection via SignalContext-backed detectors + resolveDetection pipeline.
+    // Build SignalContext + run detectors
+    const ctx = createSignalContext(projectRoot);
+    const detectorMatches = runDetectors(ctx);
+    // Re-adoption: read existing config.yml (if any) BEFORE Case A-G resolves
+    const configPath = path.join(projectRoot, '.scaffold', 'config.yml');
+    let existingDoc;
+    let existingProjectType;
+    let existingTypedConfigRaw;
+    if (fs.existsSync(configPath)) {
+        const text = fs.readFileSync(configPath, 'utf8');
+        existingDoc = parseDocument(text);
+        if (existingDoc.errors.length > 0) {
+            result.errors.push(configParseError(configPath, existingDoc.errors[0].message));
+            return result;
+        }
+        const projectNode = existingDoc.get('project', true);
+        // A null Scalar (YAML `project:` with no value) is fine — treated as empty project
+        if (projectNode !== undefined && !isMap(projectNode) && !isScalar(projectNode)) {
+            result.errors.push(configNotObject(configPath));
+            return result;
+        }
+        const projectJs = existingDoc.toJS()?.project;
+        existingProjectType = projectJs?.projectType;
+        if (existingProjectType) {
+            existingTypedConfigRaw = projectJs?.[TYPE_KEY[existingProjectType]];
+        }
+    }
+    // Re-adoption gating
+    if (existingProjectType && !force && !explicitProjectType) {
+        // SKIP detection — just re-run artifact scan (existing behavior)
+        result.warnings.push({
+            code: 'ADOPT_DETECTION_INCONCLUSIVE',
+            message: `Project already adopted as '${existingProjectType}'. `
+                + 'Pass --force to re-detect, or --project-type to switch.',
+        });
+        result.projectType = existingProjectType;
+        // Carry through context warnings
+        result.warnings.push(...ctx.warnings);
+        return result;
+    }
+    // Project-type conflict check
+    if (existingProjectType && explicitProjectType
+        && explicitProjectType !== existingProjectType
+        && !force) {
+        result.errors.push({
+            code: 'ADOPT_TYPE_CONFLICT',
+            message: `Existing projectType is '${existingProjectType}' but `
+                + `--project-type=${explicitProjectType} was passed. `
+                + 'Re-run with --force to overwrite.',
+            exitCode: ExitCode.Ambiguous,
+        });
+        return result;
+    }
+    const decision = await resolveDetection({
+        matches: detectorMatches,
+        explicitProjectType,
+        opts: {
+            interactive: !auto,
+            acceptLowConfidence: force,
+        },
+    });
+    result.warnings.push(...ctx.warnings, ...decision.warnings);
+    if (decision.error) {
+        result.errors.push(decision.error);
+        return result;
+    }
+    if (decision.chosen) {
+        // Type-changed warning if re-adoption picked a different type
+        if (existingProjectType && existingProjectType !== decision.chosen.projectType) {
+            result.warnings.push({
+                code: 'ADOPT_TYPE_CHANGED',
+                message: `Re-adoption changed projectType from '${existingProjectType}' to '${decision.chosen.projectType}'`,
+                context: { from: existingProjectType, to: decision.chosen.projectType },
+            });
+        }
+        try {
+            const finalized = finalizeConfigFromMatch(decision.chosen, flagOverrides, 
+            // Only pass existing raw if same type (avoids merging across types)
+            existingProjectType === decision.chosen.projectType ? existingTypedConfigRaw : undefined);
+            // Emit field-conflict warnings from the merge
+            if (finalized.conflicts.length > 0) {
+                result.warnings.push(...emitFieldConflictWarnings(finalized.conflicts, TYPE_KEY[decision.chosen.projectType]));
+            }
+            result.projectType = decision.chosen.projectType;
+            result.detectedConfig = {
+                type: decision.chosen.projectType,
+                config: finalized.config,
+            };
+            result.detectionEvidence = decision.chosen.evidence;
+            result.detectionConfidence = decision.chosen.confidence;
+            // Dual-emit gameConfig (deprecation alias, removed v4.0)
+            if (decision.chosen.projectType === 'game') {
+                result.gameConfig = finalized.config;
+                result.warnings.push({
+                    code: 'ADOPT_GAME_CONFIG_DEPRECATED',
+                    message: 'The \'gameConfig\' field is deprecated. '
+                        + 'Use \'detectedConfig\' (when type === \'game\'). Removed in v4.0.',
+                });
+            }
+        }
+        catch (err) {
+            if (err instanceof z.ZodError) {
+                const missing = err.errors.map(e => e.path.join('.')).join(', ');
+                result.errors.push({
+                    code: 'ADOPT_MISSING_REQUIRED_FIELDS',
+                    message: `Schema validation failed for ${decision.chosen.projectType}: `
+                        + `missing or invalid fields [${missing}]. `
+                        + 'Run \'scaffold init --help\' to see the available flags.',
+                    exitCode: ExitCode.ValidationError,
+                    context: { type: decision.chosen.projectType, missing },
+                });
+                return result;
+            }
+            throw err;
+        }
     }
     return result;
 }
+function finalizeConfigFromMatch(match, flagOverrides, existingTypedConfigRaw) {
+    // Step 1: pre-parse merge — existing wins over detected
+    const { merged, conflicts } = mergeRawConfig(match.partialConfig, existingTypedConfigRaw);
+    // Step 2: apply flag overrides — flags replace whatever survived step 1
+    const overridePartial = flagOverrides?.type === match.projectType
+        ? flagOverrides.partial
+        : undefined;
+    const flagged = applyFlagOverrides(merged, overridePartial);
+    // Step 3: Zod.parse — applies defaults to fields still unset
+    const schema = schemaForType(match.projectType);
+    const config = schema.parse(flagged);
+    return { config, conflicts };
+}
+/**
+ * Shallow merge: existing values win on overlap, detected fills gaps.
+ * Returns the merged object plus a list of FieldConflict records for any field
+ * where detected and existing disagree (caller emits ADOPT_FIELD_CONFLICT warnings).
+ *
+ * Uses JSON.stringify for value equality so arrays and (future) nested objects
+ * are compared by content, not reference.
+ */
+export function mergeRawConfig(detected, existing) {
+    const conflicts = [];
+    const merged = { ...detected };
+    if (existing) {
+        for (const [key, existingVal] of Object.entries(existing)) {
+            const detectedVal = detected[key];
+            if (detectedVal !== undefined) {
+                // Compare by serialized form so arrays/objects aren't always "different"
+                const detectedSerialized = JSON.stringify(detectedVal);
+                const existingSerialized = JSON.stringify(existingVal);
+                if (detectedSerialized !== existingSerialized) {
+                    conflicts.push({ field: key, existing: existingVal, detected: detectedVal });
+                }
+            }
+            merged[key] = existingVal; // existing wins
+        }
+    }
+    return { merged, conflicts };
+}
+export function applyFlagOverrides(base, overrides) {
+    if (!overrides)
+        return base;
+    return { ...base, ...overrides }; // flag values replace whatever was there
+}
+/**
+ * Convert FieldConflict[] into ADOPT_FIELD_CONFLICT warnings for the orchestrator
+ * to push onto result.warnings.
+ */
+export function emitFieldConflictWarnings(conflicts, configKey) {
+    return conflicts.map(c => ({
+        code: 'ADOPT_FIELD_CONFLICT',
+        message: `${configKey}.${c.field}: existing value ` +
+            `'${JSON.stringify(c.existing)}' wins over detected ` +
+            `'${JSON.stringify(c.detected)}'. Pass --force --project-type <type> --<flag> to override.`,
+        context: { field: c.field, existing: String(c.existing), detected: String(c.detected) },
+    }));
+}
 //# sourceMappingURL=adopt.js.map

package/dist/project/adopt.js.map

@@ -1 +1 @@
-{"version":3,"file":"adopt.js","sourceRoot":"","sources":["../../src/project/adopt.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adopt.js","sourceRoot":"","sources":["../../src/project/adopt.ts"],"names":[],"mappings":"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"}

package/dist/project/adopt.merge.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=adopt.merge.test.d.ts.map

package/dist/project/adopt.merge.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adopt.merge.test.d.ts","sourceRoot":"","sources":["../../src/project/adopt.merge.test.ts"],"names":[],"mappings":""}

package/dist/project/adopt.merge.test.js

@@ -0,0 +1,62 @@
+import { describe, it, expect } from 'vitest';
+import { mergeRawConfig, applyFlagOverrides, emitFieldConflictWarnings } from './adopt.js';
+describe('mergeRawConfig', () => {
+    it('returns detected when existing is undefined', () => {
+        const result = mergeRawConfig({ a: 1, b: 2 }, undefined);
+        expect(result.merged).toEqual({ a: 1, b: 2 });
+        expect(result.conflicts).toEqual([]);
+    });
+    it('existing wins on overlap (scalar values)', () => {
+        const result = mergeRawConfig({ a: 1, b: 2 }, { a: 99 });
+        expect(result.merged).toEqual({ a: 99, b: 2 });
+        expect(result.conflicts).toEqual([{ field: 'a', existing: 99, detected: 1 }]);
+    });
+    it('no conflict when detected and existing agree', () => {
+        const result = mergeRawConfig({ a: 1 }, { a: 1 });
+        expect(result.merged).toEqual({ a: 1 });
+        expect(result.conflicts).toEqual([]);
+    });
+    it('detected fills in fields existing does not set', () => {
+        const result = mergeRawConfig({ a: 1, b: 2 }, { c: 3 });
+        expect(result.merged).toEqual({ a: 1, b: 2, c: 3 });
+        expect(result.conflicts).toEqual([]);
+    });
+    it('handles arrays as opaque values via JSON.stringify comparison', () => {
+        const result = mergeRawConfig({ dataStore: ['relational', 'redis'] }, { dataStore: ['relational'] });
+        expect(result.merged.dataStore).toEqual(['relational']); // existing wins entirely
+        expect(result.conflicts).toEqual([{
+                field: 'dataStore',
+                existing: ['relational'],
+                detected: ['relational', 'redis'],
+            }]);
+    });
+    it('NO conflict when arrays are structurally equal', () => {
+        const result = mergeRawConfig({ dataStore: ['relational'] }, { dataStore: ['relational'] });
+        expect(result.conflicts).toEqual([]);
+    });
+});
+describe('emitFieldConflictWarnings', () => {
+    it('produces one ADOPT_FIELD_CONFLICT per conflict', () => {
+        const warnings = emitFieldConflictWarnings([{ field: 'renderingStrategy', existing: 'ssr', detected: 'spa' }], 'webAppConfig');
+        expect(warnings).toHaveLength(1);
+        expect(warnings[0].code).toBe('ADOPT_FIELD_CONFLICT');
+        expect(warnings[0].message).toContain('webAppConfig.renderingStrategy');
+        expect(warnings[0].message).toContain('\'"ssr"\'');
+    });
+});
+describe('applyFlagOverrides', () => {
+    it('returns base when overrides is undefined', () => {
+        expect(applyFlagOverrides({ a: 1 }, undefined)).toEqual({ a: 1 });
+    });
+    it('overrides replace base values', () => {
+        expect(applyFlagOverrides({ a: 1, b: 2 }, { a: 99 })).toEqual({ a: 99, b: 2 });
+    });
+    it('full precedence: flag overrides existing + detected merge result', () => {
+        // Step 1: merge
+        const { merged } = mergeRawConfig({ a: 'detected', b: 'detected' }, { a: 'existing' });
+        // Step 2: flag overrides
+        const final = applyFlagOverrides(merged, { a: 'flag' });
+        expect(final).toEqual({ a: 'flag', b: 'detected' });
+    });
+});
+//# sourceMappingURL=adopt.merge.test.js.map

package/dist/project/adopt.merge.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adopt.merge.test.js","sourceRoot":"","sources":["../../src/project/adopt.merge.test.ts"],"names":[],"mappings":"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"}

package/dist/project/adopt.re-adoption.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=adopt.re-adoption.test.d.ts.map

package/dist/project/adopt.re-adoption.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"adopt.re-adoption.test.d.ts","sourceRoot":"","sources":["../../src/project/adopt.re-adoption.test.ts"],"names":[],"mappings":""}

package/dist/project/adopt.re-adoption.test.js

@@ -0,0 +1,222 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import os from 'node:os';
+import path from 'node:path';
+import fs from 'node:fs';
+// ---------------------------------------------------------------------------
+// Hoisted mocks
+// ---------------------------------------------------------------------------
+vi.mock('./detector.js', () => ({
+    detectProjectMode: vi.fn(() => ({
+        mode: 'brownfield',
+        signals: [],
+        methodologySuggestion: 'deep',
+        sourceFileCount: 10,
+    })),
+}));
+vi.mock('../core/assembly/meta-prompt-loader.js', () => ({
+    discoverMetaPrompts: vi.fn(() => new Map()),
+}));
+// ---------------------------------------------------------------------------
+// Imports (after mocks)
+// ---------------------------------------------------------------------------
+import { runAdoption } from './adopt.js';
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function makeTempDir() {
+    return fs.mkdtempSync(path.join(os.tmpdir(), 'scaffold-readopt-'));
+}
+function seedGameProject(dir) {
+    const assetsDir = path.join(dir, 'Assets');
+    fs.mkdirSync(assetsDir, { recursive: true });
+    fs.writeFileSync(path.join(assetsDir, 'foo.meta'), '');
+}
+function seedConfig(dir, content) {
+    const scaffoldDir = path.join(dir, '.scaffold');
+    fs.mkdirSync(scaffoldDir, { recursive: true });
+    fs.writeFileSync(path.join(scaffoldDir, 'config.yml'), content, 'utf8');
+}
+function baseOpts(dir) {
+    return {
+        projectRoot: dir,
+        metaPromptDir: path.join(dir, 'content', 'pipeline'),
+        methodology: 'deep',
+        dryRun: true,
+        auto: true,
+    };
+}
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+describe('re-adoption gating', () => {
+    let tmpDir;
+    beforeEach(() => {
+        tmpDir = makeTempDir();
+    });
+    afterEach(() => {
+        fs.rmSync(tmpDir, { recursive: true, force: true });
+        vi.restoreAllMocks();
+    });
+    // -----------------------------------------------------------------------
+    // No existing projectType (fresh adoption)
+    // -----------------------------------------------------------------------
+    it('fresh adoption: detects game without existing config', async () => {
+        seedGameProject(tmpDir);
+        const result = await runAdoption({ ...baseOpts(tmpDir) });
+        expect(result.projectType).toBe('game');
+        expect(result.errors).toHaveLength(0);
+        expect(result.warnings.every(w => w.code !== 'ADOPT_DETECTION_INCONCLUSIVE')).toBe(true);
+    });
+    it('fresh adoption with explicit --project-type + required flag works', async () => {
+        const result = await runAdoption({
+            ...baseOpts(tmpDir),
+            explicitProjectType: 'backend',
+            flagOverrides: { type: 'backend', partial: { apiStyle: 'rest' } },
+        });
+        expect(result.projectType).toBe('backend');
+        expect(result.errors).toHaveLength(0);
+        expect(result.detectedConfig?.type).toBe('backend');
+    });
+    it('fresh adoption with explicit --project-type missing required field: MISSING_REQUIRED', async () => {
+        const result = await runAdoption({
+            ...baseOpts(tmpDir),
+            explicitProjectType: 'backend',
+        });
+        expect(result.errors).toHaveLength(1);
+        expect(result.errors[0].code).toBe('ADOPT_MISSING_REQUIRED_FIELDS');
+        expect(result.errors[0].message).toContain('apiStyle');
+    });
+    // -----------------------------------------------------------------------
+    // Existing matching projectType
+    // -----------------------------------------------------------------------
+    it('re-adoption of matching type without --force: skips detection', async () => {
+        seedGameProject(tmpDir);
+        seedConfig(tmpDir, 'version: 2\nproject:\n  projectType: game\n');
+        const result = await runAdoption({ ...baseOpts(tmpDir) });
+        expect(result.projectType).toBe('game');
+        expect(result.warnings.some(w => w.code === 'ADOPT_DETECTION_INCONCLUSIVE')).toBe(true);
+        // Detection skipped, so no detectedConfig
+        expect(result.detectedConfig).toBeUndefined();
+    });
+    it('re-adoption of matching type with --force: runs detection', async () => {
+        seedGameProject(tmpDir);
+        seedConfig(tmpDir, 'version: 2\nproject:\n  projectType: game\n');
+        const result = await runAdoption({
+            ...baseOpts(tmpDir),
+            force: true,
+        });
+        expect(result.projectType).toBe('game');
+        expect(result.detectedConfig).toBeDefined();
+        expect(result.errors).toHaveLength(0);
+        // No ADOPT_DETECTION_INCONCLUSIVE since we forced
+        expect(result.warnings.every(w => w.code !== 'ADOPT_DETECTION_INCONCLUSIVE')).toBe(true);
+    });
+    it('re-adoption with --project-type same as existing: runs detection', async () => {
+        seedGameProject(tmpDir);
+        seedConfig(tmpDir, 'version: 2\nproject:\n  projectType: game\n'
+            + '  gameConfig:\n    engine: unity\n');
+        const result = await runAdoption({
+            ...baseOpts(tmpDir),
+            explicitProjectType: 'game',
+        });
+        expect(result.projectType).toBe('game');
+        // Detection ran because explicit type bypasses re-adoption gating
+        expect(result.detectedConfig).toBeDefined();
+        expect(result.errors).toHaveLength(0);
+    });
+    // -----------------------------------------------------------------------
+    // Existing mismatching projectType
+    // -----------------------------------------------------------------------
+    it('re-adoption with mismatching --project-type (no --force): TYPE_CONFLICT', async () => {
+        seedConfig(tmpDir, 'version: 2\nproject:\n  projectType: game\n');
+        const result = await runAdoption({
+            ...baseOpts(tmpDir),
+            explicitProjectType: 'backend',
+        });
+        expect(result.errors).toHaveLength(1);
+        expect(result.errors[0].code).toBe('ADOPT_TYPE_CONFLICT');
+        expect(result.errors[0].message).toContain('game');
+        expect(result.errors[0].message).toContain('backend');
+    });
+    it('re-adoption with mismatching --project-type + --force: succeeds', async () => {
+        seedConfig(tmpDir, 'version: 2\nproject:\n  projectType: game\n');
+        const result = await runAdoption({
+            ...baseOpts(tmpDir),
+            explicitProjectType: 'backend',
+            force: true,
+            // backend requires apiStyle — supply it via flag overrides
+            flagOverrides: { type: 'backend', partial: { apiStyle: 'rest' } },
+        });
+        expect(result.projectType).toBe('backend');
+        expect(result.errors).toHaveLength(0);
+        // ADOPT_TYPE_CHANGED warning emitted
+        expect(result.warnings.some(w => w.code === 'ADOPT_TYPE_CHANGED')).toBe(true);
+    });
+    // -----------------------------------------------------------------------
+    // Merge pipeline: existing values win
+    // -----------------------------------------------------------------------
+    it('existing config values win over detected during merge', async () => {
+        seedGameProject(tmpDir);
+        seedConfig(tmpDir, 'version: 2\nproject:\n  projectType: game\n'
+            + '  gameConfig:\n    engine: unreal\n');
+        const result = await runAdoption({
+            ...baseOpts(tmpDir),
+            force: true,
+        });
+        // Detection finds unity (Assets/.meta), but existing says unreal
+        // Existing wins per merge pipeline invariant
+        expect(result.projectType).toBe('game');
+        expect(result.detectedConfig?.config).toEqual(expect.objectContaining({ engine: 'unreal' }));
+        // Conflict warning emitted
+        expect(result.warnings.some(w => w.code === 'ADOPT_FIELD_CONFLICT'
+            && w.message.includes('engine'))).toBe(true);
+    });
+    // -----------------------------------------------------------------------
+    // Flag overrides win over everything
+    // -----------------------------------------------------------------------
+    it('flag overrides win over existing and detected values', async () => {
+        seedGameProject(tmpDir);
+        seedConfig(tmpDir, 'version: 2\nproject:\n  projectType: game\n'
+            + '  gameConfig:\n    engine: unreal\n');
+        const result = await runAdoption({
+            ...baseOpts(tmpDir),
+            force: true,
+            flagOverrides: {
+                type: 'game',
+                partial: { engine: 'godot' },
+            },
+        });
+        expect(result.projectType).toBe('game');
+        // Flag override (godot) wins over existing (unreal) and detected (unity)
+        expect(result.detectedConfig?.config).toEqual(expect.objectContaining({ engine: 'godot' }));
+    });
+    // -----------------------------------------------------------------------
+    // Game deprecation alias
+    // -----------------------------------------------------------------------
+    it('game detection emits ADOPT_GAME_CONFIG_DEPRECATED warning', async () => {
+        seedGameProject(tmpDir);
+        const result = await runAdoption({ ...baseOpts(tmpDir) });
+        expect(result.projectType).toBe('game');
+        expect(result.gameConfig).toBeDefined();
+        expect(result.warnings.some(w => w.code === 'ADOPT_GAME_CONFIG_DEPRECATED')).toBe(true);
+    });
+    // -----------------------------------------------------------------------
+    // Config parse error
+    // -----------------------------------------------------------------------
+    it('returns CONFIG_PARSE_ERROR when config.yml is malformed YAML', async () => {
+        seedConfig(tmpDir, '{unclosed');
+        const result = await runAdoption({ ...baseOpts(tmpDir) });
+        expect(result.errors).toHaveLength(1);
+        expect(result.errors[0].code).toBe('CONFIG_PARSE_ERROR');
+    });
+    // -----------------------------------------------------------------------
+    // No detection match
+    // -----------------------------------------------------------------------
+    it('returns no projectType when empty dir and no explicit type', async () => {
+        const result = await runAdoption({ ...baseOpts(tmpDir) });
+        expect(result.projectType).toBeUndefined();
+        expect(result.detectedConfig).toBeUndefined();
+        expect(result.errors).toHaveLength(0);
+    });
+});
+//# sourceMappingURL=adopt.re-adoption.test.js.map

package/dist/project/adopt.re-adoption.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adopt.re-adoption.test.js","sourceRoot":"","sources":["../../src/project/adopt.re-adoption.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AACxE,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,MAAM,SAAS,CAAA;AAExB,8EAA8E;AAC9E,gBAAgB;AAChB,8EAA8E;AAE9E,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,CAAC;IAC9B,iBAAiB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;QAC9B,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,EAAE;QACX,qBAAqB,EAAE,MAAM;QAC7B,eAAe,EAAE,EAAE;KACpB,CAAC,CAAC;CACJ,CAAC,CAAC,CAAA;AAEH,EAAE,CAAC,IAAI,CAAC,wCAAwC,EAAE,GAAG,EAAE,CAAC,CAAC;IACvD,mBAAmB,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC;CAC5C,CAAC,CAAC,CAAA;AAEH,8EAA8E;AAC9E,wBAAwB;AACxB,8EAA8E;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAExC,8EAA8E;AAC9E,UAAU;AACV,8EAA8E;AAE9E,SAAS,WAAW;IAClB,OAAO,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAA;AACpE,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IAC1C,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5C,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAA;AACxD,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,OAAe;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAC/C,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC9C,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;AACzE,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,OAAO;QACL,WAAW,EAAE,GAAG;QAChB,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC;QACpD,WAAW,EAAE,MAAM;QACnB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,IAAI;KACX,CAAA;AACH,CAAC;AAED,8EAA8E;AAC9E,QAAQ;AACR,8EAA8E;AAE9E,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,MAAc,CAAA;IAElB,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,GAAG,WAAW,EAAE,CAAA;IACxB,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QACnD,EAAE,CAAC,eAAe,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,2CAA2C;IAC3C,0EAA0E;IAE1E,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,eAAe,CAAC,MAAM,CAAC,CAAA;QAEvB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAEzD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACrC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,8BAA8B,CAC/C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,GAAG,QAAQ,CAAC,MAAM,CAAC;YACnB,mBAAmB,EAAE,SAAS;YAC9B,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;SAClE,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC1C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACrC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACrD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sFAAsF,EAAE,KAAK,IAAI,EAAE;QACpG,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,GAAG,QAAQ,CAAC,MAAM,CAAC;YACnB,mBAAmB,EAAE,SAAS;SAC/B,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACrC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAA;QACnE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,gCAAgC;IAChC,0EAA0E;IAE1E,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC7E,eAAe,CAAC,MAAM,CAAC,CAAA;QACvB,UAAU,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAA;QAEjE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAEzD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CACzB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,8BAA8B,CAC/C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACb,0CAA0C;QAC1C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,aAAa,EAAE,CAAA;IAC/C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,eAAe,CAAC,MAAM,CAAC,CAAA;QACvB,UAAU,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAA;QAEjE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,GAAG,QAAQ,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,IAAI;SACZ,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,CAAA;QAC3C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACrC,kDAAkD;QAClD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,8BAA8B,CAC/C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,eAAe,CAAC,MAAM,CAAC,CAAA;QACvB,UAAU,CACR,MAAM,EACN,6CAA6C;cACzC,oCAAoC,CACzC,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,GAAG,QAAQ,CAAC,MAAM,CAAC;YACnB,mBAAmB,EAAE,MAAM;SAC5B,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,kEAAkE;QAClE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,CAAA;QAC3C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,mCAAmC;IACnC,0EAA0E;IAE1E,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACvF,UAAU,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAA;QAEjE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,GAAG,QAAQ,CAAC,MAAM,CAAC;YACnB,mBAAmB,EAAE,SAAS;SAC/B,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACrC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;QACzD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAClD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACvD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,UAAU,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAA;QAEjE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,GAAG,QAAQ,CAAC,MAAM,CAAC;YACnB,mBAAmB,EAAE,SAAS;YAC9B,KAAK,EAAE,IAAI;YACX,2DAA2D;YAC3D,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;SAClE,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC1C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACrC,qCAAqC;QACrC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CACzB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,oBAAoB,CACrC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,sCAAsC;IACtC,0EAA0E;IAE1E,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,eAAe,CAAC,MAAM,CAAC,CAAA;QACvB,UAAU,CACR,MAAM,EACN,6CAA6C;cAC3C,qCAAqC,CACxC,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,GAAG,QAAQ,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,IAAI;SACZ,CAAC,CAAA;QAEF,iEAAiE;QACjE,6CAA6C;QAC7C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,OAAO,CAC3C,MAAM,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAC9C,CAAA;QACD,2BAA2B;QAC3B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CACzB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAsB;eACjC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAClC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,qCAAqC;IACrC,0EAA0E;IAE1E,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,eAAe,CAAC,MAAM,CAAC,CAAA;QACvB,UAAU,CACR,MAAM,EACN,6CAA6C;cAC3C,qCAAqC,CACxC,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,GAAG,QAAQ,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,IAAI;YACX,aAAa,EAAE;gBACb,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;aAC7B;SACF,CAAC,CAAA;QAEF,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,yEAAyE;QACzE,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,OAAO,CAC3C,MAAM,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAC7C,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,yBAAyB;IACzB,0EAA0E;IAE1E,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,eAAe,CAAC,MAAM,CAAC,CAAA;QAEvB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAEzD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAA;QACvC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CACzB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,8BAA8B,CAC/C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,qBAAqB;IACrB,0EAA0E;IAE1E,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;QAC5E,UAAU,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;QAE/B,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAEzD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QACrC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAC1D,CAAC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,qBAAqB;IACrB,0EAA0E;IAE1E,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAC1E,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAEzD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,aAAa,EAAE,CAAA;QAC1C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,aAAa,EAAE,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}