@zhuan-ai/zhuanspec 2.6.0 → 2.8.0

package/dist/commands/review.d.ts

@@ -6,7 +6,6 @@ export declare class ReviewCommand {
     }): Promise<void>;
     private selectChangeInteractively;
     private collectRequirementNames;
-    private collectTouchedFiles;
     private collectTouchedFileContent;
     private runTests;
     private buildSummary;
@@ -14,6 +13,7 @@ export declare class ReviewCommand {
     private printSummary;
     /**
      * Fetch Sonar issues using MCP
+     * Uses the first detected repository's branch for SonarQube queries
      */
     private fetchSonarIssues;
     /**

package/dist/commands/review.js

@@ -2,6 +2,7 @@ import { execSync } from 'child_process';
 import { promises as fs, readdirSync, existsSync } from 'fs';
 import path from 'path';
 import { FileSystemUtils } from '../utils/file-system.js';
+import { GitRepoDetector } from '../utils/git-repo-detector.js';
 import { mcp__sonar__get_Sonar_Query } from '../mcp/index.js';
 import { writeCodeReviewOutput, writeUnitTestOutput, writeSpecConsistencyOutput, codeReviewResultCheck, unitTestResultCheck, specConsistencyResultCheck, generateReviewReport, } from '../core/hooks/review-hooks.js';
 export class ReviewCommand {
@@ -13,8 +14,8 @@ export class ReviewCommand {
             }
             changeName = selected;
         }
-        const repoRoot = process.cwd();
-        const changeDir = path.join(repoRoot, 'zhuanspec', 'changes', changeName);
+        const cwd = process.cwd();
+        const changeDir = path.join(cwd, 'zhuanspec', 'changes', changeName);
         const metricsDir = path.join(changeDir, 'metrics');
         const proposalPath = path.join(changeDir, 'proposal.md');
         const tasksPath = path.join(changeDir, 'tasks.md');
@@ -24,10 +25,13 @@ export class ReviewCommand {
         if (!proposalExists || !tasksExists) {
             throw new Error(`Change '${changeName}' is not ready for review. Missing proposal.md or tasks.md`);
         }
+        // Detect all git repositories (parent + children)
+        const allRepos = GitRepoDetector.detectAllGitRepos(cwd);
         const issues = [];
         const requirementNames = await this.collectRequirementNames(changeSpecsDir);
-        const touchedFiles = await this.collectTouchedFiles(repoRoot);
-        const touchedContent = await this.collectTouchedFileContent(repoRoot, touchedFiles);
+        // Use GitRepoDetector to get all changed files across all detected repos
+        const touchedFiles = GitRepoDetector.getAllChanges(cwd).filter((file) => !file.startsWith('zhuanspec/changes/archive/'));
+        const touchedContent = await this.collectTouchedFileContent(cwd, touchedFiles);
         // Track whether every requirement has at least one weak signal in changed code.
         for (const req of requirementNames) {
             const normalized = req.toLowerCase();
@@ -50,9 +54,10 @@ export class ReviewCommand {
             });
         }
         // Very lightweight code-quality checks.
+        // touchedFiles now contains absolute paths from GitRepoDetector
         for (const file of touchedFiles) {
             if (file.endsWith('.ts') || (file.endsWith('.js') && !file.includes('node_modules'))) {
-                const content = await fs.readFile(path.join(repoRoot, file), 'utf-8');
+                const content = await fs.readFile(file, 'utf-8');
                 if (content.includes('TODO') || content.includes('FIXME')) {
                     issues.push({
                         severity: 'minor',
@@ -62,8 +67,8 @@ export class ReviewCommand {
                 }
             }
         }
-        // Sonar MCP integration - fetch issues from SonarQube
-        const sonarIssues = await this.fetchSonarIssues(repoRoot);
+        // Sonar MCP integration - fetch issues from SonarQube (use first detected repo if available)
+        const sonarIssues = await this.fetchSonarIssues(allRepos);
         for (const issue of sonarIssues) {
             const severity = issue.type === 'BUG' || issue.type === 'VULNERABILITY' ? 'critical' : 'important';
             issues.push({
@@ -74,7 +79,7 @@ export class ReviewCommand {
         }
         // Scenario→Test mapping validation
         const scenarios = await this.collectScenarios(changeSpecsDir);
-        const testFiles = await this.findTestFiles(repoRoot);
+        const testFiles = await this.findTestFiles(cwd);
         for (const scenario of scenarios) {
             const testPatterns = this.scenarioToTestMethodNames(scenario.name);
             const matched = testFiles.some(tf => testPatterns.some(p => tf.toLowerCase().includes(p.toLowerCase())));
@@ -87,7 +92,7 @@ export class ReviewCommand {
             }
         }
         const testCommand = options?.testCommand?.trim() || 'npm test';
-        const testResult = this.runTests(repoRoot, testCommand);
+        const testResult = this.runTests(cwd, testCommand);
         const coverageThreshold = Number(options?.coverageThreshold ?? 80);
         if (testResult.coverage !== null && testResult.coverage < coverageThreshold) {
             issues.push({
@@ -221,23 +226,11 @@ export class ReviewCommand {
         await walk(changeSpecsDir);
         return Array.from(new Set(requirements));
     }
-    async collectTouchedFiles(repoRoot) {
-        try {
-            const output = execSync('git diff --name-only', { cwd: repoRoot, encoding: 'utf-8' });
-            return output
-                .split('\n')
-                .map((item) => item.trim())
-                .filter((item) => item.length > 0 && !item.startsWith('zhuanspec/changes/archive/'));
-        }
-        catch {
-            return [];
-        }
-    }
     async collectTouchedFileContent(repoRoot, files) {
         const result = [];
         for (const file of files) {
             try {
-                const full = path.join(repoRoot, file);
+                const full = path.isAbsolute(file) ? file : path.join(repoRoot, file);
                 const stat = await fs.stat(full);
                 if (!stat.isFile())
                     continue;
@@ -342,11 +335,18 @@ export class ReviewCommand {
     }
     /**
      * Fetch Sonar issues using MCP
+     * Uses the first detected repository's branch for SonarQube queries
      */
-    async fetchSonarIssues(repoRoot) {
+    async fetchSonarIssues(allRepos) {
+        // If no repos detected, skip Sonar queries
+        if (allRepos.length === 0) {
+            return [];
+        }
         try {
+            // Use the first detected repository's branch
+            const primaryRepo = allRepos[0];
             const branch = execSync('git branch --show-current', {
-                cwd: repoRoot,
+                cwd: primaryRepo,
                 encoding: 'utf-8',
                 stdio: ['pipe', 'pipe', 'ignore'],
             }).trim();

package/dist/commands/validate.d.ts

@@ -26,10 +26,6 @@ export declare class ValidateCommand {
      * Add a section skeleton to proposal.md
      */
     private addProposalSectionSkeleton;
-    /**
-     * Add review gate section to tasks.md
-     */
-    private addReviewGateToTasks;
     private printReport;
     private printNextSteps;
     /**

package/dist/commands/validate.js

@@ -189,12 +189,6 @@ export class ValidateCommand {
                 }
                 continue;
             }
-            // 2. Missing review gate - add to tasks.md
-            if (issue.message.includes('review gate') || issue.message.includes('zhuanspec review')) {
-                await this.addReviewGateToTasks(changeDir);
-                fixed = true;
-                continue;
-            }
             // 4. Missing @skill tag - add @skill:none (existing logic)
             if (issue.message.includes('Skill Mapping') || issue.message.includes('@skill')) {
                 const tasksFile = path.join(changeDir, 'tasks.md');
@@ -264,22 +258,6 @@ export class ValidateCommand {
             // Cannot read/write proposal.md
         }
     }
-    /**
-     * Add review gate section to tasks.md
-     */
-    async addReviewGateToTasks(changeDir) {
-        const tasksPath = path.join(changeDir, 'tasks.md');
-        try {
-            let content = await fs.readFile(tasksPath, 'utf-8');
-            if (!content.includes('zhuanspec review') && !content.includes('审查门禁')) {
-                content = content.trimEnd() + '\n\n## 审查门禁\n\n- [ ] 执行 `zhuanspec review <change-id>` 并确认通过\n';
-                await fs.writeFile(tasksPath, content, 'utf-8');
-            }
-        }
-        catch {
-            // Cannot read/write tasks.md
-        }
-    }
     printReport(type, id, report, durationMs, json, taskReport, opts) {
         if (json) {
             const out = {

package/dist/core/archive.js

@@ -9,6 +9,7 @@ import chalk from 'chalk';
 import { findSpecUpdates, buildUpdatedSpec, writeUpdatedSpec, } from './specs-apply.js';
 import { preArchiveHook } from './hooks/pre-archive.js';
 import { postArchiveHook } from './hooks/post-archive.js';
+import { GitRepoDetector } from '../utils/git-repo-detector.js';
 const ARCH_REPO_URL = 'http://gitlab.zhuanspirit.com/zz-kf/spec_repo.git';
 const ARCH_REPO_BRANCH = 'spec_repo-feature-6612-2';
 export class ArchiveCommand {
@@ -25,12 +26,18 @@ export class ArchiveCommand {
         catch {
             throw new Error("未找到 ZhuanSpec 变更目录。请先运行 'zhuanspec init'。");
         }
+        const skipSpecs = options.skipSpecs === true;
         const businessDirection = await this.resolveBusinessDirection(zhuanspecDir, options.businessDirection);
-        if (!businessDirection) {
-            throw new Error('未解析到业务方向，无法执行归档前拉取与归档后回推。请使用 --business-direction 或在 zhuanspec/.business-direction、zhuanspec/project.md 中配置。');
+        if (!businessDirection && !skipSpecs) {
+            throw new Error('未解析到业务方向，无法执行归档前拉取与归档后回推。请使用 --business-direction 或在 zhuanspec/.business-direction、zhuanspec/project.md 中配置。如果是工具类/纯本地变更，请使用 --skip-specs 跳过远端同步。');
+        }
+        if (businessDirection) {
+            console.log(chalk.gray(`业务方向：${businessDirection}`));
+            await this.refreshBusinessTemplateFromRemote(zhuanspecDir, businessDirection);
+        }
+        else {
+            console.log(chalk.gray('--skip-specs 模式：跳过远端模板拉取。'));
         }
-        console.log(chalk.gray(`业务方向：${businessDirection}`));
-        await this.refreshBusinessTemplateFromRemote(zhuanspecDir, businessDirection);
         // Get change name interactively if not provided
         if (!changeName) {
             const selectedChange = await this.selectChange(changesDir);
@@ -255,7 +262,12 @@ export class ArchiveCommand {
         await postArchiveHook({ archived: archiveName, json: false });
         // Push archive result (specs + archive + knowledge) to remote
         console.log(chalk.cyan('\n━━━ 推送到远端 ━━━'));
-        await this.pushArchiveResultToRemote(zhuanspecDir, businessDirection);
+        if (businessDirection) {
+            await this.pushArchiveResultToRemote(zhuanspecDir, businessDirection);
+        }
+        else {
+            console.log(chalk.gray('  --skip-specs 模式：跳过远端推送。'));
+        }
         // Output feedback link after archive completes
         console.log(chalk.cyan('\n━━━ 使用反馈 ━━━'));
         console.log(chalk.yellow('  请填写使用反馈，帮助我们改进 ZhuanSpec 工作流：'));
@@ -591,13 +603,8 @@ export class ArchiveCommand {
         });
     }
     hasGitChanges(repoDir) {
-        try {
-            const output = this.git(repoDir, 'git status --porcelain');
-            return output.trim().length > 0;
-        }
-        catch {
-            return false;
-        }
+        const diffResult = GitRepoDetector.getGitDiff(repoDir);
+        return diffResult.changedFiles.length > 0;
     }
     async copyDirectoryContentsIfExists(sourceDir, targetDir) {
         try {

package/dist/core/hooks/deviation-check.js

@@ -12,8 +12,8 @@
  *    - Out of scope → block with deviation handling options
  */
 import path from 'path';
-import { execSync } from 'child_process';
 import { FileSystemUtils } from '../../utils/file-system.js';
+import { GitRepoDetector } from '../../utils/git-repo-detector.js';
 import { checkPreApplyConditions } from './pre-apply.js';
 import { recordHookTrigger } from './record-progress.js';
 // Pitfall keywords for knowledge collection
@@ -113,7 +113,7 @@ async function runDeviationCheck(filePath, trigger, promptText, _options) {
     // Resume check: when session is resumed in apply phase, do a one-time deviation scan.
     if (phase === 'apply' && trigger === 'resume') {
         const estimatedFiles = await parseEstimatedChanges(proposalPath);
-        const gitDiffFiles = await parseGitChangedFiles(cwd);
+        const gitDiffFiles = GitRepoDetector.getAllChanges(cwd);
         const outOfScope = gitDiffFiles.filter((file) => {
             if (file.includes('zhuanspec/'))
                 return false;
@@ -292,34 +292,6 @@ ZhuanSpec Iron Law 3: Reverse Sync - When deviation is found, update proposal fi
         continue: true,
     };
 }
-async function parseGitChangedFiles(repoRoot) {
-    try {
-        const output = execSync('git diff --name-only', {
-            cwd: repoRoot,
-            encoding: 'utf-8',
-            stdio: ['pipe', 'pipe', 'ignore'],
-        });
-        return output.split('\n').map((line) => line.trim()).filter(Boolean);
-    }
-    catch {
-        // fall through
-    }
-    try {
-        const status = execSync('git status --porcelain', {
-            cwd: repoRoot,
-            encoding: 'utf-8',
-            stdio: ['pipe', 'pipe', 'ignore'],
-        });
-        return status
-            .split('\n')
-            .map((line) => line.replace(/^\s*[A-Z?]+\s+/, '').trim())
-            .filter(Boolean);
-    }
-    catch {
-        // ignore
-    }
-    return [];
-}
 async function parseEstimatedChanges(proposalPath) {
     try {
         const content = await FileSystemUtils.readFile(proposalPath);

package/dist/core/hooks/deviation-handler.d.ts

@@ -28,6 +28,7 @@ export declare function handleDeviation(context: DeviationContext): Promise<Devi
  * Complete deviation handling after user confirms
  *
  * @param deviationId - The deviation ID to mark as resolved
+ * @param changeId - The change ID
  * @param specChanged - List of spec files that were changed
  * @param codeChanged - List of code files that were changed
  */

package/dist/core/hooks/deviation-handler.js

@@ -8,7 +8,7 @@
  */
 import path from 'path';
 import { FileSystemUtils } from '../../utils/file-system.js';
-import { getBeijingTime } from './record-progress.js';
+import { getBeijingTime, atomicWriteJson, recoverProgressJsonForWrite, } from './record-progress.js';
 /**
  * Handle deviation correction flow
  *
@@ -20,24 +20,50 @@ export async function handleDeviation(context) {
     const zhuanspecDir = path.join(cwd, 'zhuanspec');
     const changeDir = path.join(zhuanspecDir, 'changes', context.changeId);
     const progressPath = path.join(changeDir, 'metrics', 'progress.json');
+    const timestamp = getBeijingTime();
     // Record deviation in progress.json
     const deviationId = `dev-${Date.now()}`;
     const deviationRecord = {
         deviationId,
-        detectedAt: getBeijingTime(),
+        detectedAt: timestamp,
         triggerType: 'user-input',
         userInput: context.userInput.slice(0, 500),
         specChanged: [],
         codeChanged: [],
         resolvedAt: undefined,
     };
-    // Update progress.json with deviation record
+    // Update progress.json with deviation record (using recovery strategy)
     if (await FileSystemUtils.fileExists(progressPath)) {
-        const progressData = JSON.parse(await FileSystemUtils.readFile(progressPath));
-        progressData.deviationRecords = progressData.deviationRecords || [];
-        progressData.deviationRecords.push(deviationRecord);
-        progressData.deviationCount = (progressData.deviationCount || 0) + 1;
-        await FileSystemUtils.writeFile(progressPath, JSON.stringify(progressData, null, 2));
+        const recovered = await recoverProgressJsonForWrite(progressPath);
+        if (recovered) {
+            const progressData = recovered;
+            // Fill missing fields
+            progressData.deviationRecords = progressData.deviationRecords || [];
+            progressData.deviationCount = progressData.deviationCount || 0;
+            progressData.toolCalls = progressData.toolCalls || [];
+            progressData.skillCalls = progressData.skillCalls || [];
+            progressData.hookTriggers = progressData.hookTriggers || [];
+            progressData.clarifications = progressData.clarifications || [];
+            progressData.filesModified = progressData.filesModified || [];
+            progressData.completedTasks = progressData.completedTasks || [];
+            progressData.phaseTransitions = progressData.phaseTransitions || [];
+            progressData.phaseDurations = progressData.phaseDurations || [];
+            progressData.reviewStats = progressData.reviewStats || {
+                loopCount: 0,
+                criticalFixes: 0,
+                testFixes: 0,
+                consistencyFixes: 0,
+            };
+            progressData.stats = progressData.stats || {
+                tokenUsageTotal: 0,
+                contextLoad: 0,
+                durationMs: { propose: 0, apply: 0, review: 0, archive: 0 },
+            };
+            progressData.deviationRecords.push(deviationRecord);
+            progressData.deviationCount += 1;
+            progressData.lastUpdatedAt = timestamp;
+            await atomicWriteJson(progressPath, progressData);
+        }
     }
     // Step 1: Modify spec file first
     return {
@@ -49,6 +75,7 @@ export async function handleDeviation(context) {
  * Complete deviation handling after user confirms
  *
  * @param deviationId - The deviation ID to mark as resolved
+ * @param changeId - The change ID
  * @param specChanged - List of spec files that were changed
  * @param codeChanged - List of code files that were changed
  */
@@ -57,14 +84,40 @@ export async function completeDeviation(deviationId, changeId, specChanged, code
     const zhuanspecDir = path.join(cwd, 'zhuanspec');
     const changeDir = path.join(zhuanspecDir, 'changes', changeId);
     const progressPath = path.join(changeDir, 'metrics', 'progress.json');
+    const timestamp = getBeijingTime();
     if (await FileSystemUtils.fileExists(progressPath)) {
-        const progressData = JSON.parse(await FileSystemUtils.readFile(progressPath));
-        const deviation = progressData.deviationRecords?.find((d) => d.deviationId === deviationId);
-        if (deviation) {
-            deviation.specChanged = specChanged;
-            deviation.codeChanged = codeChanged;
-            deviation.resolvedAt = getBeijingTime();
-            await FileSystemUtils.writeFile(progressPath, JSON.stringify(progressData, null, 2));
+        const recovered = await recoverProgressJsonForWrite(progressPath);
+        if (recovered) {
+            const progressData = recovered;
+            // Fill missing fields
+            progressData.deviationRecords = progressData.deviationRecords || [];
+            progressData.toolCalls = progressData.toolCalls || [];
+            progressData.skillCalls = progressData.skillCalls || [];
+            progressData.hookTriggers = progressData.hookTriggers || [];
+            progressData.clarifications = progressData.clarifications || [];
+            progressData.filesModified = progressData.filesModified || [];
+            progressData.completedTasks = progressData.completedTasks || [];
+            progressData.phaseTransitions = progressData.phaseTransitions || [];
+            progressData.phaseDurations = progressData.phaseDurations || [];
+            progressData.reviewStats = progressData.reviewStats || {
+                loopCount: 0,
+                criticalFixes: 0,
+                testFixes: 0,
+                consistencyFixes: 0,
+            };
+            progressData.stats = progressData.stats || {
+                tokenUsageTotal: 0,
+                contextLoad: 0,
+                durationMs: { propose: 0, apply: 0, review: 0, archive: 0 },
+            };
+            const deviation = progressData.deviationRecords.find((d) => d.deviationId === deviationId);
+            if (deviation) {
+                deviation.specChanged = specChanged;
+                deviation.codeChanged = codeChanged;
+                deviation.resolvedAt = timestamp;
+                progressData.lastUpdatedAt = timestamp;
+                await atomicWriteJson(progressPath, progressData);
+            }
         }
     }
 }

package/dist/core/hooks/post-apply.js

@@ -9,7 +9,8 @@
 import path from 'path';
 import { execSync } from 'child_process';
 import { FileSystemUtils } from '../../utils/file-system.js';
-import { getBeijingTime } from './record-progress.js';
+import { GitRepoDetector } from '../../utils/git-repo-detector.js';
+import { getBeijingTime, atomicWriteJson, recoverProgressJsonForWrite, } from './record-progress.js';
 export async function postApplyHook(options) {
     const output = await runPostApplyHook(options.change || '');
     if (options.json) {
@@ -26,7 +27,10 @@ async function runPostApplyHook(changeId) {
             systemMessage: 'Post-apply hook skipped: no change provided',
         };
     }
-    const repoRoot = process.cwd();
+    // Use GitRepoDetector to find the repository root
+    const zhuanspecDir = path.join(process.cwd(), 'zhuanspec');
+    const detectedRepoRoot = GitRepoDetector.findParentGitRepo(zhuanspecDir);
+    const repoRoot = detectedRepoRoot || process.cwd();
     const changeDir = path.join(repoRoot, 'zhuanspec', 'changes', changeId);
     return await executePostApply(changeDir, repoRoot);
 }
@@ -100,34 +104,15 @@ async function detectDeviation(changeDir, repoRoot) {
     catch {
         // Cannot read proposal
     }
-    // Get actual changed files
+    // Get actual changed files using GitRepoDetector
+    const zhuanspecDir = path.join(repoRoot, 'zhuanspec');
     let actualFiles = [];
     try {
-        const output = execSync('git diff --name-only HEAD~1 HEAD', {
-            cwd: repoRoot,
-            encoding: 'utf-8',
-            stdio: ['pipe', 'pipe', 'ignore'],
-        });
-        actualFiles = output.trim().split('\n').filter(Boolean);
+        actualFiles = GitRepoDetector.getAllChanges(repoRoot);
     }
     catch {
-        // Try git status for uncommitted changes
-        try {
-            const statusOutput = execSync('git status --porcelain', {
-                cwd: repoRoot,
-                encoding: 'utf-8',
-                stdio: ['pipe', 'pipe', 'ignore'],
-            });
-            actualFiles = statusOutput
-                .trim()
-                .split('\n')
-                .map(line => line.replace(/^\s*[A-Z?]+\s+/, '').trim())
-                .filter(Boolean);
-        }
-        catch {
-            // No git info available
-            return { detected: false };
-        }
+        // No git info available
+        return { detected: false };
     }
     // Find files outside proposal scope (excluding zhuanspec internal files)
     const outOfScopeFiles = [];
@@ -145,29 +130,107 @@ async function detectDeviation(changeDir, repoRoot) {
     };
 }
 /**
- * Update progress.json to track phase transitions
+ * Update progress.json to track phase transitions (with data preservation)
  */
 async function updateProgressJson(changeDir, event) {
     const metricsDir = path.join(changeDir, 'metrics');
     const progressPath = path.join(metricsDir, 'progress.json');
+    const timestamp = getBeijingTime();
     await FileSystemUtils.createDirectory(metricsDir);
-    let progress = {};
-    try {
-        if (await FileSystemUtils.fileExists(progressPath)) {
-            const content = await FileSystemUtils.readFile(progressPath);
-            progress = JSON.parse(content);
+    let progress;
+    // Use three-layer recovery strategy to preserve all data
+    if (await FileSystemUtils.fileExists(progressPath)) {
+        const recovered = await recoverProgressJsonForWrite(progressPath);
+        if (recovered) {
+            progress = recovered;
+            // Fill missing fields with defaults
+            progress.toolCalls = progress.toolCalls || [];
+            progress.skillCalls = progress.skillCalls || [];
+            progress.hookTriggers = progress.hookTriggers || [];
+            progress.clarifications = progress.clarifications || [];
+            progress.filesModified = progress.filesModified || [];
+            progress.completedTasks = progress.completedTasks || [];
+            progress.deviationRecords = progress.deviationRecords || [];
+            progress.phaseTransitions = progress.phaseTransitions || [];
+            progress.phaseDurations = progress.phaseDurations || [];
+            progress.reviewStats = progress.reviewStats || {
+                loopCount: 0,
+                criticalFixes: 0,
+                testFixes: 0,
+                consistencyFixes: 0,
+            };
+            progress.stats = progress.stats || {
+                tokenUsageTotal: 0,
+                contextLoad: 0,
+                durationMs: { propose: 0, apply: 0, review: 0, archive: 0 },
+            };
+        }
+        else {
+            // Recovery failed - create minimal valid structure
+            progress = {
+                changeId: path.basename(changeDir),
+                sessionId: '',
+                startedAt: timestamp,
+                lastUpdatedAt: timestamp,
+                phase: 'apply',
+                currentNode: 'apply',
+                currentTask: '',
+                completedTasks: [],
+                totalTasks: 0,
+                toolCalls: [],
+                skillCalls: [],
+                hookTriggers: [],
+                clarifications: [],
+                filesModified: [],
+                linesAdded: 0,
+                linesRemoved: 0,
+                deviationCount: 0,
+                deviationRecords: [],
+                reviewStats: { loopCount: 0, criticalFixes: 0, testFixes: 0, consistencyFixes: 0 },
+                phaseTransitions: [],
+                phaseDurations: [],
+                stats: { tokenUsageTotal: 0, contextLoad: 0, durationMs: { propose: 0, apply: 0, review: 0, archive: 0 } },
+            };
         }
     }
-    catch {
-        progress = {};
+    else {
+        // No existing file - create new structure
+        progress = {
+            changeId: path.basename(changeDir),
+            sessionId: '',
+            startedAt: timestamp,
+            lastUpdatedAt: timestamp,
+            phase: 'apply',
+            currentNode: 'apply',
+            currentTask: '',
+            completedTasks: [],
+            totalTasks: 0,
+            toolCalls: [],
+            skillCalls: [],
+            hookTriggers: [],
+            clarifications: [],
+            filesModified: [],
+            linesAdded: 0,
+            linesRemoved: 0,
+            deviationCount: 0,
+            deviationRecords: [],
+            reviewStats: { loopCount: 0, criticalFixes: 0, testFixes: 0, consistencyFixes: 0 },
+            phaseTransitions: [],
+            phaseDurations: [],
+            stats: { tokenUsageTotal: 0, contextLoad: 0, durationMs: { propose: 0, apply: 0, review: 0, archive: 0 } },
+        };
+    }
+    // Add event to events array (optional tracking)
+    if (!progress.events) {
+        progress.events = [];
     }
-    progress.lastEvent = event;
-    progress.lastUpdatedAt = getBeijingTime();
-    progress.events = progress.events || [];
     progress.events.push({
         event,
-        timestamp: getBeijingTime(),
+        timestamp,
     });
-    await FileSystemUtils.writeFile(progressPath, JSON.stringify(progress, null, 2));
+    progress.lastEvent = event;
+    progress.lastUpdatedAt = timestamp;
+    // Use atomic write to prevent corruption
+    await atomicWriteJson(progressPath, progress);
 }
 //# sourceMappingURL=post-apply.js.map