fix(git): patch just-git 1.9.1 with mode, ls-tree and --summary fixes

.changeset/just-git-mode-and-ls-tree.md

@@ -0,0 +1,5 @@
+---
+"sql-fs-api": patch
+---
+
+Patch just-git 1.9.1 with four unreleased upstream fixes. `git status` and `git diff` now report a chmod-only change. Switching to a branch where a file differs only in its exec bit now applies that mode, and a local chmod-only change blocks the switch as it does in git. A merge keeps a mode change made on either side. `git ls-tree` works, and `git show`, `git log` and `git diff` accept `--summary`.

AGENTS.md

@@ -66,6 +66,8 @@ Migrations are handwritten numbered SQL files. Add the next migration without ed
 
 `just-bash@3.6.0` has a substantial checked-in patch. Dependabot may open upgrade PRs for this package; maintainers review the upgrade and patch before merging. Read `scripts/build-just-bash-patch.mjs` and `patches/` before upgrading it. Regenerate the patch and run the full unit suite and `pnpm verify:local`; do not drop it to make an install pass.
 
+`just-git@1.9.1` is patched with the built `dist/index.js` and `dist/repo/index.js` of four unreleased upstream PRs merged onto the `v1.9.1` commit: blindmansion/just-git#14 (`git ls-tree`), #15 (exec bit on checkout, mode-only changes in status, diff and branch switches), #20 (merge keeps a one-sided mode change) and #21 (`--summary` in `show`, `log` and `diff`). #20 and #21 both edit `src/lib/commit-summary.ts`; the build takes #21's version, which includes #20's output changes. Drop the patch when a just-git release contains all four, then remove the mode repair in `src/api/commands/git-command.ts` and keep `src/api/tests/unit/git-command.just-git-patch.test.ts`.
+
 ## Completion and boundaries
 
 Work autonomously on local implementation and reversible verification. Use a separate checkout for concurrent writers. Do not overwrite another agent's changes. Keep secrets out of commits and evidence. Use the disposable verification stack for tests that create databases or inject faults.

pnpm-workspace.yaml

@@ -1,5 +1,6 @@
 patchedDependencies:
   just-bash@3.6.0: patches/just-bash@3.6.0.patch
+  just-git@1.9.1: patches/just-git@1.9.1.patch
 overrides:
   guarded-fetch>undici: 7.29.1
   express-rate-limit>ip-address: 10.7.1

src/api/commands/git-command.ts

@@ -13,8 +13,11 @@
  * is the path just-git actually resolved. A script may background several clones, so each
  * invocation gets its own scope via AsyncLocalStorage.
  *
