speccore 6.5.1 → 6.10.0

package/dist/core/decay-detector.js

@@ -44,6 +44,8 @@ exports.formatDecayReport = formatDecayReport;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const crypto_1 = require("crypto");
+const code_scanner_1 = require("./code-scanner");
+const reverse_sync_1 = require("./reverse-sync");
 // ═══════════════════════════════════════════════
 // 核心检测
 // ═══════════════════════════════════════════════
@@ -89,28 +91,46 @@ async function detectDecay(cwd, graph) {
     };
     const entities = Object.values(graph.entities);
     report.summary.total = entities.length;
-    // 检测 1: content_changed — 文件内容与上次快照不一致
+    // 检测 1: content_changed — 文件内容与上次快照不一致，按变更程度分级
     for (const entity of entities) {
         if (!entity.file || !entity.hash)
             continue;
-        if (snapshot && snapshot.files[entity.file]) {
-            const oldHash = snapshot.files[entity.file].hash;
+        // 直接查找（路径格式一致时匹配）
+        let snapshotEntry = snapshot?.files[entity.file];
+        // 回退：basename 匹配（应对路径格式不一致的情况）
+        if (!snapshotEntry && snapshot) {
+            const entityBase = entity.file.split('/').pop();
+            for (const [snapPath, snapEntry] of Object.entries(snapshot.files)) {
+                if (snapPath.split('/').pop() === entityBase) {
+                    snapshotEntry = snapEntry;
+                    break;
+                }
+            }
+        }
+        if (snapshotEntry) {
+            const oldHash = snapshotEntry.hash;
             if (oldHash !== entity.hash) {
+                // 计算变更强度：基于文件大小变化比例
+                const sizeChangeRatio = snapshotEntry.size > 0
+                    ? Math.abs((entity.hash.length ? snapshotEntry.size : 0) - snapshotEntry.size) / snapshotEntry.size
+                    : 1;
+                const intensity = sizeChangeRatio > 0.5 ? 'major' : sizeChangeRatio > 0.1 ? 'moderate' : 'minor';
+                const severity = intensity === 'major' ? 'critical' : intensity === 'moderate' ? 'warning' : 'info';
                 report.decayedFiles.push({
                     entityId: entity.id,
                     title: entity.title,
                     file: entity.file,
                     type: 'content_changed',
-                    severity: 'warning',
-                    detail: `内容自上次索引后已变更（hash: ${oldHash} → ${entity.hash}）`,
+                    severity,
+                    detail: `内容已变更（强度: ${intensity}, hash: ${oldHash} → ${entity.hash}）`,
                 });
             }
         }
     }
-    // 检测 2: downstream_stale — 上游需求变更，下游 spec/task 未更新
-    // 找出所有变更的需求
+    // 检测 2: downstream_stale — 上游需求重大变更，下游 spec/task 未更新
+    // 只关注重大变更（major/critical），忽略 minor 的 typo 修复
     const changedReqs = new Set(report.decayedFiles
-        .filter(d => d.type === 'content_changed')
+        .filter(d => d.type === 'content_changed' && (d.severity === 'critical' || d.severity === 'warning'))
         .map(d => d.entityId));
     for (const reqId of changedReqs) {
         // 找实现该需求的任务
@@ -147,10 +167,110 @@ async function detectDecay(cwd, graph) {
             });
         }
     }
+    // 检测 4: code_ahead_of_spec — 代码已变更但关联 Spec/Task 未同步更新
+    const codeDrift = await detectCodeSpecDrift(cwd, graph);
+    for (const item of codeDrift) {
+        report.decayedFiles.push(item);
+    }
     report.summary.decayed = report.decayedFiles.length;
     report.summary.healthy = report.summary.total - report.summary.decayed;
     return report;
 }
