jarvis-agent-factory 3.45.7 → 3.46.1

package/README.md

@@ -1,7 +1,7 @@
 # Jarvis Agent Factory · 贾维斯智能体工厂
 
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue)](./LICENSE)
-[![Version](https://img.shields.io/badge/version-v3.45.7-green)](https://github.com/Wjl1224734792/Jarvis-Agent-Factory/releases)
+[![Version](https://img.shields.io/badge/version-v3.46.1-green)](https://github.com/Wjl1224734792/Jarvis-Agent-Factory/releases)
 [![npm](https://img.shields.io/npm/v/jarvis-agent-factory)](https://www.npmjs.com/package/jarvis-agent-factory)
 [![Visual Primitives MCP](https://img.shields.io/badge/DeepSeek-Visual%20Primitives%20MCP-purple)](https://github.com/Wjl1224734792/visual-primitives-mcp)
 <br>💡 **纯文本模型（如 DeepSeek）主力用户** → 搭配 [Visual Primitives MCP](https://github.com/Wjl1224734792/visual-primitives-mcp) 获得视觉理解能力
@@ -64,27 +64,28 @@ jarvis web                       # 启动 Web 面板（按需）
 ```
 docs/
 ├── tmp/                    # 临时产物（截图、快照、导出的验证数据等，已 .gitignore 排除）
-├── requirements/           # Gate A — 需求文档
-├── tasks/                  # Gate B — 任务分解文档
-├── architecture/           # Gate B1 — 架构评审产出
-├── plans/                  # Gate C — 执行计划文档
-├── implementation/         # Gate C-impl — 实现文档
-├── testing/                # Gate C2 — 测试文档与报告
-├── review/                 # Gate D — 评审报告
-└── shipping/               # Gate E — 发布记录
+├── YYYY-MM-DD/             # ★ 日期分类目录（唯一合法格式）
+│   ├── requirements/       # Gate A — 需求文档
+│   ├── tasks/              # Gate B — 任务分解文档
+│   ├── architecture/       # Gate B1 — 架构评审产出
+│   ├── plans/              # Gate C — 执行计划文档
+│   ├── implementation/     # Gate C-impl — 实现文档
+│   ├── testing/            # Gate C2 — 测试文档与报告
+│   ├── review/             # Gate D — 评审报告
+│   └── shipping/           # Gate E — 发布记录
 ```
 
 | 目录 | 对应 Gate | 说明 |
 |------|----------|------|
 | `docs/tmp/` | 全部 | 过程临时产物，不入版本库 |
-| `docs/requirements/` | Gate A | 需求澄清文档 |
-| `docs/tasks/` | Gate B | 任务分解文档 |
-| `docs/architecture/` | Gate B1 | 架构评审报告 |
-| `docs/plans/` | Gate C | 执行计划 |
-| `docs/implementation/` | Gate C-impl | 实现说明文档 |
-| `docs/testing/` | Gate C2 | 测试用例与报告 |
-| `docs/review/` | Gate D | 代码评审报告 |
-| `docs/shipping/` | Gate E | 发布记录与版本日志 |
+| `docs/YYYY-MM-DD/requirements/` | Gate A | 需求澄清文档 |
+| `docs/YYYY-MM-DD/tasks/` | Gate B | 任务分解文档 |
+| `docs/YYYY-MM-DD/architecture/` | Gate B1 | 架构评审报告 |
+| `docs/YYYY-MM-DD/plans/` | Gate C | 执行计划 |
+| `docs/YYYY-MM-DD/implementation/` | Gate C-impl | 实现说明文档 |
+| `docs/YYYY-MM-DD/testing/` | Gate C2 | 测试用例与报告 |
+| `docs/YYYY-MM-DD/review/` | Gate D | 代码评审报告 |
+| `docs/YYYY-MM-DD/shipping/` | Gate E | 发布记录与版本日志 |
 
 ## 架构
 
@@ -255,8 +256,8 @@ test-doc-writer → test-executor → fix-retest
 ## 生命周期流水线
 
 ```
-想法细化 → 需求澄清 → 任务分解 → 执行规划 → 并行实现 → 质量门 → 视觉验证 → 测试 → 评审 → 发布
-  Gate 0     Gate A     Gate B     Gate C     Gate C     Gate C1   Gate C1.5  Gate C2  Gate D  Gate E
+想法细化 → 需求澄清 → 任务分解 → 执行规划 → 并行实现 → 质量门 → 视觉验证 → 测试 → 评审 → 质量重检 → 发布
+  Gate 0     Gate A     Gate B     Gate C     Gate C     Gate C1   Gate C1.5  Gate C2  Gate D  Gate E(前置) Gate E
 ```
 
 ## 平台入口速查（Claude Code）
@@ -320,9 +321,12 @@ test-doc-writer → test-executor → fix-retest
 
 ## 发布流程
 
-**开发 → 测试 → 推送 main → 打 Tag → GitHub Actions 自动发布**
+**质量重检 → 测试 → 推送 main → 打 Tag → GitHub Actions 自动发布**
 
-1. 本地开发 + 测试通过：`npm run check && npm run build && cd web && npm run build`
+1. 🔴 **最终质量重检**（Gate E 前置条件，不可跳过）：
+   - Lint + Type-check + Build + Deps Audit 全部通过
+   - 测试套件全部通过（`npm test`）
+   - 失败 → 修复 → 重跑全部，最多 2 轮
 2. 更新 `package.json` 版本号（语义化版本）
 3. **同步更新 AGENTS.md / README.md / docs/README.md**
 4. 提交 + 打 Tag：`git tag -a v<version> -m "v<version> - <概要>"`
@@ -330,7 +334,7 @@ test-doc-writer → test-executor → fix-retest
 6. GitHub Actions：Release 工作流自动执行（质量检查 → Changelog → GitHub Release + 单 HTML 面板 → npm publish）
 7. 验证：`npm view jarvis-agent-factory version` 确认版本
 
-> 每次提交前自问：文档是否需要同步更新？
+> 每次提交前自问：文档是否需要同步更新？质量重检是否已通过？
 
 ## 命令流程图
 

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jarvis-agent-factory",
-  "version": "3.45.7",
+  "version": "3.46.1",
   "description": "Jarvis Agent Factory CLI — Claude Code 多智能体 AI 编程助手配置安装器 | Multi-agent AI coding assistant config installer for Claude Code",
   "keywords": [
     "jarvis",
@@ -38,7 +38,7 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit",
-    "build": "tsc && node scripts/copy-assets.js",
+    "build": "tsc && node -e \"import{cpSync}from'fs';cpSync('package.json','dist/package.json');cpSync('src/templates','dist/src/templates',{recursive:true})\"",
     "build:web": "cd web && npm run build",
     "dev": "tsx src/cli/index.ts",
     "jarvis": "node dist/src/cli/index.js",
@@ -64,7 +64,7 @@
     "tsx": "^4.19.0",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.59.2",
-    "vitest": "^4.1.5"
+    "vitest": "^4.1.6"
   },
   "lint-staged": {
     "*.ts": [

package/dist/src/cli/commands/diff.d.ts

@@ -1,5 +1,2 @@
 import type { CliOpts } from '../utils/args.js';
-/**
- * jarvis diff [path] — 预览升级变更（不实际执行）
- */
 export declare function execute(opts: CliOpts, positional: string[]): Promise<void>;

package/dist/src/cli/commands/diff.js

@@ -6,8 +6,187 @@ import { resolveScope } from '../utils/scope.js';
 import { resolveTarget } from '../utils/resolve.js';
 import { PLATFORMS, ALL_PLATFORMS, PKG_ROOT } from '../utils/constants.js';
 import { getHashFilePath } from '../../hash-paths.js';
+import { readFrontmatter, splitMarkdownSections, isSectionHashRecord } from '../../shared/markdown-utils.js';
 /**
- * 对比单个平台模板与已安装文件的差异
+ * 计算 Markdown 文件当前各 section 的 SHA256 hash 映射。
+ * @param filePath 文件绝对路径
+ * @returns section title → hash 映射
+ */
+function computeCurrentSectionHashes(filePath) {
+    try {
+        const content = readFileSync(filePath, 'utf-8');
+        const { sections } = splitMarkdownSections(content);
+        const result = {};
+        for (const s of sections) {
+            result[s.title] = s.hash;
+        }
+        return result;
+    }
+    catch {
+        return {};
+    }
+}
+// ============================================================================
+// diffJsonConfig — JSON 字段级差异对比
+// ============================================================================
+/**
+ * 深度对比两个 JSON 对象，返回字段级差异列表。
+ * @param template 模板对象（新版）
+ * @param target 目标对象（已安装版）
+ * @param prefix 当前字段路径前缀（用于递归拼接）
+ * @returns 差异描述行列表（含缩进前缀）
+ */
+function diffJsonConfig(template, target, prefix) {
+    const diffs = [];
+    const allKeys = new Set([...Object.keys(template), ...Object.keys(target)]);
+    for (const key of allKeys) {
+        const fullPath = prefix ? `${prefix}.${key}` : key;
+        const inTemplate = key in template;
+        const inTarget = key in target;
+        if (!inTarget) {
+            // 目标中不存在此字段 → 来自模板的新增字段
+            diffs.push(`     + ${fullPath}`);
+        }
+        else if (!inTemplate) {
+            // 模板中不存在此字段 → 模板已移除此字段
+            diffs.push(`     - ${fullPath}`);
+        }
+        else {
+            const tv = template[key];
+            const tg = target[key];
+            const isTvObj = typeof tv === 'object' && tv !== null && !Array.isArray(tv);
+            const isTgObj = typeof tg === 'object' && tg !== null && !Array.isArray(tg);
+            if (isTvObj && isTgObj) {
+                // 双方都是纯对象 → 递归对比
+                diffs.push(...diffJsonConfig(tv, tg, fullPath));
+            }
+            else if (JSON.stringify(tv) !== JSON.stringify(tg)) {
+                // 值不同 → 已修改
+                diffs.push(`     ~ ${fullPath}  (已修改)`);
+            }
+        }
+    }
+    return diffs;
+}
+// ============================================================================
+// 冲突文件扫描
+// ============================================================================
+/**
+ * 递归扫描目录及子目录，查找所有包含未解决冲突标记（<<<<<<< user）的文件。
+ * 仅检查 .md 和 .json 文件，跳过隐藏目录和 node_modules。
+ * @param root 搜索根目录
+ * @returns 冲突文件的相对路径列表（相对于 root）
+ */
+function scanConflictFiles(root) {
+    const conflicts = [];
+    let scanned = 0;
+    const MAX_SCAN = 200;
+    /** 检查单个文件是否含冲突标记并记录 */
+    function checkFileForConflict(fullPath) {
+        if (hasConflictMarker(fullPath)) {
+            conflicts.push(fullPath.substring(root.length + 1));
+        }
+    }
+    /** 递归扫描子目录 */
+    function scanDir(dir) {
+        if (scanned >= MAX_SCAN)
+            return;
+        let entries;
+        try {
+            entries = readdirSync(dir);
+        }
+        catch {
+            return;
+        }
+        for (const entry of entries) {
+            if (scanned >= MAX_SCAN)
+                return;
+            if (entry.startsWith('.') || entry === 'node_modules')
+                continue;
+            const fullPath = join(dir, entry);
+            let isDir;
+            try {
+                isDir = statSync(fullPath).isDirectory();
+            }
+            catch {
+                continue;
+            }
+            if (isDir) {
+                scanDir(fullPath);
+            }
+            else if (entry.endsWith('.md') || entry.endsWith('.json')) {
+                scanned++;
+                checkFileForConflict(fullPath);
+            }
+        }
+    }
+    scanDir(root);
+    return conflicts;
+}
+// ============================================================================
+// Markdown section 差异计算
+// ============================================================================
+/**
+ * 三向对比 section hash，返回差异描述列表。
+ * 源 hash（srcHash）对比旧记录 hash（oldHash）和目标 hash（dstHash）：
+ * - 源未记录 → 删除；旧未记录 → 新增
+ * - 源变 + 目标变 → 冲突；仅源变 → 修改
+ *
+ * @param oldSections 旧 hash 记录中的 section 映射
+ * @param srcSecHashes 当前模板 section hash 映射
+ * @param dstSecHashes 当前已安装文件 section hash 映射
+ * @returns 差异描述行列表
+ */
+function diffSectionChanges(oldSections, srcSecHashes, dstSecHashes) {
+    const diffs = [];
+    const allTitles = new Set([...Object.keys(oldSections), ...Object.keys(srcSecHashes)]);
+    for (const title of allTitles) {
+        const oldHash = oldSections[title];
+        const srcHash = srcSecHashes[title];
+        const dstHash = dstSecHashes[title];
+        if (!srcHash) {
+            diffs.push(`     §  ## ${title}  删除`);
+        }
+        else if (!oldHash) {
+            diffs.push(`     §  ## ${title}  新增`);
+        }
+        else if (srcHash !== oldHash && dstHash && dstHash !== oldHash) {
+            diffs.push(`     §  ## ${title}  冲突`);
+        }
+        else if (srcHash !== oldHash) {
+            diffs.push(`     §  ## ${title}  修改`);
+        }
+        // srcHash === oldHash → 源未变，忽略
+    }
+    return diffs;
+}
+// ============================================================================
+// diffPlatform — 对比单个平台模板与已安装文件的差异
+// ============================================================================
+/**
+ * 检查文件是否包含未解决的冲突标记（<<<<<<< user）。
+ * @param filePath 文件绝对路径
+ * @returns 含冲突标记返回 true，读取失败返回 false
+ */
+function hasConflictMarker(filePath) {
+    try {
+        return readFileSync(filePath, 'utf-8').includes('<<<<<<< user');
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 对比单个平台模板与已安装文件的差异（增强版）。
+ * - Markdown 文件（v2 section hash）：显示 version diff + section 级差异
+ * - JSON 配置文件：显示字段级差异
+ * - 旧 hash 格式（字符串）：降级为文件级展示
+ * - 汇总冲突文件
+ *
+ * @param platform 平台名称
+ * @param target 项目根目录
+ * @param isGlobal 是否为全局安装
+ * @returns 该平台下检测到的冲突文件相对路径列表（用于末尾汇总）
  */
 async function diffPlatform(platform, target, isGlobal) {
     const srcRoot = resolve(PKG_ROOT, 'dist/src', 'templates', 'platforms', platform);
@@ -17,13 +196,20 @@ async function diffPlatform(platform, target, isGlobal) {
             : resolve(homedir(), `.${platform}`))
         : resolve(target, PLATFORMS[platform].dir);
     if (!existsSync(srcRoot))
-        return;
+        return [];
     const hashFile = getHashFilePath(target, isGlobal);
     const hashes = existsSync(hashFile)
         ? JSON.parse(readFileSync(hashFile, 'utf-8'))
         : {};
-    const hash = (f) => createHash('sha256').update(readFileSync(f)).digest('hex');
-    let changed = 0;
+    /** 计算文件整文件 SHA256 hash */
+    const fileHash = (f) => createHash('sha256').update(readFileSync(f)).digest('hex');
+    let totalChanged = 0;
+    let shownCount = 0;
+    const MAX_SHOW = 30;
+    const conflictFiles = [];
+    // ═══════════════════════════════════════════════════════════════
+    // 第一步：遍历 agents / commands / skills buckets
+    // ═══════════════════════════════════════════════════════════════
     for (const bucket of ['agents', 'commands', 'skills']) {
         const sd = join(srcRoot, bucket);
         const dd = join(destRoot, bucket);
@@ -35,43 +221,187 @@ async function diffPlatform(platform, target, isGlobal) {
             if (statSync(sp).isDirectory())
                 continue;
             const rel = `${bucket}/${entry}`;
-            const newHash = hash(sp);
+            const newHash = fileHash(sp);
+            const oldHashRecord = hashes[dp];
+            // ── 场景 A：新文件（目标中不存在）──
             if (!existsSync(dp)) {
-                if (changed < 20)
-                    console.log(`  + ${rel.padEnd(30)} (new)`);
-                changed++;
+                if (shownCount < MAX_SHOW) {
+                    const srcFm = entry.endsWith('.md') ? readFrontmatter(sp) : null;
+                    const verExtra = srcFm && srcFm.version !== '0.0.0'
+                        ? `, version: ${srcFm.version}`
+                        : '';
+                    console.log(`  +  ${rel.padEnd(40)} (新增${verExtra})`);
+                    shownCount++;
+                }
+                totalChanged++;
                 continue;
             }
-            const oldHash = hashes[dp];
-            if (newHash !== oldHash) {
-                if (changed < 20) {
-                    const destHash = hash(dp);
-                    const status = !oldHash || destHash === oldHash
-                        ? 'update'
-                        : 'skip (modified by user)';
-                    console.log(`  ~ ${rel.padEnd(30)} ${status}`);
+            const destHash = fileHash(dp);
+            // 整文件未变化 → 跳过
+            if (newHash === destHash)
+                continue;
+            const isV2 = isSectionHashRecord(oldHashRecord);
+            // ── 场景 B：Markdown section 级 diff（v2 hash 记录）──
+            if (entry.endsWith('.md') && isV2) {
+                const srcFm = readFrontmatter(sp);
+                const destFm = readFrontmatter(dp);
+                const oldSections = oldHashRecord.sections;
+                const secDiffs = diffSectionChanges(oldSections, computeCurrentSectionHashes(sp), computeCurrentSectionHashes(dp));
+                // 版本对比
+                const srcVer = srcFm.version || '0.0.0';
+                const destVer = destFm.version || '0.0.0';
+                const verInfo = srcVer !== destVer ? ` (version: ${destVer} → ${srcVer})` : '';
+                if (shownCount < MAX_SHOW) {
+                    const label = secDiffs.length > 0 ? verInfo : (verInfo || ' (preamble 变更)');
+                    console.log(`  M  ${rel.padEnd(40)}${label}`);
+                    secDiffs.forEach(d => console.log(d));
+                    shownCount++;
                 }
-                changed++;
+                totalChanged++;
+                // 内联检测冲突标记
+                if (hasConflictMarker(dp))
+                    conflictFiles.push(rel);
+            }
+            else {
+                // ── 场景 C：文件级 diff（旧 hash 格式或非 markdown）──
+                // 降级为文件级展示，保持向后兼容
+                const canUpdate = typeof oldHashRecord === 'string' && destHash === oldHashRecord;
+                const status = typeof oldHashRecord === 'undefined' || canUpdate
+                    ? '(更新)'
+                    : '(跳过, 用户已修改)';
+                if (shownCount < MAX_SHOW) {
+                    console.log(`  M  ${rel.padEnd(40)} ${status}`);
+                    shownCount++;
+                }
+                totalChanged++;
+            }
+        }
+        // ── 检测目标中存在但模板中已删除的文件 ──
+        const srcFileSet = new Set(existsSync(sd) ? readdirSync(sd).filter(e => !statSync(join(sd, e)).isDirectory()) : []);
+        for (const entry of readdirSync(dd)) {
+            if (statSync(join(dd, entry)).isDirectory())
+                continue;
+            if (!srcFileSet.has(entry)) {
+                const dp = join(dd, entry);
+                const oldHashRecord = hashes[dp];
+                if (typeof oldHashRecord === 'undefined')
+                    continue;
+                // 仅当有旧 hash 记录时（曾由 Jarvis 安装）才标记为删除
+                const rel = `${bucket}/${entry}`;
+                if (shownCount < MAX_SHOW) {
+                    console.log(`  -  ${rel.padEnd(40)} (模板已移除)`);
+                    shownCount++;
+                }
+                totalChanged++;
             }
         }
     }
-    if (changed === 0) {
+    // ═══════════════════════════════════════════════════════════════
+    // 第二步：模板根级别 JSON 配置文件（如 settings.json）
+    // ═══════════════════════════════════════════════════════════════
+    for (const entry of readdirSync(srcRoot)) {
+        const sp = join(srcRoot, entry);
+        if (statSync(sp).isDirectory())
+            continue;
+        if (!entry.endsWith('.json'))
+            continue;
+        if (entry.startsWith('settings.local'))
+            continue;
+        const dp = join(destRoot, entry);
+        if (!existsSync(dp)) {
+            if (shownCount < MAX_SHOW) {
+                console.log(`  +  ${entry.padEnd(40)} (新增配置文件)`);
+                shownCount++;
+            }
+            totalChanged++;
+            continue;
+        }
+        try {
+            const srcJson = JSON.parse(readFileSync(sp, 'utf-8'));
+            const destJson = JSON.parse(readFileSync(dp, 'utf-8'));
+            const diffs = diffJsonConfig(srcJson, destJson, '');
+            if (diffs.length > 0) {
+                if (shownCount < MAX_SHOW) {
+                    console.log(`  M  ${entry.padEnd(40)}`);
+                    diffs.forEach(d => console.log(d));
+                    shownCount++;
+                }
+                totalChanged++;
+            }
+        }
+        catch {
+            // JSON 解析失败 → 降级为文件级对比
+            const newHash = fileHash(sp);
+            const destHash = fileHash(dp);
+            if (newHash !== destHash) {
+                if (shownCount < MAX_SHOW) {
+                    console.log(`  M  ${entry.padEnd(40)} (JSON 差异)`);
+                    shownCount++;
+                }
+                totalChanged++;
+            }
+        }
+    }
+    // ═══════════════════════════════════════════════════════════════
+    // 第三步：输出摘要
+    // ═══════════════════════════════════════════════════════════════
+    if (totalChanged === 0) {
         console.log(`  ✅ ${platform.padEnd(10)} up to date`);
     }
-    else if (changed > 20) {
-        console.log(`  ... and ${changed - 20} more files`);
+    else if (totalChanged > shownCount) {
+        console.log(`  ... 还有 ${totalChanged - shownCount} 个文件未显示`);
     }
+    return conflictFiles;
 }
+// ============================================================================
+// execute — jarvis diff 入口
+// ============================================================================
 /**
  * jarvis diff [path] — 预览升级变更（不实际执行）
+ *
+ * 增强输出：
+ * - Markdown 文件：显示 version diff + section 级差异
+ * - JSON 配置文件：显示字段级差异
+ * - 末尾：冲突文件汇总
+ * - 向后兼容：旧 hash 格式降级为文件级展示
+ */
+/**
+ * 计算指定平台的已安装目标根目录。
+ * 逻辑与 diffPlatform 内 destRoot 计算保持一致。
  */
+function getDestRoot(platform, target, isGlobal) {
+    return isGlobal
+        ? (platform === 'opencode'
+            ? resolve(homedir(), '.config', 'opencode')
+            : resolve(homedir(), `.${platform}`))
+        : resolve(target, PLATFORMS[platform].dir);
+}
 export async function execute(opts, positional) {
     const path = positional[1];
     const isGlobal = await resolveScope(opts);
     const target = resolveTarget(path, isGlobal);
     console.log(`\n📋 检查变更预览 → ${isGlobal ? '~ (全局)' : target}\n`);
+    const allConflicts = [];
     for (const name of ALL_PLATFORMS) {
-        await diffPlatform(name, target, isGlobal);
+        // 内联冲突检测（来自 diff 过程中的 section 对比）
+        const platformConflicts = await diffPlatform(name, target, isGlobal);
+        for (const cf of platformConflicts) {
+            allConflicts.push(cf);
+        }
+        // 全面扫描冲突标记（覆盖未变更但含冲突标记的文件）
+        const destRoot = getDestRoot(name, target, isGlobal);
+        const scannedConflicts = scanConflictFiles(destRoot);
+        for (const cf of scannedConflicts) {
+            allConflicts.push(cf);
+        }
+    }
+    // ── 冲突文件汇总（去重后末尾统一展示）──
+    const uniqueConflicts = [...new Set(allConflicts)];
+    if (uniqueConflicts.length > 0) {
+        console.log(`\n冲突文件 (${uniqueConflicts.length}):`);
+        for (const file of uniqueConflicts) {
+            console.log(`  ⚠ ${file}`);
+        }
     }
     console.log(`\n💡 运行 \`jarvis upgrade\` 应用这些变更。\n`);
 }

package/dist/src/cli/commands/diff.js.map

@@ -1 +1 @@
-{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../src/cli/commands/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD;;GAEG;AACH,KAAK,UAAU,YAAY,CACzB,QAAgB,EAChB,MAAc,EACd,QAAiB;IAEjB,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAElF,MAAM,QAAQ,GAAG,QAAQ;QACvB,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU;YACxB,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC;YAC3C,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;IAE7C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO;IAEjC,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC;QACjC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,EAAE,CACzB,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE7D,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;QACtD,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACjC,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAAE,SAAS;QAEjD,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;YACpC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC3B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC3B,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE;gBAAE,SAAS;YAEzC,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;YAEzB,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;gBACpB,IAAI,OAAO,GAAG,EAAE;oBAAE,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;gBAC7D,OAAO,EAAE,CAAC;gBACV,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;YAC3B,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;gBACxB,IAAI,OAAO,GAAG,EAAE,EAAE,CAAC;oBACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC1B,MAAM,MAAM,GACV,CAAC,OAAO,IAAI,QAAQ,KAAK,OAAO;wBAC9B,CAAC,CAAC,QAAQ;wBACV,CAAC,CAAC,yBAAyB,CAAC;oBAChC,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC;gBACjD,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,OAAO,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC;IACvD,CAAC;SAAM,IAAI,OAAO,GAAG,EAAE,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,GAAG,EAAE,aAAa,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAa,EAAE,UAAoB;IAC/D,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE7C,OAAO,CAAC,GAAG,CAAC,iBAAiB,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IAE/D,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../../../src/cli/commands/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAG7G;;;;GAIG;AACH,SAAS,2BAA2B,CAAC,QAAgB;IACnD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,EAAE,QAAQ,EAAE,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,MAAM,GAA2B,EAAE,CAAC;QAC1C,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QAC3B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,+EAA+E;AAC/E,gCAAgC;AAChC,+EAA+E;AAE/E;;;;;;GAMG;AACH,SAAS,cAAc,CACrB,QAAiC,EACjC,MAA+B,EAC/B,MAAc;IAEd,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE5E,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QACnD,MAAM,UAAU,GAAG,GAAG,IAAI,QAAQ,CAAC;QACnC,MAAM,QAAQ,GAAG,GAAG,IAAI,MAAM,CAAC;QAE/B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,wBAAwB;YACxB,KAAK,CAAC,IAAI,CAAC,UAAU,QAAQ,EAAE,CAAC,CAAC;QACnC,CAAC;aAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACvB,uBAAuB;YACvB,KAAK,CAAC,IAAI,CAAC,UAAU,QAAQ,EAAE,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;YACzB,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACvB,MAAM,OAAO,GAAG,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAE5E,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;gBACvB,iBAAiB;gBACjB,KAAK,CAAC,IAAI,CAAC,GAAG,cAAc,CAC1B,EAA6B,EAC7B,EAA6B,EAC7B,QAAQ,CACT,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;gBACrD,YAAY;gBACZ,KAAK,CAAC,IAAI,CAAC,UAAU,QAAQ,SAAS,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,+EAA+E;AAC/E,SAAS;AACT,+EAA+E;AAE/E;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,IAAY;IACrC,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,MAAM,QAAQ,GAAG,GAAG,CAAC;IAErB,uBAAuB;IACvB,SAAS,oBAAoB,CAAC,QAAgB;QAC5C,IAAI,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED,cAAc;IACd,SAAS,OAAO,CAAC,GAAW;QAC1B,IAAI,OAAO,IAAI,QAAQ;YAAE,OAAO;QAChC,IAAI,OAAiB,CAAC;QACtB,IAAI,CAAC;YAAC,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO;QAAC,CAAC;QAErD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,OAAO,IAAI,QAAQ;gBAAE,OAAO;YAChC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,cAAc;gBAAE,SAAS;YAEhE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAClC,IAAI,KAAc,CAAC;YACnB,IAAI,CAAC;gBAAC,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC;gBAAC,SAAS;YAAC,CAAC;YAErE,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,QAAQ,CAAC,CAAC;YACpB,CAAC;iBAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5D,OAAO,EAAE,CAAC;gBACV,oBAAoB,CAAC,QAAQ,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,CAAC;IACd,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,+EAA+E;AAC/E,wBAAwB;AACxB,+EAA+E;AAE/E;;;;;;;;;;GAUG;AACH,SAAS,kBAAkB,CACzB,WAAmC,EACnC,YAAoC,EACpC,YAAoC;IAEpC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAEvF,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QAEpC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACpB,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,OAAO,KAAK,OAAO,IAAI,OAAO,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YACjE,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YAC/B,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC;QACxC,CAAC;QACD,+BAA+B;IACjC,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,+EAA+E;AAC/E,mCAAmC;AACnC,+EAA+E;AAE/E;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,QAAgB;IACzC,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,KAAK,UAAU,YAAY,CACzB,QAAgB,EAChB,MAAc,EACd,QAAiB;IAEjB,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAElF,MAAM,QAAQ,GAAG,QAAQ;QACvB,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU;YACxB,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC;YAC3C,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;IAE7C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC;IAEpC,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACnD,MAAM,MAAM,GAA4B,UAAU,CAAC,QAAQ,CAAC;QAC1D,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC,CAAC,EAAE,CAAC;IAEP,0BAA0B;IAC1B,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAU,EAAE,CACrC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE7D,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,aAAa,GAAa,EAAE,CAAC;IAEnC,kEAAkE;IAClE,4CAA4C;IAC5C,kEAAkE;IAElE,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;QACtD,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACjC,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAAE,SAAS;QAEjD,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;YACpC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC3B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC3B,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE;gBAAE,SAAS;YAEzC,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC7B,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;YAEjC,wBAAwB;YACxB,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;gBACpB,IAAI,UAAU,GAAG,QAAQ,EAAE,CAAC;oBAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBACjE,MAAM,QAAQ,GAAG,KAAK,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO;wBACjD,CAAC,CAAC,cAAc,KAAK,CAAC,OAAO,EAAE;wBAC/B,CAAC,CAAC,EAAE,CAAC;oBACP,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,QAAQ,GAAG,CAAC,CAAC;oBACtD,UAAU,EAAE,CAAC;gBACf,CAAC;gBACD,YAAY,EAAE,CAAC;gBACf,SAAS;YACX,CAAC;YAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;YAE9B,cAAc;YACd,IAAI,OAAO,KAAK,QAAQ;gBAAE,SAAS;YAEnC,MAAM,IAAI,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;YAEhD,gDAAgD;YAChD,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;gBAClC,MAAM,KAAK,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;gBAClC,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;gBACnC,MAAM,WAAW,GAAI,aAAsD,CAAC,QAAQ,CAAC;gBAErF,MAAM,QAAQ,GAAG,kBAAkB,CACjC,WAAW,EACX,2BAA2B,CAAC,EAAE,CAAC,EAC/B,2BAA2B,CAAC,EAAE,CAAC,CAChC,CAAC;gBAEF,OAAO;gBACP,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC;gBACxC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC;gBAC1C,MAAM,OAAO,GAAG,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,cAAc,OAAO,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBAE/E,IAAI,UAAU,GAAG,QAAQ,EAAE,CAAC;oBAC1B,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC;oBAC5E,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;oBAC9C,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACtC,UAAU,EAAE,CAAC;gBACf,CAAC;gBACD,YAAY,EAAE,CAAC;gBAEf,WAAW;gBACX,IAAI,iBAAiB,CAAC,EAAE,CAAC;oBAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrD,CAAC;iBAAM,CAAC;gBACN,2CAA2C;gBAC3C,kBAAkB;gBAClB,MAAM,SAAS,GAAG,OAAO,aAAa,KAAK,QAAQ,IAAI,QAAQ,KAAK,aAAa,CAAC;gBAClF,MAAM,MAAM,GAAG,OAAO,aAAa,KAAK,WAAW,IAAI,SAAS;oBAC9D,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,aAAa,CAAC;gBAElB,IAAI,UAAU,GAAG,QAAQ,EAAE,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC;oBAChD,UAAU,EAAE,CAAC;gBACf,CAAC;gBACD,YAAY,EAAE,CAAC;YACjB,CAAC;QACH,CAAC;QAED,0BAA0B;QAC1B,MAAM,UAAU,GAAG,IAAI,GAAG,CACxB,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CACxF,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;YACpC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE;gBAAE,SAAS;YACtD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC3B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;gBAC3B,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;gBACjC,IAAI,OAAO,aAAa,KAAK,WAAW;oBAAE,SAAS;gBACnD,oCAAoC;gBACpC,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC;gBACjC,IAAI,UAAU,GAAG,QAAQ,EAAE,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;oBAC9C,UAAU,EAAE,CAAC;gBACf,CAAC;gBACD,YAAY,EAAE,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC;IAED,kEAAkE;IAClE,uCAAuC;IACvC,kEAAkE;IAElE,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;QACzC,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChC,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE;YAAE,SAAS;QACzC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC;YAAE,SAAS;QACvC,IAAI,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAAE,SAAS;QAEjD,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;YACpB,IAAI,UAAU,GAAG,QAAQ,EAAE,CAAC;gBAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;gBACjD,UAAU,EAAE,CAAC;YACf,CAAC;YACD,YAAY,EAAE,CAAC;YACf,SAAS;QACX,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;YACvD,MAAM,KAAK,GAAG,cAAc,CAC1B,OAAkC,EAClC,QAAmC,EACnC,EAAE,CACH,CAAC;YAEF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,IAAI,UAAU,GAAG,QAAQ,EAAE,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;oBACxC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnC,UAAU,EAAE,CAAC;gBACf,CAAC;gBACD,YAAY,EAAE,CAAC;YACjB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,uBAAuB;YACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC9B,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACzB,IAAI,UAAU,GAAG,QAAQ,EAAE,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;oBAClD,UAAU,EAAE,CAAC;gBACf,CAAC;gBACD,YAAY,EAAE,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC;IAED,kEAAkE;IAClE,WAAW;IACX,kEAAkE;IAElE,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,OAAO,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC;IACvD,CAAC;SAAM,IAAI,YAAY,GAAG,UAAU,EAAE,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,YAAY,YAAY,GAAG,UAAU,SAAS,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,+EAA+E;AAC/E,2BAA2B;AAC3B,+EAA+E;AAE/E;;;;;;;;GAQG;AACH;;;GAGG;AACH,SAAS,WAAW,CAAC,QAAgB,EAAE,MAAc,EAAE,QAAiB;IACtE,OAAO,QAAQ;QACb,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU;YACxB,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC;YAC3C,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,QAAQ,EAAE,CAAC,CAAC;QACvC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAa,EAAE,UAAoB;IAC/D,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE7C,OAAO,CAAC,GAAG,CAAC,iBAAiB,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAa,EAAE,CAAC;IAElC,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,kCAAkC;QAClC,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACrE,KAAK,MAAM,EAAE,IAAI,iBAAiB,EAAE,CAAC;YACnC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;QAED,2BAA2B;QAC3B,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QACrD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACrD,KAAK,MAAM,EAAE,IAAI,gBAAgB,EAAE,CAAC;YAClC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,yBAAyB;IACzB,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IACnD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,WAAW,eAAe,CAAC,MAAM,IAAI,CAAC,CAAC;QACnD,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;AACtD,CAAC"}

package/dist/src/cli/commands/resolve.d.ts

@@ -0,0 +1,12 @@
+import type { CliOpts } from '../utils/args.js';
+/**
+ * jarvis resolve — 交互式和批量模式解决合并冲突。
+ *
+ * 用法：
+ *   jarvis resolve <file>                 交互式逐冲突选择
+ *   jarvis resolve <file> --accept user   保留所有用户版本
+ *   jarvis resolve <file> --accept template  使用所有模板版本
+ *   jarvis resolve --all --accept user|template  批量解决
+ *   jarvis resolve --list                 列出所有冲突文件
+ */
+export declare function execute(opts: CliOpts, positional: string[]): Promise<void>;