@hongmaple0820/scale-engine 0.10.0 → 0.11.0

package/dist/cli/evolutionCommands.js

@@ -0,0 +1,246 @@
+// SCALE Engine — Evolution Commands
+// L6 Evolution CLI 命令：Lesson 提取、自改进、规则管理
+// 设计参考：docs/03-CORE-MODULES.md §3.6
+import { defineCommand } from 'citty';
+import { join } from 'node:path';
+import { existsSync, mkdirSync } from 'node:fs';
+import { EventBus } from '../core/eventBus.js';
+import { SQLiteArtifactStore } from '../artifact/sqliteStore.js';
+import { FSM } from '../artifact/fsm.js';
+import { registerAllFSMs } from '../artifact/fsmDefinitions.js';
+import { WorkflowEngine } from '../workflow/WorkflowEngine.js';
+import { CapabilityRegistry } from '../capabilities/CapabilityRegistry.js';
+import { SkillRegistry } from '../skills/SkillRegistry.js';
+import { LessonExtractor } from '../workflow/evolution/LessonExtractor.js';
+import { SelfImproveEngine } from '../workflow/evolution/SelfImproveEngine.js';
+const SCALE_DIR = process.env.SCALE_DIR ?? '.scale';
+function ensureDir(dir) {
+    if (!existsSync(dir))
+        mkdirSync(dir, { recursive: true });
+}
+// Engine singleton (reuse pattern from phaseCommands.ts)
+function getEngine() {
+    ensureDir(SCALE_DIR);
+    const eventBus = new EventBus({ eventsDir: join(SCALE_DIR, 'events') });
+    const store = new SQLiteArtifactStore(eventBus, {
+        dbPath: join(SCALE_DIR, 'scale.db'),
+        artifactsDir: join(SCALE_DIR, 'artifacts'),
+    });
+    const fsm = new FSM(store, eventBus);
+    registerAllFSMs(fsm);
+    const capabilityRegistry = new CapabilityRegistry(eventBus);
+    const skillRegistry = new SkillRegistry(eventBus);
+    const workflowEngine = new WorkflowEngine({ eventBus, capabilityRegistry, skillRegistry });
+    return { eventBus, store, fsm, workflowEngine, skillRegistry };
+}
+// Evolution extract 命令 - 从会话提取 Lessons
+export const evolutionExtract = defineCommand({
+    meta: { name: 'extract', description: 'Extract lessons from session defects' },
+    args: {
+        'session-id': { type: 'positional', required: true, description: 'Session ID to analyze' },
+        'output': { type: 'string', alias: 'o', description: 'Output file for lessons (JSON)' },
+        'verbose': { type: 'boolean', alias: 'v', default: false, description: 'Show detailed extraction process' },
+        'min': { type: 'string', default: '2', description: 'Minimum occurrences to become lesson' },
+        json: { type: 'boolean', default: false },
+    },
+    async run({ args }) {
+        const { eventBus } = getEngine();
+        const sessionId = args['session-id'];
+        const minOccurrences = parseInt(args.min, 10) || 2;
+        const extractor = new LessonExtractor(eventBus, minOccurrences);
+        if (!args.verbose && !args.json) {
+            console.log(`Analyzing session ${sessionId} for lessons...`);
+        }
+        const candidates = await extractor.extractFromSession(sessionId);
+        if (candidates.length === 0) {
+            if (!args.json) {
+                console.log('\nNo lessons extracted from this session.');
+                console.log('This may mean:');
+                console.log('  - No defects were recorded in this session');
+                console.log('  - Patterns did not meet minimum occurrence threshold');
+            }
+            return;
+        }
+        if (args.json) {
+            const lessons = extractor.toLessonArtifacts(candidates);
+            console.log(JSON.stringify(lessons, null, 2));
+        }
+        else {
+            console.log(`\n=== Extracted Lessons (${candidates.length}) ===\n`);
+            for (const candidate of candidates) {
+                console.log(`[${candidate.priority}] ${candidate.pattern}`);
+                console.log(`  Solution: ${candidate.solution}`);
+                console.log(`  Occurrences: ${candidate.frequency}`);
+                console.log(`  Verified: ${candidate.verified ? 'Yes' : 'No (pending)'}`);
+                console.log('');
+            }
+        }
+        if (args.output && !args.json) {
+            const lessons = extractor.toLessonArtifacts(candidates);
+            console.log(`\nTo save lessons, output to: ${args.output}`);
+        }
+    },
+});
+// Evolution improve 命令 - 运行自改进闭环
+export const evolutionImprove = defineCommand({
+    meta: { name: 'improve', description: 'Run self-improve cycle: Defect → Lesson → Rule → Hook' },
+    args: {
+        'session-id': { type: 'positional', required: true, description: 'Session ID to process' },
+        'verbose': { type: 'boolean', alias: 'v', default: false, description: 'Show detailed improvement process' },
+        'verify-threshold': { type: 'string', default: '3', description: 'Lesson verification threshold' },
+        'rule-threshold': { type: 'string', default: '10', description: 'Rule activation threshold' },
+        'hook-threshold': { type: 'string', default: '20', description: 'Hook generation threshold' },
+        json: { type: 'boolean', default: false },
+    },
+    async run({ args }) {
+        const { eventBus } = getEngine();
+        const sessionId = args['session-id'];
+        const thresholds = {
+            lessonVerificationThreshold: parseInt(args['verify-threshold'], 10) || 3,
+            ruleActivationThreshold: parseInt(args['rule-threshold'], 10) || 10,
+            hookGenerationThreshold: parseInt(args['hook-threshold'], 10) || 20,
+            maxHooks: 10
+        };
+        const engine = new SelfImproveEngine(eventBus, thresholds);
+        if (args.verbose && !args.json) {
+            console.log('Self-improve thresholds:');
+            console.log(`  Lesson → Rule: ${thresholds.lessonVerificationThreshold} verifications`);
+            console.log(`  Rule → Active: ${thresholds.ruleActivationThreshold} hits`);
+            console.log(`  Rule → Hook: ${thresholds.hookGenerationThreshold} hits`);
+            console.log('');
+        }
+        const state = await engine.run(sessionId);
+        if (args.json) {
+            console.log(JSON.stringify(state, null, 2));
+        }
+        else {
+            console.log('\n=== Self-Improve Result ===\n');
+            console.log(`Lessons Extracted: ${state.lessonsExtracted}`);
+            console.log(`Lessons Verified:  ${state.lessonsVerified}`);
+            console.log(`Rules Created:     ${state.rulesCreated}`);
+            console.log(`Rules Active:      ${state.rulesActive}`);
+            console.log(`Hooks Generated:   ${state.hooksGenerated}`);
+            if (state.hooksGenerated > 0) {
+                console.log('\n[GENERATED HOOKS]');
+                const hooks = engine.getGeneratedHooks();
+                for (const hook of hooks) {
+                    console.log(`  ${hook.hookType}: ${hook.matcher}`);
+                }
+                console.log('\nTo register these hooks, add to .claude/settings.json:');
+                const hooksConfig = engine.getGeneratedHooksConfig();
+                console.log(JSON.stringify({ hooks: hooksConfig }, null, 2));
+            }
+        }
+    },
+});
+// Evolution report 命令 - 显示自改进报告
+export const evolutionReport = defineCommand({
+    meta: { name: 'report', description: 'Show self-improve engine report' },
+    args: {
+        'session-id': { type: 'positional', required: false, description: 'Session ID to analyze' },
+        json: { type: 'boolean', default: false },
+    },
+    async run({ args }) {
+        const { eventBus } = getEngine();
+        const sessionId = args['session-id'];
+        if (sessionId) {
+            const engine = new SelfImproveEngine(eventBus);
+            await engine.run(sessionId);
+            if (args.json) {
+                console.log(JSON.stringify({ report: engine.generateReport() }, null, 2));
+            }
+            else {
+                console.log(engine.generateReport());
+            }
+        }
+        else {
+            console.log('No session provided. Run `scale evolution improve <session-id>` first.');
+        }
+    },
+});
+// Evolution rules 命令 - 管理规则
+export const evolutionRules = defineCommand({
+    meta: { name: 'rules', description: 'List or manage rules' },
+    args: {
+        'list': { type: 'boolean', alias: 'l', default: false, description: 'List all rules' },
+        'active': { type: 'boolean', alias: 'a', default: false, description: 'List only active rules' },
+        json: { type: 'boolean', default: false },
+    },
+    async run({ args }) {
+        if (!args.json) {
+            console.log('\n=== Rules ===\n');
+            console.log('Rules are auto-generated from verified lessons.');
+            console.log('');
+            console.log('To view rules:');
+            console.log('  ls knowledge/rules/');
+            console.log('');
+            console.log('To create a rule:');
+            console.log('  scale evolution extract <session> --output knowledge/rules/new-rule.json');
+            console.log('');
+            console.log('To activate a rule:');
+            console.log('  scale evolution improve <session> --rule-threshold 5');
+        }
+    },
+});
+// Evolution verify 命令 - 手动验证 Lesson
+export const evolutionVerify = defineCommand({
+    meta: { name: 'verify', description: 'Manually verify a lesson' },
+    args: {
+        'pattern': { type: 'positional', required: true, description: 'Lesson pattern to verify' },
+        json: { type: 'boolean', default: false },
+    },
+    async run({ args }) {
+        const pattern = args['pattern'];
+        if (!args.json) {
+            console.log(`\nVerifying lesson: "${pattern}"`);
+            console.log('');
+            console.log('Manual verification steps:');
+            console.log('  1. Review the pattern and solution');
+            console.log('  2. Apply the solution in a real scenario');
+            console.log('  3. Confirm the solution resolves the pattern');
+            console.log('');
+            console.log('After verification, run:');
+            console.log(`  scale evolution improve <session-id> --verify-threshold 1`);
+        }
+    },
+});
+// Evolution hooks 命令 - 显示生成的 Hooks
+export const evolutionHooks = defineCommand({
+    meta: { name: 'hooks', description: 'Show generated hooks configuration' },
+    args: {
+        'session-id': { type: 'positional', required: false, description: 'Session ID to process' },
+        'json': { type: 'boolean', alias: 'j', default: false, description: 'Output as JSON' },
+    },
+    async run({ args }) {
+        const { eventBus } = getEngine();
+        const sessionId = args['session-id'];
+        if (sessionId) {
+            const engine = new SelfImproveEngine(eventBus);
+            await engine.run(sessionId);
+            if (args.json) {
+                const hooksConfig = engine.getGeneratedHooksConfig();
+                console.log(JSON.stringify({ hooks: hooksConfig }, null, 2));
+            }
+            else {
+                const hooks = engine.getGeneratedHooks();
+                if (hooks.length === 0) {
+                    console.log('No hooks generated.');
+                    console.log('Run with a session that has enough rule hits.');
+                }
+                else {
+                    console.log('\n=== Generated Hooks ===\n');
+                    for (const hook of hooks) {
+                        console.log(`[${hook.hookType}] Matcher: ${hook.matcher}`);
+                        console.log(`  Description: ${hook.description}`);
+                        console.log('');
+                    }
+                }
+            }
+        }
+        else {
+            console.log('Usage: scale evolution hooks <session-id>');
+            console.log('  --json, -j  Output as JSON for .claude/settings.json');
+        }
+    },
+});
+//# sourceMappingURL=evolutionCommands.js.map