+/**
+ * 检测代码→Task→Spec 漂移：代码文件已修改，但关联的 Task/Spec 未更新
+ *
+ * 逻辑：
+ * 1. 扫描代码中的 @spec 注释，建立 filePath → taskId 映射
+ * 2. 对比 code-index 中记录的 lastModified 与当前文件 mtime
+ * 3. 如果代码文件已变更，查找关联的 Task
+ * 4. 通过知识图谱查找 Task 关联的 Spec/Req
+ * 5. 生成 code_ahead_of_spec 类型的 DecayItem，affectedDownstream 包含完整影响链
+ */
+async function detectCodeSpecDrift(cwd, graph) {
+    const results = [];
+    // 1. 加载代码索引
+    const codeIndex = await (0, code_scanner_1.loadCodeIndex)();
+    if (!codeIndex || codeIndex.files.length === 0)
+        return results;
+    // 2. 扫描 @spec 注释（建立 filePath → taskId 映射）
+    const specAnnotations = await (0, reverse_sync_1.scanCodeForSpecAnnotations)(cwd);
+    const fileToTasks = new Map();
+    for (const ref of specAnnotations) {
+        const fullPath = (0, path_1.join)(cwd, ref.file);
+        if (!fileToTasks.has(fullPath))
+            fileToTasks.set(fullPath, []);
+        fileToTasks.get(fullPath).push(ref.taskId);
+    }
+    // 3. 检查每个有 @spec 关联的代码文件是否已变更
+    const checkedTasks = new Set(); // 避免同一 Task 重复报告
+    for (const codeFile of codeIndex.files) {
+        const fullPath = (0, path_1.join)(cwd, codeFile.path);
+        const taskIds = fileToTasks.get(fullPath);
+        if (!taskIds || taskIds.length === 0)
+            continue;
+        // 检查文件当前 mtime 是否大于索引记录的 lastModified
+        let currentMtime = 0;
+        try {
+            const st = await (0, fs_extra_1.stat)(fullPath);
+            currentMtime = st.mtimeMs;
+        }
+        catch {
+            continue;
+        }
+        // 文件在索引建立后有过修改（5分钟容差）
+        if (currentMtime <= codeFile.lastModified + 5 * 60 * 1000)
+            continue;
+        // 4. 对每个关联的 Task，推断影响范围
+        for (const taskId of taskIds) {
+            if (checkedTasks.has(taskId))
+                continue;
+            checkedTasks.add(taskId);
+            const taskEntity = graph.entities[taskId];
+            if (!taskEntity)
+                continue;
+            // 检查 Task 的 spec 文件是否也更新了
+            const taskFile = taskEntity.file;
+            let taskMtime = 0;
+            if (taskFile) {
+                try {
+                    const st = await (0, fs_extra_1.stat)((0, path_1.join)(cwd, taskFile));
+                    taskMtime = st.mtimeMs;
+                }
+                catch { }
+            }
+            // 如果代码比 Task spec 新，说明存在漂移
+            if (taskMtime > 0 && taskMtime >= currentMtime - 60 * 1000)
+                continue; // Task 也在最近更新，不算漂移
+            // 5. 通过知识图谱查找关联的 Spec/Req
+            const affectedChain = [];
+            // Task 实现了哪些需求
+            const implRelations = graph.relations.filter(r => r.from === taskId && r.type === 'implements');
+            for (const rel of implRelations) {
+                affectedChain.push(rel.to);
+            }
+            // Task 参考了哪些规格
+            const refRelations = graph.relations.filter(r => r.from === taskId && r.type === 'references');
+            for (const rel of refRelations) {
+                affectedChain.push(rel.to);
+            }
+            // Task 依赖了哪些任务（上游也可能受影响）
+            const depRelations = graph.relations.filter(r => r.from === taskId && r.type === 'depends_on');
+            for (const rel of depRelations) {
+                affectedChain.push(rel.to);
+            }
+            results.push({
+                entityId: taskId,
+                title: taskEntity.title || taskId,
+                file: codeFile.path,
+                type: 'code_ahead_of_spec',
+                severity: 'warning',
+                detail: `代码文件 ${codeFile.path} 已修改（${new Date(currentMtime).toLocaleString()}），但关联的 ${taskId} 及 Spec 未同步更新`,
+                affectedDownstream: affectedChain.length > 0 ? affectedChain : undefined,
+            });
+        }
+    }
+    return results;
+}
 /** 格式化衰减报告为 Markdown */
 function formatDecayReport(report) {
     const lines = [];
@@ -162,6 +282,8 @@ function formatDecayReport(report) {
     }
     const critical = report.decayedFiles.filter(d => d.severity === 'critical');
     const warning = report.decayedFiles.filter(d => d.severity === 'warning');
+    const info = report.decayedFiles.filter(d => d.severity === 'info');
+    const codeDrift = report.decayedFiles.filter(d => d.type === 'code_ahead_of_spec');
     if (critical.length > 0) {
         lines.push('### ❌ 严重（上下游不一致）');
         lines.push('');
@@ -170,6 +292,17 @@ function formatDecayReport(report) {
         }
         lines.push('');
     }
+    if (codeDrift.length > 0) {
+        lines.push('### 📝 代码先行（代码已改但 Spec 未同步）');
+        lines.push('');
+        for (const item of codeDrift) {
+            lines.push(`| \`${item.entityId}\` | ${item.title} | ${item.detail} |`);
+            if (item.affectedDownstream && item.affectedDownstream.length > 0) {
+                lines.push(`|   | 影响链: | ${item.affectedDownstream.join(' → ')} |`);
+            }
+        }
+        lines.push('');
+    }
     if (warning.length > 0) {
         lines.push('### ⚠️ 警告（内容已变更）');
         lines.push('');
@@ -178,6 +311,14 @@ function formatDecayReport(report) {
         }
         lines.push('');
     }
+    if (info.length > 0) {
+        lines.push('### ℹ️ 提示（轻微变更）');
+        lines.push('');
+        for (const item of info) {
+            lines.push(`| \`${item.entityId}\` | ${item.title} | ${item.detail} |`);
+        }
+        lines.push('');
+    }
     lines.push(`> 共 ${report.summary.total} 个实体，${report.summary.decayed} 个需关注`);
     return lines.join('\n');
 }

