openmatrix 0.1.92 → 0.1.93

package/dist/agents/agent-runner.js

@@ -166,9 +166,9 @@ ${agentPrompt.instructions}
 
 ## 完成要求
 
-1. 完成任务后，更新任务状态文件: \`.openmatrix/tasks/${task.id}/task.json\`
-2. 将执行结果写入: \`.openmatrix/tasks/${task.id}/artifacts/result.md\`
-3. 如需审批，创建审批请求: \`.openmatrix/approvals/\` 目录
+1. 将执行结果写入: \`.openmatrix/tasks/${task.id}/artifacts/result.md\`
+   （任务状态由 openmatrix complete 命令管理，请勿直接修改 task.json）
+2. 如需审批，创建审批请求: \`.openmatrix/approvals/\` 目录
 
 注意: 任务完成后，由 Skill 调用 \`openmatrix complete\` 并传入 --summary 参数，
 该摘要会自动追加到全局 \`.openmatrix/context.md\` 供后续 Agent 参考。

package/dist/cli/commands/complete.js

@@ -115,15 +115,8 @@ exports.completeCommand = new commander_1.Command('complete')
 
 `;
         try {
-            // 追加写入全局 context.md
-            let existingContent = '';
-            try {
-                existingContent = await fs.readFile(contextFile, 'utf-8');
-            }
-            catch {
-                // 文件不存在，创建新文件
-            }
-            await fs.writeFile(contextFile, existingContent + contextEntry, 'utf-8');
+            // 原子追加写入全局 context.md（O_APPEND flag 保证并发安全）
+            await fs.appendFile(contextFile, contextEntry, 'utf-8');
         }
         catch {
             // 忽略写入错误

package/dist/orchestrator/git-commit-manager.d.ts

@@ -46,6 +46,13 @@ export declare class GitCommitManager {
      * 获取未提交的文件列表
      */
     getUncommittedFiles(): Promise<string[]>;
+    /**
+     * 获取未提交的文件列表（带状态信息）
+     */
+    getUncommittedFilesWithStatus(): Promise<{
+        status: 'new' | 'modified' | 'deleted';
+        path: string;
+    }[]>;
     /**
      * 获取已修改的文件差异统计
      */
@@ -61,17 +68,29 @@ export declare class GitCommitManager {
      * 生成提交信息
      *
      * 格式规范:
-     * <type>: 简短描述
+     * feat(TASK-001): 简短描述
+     *
+     * 实现内容:
+     * 模块A: 功能描述
+     * 模块B: 功能描述
      *
-     * 改动点1
-     * 改动点2
+     * 新增文件:
+     * model/xxx.go
+     * service/xxx.go
      *
-     * 影响范围: 模块/功能
-     * 文件改动: 文件1, 文件2
+     * 修改文件:
+     * main.go: 路由注册和handler初始化
      *
      * Co-Authored-By: OpenMatrix https://github.com/bigfish1913/openmatrix
      */
-    generateCommitMessage(info: CommitInfo): string;
+    generateCommitMessage(info: CommitInfo, filesWithStatus?: {
+        status: 'new' | 'modified' | 'deleted';
+        path: string;
+    }[]): string;
+    /**
+     * 按目录分组文件
+     */
+    private groupFilesByDirectory;
     /**
      * 执行提交
      */

package/dist/orchestrator/git-commit-manager.js

@@ -112,6 +112,32 @@ class GitCommitManager {
             return [];
         }
     }
+    /**
+     * 获取未提交的文件列表（带状态信息）
+     */
+    async getUncommittedFilesWithStatus() {
+        try {
+            const { stdout } = await execAsync('git status --porcelain', { cwd: this.repoPath });
+            return stdout
+                .split('\n')
+                .filter(line => line.trim())
+                .map(line => {
+                const statusCode = line.slice(0, 2);
+                const filePath = line.slice(3).trim();
+                let status = 'modified';
+                if (statusCode.includes('?') || statusCode.includes('A')) {
+                    status = 'new';
+                }
+                else if (statusCode.includes('D')) {
+                    status = 'deleted';
+                }
+                return { status, path: filePath };
+            });
+        }
+        catch {
+            return [];
+        }
+    }
     /**
      * 获取已修改的文件差异统计
      */
@@ -173,17 +199,22 @@ class GitCommitManager {
      * 生成提交信息
      *
      * 格式规范:
-     * <type>: 简短描述
+     * feat(TASK-001): 简短描述
      *
-     * 改动点1
-     * 改动点2
+     * 实现内容:
+     * 模块A: 功能描述
+     * 模块B: 功能描述
      *
-     * 影响范围: 模块/功能
-     * 文件改动: 文件1, 文件2
+     * 新增文件:
+     * model/xxx.go
+     * service/xxx.go
+     *
+     * 修改文件:
+     * main.go: 路由注册和handler初始化
      *
      * Co-Authored-By: OpenMatrix https://github.com/bigfish1913/openmatrix
      */
-    generateCommitMessage(info) {
+    generateCommitMessage(info, filesWithStatus) {
         const lines = [];
         // 类型映射：根据 phase 确定提交类型
         const phaseToType = {
@@ -201,7 +232,7 @@ class GitCommitManager {
         // 格式: feat(TASK-001): 简短描述
         lines.push(`${commitType}(${info.taskId}): ${title}`);
         lines.push('');
-        // Phase 描述作为改动点
+        // Phase 描述
         const phaseDescriptions = {
             tdd: '编写测试用例',
             develop: '实现功能代码',
@@ -214,21 +245,69 @@ class GitCommitManager {
             lines.push('');
             lines.push(`影响范围: ${info.impactScope.join('、')}`);
         }
-        // 文件改动
-        const changedFiles = info.changes.slice(0, 5).map(f => {
-            const parts = f.split('/');
-            return parts.length > 2 ? parts.slice(-2).join('/') : f;
-        });
-        if (changedFiles.length > 0) {
-            const fileSummary = changedFiles.join(', ');
-            const suffix = info.changes.length > 5 ? ` 等 ${info.changes.length} 个文件` : '';
-            lines.push(`文件改动: ${fileSummary}${suffix}`);
+        // 按新增/修改分类列出文件
+        if (filesWithStatus && filesWithStatus.length > 0) {
+            const newFiles = filesWithStatus.filter(f => f.status === 'new').map(f => f.path);
+            const modifiedFiles = filesWithStatus.filter(f => f.status === 'modified').map(f => f.path);
+            const deletedFiles = filesWithStatus.filter(f => f.status === 'deleted').map(f => f.path);
+            if (newFiles.length > 0) {
+                lines.push('');
+                lines.push('新增文件:');
+                // 按目录分组
+                const grouped = this.groupFilesByDirectory(newFiles);
+                for (const [dir, files] of grouped) {
+                    lines.push(`${dir ? dir + '/' : ''}${files.join(', ')}`);
+                }
+            }
+            if (modifiedFiles.length > 0) {
+                lines.push('');
+                lines.push('修改文件:');
+                const grouped = this.groupFilesByDirectory(modifiedFiles);
+                for (const [dir, files] of grouped) {
+                    lines.push(`${dir ? dir + '/' : ''}${files.join(', ')}`);
+                }
+            }
+            if (deletedFiles.length > 0) {
+                lines.push('');
+                lines.push('删除文件:');
+                for (const f of deletedFiles) {
+                    lines.push(f);
+                }
+            }
+        }
+        else if (info.changes.length > 0) {
+            // 回退：无状态信息时使用 changes 列表
+            const changedFiles = info.changes.slice(0, 10).map(f => {
+                const parts = f.split('/');
+                return parts.length > 2 ? parts.slice(-2).join('/') : f;
+            });
+            lines.push('');
+            lines.push(`文件改动: ${changedFiles.join(', ')}`);
+            if (info.changes.length > 10) {
+                lines.push(`...等 ${info.changes.length} 个文件`);
+            }
         }
         lines.push('');
         // Co-Author
         lines.push(`Co-Authored-By: OpenMatrix https://github.com/bigfish1913/openmatrix`);
         return lines.join('\n');
     }
+    /**
+     * 按目录分组文件
+     */
+    groupFilesByDirectory(files) {
+        const groups = new Map();
+        for (const file of files) {
+            const parts = file.split('/');
+            const dir = parts.length > 1 ? parts.slice(0, -1).join('/') : '';
+            const fileName = parts[parts.length - 1];
+            if (!groups.has(dir)) {
+                groups.set(dir, []);
+            }
+            groups.get(dir).push(fileName);
+        }
+        return groups;
+    }
     /**
      * 执行提交
      */
@@ -251,6 +330,8 @@ class GitCommitManager {
             }
             // 分析影响范围
             const impactScope = await this.analyzeImpactScope(files);
+            // 获取文件状态信息（新增/修改/删除）
+            const filesWithStatus = await this.getUncommittedFilesWithStatus();
             // 更新 commit info
             const fullInfo = {
                 ...info,
@@ -258,7 +339,7 @@ class GitCommitManager {
                 impactScope: info.impactScope.length > 0 ? info.impactScope : impactScope
             };
             // 生成提交信息
-            const commitMessage = this.generateCommitMessage(fullInfo);
+            const commitMessage = this.generateCommitMessage(fullInfo, filesWithStatus);
             // 添加文件 - 使用 git add . 而不是 git add -A
             // git add . 只添加当前目录及子目录的文件，不会添加上级目录的文件
             // 同时通过 .gitignore 排除不需要的文件

package/dist/storage/file-store.d.ts

@@ -1,9 +1,14 @@
 export declare class FileStore {
     private basePath;
     constructor(basePath: string);
+    getBasePath(): string;
     ensureDir(path: string): Promise<void>;
     writeJson<T>(path: string, data: T): Promise<void>;
     writeMarkdown(path: string, content: string): Promise<void>;
+    /**
+     * 原子追加写入（使用 O_APPEND flag，内核保证追加原子性）
+     */
+    appendFile(filePath: string, content: string): Promise<void>;
     /**
      * 读取 JSON 文件
      * @returns 文件内容，如果文件不存在则返回 null；其他错误会抛出异常

package/dist/storage/file-store.js

@@ -9,6 +9,9 @@ class FileStore {
     constructor(basePath) {
         this.basePath = basePath;
     }
+    getBasePath() {
+        return this.basePath;
+    }
     async ensureDir(path) {
         const fullPath = (0, path_1.join)(this.basePath, path);
         await (0, promises_1.mkdir)(fullPath, { recursive: true });
@@ -23,6 +26,14 @@ class FileStore {
         await (0, promises_1.mkdir)((0, path_1.dirname)(fullPath), { recursive: true });
         await (0, promises_1.writeFile)(fullPath, content, 'utf-8');
     }
+    /**
+     * 原子追加写入（使用 O_APPEND flag，内核保证追加原子性）
+     */
+    async appendFile(filePath, content) {
+        const fullPath = (0, path_1.join)(this.basePath, filePath);
+        await (0, promises_1.mkdir)((0, path_1.dirname)(fullPath), { recursive: true });
+        await (0, promises_1.appendFile)(fullPath, content, 'utf-8');
+    }
     /**
      * 读取 JSON 文件
      * @returns 文件内容，如果文件不存在则返回 null；其他错误会抛出异常

package/dist/storage/state-manager.d.ts

@@ -2,12 +2,15 @@ import type { GlobalState, Task, Approval, ApprovalStatus } from '../types/index
 export declare class StateManager {
     private store;
     private stateCache;
-    private writeLock;
+    private lockDepth;
     constructor(basePath: string);
     /**
-     * 串行化异步写操作，防止并发 read-modify-write 竞态
+     * 跨进程文件锁 — 防止多个 openmatrix CLI 进程同时读写 state.json
+     *
+     * 使用 O_EXCL | O_CREAT 原子创建锁文件，Windows/Linux/macOS 均支持
+     * 支持可重入：同进程内嵌套调用（如 updateTask → updateTaskStatistics）直接执行
      */
-    private withLock;
+    private withFileLock;
     initialize(): Promise<void>;
     getState(): Promise<GlobalState>;
     updateState(updates: Partial<GlobalState>): Promise<void>;

package/dist/storage/state-manager.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StateManager = void 0;
 const file_store_js_1 = require("./file-store.js");
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
 const DEFAULT_CONFIG = {
     timeout: 120,
     maxRetries: 3,
@@ -12,23 +14,44 @@ const DEFAULT_CONFIG = {
 class StateManager {
     store;
     stateCache = null;
-    writeLock = Promise.resolve();
+    lockDepth = 0; // 可重入：同一进程内嵌套调用不阻塞
     constructor(basePath) {
         this.store = new file_store_js_1.FileStore(basePath);
     }
     /**
-     * 串行化异步写操作，防止并发 read-modify-write 竞态
+     * 跨进程文件锁 — 防止多个 openmatrix CLI 进程同时读写 state.json
+     *
+     * 使用 O_EXCL | O_CREAT 原子创建锁文件，Windows/Linux/macOS 均支持
+     * 支持可重入：同进程内嵌套调用（如 updateTask → updateTaskStatistics）直接执行
      */
-    async withLock(fn) {
-        const prev = this.writeLock;
-        let resolve;
-        this.writeLock = new Promise(r => { resolve = r; });
-        await prev;
+    async withFileLock(fn) {
+        // 可重入：同一进程内嵌套调用直接执行
+        if (this.lockDepth > 0) {
+            return fn();
+        }
+        const lockPath = (0, path_1.join)(this.store.getBasePath(), '.lock');
+        const maxRetries = 50;
+        const retryDelay = 100;
+        for (let i = 0; i < maxRetries; i++) {
+            try {
+                const fd = await (0, promises_1.open)(lockPath, 'wx');
+                await fd.write(`${process.pid}\n`);
+                await fd.close();
+                break;
+            }
+            catch {
+                if (i === maxRetries - 1)
+                    throw new Error('Cannot acquire state lock');
+                await new Promise(r => setTimeout(r, retryDelay));
+            }
+        }
+        this.lockDepth++;
         try {
             return await fn();
         }
         finally {
-            resolve();
+            this.lockDepth--;
+            await (0, promises_1.unlink)(lockPath).catch(() => { });
         }
     }
     async initialize() {
@@ -83,7 +106,7 @@ class StateManager {
         return this.stateCache;
     }
     async updateState(updates) {
-        await this.withLock(async () => {
+        await this.withFileLock(async () => {
             const state = await this.getState();
             // 确保 statistics 存在（兼容旧版本）
             if (!state.statistics) {
@@ -112,7 +135,7 @@ class StateManager {
         });
     }
     async createTask(input) {
-        return this.withLock(async () => {
+        return this.withFileLock(async () => {
             const taskId = this.generateTaskId();
             const now = new Date().toISOString();
             const task = {
@@ -161,7 +184,7 @@ class StateManager {
         return task;
     }
     async updateTask(taskId, updates) {
-        await this.withLock(async () => {
+        await this.withFileLock(async () => {
             const task = await this.getTask(taskId);
             if (!task)
                 throw new Error(`Task ${taskId} not found`);
@@ -234,67 +257,69 @@ class StateManager {
         return await this.store.readMarkdown(`tasks/${taskId}/context.md`);
     }
     async updateTaskStatistics(oldStatus, newStatus) {
-        // 直接写入状态，不经过 updateState（避免重入锁死锁）
-        const state = await this.getState();
-        const stats = { ...state.statistics };
-        // 扩展统计字段（如果不存在则初始化）
-        if (!('scheduled' in stats))
-            stats.scheduled = 0;
-        if (!('blocked' in stats))
-            stats.blocked = 0;
-        if (!('waiting' in stats))
-            stats.waiting = 0;
-        if (!('verify' in stats))
-            stats.verify = 0;
-        if (!('accept' in stats))
-            stats.accept = 0;
-        if (!('retry_queue' in stats))
-            stats.retry_queue = 0;
-        // Decrement old status count
-        if (oldStatus === 'pending')
-            stats.pending--;
-        else if (oldStatus === 'scheduled')
-            stats.scheduled--;
-        else if (oldStatus === 'in_progress')
-            stats.inProgress--;
-        else if (oldStatus === 'blocked')
-            stats.blocked--;
-        else if (oldStatus === 'waiting')
-            stats.waiting--;
-        else if (oldStatus === 'verify')
-            stats.verify--;
-        else if (oldStatus === 'accept')
-            stats.accept--;
-        else if (oldStatus === 'completed')
-            stats.completed--;
-        else if (oldStatus === 'failed')
-            stats.failed--;
-        else if (oldStatus === 'retry_queue')
-            stats.retry_queue--;
-        // Increment new status count
-        if (newStatus === 'pending')
-            stats.pending++;
-        else if (newStatus === 'scheduled')
-            stats.scheduled++;
-        else if (newStatus === 'in_progress')
-            stats.inProgress++;
-        else if (newStatus === 'blocked')
-            stats.blocked++;
-        else if (newStatus === 'waiting')
-            stats.waiting++;
-        else if (newStatus === 'verify')
-            stats.verify++;
-        else if (newStatus === 'accept')
-            stats.accept++;
-        else if (newStatus === 'completed')
-            stats.completed++;
-        else if (newStatus === 'failed')
-            stats.failed++;
-        else if (newStatus === 'retry_queue')
-            stats.retry_queue++;
-        const newState = { ...state, statistics: stats };
-        await this.store.writeJson('state.json', newState);
-        this.stateCache = newState;
+        await this.withFileLock(async () => {
+            // 从文件重新读取最新状态（不用缓存，避免 stale）
+            const state = await this.store.readJson('state.json') ?? await this.getState();
+            const stats = { ...state.statistics };
+            // 扩展统计字段（如果不存在则初始化）
+            if (!('scheduled' in stats))
+                stats.scheduled = 0;
+            if (!('blocked' in stats))
+                stats.blocked = 0;
+            if (!('waiting' in stats))
+                stats.waiting = 0;
+            if (!('verify' in stats))
+                stats.verify = 0;
+            if (!('accept' in stats))
+                stats.accept = 0;
+            if (!('retry_queue' in stats))
+                stats.retry_queue = 0;
+            // Decrement old status count
+            if (oldStatus === 'pending')
+                stats.pending--;
+            else if (oldStatus === 'scheduled')
+                stats.scheduled--;
+            else if (oldStatus === 'in_progress')
+                stats.inProgress--;
+            else if (oldStatus === 'blocked')
+                stats.blocked--;
+            else if (oldStatus === 'waiting')
+                stats.waiting--;
+            else if (oldStatus === 'verify')
+                stats.verify--;
+            else if (oldStatus === 'accept')
+                stats.accept--;
+            else if (oldStatus === 'completed')
+                stats.completed--;
+            else if (oldStatus === 'failed')
+                stats.failed--;
+            else if (oldStatus === 'retry_queue')
+                stats.retry_queue--;
+            // Increment new status count
+            if (newStatus === 'pending')
+                stats.pending++;
+            else if (newStatus === 'scheduled')
+                stats.scheduled++;
+            else if (newStatus === 'in_progress')
+                stats.inProgress++;
+            else if (newStatus === 'blocked')
+                stats.blocked++;
+            else if (newStatus === 'waiting')
+                stats.waiting++;
+            else if (newStatus === 'verify')
+                stats.verify++;
+            else if (newStatus === 'accept')
+                stats.accept++;
+            else if (newStatus === 'completed')
+                stats.completed++;
+            else if (newStatus === 'failed')
+                stats.failed++;
+            else if (newStatus === 'retry_queue')
+                stats.retry_queue++;
+            const newState = { ...state, statistics: stats };
+            await this.store.writeJson('state.json', newState);
+            this.stateCache = newState;
+        });
     }
     generateRunId() {
         const date = new Date().toISOString().slice(0, 10).replace(/-/g, '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmatrix",
-  "version": "0.1.92",
+  "version": "0.1.93",
   "description": "AI Agent task orchestration system with Claude Code Skills integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",