@intentius/chant 0.124.21 → 0.124.23

package/src/workspace/records-checkout.ts

@@ -11,10 +11,15 @@
  *
  * Every git call here reads. None takes the index lock or refreshes the
  * index (`--no-optional-locks`), so a read leaves the checkout as it was,
- * `.git` included, which the reader conformance suite checks.
+ * `.git` included, which the reader conformance suite checks. A diff against
+ * the working tree is the exception git makes: it refreshes the index even
+ * then, so {@link worktreeChanges} runs it on a private copy.
  */
 
 import { execFileSync } from "node:child_process";
+import { copyFileSync, existsSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { isAbsolute, join } from "node:path";
 import { resolveBase, type BaseSource } from "./trust/provenance";
 
 /** Where a record's file stands against `HEAD`. */
@@ -55,6 +60,35 @@ function tryGit(top: string, args: string[]): string | undefined {
   }
 }
 
+/**
+ * The paths under `spec` whose working-tree content differs from `rev`, or
+ * undefined when git can't say. `git diff <rev>` refreshes the index's stat
+ * data for a file touched without a change, and writes the index even under
+ * `--no-optional-locks` (git 2.54), so it runs against a copy of the index
+ * (`GIT_INDEX_FILE`) and the checkout's own index is never written.
+ */
+export function worktreeChanges(top: string, rev: string, spec: string): string[] | undefined {
+  const scratch = mkdtempSync(join(tmpdir(), "chant-index-"));
+  try {
+    const at = tryGit(top, ["rev-parse", "--git-path", "index"])?.trim();
+    const index = at ? (isAbsolute(at) ? at : join(top, at)) : undefined;
+    const copy = join(scratch, "index");
+    if (index && existsSync(index)) copyFileSync(index, copy);
+    const out = execFileSync("git", ["--no-optional-locks", "--literal-pathspecs", "diff", "--name-only", "-z", "--no-renames", rev, "--", spec], {
+      cwd: top,
+      encoding: "utf-8",
+      stdio: ["ignore", "pipe", "pipe"],
+      maxBuffer: 256 * 1024 * 1024,
+      env: { ...process.env, GIT_INDEX_FILE: copy },
+    });
+    return out.split("\0").filter(Boolean);
+  } catch {
+    return undefined;
+  } finally {
+    rmSync(scratch, { recursive: true, force: true });
+  }
+}
+
 /**
  * The branch, head and base of the checkout at `top`. `explicitBase` is
  * `--base`, as the trust policy takes it; otherwise the target branch is the
@@ -98,7 +132,7 @@ export function worktreeStates(
   const direct = (p: string) => p.startsWith(prefix) && !p.slice(prefix.length).includes("/");
   const spec = dir === "." ? "." : dir;
   const atHead = new Set(zList(tryGit(top, ["ls-tree", "-r", "-z", "--name-only", head, "--", spec])).filter(direct));
-  const changed = new Set(zList(tryGit(top, ["diff", "--name-only", "-z", "--no-renames", head, "--", spec])));
+  const changed = new Set(worktreeChanges(top, head, spec) ?? []);
   for (const p of paths) states.set(p, !atHead.has(p) ? "new" : changed.has(p) ? "modified" : "committed");
   const present = new Set(paths);
   const deleted = [...atHead].filter((p) => !present.has(p) && match.test(p.slice(prefix.length))).sort();

package/src/workspace/records-uncommitted.test.ts

@@ -6,7 +6,7 @@
  */
 
 import { execFileSync } from "node:child_process";
-import { cpSync, mkdtempSync, readFileSync, realpathSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import { cpSync, mkdtempSync, readFileSync, realpathSync, rmSync, statSync, unlinkSync, utimesSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import Ajv2020 from "ajv/dist/2020";
@@ -101,6 +101,10 @@ describe("records in the working tree (#3160)", () => {
     const { root } = repository();
     const path = join(root, file("001"));
     writeFileSync(path, decided("001"));
+    // Its stat data no longer matches the index on any clock, so a read that
+    // refreshes the index would write it (a CI runner was slow enough to).
+    const later = new Date(Date.now() + 5_000);
+    utimesSync(path, later, later);
     const index = join(root, ".git", "index");
     const before = { bytes: readFileSync(index), mtime: statSync(index).mtimeMs };
     const doc = result(await queryRecords({ kind: KIND, cwd: root, uncommitted: true }));

package/src/workspace/status.ts

@@ -41,7 +41,7 @@ import { readPathSha } from "../lifecycle/git";
 import { latestPerComponent, readReleaseLedger, type ReleaseRecord } from "../lifecycle/release-ledger";
 import { readReleasePlan, type ReleasePlan } from "../lifecycle/plan-ledger";
 import { listWorkLeases, type WorkLeaseState } from "../lifecycle/work-lease";
-import { readCheckoutHead, type CheckoutHead } from "./records-checkout";
+import { readCheckoutHead, worktreeChanges, type CheckoutHead } from "./records-checkout";
 import { policyView, replicationState, type ReplicationState } from "./wip";
 import { findWorkspaceRoot } from "../project-root";
 import { resolveBoxes, type ResolvedIsolation } from "./box-isolation";
@@ -400,7 +400,8 @@ async function shipView(member: Member, cwd: string, read: LedgerReader): Promis
   };
   // The commit must be here: a release from a commit this checkout never had says nothing about it.
   if (lines(["cat-file", "-e", `${last.gitSha}^{commit}`]) === null) return view;
-  const changed = lines(["diff", "--name-only", "-z", "--no-renames", last.gitSha, "--"]);
+  // A diff against the working tree writes the index; run it on a copy.
+  const changed = worktreeChanges(top, last.gitSha, ".") ?? null;
   const untracked = lines(["ls-files", "--others", "--exclude-standard", "-z"]);
   if (changed === null || untracked === null) return view;
   const bookkeeping = (path: string) => ship.bookkeeping.some((prefix) => path === prefix || path.startsWith(`${prefix}/`));

package/src/workspace/workspace-kinds.schema.json

@@ -78,6 +78,11 @@
         },
         "fields": {
           "$ref": "#/$defs/fields"
+        },
+        "reader": {
+          "type": "string",
+          "pattern": "^[a-z][a-z0-9-]{0,39}$",
+          "description": "A link reader chant ships, by name, that derives a member's links from the member's own files (#3932): dbt-project reads a dbt project's sources. The reader is chant's code and runs offline, parsing files as data; the package supplies only the name. A name this chant doesn't have keeps the kind without a reader, and the load reports it. A chant older than this field fails a kinds file that uses it."
         }
       },
       "patternProperties": {