package/dist/core/decay-detector.js.map

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

package/dist/core/git-integration.d.ts

@@ -8,11 +8,59 @@
  *  - Git Hook 安装
  *  - 保护分支拦截
  */
+/**
+ * Git 配置 — 三级回退：子任务级 > 迭代级 > 全局级 > 默认值
+ *
+ * 继承链：命令行参数 > 子任务 .meta/git-config > 迭代级 PROJECT_GRAPH.md > 全局 CONSTITUTION.md > 默认值
+ */
+export interface GitConfig {
+    /** 默认基础分支（如 main/master） */
+    defaultBranch: string;
+    /** 分支类型（feature/bugfix/refactor/research），由任务 type 决定 */
+    branchType: string;
+    /** 分支前缀（如 2060708），三级回退 */
+    branchPrefix: string;
+    /** 分支命名格式模板 */
+    branchFormat: string;
+    /** 创建分支前是否自动 git pull */
+    autoPull: boolean;
+    /** 远程仓库名称 */
+    remoteName: string;
+    /** 保护分支列表 */
+    protectedBranches: string[];
+}
+/** 任务类型 → 分支类型映射 */
+export declare const TASK_TYPE_TO_BRANCH_TYPE: Record<string, string>;
 /**
  * 为任务创建 Git 分支
+ *
+ * 分支名按子任务级/迭代级/全局配置生成，支持自定义前缀和格式模板
+ * 三级回退：子任务 .meta/git-config > 迭代 PROJECT_GRAPH.md > 全局 CONSTITUTION.md
+ */
+export declare function createTaskBranch(taskId: string, taskName: string, baseBranch?: string, iteration?: string, taskDir?: string, taskType?: string): string | null;
+/**
+ * 读取子任务级 Git 配置
+ *
+ * 从任务 .meta/git-config 文件读取，格式（每行 key-value）：
+ *   分支前缀: 2060708
+ *   源分支: develop
+ *   分支格式: {type}/{prefix}{name}-{hash4}
+ *   自动拉取: true
+ */
+export declare function loadSubtaskGitConfig(taskDir: string): Partial<GitConfig>;
+/**
+ * 加载完整 Git 配置 — 子任务级 > 迭代级 > 全局 > 默认值
+ *
+ * 配置来源优先级：
+ * 1. 子任务级 .meta/git-config    任务自身配置
+ * 2. 迭代级 PROJECT_GRAPH.md      frontmatter 字段
+ * 3. 全局 CONSTITUTION.md          Git 分支策略章节
+ * 4. 默认值
+ *
+ * 每个字段独立回退：子任务只配了 branchPrefix，defaultBranch 仍从迭代/全局继承
  */
