hivecode-mcp 0.12.4 → 0.13.0

package/hive-branch.js

@@ -58,6 +58,19 @@ export function roomFolder(link, name) {
 
 // ---- git ----------------------------------------------------------------------------------
 
+// OUR SCRATCH WORKTREES RUN WITHOUT THE DEVELOPER'S GIT HOOKS. A post-checkout hook that exits 1
+// made `pr` fail with Q563 although git had made the worktree (measured 25 Oct 2026, a vexp hook);
+// others run npm install or rewrite files in what is a scratch folder about to be deleted. Only
+// commands inside our own temporary worktrees: the developer's checkout and every push keep their
+// hooks. A hooks path that is never created means "no hooks" on every platform git runs on.
+export const NO_HOOKS_DIR = path.join(os.tmpdir(), 'hivecode-no-hooks-never-created')
+export const noHooks = (args) => ['-c', `core.hooksPath=${NO_HOOKS_DIR}`, ...args]
+/** The same for a child process that runs git itself. Appends to any GIT_CONFIG_* already set. */
+export function noHooksEnv(env = process.env) {
+  const n = Number(env.GIT_CONFIG_COUNT) > 0 ? Number(env.GIT_CONFIG_COUNT) : 0
+  return { ...env, GIT_CONFIG_COUNT: String(n + 1), [`GIT_CONFIG_KEY_${n}`]: 'core.hooksPath', [`GIT_CONFIG_VALUE_${n}`]: NO_HOOKS_DIR }
+}
+
 function git(cwd, args, { input, raw = false, trim = true } = {}) {
   const r = spawnSync('git', args, { cwd, input, encoding: raw ? undefined : 'utf8', maxBuffer: 1024 * 1024 * 1024, windowsHide: true })
   if (r.error) return { code: -1, out: raw ? Buffer.alloc(0) : '', err: r.error.message }
@@ -74,8 +87,14 @@ export function repoRoot(dir) {
   return r.code === 0 && r.out ? path.resolve(r.out) : null
 }
 
+// Links are resolved on both sides: git names a repository's top with them resolved, while the home
+// directory comes as written, and on macOS the temp folders sit behind one (6 Oct 2026).
 const sameDir = (a, b) => {
-  const n = (p) => path.resolve(p).replace(/[\\/]+$/, '')
+  const n = (p) => {
+    let r = path.resolve(p)
+    try { r = fs.realpathSync.native(r) } catch { /* a path that cannot be resolved is compared as written */ }
+    return r.replace(/[\\/]+$/, '')
+  }
   return process.platform === 'win32' ? n(a).toLowerCase() === n(b).toLowerCase() : n(a) === n(b)
 }
 
@@ -186,7 +205,7 @@ export function roomCarries(files) {
 // folder look held by some other process, and a foreign shadow is somebody else's ancestry.
 // By exact name: a project's own `.hiverc` is its business. All of these are already never carried
 // (always-ignored, or rendered locally), so the seed and a fresh joiner agree on what the room holds.
-const OWN_FILES = new Set(['.hive.json', '.hive-shadow.json', '.hive-shadow.json.tmp', '.hive-lock.json', '.hive-id.json', '.hive-mcp-session.json'])
+const OWN_FILES = new Set(['.hive.json', '.hive-shadow.json', '.hive-shadow.json.tmp', '.hive-lock.json', '.hive-id.json', '.hive-mcp-session.json', '.hive-stop-hook.json'])
 const isOwnFile = (rel) => OWN_FILES.has(path.posix.basename(rel))
 
 function writeFiles(dir, files) {
@@ -350,7 +369,7 @@ function defaultBase(root, name) {
  * line, and naming this room in its .hive.json. The path comes from git config, and config is
  * editable text -- a path that fails any of these is refused, never removed.
  */
-function removeRoomFolder(dir, room) {
+export function removeRoomFolder(dir, room) {
   const abs = path.resolve(dir)
   const home = path.resolve(hiveHome()) + path.sep
   let ours = false
@@ -517,7 +536,7 @@ export async function landBranch({ cwd, branch, dry = false, push = false, pr =
     git(root, ['worktree', 'prune'])
     if (revParse(root, `refs/heads/${temp}`)) git(root, ['branch', '-D', temp])
   }
-  const wt = git(root, ['worktree', 'add', '--detach', tmp, tip])
+  const wt = git(root, noHooks(['worktree', 'add', '--detach', tmp, tip]))
   if (wt.code !== 0) { cleanup(); throw coded('Q563', `could not make a temporary worktree: ${wt.err}`) }
 
   try {
@@ -528,7 +547,7 @@ export async function landBranch({ cwd, branch, dry = false, push = false, pr =
     if (dry) args.push('--dry-run')
     if (force) args.push('--force', force)
     if (only) args.push('--only', only)
-    const r = spawnSync(process.execPath, args, { cwd: tmp, encoding: 'utf8', env: { ...process.env, HIVE_PROVENANCE: 'on' }, maxBuffer: 64 * 1024 * 1024, windowsHide: true })
+    const r = spawnSync(process.execPath, args, { cwd: tmp, encoding: 'utf8', env: noHooksEnv({ ...process.env, HIVE_PROVENANCE: 'on' }), maxBuffer: 64 * 1024 * 1024, windowsHide: true })
     if (r.stdout) log(r.stdout.replace(/\s+$/, ''))
     // Q501 is hive-pr saying no file in the room carries an agent's receipt: nothing was changed or
     // added. For a branch room that is an answer, not a failure -- and deletions may still land.
@@ -543,17 +562,22 @@ export async function landBranch({ cwd, branch, dry = false, push = false, pr =
     if (deletions.length) {
       // hive-pr left the temporary worktree on its branch when it committed; when it had nothing to
       // commit it never made one, so make it here, at the same tip.
-      if (!revParse(root, `refs/heads/${temp}`)) git(tmp, ['checkout', '-q', '-b', temp])
+      if (!revParse(root, `refs/heads/${temp}`)) git(tmp, noHooks(['checkout', '-q', '-b', temp]))
       const rm = git(tmp, ['rm', '-q', '--', ...deletions])
       if (rm.code !== 0) throw coded('Q563', `could not stage the room's deletions: ${rm.err}`)
       const msg = [`Room: delete ${deletions.length === 1 ? deletions[0] : `${deletions.length} files`}`, '', ...deletions.map((d) => `  - ${d}`), '', `Room: ${parseLink(b.link).room}`].join('\n')
-      const c = git(tmp, ['commit', '-q', '-m', msg, '--author', 'hivecode-room <room@agents.hivecode.local>'])
+      const c = git(tmp, noHooks(['commit', '-q', '-m', msg, '--author', 'hivecode-room <room@agents.hivecode.local>']))
       if (c.code !== 0) throw coded('Q563', `could not commit the room's deletions: ${c.err || c.out}`)
     }
-    if (nothingChanged && !deletions.length) { log(`nothing to land yet: no agent has changed a file in the room for ${name}.`); return { ok: true, landed: 0 } }
-
-    const newTip = revParse(root, `refs/heads/${temp}`)
-    if (!newTip || newTip === tip) { log(`nothing to land: ${name} already has everything the room holds.`); return { ok: true, landed: 0 } }
+    // NOTHING NEW TO LAND IS NOT "DONE" WHEN A PUSH OR A PR WAS ASKED FOR. The usual sequence is a
+    // plain `pr` to look, then `pr --pr`; the second run lands nothing, and returning here skipped
+    // the push and the PR while printing success (1 Nov 2026). Push and open what is already there.
+    let nothingNew = false
+    if (nothingChanged && !deletions.length) { log(`nothing to land yet: no agent has changed a file in the room for ${name}.`); nothingNew = true }
+    const newTip = nothingNew ? tip : revParse(root, `refs/heads/${temp}`)
+    if (!nothingNew && (!newTip || newTip === tip)) { log(`nothing to land: ${name} already has everything the room holds.`); nothingNew = true }
+    if (nothingNew && !push && !pr) return { ok: true, landed: 0 }
+    if (nothingNew) return finish('')
 
     // Move the branch. Checked out somewhere: only a clean fast-forward of that checkout, which is
     // what `git pull` would do; with local changes it is refused, because moving the branch under a
@@ -571,21 +595,27 @@ export async function landBranch({ cwd, branch, dry = false, push = false, pr =
     }
     const made = git(root, ['log', '--format=  %h  %an  %s', `${tip}..${newTip}`]).out
     log(`\nlanded on ${name}:\n${made}`)
-
-    if (push) {
-      const p = git(root, ['push', '-u', 'origin', name])
-      if (p.code !== 0) throw coded('Q573', `the work landed on ${name} locally, but the push failed: ${p.err}`)
-      log(`pushed ${name}`)
-    }
-    if (pr) {
-      const into = base || b.from
-      if (!into) throw coded('Q574', `the work landed on ${name}, but there is no branch to open the PR into; pass --base <branch>.`)
-      const body = [`Opened by Hivecode from the room bound to \`${name}\`.`, '', 'Each commit carries its agent as the git author and the signed author id as a `Hivecode-Author` trailer.', '', '```', made, '```'].join('\n')
-      const g = spawnSync('gh', ['pr', 'create', '--base', into, '--head', name, '--title', title || `Hivecode: ${name}`, '--body', body], { cwd: root, encoding: 'utf8', windowsHide: true })
-      if (g.status !== 0) throw coded('Q574', `the work landed on ${name}, but gh pr create failed: ${(g.stderr || (g.error && g.error.message) || '').toString().trim()}`)
-      log((g.stdout || '').trim())
+    return finish(made)
+
+    // `made` is '' when nothing new landed this run: the push and the PR are of what is already on
+    // the branch, and the PR body lists the branch's commits since its base instead.
+    function finish(made) {
+      if (push) {
+        const p = git(root, ['push', '-u', 'origin', name])
+        if (p.code !== 0) throw coded('Q573', `the work ${made ? 'landed' : 'is'} on ${name} locally, but the push failed: ${p.err}`)
+        log(`pushed ${name}`)
+      }
+      if (pr) {
+        const into = base || b.from
+        if (!into) throw coded('Q574', `the work is on ${name}, but there is no branch to open the PR into; pass --base <branch>.`)
+        const listed = made || git(root, ['log', '--format=  %h  %an  %s', `${into}..${name}`]).out
+        const body = [`Opened by Hivecode from the room bound to \`${name}\`.`, '', 'Each commit carries its agent as the git author and the signed author id as a `Hivecode-Author` trailer.', '', '```', listed, '```'].join('\n')
+        const g = spawnSync('gh', ['pr', 'create', '--base', into, '--head', name, '--title', title || `Hivecode: ${name}`, '--body', body], { cwd: root, encoding: 'utf8', windowsHide: true })
+        if (g.status !== 0) throw coded('Q574', `the work is on ${name}, but gh pr create failed: ${(g.stderr || (g.error && g.error.message) || '').toString().trim()}`)
+        log((g.stdout || '').trim())
+      }
+      return { ok: true, landed: made ? made.split('\n').filter(Boolean).length : 0, tip: made ? newTip : tip, deletions }
     }
-    return { ok: true, landed: made.split('\n').filter(Boolean).length, tip: newTip, deletions }
   } finally {
     cleanup()
   }