dsh-taskboard 0.4.5 → 0.5.1

package/lib/host/git.js.map

@@ -1 +1 @@
-{"version":3,"file":"git.js","names":[],"sources":["../../src/host/git.ts"],"sourcesContent":["/**\n * Host git face (0.3.0): the ONLY place dsh-taskboard shells out to git.\n * 0.3.1: per-repo serialization of structural operations, binary probing,\n * no-op merge detection, worktree REUSE mode, and evidence size caps.\n *\n * Design invariants (plan §3.4/§3.5):\n * - NARROW interface: detect / binaryAvailable / prepareWorktree / collect /\n *   merge / isAncestor / removeWorktree / deleteBranch — nothing else leaks\n *   into the plugin.\n * - FAIL-SOFT: every call has a timeout and resolves to a benign result\n *   (false / undefined / empty facts) on ANY git failure — a missing git,\n *   a locked worktree, or a damaged repo degrades execution to the original\n *   directory and NEVER fails the ledger or the run pipeline. Only the\n *   explicit user actions (merge / remove / deleteBranch) throw, with a\n *   readable message the GUI surfaces as-is.\n * - SERIALIZED structural ops: concurrent isolated executions on the SAME\n *   repository would race on git's index/worktree locks, so every structural\n *   operation (prepareWorktree / merge / removeWorktree / deleteBranch) runs\n *   inside a per-root in-process mutex. Read-only collects stay concurrent.\n * - INJECTABLE runner: the exec layer is a single function so unit tests\n *   script every path without a real git.\n *\n * @module dsh-taskboard/host/git\n */\nimport type { CommitInfo } from '../shared/protocol.ts'\n\n/** Timeout for quick read-only queries (rev-parse / status / log / diff). */\nconst QUICK_TIMEOUT_MS = 2_000\n\n/** Timeout for structural operations (worktree add/remove, merge, branch). */\nconst HEAVY_TIMEOUT_MS = 15_000\n\n/** Directory under a workspace where task worktrees live. */\nexport const WORKTREE_DIR = '.dsh-worktrees'\n\n/** Evidence caps: commits kept per execution record (newest first). */\nexport const MAX_COMMIT_EVIDENCE = 50\n\n/** Evidence caps: uncommitted-change lines kept per execution record. */\nexport const MAX_DIRTY_EVIDENCE = 100\n\n/** Diff viewer caps (0.4.0): raw text kept per view. */\nexport const MAX_DIFF_BYTES = 128 * 1024\n\n/** Diff viewer caps: lines kept per view. */\nexport const MAX_DIFF_LINES = 2_000\n\n/** One capped, read-only diff view (diff viewer, 0.4.0). */\nexport interface DiffResult {\n  text: string\n  truncated: boolean\n}\n\n/** Cap one diff payload by bytes and lines (in order, marking truncation). */\nfunction capDiff(out: string): DiffResult {\n  let text = out\n  let truncated = false\n  if (text.length > MAX_DIFF_BYTES) {\n    text = text.slice(0, MAX_DIFF_BYTES)\n    truncated = true\n  }\n  const lines = text.split('\\n')\n  if (lines.length > MAX_DIFF_LINES) {\n    text = lines.slice(0, MAX_DIFF_LINES).join('\\n')\n    truncated = true\n  }\n  return { text, truncated }\n}\n\n/** A plausible git object hash (defense against option injection). */\nfunction isHash(hash: string): boolean {\n  return /^[0-9a-f]{4,64}$/i.test(hash)\n}\n\n/** Result of one underlying exec: `ok` is exit-0, output never null. */\nexport interface ExecResult { ok: boolean; stdout: string; stderr: string }\n\n/** The injectable exec layer: run `git <args>` under a cwd with a timeout. */\nexport type ExecFn = (args: string[], options: { cwd?: string; timeout?: number }) => Promise<ExecResult>\n\n/** Facts needed to open an isolated execution. */\nexport interface WorktreeInfo {\n  /** Absolute worktree path (the session's cwd). */\n  path: string\n  /** The task branch checked out there. */\n  branch: string\n  /** Baseline for evidence collection: main HEAD (fresh) or worktree HEAD (reuse). */\n  baseCommit: string\n  /** True when an existing live worktree was kept as-is (续跑). */\n  reused?: boolean\n}\n\n/** Settlement facts collected from a worktree (partial on best-effort basis). */\nexport interface SettlementFacts {\n  headCommit?: string\n  commits: CommitInfo[]\n  /** Total commits before capping (equals commits.length when under the cap). */\n  commitsTotal: number\n  dirtyFiles: string[]\n  /** Total uncommitted lines before capping. */\n  dirtyFilesTotal: number\n  diffStat?: string\n  changedFiles: number\n}\n\n/** The narrow git face the rest of the plugin depends on. */\nexport interface GitFace {\n  /** Whether `root` sits inside a usable git work tree (fail-soft → false). */\n  detect(root: string): Promise<boolean>\n  /** Whether a usable git binary answers at all (distinguishes 未装 git vs 非 git 仓库). */\n  binaryAvailable(): Promise<boolean>\n  /**\n   * Ensure a worktree at `path` on `branch`. Default mode `'fresh'` resets to\n   * the main worktree's current HEAD (每次全新); mode `'reuse'` keeps a live\n   * worktree exactly as-is (续跑 — agent's commits and uncommitted changes\n   * survive) and falls back to a fresh creation when none is alive. Resolves\n   * undefined on any failure — callers degrade to the original directory.\n   */\n  prepareWorktree(root: string, path: string, branch: string, mode?: 'fresh' | 'reuse'): Promise<WorktreeInfo | undefined>\n  /** Collect settlement facts (never throws; missing pieces stay unset). */\n  collect(worktreePath: string, baseCommit: string): Promise<SettlementFacts>\n  /** Merge `branch` into the main worktree (`--no-ff`); THROWS with a readable reason. */\n  merge(root: string, branch: string): Promise<void>\n  /** Whether `branch` is already an ancestor of HEAD (a merge would be a no-op). */\n  isAncestor(root: string, branch: string): Promise<boolean>\n  /** Remove a worktree; THROWS when it still has uncommitted changes. */\n  removeWorktree(root: string, worktreePath: string): Promise<void>\n  /** Delete a branch; THROWS (e.g. still checked out in a worktree). */\n  deleteBranch(root: string, branch: string): Promise<void>\n  /**\n   * Show one commit (message + patch) — diff viewer (0.4.0). Fail-soft:\n   * undefined on any git failure; the payload is capped.\n   */\n  showCommit(cwd: string, hash: string): Promise<DiffResult | undefined>\n  /**\n   * Show the diff of one path — diff viewer (0.4.0). Without `baseCommit`:\n   * the working-tree view (staged + unstaged vs HEAD, e.g. uncommitted\n   * changes in a live worktree); with `baseCommit`: the range\n   * base..HEAD restricted to the path. Fail-soft: undefined on failure.\n   */\n  showPathDiff(cwd: string, path: string, baseCommit?: string): Promise<DiffResult | undefined>\n}\n\n/**\n * Build the task branch name `task/<标题>+<taskId>` (plan §9 拍板).\n *\n * Title sanitizing: whitespace runs collapse to `-`; git-illegal characters\n * (`~ ^ : ? * [ \\ / @ { }` and friends) are stripped; `..` collapses; the\n * segment is trimmed of leading/trailing `.-` and truncated to ~20 code\n * points; an empty result falls back to the bare `task/<taskId>`.\n * @param title - the task title (already normalized 1..200 chars).\n * @param taskId - the task id (stable suffix).\n * @returns the branch name.\n */\nexport function sanitizeBranchName(title: string, taskId: string): string {\n  const segment = title.trim()\n    .replace(/\\s+/g, '-')\n    .replace(/[/\\\\~^:?*[\\]@{}\"'<>|#%&;$!`'=,;()]+/g, '')\n    .replace(/\\.\\.+/g, '.')\n    .replace(/^[-.\\s]+|[-.\\s]+$/g, '')\n  const head = Array.from(segment).slice(0, 20).join('').replace(/^[-.]+|[-.]+$/g, '')\n  return head.length === 0 ? `task/${taskId}` : `task/${head}+${taskId}`\n}\n\n/** The canonical worktree path of a task inside its workspace (forward slashes). */\nexport function worktreePathOf(workspacePath: string, taskId: string): string {\n  const root = workspacePath.replace(/[\\\\/]+$/, '').replaceAll('\\\\', '/')\n  return `${root}/${WORKTREE_DIR}/${taskId}`\n}\n\n/** Real exec layer over child_process.execFile (windowsHide, timeout, maxBuffer). */\nconst realExec: ExecFn = (args, options) => new Promise(resolve => {\n  void (async () => {\n    const { execFile } = await import('node:child_process')\n    execFile('git', args, {\n      cwd: options.cwd,\n      timeout: options.timeout ?? QUICK_TIMEOUT_MS,\n      windowsHide: true,\n      maxBuffer: 4 * 1024 * 1024,\n      encoding: 'utf8',\n    }, (error, stdout, stderr) => {\n      resolve({ ok: error === null, stdout: String(stdout ?? ''), stderr: String(stderr ?? '') })\n    })\n  })().catch(() => resolve({ ok: false, stdout: '', stderr: 'exec unavailable' }))\n})\n\n/**\n * Build a {@link GitFace} over an injectable exec layer.\n * @param exec - the exec function (real `git` when omitted).\n */\nexport function createGitFace(exec: ExecFn = realExec): GitFace {\n  const quick = (args: string[], cwd?: string): Promise<ExecResult> => exec(args, { cwd, timeout: QUICK_TIMEOUT_MS })\n  const heavy = (args: string[], cwd?: string): Promise<ExecResult> => exec(args, { cwd, timeout: HEAVY_TIMEOUT_MS })\n\n  // Per-root mutex (0.3.1): structural git ops on the SAME repository run one\n  // at a time — concurrent isolated executions must not race on git's locks.\n  const locks = new Map<string, Promise<unknown>>()\n  const withRootLock = <T>(root: string, fn: () => Promise<T>): Promise<T> => {\n    const prev = locks.get(root) ?? Promise.resolve()\n    const next = prev.then(fn, fn)\n    locks.set(root, next.catch(() => { /* the chain never blocks later ops */ }))\n    return next\n  }\n\n  return {\n    async detect(root) {\n      const r = await quick(['rev-parse', '--is-inside-work-tree'], root)\n      return r.ok && r.stdout.trim() === 'true'\n    },\n\n    async binaryAvailable() {\n      const r = await quick(['--version'])\n      return r.ok && r.stdout.startsWith('git version')\n    },\n\n    prepareWorktree: (root, path, branch, mode = 'fresh') => withRootLock(root, async () => {\n      // 续跑: a live worktree at the path is kept EXACTLY as-is — the agent's\n      // commits and uncommitted changes survive; the baseline becomes the\n      // worktree's own HEAD so evidence covers only the new run.\n      if (mode === 'reuse') {\n        const wtHead = await quick(['rev-parse', 'HEAD'], path)\n        if (wtHead.ok && wtHead.stdout.trim().length > 0) {\n          return { path, branch, baseCommit: wtHead.stdout.trim(), reused: true }\n        }\n        // No live worktree → fall through to a fresh preparation.\n      }\n\n      // Baseline: the main worktree's current HEAD (also validates the repo).\n      const head = await quick(['rev-parse', 'HEAD'], root)\n      if (!head.ok) return undefined\n      const baseCommit = head.stdout.trim()\n\n      const exists = await quick(['show-ref', '--verify', `refs/heads/${branch}`], root)\n      if (exists.ok) {\n        // Reuse the fixed branch name, but guarantee a FRESH baseline: drop\n        // any stale worktree at the path, move the branch to the current\n        // HEAD, then check the branch out again (每次全新，复用仅作选项保留).\n        await heavy(['worktree', 'remove', '--force', path], root)\n        await heavy(['worktree', 'prune'], root)\n        const moved = await heavy(['branch', '-f', branch, 'HEAD'], root)\n        if (!moved.ok) return undefined\n        const added = await heavy(['worktree', 'add', path, branch], root)\n        if (!added.ok) return undefined\n      } else {\n        const added = await heavy(['worktree', 'add', '-b', branch, path], root)\n        if (!added.ok) return undefined\n      }\n      return { path, branch, baseCommit }\n    }),\n\n    async collect(worktreePath, baseCommit) {\n      const facts: SettlementFacts = { commits: [], commitsTotal: 0, dirtyFiles: [], dirtyFilesTotal: 0, changedFiles: 0 }\n      const range = `${baseCommit}..HEAD`\n\n      const head = await quick(['rev-parse', 'HEAD'], worktreePath)\n      if (head.ok) facts.headCommit = head.stdout.trim()\n\n      const log = await quick(['log', '--pretty=format:%h %s', range], worktreePath)\n      if (log.ok) {\n        const commits = log.stdout.split('\\n')\n          .map(line => line.trim())\n          .filter(line => line.length > 0)\n          .map(line => {\n            const space = line.indexOf(' ')\n            return space === -1\n              ? { hash: line, subject: '' }\n              : { hash: line.slice(0, space), subject: line.slice(space + 1) }\n          })\n        // Evidence caps (0.3.1): the ledger is rewritten whole on every\n        // mutation — cap what a huge branch/status dump can add to it.\n        facts.commitsTotal = commits.length\n        facts.commits = commits.slice(0, MAX_COMMIT_EVIDENCE)\n      }\n\n      const status = await quick(['status', '--porcelain'], worktreePath)\n      if (status.ok) {\n        const dirty = status.stdout.split('\\n').map(l => l.trim()).filter(l => l.length > 0)\n        facts.dirtyFilesTotal = dirty.length\n        facts.dirtyFiles = dirty.slice(0, MAX_DIRTY_EVIDENCE)\n      }\n\n      const shortstat = await quick(['diff', '--shortstat', range], worktreePath)\n      if (shortstat.ok && shortstat.stdout.trim().length > 0) facts.diffStat = shortstat.stdout.trim()\n\n      const names = await quick(['diff', '--name-only', range], worktreePath)\n      if (names.ok) facts.changedFiles = names.stdout.split('\\n').filter(l => l.trim().length > 0).length\n\n      return facts\n    },\n\n    merge: (root, branch) => withRootLock(root, async () => {\n      // Main-clean check. The plugin's own worktree directory\n      // (<root>/.dsh-worktrees) shows up as untracked noise and is EXEMPT —\n      // otherwise merging would be impossible without gitignoring it first.\n      const status = await quick(['status', '--porcelain'], root)\n      if (status.ok) {\n        const dirtyLines = status.stdout.split('\\n')\n          .map(l => l.trim())\n          .filter(l => {\n            if (l.length === 0) return false\n            const path = l.slice(3)\n            return path !== WORKTREE_DIR && !path.startsWith(`${WORKTREE_DIR}/`)\n          })\n        if (dirtyLines.length > 0) {\n          throw new Error(`主工作区有 ${dirtyLines.length} 处未提交修改，请先提交或暂存后再合并`)\n        }\n      }\n      const merged = await heavy(['merge', '--no-ff', '--no-edit', branch], root)\n      if (!merged.ok) {\n        // Roll the half-finished merge back so the main worktree stays usable;\n        // report the ORIGINAL failure verbatim (不自动解决冲突).\n        await heavy(['merge', '--abort'], root)\n        throw new Error(`合并失败：${merged.stderr.trim().slice(0, 300)}`)\n      }\n    }),\n\n    async isAncestor(root, branch) {\n      // exit 0 = branch is an ancestor of (or equal to) HEAD → merge no-op.\n      const r = await quick(['merge-base', '--is-ancestor', branch, 'HEAD'], root)\n      return r.ok\n    },\n\n    removeWorktree: (root, worktreePath) => withRootLock(root, async () => {\n      const status = await quick(['status', '--porcelain'], worktreePath)\n      if (status.ok && status.stdout.trim().length > 0) {\n        const lines = status.stdout.split('\\n').map(l => l.trim()).filter(l => l.length > 0)\n        throw new Error(`worktree 有 ${lines.length} 处未提交修改，拒绝删除：\\n${lines.slice(0, 10).join('\\n')}`)\n      }\n      const removed = await heavy(['worktree', 'remove', worktreePath], root)\n      if (!removed.ok) throw new Error(`删除 worktree 失败：${(removed.stderr.trim() || removed.stdout.trim()).slice(0, 300)}`)\n    }),\n\n    deleteBranch: (root, branch) => withRootLock(root, async () => {\n      const deleted = await heavy(['branch', '-D', branch], root)\n      if (!deleted.ok) throw new Error(`删除分支失败：${deleted.stderr.trim().slice(0, 300)}`)\n    }),\n\n    async showCommit(cwd, hash) {\n      if (!isHash(hash)) return undefined\n      const r = await quick(['show', '--no-color', '--format=medium', hash], cwd)\n      if (!r.ok || r.stdout.trim().length === 0) return undefined\n      return capDiff(r.stdout)\n    },\n\n    async showPathDiff(cwd, path, baseCommit) {\n      const target = path.trim()\n      if (target.length === 0) return undefined\n      if (baseCommit !== undefined && isHash(baseCommit)) {\n        const r = await quick(['diff', '--no-color', `${baseCommit}..HEAD`, '--', target], cwd)\n        if (!r.ok) return undefined\n        if (r.stdout.trim().length === 0) return { text: '（该文件无差异）', truncated: false }\n        return capDiff(r.stdout)\n      }\n      // Working-tree view: staged + unstaged vs HEAD.\n      const r = await quick(['diff', '--no-color', 'HEAD', '--', target], cwd)\n      if (r.ok && r.stdout.trim().length > 0) return capDiff(r.stdout)\n      // Untracked files never appear in `git diff` — detect one and synthesize\n      // its new-file patch via --no-index (which exits 1 on differences, so\n      // its stdout is trusted whenever it carries a diff header).\n      const st = await quick(['status', '--porcelain', '--', target], cwd)\n      if (r.ok && st.ok && st.stdout.trim().startsWith('??')) {\n        const ni = await exec(['diff', '--no-color', '--no-index', '--', '/dev/null', target], { cwd, timeout: QUICK_TIMEOUT_MS })\n        if (ni.stdout.includes('diff --git')) return capDiff(ni.stdout)\n        return { text: `（未跟踪新文件：${target}）`, truncated: false }\n      }\n      if (!r.ok) return undefined\n      return { text: '（该文件无差异）', truncated: false }\n    },\n  }\n}\n"],"mappings":";;AA2BA,MAAM,mBAAmB;;AAGzB,MAAM,mBAAmB;;AAGzB,MAAa,eAAe;;AAS5B,MAAa,iBAAiB,MAAM;;AAGpC,MAAa,iBAAiB;;AAS9B,SAAS,QAAQ,KAAyB;CACxC,IAAI,OAAO;CACX,IAAI,YAAY;CAChB,IAAI,KAAK,SAAA,QAAyB;EAChC,OAAO,KAAK,MAAM,GAAG,cAAc;EACnC,YAAY;CACd;CACA,MAAM,QAAQ,KAAK,MAAM,IAAI;CAC7B,IAAI,MAAM,SAAA,KAAyB;EACjC,OAAO,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,KAAK,IAAI;EAC/C,YAAY;CACd;CACA,OAAO;EAAE;EAAM;CAAU;AAC3B;;AAGA,SAAS,OAAO,MAAuB;CACrC,OAAO,oBAAoB,KAAK,IAAI;AACtC;;;;;;;;;;;;AAkFA,SAAgB,mBAAmB,OAAe,QAAwB;CACxE,MAAM,UAAU,MAAM,KAAK,CAAC,CACzB,QAAQ,QAAQ,GAAG,CAAC,CACpB,QAAQ,wCAAwC,EAAE,CAAC,CACnD,QAAQ,UAAU,GAAG,CAAC,CACtB,QAAQ,sBAAsB,EAAE;CACnC,MAAM,OAAO,MAAM,KAAK,OAAO,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,QAAQ,kBAAkB,EAAE;CACnF,OAAO,KAAK,WAAW,IAAI,QAAQ,WAAW,QAAQ,KAAK,GAAG;AAChE;;AAGA,SAAgB,eAAe,eAAuB,QAAwB;CAE5E,OAAO,GADM,cAAc,QAAQ,WAAW,EAAE,CAAC,CAAC,WAAW,MAAM,GACtD,EAAE,GAAG,aAAa,GAAG;AACpC;;AAGA,MAAM,YAAoB,MAAM,YAAY,IAAI,SAAQ,YAAW;CACjE,CAAM,YAAY;EAChB,MAAM,EAAE,aAAa,MAAM,OAAO;EAClC,SAAS,OAAO,MAAM;GACpB,KAAK,QAAQ;GACb,SAAS,QAAQ,WAAW;GAC5B,aAAa;GACb,WAAW,IAAI,OAAO;GACtB,UAAU;EACZ,IAAI,OAAO,QAAQ,WAAW;GAC5B,QAAQ;IAAE,IAAI,UAAU;IAAM,QAAQ,OAAO,UAAU,EAAE;IAAG,QAAQ,OAAO,UAAU,EAAE;GAAE,CAAC;EAC5F,CAAC;CACH,EAAA,CAAG,CAAC,CAAC,YAAY,QAAQ;EAAE,IAAI;EAAO,QAAQ;EAAI,QAAQ;CAAmB,CAAC,CAAC;AACjF,CAAC;;;;;AAMD,SAAgB,cAAc,OAAe,UAAmB;CAC9D,MAAM,SAAS,MAAgB,QAAsC,KAAK,MAAM;EAAE;EAAK,SAAS;CAAiB,CAAC;CAClH,MAAM,SAAS,MAAgB,QAAsC,KAAK,MAAM;EAAE;EAAK,SAAS;CAAiB,CAAC;CAIlH,MAAM,wBAAQ,IAAI,IAA8B;CAChD,MAAM,gBAAmB,MAAc,OAAqC;EAE1E,MAAM,QADO,MAAM,IAAI,IAAI,KAAK,QAAQ,QAAQ,EAAA,CAC9B,KAAK,IAAI,EAAE;EAC7B,MAAM,IAAI,MAAM,KAAK,YAAY,CAAyC,CAAC,CAAC;EAC5E,OAAO;CACT;CAEA,OAAO;EACL,MAAM,OAAO,MAAM;GACjB,MAAM,IAAI,MAAM,MAAM,CAAC,aAAa,uBAAuB,GAAG,IAAI;GAClE,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,MAAM;EACrC;EAEA,MAAM,kBAAkB;GACtB,MAAM,IAAI,MAAM,MAAM,CAAC,WAAW,CAAC;GACnC,OAAO,EAAE,MAAM,EAAE,OAAO,WAAW,aAAa;EAClD;EAEA,kBAAkB,MAAM,MAAM,QAAQ,OAAO,YAAY,aAAa,MAAM,YAAY;GAItF,IAAI,SAAS,SAAS;IACpB,MAAM,SAAS,MAAM,MAAM,CAAC,aAAa,MAAM,GAAG,IAAI;IACtD,IAAI,OAAO,MAAM,OAAO,OAAO,KAAK,CAAC,CAAC,SAAS,GAC7C,OAAO;KAAE;KAAM;KAAQ,YAAY,OAAO,OAAO,KAAK;KAAG,QAAQ;IAAK;GAG1E;GAGA,MAAM,OAAO,MAAM,MAAM,CAAC,aAAa,MAAM,GAAG,IAAI;GACpD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAA;GACrB,MAAM,aAAa,KAAK,OAAO,KAAK;GAGpC,KAAI,MADiB,MAAM;IAAC;IAAY;IAAY,cAAc;GAAQ,GAAG,IAAI,EAAA,CACtE,IAAI;IAIb,MAAM,MAAM;KAAC;KAAY;KAAU;KAAW;IAAI,GAAG,IAAI;IACzD,MAAM,MAAM,CAAC,YAAY,OAAO,GAAG,IAAI;IAEvC,IAAI,EAAC,MADe,MAAM;KAAC;KAAU;KAAM;KAAQ;IAAM,GAAG,IAAI,EAAA,CACrD,IAAI,OAAO,KAAA;IAEtB,IAAI,EAAC,MADe,MAAM;KAAC;KAAY;KAAO;KAAM;IAAM,GAAG,IAAI,EAAA,CACtD,IAAI,OAAO,KAAA;GACxB,OAEE,IAAI,EAAC,MADe,MAAM;IAAC;IAAY;IAAO;IAAM;IAAQ;GAAI,GAAG,IAAI,EAAA,CAC5D,IAAI,OAAO,KAAA;GAExB,OAAO;IAAE;IAAM;IAAQ;GAAW;EACpC,CAAC;EAED,MAAM,QAAQ,cAAc,YAAY;GACtC,MAAM,QAAyB;IAAE,SAAS,CAAC;IAAG,cAAc;IAAG,YAAY,CAAC;IAAG,iBAAiB;IAAG,cAAc;GAAE;GACnH,MAAM,QAAQ,GAAG,WAAW;GAE5B,MAAM,OAAO,MAAM,MAAM,CAAC,aAAa,MAAM,GAAG,YAAY;GAC5D,IAAI,KAAK,IAAI,MAAM,aAAa,KAAK,OAAO,KAAK;GAEjD,MAAM,MAAM,MAAM,MAAM;IAAC;IAAO;IAAyB;GAAK,GAAG,YAAY;GAC7E,IAAI,IAAI,IAAI;IACV,MAAM,UAAU,IAAI,OAAO,MAAM,IAAI,CAAC,CACnC,KAAI,SAAQ,KAAK,KAAK,CAAC,CAAC,CACxB,QAAO,SAAQ,KAAK,SAAS,CAAC,CAAC,CAC/B,KAAI,SAAQ;KACX,MAAM,QAAQ,KAAK,QAAQ,GAAG;KAC9B,OAAO,UAAU,KACb;MAAE,MAAM;MAAM,SAAS;KAAG,IAC1B;MAAE,MAAM,KAAK,MAAM,GAAG,KAAK;MAAG,SAAS,KAAK,MAAM,QAAQ,CAAC;KAAE;IACnE,CAAC;IAGH,MAAM,eAAe,QAAQ;IAC7B,MAAM,UAAU,QAAQ,MAAM,GAAA,EAAsB;GACtD;GAEA,MAAM,SAAS,MAAM,MAAM,CAAC,UAAU,aAAa,GAAG,YAAY;GAClE,IAAI,OAAO,IAAI;IACb,MAAM,QAAQ,OAAO,OAAO,MAAM,IAAI,CAAC,CAAC,KAAI,MAAK,EAAE,KAAK,CAAC,CAAC,CAAC,QAAO,MAAK,EAAE,SAAS,CAAC;IACnF,MAAM,kBAAkB,MAAM;IAC9B,MAAM,aAAa,MAAM,MAAM,GAAA,GAAqB;GACtD;GAEA,MAAM,YAAY,MAAM,MAAM;IAAC;IAAQ;IAAe;GAAK,GAAG,YAAY;GAC1E,IAAI,UAAU,MAAM,UAAU,OAAO,KAAK,CAAC,CAAC,SAAS,GAAG,MAAM,WAAW,UAAU,OAAO,KAAK;GAE/F,MAAM,QAAQ,MAAM,MAAM;IAAC;IAAQ;IAAe;GAAK,GAAG,YAAY;GACtE,IAAI,MAAM,IAAI,MAAM,eAAe,MAAM,OAAO,MAAM,IAAI,CAAC,CAAC,QAAO,MAAK,EAAE,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;GAE7F,OAAO;EACT;EAEA,QAAQ,MAAM,WAAW,aAAa,MAAM,YAAY;GAItD,MAAM,SAAS,MAAM,MAAM,CAAC,UAAU,aAAa,GAAG,IAAI;GAC1D,IAAI,OAAO,IAAI;IACb,MAAM,aAAa,OAAO,OAAO,MAAM,IAAI,CAAC,CACzC,KAAI,MAAK,EAAE,KAAK,CAAC,CAAC,CAClB,QAAO,MAAK;KACX,IAAI,EAAE,WAAW,GAAG,OAAO;KAC3B,MAAM,OAAO,EAAE,MAAM,CAAC;KACtB,OAAO,SAAA,oBAAyB,CAAC,KAAK,WAAW,iBAAkB;IACrE,CAAC;IACH,IAAI,WAAW,SAAS,GACtB,MAAM,IAAI,MAAM,SAAS,WAAW,OAAO,oBAAoB;GAEnE;GACA,MAAM,SAAS,MAAM,MAAM;IAAC;IAAS;IAAW;IAAa;GAAM,GAAG,IAAI;GAC1E,IAAI,CAAC,OAAO,IAAI;IAGd,MAAM,MAAM,CAAC,SAAS,SAAS,GAAG,IAAI;IACtC,MAAM,IAAI,MAAM,QAAQ,OAAO,OAAO,KAAK,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG;GAC9D;EACF,CAAC;EAED,MAAM,WAAW,MAAM,QAAQ;GAG7B,QAAO,MADS,MAAM;IAAC;IAAc;IAAiB;IAAQ;GAAM,GAAG,IAAI,EAAA,CAClE;EACX;EAEA,iBAAiB,MAAM,iBAAiB,aAAa,MAAM,YAAY;GACrE,MAAM,SAAS,MAAM,MAAM,CAAC,UAAU,aAAa,GAAG,YAAY;GAClE,IAAI,OAAO,MAAM,OAAO,OAAO,KAAK,CAAC,CAAC,SAAS,GAAG;IAChD,MAAM,QAAQ,OAAO,OAAO,MAAM,IAAI,CAAC,CAAC,KAAI,MAAK,EAAE,KAAK,CAAC,CAAC,CAAC,QAAO,MAAK,EAAE,SAAS,CAAC;IACnF,MAAM,IAAI,MAAM,cAAc,MAAM,OAAO,iBAAiB,MAAM,MAAM,GAAG,EAAE,CAAC,CAAC,KAAK,IAAI,GAAG;GAC7F;GACA,MAAM,UAAU,MAAM,MAAM;IAAC;IAAY;IAAU;GAAY,GAAG,IAAI;GACtE,IAAI,CAAC,QAAQ,IAAI,MAAM,IAAI,MAAM,mBAAmB,QAAQ,OAAO,KAAK,KAAK,QAAQ,OAAO,KAAK,EAAA,CAAG,MAAM,GAAG,GAAG,GAAG;EACrH,CAAC;EAED,eAAe,MAAM,WAAW,aAAa,MAAM,YAAY;GAC7D,MAAM,UAAU,MAAM,MAAM;IAAC;IAAU;IAAM;GAAM,GAAG,IAAI;GAC1D,IAAI,CAAC,QAAQ,IAAI,MAAM,IAAI,MAAM,UAAU,QAAQ,OAAO,KAAK,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG;EAClF,CAAC;EAED,MAAM,WAAW,KAAK,MAAM;GAC1B,IAAI,CAAC,OAAO,IAAI,GAAG,OAAO,KAAA;GAC1B,MAAM,IAAI,MAAM,MAAM;IAAC;IAAQ;IAAc;IAAmB;GAAI,GAAG,GAAG;GAC1E,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,KAAK,CAAC,CAAC,WAAW,GAAG,OAAO,KAAA;GAClD,OAAO,QAAQ,EAAE,MAAM;EACzB;EAEA,MAAM,aAAa,KAAK,MAAM,YAAY;GACxC,MAAM,SAAS,KAAK,KAAK;GACzB,IAAI,OAAO,WAAW,GAAG,OAAO,KAAA;GAChC,IAAI,eAAe,KAAA,KAAa,OAAO,UAAU,GAAG;IAClD,MAAM,IAAI,MAAM,MAAM;KAAC;KAAQ;KAAc,GAAG,WAAW;KAAS;KAAM;IAAM,GAAG,GAAG;IACtF,IAAI,CAAC,EAAE,IAAI,OAAO,KAAA;IAClB,IAAI,EAAE,OAAO,KAAK,CAAC,CAAC,WAAW,GAAG,OAAO;KAAE,MAAM;KAAY,WAAW;IAAM;IAC9E,OAAO,QAAQ,EAAE,MAAM;GACzB;GAEA,MAAM,IAAI,MAAM,MAAM;IAAC;IAAQ;IAAc;IAAQ;IAAM;GAAM,GAAG,GAAG;GACvE,IAAI,EAAE,MAAM,EAAE,OAAO,KAAK,CAAC,CAAC,SAAS,GAAG,OAAO,QAAQ,EAAE,MAAM;GAI/D,MAAM,KAAK,MAAM,MAAM;IAAC;IAAU;IAAe;IAAM;GAAM,GAAG,GAAG;GACnE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,KAAK,CAAC,CAAC,WAAW,IAAI,GAAG;IACtD,MAAM,KAAK,MAAM,KAAK;KAAC;KAAQ;KAAc;KAAc;KAAM;KAAa;IAAM,GAAG;KAAE;KAAK,SAAS;IAAiB,CAAC;IACzH,IAAI,GAAG,OAAO,SAAS,YAAY,GAAG,OAAO,QAAQ,GAAG,MAAM;IAC9D,OAAO;KAAE,MAAM,WAAW,OAAO;KAAI,WAAW;IAAM;GACxD;GACA,IAAI,CAAC,EAAE,IAAI,OAAO,KAAA;GAClB,OAAO;IAAE,MAAM;IAAY,WAAW;GAAM;EAC9C;CACF;AACF"}
+{"version":3,"file":"git.js","names":[],"sources":["../../src/host/git.ts"],"sourcesContent":["/**\n * Host git face (0.3.0): the ONLY place dsh-taskboard shells out to git.\n * 0.3.1: per-repo serialization of structural operations, binary probing,\n * no-op merge detection, worktree REUSE mode, and evidence size caps.\n *\n * Design invariants (plan §3.4/§3.5):\n * - NARROW interface: detect / binaryAvailable / prepareWorktree / collect /\n *   merge / isAncestor / removeWorktree / deleteBranch — nothing else leaks\n *   into the plugin.\n * - FAIL-SOFT: every call has a timeout and resolves to a benign result\n *   (false / undefined / empty facts) on ANY git failure — a missing git,\n *   a locked worktree, or a damaged repo degrades execution to the original\n *   directory and NEVER fails the ledger or the run pipeline. Only the\n *   explicit user actions (merge / remove / deleteBranch) throw, with a\n *   readable message the GUI surfaces as-is.\n * - SERIALIZED structural ops: concurrent isolated executions on the SAME\n *   repository would race on git's index/worktree locks, so every structural\n *   operation (prepareWorktree / merge / removeWorktree / deleteBranch) runs\n *   inside a per-root in-process mutex. Read-only collects stay concurrent.\n * - INJECTABLE runner: the exec layer is a single function so unit tests\n *   script every path without a real git.\n *\n * @module dsh-taskboard/host/git\n */\nimport { resolve } from 'node:path'\nimport { isValidTaskId, type CommitInfo } from '../shared/protocol.ts'\n\n/** Timeout for quick read-only queries (rev-parse / status / log / diff). */\nconst QUICK_TIMEOUT_MS = 2_000\n\n/** Timeout for structural operations (worktree add/remove, merge, branch). */\nconst HEAVY_TIMEOUT_MS = 15_000\n\n/** Directory under a workspace where task worktrees live. */\nexport const WORKTREE_DIR = '.dsh-worktrees'\n\n/** Evidence caps: commits kept per execution record (newest first). */\nexport const MAX_COMMIT_EVIDENCE = 50\n\n/** Evidence caps: uncommitted-change lines kept per execution record. */\nexport const MAX_DIRTY_EVIDENCE = 100\n\n/** Diff viewer caps (0.4.0): raw text kept per view. */\nexport const MAX_DIFF_BYTES = 128 * 1024\n\n/** Diff viewer caps: lines kept per view. */\nexport const MAX_DIFF_LINES = 2_000\n\n/** One capped, read-only diff view (diff viewer, 0.4.0). */\nexport interface DiffResult {\n  text: string\n  truncated: boolean\n}\n\n/** Cap one diff payload by bytes and lines (in order, marking truncation). */\nfunction capDiff(out: string): DiffResult {\n  let text = out\n  let truncated = false\n  if (text.length > MAX_DIFF_BYTES) {\n    text = text.slice(0, MAX_DIFF_BYTES)\n    truncated = true\n  }\n  const lines = text.split('\\n')\n  if (lines.length > MAX_DIFF_LINES) {\n    text = lines.slice(0, MAX_DIFF_LINES).join('\\n')\n    truncated = true\n  }\n  return { text, truncated }\n}\n\n/** A plausible git object hash (defense against option injection). */\nfunction isHash(hash: string): boolean {\n  return /^[0-9a-f]{4,64}$/i.test(hash)\n}\n\n/** Result of one underlying exec: `ok` is exit-0, output never null. */\nexport interface ExecResult { ok: boolean; stdout: string; stderr: string }\n\n/** The injectable exec layer: run `git <args>` under a cwd with a timeout. */\nexport type ExecFn = (args: string[], options: { cwd?: string; timeout?: number }) => Promise<ExecResult>\n\n/** Facts needed to open an isolated execution. */\nexport interface WorktreeInfo {\n  /** Absolute worktree path (the session's cwd). */\n  path: string\n  /** The task branch checked out there. */\n  branch: string\n  /** Baseline for evidence collection: main HEAD (fresh) or worktree HEAD (reuse). */\n  baseCommit: string\n  /** True when an existing live worktree was kept as-is (续跑). */\n  reused?: boolean\n}\n\n/** Settlement facts collected from a worktree (partial on best-effort basis). */\nexport interface SettlementFacts {\n  headCommit?: string\n  commits: CommitInfo[]\n  /** Total commits before capping (equals commits.length when under the cap). */\n  commitsTotal: number\n  dirtyFiles: string[]\n  /** Total uncommitted lines before capping. */\n  dirtyFilesTotal: number\n  diffStat?: string\n  changedFiles: number\n}\n\n/** The narrow git face the rest of the plugin depends on. */\nexport interface GitFace {\n  /** Whether `root` sits inside a usable git work tree (fail-soft → false). */\n  detect(root: string): Promise<boolean>\n  /** Whether a usable git binary answers at all (distinguishes 未装 git vs 非 git 仓库). */\n  binaryAvailable(): Promise<boolean>\n  /**\n   * Ensure a worktree at `path` on `branch`. Default mode `'fresh'` resets to\n   * the main worktree's current HEAD (每次全新); mode `'reuse'` keeps a live\n   * worktree exactly as-is (续跑 — agent's commits and uncommitted changes\n   * survive) and falls back to a fresh creation when none is alive. Resolves\n   * undefined on any failure — callers degrade to the original directory.\n   */\n  prepareWorktree(root: string, path: string, branch: string, mode?: 'fresh' | 'reuse'): Promise<WorktreeInfo | undefined>\n  /** Collect settlement facts (never throws; missing pieces stay unset). */\n  collect(worktreePath: string, baseCommit: string): Promise<SettlementFacts>\n  /** Merge `branch` into the main worktree (`--no-ff`); THROWS with a readable reason. */\n  merge(root: string, branch: string): Promise<void>\n  /** Whether `branch` is already an ancestor of HEAD (a merge would be a no-op). */\n  isAncestor(root: string, branch: string): Promise<boolean>\n  /**\n   * Remove a worktree. Resolves 'removed' on success, 'unregistered' when git\n   * no longer knows the path (an orphaned directory). THROWS when it still\n   * has uncommitted changes, or on any other git failure (readable reason).\n   */\n  removeWorktree(root: string, worktreePath: string): Promise<'removed' | 'unregistered'>\n  /** Delete a branch; THROWS (e.g. still checked out in a worktree). */\n  deleteBranch(root: string, branch: string): Promise<void>\n  /**\n   * Show one commit (message + patch) — diff viewer (0.4.0). Fail-soft:\n   * undefined on any git failure; the payload is capped.\n   */\n  showCommit(cwd: string, hash: string): Promise<DiffResult | undefined>\n  /**\n   * Show the diff of one path — diff viewer (0.4.0). Without `baseCommit`:\n   * the working-tree view (staged + unstaged vs HEAD, e.g. uncommitted\n   * changes in a live worktree); with `baseCommit`: the range\n   * base..HEAD restricted to the path. Fail-soft: undefined on failure.\n   */\n  showPathDiff(cwd: string, path: string, baseCommit?: string): Promise<DiffResult | undefined>\n}\n\n/**\n * Build the task branch name `task/<标题>+<taskId>` (plan §9 拍板).\n *\n * Title sanitizing: whitespace runs collapse to `-`; git-illegal characters\n * (`~ ^ : ? * [ \\ / @ { }` and friends) are stripped; `..` collapses; the\n * segment is trimmed of leading/trailing `.-` and truncated to ~20 code\n * points; an empty result falls back to the bare `task/<taskId>`.\n * @param title - the task title (already normalized 1..200 chars).\n * @param taskId - the task id (stable suffix).\n * @returns the branch name.\n */\nexport function sanitizeBranchName(title: string, taskId: string): string {\n  const segment = title.trim()\n    .replace(/\\s+/g, '-')\n    .replace(/[/\\\\~^:?*[\\]@{}\"'<>|#%&;$!`'=,;()]+/g, '')\n    .replace(/\\.\\.+/g, '.')\n    .replace(/^[-.\\s]+|[-.\\s]+$/g, '')\n  const head = Array.from(segment).slice(0, 20).join('').replace(/^[-.]+|[-.]+$/g, '')\n  return head.length === 0 ? `task/${taskId}` : `task/${head}+${taskId}`\n}\n\n/**\n * The canonical worktree path of a task inside its workspace (forward\n * slashes). R4②: the id is validated HERE so every present and future call\n * site is covered — a traversal-shaped id must never ride into a filesystem\n * path (the cleanup/purge flows `rm -rf` what this returns).\n */\nexport function worktreePathOf(workspacePath: string, taskId: string): string {\n  if (!isValidTaskId(taskId)) {\n    throw new Error(`Error: invalid_input: illegal task id ${JSON.stringify(taskId.slice(0, 40))}`)\n  }\n  const root = workspacePath.replace(/[\\\\/]+$/, '').replaceAll('\\\\', '/')\n  return `${root}/${WORKTREE_DIR}/${taskId}`\n}\n\n/** Real exec layer over child_process.execFile (windowsHide, timeout, maxBuffer). */\nconst realExec: ExecFn = (args, options) => new Promise(resolve => {\n  void (async () => {\n    const { execFile } = await import('node:child_process')\n    execFile('git', args, {\n      cwd: options.cwd,\n      timeout: options.timeout ?? QUICK_TIMEOUT_MS,\n      windowsHide: true,\n      maxBuffer: 4 * 1024 * 1024,\n      encoding: 'utf8',\n    }, (error, stdout, stderr) => {\n      resolve({ ok: error === null, stdout: String(stdout ?? ''), stderr: String(stderr ?? '') })\n    })\n  })().catch(() => resolve({ ok: false, stdout: '', stderr: 'exec unavailable' }))\n})\n\n/**\n * Build a {@link GitFace} over an injectable exec layer.\n * @param exec - the exec function (real `git` when omitted).\n */\nexport function createGitFace(exec: ExecFn = realExec): GitFace {\n  const quick = (args: string[], cwd?: string): Promise<ExecResult> => exec(args, { cwd, timeout: QUICK_TIMEOUT_MS })\n  const heavy = (args: string[], cwd?: string): Promise<ExecResult> => exec(args, { cwd, timeout: HEAVY_TIMEOUT_MS })\n\n  // Per-root mutex (0.3.1): structural git ops on the SAME repository run one\n  // at a time — concurrent isolated executions must not race on git's locks.\n  const locks = new Map<string, Promise<unknown>>()\n  const withRootLock = <T>(root: string, fn: () => Promise<T>): Promise<T> => {\n    const prev = locks.get(root) ?? Promise.resolve()\n    const next = prev.then(fn, fn)\n    locks.set(root, next.catch(() => { /* the chain never blocks later ops */ }))\n    return next\n  }\n\n  return {\n    async detect(root) {\n      const r = await quick(['rev-parse', '--is-inside-work-tree'], root)\n      return r.ok && r.stdout.trim() === 'true'\n    },\n\n    async binaryAvailable() {\n      const r = await quick(['--version'])\n      return r.ok && r.stdout.startsWith('git version')\n    },\n\n    prepareWorktree: (root, path, branch, mode = 'fresh') => withRootLock(root, async () => {\n      // 续跑: a live worktree at the path is kept EXACTLY as-is — the agent's\n      // commits and uncommitted changes survive; the baseline becomes the\n      // worktree's own HEAD so evidence covers only the new run.\n      if (mode === 'reuse') {\n        const wtHead = await quick(['rev-parse', 'HEAD'], path)\n        // S14: a readable HEAD is not enough — the worktree must be on OUR\n        // branch, otherwise a user-created repo at the path would be silently\n        // taken over. Foreign or detached → fall through to fresh preparation.\n        const wtBranch = wtHead.ok ? await quick(['rev-parse', '--abbrev-ref', 'HEAD'], path) : undefined\n        if (wtHead.ok && wtHead.stdout.trim().length > 0\n          && wtBranch !== undefined && wtBranch.ok && wtBranch.stdout.trim() === branch) {\n          return { path, branch, baseCommit: wtHead.stdout.trim(), reused: true }\n        }\n        // No live worktree on our branch → fall through to a fresh preparation.\n      }\n\n      // Baseline: the main worktree's current HEAD (also validates the repo).\n      const head = await quick(['rev-parse', 'HEAD'], root)\n      if (!head.ok) return undefined\n      const baseCommit = head.stdout.trim()\n\n      const exists = await quick(['show-ref', '--verify', `refs/heads/${branch}`], root)\n      if (exists.ok) {\n        // Reuse the fixed branch name, but guarantee a FRESH baseline: drop\n        // any stale worktree at the path, move the branch to the current\n        // HEAD, then check the branch out again (每次全新，复用仅作选项保留).\n        await heavy(['worktree', 'remove', '--force', path], root)\n        await heavy(['worktree', 'prune'], root)\n        const moved = await heavy(['branch', '-f', branch, 'HEAD'], root)\n        if (!moved.ok) return undefined\n        const added = await heavy(['worktree', 'add', path, branch], root)\n        if (!added.ok) return undefined\n      } else {\n        const added = await heavy(['worktree', 'add', '-b', branch, path], root)\n        if (!added.ok) return undefined\n      }\n      return { path, branch, baseCommit }\n    }),\n\n    async collect(worktreePath, baseCommit) {\n      const facts: SettlementFacts = { commits: [], commitsTotal: 0, dirtyFiles: [], dirtyFilesTotal: 0, changedFiles: 0 }\n      const range = `${baseCommit}..HEAD`\n\n      const head = await quick(['rev-parse', 'HEAD'], worktreePath)\n      if (head.ok) facts.headCommit = head.stdout.trim()\n\n      const log = await quick(['log', '--pretty=format:%h %s', range], worktreePath)\n      if (log.ok) {\n        const commits = log.stdout.split('\\n')\n          .map(line => line.trim())\n          .filter(line => line.length > 0)\n          .map(line => {\n            const space = line.indexOf(' ')\n            return space === -1\n              ? { hash: line, subject: '' }\n              : { hash: line.slice(0, space), subject: line.slice(space + 1) }\n          })\n        // Evidence caps (0.3.1): the ledger is rewritten whole on every\n        // mutation — cap what a huge branch/status dump can add to it.\n        facts.commitsTotal = commits.length\n        facts.commits = commits.slice(0, MAX_COMMIT_EVIDENCE)\n      }\n\n      const status = await quick(['status', '--porcelain'], worktreePath)\n      if (status.ok) {\n        const dirty = status.stdout.split('\\n').map(l => l.trim()).filter(l => l.length > 0)\n        facts.dirtyFilesTotal = dirty.length\n        facts.dirtyFiles = dirty.slice(0, MAX_DIRTY_EVIDENCE)\n      }\n\n      const shortstat = await quick(['diff', '--shortstat', range], worktreePath)\n      if (shortstat.ok && shortstat.stdout.trim().length > 0) facts.diffStat = shortstat.stdout.trim()\n\n      const names = await quick(['diff', '--name-only', range], worktreePath)\n      if (names.ok) facts.changedFiles = names.stdout.split('\\n').filter(l => l.trim().length > 0).length\n\n      return facts\n    },\n\n    merge: (root, branch) => withRootLock(root, async () => {\n      // Main-clean check. The plugin's own worktree directory\n      // (<root>/.dsh-worktrees) shows up as untracked noise and is EXEMPT —\n      // otherwise merging would be impossible without gitignoring it first.\n      const status = await quick(['status', '--porcelain'], root)\n      if (status.ok) {\n        const dirtyLines = status.stdout.split('\\n')\n          .map(l => l.trim())\n          .filter(l => {\n            if (l.length === 0) return false\n            const path = l.slice(3)\n            return path !== WORKTREE_DIR && !path.startsWith(`${WORKTREE_DIR}/`)\n          })\n        if (dirtyLines.length > 0) {\n          // Machine-readable tag: callers classify without parsing zh-CN text.\n          throw Object.assign(new Error(`主工作区有 ${dirtyLines.length} 处未提交修改，请先提交或暂存后再合并`), { code: 'dirty-tree' })\n        }\n      }\n      const merged = await heavy(['merge', '--no-ff', '--no-edit', branch], root)\n      if (!merged.ok) {\n        // Roll the half-finished merge back so the main worktree stays usable;\n        // report the ORIGINAL failure verbatim (不自动解决冲突).\n        await heavy(['merge', '--abort'], root)\n        throw new Error(`合并失败：${merged.stderr.trim().slice(0, 300)}`)\n      }\n    }),\n\n    async isAncestor(root, branch) {\n      // exit 0 = branch is an ancestor of (or equal to) HEAD → merge no-op.\n      const r = await quick(['merge-base', '--is-ancestor', branch, 'HEAD'], root)\n      return r.ok\n    },\n\n    removeWorktree: (root, worktreePath) => withRootLock(root, async (): Promise<'removed' | 'unregistered'> => {\n      const status = await quick(['status', '--porcelain'], worktreePath)\n      if (status.ok && status.stdout.trim().length > 0) {\n        const lines = status.stdout.split('\\n').map(l => l.trim()).filter(l => l.length > 0)\n        // Machine-readable tag: purge flows classify without parsing zh-CN text.\n        throw Object.assign(new Error(`worktree 有 ${lines.length} 处未提交修改，拒绝删除：\\n${lines.slice(0, 10).join('\\n')}`), { code: 'dirty-worktree' })\n      }\n      const removed = await heavy(['worktree', 'remove', worktreePath], root)\n      if (removed.ok) return 'removed'\n      // S3: classify the failure WITHOUT parsing git's (localizable) stderr —\n      // a path absent from `worktree list` is an unregistered leftover, not\n      // an error the caller should relay verbatim.\n      const list = await quick(['worktree', 'list', '--porcelain'], root)\n      const registered = list.ok && list.stdout.split('\\n')\n        .some(l => l.startsWith('worktree ')\n          && resolve(l.slice('worktree '.length).trim()).toLowerCase() === resolve(worktreePath).toLowerCase())\n      if (!registered) return 'unregistered'\n      throw new Error(`删除 worktree 失败：${(removed.stderr.trim() || removed.stdout.trim()).slice(0, 300)}`)\n    }),\n\n    deleteBranch: (root, branch) => withRootLock(root, async () => {\n      const deleted = await heavy(['branch', '-D', branch], root)\n      if (!deleted.ok) throw new Error(`删除分支失败：${deleted.stderr.trim().slice(0, 300)}`)\n    }),\n\n    async showCommit(cwd, hash) {\n      if (!isHash(hash)) return undefined\n      const r = await quick(['show', '--no-color', '--format=medium', hash], cwd)\n      if (!r.ok || r.stdout.trim().length === 0) return undefined\n      return capDiff(r.stdout)\n    },\n\n    async showPathDiff(cwd, path, baseCommit) {\n      const target = path.trim()\n      if (target.length === 0) return undefined\n      if (baseCommit !== undefined && isHash(baseCommit)) {\n        const r = await quick(['diff', '--no-color', `${baseCommit}..HEAD`, '--', target], cwd)\n        if (!r.ok) return undefined\n        if (r.stdout.trim().length === 0) return { text: '（该文件无差异）', truncated: false }\n        return capDiff(r.stdout)\n      }\n      // Working-tree view: staged + unstaged vs HEAD.\n      const r = await quick(['diff', '--no-color', 'HEAD', '--', target], cwd)\n      if (r.ok && r.stdout.trim().length > 0) return capDiff(r.stdout)\n      // Untracked files never appear in `git diff` — detect one and synthesize\n      // its new-file patch via --no-index (which exits 1 on differences, so\n      // its stdout is trusted whenever it carries a diff header).\n      const st = await quick(['status', '--porcelain', '--', target], cwd)\n      if (r.ok && st.ok && st.stdout.trim().startsWith('??')) {\n        const ni = await exec(['diff', '--no-color', '--no-index', '--', '/dev/null', target], { cwd, timeout: QUICK_TIMEOUT_MS })\n        if (ni.stdout.includes('diff --git')) return capDiff(ni.stdout)\n        return { text: `（未跟踪新文件：${target}）`, truncated: false }\n      }\n      if (!r.ok) return undefined\n      return { text: '（该文件无差异）', truncated: false }\n    },\n  }\n}\n"],"mappings":"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"}