-export declare function createTaskBranch(taskId: string, taskName: string, baseBranch?: string, iteration?: string): string | null;
-/** 检测默认分支: 迭代配置 > CONSTITUTION > git remote > 本地 */
+export declare function loadGitConfig(iteration?: string, taskDir?: string): GitConfig;
+/** 检测默认分支 — 兼容旧接口，内部调用 loadGitConfig */
 export declare function detectDefaultBranch(iteration?: string): string | undefined;
 /**
  * 获取当前分支关联的任务

package/dist/core/git-integration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-integration.d.ts","sourceRoot":"","sources":["../../src/core/git-integration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAgBH;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA6BzH;AAED,oDAAoD;AACpD,wBAAgB,mBAAmB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAsC1E;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAQnF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAchG;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmB9E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,EAAE,CAc/C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAa7D;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA6E1E;AA2BD,6BAA6B;AAC7B,wBAAgB,eAAe,IAAI,OAAO,CAazC"}
+{"version":3,"file":"git-integration.d.ts","sourceRoot":"","sources":["../../src/core/git-integration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAiBH;;;;GAIG;AACH,MAAM,WAAW,SAAS;IACxB,4BAA4B;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,yDAAyD;IACzD,UAAU,EAAE,MAAM,CAAC;IACnB,2BAA2B;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,yBAAyB;IACzB,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa;IACb,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,oBAAoB;AACpB,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAK3D,CAAC;AAYF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI,CAyEf;AAuBD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CA4BxE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAgF7E;AAED,wCAAwC;AACxC,wBAAgB,mBAAmB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAmB1E;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAQnF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAchG;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmB9E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,EAAE,CAc/C;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAa7D;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CA6E1E;AA2BD,6BAA6B;AAC7B,wBAAgB,eAAe,IAAI,OAAO,CAazC"}

package/dist/core/git-integration.js

@@ -10,7 +10,10 @@
  *  - 保护分支拦截
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.TASK_TYPE_TO_BRANCH_TYPE = void 0;
 exports.createTaskBranch = createTaskBranch;
+exports.loadSubtaskGitConfig = loadSubtaskGitConfig;
+exports.loadGitConfig = loadGitConfig;
 exports.detectDefaultBranch = detectDefaultBranch;
 exports.getCurrentTaskMapping = getCurrentTaskMapping;
 exports.generateCommitMessage = generateCommitMessage;
@@ -22,19 +25,66 @@ exports.cleanStaleCache = cleanStaleCache;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
+const crypto_1 = require("crypto");
 const GIT_MAPPING_PATH = '.speccore/.git-mapping.json';
+/** 任务类型 → 分支类型映射 */
+exports.TASK_TYPE_TO_BRANCH_TYPE = {
+    feature: 'feature',
+    bugfix: 'bugfix',
+    refactor: 'refactor',
+    research: 'research',
+};
+const DEFAULT_GIT_CONFIG = {
+    defaultBranch: 'main',
+    branchType: 'feature',
+    branchPrefix: '',
+    branchFormat: '{type}/{prefix}{name}-{hash4}',
+    autoPull: false,
+    remoteName: 'origin',
+    protectedBranches: ['main', 'master'],
+};
 /**
  * 为任务创建 Git 分支
+ *
+ * 分支名按子任务级/迭代级/全局配置生成，支持自定义前缀和格式模板
+ * 三级回退：子任务 .meta/git-config > 迭代 PROJECT_GRAPH.md > 全局 CONSTITUTION.md
  */
