openmatrix 0.2.31 → 0.2.34

package/dist/test/generator.js

@@ -150,17 +150,17 @@ function generateTestContent(source, config) {
     // 测试块
     const testBlocks = source.exports.map(exp => generateTestBlock(exp, framework, usesDescribeIt, source.fileType));
     // 组装内容
-    const content = `${needsViImport ? `import { vi } from 'vitest';\n` : ''}${imports}
-${needsLifecycle ? `
-beforeEach(() => {
-  vi.clearAllMocks();
-});
-
-afterEach(() => {
-  vi.restoreAllMocks();
-});
-` : ''}
-${testBlocks.join('\n\n')}
+    const content = `${needsViImport ? `import { vi } from 'vitest';\n` : ''}${imports}
+${needsLifecycle ? `
+beforeEach(() => {
+  vi.clearAllMocks();
+});
+
+afterEach(() => {
+  vi.restoreAllMocks();
+});
+` : ''}
+${testBlocks.join('\n\n')}
 `;
     return content;
 }
@@ -186,14 +186,14 @@ function generateTestBlock(exportName, framework, usesDescribeIt, fileType) {
         // 根据文件类型生成不同的测试场景
         const testCases = generateBusinessTestCases(exportName, fileType);
         const testBlocks = testCases.map(tc => generateTestCaseBlock(tc, exportName));
-        return `describe('${getDescribeTitle(exportName, fileType)}', () => {
-${testBlocks.join('\n\n')}
+        return `describe('${getDescribeTitle(exportName, fileType)}', () => {
+${testBlocks.join('\n\n')}
 });`;
     }
     else {
-        return `test('${exportName}', () => {
-  expect(${exportName}).toBeDefined();
-  expect(${exportName}(null)).toBeDefined();
+        return `test('${exportName}', () => {
+  expect(${exportName}).toBeDefined();
+  expect(${exportName}(null)).toBeDefined();
 });`;
     }
 }
@@ -206,10 +206,10 @@ function generateBusinessTestCases(exportName, fileType) {
             return [
                 {
                     name: 'should return valid result on successful execution',
-                    arrange: `// Arrange - 准备有效的输入参数
-    const params = { id: 'test-id', data: {} };
+                    arrange: `// Arrange - 准备有效的输入参数
+    const params = { id: 'test-id', data: {} };
     const spy = vi.spyOn({ ${exportName} }, '${exportName}');`,
-                    act: `// Act - 执行服务方法
+                    act: `// Act - 执行服务方法
     const result = await ${exportName}(params);`,
                     assert: [
                         'expect(result).toBeDefined();',
@@ -221,9 +221,9 @@ function generateBusinessTestCases(exportName, fileType) {
                 },
                 {
                     name: 'should handle invalid input gracefully',
-                    arrange: `// Arrange - 准备无效输入
+                    arrange: `// Arrange - 准备无效输入
     const invalidParams = { id: null, data: undefined };`,
-                    act: `// Act - 使用无效参数调用
+                    act: `// Act - 使用无效参数调用
     const result = await ${exportName}(invalidParams);`,
                     assert: [
                         'expect(result).toBeDefined();',
@@ -233,7 +233,7 @@ function generateBusinessTestCases(exportName, fileType) {
                 {
                     name: 'should handle empty parameters',
                     arrange: `// Arrange - 空参数测试`,
-                    act: `// Act & Assert - 验证空参数处理
+                    act: `// Act & Assert - 验证空参数处理
     const result = await ${exportName}({});`,
                     assert: [
                         'expect(result).toBeDefined();',
@@ -254,11 +254,11 @@ function generateBusinessTestCases(exportName, fileType) {
             return [
                 {
                     name: 'should process valid input correctly',
-                    arrange: `// Arrange - 准备有效输入
-    const input = 'test-value';
-    const expected = 'expected-result';
+                    arrange: `// Arrange - 准备有效输入
+    const input = 'test-value';
+    const expected = 'expected-result';
     const spy = vi.spyOn({ ${exportName} }, '${exportName}');`,
-                    act: `// Act
+                    act: `// Act
     const result = ${exportName}(input);`,
                     assert: [
                         'expect(result).toBeDefined();',
@@ -280,7 +280,7 @@ function generateBusinessTestCases(exportName, fileType) {
                 {
                     name: 'should handle empty string input',
                     arrange: `// Arrange - 空字符串输入`,
-                    act: `// Act
+                    act: `// Act
     const result = ${exportName}('');`,
                     assert: [
                         'expect(result).toBeDefined();',
@@ -305,9 +305,9 @@ function generateBusinessTestCases(exportName, fileType) {
             return [
                 {
                     name: 'should render without crashing',
-                    arrange: `// Arrange - 准备组件 props
+                    arrange: `// Arrange - 准备组件 props
     const props = { title: \'Test Title\', onClick: vi.fn() };`,
-                    act: `// Act - 渲染组件
+                    act: `// Act - 渲染组件
     const { container } = render(<${exportName} {...props} />);`,
                     assert: [
                         'expect(container).toBeDefined();',
@@ -316,11 +316,11 @@ function generateBusinessTestCases(exportName, fileType) {
                 },
                 {
                     name: 'should handle user interaction',
-                    arrange: `// Arrange - 准备交互测试
-    const handleClick = vi.fn();
+                    arrange: `// Arrange - 准备交互测试
+    const handleClick = vi.fn();
     const props = { onClick: handleClick };`,
-                    act: `// Act - 模拟用户点击
-    const { getByRole } = render(<${exportName} {...props} />);
+                    act: `// Act - 模拟用户点击
+    const { getByRole } = render(<${exportName} {...props} />);
     fireEvent.click(getByRole(\'button\'));`,
                     assert: [
                         'expect(handleClick).toHaveBeenCalledTimes(1);'
@@ -328,10 +328,10 @@ function generateBusinessTestCases(exportName, fileType) {
                 },
                 {
                     name: 'should display correct content with props',
-                    arrange: `// Arrange - 准备显示内容测试
-    const testContent = \'Hello World\';
+                    arrange: `// Arrange - 准备显示内容测试
+    const testContent = \'Hello World\';
     const props = { children: testContent };`,
-                    act: `// Act - 渲染并检查内容
+                    act: `// Act - 渲染并检查内容
     const { getByText } = render(<${exportName} {...props} />);`,
                     assert: [
                         'expect(getByText(testContent)).toBeInTheDocument();'
@@ -340,7 +340,7 @@ function generateBusinessTestCases(exportName, fileType) {
                 {
                     name: 'should handle missing optional props',
                     arrange: `// Arrange - 无可选 props`,
-                    act: `// Act - 仅传递必需 props
+                    act: `// Act - 仅传递必需 props
     const { container } = render(<${exportName} />);`,
                     assert: [
                         'expect(container).toBeDefined();',
@@ -352,11 +352,11 @@ function generateBusinessTestCases(exportName, fileType) {
             return [
                 {
                     name: 'should return success response for valid request',
-                    arrange: `// Arrange - 准备有效的 API 请求参数
-    const request = { method: \'GET\', path: \'/api/test\' };
-    const mockResponse = { status: 200, data: { id: 1 } };
+                    arrange: `// Arrange - 准备有效的 API 请求参数
+    const request = { method: \'GET\', path: \'/api/test\' };
+    const mockResponse = { status: 200, data: { id: 1 } };
     const spy = vi.spyOn({ ${exportName} }, '${exportName}').mockResolvedValue(mockResponse);`,
-                    act: `// Act - 执行 API 调用
+                    act: `// Act - 执行 API 调用
     const response = await ${exportName}(request);`,
                     assert: [
                         'expect(response).toBeDefined();',
@@ -368,11 +368,11 @@ function generateBusinessTestCases(exportName, fileType) {
                 },
                 {
                     name: 'should handle 404 not found',
-                    arrange: `// Arrange - 准备不存在的资源请求
-    const request = { method: \'GET\', path: \'/api/nonexistent\' };
-    const mockResponse = { status: 404, error: \'Not Found\' };
+                    arrange: `// Arrange - 准备不存在的资源请求
+    const request = { method: \'GET\', path: \'/api/nonexistent\' };
+    const mockResponse = { status: 404, error: \'Not Found\' };
     vi.spyOn({ ${exportName} }, '${exportName}').mockResolvedValue(mockResponse);`,
-                    act: `// Act - 请求不存在的资源
+                    act: `// Act - 请求不存在的资源
     const response = await ${exportName}(request);`,
                     assert: [
                         'expect(response.status).toBe(404);',
@@ -381,11 +381,11 @@ function generateBusinessTestCases(exportName, fileType) {
                 },
                 {
                     name: 'should handle invalid request body',
-                    arrange: `// Arrange - 准备无效的请求体
-    const request = { method: \'POST\', path: \'/api/test\', body: null };
-    const mockResponse = { status: 400, error: \'invalid request\' };
+                    arrange: `// Arrange - 准备无效的请求体
+    const request = { method: \'POST\', path: \'/api/test\', body: null };
+    const mockResponse = { status: 400, error: \'invalid request\' };
     vi.spyOn({ ${exportName} }, '${exportName}').mockResolvedValue(mockResponse);`,
-                    act: `// Act - 发送无效请求
+                    act: `// Act - 发送无效请求
     const response = await ${exportName}(request);`,
                     assert: [
                         'expect(response.status).toBe(400);',
@@ -394,8 +394,8 @@ function generateBusinessTestCases(exportName, fileType) {
                 },
                 {
                     name: 'should handle network errors gracefully',
-                    arrange: `// Arrange - 模拟网络错误
-    const request = { method: \'GET\', path: \'/api/error\' };
+                    arrange: `// Arrange - 模拟网络错误
+    const request = { method: \'GET\', path: \'/api/error\' };
     vi.spyOn({ ${exportName} }, '${exportName}').mockRejectedValue(new Error('Network Error'));`,
                     act: `// Act - 处理错误响应`,
                     assert: [
@@ -409,9 +409,9 @@ function generateBusinessTestCases(exportName, fileType) {
             return [
                 {
                     name: 'should return defined result for valid input',
-                    arrange: `// Arrange - 准备有效输入
+                    arrange: `// Arrange - 准备有效输入
     const input = {};`,
-                    act: `// Act - 执行函数
+                    act: `// Act - 执行函数
     const result = ${exportName}(input);`,
                     assert: [
                         'expect(result).toBeDefined();'
@@ -443,10 +443,10 @@ function generateTestCaseBlock(tc, exportName) {
     const indent = '  ';
     const actIndent = tc.act.includes('\n') ? indent : indent + '  ';
     const assertLines = tc.assert.map(a => `${indent}  ${a}`).join('\n');
-    return `${indent}it('${tc.name}', () => {
-${indent}  ${tc.arrange}
-${actIndent}${tc.act}
-${assertLines}
+    return `${indent}it('${tc.name}', () => {
+${indent}  ${tc.arrange}
+${actIndent}${tc.act}
+${assertLines}
 ${indent}});`;
 }
 /**
@@ -518,21 +518,21 @@ function generateMockFiles(sources, config, projectRoot) {
  */
 function generateMockContent(source, config) {
     const mockExports = source.exports.map(exp => {
-        return `export const ${exp} = vi.fn(() => ({
-  // Default mock implementation
-  data: null,
-  error: null
+        return `export const ${exp} = vi.fn(() => ({
+  // Default mock implementation
+  data: null,
+  error: null
 }));`;
     });
-    return `// Mock for ${source.path}
-import { vi } from 'vitest';
-
-${mockExports.join('\n\n')}
-
-// Reset all mocks before each test
-beforeEach(() => {
-  vi.clearAllMocks();
-});
+    return `// Mock for ${source.path}
+import { vi } from 'vitest';
+
+${mockExports.join('\n\n')}
+
+// Reset all mocks before each test
+beforeEach(() => {
+  vi.clearAllMocks();
+});
 `;
 }
 /**
@@ -562,52 +562,52 @@ function generateE2ETestFiles(scanResult, config, uiComponents) {
  */
 function generateE2EContent(component, framework) {
     if (framework === 'playwright') {
-        return `// E2E test for ${component.path}
-import { test, expect } from '@playwright/test';
-
-test.describe('${component.exports[0] || 'Component'} E2E', () => {
-  test.beforeEach(async ({ page }) => {
-    await page.goto('/');
-  });
-
-  test('should render correctly', async ({ page }) => {
-    // Navigate to component page
-    await page.waitForSelector('[data-testid="${component.exports[0]?.toLowerCase() || 'component'}"]');
-
-    // Take screenshot
-    await page.screenshot({ path: 'screenshots/${component.exports[0]?.toLowerCase() || 'component'}.png' });
-  });
-
-  test('should handle user interaction', async ({ page }) => {
-    const element = await page.locator('[data-testid="${component.exports[0]?.toLowerCase() || 'component'}"]');
-    await element.click();
-
-    // Verify state change
-    await expect(element).toHaveAttribute('data-active', 'true');
-  });
-});
+        return `// E2E test for ${component.path}
+import { test, expect } from '@playwright/test';
+
+test.describe('${component.exports[0] || 'Component'} E2E', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('/');
+  });
+
+  test('should render correctly', async ({ page }) => {
+    // Navigate to component page
+    await page.waitForSelector('[data-testid="${component.exports[0]?.toLowerCase() || 'component'}"]');
+
+    // Take screenshot
+    await page.screenshot({ path: 'screenshots/${component.exports[0]?.toLowerCase() || 'component'}.png' });
+  });
+
+  test('should handle user interaction', async ({ page }) => {
+    const element = await page.locator('[data-testid="${component.exports[0]?.toLowerCase() || 'component'}"]');
+    await element.click();
+
+    // Verify state change
+    await expect(element).toHaveAttribute('data-active', 'true');
+  });
+});
 `;
     }
     // Default Cypress style
-    return `// E2E test for ${component.path}
-describe('${component.exports[0] || 'Component'} E2E', () => {
-  beforeEach(() => {
-    cy.visit('/');
-  });
-
-  it('should render correctly', () => {
-    cy.get('[data-testid="${component.exports[0]?.toLowerCase() || 'component'}"]')
-      .should('be.visible');
-
-    cy.screenshot('${component.exports[0]?.toLowerCase() || 'component'}');
-  });
-
-  it('should handle user interaction', () => {
-    cy.get('[data-testid="${component.exports[0]?.toLowerCase() || 'component'}"]')
-      .click()
-      .should('have.attr', 'data-active', 'true');
-  });
-});
+    return `// E2E test for ${component.path}
+describe('${component.exports[0] || 'Component'} E2E', () => {
+  beforeEach(() => {
+    cy.visit('/');
+  });
+
+  it('should render correctly', () => {
+    cy.get('[data-testid="${component.exports[0]?.toLowerCase() || 'component'}"]')
+      .should('be.visible');
+
+    cy.screenshot('${component.exports[0]?.toLowerCase() || 'component'}');
+  });
+
+  it('should handle user interaction', () => {
+    cy.get('[data-testid="${component.exports[0]?.toLowerCase() || 'component'}"]')
+      .click()
+      .should('have.attr', 'data-active', 'true');
+  });
+});
 `;
 }
 /**

package/dist/utils/error-handler.d.ts

@@ -44,3 +44,21 @@ export declare function isRecoverableError(error: unknown): boolean;
  * 判断错误是否为文件系统错误
  */
 export declare function isFileSystemError(error: unknown): boolean;
+/**
+ * ID 验证正则表达式
+ */
+export declare const ID_PATTERNS: {
+    taskId: RegExp;
+    approvalId: RegExp;
+    meetingId: RegExp;
+    runId: RegExp;
+};
+/**
+ * 验证 ID 格式
+ * @returns true if valid, false otherwise
+ */
+export declare function validateId(id: string, type: keyof typeof ID_PATTERNS): boolean;
+/**
+ * 验证并返回 ID，如果无效则抛出错误
+ */
+export declare function validateIdOrThrow(id: string, type: keyof typeof ID_PATTERNS): void;

package/dist/utils/error-handler.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ID_PATTERNS = void 0;
 exports.toError = toError;
 exports.logError = logError;
 exports.wrapError = wrapError;
@@ -9,6 +10,8 @@ exports.safeExecuteSync = safeExecuteSync;
 exports.executeWithError = executeWithError;
 exports.isRecoverableError = isRecoverableError;
 exports.isFileSystemError = isFileSystemError;
+exports.validateId = validateId;
+exports.validateIdOrThrow = validateIdOrThrow;
 // src/utils/error-handler.ts
 const logger_js_1 = require("./logger.js");
 /**
@@ -121,3 +124,32 @@ function isFileSystemError(error) {
     ];
     return fsPatterns.some(p => p.test(err.message));
 }
+/**
+ * ID 验证正则表达式
+ */
+exports.ID_PATTERNS = {
+    taskId: /^TASK-\d{3,}$/,
+    approvalId: /^APPR-[A-Z0-9]+$/,
+    meetingId: /^meeting-[a-z0-9]+$/,
+    runId: /^run-\d{8}-[a-z0-9]{4}$/
+};
+/**
+ * 验证 ID 格式
+ * @returns true if valid, false otherwise
+ */
+function validateId(id, type) {
+    if (!id || typeof id !== 'string')
+        return false;
+    // 防止路径遍历攻击：拒绝包含 .. 或 / 或 \ 的 ID
+    if (id.includes('..') || id.includes('/') || id.includes('\\'))
+        return false;
+    return exports.ID_PATTERNS[type].test(id);
+}
+/**
+ * 验证并返回 ID，如果无效则抛出错误
+ */
+function validateIdOrThrow(id, type) {
+    if (!validateId(id, type)) {
+        throw new Error(`Invalid ${type} format: ${id}`);
+    }
+}

package/dist/utils/worktree-sync.js

@@ -301,15 +301,36 @@ class WorktreeSyncManager {
     async cleanupWorktree(worktreePath) {
         try {
             const gitRoot = await this.getGitRoot();
+            // 0. 检查是否有未提交的改动（防止丢失工作）
+            try {
+                const { stdout: statusOutput } = await execAsync(`git status --porcelain`, { cwd: worktreePath });
+                if (statusOutput.trim().length > 0) {
+                    // 有未提交改动，记录警告但不强制移除
+                    console.warn(`⚠️ Worktree ${worktreePath} 有未提交改动，跳过清理`);
+                    console.warn(`   未提交文件: ${statusOutput.trim().split('\n').length} 个`);
+                    return false;
+                }
+            }
+            catch {
+                // status 检查失败，继续尝试清理（可能 worktree 已损坏）
+            }
             // 1. 移除 worktree
-            await execAsync(`git worktree remove "${worktreePath}" --force`, { cwd: gitRoot });
+            await execAsync(`git worktree remove "${worktreePath}"`, { cwd: gitRoot });
             // 2. 清理可能的残留分支（如果是临时分支）
             // 注意：不自动删除分支，因为可能还需要
             return true;
         }
         catch (error) {
-            (0, error_handler_js_1.logError)(error, { operation: 'cleanupWorktree', file: worktreePath });
-            return false;
+            // 如果普通移除失败，尝试强制移除（但已确认无未提交改动）
+            try {
+                const gitRoot = await this.getGitRoot();
+                await execAsync(`git worktree remove "${worktreePath}" --force`, { cwd: gitRoot });
+                return true;
+            }
+            catch (forceError) {
+                (0, error_handler_js_1.logError)(forceError, { operation: 'cleanupWorktreeForce', file: worktreePath });
+                return false;
+            }
         }
     }
     /**

package/package.json

@@ -1,61 +1,61 @@
-{
-  "name": "openmatrix",
-  "version": "0.2.31",
-  "description": "AI Agent task orchestration system with Claude Code Skills integration",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "bin": {
-    "openmatrix": "dist/cli/index.js"
-  },
-  "files": [
-    "dist",
-    "skills",
-    "scripts",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsx src/cli/index.ts",
-    "test": "vitest",
-    "lint": "eslint src --ext .ts",
-    "typecheck": "tsc --noEmit",
-    "postinstall": "node scripts/install-skills.js"
-  },
-  "keywords": [
-    "claude",
-    "claude-code",
-    "ai-agent",
-    "task-orchestration",
-    "automation",
-    "multi-agent"
-  ],
-  "author": "",
-  "license": "MIT",
-  "type": "commonjs",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/bigfish1913/openmatrix.git"
-  },
-  "homepage": "https://github.com/bigfish1913/openmatrix#readme",
-  "bugs": {
-    "url": "https://github.com/bigfish1913/openmatrix/issues"
-  },
-  "dependencies": {
-    "chalk": "^5.6.2",
-    "chokidar": "^5.0.0",
-    "commander": "^14.0.3",
-    "winston": "^3.19.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.58.1",
-    "@typescript-eslint/parser": "^8.58.1",
-    "@vitest/coverage-v8": "^1.6.1",
-    "eslint": "^10.2.0",
-    "typescript": "^5.3.3",
-    "vitest": "^1.6.0"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  }
-}
+{
+  "name": "openmatrix",
+  "version": "0.2.34",
+  "description": "AI Agent task orchestration system with Claude Code Skills integration",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "bin": {
+    "openmatrix": "dist/cli/index.js"
+  },
+  "files": [
+    "dist",
+    "skills",
+    "scripts",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsx src/cli/index.ts",
+    "test": "vitest",
+    "lint": "eslint src --ext .ts",
+    "typecheck": "tsc --noEmit",
+    "postinstall": "node scripts/install-skills.js"
+  },
+  "keywords": [
+    "claude",
+    "claude-code",
+    "ai-agent",
+    "task-orchestration",
+    "automation",
+    "multi-agent"
+  ],
+  "author": "",
+  "license": "MIT",
+  "type": "commonjs",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bigfish1913/openmatrix.git"
+  },
+  "homepage": "https://github.com/bigfish1913/openmatrix#readme",
+  "bugs": {
+    "url": "https://github.com/bigfish1913/openmatrix/issues"
+  },
+  "dependencies": {
+    "chalk": "^5.6.2",
+    "chokidar": "^5.0.0",
+    "commander": "^14.0.3",
+    "winston": "^3.19.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.58.1",
+    "@typescript-eslint/parser": "^8.58.1",
+    "@vitest/coverage-v8": "^1.6.1",
+    "eslint": "^10.2.0",
+    "typescript": "^5.3.3",
+    "vitest": "^1.6.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  }
+}