looply-cli 0.5.4 → 0.5.5

package/dist/run-base.js

@@ -0,0 +1,142 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CHECKOUT_GOAL_MARKER = void 0;
+exports.readCheckoutGoal = readCheckoutGoal;
+exports.writeCheckoutGoal = writeCheckoutGoal;
+exports.resolveBaseBranch = resolveBaseBranch;
+exports.cutPointFor = cutPointFor;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+/**
+ * WHERE A RUN IN A MACHINE-MADE CHECKOUT IS CUT FROM.
+ *
+ * ─────────────────────────────────────────────────────────────────────────────
+ * Without this a run's branch is cut from wherever HEAD is, and in a checkout
+ * the machine reuses HEAD is the PREVIOUS run's branch — so ticket N+1 stacked
+ * on ticket N, and nothing could be reviewed on its own. Now, in a checkout the
+ * machine made (never the person's own checkout), a run is cut from:
+ *
+ *   1. HEAD, when this checkout's last cut was for THE SAME GOAL — a goal's
+ *      later Starts continue its own work (the coordinator keeps a goal's plan
+ *      checkout for it, F28), and the goal-gap / "looks done" checks read this
+ *      checkout, so they judge that goal's own tree;
+ *   1b. the goal's OWN recorded work (its newest delivered commit, else the branch
+ *      its run claimed) when it lands in a different checkout — a retired home;
+ *   2. the delivered tip of the goal it depends on, when it depends on exactly
+ *      ONE goal — B builds on A's work, not on a base that lacks it;
+ *   3. the project's base branch otherwise (`run.base_branch`, else the
+ *      repository's default branch) — so independent tickets never stack;
+ *   4. HEAD as before, said out loud, when no base can be found.
+ *
+ * ⚠️ THE MARKER IS PER CHECKOUT (`checkout-goal.json` in its own state dir),
+ * written at the cut, and it is the only memory this needs: which goal this
+ * tree's HEAD belongs to.
+ */
+exports.CHECKOUT_GOAL_MARKER = 'checkout-goal.json';
+function readCheckoutGoal(stateDir) {
+    try {
+        const raw = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(stateDir, exports.CHECKOUT_GOAL_MARKER), 'utf8'));
+        if (typeof raw.branch !== 'string' || typeof raw.at !== 'string')
+            return null;
+        return { goalId: typeof raw.goalId === 'string' ? raw.goalId : null, branch: raw.branch, at: raw.at };
+    }
+    catch {
+        return null;
+    }
+}
+function writeCheckoutGoal(stateDir, marker) {
+    (0, node_fs_1.mkdirSync)(stateDir, { recursive: true });
+    const target = (0, node_path_1.join)(stateDir, exports.CHECKOUT_GOAL_MARKER);
+    const tmp = `${target}.${process.pid}.tmp`;
+    (0, node_fs_1.writeFileSync)(tmp, `${JSON.stringify(marker)}\n`, 'utf8');
+    (0, node_fs_1.renameSync)(tmp, target);
+}
+/**
+ * The project's base branch: `configured` when it names a ref that exists; else
+ * the remote's default branch (`origin/HEAD`) — as the LOCAL branch of that name
+ * unless the remote one is strictly newer; else the branch the main checkout is
+ * on (unless that is one of looply's own). Null when none can be found.
+ */
+async function resolveBaseBranch(git, configured) {
+    if (configured !== undefined) {
+        return (await git.refExists(configured)) ? { ref: configured, because: 'run.base_branch' } : null;
+    }
+    const remote = await git.remoteHeadBranch().catch(() => null);
+    if (remote !== null) {
+        const local = remote.slice(remote.indexOf('/') + 1);
+        const hasLocal = local !== '' && (await git.refExists(`refs/heads/${local}`));
+        const hasRemote = await git.refExists(remote);
+        if (hasLocal && hasRemote) {
+            // The newer of the two when one contains the other; the person's own branch when they diverged.
+            const remoteNewer = (await git.isAncestor(local, remote)) && !(await git.isAncestor(remote, local));
+            return remoteNewer
+                ? { ref: remote, because: `the remote default branch (${remote} is ahead of ${local})` }
+                : { ref: local, because: `the default branch (${remote})` };
+        }
+        if (hasLocal)
+            return { ref: local, because: `the default branch (${remote})` };
+        if (hasRemote)
+            return { ref: remote, because: 'the remote default branch' };
+    }
+    try {
+        const main = (await git.listWorktrees())[0];
+        const branch = main?.branch?.replace(/^refs\/heads\//, '') ?? null;
+        if (branch !== null && branch !== '' && !branch.startsWith('looply/') && (await git.refExists(`refs/heads/${branch}`))) {
+            return { ref: branch, because: 'the branch the main checkout is on' };
+        }
+    }
+    catch {
+        /* no worktree list: nothing more to try */
+    }
+    return null;
+}
+/** Decide where this run's branch starts. Never throws: an unreadable answer degrades to HEAD, said. */
+async function cutPointFor(git, input) {
+    if (input.goalId !== undefined && input.checkout?.goalId === input.goalId) {
+        return { kind: 'continue', because: `this checkout holds ${input.goalId}'s own work (${input.checkout.branch})` };
+    }
+    if (input.goalId !== undefined) {
+        // This goal already has work on a branch — its home checkout was retired, or it was placed
+        // elsewhere: carry on from that work rather than redo it from the base.
+        const own = await dependencyTip(git, input.goalId, input.claims);
+        if (own !== null)
+            return { kind: 'dependency', ref: own.ref, because: `${input.goalId} already has work at ${own.ref} (${own.what}); continuing from it` };
+    }
+    const deps = input.dependsOn ?? [];
+    if (input.goalId !== undefined && deps.length === 1) {
+        const dep = deps[0];
+        const tip = await dependencyTip(git, dep, input.claims);
+        if (tip !== null)
+            return { kind: 'dependency', ref: tip.ref, because: `it depends on ${dep}, whose work is at ${tip.ref} (${tip.what})` };
+    }
+    try {
+        const base = await resolveBaseBranch(git, input.configuredBase);
+        if (base !== null)
+            return { kind: 'base', ref: base.ref, because: base.because };
+    }
+    catch {
+        /* fall through to HEAD */
+    }
+    return {
+        kind: 'head',
+        because: input.configuredBase !== undefined
+            ? `run.base_branch ${input.configuredBase} does not exist here`
+            : 'no default branch could be found (no origin/HEAD, no main checkout branch)',
+    };
+}
+/** The newest delivered commit of `goalId`, else the tip of its newest claimed branch. */
+async function dependencyTip(git, goalId, claims) {
+    const mine = claims.filter((c) => c.goalId === goalId);
+    for (const c of [...mine].reverse()) {
+        if (c.kind === 'delivery' && (await git.refExists(c.commitSha).catch(() => false))) {
+            return { ref: c.commitSha, what: `its delivered commit on ${c.branch}` };
+        }
+    }
+    for (const c of [...mine].reverse()) {
+        if (c.kind === 'claims' && (await git.refExists(`refs/heads/${c.branch}`).catch(() => false))) {
+            return { ref: c.branch, what: 'the branch its run worked on' };
+        }
+    }
+    return null;
+}
+//# sourceMappingURL=run-base.js.map

package/dist/run-base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-base.js","sourceRoot":"","sources":["../src/run-base.ts"],"names":[],"mappings":"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"}

package/dist/run-cmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-cmd.d.ts","sourceRoot":"","sources":["../src/run-cmd.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-cmd.d.ts","sourceRoot":"","sources":["../src/run-cmd.ts"],"names":[],"mappings":"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"}

package/dist/run-cmd.js

@@ -15,12 +15,14 @@ const core_1 = require("@looply/core");
 const config_1 = require("./config");
 const ledger_store_1 = require("./ledger-store");
 const run_ended_1 = require("./run-ended");
+const pursuit_ending_1 = require("./pursuit-ending");
 const exemption_store_1 = require("./exemption-store");
 const queue_store_1 = require("./queue-store");
 const lane_claims_1 = require("./lane-claims");
 const run_delivery_1 = require("./run-delivery");
 const goal_met_target_1 = require("./goal-met-target");
 const reaper_1 = require("./reaper");
+const run_base_1 = require("./run-base");
 const requirement_claims_1 = require("./requirement-claims");
 const evidence_cache_1 = require("./evidence-cache");
 const control_file_1 = require("./control-file");
@@ -807,7 +809,7 @@ async function runLoop(opts) {
             return;
         try {
             const tree = await git.headTreeSha();
-            const indexStore = new project_index_store_1.ProjectIndexStore(stateDir, ledger_store_1.nodeLedgerFs);
+            const indexStore = new project_index_store_1.ProjectIndexStore(stateDir, ledger_store_1.nodeLedgerFs, (0, git_driver_1.projectStateDir)(cwd));
             /**
              * ⚠️ THE PACKAGE SET IS PART OF THE KEY, NOT JUST OF THE BUILD. Passing
              * it is what stops a config edit — which no tree sha covers — being
@@ -858,7 +860,7 @@ async function runLoop(opts) {
         projectKey: memoryKey,
         headTreeSha: () => git.headTreeSha(),
         indexFor: async (tree) => {
-            const store = new project_index_store_1.ProjectIndexStore(stateDir, ledger_store_1.nodeLedgerFs);
+            const store = new project_index_store_1.ProjectIndexStore(stateDir, ledger_store_1.nodeLedgerFs, (0, git_driver_1.projectStateDir)(cwd));
             const packages = (0, index_for_head_1.workspacePackages)(config);
             // Same key as the block above, and for the same reason.
             const cached = await store.load(tree, packages.map((pkg) => pkg.name));
@@ -2920,7 +2922,8 @@ async function runLoop(opts) {
                 // and the next Start tries again.
                 log(`compile : every step was refused — ${checked.refused.length} step(s) cited evidence that does not hold at the tree. ` +
                     'Nothing queued, and this goal still has no plan.');
-                compileNote = `compile: every step was refused — ${checked.refused.length} step(s) cited evidence that does not hold at the tree`;
+                // Matched by pursuit-ending.ts to explain an ending to a person; keep the prefix.
+                compileNote = `${pursuit_ending_1.COMPILE_REFUSED_NOTE} — ${checked.refused.length} step(s) cited evidence that does not hold at the tree`;
             }
             else if (!(stillOurs = await freshAuthority(binding.goal.id, binding.goal.version, binding.goal.text)).ok) {
                 /**
@@ -3019,7 +3022,7 @@ async function runLoop(opts) {
                 }
                 else if (!compiled.steps.length) {
                     log('compile : the plan came back empty — nothing to do for this goal.');
-                    compileNote = 'compile: the plan came back empty';
+                    compileNote = pursuit_ending_1.COMPILE_EMPTY_NOTE;
                 }
                 else {
                     log(
@@ -3875,7 +3878,45 @@ async function runLoop(opts) {
                     }
                 },
             }
-            : {}),
+            : (0, reaper_1.hasProvisionedMarker)(cwd)
+                ? {
+                    /**
+                     * PARALLEL TICKETS: A RUN IN A CHECKOUT THE MACHINE MADE IS CUT FROM ITS OWN BASE,
+                     * never from whatever the previous run in that checkout left on HEAD — see
+                     * `run-base.ts`. Its own goal's earlier work continues on HEAD; a single
+                     * dependency's delivered tip comes next; the project's base branch otherwise. The
+                     * person's own checkout is never touched by this: there, HEAD stays the start.
+                     */
+                    integrationBase: async () => {
+                        const goalId = binding.kind === 'bound' ? binding.goal.id : undefined;
+                        let cut;
+                        try {
+                            cut = await (0, run_base_1.cutPointFor)(git, {
+                                ...(goalId === undefined ? {} : { goalId }),
+                                dependsOn: binding.kind === 'bound' ? (binding.goal.dependsOn ?? []) : [],
+                                checkout: (0, run_base_1.readCheckoutGoal)(stateDir),
+                                claims: (0, lane_claims_1.readLaneClaims)(cwd),
+                                ...(config.run.baseBranch === undefined ? {} : { configuredBase: config.run.baseBranch }),
+                            });
+                        }
+                        catch (e) {
+                            cut = { kind: 'head', because: e.message };
+                        }
+                        log(cut.kind === 'continue'
+                            ? `base    : continuing on HEAD — ${cut.because}`
+                            : cut.kind === 'head'
+                                ? `base    : cutting from HEAD — ${cut.because}`
+                                : `base    : cutting from ${cut.ref} — ${cut.because}`);
+                        try {
+                            (0, run_base_1.writeCheckoutGoal)(stateDir, { goalId: goalId ?? null, branch, at: new Date().toISOString() });
+                        }
+                        catch {
+                            // The marker is a memory, not a gate: without it the next run is cut from the base.
+                        }
+                        return cut.kind === 'base' || cut.kind === 'dependency' ? cut.ref : null;
+                    },
+                }
+                : {}),
         // Attribution for this run's header event, passed as opaque values. The
         // runner spreads them and knows nothing about what they mean — that is the
         // whole point of the carrier, and why RoundRunner still contains no