-function createTaskBranch(taskId, taskName, baseBranch, iteration) {
+function createTaskBranch(taskId, taskName, baseBranch, iteration, taskDir, taskType) {
     try {
-        // 分支名 = taskId + 任务名精简（确保和目录名一致）
+        // 读取 Git 配置（子任务级 > 迭代级 > 全局 > 默认）
+        const gitConfig = loadGitConfig(iteration, taskDir);
+        // 任务类型 → 分支类型
+        const branchType = taskType
+            ? (exports.TASK_TYPE_TO_BRANCH_TYPE[taskType] || taskType)
+            : gitConfig.branchType;
+        // 任务名安全处理
         const safeName = taskName.replace(/[^a-zA-Z0-9\u4e00-\u9fff_-]/g, '-');
-        const branchName = `feature/${taskId}-${safeName}`.substring(0, 250);
-        // 确定 base 分支: 显式指定 > 依赖分支 > 迭代配置 > CONSTITUTION > git检测
+        // 4 位随机 hex hash
+        const hash4 = (0, crypto_1.randomBytes)(2).toString('hex');
+        // 前缀段：有值时追加连字符，无值时为空
+        const prefixSegment = gitConfig.branchPrefix ? `${gitConfig.branchPrefix}-` : '';
+        // 按格式模板生成分支名
+        const branchName = formatBranchName(gitConfig.branchFormat, {
+            type: branchType,
+            prefix: prefixSegment,
+            taskId,
+            name: safeName,
+            date: new Date().toISOString().slice(0, 10).replace(/-/g, ''),
+            hash4,
+        }).substring(0, 250);
+        // 确定 base 分支: 显式指定 > 子任务配置 > 迭代配置 > 全局 > git检测
         let effectiveBase = baseBranch;
         if (!effectiveBase) {
-            effectiveBase = detectDefaultBranch(iteration);
+            effectiveBase = gitConfig.defaultBranch;
+        }
+        // 自动拉取（如果配置开启）
+        if (gitConfig.autoPull && effectiveBase) {
+            try {
+                (0, child_process_1.execSync)(`git pull ${gitConfig.remoteName} "${effectiveBase}"`, { stdio: 'pipe' });
+            }
+            catch {
+                // pull 失败不阻断，继续创建分支
+            }
         }
         if (effectiveBase) {
             (0, child_process_1.execSync)(`git checkout "${effectiveBase}"`, { stdio: 'pipe' });
@@ -48,38 +98,178 @@ function createTaskBranch(taskId, taskName, baseBranch, iteration) {
     }
     catch (e) {
         // 分支已存在等非致命错误
-        if (e.message?.includes('already exists'))
-            return `feature/${taskId}`;
+        if (e.message?.includes('already exists')) {
+            const cfg = loadGitConfig(iteration, taskDir);
+            const bt = taskType ? (exports.TASK_TYPE_TO_BRANCH_TYPE[taskType] || taskType) : cfg.branchType;
+            const ps = cfg.branchPrefix ? `${cfg.branchPrefix}-` : '';
+            return formatBranchName(cfg.branchFormat, {
+                type: bt,
+                prefix: ps,
+                taskId,
+                name: '',
+                date: '',
+                hash4: '',
+            }).replace(/-{2,}/g, '-').replace(/-$/, '');
+        }
         return null;
     }
 }
-/** 检测默认分支: 迭代配置 > CONSTITUTION > git remote > 本地 */
-function detectDefaultBranch(iteration) {
-    // 1. 迭代级配置 (PROJECT_GRAPH.md 中 默认分支 字段)
+/**
+ * 按模板格式化分支名
+ *
+ * 支持变量: {type}, {prefix}, {taskId}, {name}, {date}, {hash4}
+ */
+function formatBranchName(template, vars) {
+    return template
+        .replace(/\{type\}/g, vars.type)
+        .replace(/\{prefix\}/g, vars.prefix)
+        .replace(/\{taskId\}/g, vars.taskId)
+        .replace(/\{name\}/g, vars.name)
+        .replace(/\{date\}/g, vars.date)
+        .replace(/\{hash4\}/g, vars.hash4)
+        .replace(/-{2,}/g, '-') // 清理连续连字符
+        .replace(/\/$/g, '') // 清理尾部斜杠
+        .replace(/^-|-$/g, ''); // 清理头尾连字符
+}
+/**
+ * 读取子任务级 Git 配置
+ *
+ * 从任务 .meta/git-config 文件读取，格式（每行 key-value）：
+ *   分支前缀: 2060708
+ *   源分支: develop
+ *   分支格式: {type}/{prefix}{name}-{hash4}
+ *   自动拉取: true
+ */
+function loadSubtaskGitConfig(taskDir) {
+    const config = {};
+    try {
+        const configPath = (0, path_1.join)(taskDir, '.meta', 'git-config');
+        if (!(0, fs_extra_1.existsSync)(configPath))
+            return config;
+        const content = (0, fs_extra_1.readFileSync)(configPath, 'utf-8');
+        // 分支前缀
+        const prefixMatch = content.match(/分支前缀[：:]\s*(\S+)/);
+        if (prefixMatch)
+            config.branchPrefix = prefixMatch[1];
+        // 源分支
+        const branchMatch = content.match(/源分支[：:]\s*(\S+)/);
+        if (branchMatch)
+            config.defaultBranch = branchMatch[1];
+        // 分支格式
+        const formatMatch = content.match(/分支格式[：:]\s*(.+)/);
+        if (formatMatch)
+            config.branchFormat = formatMatch[1].trim();
+        // 自动拉取
+        const pullMatch = content.match(/自动拉取[：:]\s*(\S+)/);
+        if (pullMatch)
+            config.autoPull = pullMatch[1] === 'true' || pullMatch[1] === '开启';
+        // 远程名称
+        const remoteMatch = content.match(/远程名称[：:]\s*(\S+)/);
+        if (remoteMatch)
+            config.remoteName = remoteMatch[1];
+    }
+    catch { }
+    return config;
+}
+/**
+ * 加载完整 Git 配置 — 子任务级 > 迭代级 > 全局 > 默认值
+ *
+ * 配置来源优先级：
+ * 1. 子任务级 .meta/git-config    任务自身配置
+ * 2. 迭代级 PROJECT_GRAPH.md      frontmatter 字段
+ * 3. 全局 CONSTITUTION.md          Git 分支策略章节
+ * 4. 默认值
+ *
+ * 每个字段独立回退：子任务只配了 branchPrefix，defaultBranch 仍从迭代/全局继承
+ */
+function loadGitConfig(iteration, taskDir) {
+    const config = {};
+    // ── 1. 读取全局 CONSTITUTION.md ──
+    try {
+        const constitutionPath = (0, path_1.join)('.speccore', 'CONSTITUTION.md');
+        if ((0, fs_extra_1.existsSync)(constitutionPath)) {
+            const content = (0, fs_extra_1.readFileSync)(constitutionPath, 'utf-8');
+            // 默认分支
+            const branchMatch = content.match(/默认分支[：:]\s*(\S+)/);
+            if (branchMatch)
+                config.defaultBranch = branchMatch[1];
+            // 任务分支前缀（从"任务分支: feature/{Task-ID}"提取前缀）
+            const taskBranchMatch = content.match(/任务分支[：:]\s*(\S+?)\//);
+            if (taskBranchMatch)
+                config.branchPrefix = taskBranchMatch[1];
+            // 保护分支
+            const protectMatch = content.match(/保护分支[：:]\s*(.+)/);
+            if (protectMatch) {
+                config.protectedBranches = protectMatch[1]
+                    .split(',')
+                    .map((s) => s.trim())
+                    .filter(Boolean);
+            }
+        }
+    }
+    catch { }
+    // ── 2. 迭代级 PROJECT_GRAPH.md 覆盖全局 ──
     if (iteration) {
         try {
             const iterGraphPath = (0, path_1.join)(`Iteration-${iteration}`, '000-overview', 'PROJECT_GRAPH.md');
-            if (require('fs').existsSync(iterGraphPath)) {
-                const content = require('fs').readFileSync(iterGraphPath, 'utf-8');
-                const match = content.match(/默认分支[：:]\s*(\S+)/);
-                if (match)
-                    return match[1];
+            if ((0, fs_extra_1.existsSync)(iterGraphPath)) {
+                const content = (0, fs_extra_1.readFileSync)(iterGraphPath, 'utf-8');
+                // 默认分支
+                const branchMatch = content.match(/默认分支[：:]\s*(\S+)/);
+                if (branchMatch && branchMatch[1] !== '继承全局配置') {
+                    config.defaultBranch = branchMatch[1];
+                }
+                // 分支前缀
+                const prefixMatch = content.match(/分支前缀[：:]\s*(\S+)/);
+                if (prefixMatch)
+                    config.branchPrefix = prefixMatch[1];
+                // 分支格式
+                const formatMatch = content.match(/分支格式[：:]\s*(.+)/);
+                if (formatMatch)
+                    config.branchFormat = formatMatch[1].trim();
+                // 自动拉取
+                const pullMatch = content.match(/自动拉取[：:]\s*(\S+)/);
+                if (pullMatch)
+                    config.autoPull = pullMatch[1] === 'true' || pullMatch[1] === '开启';
+                // 远程名称
+                const remoteMatch = content.match(/远程名称[：:]\s*(\S+)/);
+                if (remoteMatch)
+                    config.remoteName = remoteMatch[1];
             }
         }
         catch { }
     }
-    // 2. 全局 CONSTITUTION.md
-    try {
-        const constitutionPath = (0, path_1.join)('.speccore', 'CONSTITUTION.md');
-        if (require('fs').existsSync(constitutionPath)) {
-            const content = require('fs').readFileSync(constitutionPath, 'utf-8');
-            const match = content.match(/默认分支[：:]\s*(\S+)/);
-            if (match)
-                return match[1];
-        }
+    // ── 3. 子任务级 .meta/git-config 覆盖迭代级（每个字段独立判断） ──
+    if (taskDir) {
+        const subtaskConfig = loadSubtaskGitConfig(taskDir);
+        if (subtaskConfig.branchPrefix !== undefined)
+            config.branchPrefix = subtaskConfig.branchPrefix;
+        if (subtaskConfig.defaultBranch !== undefined)
+            config.defaultBranch = subtaskConfig.defaultBranch;
+        if (subtaskConfig.branchFormat !== undefined)
+            config.branchFormat = subtaskConfig.branchFormat;
+        if (subtaskConfig.autoPull !== undefined)
+            config.autoPull = subtaskConfig.autoPull;
+        if (subtaskConfig.remoteName !== undefined)
+            config.remoteName = subtaskConfig.remoteName;
     }
-    catch { }
-    // 3. git remote HEAD
+    // ── 4. 合并默认值 ──
+    return {
+        defaultBranch: config.defaultBranch || DEFAULT_GIT_CONFIG.defaultBranch,
+        branchType: config.branchType || DEFAULT_GIT_CONFIG.branchType,
+        branchPrefix: config.branchPrefix !== undefined ? config.branchPrefix : DEFAULT_GIT_CONFIG.branchPrefix,
+        branchFormat: config.branchFormat || DEFAULT_GIT_CONFIG.branchFormat,
+        autoPull: config.autoPull !== undefined ? config.autoPull : DEFAULT_GIT_CONFIG.autoPull,
+        remoteName: config.remoteName || DEFAULT_GIT_CONFIG.remoteName,
+        protectedBranches: config.protectedBranches || DEFAULT_GIT_CONFIG.protectedBranches,
+    };
+}
+/** 检测默认分支 — 兼容旧接口，内部调用 loadGitConfig */
+function detectDefaultBranch(iteration) {
+    const cfg = loadGitConfig(iteration);
+    if (cfg.defaultBranch)
+        return cfg.defaultBranch;
+    // 回退：git remote HEAD
     try {
         const remote = (0, child_process_1.execSync)('git remote show origin 2>/dev/null', { encoding: 'utf-8' });
         const headMatch = remote.match(/HEAD branch:\s*(\S+)/);
@@ -87,7 +277,7 @@ function detectDefaultBranch(iteration) {
             return headMatch[1];
     }
     catch { }
-    // 4. 本地分支
+    // 回退：本地分支
     try {
         const branches = (0, child_process_1.execSync)('git branch', { encoding: 'utf-8' });
         if (branches.includes('main') || branches.includes(' main'))