package/dist/cli/evolutionCommands.js.map

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

package/dist/cli/phaseCommands.d.ts

@@ -97,6 +97,15 @@ export declare const phaseVerify: import("citty").CommandDef<{
         type: "string";
         description: string;
     };
+    'tdd-evidence': {
+        type: "string";
+        description: string;
+    };
+    'tdd-strict': {
+        type: "boolean";
+        default: false;
+        description: string;
+    };
     'skip-build': {
         type: "boolean";
         default: false;

package/dist/cli/phaseCommands.js

@@ -46,6 +46,19 @@ function validateReviewEvidence(ids) {
     }
     return { ok: (ids?.length ?? 0) > 0 && missing.length === 0 && failed.length === 0, missing, failed };
 }
+function getValidatedReviewRecords(ids) {
+    const reviewStore = new ReviewStore(SCALE_DIR);
+    return (ids ?? [])
+        .map(id => reviewStore.getReview(id))
+        .filter((record) => Boolean(record?.passed));
+}
+function getVerificationEvidenceSummary(ids) {
+    const evidenceStore = new EvidenceStore(SCALE_DIR);
+    return (ids ?? [])
+        .map(id => evidenceStore.getGateResult(id))
+        .filter((record) => Boolean(record))
+        .map(record => ({ gate: record.gate, passed: record.passed }));
+}
 function getEngine() {
     ensureDir(SCALE_DIR);
     const eventBus = new EventBus({ eventsDir: join(SCALE_DIR, 'events') });
@@ -77,6 +90,9 @@ function isTruthyFlag(value) {
 function shouldSkipCommit(value) {
     return isTruthyFlag(value) || process.argv.includes('--no-commit') || process.argv.includes('--skip-commit');
 }
+function normalizeGitPath(path) {
+    return path.replace(/\\/g, '/');
+}
 // Helper: Generate spec markdown file
 function generateSpecMarkdown(id, title, payload) {
     return `# Spec: ${title}
@@ -236,15 +252,30 @@ export const phaseDefine = defineCommand({
         const specPath = join(specsDir, `${spec.id}.md`);
         writeFileSync(specPath, generateSpecMarkdown(spec.id, args.title, specPayload));
         // FSM transitions: DRAFT -> REVIEWING -> FROZEN
-        try {
-            await fsm.transition(spec.id, 'refine', { actor: { kind: 'system', component: 'phase-define' } });
-            await fsm.transition(spec.id, 'approve', { actor: { kind: 'system', component: 'phase-define' } });
+        // Phase 1: refine (DRAFT -> REVIEWING) - no guards
+        const refineResult = await fsm.canTransition(spec.id, 'refine');
+        if (!refineResult.allowed) {
+            if (!args.json) {
+                console.error('\nFSM transition blocked: DRAFT -> REVIEWING');
+                refineResult.blockedBy?.forEach(b => console.error(`   [GUARD] ${b.guard}: ${b.message}`));
+            }
+            process.exit(1);
         }
-        catch (e) {
-            // Guard may fail - report reason
-            const error = e;
-            if (!args.json)
-                console.log(`   FSM transition: ${error.message}`);
+        await fsm.transition(spec.id, 'refine', { actor: { kind: 'system', component: 'phase-define' } });
+        // Phase 2: approve (REVIEWING -> FROZEN) - guards: ambiguityScore <= 0.2, has successCriteria
+        const approveResult = await fsm.canTransition(spec.id, 'approve');
+        if (!approveResult.allowed) {
+            if (!args.json) {
+                console.error('\nFSM transition blocked: REVIEWING -> FROZEN');
+                console.error('   Spec cannot be frozen due to:');
+                approveResult.blockedBy?.forEach(b => console.error(`   [GUARD] ${b.guard}: ${b.message}`));
+                console.error('\n   Resolve issues before proceeding.');
+            }
+            process.exit(1);
+        }
+        await fsm.transition(spec.id, 'approve', { actor: { kind: 'system', component: 'phase-define' } });
+        if (!args.json) {
+            console.log('   FSM: DRAFT -> REVIEWING -> FROZEN ✓');
         }
         const result = { phase: 'DEFINE', spec, specPath, ambiguityScore, successCriteria };
         if (args.json)
@@ -333,14 +364,20 @@ export const phasePlan = defineCommand({
         ensureDir(plansDir);
         const planPath = join(plansDir, `${plan.id}.md`);
         writeFileSync(planPath, generatePlanMarkdown(plan.id, args['spec-id'], planPayload));
-        // FSM transition: DRAFT -> APPROVED (requires rollbackStrategy)
-        try {
-            await fsm.transition(plan.id, 'review', { actor: { kind: 'system', component: 'phase-plan' } });
+        // FSM transition: DRAFT -> APPROVED (requires rollbackStrategy guard)
+        const reviewResult = await fsm.canTransition(plan.id, 'review');
+        if (!reviewResult.allowed) {
+            if (!args.json) {
+                console.error('\nFSM transition blocked: DRAFT -> APPROVED');
+                console.error('   Plan cannot be approved due to:');
+                reviewResult.blockedBy?.forEach(b => console.error(`   [GUARD] ${b.guard}: ${b.message}`));
+                console.error('\n   Provide rollback strategy: --rollback "Revert strategy description"');
+            }
+            process.exit(1);
         }
-        catch (e) {
-            const error = e;
-            if (!args.json)
-                console.log(`   FSM transition: ${error.message}`);
+        await fsm.transition(plan.id, 'review', { actor: { kind: 'system', component: 'phase-plan' } });
+        if (!args.json) {
+            console.log('   FSM: DRAFT -> APPROVED ✓');
         }
         const result = { phase: 'PLAN', plan, planPath, rollbackStrategy };
         if (args.json)
@@ -390,20 +427,26 @@ export const phaseBuild = defineCommand({
             createdBy: { kind: 'human', userId: 'cli' },
         });
         // FSM transitions: PENDING -> READY -> RUNNING
-        try {
-            await fsm.transition(task.id, 'schedule', { actor: { kind: 'system', component: 'phase-build' } });
-            await fsm.transition(task.id, 'start', { actor: { kind: 'human', userId: 'cli' } });
+        // Phase 1: schedule (PENDING -> READY) - no guards
+        const scheduleResult = await fsm.canTransition(task.id, 'schedule');
+        if (!scheduleResult.allowed) {
+            if (!args.json) {
+                console.error('\nFSM transition blocked: PENDING -> READY');
+                scheduleResult.blockedBy?.forEach(b => console.error(`   [GUARD] ${b.guard}: ${b.message}`));
+            }
+            process.exit(1);
         }
-        catch (e) {
-            const error = e;
-            if (!args.json)
-                console.log(`   FSM transition: ${error.message}`);
+        await fsm.transition(task.id, 'schedule', { actor: { kind: 'system', component: 'phase-build' } });
+        // Phase 2: start (READY -> RUNNING) - no guards
+        await fsm.transition(task.id, 'start', { actor: { kind: 'human', userId: 'cli' } });
+        if (!args.json) {
+            console.log('   FSM: PENDING -> READY -> RUNNING ✓');
         }
         // Update Plan status to IMPLEMENTING
-        try {
+        const implResult = await fsm.canTransition(args['plan-id'], 'implement');
+        if (implResult.allowed) {
             await fsm.transition(args['plan-id'], 'implement', { actor: { kind: 'system', component: 'phase-build' } });
         }
-        catch { }
         const result = { phase: 'BUILD', task, status: 'RUNNING' };
         if (args.json)
             console.log(JSON.stringify(result, null, 2));
@@ -435,6 +478,8 @@ export const phaseVerify = defineCommand({
         'lint-cmd': { type: 'string', description: 'Override lint command' },
         'test-cmd': { type: 'string', description: 'Override test command' },
         'coverage-cmd': { type: 'string', description: 'Override coverage command' },
+        'tdd-evidence': { type: 'string', description: 'Path to JSON TDD evidence with red/green/refactor/testFirst=true' },
+        'tdd-strict': { type: 'boolean', default: false, description: 'Require TDD evidence before other gates' },
         'skip-build': { type: 'boolean', default: false },
         'skip-lint': { type: 'boolean', default: false },
         'skip-test': { type: 'boolean', default: false },
@@ -457,6 +502,8 @@ export const phaseVerify = defineCommand({
             lint: args['lint-cmd'],
             test: args['test-cmd'],
             coverage: args['coverage-cmd'],
+            tddEvidence: args['tdd-evidence'],
+            tddStrict: isTruthyFlag(args['tdd-strict']),
         });
         // Step 2: Display gate results
         if (!args.json) {
@@ -503,6 +550,7 @@ export const phaseVerify = defineCommand({
         };
         await store.update(args['task-id'], { payload: updatedPayload });
         // Attempt FSM transition to COMPLETED
+        // Guards: build_passed, lint_passed, tests_passed
         const allPassed = results.buildStatus === 'success' &&
             (results.buildExitCode ?? 1) === 0 &&
             results.lintStatus === 'success' &&
@@ -511,19 +559,26 @@ export const phaseVerify = defineCommand({
             results.securityPassed === true;
         let transitionResult = null;
         if (allPassed) {
-            try {
+            const completeResult = await fsm.canTransition(args['task-id'], 'complete');
+            if (!completeResult.allowed) {
+                if (!args.json) {
+                    console.error('\nFSM transition blocked: RUNNING -> COMPLETED');
+                    console.error('   Task cannot be completed due to:');
+                    completeResult.blockedBy?.forEach(b => console.error(`   [GUARD] ${b.guard}: ${b.message}`));
+                }
+                // Don't exit - allow user to see what passed and fix issues
+            }
+            else {
                 transitionResult = await fsm.transition(args['task-id'], 'complete', {
                     actor: { kind: 'human', userId: 'cli' }
                 });
                 if (!args.json)
-                    console.log('\nTask marked COMPLETED');
-            }
-            catch (e) {
-                const error = e;
-                if (!args.json)
-                    console.log('\nFSM transition failed:', error.message);
+                    console.log('\n   FSM: RUNNING -> COMPLETED ✓');
             }
         }
+        else if (!args.json) {
+            console.log('\n   Verification requirements not met - cannot complete Task');
+        }
         const passed = allPassed && (transitionResult?.success ?? false);
         const result = { phase: 'VERIFY', taskId: args['task-id'], results, evidenceIds: verificationEvidenceIds, passed };
         if (args.json)
@@ -578,7 +633,8 @@ async function reviewGitChanges(taskPayload) {
     const status = await runGit(['status', '--short']);
     const untracked = await runGit(['ls-files', '--others', '--exclude-standard']);
     const statusOutput = mergeUntrackedFilesIntoStatus(status.stdout, untracked.stdout);
-    const changedFiles = analyzeReview({ statusOutput, diffs: [], taskPayload }).changedFiles;
+    const verificationEvidence = getVerificationEvidenceSummary(taskPayload?.verificationEvidenceIds);
+    const changedFiles = analyzeReview({ statusOutput, diffs: [], taskPayload, verificationEvidence }).changedFiles;
     const diffs = [];
     for (const file of changedFiles.slice(0, 50)) {
         if (file.status === '??') {
@@ -589,7 +645,50 @@ async function reviewGitChanges(taskPayload) {
             diffs.push({ file: file.path, text: diff.stdout });
         }
     }
-    return analyzeReview({ statusOutput, diffs, taskPayload });
+    return analyzeReview({ statusOutput, diffs, taskPayload, verificationEvidence });
+}
+function collectReviewedFiles(records) {
+    const reviewed = new Set();
+    for (const record of records) {
+        if (!record.passed)
+            continue;
+        for (const file of record.changedFiles) {
+            if (shouldReviewFile(file))
+                reviewed.add(normalizeGitPath(file));
+        }
+    }
+    return reviewed;
+}
+async function getReviewableGitChanges() {
+    const status = await runGit(['status', '--short']);
+    const untracked = await runGit(['ls-files', '--others', '--exclude-standard']);
+    const statusOutput = mergeUntrackedFilesIntoStatus(status.stdout, untracked.stdout);
+    return parseChangedFiles(statusOutput).filter(file => shouldReviewFile(file.path));
+}
+async function stageReviewedFiles(reviewRecords) {
+    const reviewedFiles = collectReviewedFiles(reviewRecords);
+    const currentChanges = await getReviewableGitChanges();
+    const stagedFiles = [];
+    const unreviewedFiles = [];
+    for (const file of currentChanges) {
+        const normalizedPath = normalizeGitPath(file.path);
+        if (reviewedFiles.has(normalizedPath)) {
+            stagedFiles.push(file.path);
+        }
+        else {
+            unreviewedFiles.push(file.path);
+        }
+    }
+    if (unreviewedFiles.length > 0) {
+        return { stagedFiles: [], unreviewedFiles };
+    }
+    if (stagedFiles.length > 0) {
+        const gitAdd = await runGit(['add', '--', ...stagedFiles]);
+        if (gitAdd.exitCode !== 0) {
+            throw new Error(gitAdd.stderr || 'git add failed');
+        }
+    }
+    return { stagedFiles, unreviewedFiles: [] };
 }
 // REVIEW Phase - KarpathyEvaluator + deterministic review evidence
 export const phaseReview = defineCommand({
@@ -720,18 +819,17 @@ export const phaseShip = defineCommand({
                 }
                 process.exit(1);
             }
-            // Attempt FSM transition
-            try {
-                await fsm.transition(args['task-id'], 'complete', {
-                    actor: { kind: 'human', userId: 'cli' }
-                });
-            }
-            catch (e) {
-                const error = e;
-                console.error('\nFSM transition failed:', error.message);
+            // FSM transition with guard check
+            const completeResult = await fsm.canTransition(args['task-id'], 'complete');
+            if (!completeResult.allowed) {
+                console.error('\nFSM transition blocked: RUNNING -> COMPLETED');
+                completeResult.blockedBy?.forEach(b => console.error(`   [GUARD] ${b.guard}: ${b.message}`));
                 console.log('\n   Run verification first: scale verify ' + args['task-id'] + '\n');
                 process.exit(1);
             }
+            await fsm.transition(args['task-id'], 'complete', {
+                actor: { kind: 'human', userId: 'cli' }
+            });
         }
         if (!reviewPassed) {
             console.error('\nTask not reviewed with persisted passing evidence. Run: scale review ' + args['task-id'] + '\n');
@@ -745,18 +843,38 @@ export const phaseShip = defineCommand({
         }
         // Git operations
         let commitHash = null;
+        let stagedFiles = [];
         if (!shouldSkipCommit(args['skip-commit'])) {
-            const { execa } = await import('execa');
             const commitMessage = args.message ?? `feat: ${task.title ?? args['task-id']}`;
             try {
-                await execa('git', ['add', '.']);
-                const result = await execa('git', ['commit', '-m', commitMessage]);
-                commitHash = result.stdout.split('\n')[0]; // First line contains hash
+                const reviewRecords = getValidatedReviewRecords(payload.reviewEvidenceIds);
+                const stageResult = await stageReviewedFiles(reviewRecords);
+                if (stageResult.unreviewedFiles.length > 0) {
+                    console.error('\nUnreviewed working tree changes detected. Re-run scale review before shipping.');
+                    stageResult.unreviewedFiles.forEach(file => console.error('  - ' + file));
+                    console.error('\nUse scale ship ' + args['task-id'] + ' --no-commit to generate the delivery report without committing.\n');
+                    process.exit(1);
+                }
+                stagedFiles = stageResult.stagedFiles;
+                const result = await runGit(['commit', '-m', commitMessage]);
+                if (result.exitCode !== 0) {
+                    const message = result.stderr || result.stdout || 'git commit failed';
+                    if (/nothing to commit|no changes added/i.test(message)) {
+                        if (!args.json)
+                            console.log('   Git commit skipped: nothing to commit');
+                    }
+                    else {
+                        throw new Error(message);
+                    }
+                }
+                else {
+                    commitHash = result.stdout.split('\n')[0]; // First line contains hash
+                }
             }
             catch (e) {
                 const error = e;
-                if (!args.json)
-                    console.log('   Git commit skipped:', error.message);
+                console.error('\nGit commit failed:', error.message);
+                process.exit(1);
             }
         }
         // Update Plan to DONE if Task completed
@@ -777,6 +895,8 @@ export const phaseShip = defineCommand({
             console.log(`  - Status: COMPLETED`);
             if (commitHash)
                 console.log(`  - Commit: ${commitHash}`);
+            if (stagedFiles.length)
+                console.log(`  - Files committed: ${stagedFiles.length}`);
             console.log('');
             console.log(`[VERIFIED]`);
             console.log('  [PASS] Build: passed');
@@ -811,6 +931,7 @@ export const phaseShip = defineCommand({
             reviewEvidenceIds: payload.reviewEvidenceIds ?? [],
             reviewValidation,
             commitHash,
+            stagedFiles,
         };
         if (args.json)
             console.log(JSON.stringify(result, null, 2));