dsh-git-idea 0.1.0 → 0.2.1

package/lib/index.js

@@ -1,14 +1,14 @@
-/* GENERATED by build-package.mjs from 13 fragments under src/ — edit those, not this file. */
+/* GENERATED by build-package.mjs from 12 fragments under src/ — edit those, not this file. */
 /* ── the real-package Host half ──
 
    The fragments under src/host/ were written for the dynamic Cordis bridge:
-   that realm handed the plugin a \`harness\` (\`defineTool\` / \`registerTool\` /
-   \`handle\`) and a façade \`ctx\`. A real package gets neither, so this prelude
-   supplies the same three ways to speak over the services a real \`ctx\` has.
-   The body after it is the same text the dynamic bridge loads — one body, two
-   builds — and host-post.js exports the plugin object. */
-
-import { defineTool } from '@deepseek-ai/dsh-tools'
+   that realm handed the plugin a \`harness\` and a façade \`ctx\`. A real package
+   gets neither, so this prelude supplies the one thing the body still asks of a
+   harness — \`handle\`, which the RPC route below serves. (It used to supply
+   \`defineTool\` / \`registerTool\` too, for the model tools; the plugin ships
+   none, see the README's 「不注册工具」.) The body after it is the same text the
+   dynamic bridge loads — one body, two builds — and host-post.js exports the
+   plugin object. */
 
 /* The one route the browser half calls: same origin as the page, so no CORS.
    The same-origin check below is what keeps another page on loopback from
@@ -92,9 +92,9 @@ async function rpcRoute(request, response) {
   }
 }
 
+/* The body registers RPC handlers here and nothing else: with no model tools
+   there is no tool registry to reach, and \`inject\` no longer names one. */
 const harness = {
-  defineTool: function (options) { return defineTool(options) },
-  registerTool: function (ctx, tool) { return ctx.tools.register(tool) },
   handle: function (method, handler) {
     rpcHandlers.set(method, handler)
     return function () { rpcHandlers.delete(method) }
@@ -109,7 +109,7 @@ return {
 
 const shell = ctx.get('shell')
 if (shell === undefined) {
-  console.error('git plugin: the shell Service is unavailable; no tools registered')
+  console.error('git plugin: the shell Service is unavailable; no RPC registered')
   return
 }
 
@@ -213,12 +213,69 @@ async function invoke(command, args, exec, options) {
   }
 }
 
+/* ── the one failure that is not about the repository ──
+
+   On a machine with no `git` on PATH every command below dies at the shell, and
+   its "command not found" arrives looking exactly like a repository git refused
+   to read: `git status` and `git rev-parse` both answer nothing, `$gd` comes out
+   empty, and a perfectly good repository is reported as "not a git repository" —
+   the one diagnosis the reader cannot act on, with the path field hidden besides.
+
+   So each git command opens with a question about the machine instead. `command
+   -v` is a shell builtin, so the check costs no process, and it asks about the
+   PATH *this* command will be resolved with — after `LC_ALL=C` and
+   `GIT_TERMINAL_PROMPT=0` have been put in front of it, neither of which changes
+   which git is found. The marker word and exit code 127 are what the Host reads;
+   bash's own sentence is never matched, because it is printed in whatever
+   language the machine happens to speak.
+
+   The panel scripts below are the one place this is not enough: they multiplex
+   several answers over stdout in a single process (`pathShell`), so they carry
+   the same check's answer as an output marker instead of an exit code —
+   `PANEL_NO_GIT`. Same question, same builtin, two transports. */
+const GIT_MISSING_MARK = 'dsh-git-idea: no git on PATH'
+/* `command -v <word>` answers for a bare name through PATH and for an absolute
+   path by checking it is executable, so one guard covers both "the git on PATH"
+   and "the git this reader configured". The command word is resolved once per
+   call (see `gitCmd` in 70-config.js) and cannot contain a newline. */
+function gitGuard() {
+  return 'command -v ' + gitCmd() + ' >/dev/null 2>&1 || { printf ' + shq(GIT_MISSING_MARK + '\n') + ' >&2; exit 127; }\n'
+}
+const PANEL_NO_GIT = 'N:nogit'
+
+/* ── the second failure that is not about the repository ──
+
+   `git commit` refuses to author a commit when it cannot work out who the
+   author is, and nothing about that is the repository's fault: the identity
+   lives in git's own configuration, and only the reader can choose a name and
+   an address. Read as plain stderr it arrives as eight lines of English
+   ending in `fatal: empty ident name`, which says what failed and not one word
+   about the two commands that fix it.
+
+   Recognised where it happens rather than matched out of that text: git
+   translates it, and it has several spellings (identity absent, an address but
+   no name, a guessed address that is not a full domain). The question asked
+   instead is `git var GIT_AUTHOR_IDENT` — the same lookup `git commit` makes
+   before it writes anything — and a non-zero exit answers "this commit is
+   going to be refused" in every locale. It is asked only *after* a commit has
+   already failed, so the path that works pays nothing for it. */
+async function identityMissing(args) {
+  const asked = await gitC(args, ['var', 'GIT_AUTHOR_IDENT'], null, {})
+  return asked.exitCode !== 0
+}
+
+/* The same answer as a marker inside a panel script, where a non-zero exit code
+   cannot be the transport: `$gd` is already known to be non-empty by the time
+   this runs, so it is one git process, in the whole-tree read only. */
+const PANEL_NO_IDENT = 'I:none'
+
 /* The three wrappers differ only in what they put in front of the command: the
    package prefix is the whole of the difference, so it is the only argument. */
 async function shellGit(prefix, args, argv, exec, options) {
-  const result = await invoke(prefix + 'git ' + argv.map(shq).join(' '), args, exec, options)
-  result.command = 'git ' + argv.join(' ')
+  const result = await invoke(gitGuard() + prefix + gitCmd() + ' ' + argv.map(shq).join(' '), args, exec, options)
+  result.command = gitExe + ' ' + argv.join(' ')
   result.ok = result.exitCode === 0
+  result.noGit = result.exitCode === 127 && result.stderr.indexOf(GIT_MISSING_MARK) >= 0
   return result
 }
 
@@ -239,927 +296,33 @@ async function gitC(args, argv, exec, options) {
   return await shellGit('LC_ALL=C ', args, argv, exec, options)
 }
 
-/* ─────────────── safety classification ─────────────── */
-
-const READ_ONLY_SUBCOMMANDS = [
-  'status', 'diff', 'log', 'show', 'blame', 'grep', 'shortlog', 'describe',
-  'rev-parse', 'rev-list', 'ls-files', 'ls-tree', 'cat-file', 'for-each-ref',
-  'show-ref', 'diff-tree', 'diff-index', 'diff-files', 'merge-base', 'name-rev',
-  'symbolic-ref', 'var', 'version', 'check-ignore', 'check-attr', 'whatchanged',
-  'range-diff', 'cherry', 'fsck', 'count-objects', 'verify-commit', 'verify-tag',
-]
-
-const PROTECTED_BRANCHES = ['main', 'master']
-
-function scanArgv(argv) {
-  let index = 0
-  while (index < argv.length) {
-    const token = argv[index]
-    if (token === '-C' || token === '-c' || token === '--git-dir' || token === '--work-tree'
-      || token === '--namespace' || token === '--exec-path' || token === '--config-env') {
-      index += 2
-      continue
-    }
-    if (isStr(token) && token.length > 1 && token.charAt(0) === '-') {
-      index += 1
-      continue
-    }
-    break
-  }
-  return { sub: argv[index], rest: argv.slice(index + 1) }
+/* Every reply that carries a command's failure carries this with it, so that no
+   surface has to recognise a missing git by the words in stderr — see
+   `gitGuard`. One flag, read in one place per surface: the mutating commands
+   through `commandDetail`, the panel reads through their `reason`. */
+function gitMissing(result) {
+  return result != null && result.noGit === true
 }
 
-function hasAny(list, names) {
-  for (let i = 0; i < names.length; i += 1) if (list.indexOf(names[i]) >= 0) return true
-  return false
-}
-
-function shortFlag(list, letters) {
-  for (let i = 0; i < list.length; i += 1) {
-    const token = list[i]
-    if (!isStr(token) || token.length < 2 || token.charAt(0) !== '-' || token.charAt(1) === '-') continue
-    const body = token.slice(1)
-    for (let j = 0; j < letters.length; j += 1) if (body.indexOf(letters[j]) >= 0) return letters[j]
-  }
-  return null
-}
-
-function refspecTargetsProtected(refspec) {
-  let spec = refspec.charAt(0) === '+' ? refspec.slice(1) : refspec
-  const colon = spec.lastIndexOf(':')
-  if (colon >= 0) spec = spec.slice(colon + 1)
-  return isProtectedBranch(spec)
-}
-
-/* "main", "heads/main" and "refs/heads/main" are one ref written three ways, and
-   git accepts all three. Only the longest spelling was recognised here, so a
-   force push written `-f origin heads/main` classified as merely destructive
-   instead of forbidden — the rule read as if it held while the ref it names went
-   through. */
-function bareBranchName(name) {
-  let spec = name
-  if (spec.indexOf('refs/') === 0) spec = spec.slice('refs/'.length)
-  if (spec.indexOf('heads/') === 0) spec = spec.slice('heads/'.length)
-  return spec
-}
-
-function isProtectedBranch(name) {
-  return PROTECTED_BRANCHES.indexOf(bareBranchName(name)) >= 0
-}
+/* ── HEAD 指着一个还没有提交的分支 ──
 
-/* ── a value is not an option ──
+   刚 `git init` 出来的仓库就是这样（包括这个插件自己的引导页建出来的那个）：HEAD
+   里写着 `refs/heads/main`，而 `refs/heads` 是空的。它没有任何毛病，但所有读 *ref*
+   的东西都拿不到答案 —— `for-each-ref` 一个分支都不列，`git log <branch>` 报
+   "unknown revision"，而把「这次读失败了」当成「这不是一个仓库」的面板，就会对着
+   它自己刚建出来的仓库说那句话。
 
-   The structured tools hand caller strings straight into git's argv: a revision,
-   a path, a remote, a branch name. A string that starts with "-" is not that
-   value any more — git reads it as an option and the tool does something else
-   entirely. Measured on this deployment: `git_sync` with branch "--force" ran
-   `git push origin --force` (a force push with no confirmation), `git_log` with
-   ref "--output=/tmp/x" wrote an empty log to that path and returned nothing, and
-   `git_branch` with name "--force" ran `git branch --force`. The escape hatch
-   has a classifier for this because its argv is open-ended; the named arguments
-   here only need the one rule. */
-function optionLike(fields) {
-  for (let i = 0; i < fields.length; i += 1) {
-    const value = fields[i][1]
-    if (isStr(value) && value.length > 0 && value.charAt(0) === '-') {
-      return {
-        field: fields[i][0],
-        value: value,
-        reason: fields[i][0] + ' may not start with "-" (' + value + ' would be read by git as an option, not as a value)',
-      }
-    }
-  }
-  return null
+   这里还剩一个问得出来的问题，而且 git 不用碰任何 ref 就能回答：HEAD 写的是哪个
+   分支。只在 ref 表里一个当前分支都没有时才问一次 —— 普通仓库（`%(HEAD)` 已经标出
+   来了）一次都不多花。真正的游离 HEAD 同样答不出来，而那正是调用方本来就会处理的
+   情况。 */
+async function headBranchWithoutCommit(args) {
+  const asked = await gitC(args, ['symbolic-ref', '--quiet', '--short', 'HEAD'], null, {})
+  if (asked.exitCode !== 0) return ''
+  const name = asked.stdout.trim()
+  return name.length > 0 ? name : ''
 }
 
-/* ── a path that stays inside the repository ──
-
-   Every path the panel sends is one git itself listed, so it is relative to the
-   work-tree root. Three of the four diff reads pass it as a pathspec, which git
-   keeps inside the repository on its own. The untracked read cannot: it is
-   `git diff --no-index -- /dev/null <path>`, and that command reads whatever the
-   path names. Measured here, an absolute path came back with the contents of
-   /etc/hostname — a file no reader of a git panel asked for. So anything
-   absolute, or stepping up with "..", is refused rather than resolved. */
-function repoRelativePath(path) {
-  if (!isStr(path) || path.length === 0) return 'path is required'
-  if (path.charAt(0) === '/' || path.charAt(0) === '\\') return 'path must be relative to the repository root'
-  if (path.length > 1 && path.charAt(1) === ':') return 'path must be relative to the repository root'
-  if (path.indexOf('\u0000') >= 0) return 'path may not contain a NUL byte'
-  const parts = path.split(/[\\/]/)
-  for (let i = 0; i < parts.length; i += 1) {
-    if (parts[i] === '..') return 'path may not step outside the repository'
-  }
-  return ''
-}
-
-function classify(argv) {
-  const scan = scanArgv(argv)
-  const sub = scan.sub
-  const rest = scan.rest
-  if (sub === undefined) return { level: 'read', why: '' }
-
-  if (sub === 'filter-branch' || sub === 'filter-repo') {
-    return { level: 'forbidden', why: sub + ' rewrites published history and is never allowed through this tool' }
-  }
-  if (sub === 'update-ref' && hasAny(rest, ['-d', '--delete'])) {
-    return { level: 'forbidden', why: 'update-ref -d deletes refs directly, bypassing every safety net' }
-  }
-  if (sub === 'reflog' && rest[0] === 'expire') {
-    return { level: 'forbidden', why: 'reflog expire destroys the log that makes mistakes recoverable' }
-  }
-  if (sub === 'gc' && rest.some(function (token) { return isStr(token) && token.indexOf('--prune') === 0 })) {
-    return { level: 'forbidden', why: 'gc --prune destroys unreachable objects permanently' }
-  }
-
-  const reasons = []
-  if (sub === 'reset' && hasAny(rest, ['--hard'])) reasons.push('reset --hard discards working-tree changes')
-  if (sub === 'clean' && (hasAny(rest, ['-f', '--force']) || shortFlag(rest, 'f') !== null)) reasons.push('clean -f deletes untracked files')
-  if (sub === 'checkout' && (hasAny(rest, ['-f', '--force']) || shortFlag(rest, 'f') !== null)) reasons.push('checkout --force discards local changes')
-  if ((sub === 'checkout' || sub === 'restore') && rest.indexOf('.') >= 0) reasons.push('restoring "." discards every working-tree change')
-  if (sub === 'switch' && hasAny(rest, ['-f', '--force', '--discard-changes'])) reasons.push('switch --force discards local changes')
-  if (sub === 'branch' && (shortFlag(rest, 'D') !== null || (hasAny(rest, ['--delete']) && hasAny(rest, ['--force'])))) reasons.push('force-deleting a branch discards unmerged commits')
-  if (sub === 'stash' && rest[0] === 'clear') reasons.push('stash clear drops every stash entry')
-  if (sub === 'stash' && rest[0] === 'drop') reasons.push('stash drop discards a stash entry')
-  if (sub === 'reflog' && rest[0] === 'delete') reasons.push('reflog delete removes recovery entries')
-  if (sub === 'worktree' && rest[0] === 'remove' && hasAny(rest, ['-f', '--force'])) reasons.push('worktree remove --force deletes a worktree that still has changes')
-  if (sub === 'submodule' && rest[0] === 'deinit' && hasAny(rest, ['-f', '--force'])) reasons.push('submodule deinit --force removes a submodule checkout')
-  if (sub === 'tag' && hasAny(rest, ['-d', '--delete'])) reasons.push('deleting a tag removes a published reference')
-  if (argv.indexOf('--no-verify') >= 0) reasons.push('--no-verify skips the repository hooks')
-
-  if (sub === 'push') {
-    const positional = rest.filter(function (token) { return isStr(token) && token.charAt(0) !== '-' })
-    const refspecs = positional.slice(1)
-    const forced = hasAny(rest, ['--force', '--mirror']) || shortFlag(rest, 'f') !== null
-    const leased = rest.some(function (token) { return isStr(token) && token.indexOf('--force-with-lease') === 0 })
-    const deleting = hasAny(rest, ['--delete']) || refspecs.some(function (token) { return token.charAt(0) === ':' })
-    if (forced && refspecs.some(refspecTargetsProtected)) {
-      return { level: 'forbidden', why: 'force-pushing to a protected branch (main/master) is never allowed' }
-    }
-    if (forced) reasons.push('push --force overwrites remote history')
-    if (leased) reasons.push('push --force-with-lease overwrites remote history')
-    if (deleting) reasons.push('push --delete removes a remote reference')
-    if (refspecs.some(function (token) { return token.charAt(0) === '+' })) reasons.push('a "+" refspec forces the remote update')
-  }
-
-  if (reasons.length > 0) return { level: 'destructive', why: reasons.join('; ') }
-  if (READ_ONLY_SUBCOMMANDS.indexOf(sub) >= 0) return { level: 'read', why: '' }
-  return { level: 'write', why: '' }
-}
-
-/* ─────────────── renderers ─────────────── */
-
-/* The header every renderer prints when a git command came back non-zero. Three
-   of them wrote it out by hand. */
-function renderCommandFailure(title, value) {
-  const stderr = isStr(value.stderr) ? value.stderr.replace(/\n+$/, '') : ''
-  return title + ' failed in ' + String(value.cwd) + '\n' + stderr + '\n[exit code: ' + String(value.exitCode) + ']'
-}
-
-function renderPassthrough(value) {
-  const lines = ['$ ' + value.command]
-  if (value.cwd !== null) lines.push('cwd: ' + value.cwd)
-  if (value.blocked === 'invalid-args') {
-    lines.push('INVALID ARGUMENTS: ' + value.reason)
-    lines.push('Nothing was executed.')
-    return lines.join('\n')
-  }
-  if (value.blocked === 'forbidden') {
-    lines.push('BLOCKED by git plugin policy: ' + value.reason)
-    return lines.join('\n')
-  }
-  if (value.blocked === 'confirmation-required') {
-    lines.push('CONFIRMATION REQUIRED: ' + value.reason)
-    lines.push('Nothing was executed. Re-call with confirm: true only if this destructive operation is really intended.')
-    return lines.join('\n')
-  }
-  /* Guarded rather than assumed: three of the refusal paths above return no
-     stdout at all, and a renderer that throws takes the answer with it. */
-  const out = isStr(value.stdout) ? value.stdout.replace(/\n+$/, '') : ''
-  const err = isStr(value.stderr) ? value.stderr.replace(/\n+$/, '') : ''
-  if (out.length > 0) lines.push(out)
-  if (err.length > 0) lines.push('[stderr]\n' + err)
-  if (out.length === 0 && err.length === 0) lines.push('(no output)')
-  lines.push('[exit code: ' + String(value.exitCode) + ']')
-  if (value.timedOut === true) lines.push('(timed out)')
-  if (value.sandboxDenied === true) lines.push('(denied by the file sandbox)')
-  if (value.truncated === true) lines.push('(output truncated' + (value.spillPath !== null ? '; full output at ' + value.spillPath : '') + ')')
-  return lines.join('\n')
-}
-
-function renderOutcome(value, title) {
-  const lines = [title]
-  if (value.cwd !== undefined && value.cwd !== null) lines.push('cwd: ' + String(value.cwd))
-  if (value.blocked === 'forbidden') { lines.push('BLOCKED by git plugin policy: ' + value.reason); return lines.join('\n') }
-  if (value.blocked === 'confirmation-required') {
-    lines.push('CONFIRMATION REQUIRED: ' + value.reason)
-    lines.push('Nothing was executed. Re-call with confirm: true only if this is really intended.')
-    return lines.join('\n')
-  }
-  const out = isStr(value.stdout) ? value.stdout.replace(/\n+$/, '') : ''
-  const err = isStr(value.stderr) ? value.stderr.replace(/\n+$/, '') : ''
-  if (value.ok === true) {
-    if (out.length > 0) lines.push(out)
-    if (err.length > 0) lines.push('[stderr]\n' + err)
-    if (out.length === 0 && err.length === 0) lines.push('ok')
-    return lines.join('\n')
-  }
-  if (err.length > 0) lines.push(err)
-  if (out.length > 0) lines.push(out)
-  lines.push('[exit code: ' + String(value.exitCode) + ']')
-  return lines.join('\n')
-}
-
-const STATUS_LABELS = {
-  M: 'modified', A: 'added', D: 'deleted', R: 'renamed', C: 'copied',
-  T: 'typechange', U: 'unmerged', '.': 'unchanged',
-}
-
-function statusLabel(code) {
-  return STATUS_LABELS[code] === undefined ? code : STATUS_LABELS[code]
-}
-
-function parseStatusV2(stdout) {
-  const parsed = {
-    branch: null, detached: false, upstream: null, ahead: 0, behind: 0,
-    staged: [], unstaged: [], untracked: [], unmerged: [],
-  }
-  const lines = stdout.split('\n')
-  for (let i = 0; i < lines.length; i += 1) {
-    const line = lines[i]
-    if (line.length === 0) continue
-    if (line.charAt(0) === '#') {
-      const head = line.slice(2)
-      const space = head.indexOf(' ')
-      const key = space < 0 ? head : head.slice(0, space)
-      const rest = space < 0 ? '' : head.slice(space + 1)
-      if (key === 'branch.head') {
-        if (rest === '(detached)') parsed.detached = true
-        else parsed.branch = rest
-      } else if (key === 'branch.upstream') {
-        parsed.upstream = rest
-      } else if (key === 'branch.ab') {
-        const parts = rest.split(' ')
-        if (parts.length === 2) {
-          parsed.ahead = parseInt(parts[0].slice(1), 10) || 0
-          parsed.behind = parseInt(parts[1].slice(1), 10) || 0
-        }
-      }
-      continue
-    }
-    const marker = line.charAt(0)
-    if (marker === '?') { parsed.untracked.push(line.slice(2)); continue }
-    if (marker === '!') continue
-    if (marker === '1' || marker === '2' || marker === 'u') {
-      const fields = line.split(' ')
-      const xy = fields[1] === undefined ? '..' : fields[1]
-      let path = ''
-      if (marker === '1') path = fields.slice(8).join(' ')
-      else if (marker === '2') path = fields.slice(9).join(' ').split('\t')[0]
-      else path = fields.slice(10).join(' ')
-      const entry = { path: path, code: xy, label: statusLabel(xy.charAt(0)) + '/' + statusLabel(xy.charAt(1)) }
-      if (marker === 'u') { parsed.unmerged.push(entry); continue }
-      if (xy.charAt(0) !== '.') parsed.staged.push(entry)
-      if (xy.charAt(1) !== '.') parsed.unstaged.push(entry)
-    }
-  }
-  return parsed
-}
-
-function renderStatus(value) {
-  if (value.ok !== true) return renderCommandFailure('git status', value)
-  const lines = []
-  lines.push('repo:      ' + String(value.cwd))
-  const head = value.detached === true ? '(detached HEAD)' : String(value.branch)
-  const track = value.upstream === null ? '' : ' -> ' + value.upstream + '  ahead ' + String(value.ahead) + ', behind ' + String(value.behind)
-  lines.push('branch:    ' + head + track)
-  if (value.unmerged.length > 0) {
-    lines.push('conflicts: ' + String(value.unmerged.length))
-    for (let i = 0; i < value.unmerged.length; i += 1) lines.push('  ' + value.unmerged[i].code + '  ' + value.unmerged[i].path)
-  }
-  lines.push('staged:    ' + String(value.staged.length))
-  for (let i = 0; i < value.staged.length; i += 1) lines.push('  ' + value.staged[i].code + '  ' + value.staged[i].path)
-  lines.push('unstaged:  ' + String(value.unstaged.length))
-  for (let i = 0; i < value.unstaged.length; i += 1) lines.push('  ' + value.unstaged[i].code + '  ' + value.unstaged[i].path)
-  lines.push('untracked: ' + String(value.untracked.length))
-  for (let i = 0; i < value.untracked.length; i += 1) lines.push('  ??  ' + value.untracked[i])
-  if (value.clean === true) lines.push('working tree clean')
-  return lines.join('\n')
-}
-
-function renderLog(value) {
-  if (value.ok !== true) return renderCommandFailure('git log', value)
-  if (value.commits.length === 0) return 'no commits matched in ' + String(value.cwd)
-  const lines = []
-  for (let i = 0; i < value.commits.length; i += 1) {
-    const entry = value.commits[i]
-    const refs = entry.refs.length > 0 ? '  (' + entry.refs + ')' : ''
-    lines.push(entry.short + '  ' + entry.date + '  ' + entry.author + '  ' + entry.subject + refs)
-  }
-  return lines.join('\n')
-}
-
-function renderDiff(value) {
-  if (value.ok !== true) return renderCommandFailure('git diff', value)
-  const lines = ['diff mode: ' + value.mode, 'cwd: ' + String(value.cwd), 'changed files: ' + String(value.paths.length)]
-  for (let i = 0; i < value.paths.length; i += 1) lines.push('  ' + value.paths[i])
-  if (value.note !== null) lines.push('note: ' + value.note)
-  if (value.cardAvailable === true) lines.push('(a native diff card is attached to this call)')
-  if (value.truncated === true) lines.push('(some file content was truncated in the card)')
-  if (value.patch !== null) { lines.push(''); lines.push(value.patch.replace(/\n+$/, '')) }
-  return lines.join('\n')
-}
-
-function renderBranches(value) {
-  if (value.ok !== true) return renderOutcome(value, 'git branch')
-  const lines = ['current: ' + (value.current === null ? '(detached or unknown)' : value.current)]
-  for (let i = 0; i < value.branches.length; i += 1) {
-    const entry = value.branches[i]
-    const track = entry.upstream.length > 0 ? ' -> ' + entry.upstream : ''
-    lines.push((entry.current ? '* ' : '  ') + entry.name + track + (entry.subject.length > 0 ? '  ' + entry.subject : ''))
-  }
-  return lines.join('\n')
-}
-
-function renderStashes(value) {
-  if (value.ok !== true) return renderOutcome(value, 'git stash')
-  if (value.stashes.length === 0) return 'no stash entries'
-  const lines = []
-  for (let i = 0; i < value.stashes.length; i += 1) {
-    const entry = value.stashes[i]
-    lines.push(entry.ref + '  ' + entry.date + '  ' + entry.subject)
-  }
-  return lines.join('\n')
-}
-
-/* ─────────────── diff helpers ─────────────── */
-
-function parseNulList(stdout) {
-  const parts = stdout.split('\u0000')
-  const out = []
-  for (let i = 0; i < parts.length; i += 1) if (parts[i].length > 0) out.push(parts[i])
-  return out
-}
-
-function capText(text) {
-  const lines = text.split('\n')
-  if (lines.length > 4000) return { text: lines.slice(0, 4000).join('\n'), cut: true }
-  if (text.length > 300000) return { text: text.slice(0, 300000), cut: true }
-  return { text: text, cut: false }
-}
-
-/* A path is data, and `cat <path>` did not treat it as data: a file called `-n`
-   is an option to cat, so the card showed it as empty rather than as itself.
-   (`:./path` would be the other half of this — except that git already resolves
-   `:<path>` correctly even when the path contains a colon, and `./` would break
-   the case where the repository path is a subdirectory, so the spec is left as
-   git's plain `:<path>` form.) */
-async function readBlob(args, spec, exec) {
-  const result = await git(args, ['show', spec], exec, { maxBytes: 400000 })
-  if (result.exitCode !== 0) return null
-  return result.stdout
-}
-
-async function readWorktreeFile(args, path, exec) {
-  const result = await invoke('cat -- ' + shq(path), args, exec, { maxBytes: 400000 })
-  if (result.exitCode !== 0) return null
-  return result.stdout
-}
-
-const CARD_TOTAL_LIMIT = 500000
-
-/* ─────────────── tool registration ─────────────── */
-
-function define(name, definition) {
-  definition.name = name
-  ctx.effect(function () {
-    return harness.registerTool(ctx, harness.defineTool(definition))
-  }, 'dsh-git-idea tool ' + name)
-}
-
-define('git', {
-  description: 'Run any git command as a token array: the complete escape hatch behind the structured git_* tools. There is no argument allowlist, so every git subcommand works (clone, init, worktree, submodule, bisect, tag, merge, rebase, cherry-pick, revert, blame, gc, ...). Destructive commands are refused unless confirm: true is also passed. Always check the reported exit code.',
-  parameters: {
-    args: {
-      type: 'array',
-      items: { type: 'string' },
-      required: true,
-      description: 'git arguments as separate tokens, WITHOUT the leading "git". Example: ["log", "--oneline", "-n", "5"].',
-    },
-    repo: { type: 'string', description: 'Repository directory. Defaults to the session working directory.' },
-    stdin: { type: 'string', description: 'Text piped to git standard input.' },
-    timeoutMs: { type: 'number', description: 'Timeout in milliseconds. Default 120000.' },
-    confirm: { type: 'boolean', description: 'Must be true to allow a destructive command. Without it the command is refused and nothing runs.' },
-  },
-  output: {
-    schema: { type: 'json' },
-    render: function (_args, value) { return [{ type: 'text', text: renderPassthrough(value) }] },
-  },
-  isConcurrencySafe: function (args) {
-    return classify(Array.isArray(args.args) ? args.args.filter(isStr) : []).level === 'read'
-  },
-  execute: async function (args, exec) {
-    const argv = Array.isArray(args.args) ? args.args.filter(isStr) : []
-    const cwd = here(args, exec)
-    if (argv.length === 0) {
-      return { ok: false, blocked: 'invalid-args', reason: 'args must hold at least one git token, e.g. ["status"]', command: 'git', cwd: cwd }
-    }
-    const verdict = classify(argv)
-    if (verdict.level === 'forbidden') {
-      return { ok: false, blocked: 'forbidden', reason: verdict.why, command: 'git ' + argv.join(' '), cwd: cwd }
-    }
-    if (verdict.level === 'destructive' && args.confirm !== true) {
-      return { ok: false, blocked: 'confirmation-required', reason: verdict.why, command: 'git ' + argv.join(' '), cwd: cwd }
-    }
-    const options = {}
-    if (isStr(args.stdin)) options.stdin = args.stdin
-    if (typeof args.timeoutMs === 'number') options.timeoutMs = args.timeoutMs
-    return await git(args, argv, exec, options)
-  },
-})
-
-define('git_status', {
-  description: 'Structured repository status: current branch, detached state, upstream, ahead/behind counts, and the staged, unstaged, untracked and unmerged file lists. Reads git status --porcelain=v2, so it is stable across git versions.',
-  parameters: {
-    repo: { type: 'string', description: 'Repository directory. Defaults to the session working directory.' },
-  },
-  output: {
-    schema: { type: 'json' },
-    render: function (_args, value) { return [{ type: 'text', text: renderStatus(value) }] },
-  },
-  isConcurrencySafe: function () { return true },
-  execute: async function (args, exec) {
-    /* A read must not take .git/index.lock: `git status` would happily refresh
-       the index cache, and a tool call that overlaps anyone else's `git add`
-       makes THEIR command fail with "Unable to create index.lock". */
-    const result = await git(args, ['--no-optional-locks', '-c', 'core.quotePath=false', 'status', '--porcelain=v2', '--branch', '--untracked-files=all'], exec, {})
-    if (result.exitCode !== 0) {
-      return { ok: false, cwd: result.cwd, exitCode: result.exitCode, stderr: result.stderr, error: 'not-a-repository' }
-    }
-    const parsed = parseStatusV2(result.stdout)
-    parsed.ok = true
-    parsed.cwd = result.cwd
-    parsed.exitCode = result.exitCode
-    parsed.clean = parsed.staged.length === 0 && parsed.unstaged.length === 0 && parsed.untracked.length === 0 && parsed.unmerged.length === 0
-    parsed.stderr = result.stderr
-    return parsed
-  },
-})
-
-define('git_log', {
-  description: 'Structured commit history: hash, short hash, author, ISO date, subject line and the refs each commit carries. Supports a revision range, a path filter and a result cap.',
-  parameters: {
-    repo: { type: 'string', description: 'Repository directory. Defaults to the session working directory.' },
-    maxCount: { type: 'number', description: 'Maximum commits to return. Default 20, hard cap 200.' },
-    ref: { type: 'string', description: 'Revision or range to walk, e.g. "HEAD", "main..feature", "v1.0.0". Default HEAD.' },
-    path: { type: 'string', description: 'Limit history to one path.' },
-  },
-  output: {
-    schema: { type: 'json' },
-    render: function (_args, value) { return [{ type: 'text', text: renderLog(value) }] },
-  },
-  isConcurrencySafe: function () { return true },
-  execute: async function (args, exec) {
-    const requested = typeof args.maxCount === 'number' && args.maxCount > 0 ? Math.floor(args.maxCount) : 20
-    const maxCount = requested > 200 ? 200 : requested
-    const ref = isStr(args.ref) ? args.ref.trim() : ''
-    const path = isStr(args.path) ? args.path.trim() : ''
-    /* A revision is positional, so a "-"-leading one is an option to git. A path
-       is not guarded here: it travels after `--`, where git already reads it as a
-       path, and a file called `-notes.txt` is a legitimate name. */
-    const bad = optionLike([['ref', ref]])
-    if (bad !== null) {
-      return { ok: false, cwd: here(args, exec), exitCode: null, stderr: bad.reason, error: 'option-like-value' }
-    }
-    const argv = ['-c', 'core.quotePath=false', 'log', '--max-count=' + String(maxCount), '--pretty=format:%H%x1f%h%x1f%an%x1f%aI%x1f%s%x1f%D%x1e']
-    if (ref.length > 0) argv.push(ref)
-    if (path.length > 0) { argv.push('--'); argv.push(path) }
-    const result = await git(args, argv, exec, {})
-    if (result.exitCode !== 0) {
-      return { ok: false, cwd: result.cwd, exitCode: result.exitCode, stderr: result.stderr, error: 'log-failed' }
-    }
-    const commits = []
-    const records = result.stdout.split('\u001e')
-    for (let i = 0; i < records.length; i += 1) {
-      const record = records[i].replace(/^\n+/, '')
-      if (record.length === 0) continue
-      const fields = record.split('\u001f')
-      const rawDate = field(fields, 3)
-      commits.push({
-        hash: field(fields, 0),
-        short: field(fields, 1),
-        author: field(fields, 2),
-        date: rawDate.length >= 16 ? rawDate.slice(0, 16).replace('T', ' ') : rawDate,
-        subject: field(fields, 4),
-        refs: field(fields, 5),
-      })
-    }
-    return { ok: true, cwd: result.cwd, exitCode: result.exitCode, count: commits.length, commits: commits, stderr: result.stderr }
-  },
-})
-
-define('git_diff', {
-  description: 'Diff between two repository states, returning the changed file list plus full before/after content so the UI renders a native diff card. modes: "worktree" (index vs working tree), "staged" (HEAD vs index), "commit" (ref against its first parent), "range" (ref..to). Narrow with paths for a large change set: above maxFiles the card is skipped and the raw unified patch is returned instead.',
-  parameters: {
-    repo: { type: 'string', description: 'Repository directory. Defaults to the session working directory.' },
-    mode: { type: 'string', required: true, enum: ['worktree', 'staged', 'commit', 'range'], description: 'Which two states to compare.' },
-    ref: { type: 'string', description: 'Base revision: for "commit" the commit to show (default HEAD); for "range" the range start.' },
-    to: { type: 'string', description: 'Range end. Required for mode "range".' },
-    paths: { type: 'array', items: { type: 'string' }, description: 'Limit the diff to these paths.' },
-    maxFiles: { type: 'number', description: 'Maximum files to build the diff card for. Default 12, cap 50.' },
-  },
-  output: {
-    schema: { type: 'json' },
-    render: function (_args, value) { return [{ type: 'text', text: renderDiff(value) }] },
-    presentationMeta: function (_args, value) {
-      return { mode: value.mode, cardAvailable: value.cardAvailable === true, diffs: value.files }
-    },
-  },
-  isConcurrencySafe: function () { return true },
-  presentResult: function (_args, result) {
-    if (result == null || result.isError === true) return undefined
-    const meta = result.meta
-    if (meta == null || meta.cardAvailable !== true) return undefined
-    const diffs = Array.isArray(meta.diffs) ? meta.diffs : []
-    if (diffs.length === 0) return undefined
-    return { card: 'diff', title: 'git diff (' + String(meta.mode) + ')', diffs: diffs }
-  },
-  execute: async function (args, exec) {
-    const mode = isStr(args.mode) ? args.mode : 'worktree'
-    const bad = optionLike([['ref', isStr(args.ref) ? args.ref.trim() : ''], ['to', isStr(args.to) ? args.to.trim() : '']])
-    if (bad !== null) {
-      return { ok: false, cwd: here(args, exec), exitCode: null, stderr: bad.reason, error: 'option-like-value' }
-    }
-    const requested = typeof args.maxFiles === 'number' && args.maxFiles > 0 ? Math.floor(args.maxFiles) : 12
-    const maxFiles = requested > 50 ? 50 : requested
-    const paths = Array.isArray(args.paths) ? args.paths.filter(isStr) : []
-    const ref = isStr(args.ref) && args.ref.trim().length > 0 ? args.ref.trim() : 'HEAD'
-    const to = isStr(args.to) && args.to.trim().length > 0 ? args.to.trim() : null
-    const suffix = paths.length > 0 ? ['--'].concat(paths) : []
-
-    let listArgv
-    let patchArgv
-    let oldSpec
-    let newSpec
-    let fromWorktree = false
-
-    if (mode === 'worktree') {
-      listArgv = ['-c', 'core.quotePath=false', 'diff', '--name-only', '--no-renames', '-z'].concat(suffix)
-      patchArgv = ['-c', 'core.quotePath=false', 'diff', '--no-color', '-U3'].concat(suffix)
-      oldSpec = function (path) { return ':' + path }
-      fromWorktree = true
-    } else if (mode === 'staged') {
-      listArgv = ['-c', 'core.quotePath=false', 'diff', '--cached', '--name-only', '--no-renames', '-z'].concat(suffix)
-      patchArgv = ['-c', 'core.quotePath=false', 'diff', '--cached', '--no-color', '-U3'].concat(suffix)
-      oldSpec = function (path) { return 'HEAD:' + path }
-      newSpec = function (path) { return ':' + path }
-    } else if (mode === 'commit') {
-      listArgv = ['-c', 'core.quotePath=false', 'show', '--name-only', '--no-renames', '-z', '--format=', ref].concat(suffix)
-      patchArgv = ['-c', 'core.quotePath=false', 'show', '--no-color', '-U3', '--format=', ref].concat(suffix)
-      oldSpec = function (path) { return ref + '^:' + path }
-      newSpec = function (path) { return ref + ':' + path }
-    } else if (mode === 'range') {
-      if (to === null) return { ok: false, cwd: here(args, exec), error: 'mode "range" needs a "to" revision' }
-      listArgv = ['-c', 'core.quotePath=false', 'diff', '--name-only', '--no-renames', '-z', ref + '..' + to].concat(suffix)
-      patchArgv = ['-c', 'core.quotePath=false', 'diff', '--no-color', '-U3', ref + '..' + to].concat(suffix)
-      oldSpec = function (path) { return ref + ':' + path }
-      newSpec = function (path) { return to + ':' + path }
-    } else {
-      return { ok: false, cwd: here(args, exec), error: 'unknown mode ' + mode }
-    }
-
-    const listed = await git(args, listArgv, exec, {})
-    if (listed.exitCode !== 0) {
-      return { ok: false, cwd: listed.cwd, exitCode: listed.exitCode, stderr: listed.stderr, error: 'diff-failed' }
-    }
-    const names = parseNulList(listed.stdout)
-    const result = {
-      ok: true, cwd: listed.cwd, exitCode: listed.exitCode, mode: mode,
-      paths: names, files: [], cardAvailable: false, truncated: false, patch: null, note: null, stderr: listed.stderr,
-    }
-    if (names.length === 0) { result.note = 'no differences in this mode'; return result }
-
-    if (names.length > maxFiles) {
-      const patch = await git(args, patchArgv, exec, { maxBytes: 400000 })
-      result.patch = patch.stdout
-      result.note = String(names.length) + ' files changed, more than maxFiles=' + String(maxFiles) + '; pass paths to narrow the diff and get the diff card'
-      return result
-    }
-
-    const files = []
-    let total = 0
-    let cut = false
-    let overLimit = false
-    for (let i = 0; i < names.length; i += 1) {
-      const path = names[i]
-      const rawOld = await readBlob(args, oldSpec(path), exec)
-      let rawNew = null
-      if (fromWorktree) rawNew = await readWorktreeFile(args, path, exec)
-      else rawNew = await readBlob(args, newSpec(path), exec)
-      const oldCapped = rawOld === null ? null : capText(rawOld)
-      const newCapped = capText(rawNew === null ? '' : rawNew)
-      if ((oldCapped !== null && oldCapped.cut) || newCapped.cut) cut = true
-      total += (oldCapped === null ? 0 : oldCapped.text.length) + newCapped.text.length
-      files.push({ path: path, oldText: oldCapped === null ? null : oldCapped.text, newText: newCapped.text })
-      if (total > CARD_TOTAL_LIMIT) { overLimit = true; break }
-    }
-    result.truncated = cut
-    if (overLimit) {
-      const patch = await git(args, patchArgv, exec, { maxBytes: 400000 })
-      result.patch = patch.stdout
-      result.note = 'the combined before/after content is too large for the diff card; the raw patch is returned instead'
-      return result
-    }
-    result.files = files
-    result.cardAvailable = true
-    return result
-  },
-})
-
-define('git_commit', {
-  description: 'Stage and commit in one step. By default it commits exactly what is already staged; pass paths to stage only those paths first, or all: true to stage every change. Reports the new commit hash.',
-  parameters: {
-    repo: { type: 'string', description: 'Repository directory. Defaults to the session working directory.' },
-    message: { type: 'string', required: true, description: 'Commit message. Passed as a single argument, never through a shell.' },
-    paths: { type: 'array', items: { type: 'string' }, description: 'Stage only these paths before committing.' },
-    all: { type: 'boolean', description: 'Stage every change (git add -A) before committing.' },
-    amend: { type: 'boolean', description: 'Amend the previous commit instead of creating a new one.' },
-    signoff: { type: 'boolean', description: 'Add a Signed-off-by trailer.' },
-  },
-  output: {
-    schema: { type: 'json' },
-    render: function (_args, value) {
-      if (value.ok === true) return [{ type: 'text', text: 'committed ' + String(value.hash) + (value.amended === true ? ' (amended)' : '') + '\n' + String(value.stdout).replace(/\n+$/, '') }]
-      return [{ type: 'text', text: renderOutcome(value, 'git commit') }]
-    },
-  },
-  isConcurrencySafe: function () { return false },
-  execute: async function (args, exec) {
-    const paths = Array.isArray(args.paths) ? args.paths.filter(isStr) : []
-    if (args.all === true) {
-      const staged = await git(args, ['add', '-A'], exec, {})
-      if (staged.exitCode !== 0) return { ok: false, cwd: staged.cwd, exitCode: staged.exitCode, stdout: staged.stdout, stderr: staged.stderr, error: 'stage-failed' }
-    } else if (paths.length > 0) {
-      const staged = await git(args, ['add', '--'].concat(paths), exec, {})
-      if (staged.exitCode !== 0) return { ok: false, cwd: staged.cwd, exitCode: staged.exitCode, stdout: staged.stdout, stderr: staged.stderr, error: 'stage-failed' }
-    }
-    const argv = ['commit', '-m', args.message]
-    if (args.amend === true) argv.push('--amend')
-    if (args.signoff === true) argv.push('--signoff')
-    const committed = await git(args, argv, exec, {})
-    if (committed.exitCode !== 0) {
-      return { ok: false, cwd: committed.cwd, exitCode: committed.exitCode, stdout: committed.stdout, stderr: committed.stderr, error: 'commit-failed' }
-    }
-    const rev = await git(args, ['rev-parse', '--short', 'HEAD'], exec, {})
-    return {
-      ok: true, cwd: committed.cwd, exitCode: committed.exitCode, amended: args.amend === true,
-      hash: rev.exitCode === 0 ? rev.stdout.trim() : null,
-      message: args.message, stdout: committed.stdout, stderr: committed.stderr,
-    }
-  },
-})
-
-define('git_branch', {
-  description: 'List, create, switch, delete or rename branches. "list" reports local branches with their upstream, head commit and subject; force-deleting needs confirm: true.',
-  parameters: {
-    repo: { type: 'string', description: 'Repository directory. Defaults to the session working directory.' },
-    action: { type: 'string', required: true, enum: ['list', 'create', 'switch', 'delete', 'rename'], description: 'Operation to perform.' },
-    name: { type: 'string', description: 'Branch name. Required for every action except "list". For "rename" it is the NEW name of the current branch.' },
-    startPoint: { type: 'string', description: 'For "create", the start point; for "switch", creates the branch there first.' },
-    all: { type: 'boolean', description: 'For "list", include remote-tracking branches.' },
-    force: { type: 'boolean', description: 'For "delete", delete even when unmerged (git branch -D). Needs confirm: true.' },
-    confirm: { type: 'boolean', description: 'Must be true when force is used.' },
-  },
-  output: {
-    schema: { type: 'json' },
-    render: function (_args, value) {
-      if (value.action === 'list') return [{ type: 'text', text: renderBranches(value) }]
-      return [{ type: 'text', text: renderOutcome(value, 'git branch ' + String(value.action)) }]
-    },
-  },
-  isConcurrencySafe: function () { return false },
-  execute: async function (args, exec) {
-    const action = args.action
-    const name = isStr(args.name) && args.name.trim().length > 0 ? args.name.trim() : null
-    if (action !== 'list' && name === null) {
-      return { ok: false, action: action, cwd: here(args, exec), error: 'name is required for action ' + action }
-    }
-    const startPoint = isStr(args.startPoint) ? args.startPoint.trim() : ''
-    const bad = optionLike([['name', name === null ? '' : name], ['startPoint', startPoint]])
-    if (bad !== null) {
-      return { ok: false, action: action, cwd: here(args, exec), exitCode: null, stderr: bad.reason, error: 'option-like-value' }
-    }
-    if (action === 'delete' && args.force === true && args.confirm !== true) {
-      return { ok: false, action: action, cwd: here(args, exec), blocked: 'confirmation-required', reason: 'force-deleting a branch discards commits that are not merged anywhere else' }
-    }
-
-    if (action === 'list') {
-      const argv = ['-c', 'core.quotePath=false', 'branch', '--format=%(refname:short)%1f%(HEAD)%1f%(upstream:short)%1f%(objectname:short)%1f%(contents:subject)']
-      if (args.all === true) argv.push('-a')
-      const listed = await git(args, argv, exec, {})
-      if (listed.exitCode !== 0) {
-        return { ok: false, action: 'list', cwd: listed.cwd, exitCode: listed.exitCode, stdout: listed.stdout, stderr: listed.stderr, error: 'branch-list-failed' }
-      }
-      const branches = []
-      let current = null
-      const rows = listed.stdout.split('\n')
-      for (let i = 0; i < rows.length; i += 1) {
-        const row = rows[i]
-        if (row.length === 0) continue
-        const fields = row.split('\u001f')
-        const isCurrent = fields[1] === '*'
-        if (isCurrent) current = fields[0] === undefined ? null : fields[0]
-        branches.push({
-          name: field(fields, 0),
-          current: isCurrent,
-          upstream: field(fields, 2),
-          head: field(fields, 3),
-          subject: field(fields, 4),
-        })
-      }
-      return { ok: true, action: 'list', cwd: listed.cwd, exitCode: listed.exitCode, current: current, branches: branches, stdout: listed.stdout, stderr: listed.stderr }
-    }
-
-    let argv
-    if (action === 'create') {
-      argv = ['branch', name]
-      if (startPoint.length > 0) argv.push(startPoint)
-    } else if (action === 'switch') {
-      if (startPoint.length > 0) argv = ['switch', '-c', name, startPoint]
-      else argv = ['switch', name]
-    } else if (action === 'delete') {
-      argv = ['branch', args.force === true ? '-D' : '-d', name]
-    } else {
-      argv = ['branch', '-m', name]
-    }
-    const done = await git(args, argv, exec, {})
-    done.action = action
-    return done
-  },
-})
-
-define('git_stash', {
-  description: 'Manage the stash: list entries, push the current changes onto it, pop or apply an entry, show one, or drop/clear entries. Dropping and clearing need confirm: true.',
-  parameters: {
-    repo: { type: 'string', description: 'Repository directory. Defaults to the session working directory.' },
-    action: { type: 'string', required: true, enum: ['list', 'push', 'pop', 'apply', 'show', 'drop', 'clear'], description: 'Operation to perform.' },
-    message: { type: 'string', description: 'For "push", the stash message.' },
-    index: { type: 'number', description: 'For pop/apply/show/drop, which stash entry (default 0, the most recent).' },
-    paths: { type: 'array', items: { type: 'string' }, description: 'For "push", stash only these paths.' },
-    confirm: { type: 'boolean', description: 'Must be true for "drop" and "clear".' },
-  },
-  output: {
-    schema: { type: 'json' },
-    render: function (_args, value) {
-      if (value.action === 'list') return [{ type: 'text', text: renderStashes(value) }]
-      return [{ type: 'text', text: renderOutcome(value, 'git stash ' + String(value.action)) }]
-    },
-  },
-  isConcurrencySafe: function () { return false },
-  execute: async function (args, exec) {
-    const action = args.action
-    const rawIndex = typeof args.index === 'number' && args.index >= 0 ? Math.floor(args.index) : 0
-    const selector = 'stash@{' + String(rawIndex) + '}'
-
-    if (action === 'clear') {
-      if (args.confirm !== true) return { ok: false, action: action, cwd: here(args, exec), blocked: 'confirmation-required', reason: 'stash clear drops every stash entry permanently' }
-      const done = await git(args, ['stash', 'clear'], exec, {})
-      done.action = action
-      return done
-    }
-    if (action === 'drop') {
-      if (args.confirm !== true) return { ok: false, action: action, cwd: here(args, exec), blocked: 'confirmation-required', reason: 'stash drop discards a stash entry permanently' }
-      const done = await git(args, ['stash', 'drop', selector], exec, {})
-      done.action = action
-      return done
-    }
-    if (action === 'list') {
-      const listed = await git(args, ['stash', 'list', '--format=%gd%x1f%gs%x1f%aI'], exec, {})
-      if (listed.exitCode !== 0) {
-        return { ok: false, action: 'list', cwd: listed.cwd, exitCode: listed.exitCode, stdout: listed.stdout, stderr: listed.stderr, error: 'stash-list-failed', stashes: [] }
-      }
-      const stashes = []
-      const rows = listed.stdout.split('\n')
-      for (let i = 0; i < rows.length; i += 1) {
-        if (rows[i].length === 0) continue
-        const fields = rows[i].split('\u001f')
-        const stamp = field(fields, 2)
-        stashes.push({
-          ref: field(fields, 0),
-          subject: field(fields, 1),
-          date: stamp.length >= 16 ? stamp.slice(0, 16).replace('T', ' ') : stamp,
-        })
-      }
-      return { ok: true, action: 'list', cwd: listed.cwd, exitCode: listed.exitCode, stashes: stashes, stdout: listed.stdout, stderr: listed.stderr }
-    }
-
-    let argv
-    if (action === 'push') {
-      argv = ['stash', 'push']
-      if (isStr(args.message) && args.message.length > 0) { argv.push('-m'); argv.push(args.message) }
-      const paths = Array.isArray(args.paths) ? args.paths.filter(isStr) : []
-      if (paths.length > 0) argv = argv.concat(['--']).concat(paths)
-    } else {
-      argv = ['stash', action, selector]
-    }
-    const done = await git(args, argv, exec, {})
-    done.action = action
-    return done
-  },
-})
-
-define('git_sync', {
-  description: 'Work with remotes: fetch, pull, push, list remotes, and add/remove/retarget one. A protected branch (main/master) can never be force-pushed, and any force push needs confirm: true.',
-  parameters: {
-    repo: { type: 'string', description: 'Repository directory. Defaults to the session working directory.' },
-    action: { type: 'string', required: true, enum: ['fetch', 'pull', 'push', 'remote-list', 'remote-add', 'remote-remove', 'set-url'], description: 'Operation to perform.' },
-    remote: { type: 'string', description: 'Remote name, e.g. "origin".' },
-    branch: { type: 'string', description: 'Branch to pull or push.' },
-    url: { type: 'string', description: 'Remote URL for remote-add and set-url.' },
-    setUpstream: { type: 'boolean', description: 'For "push", set the upstream tracking branch (git push -u).' },
-    prune: { type: 'boolean', description: 'For "fetch", drop remote-tracking refs that no longer exist (--prune).' },
-    ff: { type: 'string', enum: ['auto', 'only', 'rebase'], description: 'For "pull": "only" passes --ff-only, "rebase" passes --rebase.' },
-    force: { type: 'string', enum: ['none', 'lease', 'force'], description: 'For "push": "lease" passes --force-with-lease, "force" passes --force and needs confirm: true.' },
-    confirm: { type: 'boolean', description: 'Must be true for a force push and for remote-remove.' },
-  },
-  output: {
-    schema: { type: 'json' },
-    render: function (_args, value) { return [{ type: 'text', text: renderOutcome(value, 'git ' + String(value.action)) }] },
-  },
-  isConcurrencySafe: function () { return false },
-  execute: async function (args, exec) {
-    const action = args.action
-    const remote = isStr(args.remote) && args.remote.trim().length > 0 ? args.remote.trim() : null
-    const branch = isStr(args.branch) && args.branch.trim().length > 0 ? args.branch.trim() : null
-    const url = isStr(args.url) && args.url.trim().length > 0 ? args.url.trim() : null
-    const cwd = here(args, exec)
-    const bad = optionLike([['remote', remote], ['branch', branch], ['url', url]])
-    if (bad !== null) {
-      return { ok: false, action: action, cwd: cwd, exitCode: null, stderr: bad.reason, error: 'option-like-value' }
-    }
-
-    if (action === 'push' && args.force === 'force') {
-      /* The branch that is not named is the branch you are on, and "a protected
-         branch can never be force-pushed" has to mean that branch too: without
-         this, `force: 'force'` with no branch force-pushed whatever was checked
-         out after a bare `confirm`. Resolved here, once, on the one path that
-         needs it. */
-      let target = branch
-      if (target === null) {
-        const head = await git(args, ['symbolic-ref', '--quiet', '--short', 'HEAD'], exec, {})
-        target = head.exitCode === 0 ? head.stdout.trim() : null
-      }
-      if (target !== null && isProtectedBranch(target)) {
-        return { ok: false, action: action, cwd: cwd, blocked: 'forbidden', reason: 'force-pushing to a protected branch (main/master) is never allowed' }
-      }
-    }
-    if (action === 'push' && (args.force === 'force' || args.force === 'lease') && args.confirm !== true) {
-      return { ok: false, action: action, cwd: cwd, blocked: 'confirmation-required', reason: 'a force push overwrites remote history' }
-    }
-    if (action === 'remote-remove' && args.confirm !== true) {
-      return { ok: false, action: action, cwd: cwd, blocked: 'confirmation-required', reason: 'remote remove detaches every local branch that tracks it' }
-    }
-    if ((action === 'remote-add' || action === 'set-url') && (remote === null || url === null)) {
-      return { ok: false, action: action, cwd: cwd, error: action + ' needs both remote and url' }
-    }
-    if (action === 'remote-remove' && remote === null) {
-      return { ok: false, action: action, cwd: cwd, error: action + ' needs remote' }
-    }
-
-    let argv
-    if (action === 'fetch') {
-      argv = ['fetch']
-      if (remote !== null) argv.push(remote)
-      if (args.prune === true) argv.push('--prune')
-    } else if (action === 'pull') {
-      argv = ['pull']
-      if (remote !== null) argv.push(remote)
-      if (branch !== null) argv.push(branch)
-      if (args.ff === 'only') argv.push('--ff-only')
-      else if (args.ff === 'rebase') argv.push('--rebase')
-    } else if (action === 'push') {
-      argv = ['push']
-      if (args.setUpstream === true) argv.push('-u')
-      if (args.force === 'lease') argv.push('--force-with-lease')
-      else if (args.force === 'force') argv.push('--force')
-      if (remote !== null) argv.push(remote)
-      if (branch !== null) argv.push(branch)
-    } else if (action === 'remote-list') {
-      argv = ['remote', '-v']
-    } else if (action === 'remote-add') {
-      argv = ['remote', 'add', remote, url]
-    } else if (action === 'remote-remove') {
-      argv = ['remote', 'remove', remote]
-    } else {
-      argv = ['remote', 'set-url', remote, url]
-    }
-
-    const done = await git(args, argv, exec, { timeoutMs: 300000 })
-    done.action = action
-    return done
-  },
-})
-
 /* ─────────────── graph layout ─────────────── */
 
 function layoutGraph(commits, maxLanes) {
@@ -1361,6 +524,31 @@ function argsFor(input) {
   return argsAt(input, repoFrom(input))
 }
 
+/* ── a path that stays inside the repository ──
+
+   Every path the panel sends is one git itself listed, so it is relative to the
+   work-tree root. Three of the four diff reads pass it as a pathspec, which git
+   keeps inside the repository on its own. The untracked read cannot: it is
+   `git diff --no-index -- /dev/null <path>`, and that command reads whatever the
+   path names. Measured here, an absolute path came back with the contents of
+   /etc/hostname — a file no reader of a git panel asked for. So anything
+   absolute, or stepping up with "..", is refused rather than resolved.
+
+   A NUL byte is refused for a different reason: it survives as far as the shell
+   layer, where Node's own `spawn` rejects the argument outright (`ERR_INVALID_ARG_VALUE`,
+   measured), so the read would throw instead of answering. */
+function repoRelativePath(path) {
+  if (!isStr(path) || path.length === 0) return 'path is required'
+  if (path.charAt(0) === '/' || path.charAt(0) === '\\') return 'path must be relative to the repository root'
+  if (path.length > 1 && path.charAt(1) === ':') return 'path must be relative to the repository root'
+  if (path.indexOf('\u0000') >= 0) return 'path may not contain a NUL byte'
+  const parts = path.split(/[\\/]/)
+  for (let i = 0; i < parts.length; i += 1) {
+    if (parts[i] === '..') return 'path may not step outside the repository'
+  }
+  return ''
+}
+
 /* ─────────────── per-repository read cache ───────────────
 
    Opening the panel used to cost nine child processes and nothing was reused,
@@ -1467,6 +655,15 @@ function sequencerShell() {
   ].join('\n')
 }
 
+/* Whether this machine can sign a commit at all, asked in the same process as
+   the rest of the whole-tree read — git's own lookup, and a marker instead of an
+   exit code for the same reason `PANEL_NO_GIT` is one (see 10-shell.js). It is
+   here so the commit pane can say it before the reader writes a message and gets
+   refused, rather than after. */
+function identityShell(target) {
+  return "    LC_ALL=C " + gitCmd() + " -C " + shq(target) + " var GIT_AUTHOR_IDENT >/dev/null 2>&1 || printf '" + PANEL_NO_IDENT + "\\n'"
+}
+
 /* The branch half of the identity read, in one git process instead of three.
 
    The branch name comes out of `$gd/HEAD` itself rather than out of
@@ -1495,7 +692,7 @@ function branchIdentityShell(target) {
     '    fi',
     '    if [ -n "$b" ]; then',
     "      printf 'B:%s\\n' \"$b\"",
-    "      printf 'U:%s\\n' \"$(LC_ALL=C git -C " + shq(target) + " for-each-ref --format='%(upstream:short)%1f%(upstream:track)' \"refs/heads/$b\" 2>/dev/null)\"",
+    "      printf 'U:%s\\n' \"$(LC_ALL=C " + gitCmd() + " -C " + shq(target) + " for-each-ref --format='%(upstream:short)%1f%(upstream:track)' \"refs/heads/$b\" 2>/dev/null)\"",
     '    fi',
   ].join('\n')
 }
@@ -1510,11 +707,22 @@ function pathShell(target, middle) {
   return [
     'if [ -d ' + quoted + ' ]; then',
     "  printf 'K:dir\\n'",
+    /* Asked here, once, before anything that needs git runs. Whether this path
+       is a repository is answered by the filesystem above and stays true on a
+       machine with no git; what is not true is everything the middle would then
+       report, because an empty answer from a git that never ran is not "there is
+       nothing here". This is the multiplexed half of `gitGuard` — see there for
+       why the answer comes out as a marker instead of an exit code — and it
+       stops the script rather than letting the middle fail in a way that would
+       be read as git refusing the repository. `pathKind` is deliberately on the
+       other side of it: whether the path exists does not need git, so it still
+       answers here. */
+    '  if ! command -v ' + gitCmd() + ' >/dev/null 2>&1; then printf ' + shq(PANEL_NO_GIT + '\\n') + '; exit 0; fi',
     /* Guarded by `repoHere` and not left to git: without the guard,
        `git rev-parse` in a directory that is not a repository walks up and
        answers for a parent one. */
     '  if ' + repoHere(target) + '; then',
-    '    gd=$(git -C ' + quoted + ' rev-parse --absolute-git-dir 2>/dev/null)',
+    '    gd=$(' + gitCmd() + ' -C ' + quoted + ' rev-parse --absolute-git-dir 2>/dev/null)',
     '  else',
     "    gd=''",
     '  fi',
@@ -1585,7 +793,7 @@ function panelCommand(target, paths) {
   const asked = paths == null ? [] : paths
   return pathShell(target, [
     '  if ' + repoHere(target) + '; then',
-    "    out=$(git -C " + quoted + " --no-optional-locks -c core.quotePath=false status --porcelain=v2 --branch --untracked-files=normal" + pathspecSuffix(asked) + " 2>&1); rc=$?",
+    "    out=$(" + gitCmd() + " -C " + quoted + " --no-optional-locks -c core.quotePath=false status --porcelain=v2 --branch --untracked-files=normal" + pathspecSuffix(asked) + " 2>&1); rc=$?",
     '  else',
     "    out='fatal: not a git repository'; rc=1",
     '  fi',
@@ -1593,6 +801,7 @@ function panelCommand(target, paths) {
     "  printf 'RC:%s\n' \"$rc\"",
     '  if [ -n "$gd" ]; then',
     sequencerShell(),
+    identityShell(target),
     '  fi',
   ].join('\n'))
 }
@@ -1612,8 +821,9 @@ function panelCommand(target, paths) {
    the reported status is identical either way.
 
    The rule is not "this one call": it is every read this plugin makes. The full
-   panel read and the `git_status` tool missed it for a while and were caught by
-   a case of exactly this — a fetch that triggered auto-gc was blamed first, but
+   panel read missed it for a while (so did the `git_status` tool, while the
+   plugin still had one) and was caught by a case of exactly this — a fetch that
+   triggered auto-gc was blamed first, but
    background gc never touches index.lock (it runs pack-objects --indexed-objects,
    which only reads the index). Whoever writes .git/index is the suspect, and a
    `git status` writes it. `test/gp34a` now holds both the rule and the probe. */
@@ -1633,7 +843,7 @@ function watchCommand(target, deep, paths) {
   const out = [
     "st() { stat -c '%Y:%s' \"$1\" 2>/dev/null || stat -f '%m:%z' \"$1\" 2>/dev/null; }",
     'if ' + repoHere(target) + '; then',
-    '  gd=$(git -C ' + quoted + ' rev-parse --absolute-git-dir 2>/dev/null)',
+    '  gd=$(' + gitCmd() + ' -C ' + quoted + ' rev-parse --absolute-git-dir 2>/dev/null)',
     'else',
     "  gd=''",
     'fi',
@@ -1647,11 +857,11 @@ function watchCommand(target, deep, paths) {
        it. The same command over the paths the tree was showing is 0.5s. A file
        that was clean and is now modified is the one thing this cannot see; the
        panel reads the whole tree for that on its own clock. */
-    out.push('if [ -n "$gd" ]; then git -C ' + quoted + ' --no-optional-locks -c core.quotePath=false status --porcelain=v2 --branch --untracked-files=normal' + pathspecSuffix(asked) + ' 2>&1; fi')
+    out.push('if [ -n "$gd" ]; then ' + gitCmd() + ' -C ' + quoted + ' --no-optional-locks -c core.quotePath=false status --porcelain=v2 --branch --untracked-files=normal' + pathspecSuffix(asked) + ' 2>&1; fi')
   }
   out.push(
-    "printf 'F:%s\\n' \"" + whenRepo("git -C " + quoted + " for-each-ref --format='%(refname):%(objectname)' refs/heads refs/remotes 2>/dev/null") + "\"",
-    "printf 'H:%s\\n' \"" + whenRepo("git -C " + quoted + " rev-parse -q --verify HEAD 2>/dev/null") + "\"",
+    "printf 'F:%s\\n' \"" + whenRepo(gitCmd() + " -C " + quoted + " for-each-ref --format='%(refname):%(objectname)' refs/heads refs/remotes 2>/dev/null") + "\"",
+    "printf 'H:%s\\n' \"" + whenRepo(gitCmd() + " -C " + quoted + " rev-parse -q --verify HEAD 2>/dev/null") + "\"",
     "printf 'I:%s\\n' \"$(st \"$gd/index\")\"",
     /* The HEAD *file*, not just its stamp. Two branches can point at the same
        commit — `git switch -c` always does, and so does any pair left level by a
@@ -1668,6 +878,69 @@ function watchCommand(target, deep, paths) {
 
 /* ─────────────── the panel's own read, and the graph ─────────────── */
 
+/* ── `git status --porcelain=v2`, and the words for its two letters ──
+
+   The panel's full read is the only caller: the cheap identity read that the
+   chip uses asks three questions and never looks at the working tree.
+   `STATUS_LABELS` has one reader — `parseStatusV2` puts those words into each
+   entry's `label` — so it travels with the parser rather than on its own.
+ */
+const STATUS_LABELS = {
+  M: 'modified', A: 'added', D: 'deleted', R: 'renamed', C: 'copied',
+  T: 'typechange', U: 'unmerged', '.': 'unchanged',
+}
+
+function statusLabel(code) {
+  return STATUS_LABELS[code] === undefined ? code : STATUS_LABELS[code]
+}
+
+function parseStatusV2(stdout) {
+  const parsed = {
+    branch: null, detached: false, upstream: null, ahead: 0, behind: 0,
+    staged: [], unstaged: [], untracked: [], unmerged: [],
+  }
+  const lines = stdout.split('\n')
+  for (let i = 0; i < lines.length; i += 1) {
+    const line = lines[i]
+    if (line.length === 0) continue
+    if (line.charAt(0) === '#') {
+      const head = line.slice(2)
+      const space = head.indexOf(' ')
+      const key = space < 0 ? head : head.slice(0, space)
+      const rest = space < 0 ? '' : head.slice(space + 1)
+      if (key === 'branch.head') {
+        if (rest === '(detached)') parsed.detached = true
+        else parsed.branch = rest
+      } else if (key === 'branch.upstream') {
+        parsed.upstream = rest
+      } else if (key === 'branch.ab') {
+        const parts = rest.split(' ')
+        if (parts.length === 2) {
+          parsed.ahead = parseInt(parts[0].slice(1), 10) || 0
+          parsed.behind = parseInt(parts[1].slice(1), 10) || 0
+        }
+      }
+      continue
+    }
+    const marker = line.charAt(0)
+    if (marker === '?') { parsed.untracked.push(line.slice(2)); continue }
+    if (marker === '!') continue
+    if (marker === '1' || marker === '2' || marker === 'u') {
+      const fields = line.split(' ')
+      const xy = fields[1] === undefined ? '..' : fields[1]
+      let path = ''
+      if (marker === '1') path = fields.slice(8).join(' ')
+      else if (marker === '2') path = fields.slice(9).join(' ').split('\t')[0]
+      else path = fields.slice(10).join(' ')
+      const entry = { path: path, code: xy, label: statusLabel(xy.charAt(0)) + '/' + statusLabel(xy.charAt(1)) }
+      if (marker === 'u') { parsed.unmerged.push(entry); continue }
+      if (xy.charAt(0) !== '.') parsed.staged.push(entry)
+      if (xy.charAt(1) !== '.') parsed.unstaged.push(entry)
+    }
+  }
+  return parsed
+}
+
 function missingPanel(target, reason) {
   return {
     ok: false, repo: target, error: 'not-a-repository', reason: reason,
@@ -1687,8 +960,10 @@ async function readPanelIdentity(input, target) {
   let branch = null
   let upstream = null
   let track = ''
+  let noGit = false
   for (let i = 1; i < lines.length; i += 1) {
     const line = lines[i]
+    if (line === PANEL_NO_GIT) { noGit = true; continue }
     if (line.indexOf('RC:') === 0) { exitCode = parseInt(line.slice(3), 10); continue }
     if (line.indexOf('S:') === 0) { if (sequencer === null) sequencer = line.slice(2); continue }
     if (line.indexOf('B:') === 0) { branch = line.slice(2); continue }
@@ -1700,6 +975,9 @@ async function readPanelIdentity(input, target) {
       track = field(fields, 1)
     }
   }
+  /* Before the exit code, which the script never reached: "this machine has no
+     git" is not a repository that failed to read, and the reader can act on it. */
+  if (noGit) return missingPanel(target, 'no-git')
   if (exitCode !== 0) {
     const failed = missingPanel(target, 'not-a-repo')
     failed.exitCode = exitCode
@@ -1729,15 +1007,20 @@ async function readPanel(input, target, paths) {
 
   let exitCode = null
   let sequencer = null
+  let noGit = false
+  let needsIdentity = false
   const body = []
   for (let i = 1; i < lines.length; i += 1) {
     const line = lines[i]
+    if (line === PANEL_NO_GIT) { noGit = true; continue }
+    if (line === PANEL_NO_IDENT) { needsIdentity = true; continue }
     if (line.indexOf('RC:') === 0) { exitCode = parseInt(line.slice(3), 10); continue }
     if (line.indexOf('S:') === 0) { if (sequencer === null) sequencer = line.slice(2); continue }
     body.push(line)
   }
   const output = body.join('\n')
 
+  if (noGit) return missingPanel(target, 'no-git')
   if (exitCode !== 0) {
     const outsideRepo = output.indexOf('not a git repository') >= 0
     const failed = missingPanel(target, outsideRepo ? 'not-a-repo' : 'git-error')
@@ -1754,6 +1037,12 @@ async function readPanel(input, target, paths) {
     upstream: parsed.upstream, ahead: parsed.ahead, behind: parsed.behind,
     sequencer: sequencer,
     staged: parsed.staged, unstaged: parsed.unstaged, untracked: untracked, unmerged: parsed.unmerged,
+    /* Always a boolean, never left out and never `undefined`: the bridge validates
+       every field of a reply for "can this become lossless JSON", and a key whose
+       value is `undefined` rejects the *whole* reply — the client would get an
+       error instead of a snapshot. (Found live, not in a suite: the suites call
+       these handlers directly, with no validation in between.) */
+    needsIdentity: needsIdentity === true,
   }
   /* A pathspec answer is about those paths and nothing else. It says so, and it
      names them, so the client can fold it into the snapshot it already has
@@ -1825,7 +1114,25 @@ async function readGraph(input, repo) {
 
   const logged = await git(args, argv, null, {})
   if (logged.exitCode !== 0) {
-    return { ok: false, repo: repo === undefined ? null : repo, error: 'not-a-repository', stderr: logged.stderr, currentBranch: currentBranch, ref: ref, commits: [], rows: [], lanes: 1 }
+    /* ── 一个提交都还没有的仓库 ──
+       `git log <branch>` 在这里必然失败（那个 ref 还不存在），但那不是「读不动这个
+       仓库」：它是这个仓库的第一个状态，历史就是空的。判据是两句 git 自己的问话，
+       都不认措辞：`rev-parse --git-dir` 能答上来 = 这确实是个仓库（在仓库外它退出
+       128），而 `--verify HEAD` 答不上来 = HEAD 还没指向任何提交。
+
+       注意别拿 `repoHere` 来判：它返回的是一段 shell 文本（给脚本拼命令用的），在
+       JS 里永远为真 —— 第一版就是这么写的，负对照立刻把它抓出来了。 */
+    const verifyHead = await git(args, ['rev-parse', '-q', '--verify', 'HEAD'], null, {})
+    if (verifyHead.exitCode !== 0) {
+      const gitDir = await git(args, ['rev-parse', '--git-dir'], null, {})
+      if (gitDir.exitCode === 0) {
+        return {
+          ok: true, repo: logged.cwd, currentBranch: currentBranch, ref: ref, allRefs: allRefs,
+          unborn: true, hasMore: false, maxCount: maxCount, commits: [], rows: [], lanes: 1,
+        }
+      }
+    }
+    return { ok: false, repo: repo === undefined ? null : repo, error: 'not-a-repository', stderr: logged.stderr, noGit: gitMissing(logged), currentBranch: currentBranch, ref: ref, commits: [], rows: [], lanes: 1 }
   }
   const parsed = parseCommitRecords(logged.stdout)
   const hasMore = parsed.length > maxCount
@@ -1897,7 +1204,7 @@ async function readAuthors(input, repo) {
   const args = argsFor(input)
   const listed = await git(args, ['--no-pager', 'shortlog', '-sne', '--all'], null, { maxBytes: 200000 })
   if (listed.exitCode !== 0) {
-    return { ok: false, repo: repo === undefined ? null : repo, error: 'not-a-repository', stderr: listed.stderr, authors: [] }
+    return { ok: false, repo: repo === undefined ? null : repo, error: 'not-a-repository', stderr: listed.stderr, noGit: gitMissing(listed), authors: [] }
   }
   const authors = []
   const rows = listed.stdout.split('\n')
@@ -1938,7 +1245,7 @@ async function readRefs(input, repo) {
     '--format=%(refname)%1f%(refname:short)%1f%(HEAD)%1f%(objectname:short)%1f%(upstream:short)%1f%(upstream:track)%1f%(committerdate:unix)',
     'refs/heads', 'refs/remotes'], null, {})
   if (listed.exitCode !== 0) {
-    return { ok: false, repo: repo === undefined ? null : repo, error: 'not-a-repository', stderr: listed.stderr, current: [], local: [], remote: [] }
+    return { ok: false, repo: repo === undefined ? null : repo, error: 'not-a-repository', stderr: listed.stderr, noGit: gitMissing(listed), current: [], local: [], remote: [] }
   }
   const local = []
   const current = []
@@ -1970,6 +1277,12 @@ async function readRefs(input, repo) {
   }
   const remote = []
   remoteMap.forEach(function (entries, name) { remote.push({ name: name, refs: entries }) })
+  /* 一个 ref 都没标出当前分支，可能不是游离 HEAD，而是这个分支还没有提交 ——
+     那也要说出它的名字（见 `headBranchWithoutCommit`）。 */
+  if (current.length === 0) {
+    const unborn = await headBranchWithoutCommit(args)
+    if (unborn.length > 0) current.push(unborn)
+  }
   return { ok: true, repo: listed.cwd, current: current, local: local, remote: remote }
 }
 
@@ -2011,7 +1324,7 @@ async function readBranches(input, repo) {
     '--format=%(refname)%1f%(refname:short)%1f%(HEAD)%1f%(committerdate:unix)%1f%(upstream:short)%1f%(upstream:trackshort)%1f%(upstream:track)%1f%(objectname:short)%1f%(contents:subject)',
     '--sort=-committerdate', 'refs/heads', 'refs/remotes'], null, {})
   if (listed.exitCode !== 0) {
-    return { ok: false, repo: repo === undefined ? null : repo, error: 'not-a-repository', stderr: listed.stderr, current: '', previous: '', branches: [], remotes: [] }
+    return { ok: false, repo: repo === undefined ? null : repo, error: 'not-a-repository', stderr: listed.stderr, noGit: gitMissing(listed), current: '', previous: '', branches: [], remotes: [] }
   }
   const branches = []
   const remoteRows = []
@@ -2065,9 +1378,17 @@ async function readBranches(input, repo) {
   }
   const prev = await git(args, ['rev-parse', '--abbrev-ref', '@{-1}'], null, {})
   const previous = prev.exitCode === 0 ? prev.stdout.trim() : ''
+  /* 当前分支还没有提交时，ref 表里没有它 —— 头上那行不能因此写成 HEAD（见
+     `headBranchWithoutCommit`）。它不进 `branches`：那是一份 ref 清单，而它还不是
+     一个 ref，列进去会给人一个点得动的、其实不存在的东西。 */
+  const unborn = current.length === 0 ? await headBranchWithoutCommit(args) : ''
   return {
-    ok: true, repo: listed.cwd, current: current,
+    ok: true, repo: listed.cwd, current: current.length === 0 ? unborn : current,
     previous: previous === 'HEAD' || previous === current ? '' : previous,
+    /* 说出来，切换器才有办法换一套说法：一个提交都没有的仓库里，`git stash`
+       直接失败（"You do not have the initial commit yet"），所以那张卡片上「先暂存
+       再切（切完自动恢复）」这句承诺在这里兑现不了。 */
+    unborn: unborn.length > 0,
     branches: branches, remotes: remotes,
   }
 }
@@ -2175,7 +1496,7 @@ async function readCommitDetail(input) {
   const args = argsFor(input)
   const meta = await git(args, ['-c', 'core.quotePath=false', 'show', '-s',
     '--format=%H%x1f%h%x1f%an%x1f%ae%x1f%aI%x1f%s%x1f%b', hash], null, {})
-  if (meta.exitCode !== 0) return { ok: false, error: 'commit-not-found', stderr: meta.stderr }
+  if (meta.exitCode !== 0) return { ok: false, error: 'commit-not-found', stderr: meta.stderr, noGit: gitMissing(meta) }
   const fields = meta.stdout.split('\u001f')
 
   const files = []
@@ -2338,7 +1659,7 @@ async function readFileDiff(input) {
      good patch on stdout; every other mode says it with exit code 0. */
   const produced = result.exitCode === 0 || (mode === 'untracked' && result.exitCode === 1 && result.stdout.length > 0)
   if (!produced) {
-    return { ok: false, error: 'diff-failed', exitCode: result.exitCode, stderr: result.stderr, mode: mode, path: path }
+    return { ok: false, error: 'diff-failed', exitCode: result.exitCode, stderr: result.stderr, noGit: gitMissing(result), mode: mode, path: path }
   }
 
   const binary = patchLooksBinary(result.stdout)
@@ -2385,7 +1706,7 @@ async function readUntrackedTree(input) {
   const result = await git(argsFor(input), ['--no-optional-locks', '-c', 'core.quotePath=false',
     'ls-files', '--others', '--exclude-standard', '-z', '--', dir], null, { maxBytes: 800000 })
   if (result.exitCode !== 0) {
-    return { ok: false, error: 'ls-files-failed', exitCode: result.exitCode, stderr: result.stderr, dir: dir }
+    return { ok: false, error: 'ls-files-failed', exitCode: result.exitCode, stderr: result.stderr, noGit: gitMissing(result), dir: dir }
   }
   const files = []
   const parts = result.stdout.split('\u0000')
@@ -2414,6 +1735,9 @@ async function panelMutate(input, argv, options) {
     /* Says outright that the file sandbox refused the write, so the reader is not
        left reading git's "Permission denied" as a problem with their repository. */
     sandboxDenied: result.sandboxDenied === true,
+    /* And the other failure that is not about the repository: no git on this
+       machine at all. Every mutating command and `git init` come through here. */
+    noGit: gitMissing(result),
   }
 }
 
@@ -2441,40 +1765,82 @@ async function configPath() {
 }
 
 function normalizeConfig(raw) {
-  const out = { initBranch: 'main', cherryPickRecord: false }
+  const out = {
+    initBranch: 'main', cherryPickRecord: false,
+    /* Which git to run. Empty means "the one on the deployment's PATH", which is
+       what every command used before this key existed. */
+    gitPath: '',
+    /* The three choices the plugin itself makes about the network — each one is
+       the argument this plugin passes, not a copy of a git setting: `git fetch`
+       is `--all --prune` here, pull merges, and a push to a branch with no
+       upstream asks first. git's own `push.default` / `pull.rebase` still apply
+       underneath and are not overridden. */
+    fetchPrune: true, pullRebase: false, pushSetUpstream: false,
+  }
   if (raw == null || typeof raw !== 'object') return out
   if (isStr(raw.initBranch)) out.initBranch = raw.initBranch.trim().slice(0, 120)
   out.cherryPickRecord = raw.cherryPickRecord === true
+  if (isStr(raw.gitPath)) out.gitPath = cleanGitPath(raw.gitPath)
+  out.fetchPrune = raw.fetchPrune !== false
+  out.pullRebase = raw.pullRebase === true
+  out.pushSetUpstream = raw.pushSetUpstream === true
   return out
 }
 
+/* ── 这份配置文件走 shell，不走文件服务 ──
+
+   它住在部署的配置目录里（`<DSH_HOME>/dsh-git-idea.json`），也就是**任何工作区之外**。
+   文件服务是按工作区发策略的，而这条路径不在任何一个工作区里：写它的时候拿到的是部署
+   默认那份策略（workspace-write），于是被拒绝 —— 而且拒得安静：面板里点了保存、磁盘上
+   一个字节没变、屏幕上什么也没说。这是真机上抓到的（改用 `git` 路径时）。
+
+   所以它和这个插件改的所有东西走同一条路：`invoke` + 会话自己的沙箱策略（`sandboxFor`），
+   失败时答复里带着 sandboxDenied 和 git 那句话，界面上说得出为什么。读也一样走这条路，
+   免得读到一个地方、写到另一个地方。 */
+
 async function readConfigFile() {
   if (configCache !== null) return configCache
   const path = await configPath()
-  const fsService = ctx.get('fs')
-  if (path === null || fsService === undefined) { configCache = normalizeConfig(null); return configCache }
+  if (path === null) { configCache = applyConfig(normalizeConfig(null)); return configCache }
+  /* `[ -f … ]` 先说有没有这个文件：不存在不是错误，是「还没有配置过」。 */
+  const probe = await invoke('[ -f ' + shq(path) + ' ] && cat ' + shq(path) + '\n', {}, null, { timeoutMs: 10000 })
+  if (probe.exitCode !== 0) { configCache = applyConfig(normalizeConfig(null)); return configCache }
   try {
-    const target = await fsService.resolve(path)
-    const info = await fsService.stat(target)
-    if (info === undefined) { configCache = normalizeConfig(null); return configCache }
-    configCache = normalizeConfig(JSON.parse(await fsService.readText(target)))
+    configCache = applyConfig(normalizeConfig(JSON.parse(probe.stdout)))
   } catch (error) {
-    console.error('dsh-git-idea: could not read the plugin config', String(error))
-    configCache = normalizeConfig(null)
+    console.error('dsh-git-idea: could not parse the plugin config', String(error))
+    configCache = applyConfig(normalizeConfig(null))
   }
   return configCache
 }
 
-async function writeConfigFile(raw) {
+async function writeConfigFile(raw, args) {
   const path = await configPath()
-  if (path === null) return { ok: false, error: '无法确定配置目录' }
-  const fsService = ctx.get('fs')
-  if (fsService === undefined) return { ok: false, error: '文件系统服务不可用' }
+  if (path === null) return { ok: false, error: '无法确定配置目录', stderr: '读不出部署的配置目录' }
   const next = normalizeConfig(raw)
   try {
-    const target = await fsService.resolve(path)
-    await fsService.writeText(target, JSON.stringify(next, null, 2) + '\n')
-    configCache = next
+    /* `mkdir -p` 先来一次：`DSH_HOME` 可以指到一个还不存在的目录，而重定向不会替
+       你建目录。`printf %s` 而不是 heredoc —— 值里可能有引号、反斜杠、换行，`shq`
+       一个都不挑。 */
+    const dir = path.slice(0, path.lastIndexOf('/'))
+    const written = await invoke(
+      'mkdir -p ' + shq(dir) + ' && printf %s ' + shq(JSON.stringify(next, null, 2) + '\n') + ' > ' + shq(path) + '\n',
+      args, null, { timeoutMs: 10000 })
+    if (written.exitCode !== 0) {
+      return {
+        ok: false, path: path,
+        error: written.sandboxDenied === true ? '文件沙箱不允许写这个配置文件' : '写不进这个配置文件',
+        stderr: written.stderr, stdout: written.stdout,
+        sandboxDenied: written.sandboxDenied === true,
+        noGit: false,
+      }
+    }
+    /* 换了一个 git，所有读的答案都可能跟着变 —— 可能从「读不动这个目录」变成读得动，
+       反过来也一样。缓存不作废的话，读者在设置页里把路径改对了，面板还在拿上一个二进
+       制留下的答案说话（这条是 fixture 抓出来的：改完之后同一棵树仍然回答旧的那一份）。 */
+    const before = gitExe
+    configCache = applyConfig(next)
+    if (before !== gitExe) invalidateRepo(null)
     return { ok: true, path: path, config: next }
   } catch (error) {
     const detail = error != null && error.message !== undefined ? String(error.message) : String(error)
@@ -2502,11 +1868,252 @@ async function initSnapshot(input) {
   return await panelMutate(args, ['init'])
 }
 
+/* ─────────────── which git this machine runs ───────────────
+
+   Every command this plugin runs starts with one word: `git`. That word comes
+   from the deployment's PATH, and on a machine where git lives somewhere the
+   deployment's PATH does not look — a Homebrew prefix, a bundled git inside an
+   IDE, a nix profile — the plugin's answer used to be "this machine has no git",
+   which is both wrong and unactionable. So the word is a setting.
+
+   The resolution is deliberately one function and one variable: `gitExe` is what
+   the config says, `gitCmd()` is how it is written into a command line, and the
+   config read happens before any handler builds a command (see `onRpc`), so no
+   command can be built from a half-loaded answer. */
+
+/* Where the resolved binary is kept. `applyConfig` is the one place that writes
+   it, so reading the config and running a command can never disagree. */
+let gitExe = 'git'
+
+function applyConfig(config) {
+  gitExe = isStr(config.gitPath) && config.gitPath.length > 0 ? config.gitPath : 'git'
+  return config
+}
+
+/* The command word every shell string is built from — quoted, because a path
+   with a space in it is a perfectly good path. */
+function gitCmd() {
+  return gitExe === 'git' ? 'git' : shq(gitExe)
+}
+
+/* A path that is about to be put in front of every git command on this machine.
+   It is the reader's own text, so it is not a threat to *them* — but a stray
+   newline would cut the panel scripts in half, and a leading `-` would turn the
+   command into an option. Both are refused here rather than quoted and hoped
+   for; anything else (spaces, quotes) `shq` and `command -v` carry. */
+function cleanGitPath(value) {
+  const trimmed = value.trim().slice(0, 400)
+  if (trimmed.length === 0) return ''
+  if (/[\u0000-\u001f\u007f]/.test(trimmed)) return ''
+  if (trimmed.charAt(0) === '-') return ''
+  return trimmed
+}
+
+/* ── what the settings page shows ──
+
+   Three answers about the same word: what `command -v` resolves it to (the
+   configured path itself, or the one on PATH), whether that thing runs at all,
+   and its version. The read does not go through `gitGuard`: a toolchain probe
+   that reports "no git" by failing to run is exactly the answer being asked
+   for, so it must not be turned into "this is not a repository".
+
+   `P:` is printed even when `command -v` finds nothing (an empty line), because
+   "the word is not there" and "the probe did not run" have to stay apart. */
+async function toolchainSnapshot() {
+  const config = await readConfigFile()
+  const probe = await invoke(
+    'p=$(command -v ' + gitCmd() + ' 2>/dev/null || true)\n'
+    + "printf 'P:%s\\n' \"$p\"\n"
+    + "printf 'V:%s\\n' \"$(" + gitCmd() + ' --version 2>&1 | head -1)"\n',
+    {}, null, { timeoutMs: 10000 })
+  let resolved = ''
+  let version = ''
+  const lines = probe.stdout.split('\n')
+  for (let i = 0; i < lines.length; i += 1) {
+    if (lines[i].indexOf('P:') === 0) resolved = lines[i].slice(2).trim()
+    if (lines[i].indexOf('V:') === 0) version = lines[i].slice(2).trim()
+  }
+  /* A configured path that does not resolve is not the same failure as a machine
+     with no git on PATH, and the fix is different — so it says which one it is. */
+  const reason = resolved.length > 0
+    ? ''
+    : (config.gitPath.length > 0 ? 'configured-missing' : 'not-on-path')
+  return {
+    ok: true,
+    configured: config.gitPath,
+    fromPath: config.gitPath.length === 0,
+    path: resolved,
+    version: version,
+    found: resolved.length > 0,
+    reason: reason,
+    platform: probe.exitCode === 0 ? 'ok' : 'probe-failed',
+  }
+}
+/* ─────────────── who a commit is signed by ───────────────
+
+   `git commit` will not write a commit until it knows a name and an address, and
+   when it does not it prints eight lines of English advice. The panel used to
+   hand those eight lines to the reader; the two `git config` commands inside them
+   are the real answer, and this is where the panel offers to run them.
+
+   Read through git and not through the config file: the effective value depends
+   on the local file, the global file, the system file, `GIT_AUTHOR_NAME` and the
+   command line, in an order only git knows (`git var GIT_AUTHOR_IDENT` is the
+   same lookup the commit makes, and it is what `identityMissing` asks). One
+   `--show-origin --get-regexp` answers "what is it" and "where did that come
+   from" together, which is the pair the settings page has to show: a name that
+   comes from `.git/config` is *this repository's*, and one that comes from
+   `~/.gitconfig` is the machine's. */
+
+/* The two values, each with the file it came from. `git config` prints
+   `file:/path/to/config<TAB>user.name Ada`; the origin prefix is the part that
+   says who is winning. */
+function parseIdentity(out) {
+  const found = { name: '', email: '', nameOrigin: '', emailOrigin: '' }
+  const lines = out.split('\n')
+  for (let i = 0; i < lines.length; i += 1) {
+    const line = lines[i]
+    const tab = line.indexOf('\t')
+    if (tab < 0) continue
+    const origin = line.slice(0, tab)
+    const rest = line.slice(tab + 1)
+    const space = rest.indexOf(' ')
+    if (space < 0) continue
+    const key = rest.slice(0, space)
+    const value = rest.slice(space + 1)
+    if (key === 'user.name') { found.name = value; found.nameOrigin = origin }
+    if (key === 'user.email') { found.email = value; found.emailOrigin = origin }
+  }
+  return found
+}
+
+/* `file:/home/x/.gitconfig` is what git prints; the reader wants the path. */
+function originLabel(origin) {
+  if (origin.length === 0) return ''
+  if (origin.indexOf('file:') === 0) return origin.slice(5)
+  return origin
+}
+
+async function identitySnapshot(input) {
+  const target = repoFrom(input, null)
+  const inside = target !== undefined
+  const args = inside ? argsAt(input, target) : {}
+  /* 不知道是哪个仓库时，绝不去问「此刻生效的那一份」：`git config`（和 `git var`）
+     会按**当前目录**回答，而当前目录是 dsh 进程自己的目录，不是读者在看的东西 ——
+     拿它答出来的作者名去填「此刻生效」，就是把另一个仓库的身份说成这个仓库的。这时
+     只回答机器级的那一份，并明说不知道仓库（`insideRepo: false`），由界面自己说清。
+     这条是被 fixture 抓出来的：临时仓库里读到的 `user.name` 是插件自己仓库里的那个。 */
+  const effective = inside
+    ? await gitC(args, ['config', '--show-origin', '--get-regexp', '^user\\.(name|email)$'], null, {})
+    : null
+  /* 机器级的这一份按定义与目录无关，所以它在两种情况下都问。 */
+  const global = await gitC(args, ['config', '--global', '--show-origin', '--get-regexp', '^user\\.(name|email)$'], null, {})
+  const here = effective === null
+    ? { name: '', email: '', nameOrigin: '', emailOrigin: '' }
+    : parseIdentity(effective.stdout)
+  const machine = parseIdentity(global.stdout)
+  /* The same question the commit asks, so the settings page and the commit pane
+     can never disagree about whether a commit would be refused. Not asked when
+     there is no repository to ask about: "would a commit here be refused" is a
+     question about a repository, and answering it from whatever directory the
+     Host happens to sit in is the misreport this whole function avoids. */
+  const missing = inside ? await identityMissing(args) : false
+  return {
+    ok: true, repo: inside ? target : null, insideRepo: inside,
+    name: inside ? here.name : machine.name,
+    email: inside ? here.email : machine.email,
+    nameOrigin: inside ? originLabel(here.nameOrigin) : originLabel(machine.nameOrigin),
+    emailOrigin: inside ? originLabel(here.emailOrigin) : originLabel(machine.emailOrigin),
+    globalName: machine.name, globalEmail: machine.email,
+    needsIdentity: missing,
+    /* Both halves are the same value from the same file: a name set here but no
+       address is the case git reports as "empty ident name", and the page has to
+       be able to say which half is missing rather than "fill both". */
+    nameMissing: (inside ? here.name : machine.name).length === 0,
+    emailMissing: (inside ? here.email : machine.email).length === 0,
+  }
+}
+
+/* A value about to become one `git config` argument. Quoting is the shell's
+   problem (`shq` handles it); what git itself would misread is a leading dash,
+   and what would cut a command in half is a control character. */
+function cleanIdentValue(value) {
+  const raw = isStr(value) ? value : ''
+  const trimmed = raw.trim().slice(0, 200)
+  if (trimmed.length === 0) return ''
+  if (/[\u0000-\u001f\u007f]/.test(trimmed)) return null
+  if (trimmed.charAt(0) === '-') return null
+  return trimmed
+}
+
+/* Written through git so that everything else on the machine sees it: a terminal,
+   IDEA, a hook. The alternative — keeping the pair in this plugin's own config and
+   passing `-c user.name=…` to every commit — would make the panel the only tool
+   that knows who the author is, which is a worse surprise than the failure it
+   fixes.
+
+   `scope` is 'global' (this machine) or 'local' (this repository). Nothing is
+   written for a field left empty: `git config user.name ''` is how a reader ends
+   up with git's "empty ident name" error in the first place, so an empty box
+   means "leave this one alone" rather than "set it to nothing". */
+async function identitySave(input) {
+  const scope = input != null && input.scope === 'local' ? 'local' : 'global'
+  const target = repoFrom(input, null)
+  if (scope === 'local' && target === undefined) {
+    return { ok: false, error: 'no-path', stderr: '不知道该写进哪个仓库：这个会话没有工作区，也没有指定路径' }
+  }
+  const name = cleanIdentValue(input != null ? input.name : '')
+  const email = cleanIdentValue(input != null ? input.email : '')
+  if (name === null || email === null) {
+    return { ok: false, error: 'bad-value', stderr: '名字和邮箱里不能有控制字符，也不能以 - 开头' }
+  }
+  if (name.length === 0 && email.length === 0) {
+    return { ok: false, error: 'empty', stderr: '名字和邮箱至少要填一个' }
+  }
+  const flag = scope === 'local' ? '--local' : '--global'
+  /* The sandbox is the session's, and that is decided from `args`: a global write
+     has no repository to name, so the session id is what carries the policy. */
+  const args = scope === 'local' ? argsAt(input, target) : (input != null && isStr(input.sessionId) ? { sessionId: input.sessionId } : {})
+  const written = []
+  if (name.length > 0) {
+    const one = await git(args, ['config', flag, 'user.name', name], null, {})
+    if (one.exitCode !== 0) return { ok: false, error: 'write-failed', field: 'user.name', stderr: one.stderr, stdout: one.stdout, sandboxDenied: one.sandboxDenied === true, noGit: gitMissing(one) }
+    written.push('user.name')
+  }
+  if (email.length > 0) {
+    const one = await git(args, ['config', flag, 'user.email', email], null, {})
+    if (one.exitCode !== 0) return { ok: false, error: 'write-failed', field: 'user.email', stderr: one.stderr, stdout: one.stdout, sandboxDenied: one.sandboxDenied === true, noGit: gitMissing(one) }
+    written.push('user.email')
+  }
+  /* Read back rather than echo the input: `git config` may have written something
+     other than what was typed (a local value being overridden by a higher scope
+     is the interesting one), and the page should show what git now answers. The
+     read is told which repository to ask about — never left to fall back on the
+     Host's own directory (see identitySnapshot). */
+  const after = await identitySnapshot({ repo: target, sessionId: input != null ? input.sessionId : undefined })
+  return {
+    ok: true, scope: scope, written: written, repo: after.repo,
+    name: after.name, email: after.email,
+    nameOrigin: after.nameOrigin, emailOrigin: after.emailOrigin,
+    globalName: after.globalName, globalEmail: after.globalEmail,
+    needsIdentity: after.needsIdentity,
+  }
+}
 /* Every request the Client can make, in one table. Each handler is registered
    through `ctx.effect` so it belongs to this fiber: stopping or updating the
-   Package removes all of them, which is what makes the bridge's reload safe. */
+   Package removes all of them, which is what makes the bridge's reload safe.
+
+   Each one waits for the plugin config before the handler runs, because the
+   config decides which binary every command in this plugin starts with
+   (`gitExe` — see 72-gitbin.js) and command lines are built synchronously inside
+   the handlers. One cached read for the life of the process: the first request
+   pays for it, and a "which git" answer can never be half-applied. */
 function onRpc(name, handler) {
-  ctx.effect(function () { return harness.handle(name, handler) }, 'dsh-git-idea rpc ' + name)
+  ctx.effect(function () {
+    return harness.handle(name, function (input) {
+      return readConfigFile().then(function () { return handler(input) })
+    })
+  }, 'dsh-git-idea rpc ' + name)
 }
 
 onRpc('git/panel', function (input) { return panelSnapshot(input) })
@@ -2529,9 +2136,24 @@ onRpc('git/config', function () {
 })
 
 onRpc('git/config-save', function (input) {
-  return writeConfigFile(input != null ? input.config : null)
+  /* 带上会话：这份文件在任何工作区之外，写它的策略来自这个会合（`sandboxFor`）。
+     没有会话时拿到的是部署默认那份（workspace-write），写到 ~/.dsh 会被拒 —— 而现在
+     被拒会在答复里说出来，不再是一个安静的 no-op。 */
+  return writeConfigFile(input != null ? input.config : null, argsAt(input, null))
 })
 
+/* The two machine-level questions the settings page asks: which git, and who
+   commits. Both are reads of the world outside the repository and neither is
+   cached — the reader opening this page is asking "now", not "a moment ago". */
+onRpc('git/toolchain', function () { return toolchainSnapshot() })
+
+onRpc('git/identity', function (input) { return identitySnapshot(input) })
+
+/* The one mutation that is not about the repository at all: it writes the
+   reader's own name and address into git's configuration. Explicit button, named
+   scope, and nothing is written for a box left empty. */
+onRpc('git/identity-save', function (input) { return identitySave(input) })
+
 /* Never cached: its whole purpose is to observe change. `paths` narrows the
    working-tree half of the signature to what is on screen — see watchCommand for
    what a whole-tree status costs on a slow mount. */
@@ -2576,16 +2198,34 @@ onRpc('git/unstage', function (input) {
   return panelMutate(input, ['restore', '--staged', '--'].concat(paths))
 })
 
+/* A failed commit is the one mutation whose failure can be about this machine
+   instead of about the repository: git will not author a commit until it knows
+   who the author is, and no amount of retrying here changes that. Asked of git
+   itself, once, and only after the commit has already been refused — see
+   `identityMissing`. The flag rides the same reply as `noGit` and
+   `sandboxDenied`, so the client has one place to read all three.
+
+   Which mutations go through here is decided at the call site, because only the
+   call site knows whether the command writes a commit object. `git add`,
+   `git branch -d` and the aborts all run on a machine with no identity at all —
+   hanging "this machine has no identity" on one of those would send the reader
+   to fix something that is not broken. */
+async function commitMutation(input, argv, options) {
+  const result = await panelMutate(input, argv, options)
+  if (result.ok !== true) result.needsIdentity = await identityMissing(argsFor(input))
+  return result
+}
+
 onRpc('git/commit', function (input) {
   const message = input != null && isStr(input.message) ? input.message.trim() : ''
   if (message.length === 0) return { ok: false, error: 'a commit message is required' }
   if (input != null && input.stageAll === true) {
     return panelMutate(input, ['add', '-A']).then(function (staged) {
       if (staged.ok !== true) return staged
-      return panelMutate(input, ['commit', '-m', message])
+      return commitMutation(input, ['commit', '-m', message])
     })
   }
-  return panelMutate(input, ['commit', '-m', message])
+  return commitMutation(input, ['commit', '-m', message])
 })
 
 onRpc('git/checkout', async function (input) {
@@ -2604,12 +2244,25 @@ onRpc('git/checkout', async function (input) {
 
 const NET_SPAWN = { timeoutMs: 180000 }
 
-onRpc('git/fetch', function (input) {
-  return panelMutate(input, ['fetch', '--all', '--prune'], { net: true, spawn: NET_SPAWN })
+/* The three arguments this plugin chooses about the network, each read from the
+   plugin config at the moment it is used: `fetch --all` prunes only if asked,
+   `pull` merges unless the reader prefers rebase, and a push to a branch with no
+   upstream is left to the panel's own "set upstream and push" row unless the
+   reader asked for it to just happen. git's own `push.default` and `pull.rebase`
+   are not overridden — these are the flags this plugin adds on top. */
+async function netConfig() {
+  return await readConfigFile()
+}
+
+onRpc('git/fetch', async function (input) {
+  const config = await netConfig()
+  return panelMutate(input, config.fetchPrune === true ? ['fetch', '--all', '--prune'] : ['fetch', '--all'], { net: true, spawn: NET_SPAWN })
 })
 
-onRpc('git/pull', function (input) {
-  return panelMutate(input, ['pull'], { net: true, spawn: NET_SPAWN })
+onRpc('git/pull', async function (input) {
+  const config = await netConfig()
+  /* A pull that merges writes a commit, so the identity can be what failed. */
+  return commitMutation(input, config.pullRebase === true ? ['pull', '--rebase'] : ['pull'], { net: true, spawn: NET_SPAWN })
 })
 
 onRpc('git/push', function (input) {
@@ -2637,20 +2290,20 @@ onRpc('git/sequence', function (input) {
   if (op === 'merge') {
     if (action === 'start') {
       if (target.length === 0) return { ok: false, error: 'a branch or commit is required to merge' }
-      return panelMutate(input, ['merge', '--no-edit', target])
+      return commitMutation(input, ['merge', '--no-edit', target])
     }
-    if (action === 'continue') return panelMutate(input, ['commit', '--no-edit'])
+    if (action === 'continue') return commitMutation(input, ['commit', '--no-edit'])
     if (action === 'abort') return panelMutate(input, ['merge', '--abort'])
     return { ok: false, error: 'merge supports start, continue and abort' }
   }
 
   if (action === 'start') {
     if (target.length === 0) return { ok: false, error: 'a commit is required' }
-    if (op === 'revert') return panelMutate(input, ['revert', '--no-edit', target])
-    if (input != null && input.record === true) return panelMutate(input, ['cherry-pick', '-x', target])
-    return panelMutate(input, ['cherry-pick', target])
+    if (op === 'revert') return commitMutation(input, ['revert', '--no-edit', target])
+    if (input != null && input.record === true) return commitMutation(input, ['cherry-pick', '-x', target])
+    return commitMutation(input, ['cherry-pick', target])
   }
-  if (action === 'continue') return panelMutate(input, ['-c', 'core.editor=true', op, '--continue'])
+  if (action === 'continue') return commitMutation(input, ['-c', 'core.editor=true', op, '--continue'])
   if (action === 'abort') return panelMutate(input, [op, '--abort'])
   if (action === 'skip') return panelMutate(input, [op, '--skip'])
   return { ok: false, error: op + ' does not support ' + action }
@@ -2685,8 +2338,8 @@ onRpc('git/tag', function (input) {
 
 /* The body's own apply, plus the one thing the bridge used to own: the
    transport to the browser half. \`webServer\` is optional at the type level but
-   present in every web profile; without it the model tools still register and
-   only the panel goes quiet. */
+   present in every web profile; without it the panel goes quiet and nothing
+   else changes. */
 export function apply(ctx, config) {
   ctx.inject(['webServer'], function (scope) {
     scope.effect(function () {
@@ -2696,6 +2349,6 @@ export function apply(ctx, config) {
   return plugin.apply(ctx, config)
 }
 
-/* \`tools\` is the only hard dependency: every fragment reaches it through
-   \`harness.registerTool\`. Every other service is read with \`ctx.get\` and guarded. */
-export const inject = ['tools']
+/* No hard dependency to declare. Every service the fragments use — \`shell\`,
+   \`fs\`, \`timer\`, \`sandboxPolicy\`, \`sessions\` — is read with \`ctx.get\` and
+   guarded, and the RPC route waits for \`webServer\` through \`ctx.inject\` above. */