@astrosheep/keiyaku 2.9.7 → 2.9.9

package/build/core/projection/projection-wake.js

@@ -7,40 +7,12 @@ import { createProjectionExecutionId } from "./generation/projection-generation-
 import { PROJECTION_ADOPTION_POLL_MS, PROJECTION_ADOPTION_TIMEOUT_MS, startProjectionGeneration, } from "./generation/projection-generation-launcher.js";
 import { openProjectionGenerationStore, openProjectionGenerationStoreReadOnly, } from "./generation/store.js";
 import { observeProjectionLifeSnapshot } from "./projection-life-observer.js";
-import { observeProjectionRunnerLock } from "./projection-runner-lock.js";
+import { acquireProjectionRunnerLock, acquireProjectionRunnerSettlementLock, ProjectionRunnerLockUnavailableError, } from "./projection-runner-lock.js";
 import { setTimeout as delay } from "node:timers/promises";
-/** Persist an asynchronous interrupt wake failure at the generation boundary. */
-export function recordInterruptWakeFailure(projectionDirectory, cause, nowMs = Date.now()) {
-    const continuation = readProjectionGenerationContinuationSnapshot(projectionDirectory, 10);
-    const current = continuation.current;
-    if (!current || !current.verdict || current.verdict.facts.state !== "interrupted")
-        return;
-    const snapshot = continuation.successor;
-    const executionId = createProjectionExecutionId(nowMs);
-    const facts = successorFacts(current, snapshot, nowMs, false);
-    const store = openProjectionGenerationStore(projectionDirectory);
-    try {
-        const launch = store.launchIfSettled({ executionId, facts });
-        if (launch.status !== "committed")
-            return;
-        store.verdictIfOpen({
-            executionId,
-            verdict: "launch-failed",
-            facts: {
-                stage: "interrupt-wake",
-                cause,
-                tellRetained: true,
-                terminalAt: new Date(nowMs).toISOString(),
-            },
-        });
-    }
-    finally {
-        store.close();
-    }
-}
 function incompatibleProjectionError(projectionId) {
     const subject = projectionId ? `Projection '${projectionId}'` : "Projection";
-    return new FlowError("PROJECTION_INCOMPATIBLE", `${subject} has incompatible historical storage; keiyaku status --all can inspect it, but tell cannot change it.`);
+    const statusCoordinate = projectionId ?? "<projection-id>";
+    return new FlowError("PROJECTION_INCOMPATIBLE", `${subject} has incompatible historical storage; inspect it with keiyaku status ${statusCoordinate}, but tell cannot change it.`);
 }
 /**
  * Tell is a current-schema mutation only. This gate runs before the handler
@@ -127,10 +99,24 @@ export function assertTellEffortSupported(projectionDirectory, effort) {
         throw new FlowError("INVALID_EFFORT_OVERRIDE", `Effort '${effort}' is not permitted; legal values: ${effortOptions.join(", ")}.`);
     }
 }
-async function startCommittedSuccessor(projectionDirectory, projectionId, executionId, startGeneration) {
-    const started = await startGeneration(projectionDirectory, executionId);
+async function startCommittedSuccessor(projectionDirectory, projectionId, executionId, startGeneration, dependencies = {}) {
+    let started;
+    try {
+        started = await startGeneration(projectionDirectory, executionId, dependencies);
+    }
+    finally {
+        dependencies.launchOwnership?.close();
+    }
     if (started.status === "adopted")
         return "woken";
+    if (started.status === "pending")
+        return "pending";
+    const reconciled = readCurrentGeneration(projectionDirectory);
+    if (reconciled?.launch.executionId === executionId && reconciled.adoption)
+        return "woken";
+    if (reconciled && !reconciled.verdict && reconciled.launch.executionId !== executionId) {
+        return reconciled.adoption ? "active" : "pending";
+    }
     throw new FlowError("PROJECTION_WAKE_FAILED", `The tell was saved for '${projectionId}', but its successor could not be started (cause: ${started.cause}).`, {
         facts: {
             kind: "projection_wake_failure",
@@ -151,6 +137,31 @@ function sessionWakeFailure(projectionId, cause) {
         },
     });
 }
+export function persistInterruptWakeFailure(projectionDirectory, error, nowMs = Date.now()) {
+    if (!(error instanceof FlowError)
+        || error.code !== "PROJECTION_WAKE_FAILED"
+        || error.facts?.kind !== "projection_wake_failure")
+        return;
+    const continuation = readProjectionGenerationContinuationSnapshot(projectionDirectory, 10);
+    const current = continuation.current;
+    if (current?.verdict?.facts.state !== "interrupted" || !continuation.requiresWake)
+        return;
+    const successorExecutionId = createProjectionExecutionId(nowMs);
+    const facts = successorFacts(current, continuation.successor, nowMs, false);
+    const store = openProjectionGenerationStore(projectionDirectory);
+    try {
+        store.failInterruptWakeIfSettled({
+            predecessorExecutionId: current.launch.executionId,
+            successorExecutionId,
+            successorFacts: facts,
+            cause: error.facts.cause,
+            terminalAt: new Date(nowMs).toISOString(),
+        });
+    }
+    finally {
+        store.close();
+    }
+}
 export async function tellProjection(projectionDirectory, projectionId, effort, dependencies = {}) {
     const startGeneration = dependencies.startGeneration ?? startProjectionGeneration;
     const sleep = dependencies.sleep ?? ((milliseconds) => delay(milliseconds));
@@ -201,56 +212,144 @@ export async function tellProjection(projectionDirectory, projectionId, effort,
         try {
             if (life.phase === "startup-timeout") {
                 const terminalAt = new Date(nowMs).toISOString();
-                const transition = store.supersedeStartupTimeout({
-                    executionId: current.launch.executionId,
-                    observedAtMs: nowMs,
-                    startupTimeoutMs: PROJECTION_ADOPTION_TIMEOUT_MS,
-                    diagnostic: { detail: "runner did not adopt before startup timeout" },
-                    successorExecutionId,
-                    successorFacts: facts,
-                    terminalAt,
-                });
-                if (transition.status === "committed") {
-                    return await startCommittedSuccessor(projectionDirectory, projectionId, successorExecutionId, startGeneration);
+                let deathEvidence;
+                try {
+                    deathEvidence = acquireProjectionRunnerSettlementLock(projectionDirectory);
                 }
-                if (transition.reason === "kill-requested")
+                catch (error) {
+                    if (error instanceof ProjectionRunnerLockUnavailableError)
+                        return "pending";
                     return "pending";
-                await sleep(PROJECTION_ADOPTION_POLL_MS);
-                continue;
+                }
+                try {
+                    store.beginWriteTransaction();
+                    const protectedCurrent = store.readCurrentGeneration();
+                    if (protectedCurrent?.launch.executionId !== current.launch.executionId
+                        || protectedCurrent.adoption
+                        || protectedCurrent.verdict) {
+                        store.rollbackWriteTransaction();
+                        return "pending";
+                    }
+                    if (protectedCurrent.killIntent) {
+                        const settled = store.settleKillIfRunnerDead({
+                            executionId: current.launch.executionId,
+                            releasedLockEvidence: { observedAt: terminalAt, state: "acquired" },
+                        });
+                        if (settled.status === "committed")
+                            store.commitWriteTransaction();
+                        else
+                            store.rollbackWriteTransaction();
+                        return "pending";
+                    }
+                    deathEvidence.close();
+                    let launchOwnership;
+                    try {
+                        launchOwnership = acquireProjectionRunnerLock(projectionDirectory);
+                    }
+                    catch (error) {
+                        store.rollbackWriteTransaction();
+                        if (error instanceof ProjectionRunnerLockUnavailableError)
+                            return "pending";
+                        return "pending";
+                    }
+                    return await startCommittedSuccessor(projectionDirectory, projectionId, successorExecutionId, startGeneration, {
+                        commitLaunch: () => {
+                            const transition = store.supersedeStartupTimeout({
+                                executionId: current.launch.executionId,
+                                releasedLockEvidence: { observedAt: terminalAt, state: "acquired" },
+                                diagnostic: { detail: "runner did not adopt before startup timeout" },
+                                successorExecutionId,
+                                successorFacts: facts,
+                                terminalAt,
+                            });
+                            if (transition.status === "committed")
+                                store.commitWriteTransaction();
+                            else
+                                store.rollbackWriteTransaction();
+                            return transition.status === "committed";
+                        },
+                        launchOwnership,
+                    });
+                }
+                finally {
+                    store.rollbackWriteTransaction();
+                    deathEvidence.close();
+                }
             }
             if (life.phase === "lost" && !current.verdict) {
-                const lock = observeProjectionRunnerLock(projectionDirectory);
-                if (lock.state !== "released")
-                    return lock.state === "held" ? "active" : "pending";
-                const terminalAt = new Date(nowMs).toISOString();
-                const transition = store.replaceDeadRunner({
-                    executionId: current.launch.executionId,
-                    releasedLockEvidence: { observedAt: terminalAt },
-                    successorExecutionId,
-                    successorFacts: facts,
-                    terminalAt,
-                });
-                if (transition.status === "committed") {
-                    return await startCommittedSuccessor(projectionDirectory, projectionId, successorExecutionId, startGeneration);
+                let deathEvidence;
+                try {
+                    deathEvidence = acquireProjectionRunnerSettlementLock(projectionDirectory);
                 }
-                if (transition.reason === "kill-requested")
+                catch (error) {
+                    if (error instanceof ProjectionRunnerLockUnavailableError)
+                        return "active";
                     return "pending";
-                await sleep(PROJECTION_ADOPTION_POLL_MS);
-                continue;
+                }
+                try {
+                    store.beginWriteTransaction();
+                    const protectedCurrent = store.readCurrentGeneration();
+                    if (protectedCurrent?.launch.executionId !== current.launch.executionId
+                        || !protectedCurrent.adoption
+                        || protectedCurrent.verdict) {
+                        store.rollbackWriteTransaction();
+                        return "pending";
+                    }
+                    const terminalAt = new Date(nowMs).toISOString();
+                    if (protectedCurrent.killIntent) {
+                        const settled = store.settleKillIfRunnerDead({
+                            executionId: current.launch.executionId,
+                            releasedLockEvidence: { observedAt: terminalAt, state: "acquired" },
+                        });
+                        if (settled.status === "committed")
+                            store.commitWriteTransaction();
+                        else
+                            store.rollbackWriteTransaction();
+                        return "pending";
+                    }
+                    deathEvidence.close();
+                    let launchOwnership;
+                    try {
+                        launchOwnership = acquireProjectionRunnerLock(projectionDirectory);
+                    }
+                    catch (error) {
+                        store.rollbackWriteTransaction();
+                        if (error instanceof ProjectionRunnerLockUnavailableError)
+                            return "active";
+                        return "pending";
+                    }
+                    return await startCommittedSuccessor(projectionDirectory, projectionId, successorExecutionId, startGeneration, {
+                        commitLaunch: () => {
+                            const transition = store.replaceDeadRunner({
+                                executionId: current.launch.executionId,
+                                releasedLockEvidence: { observedAt: terminalAt, state: "acquired" },
+                                successorExecutionId,
+                                successorFacts: facts,
+                                terminalAt,
+                            });
+                            if (transition.status === "committed")
+                                store.commitWriteTransaction();
+                            else
+                                store.rollbackWriteTransaction();
+                            return transition.status === "committed";
+                        },
+                        launchOwnership,
+                    });
+                }
+                finally {
+                    store.rollbackWriteTransaction();
+                    deathEvidence.close();
+                }
             }
             if (!["done", "failed", "lost", "dismissed", "killed"].includes(life.phase)) {
                 return "pending";
             }
-            const transition = store.launchIfSettled({
-                executionId: successorExecutionId,
-                facts,
+            return await startCommittedSuccessor(projectionDirectory, projectionId, successorExecutionId, startGeneration, {
+                commitLaunch: () => store.launchIfSettled({
+                    executionId: successorExecutionId,
+                    facts,
+                }).status === "committed",
             });
-            if (transition.status === "committed") {
-                return await startCommittedSuccessor(projectionDirectory, projectionId, successorExecutionId, startGeneration);
-            }
-            if (transition.reason === "kill-requested")
-                return "pending";
-            await sleep(PROJECTION_ADOPTION_POLL_MS);
         }
         finally {
             store.close();

package/build/core/status/board.js

@@ -1,6 +1,7 @@
+import { availableParallelism } from "node:os";
 import { loadKeiyakuSettings } from "../../config/settings/loader.js";
 import { observeGitRepository } from "../../git/branches.js";
-import { readProjectionStatusBoard } from "../projection/index.js";
+import { readExactProjectionStatus, readOperationalProjectionStatusBoard, } from "../projection/index.js";
 import { deriveQueueReadModel, queueMembership, } from "../settlement/index.js";
 import { findOpenArc, getMaxArc, receiptsAfterFence } from "../seal.js";
 import { openTaskStore, readTaskBoard, taskRepositoryFromStore, taskUpdatedAt, } from "../task/index.js";
@@ -8,6 +9,9 @@ import { deriveBootstrapDiagnostics, deriveContractState, hasCurrentPetitionVerd
 import { commissionTarget, evaluateBaseDrift, latestBase, resolveDefaultBranchFromSettings, } from "./drift.js";
 import { computeClaimReconciliation, } from "./reconciliation.js";
 import { readStatusLedgers } from "./ledger-batch.js";
+// Git object reads benefit from overlap, but a hard cap avoids process and disk contention.
+const STATUS_DRIFT_MAX_CONCURRENCY = 8;
+const STATUS_DRIFT_CONCURRENCY = Math.min(STATUS_DRIFT_MAX_CONCURRENCY, availableParallelism());
 function compareTaskStatusRows(left, right) {
     const leftUpdated = taskUpdatedAt(left);
     const rightUpdated = taskUpdatedAt(right);
@@ -22,11 +26,9 @@ function timestampAge(timestamp, now) {
 export function deriveTaskStatusSummary(board, now) {
     const eligible = board.tasks.filter((task) => !task.contractId && (task.state === "open" || task.state === "in_progress"));
     const inProgress = eligible.filter((task) => task.state === "in_progress").length;
-    const topTasks = [
-        ...eligible.filter((task) => task.state === "in_progress").sort(compareTaskStatusRows),
-        ...eligible.filter((task) => task.state === "open" && !task.blocked).sort(compareTaskStatusRows),
-    ]
-        .slice(0, 5)
+    const topTasks = eligible
+        .filter((task) => task.state === "in_progress")
+        .sort(compareTaskStatusRows)
         .map((task) => {
         const updatedAt = taskUpdatedAt(task);
         return {
@@ -43,14 +45,12 @@ export function deriveTaskStatusSummary(board, now) {
     });
     const ready = eligible.filter((task) => task.state === "open" && !task.blocked).length;
     const blocked = eligible.filter((task) => task.state === "open" && task.blocked).length;
-    if (board.tasks.length === 0 && board.diseases.length === 0)
-        return undefined;
     return {
-        total: board.tasks.length,
+        total: eligible.length,
         inProgress,
         ready,
         blocked,
-        omitted: inProgress + ready - topTasks.length,
+        omitted: ready + blocked,
         topTasks,
         diseases: board.diseases,
     };
@@ -165,6 +165,23 @@ function deriveLastActiveAge(entries, now) {
         lastActiveMs: Math.max(0, now - atMs),
     };
 }
+export async function evaluateDistinctBaseDrifts(cwd, bases, defaultBranch, evaluate = evaluateBaseDrift) {
+    const uniqueBases = [...new Set(bases)];
+    const results = new Map();
+    let nextIndex = 0;
+    const worker = async () => {
+        while (nextIndex < uniqueBases.length) {
+            const index = nextIndex++;
+            const base = uniqueBases[index];
+            if (base === undefined)
+                return;
+            results.set(base, await evaluate(cwd, base, defaultBranch));
+        }
+    };
+    const workerCount = Math.min(STATUS_DRIFT_CONCURRENCY, uniqueBases.length);
+    await Promise.all(Array.from({ length: workerCount }, () => worker()));
+    return results;
+}
 export async function readKanshiBoard(cwd, now, opts) {
     const targetFilter = opts?.target ?? null;
     const loadedSettings = await loadKeiyakuSettings(cwd);
@@ -173,14 +190,22 @@ export async function readKanshiBoard(cwd, now, opts) {
     if (repository.capability === "unknown")
         throw repository.error;
     if (repository.capability !== "available" || repository.coordinate !== "repository") {
+        const exactProjection = opts?.projectionId === undefined
+            ? undefined
+            : await readExactProjectionStatus(cwd, now, opts.projectionId);
         return {
             contracts: [],
-            projections: await readProjectionStatusBoard(cwd, now, { showAll: opts?.showAllProjections }),
+            contractsObservable: false,
+            commissionPlaces: new Map(),
+            projections: opts?.projectionId === undefined
+                ? await readOperationalProjectionStatusBoard(cwd, now)
+                : exactProjection ? { rows: [exactProjection] } : null,
             queueLength: 0,
             diseases: loadedSettings.diseases,
             claimReconciliation: null,
             targetFilter,
-            ...(tasks ? { tasks } : {}),
+            // Task and contract boards are repository organs; a non-repository cwd
+            // cannot truthfully turn their absence into a zero count.
         };
     }
     // Status is a pure reader: use the same resolver, but retain its ability to
@@ -203,7 +228,15 @@ export async function readKanshiBoard(cwd, now, opts) {
     }
     const queueModel = deriveQueueReadModel(readableLedgers);
     const boardQueueLength = queueModel.targetQueues.reduce((sum, queue) => sum + queue.ordered.length, 0);
+    const baseDrifts = await evaluateDistinctBaseDrifts(cwd, readableLedgers.flatMap((item) => {
+        const state = deriveContractState(item.entries);
+        return isTerminalState(state) ? [] : (() => {
+            const base = latestBase(item.entries);
+            return base ? [base] : [];
+        })();
+    }), defaultBranch);
     const contracts = [];
+    const commissionPlaces = new Map();
     // Readable-ledger commission targets retained for post-assembly filter only.
     const derivedTargetById = new Map();
     for (const item of ledgers) {
@@ -228,6 +261,7 @@ export async function readKanshiBoard(cwd, now, opts) {
             continue;
         }
         const bind = findBindEntry(item.entries);
+        commissionPlaces.set(item.contractId, bind?.data.place ?? null);
         derivedTargetById.set(item.contractId, commissionTarget(item.entries)?.ref);
         const base = latestBase(item.entries);
         const state = deriveContractState(item.entries);
@@ -236,7 +270,7 @@ export async function readKanshiBoard(cwd, now, opts) {
         const after = (bind?.data.after ?? []).map((id) => ({ id, terminal: terminalById.get(id) ?? false }));
         const currentArc = deriveCurrentArc(item.entries, bind?.data.objective, state);
         const baseDrift = base
-            ? await evaluateBaseDrift(cwd, base, defaultBranch)
+            ? baseDrifts.get(base) ?? { state: "unknown", label: "n/a (base drift unavailable)" }
             : { state: "unknown", label: "n/a (no default branch)" };
         const nextStep = deriveNextStep({
             id: item.contractId,
@@ -296,9 +330,16 @@ export async function readKanshiBoard(cwd, now, opts) {
         ? boardQueueLength
         : (queueModel.targetQueues.find((queue) => queue.target === targetFilter)?.ordered.length ?? 0);
     const claimReconciliation = await computeClaimReconciliation(cwd, defaultBranch);
+    const exactProjection = opts?.projectionId === undefined
+        ? undefined
+        : await readExactProjectionStatus(cwd, now, opts.projectionId);
     return {
         contracts: filteredContracts,
-        projections: await readProjectionStatusBoard(cwd, now, { showAll: opts?.showAllProjections }),
+        contractsObservable: true,
+        commissionPlaces,
+        projections: opts?.projectionId === undefined
+            ? await readOperationalProjectionStatusBoard(cwd, now)
+            : exactProjection ? { rows: [exactProjection] } : null,
         queueLength,
         defaultBranch: defaultBranch?.branch,
         defaultHead: defaultBranch?.head,

package/build/core/status/drift.js

@@ -1,7 +1,7 @@
 import { assertSettingsKnobUsable } from "../../config/settings/disease.js";
 import { loadKeiyakuSettings } from "../../config/settings/loader.js";
 import { FlowError } from "../../flow-error.js";
-import { SETTINGS_FILE } from "../../keiyaku.js";
+import { resolveLocalBranchHead } from "../../git/refs.js";
 import { createGit, errorContainsAnyPattern, MISSING_HEAD_PATTERNS, wrapGitError } from "../../git/core.js";
 function findBindEntry(entries) {
     return entries.find((entry) => entry.kind === "bind");
@@ -49,10 +49,26 @@ export async function resolveDefaultBranchFromSettings(cwd, loaded, rejectDiseas
         assertSettingsKnobUsable(loaded, "defaultBranch");
     const override = loaded.knobs?.defaultBranch;
     if (override) {
-        const head = await resolveCommit(cwd, override);
-        if (!head)
-            throw new FlowError("INVALID_SETTINGS", `${SETTINGS_FILE} defaultBranch '${override}' does not resolve`);
-        return { branch: override, head };
+        const resolved = await resolveLocalBranchHead(cwd, override);
+        if (!resolved) {
+            const source = loaded.knobSources.defaultBranch;
+            if (source === undefined) {
+                throw new Error("admitted defaultBranch has no settings source coordinate");
+            }
+            throw new FlowError("INVALID_SETTINGS", `${source.coordinate} defaultBranch '${override}' does not resolve`, {
+                facts: {
+                    kind: "invalid_settings",
+                    diseases: [{
+                            source: source.source,
+                            coordinate: source.coordinate,
+                            knob: "defaultBranch",
+                            reason: `defaultBranch '${override}' does not resolve as a local branch`,
+                        }],
+                },
+            });
+        }
+        const branch = resolved.ref.slice("refs/heads/".length);
+        return { branch, head: resolved.head };
     }
     const git = createGit(cwd);
     for (const branch of ["main", "master"]) {

package/build/core/status/ledger-batch.js

@@ -1,158 +1 @@
-import { wrapGitError, runGitProcess } from "../../git/core.js";
-import { GitStreamingBatchFramingError, GitStreamingBatchResponseEndedError, openGitStreamingBatch, } from "../../git/streaming-batch.js";
-import { parseLedgerEntryCommitMessage } from "../entry.js";
-import { ACTIVE_LEDGER_REF_PREFIX, } from "../ledger.js";
-const MAX_LEDGER_COMMIT_BYTES = 1024 * 1024;
-async function runStatusGit(cwd, args) {
-    const result = await runGitProcess(cwd, args);
-    if (result.error || result.status !== 0) {
-        throw wrapGitError(args.join(" "), {
-            message: result.error?.message
-                ?? `git exited with status ${result.status ?? "unknown"}`,
-            stderr: result.stderr,
-            stdout: result.stdout,
-        }, cwd);
-    }
-    return Buffer.from(result.stdout, "utf8");
-}
-async function queryBatchObject(batch, expression) {
-    const record = await batch.request(expression, {
-        maxContentBytes: MAX_LEDGER_COMMIT_BYTES,
-    });
-    if (record.kind === "missing" || record.kind === "ambiguous") {
-        throw new Error(`[git cat-file ${expression}] object is ${record.kind === "missing" ? "missing" : "ambiguous"}`);
-    }
-    return {
-        oid: record.record.oid,
-        type: record.record.type,
-        content: record.record.content,
-    };
-}
-function parseCommitObject(object) {
-    if (object.type !== "commit") {
-        throw new Error(`git cat-file expected commit ${object.oid}, received ${object.type}`);
-    }
-    const content = object.content.toString("utf8");
-    const messageStart = content.indexOf("\n\n");
-    if (messageStart < 0)
-        throw new Error(`git commit ${object.oid} has no message separator`);
-    const parents = [];
-    for (const line of content.slice(0, messageStart).split("\n")) {
-        if (!line.startsWith("parent "))
-            continue;
-        const parent = line.slice("parent ".length);
-        if (!/^[0-9a-f]{40,64}$/.test(parent)) {
-            throw new Error(`git commit ${object.oid} has an invalid parent header`);
-        }
-        parents.push(parent);
-    }
-    return { oid: object.oid, parents, message: content.slice(messageStart + 2) };
-}
-function parseLedgerRefs(output) {
-    return output
-        .toString("utf8")
-        .split(/\r?\n/)
-        .filter((ref) => ref.startsWith(ACTIVE_LEDGER_REF_PREFIX))
-        .map((ref) => ({ contractId: ref.slice(ACTIVE_LEDGER_REF_PREFIX.length), ref }));
-}
-async function readLedgerFromBatch(batch, ref, commits) {
-    const headObject = await queryBatchObject(batch, `${ref.ref}^{commit}`);
-    const head = parseCommitObject(headObject);
-    commits.set(head.oid, Promise.resolve(head));
-    const ordered = [];
-    const visited = new Set();
-    const visiting = new Set();
-    const visit = async (oid) => {
-        if (visited.has(oid))
-            return;
-        if (visiting.has(oid))
-            throw new Error(`git ledger ancestry contains a cycle at ${oid}`);
-        visiting.add(oid);
-        let pending = commits.get(oid);
-        if (!pending) {
-            pending = queryBatchObject(batch, oid).then(parseCommitObject);
-            commits.set(oid, pending);
-        }
-        const commit = await pending;
-        for (const parent of commit.parents)
-            await visit(parent);
-        visiting.delete(oid);
-        visited.add(oid);
-        ordered.push(commit);
-    };
-    await visit(head.oid);
-    return {
-        contractId: ref.contractId,
-        ref: ref.ref,
-        head: head.oid,
-        entries: ordered.map((commit) => parseLedgerEntryCommitMessage(commit.message)),
-    };
-}
-/**
- * Read the aggregate status ledger snapshot with at most two Git processes:
- * ref-name discovery and one framed, streaming object session.
- */
-export async function readStatusLedgers(cwd) {
-    const refOutput = await runStatusGit(cwd, [
-        "for-each-ref",
-        "--sort=refname",
-        "--format=%(refname)",
-        ACTIVE_LEDGER_REF_PREFIX,
-    ]);
-    const refs = parseLedgerRefs(refOutput);
-    if (refs.length === 0)
-        return [];
-    const batch = openGitStreamingBatch(cwd);
-    const commits = new Map();
-    const results = [];
-    let readError;
-    try {
-        for (let index = 0; index < refs.length; index += 1) {
-            const ref = refs[index];
-            try {
-                results.push(await readLedgerFromBatch(batch, ref, commits));
-            }
-            catch (error) {
-                const diagnostic = error instanceof Error ? error : new Error(String(error));
-                results.push({ id: ref.contractId, error: diagnostic });
-                // Framing and mid-frame EOF both destroy the batch channel; isolate remaining refs.
-                if (error instanceof GitStreamingBatchFramingError
-                    || error instanceof GitStreamingBatchResponseEndedError) {
-                    const isolationReason = error instanceof GitStreamingBatchResponseEndedError
-                        ? "response ended"
-                        : "malformed frame";
-                    for (const pending of refs.slice(index + 1)) {
-                        results.push({
-                            id: pending.contractId,
-                            error: new Error(`git cat-file batch terminated after ${isolationReason}: ${diagnostic.message}`),
-                        });
-                    }
-                    break;
-                }
-            }
-        }
-    }
-    catch (error) {
-        readError = error;
-    }
-    try {
-        const close = await batch.close();
-        if (!close.aborted && (close.timedOut || close.signal || close.code !== 0)) {
-            throw wrapGitError("cat-file --batch", {
-                message: close.timedOut
-                    ? "git timed out"
-                    : close.signal
-                        ? `git exited from signal ${close.signal}`
-                        : `git exited with status ${close.code ?? "unknown"}`,
-                stderr: close.stderr.toString("utf8"),
-            }, cwd);
-        }
-    }
-    catch (error) {
-        if (!readError)
-            readError = error;
-    }
-    if (readError)
-        throw readError;
-    return results;
-}
+export { readAllLedgerSnapshots as readStatusLedgers, } from "../ledger-batch.js";

package/build/core/task/settlement-git.js

@@ -72,7 +72,7 @@ export async function createTaskMutationCommit(input) {
             ], undefined, env);
         }
         const tree = (await git(input.cwd, ["write-tree"], undefined, env)).trim();
-        const parentTree = (await git(input.cwd, ["rev-parse", `${input.parent}^{tree}`])).trim();
+        const parentTree = (await git(input.cwd, ["show", "-s", "--format=%T", input.parent])).trim();
         if (tree === parentTree)
             return input.parent;
         return (await git(input.cwd, ["commit-tree", tree, "-p", input.parent, "-m", input.subject])).trim();
@@ -354,7 +354,7 @@ export async function findAcceptedLandingCommit(input) {
             delivery: input.delivery,
             sources,
         });
-        const actualTree = (await git(input.cwd, ["rev-parse", `${commit}^{tree}`])).trim();
+        const actualTree = (await git(input.cwd, ["show", "-s", "--format=%T", commit])).trim();
         if (actualTree === expectedTree)
             return commit;
     }