- * just-git's checkout also never sets the executable bit (blindmansion/just-git#10), so every
- * file git writes is given the mode its index entry records until upstream fixes that.
+ * just-git 1.9.1 never sets the executable bit on checkout (blindmansion/just-git#10) and drops a
+ * one-sided mode change in a merge (blindmansion/just-git#18). `patches/just-git@1.9.1.patch`
+ * carries the fixes, blindmansion/just-git#15 and blindmansion/just-git#20, so just-git now writes
+ * every mode itself. The repair below, which gives each file git wrote its index mode, stays as a
+ * fallback until a just-git release includes both PRs; remove it then.
  */
 
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -217,8 +220,7 @@ async function indexModes(
 /**
  * Give each regular file git wrote its index mode, merging unmerged stages as Git does.
  * Only those files change, as with real git, so a caller's own uncommitted chmod on any other file
- * stays. A branch switch where a file differs only in mode is not covered: just-git neither
- * rewrites that file nor updates its index entry, so there is no correct mode to read.
+ * stays.
  */
 async function applyIndexModes(
 	fs: IFileSystem,

src/api/tests/unit/git-command.just-git-patch.test.ts

@@ -0,0 +1,118 @@
+/**
+ * Behaviour carried by `patches/just-git@1.9.1.patch` until upstream releases it.
+ *
+ * - blindmansion/just-git#15 (fixes #10): status and diff report a chmod-only change, and a branch
+ *   switch where a file differs only in mode rewrites the mode.
+ * - blindmansion/just-git#14 (fixes #12): `git ls-tree`.
+ * - blindmansion/just-git#20 (fixes #18): a merge keeps a mode change made on either side.
+ * - blindmansion/just-git#21 (fixes #19): `--summary` in `show`, `log` and `diff`.
+ *
+ * When a just-git release includes all four PRs, drop the patch and keep these tests.
+ */
+
+import { beforeEach, describe, expect, it } from "vitest";
+import { type BashOverSqlFs, bashOverSqlFs } from "../../../sql-fs/tests/fixtures/bash-over-sqlfs.js";
+import { createGitCommand } from "../../commands/git-command.js";
+
+const IDENTITY = {
+	GIT_AUTHOR_NAME: "a",
+	GIT_AUTHOR_EMAIL: "a@b.c",
+	GIT_COMMITTER_NAME: "a",
+	GIT_COMMITTER_EMAIL: "a@b.c",
+};
+
+/** `main` has an executable `run.sh`; `plain` records the same content as 100644. */
+const SEED = [
+	"mkdir repo && cd repo && git init -q",
+	"printf 'echo ran\\n' > run.sh && chmod 755 run.sh",
+	"git add -A && git commit -q -m init",
+	"git checkout -q -b plain && chmod 644 run.sh && git commit -q -am plain && git checkout -q main",
+].join(" && ");
+
+describe("git wrapper — patched just-git behaviour", () => {
+	let env: BashOverSqlFs;
+
+	async function sh(script: string): Promise<{ stdout: string; stderr: string; exitCode: number }> {
+		const r = await env.bash.exec(script);
+		return { stdout: r.stdout, stderr: r.stderr, exitCode: r.exitCode };
+	}
+
+	beforeEach(async () => {
+		env = await bashOverSqlFs({ env: IDENTITY, customCommands: [createGitCommand({ network: false })] });
+		expect((await sh(SEED)).exitCode).toBe(0);
+	});
+
+	it("reports a chmod-only change in status and diff", async () => {
+		const r = await sh("cd repo && chmod 644 run.sh && git status --short && git diff");
+		expect(r).toEqual({
+			stdout: " M run.sh\ndiff --git a/run.sh b/run.sh\nold mode 100755\nnew mode 100644\n",
+			stderr: "",
+			exitCode: 0,
+		});
+	});
+
+	it("applies the mode when switching to a branch where only the mode differs", async () => {
+		expect((await sh("cd repo && stat -c %a run.sh")).stdout).toBe("755\n");
+		await sh("cd repo && git checkout -q plain");
+		expect((await sh("cd repo && stat -c %a run.sh && git status --short")).stdout).toBe("644\n");
+		await sh("cd repo && git checkout -q main");
+		expect((await sh("cd repo && stat -c %a run.sh && git status --short")).stdout).toBe("755\n");
+	});
+
+	it("refuses to switch over a local chmod-only change", async () => {
+		const r = await sh("cd repo && chmod 644 run.sh && git checkout plain");
+		expect(r.exitCode).toBe(1);
+		expect(r.stderr).toContain("Your local changes to the following files would be overwritten by checkout:");
+		expect((await sh("cd repo && git branch --show-current")).stdout).toBe("main\n");
+	});
+
+	it("lists a tree with git ls-tree", async () => {
+		expect(await sh("cd repo && git ls-tree --name-only plain && git ls-tree HEAD | cut -d' ' -f1-2")).toEqual({
+			stdout: "run.sh\n100755 blob\n",
+			stderr: "",
+			exitCode: 0,
+		});
+	});
+
+	it("recurses, filters by path and resolves <rev>:<path> in git ls-tree", async () => {
+		await sh(
+			"cd repo && mkdir -p src/lib && echo a > src/a && echo b > src/lib/b && git add src && git commit -q -m src",
+		);
+		const r = await sh(
+			"cd repo && git ls-tree --name-only HEAD && git ls-tree -r --name-only HEAD && " +
+				"git ls-tree --name-only HEAD src/lib && git ls-tree -r --name-only HEAD:src",
+		);
+		expect(r).toEqual({
+			stdout: "run.sh\nsrc\n" + "run.sh\nsrc/a\nsrc/lib/b\n" + "src/lib\n" + "a\nlib/b\n",
+			stderr: "",
+			exitCode: 0,
+		});
+	});
+
+	it("keeps a mode-only change from the merged branch", async () => {
+		await sh("cd repo && git checkout -q -b side plain && chmod 755 run.sh && git commit -q -am exec");
+		await sh("cd repo && git checkout -q plain && echo n > n && git add n && git commit -q -m n");
+		const r = await sh("cd repo && git merge -q -m mg side && git ls-files -s run.sh | cut -c1-6 && stat -c %a run.sh");
+		expect(r).toEqual({ stdout: "100755\n755\n", stderr: "", exitCode: 0 });
+	});
+
+	it("gives a conflicted file the merged mode", async () => {
+		await sh(
+			"cd repo && git checkout -q -b side plain && echo theirs > run.sh && chmod 755 run.sh && git commit -q -am t",
+		);
+		await sh("cd repo && git checkout -q plain && echo ours > run.sh && git commit -q -am o");
+		const r = await sh(
+			"cd repo && git merge -q side; echo rc=$?; git ls-files -s run.sh | cut -c1-6 && stat -c %a run.sh",
+		);
+		expect(r.stdout.split("\n").slice(-6)).toEqual(["rc=1", "100644", "100644", "100755", "755", ""]);
+	});
+
+	it("prints git show --summary", async () => {
+		await sh("cd repo && git mv run.sh go.sh && echo n > n && git add n && git commit -q -m sum");
+		expect(await sh("cd repo && git show --summary --format=%s HEAD")).toEqual({
+			stdout: "sum\n\n rename run.sh => go.sh (100%)\n create mode 100644 n\n",
+			stderr: "",
+			exitCode: 0,
+		});
+	});
+});