@kenkaiiii/ggcoder 4.3.230 → 4.3.231

package/dist/core/goal-integration.test.js

@@ -0,0 +1,369 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { execFile } from "node:child_process";
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { promisify } from "node:util";
+import { confirmAndCommitMainIntegration, integrableWorktreeTasks, discardStagedIntegration, fileMatchesScope, finalizeStagedIntegration, stageGoalIntegration, } from "./goal-integration.js";
+import { commitGoalWorkerCandidate, createGoalWorkerWorktree } from "./goal-worktree.js";
+const execFileAsync = promisify(execFile);
+function goalRun(overrides = {}) {
+    return {
+        id: "goal-int",
+        title: "Integrate candidates",
+        goal: "Apply accepted worktree candidates to main deterministically",
+        status: "ready",
+        createdAt: "2024-01-01T00:00:00.000Z",
+        updatedAt: "2024-01-01T00:00:00.000Z",
+        projectPath: "/main",
+        successCriteria: [],
+        prerequisites: [],
+        harness: [],
+        evidencePlan: [],
+        tasks: [],
+        evidence: [],
+        blockers: [],
+        ...overrides,
+    };
+}
+function candidateTask(overrides = {}) {
+    return {
+        id: "task-a",
+        title: "Implement core change",
+        prompt: "Do work",
+        status: "done",
+        attempts: 1,
+        integration: "candidate",
+        expectedChangedScope: ["packages/ggcoder/src/core/**"],
+        worktree: {
+            baseRef: "base",
+            branchName: "goal/goal-int/task-a",
+            path: "/wt-a",
+            status: "created",
+        },
+        candidate: {
+            baseRef: "base",
+            headSha: "cand-sha",
+            branchName: "goal/goal-int/task-a",
+            changedFiles: ["packages/ggcoder/src/core/foo.ts"],
+            committed: true,
+        },
+        ...overrides,
+    };
+}
+function makeRunner(handler) {
+    const calls = [];
+    const runner = {
+        async execFile(_file, args, opts) {
+            const call = { cwd: opts.cwd, args: [...args] };
+            calls.push(call);
+            const out = handler(call);
+            if (out instanceof Error)
+                throw out;
+            return { stdout: out, stderr: "" };
+        },
+    };
+    return { runner, calls };
+}
+describe("goal staged integration", () => {
+    afterEach(() => {
+        delete process.env.GG_GOAL_AUTO_INTEGRATE;
+    });
+    it("matches expected_changed_scope globs conservatively", () => {
+        expect(fileMatchesScope("packages/ggcoder/src/core/x.ts", ["packages/ggcoder/src/core/**"])).toBe(true);
+        expect(fileMatchesScope("packages/ggcoder/src/ui/x.ts", ["packages/ggcoder/src/core/**"])).toBe(false);
+        expect(fileMatchesScope("src/a.ts", ["src/*.ts"])).toBe(true);
+        expect(fileMatchesScope("src/nested/a.ts", ["src/*.ts"])).toBe(false);
+    });
+    it("integrates every non-manual worktree candidate", () => {
+        const run = goalRun({
+            tasks: [
+                candidateTask({ id: "after-dep" }),
+                candidateTask({ id: "parallel", integration: "candidate" }),
+                candidateTask({ id: "serial", integration: "candidate" }),
+                candidateTask({ id: "pending", status: "pending" }),
+                candidateTask({ id: "manual", integration: "manual" }),
+                candidateTask({ id: "no-wt", worktree: undefined }),
+                // Read-only task (e.g. audit): worktree but no candidate changes -> excluded.
+                candidateTask({ id: "readonly", candidate: undefined }),
+            ],
+        });
+        expect(integrableWorktreeTasks(run)
+            .map((t) => t.id)
+            .sort()).toEqual(["after-dep", "parallel", "serial"]);
+    });
+    it("stages an eligible typed candidate on a throwaway branch without touching main", () => {
+        const { runner, calls } = makeRunner(({ args }) => {
+            if (args[0] === "status")
+                return ""; // main clean
+            if (args[0] === "rev-parse")
+                return "mainbase";
+            if (args.includes("cherry-pick"))
+                return "";
+            return "";
+        });
+        return stageGoalIntegration({
+            projectPath: "/main",
+            run: goalRun({ tasks: [candidateTask()] }),
+            stagingRoot: "/stage",
+            commandRunner: runner,
+        }).then((out) => {
+            expect(out).toMatchObject({
+                status: "staged",
+                stagingBranch: "goal/goal-int/integration",
+                mainBase: "mainbase",
+                integratedTaskIds: ["task-a"],
+                changedFiles: ["packages/ggcoder/src/core/foo.ts"],
+            });
+            // Built a staging worktree and cherry-picked there; main never modified.
+            expect(calls.some((c) => c.args[0] === "worktree" && c.args[1] === "add")).toBe(true);
+            expect(calls.some((c) => c.args.includes("cherry-pick"))).toBe(true);
+            expect(calls.some((c) => c.args[0] === "merge")).toBe(false);
+            // No archaeology on the candidate worktree (typed packet used).
+            expect(calls.some((c) => c.cwd === "/wt-a")).toBe(false);
+        });
+    });
+    it("falls back when the main checkout is dirty", async () => {
+        const { runner, calls } = makeRunner(({ args }) => args[0] === "status" ? " M packages/ggcoder/src/core/foo.ts" : "");
+        const out = await stageGoalIntegration({
+            projectPath: "/main",
+            run: goalRun({ tasks: [candidateTask()] }),
+            commandRunner: runner,
+        });
+        expect(out.status).toBe("fallback");
+        expect(calls.some((c) => c.args[0] === "worktree" && c.args[1] === "add")).toBe(false);
+    });
+    it("falls back when a candidate changes files outside its scope", async () => {
+        const { runner } = makeRunner(({ args }) => (args[0] === "rev-parse" ? "mainbase" : ""));
+        const out = await stageGoalIntegration({
+            projectPath: "/main",
+            run: goalRun({
+                tasks: [candidateTask({ expectedChangedScope: ["packages/ggcoder/src/ui/**"] })],
+            }),
+            commandRunner: runner,
+        });
+        expect(out.status).toBe("fallback");
+        expect(out.status === "fallback" && out.reason).toContain("outside expected_changed_scope");
+    });
+    it("falls back when a candidate has no expected_changed_scope", async () => {
+        const { runner } = makeRunner(() => "");
+        const out = await stageGoalIntegration({
+            projectPath: "/main",
+            run: goalRun({ tasks: [candidateTask({ expectedChangedScope: [] })] }),
+            commandRunner: runner,
+        });
+        expect(out.status).toBe("fallback");
+    });
+    it("falls back when candidates overlap on the same file", async () => {
+        const { runner } = makeRunner(({ args }) => (args[0] === "rev-parse" ? "mainbase" : ""));
+        const out = await stageGoalIntegration({
+            projectPath: "/main",
+            run: goalRun({
+                tasks: [
+                    candidateTask({ id: "task-a" }),
+                    candidateTask({
+                        id: "task-b",
+                        worktree: { baseRef: "base", branchName: "b-b", path: "/wt-b", status: "created" },
+                        candidate: {
+                            baseRef: "base",
+                            headSha: "cand-b",
+                            branchName: "b-b",
+                            changedFiles: ["packages/ggcoder/src/core/foo.ts"],
+                            committed: true,
+                        },
+                    }),
+                ],
+            }),
+            commandRunner: runner,
+        });
+        expect(out.status).toBe("fallback");
+        expect(out.status === "fallback" && out.reason).toContain("overlap");
+    });
+    it("aborts and cleans up staging on a cherry-pick conflict", async () => {
+        const { runner, calls } = makeRunner(({ args }) => {
+            if (args[0] === "status")
+                return "";
+            if (args[0] === "rev-parse")
+                return "mainbase";
+            if (args.includes("cherry-pick") && !args.includes("--abort"))
+                return new Error("CONFLICT");
+            return "";
+        });
+        const out = await stageGoalIntegration({
+            projectPath: "/main",
+            run: goalRun({ tasks: [candidateTask()] }),
+            stagingRoot: "/stage",
+            commandRunner: runner,
+        });
+        expect(out.status).toBe("fallback");
+        expect(calls.some((c) => c.args.includes("cherry-pick") && c.args.includes("--abort"))).toBe(true);
+        expect(calls.some((c) => c.args[0] === "worktree" && c.args[1] === "remove")).toBe(true);
+    });
+    it("is a noop when there are no candidate worktree tasks", async () => {
+        const { runner, calls } = makeRunner(() => "");
+        const out = await stageGoalIntegration({
+            projectPath: "/main",
+            run: goalRun({ tasks: [candidateTask({ integration: "manual" })] }),
+            commandRunner: runner,
+        });
+        expect(out.status).toBe("noop");
+        expect(calls).toHaveLength(0);
+    });
+    it("is disabled via GG_GOAL_AUTO_INTEGRATE=0", async () => {
+        process.env.GG_GOAL_AUTO_INTEGRATE = "0";
+        const { runner, calls } = makeRunner(() => "");
+        const out = await stageGoalIntegration({
+            projectPath: "/main",
+            run: goalRun({ tasks: [candidateTask()] }),
+            commandRunner: runner,
+        });
+        expect(out.status).toBe("fallback");
+        expect(out.status === "fallback" && out.reason).toContain("GG_GOAL_AUTO_INTEGRATE=0");
+        expect(calls).toHaveLength(0);
+    });
+});
+describe("goal staged integration (real git)", () => {
+    let tmp;
+    let main;
+    async function git(cwd, args) {
+        const { stdout } = await execFileAsync("git", args, { cwd });
+        return stdout.trim();
+    }
+    async function setupRepoWithCandidate() {
+        tmp = await fs.mkdtemp(path.join(os.tmpdir(), "goal-staged-real-"));
+        main = path.join(tmp, "main");
+        await fs.mkdir(main, { recursive: true });
+        await git(main, ["init", "-b", "main"]);
+        await git(main, ["config", "user.email", "goal@test.local"]);
+        await git(main, ["config", "user.name", "Goal Test"]);
+        await fs.mkdir(path.join(main, "src"), { recursive: true });
+        await fs.writeFile(path.join(main, "src/app.ts"), "export const v = 1;\n", "utf-8");
+        await git(main, ["add", "-A"]);
+        await git(main, ["commit", "-m", "base"]);
+        const baseRef = await git(main, ["rev-parse", "HEAD"]);
+        const worktree = await createGoalWorkerWorktree({
+            projectPath: main,
+            goalRunId: "goal-real",
+            goalTaskId: "task-a",
+            workerId: "w1",
+            baseRef,
+            worktreesRoot: path.join(tmp, "worktrees"),
+        });
+        await fs.writeFile(path.join(worktree.path, "src/app.ts"), "export const v = 2;\n", "utf-8");
+        const candidate = await commitGoalWorkerCandidate({
+            worktreePath: worktree.path,
+            branchName: worktree.branchName,
+            baseRef: worktree.baseRef,
+            message: "goal(goal-real): candidate task-a",
+        });
+        const run = goalRun({
+            id: "goal-real",
+            projectPath: main,
+            tasks: [
+                candidateTask({
+                    id: "task-a",
+                    expectedChangedScope: ["src/**"],
+                    worktree: {
+                        baseRef,
+                        branchName: worktree.branchName,
+                        path: worktree.path,
+                        status: "created",
+                    },
+                    ...(candidate ? { candidate } : {}),
+                }),
+            ],
+        });
+        const staging = await stageGoalIntegration({
+            projectPath: main,
+            run,
+            stagingRoot: path.join(tmp, "staging"),
+        });
+        return { baseRef, run, staging };
+    }
+    afterEach(async () => {
+        if (tmp)
+            await fs.rm(tmp, { recursive: true, force: true });
+    });
+    it("stages, verifies-then-fast-forwards main only on success", async () => {
+        const { baseRef, staging } = await setupRepoWithCandidate();
+        expect(staging.status).toBe("staged");
+        // Staging built; main NOT yet advanced.
+        expect(await git(main, ["rev-parse", "HEAD"])).toBe(baseRef);
+        expect(await fs.readFile(path.join(main, "src/app.ts"), "utf-8")).toBe("export const v = 1;\n");
+        if (staging.status !== "staged")
+            throw new Error("expected staged");
+        const { commitSha } = await finalizeStagedIntegration({ projectPath: main, staging });
+        // After a green fast-forward, main holds the verified change.
+        expect(await git(main, ["rev-parse", "HEAD"])).toBe(commitSha);
+        expect(commitSha).not.toBe(baseRef);
+        expect(await fs.readFile(path.join(main, "src/app.ts"), "utf-8")).toBe("export const v = 2;\n");
+        // Staging branch is cleaned up.
+        expect(await git(main, ["branch", "--list", staging.stagingBranch])).toBe("");
+    });
+    it("discards the staging and leaves main untouched on failure", async () => {
+        const { baseRef, staging } = await setupRepoWithCandidate();
+        expect(staging.status).toBe("staged");
+        if (staging.status !== "staged")
+            throw new Error("expected staged");
+        await discardStagedIntegration({ projectPath: main, staging });
+        // Main is exactly where it started; no unverified changes leaked in.
+        expect(await git(main, ["rev-parse", "HEAD"])).toBe(baseRef);
+        expect(await fs.readFile(path.join(main, "src/app.ts"), "utf-8")).toBe("export const v = 1;\n");
+        expect(await git(main, ["branch", "--list", staging.stagingBranch])).toBe("");
+    });
+    async function freshRepo() {
+        tmp = await fs.mkdtemp(path.join(os.tmpdir(), "goal-confirm-real-"));
+        main = path.join(tmp, "main");
+        await fs.mkdir(main, { recursive: true });
+        await git(main, ["init", "-b", "main"]);
+        await git(main, ["config", "user.email", "e2e@test.local"]);
+        await git(main, ["config", "user.name", "E2E"]);
+        await fs.writeFile(path.join(main, "a.txt"), "v1\n", "utf-8");
+        await git(main, ["add", "-A"]);
+        await git(main, ["commit", "-m", "base"]);
+        return git(main, ["rev-parse", "HEAD"]);
+    }
+    it("commits an apply worker's uncommitted changes and confirms main advanced", async () => {
+        const baseRef = await freshRepo();
+        // Simulate an LLM apply worker that edited main but did NOT commit.
+        await fs.writeFile(path.join(main, "a.txt"), "v2\n", "utf-8");
+        const result = await confirmAndCommitMainIntegration({
+            projectPath: main,
+            baseRef,
+            message: "goal(g): commit integrated changes",
+        });
+        expect(result.applied).toBe(true);
+        expect(result.committed).toBe(true);
+        expect(result.files).toEqual(["a.txt"]);
+        expect(result.sha).not.toBe(baseRef);
+        // Main is now clean and committed.
+        expect(await git(main, ["status", "--porcelain"])).toBe("");
+        expect(await git(main, ["rev-parse", "HEAD"])).toBe(result.sha);
+    });
+    it("confirms applied when the apply worker already committed (nothing to commit)", async () => {
+        const baseRef = await freshRepo();
+        await fs.writeFile(path.join(main, "a.txt"), "v2\n", "utf-8");
+        await git(main, ["add", "-A"]);
+        await git(main, ["commit", "-m", "worker already committed"]);
+        const result = await confirmAndCommitMainIntegration({
+            projectPath: main,
+            baseRef,
+            message: "goal(g): commit integrated changes",
+        });
+        expect(result.applied).toBe(true);
+        expect(result.committed).toBe(false); // nothing left to commit
+        expect(result.files).toEqual(["a.txt"]);
+    });
+    it("reports not-applied when main is unchanged versus the base", async () => {
+        const baseRef = await freshRepo();
+        const result = await confirmAndCommitMainIntegration({
+            projectPath: main,
+            baseRef,
+            message: "goal(g): commit integrated changes",
+        });
+        expect(result.applied).toBe(false);
+        expect(result.committed).toBe(false);
+        expect(result.files).toEqual([]);
+    });
+});
+//# sourceMappingURL=goal-integration.test.js.map

package/dist/core/goal-integration.test.js.map

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

package/dist/core/goal-prerequisites.test.js

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { goalHasBlockingPrerequisites, goalHasUnmetLocalPrerequisites, isBlockingGoalPrerequisite, prerequisiteKind, } from "./goal-store.js";
 import { runGoalPrerequisiteCheckCommand, runGoalPrerequisiteChecks, shouldRunGoalPrerequisiteCheck, validateGoalPrerequisiteCheckCommand, } from "./goal-prerequisites.js";
 function goalRun(overrides = {}) {
     return {
@@ -87,12 +88,46 @@ describe("goal prerequisite checks", () => {
             checkCommand: "true",
         })).toBe(true);
     });
+    it("infers prerequisite kind and keeps explicit kind", () => {
+        expect(prerequisiteKind({ id: "a", label: "a", status: "unknown", checkCommand: "true" })).toBe("local");
+        expect(prerequisiteKind({ id: "b", label: "b", status: "unknown" })).toBe("external");
+        expect(prerequisiteKind({
+            id: "c",
+            label: "c",
+            status: "unknown",
+            kind: "external",
+            checkCommand: "true",
+        })).toBe("external");
+        expect(prerequisiteKind({ id: "d", label: "d", status: "unknown", kind: "local" })).toBe("local");
+    });
+    it("local unmet prerequisites do not block; external unmet ones do", () => {
+        const localPrereq = {
+            id: "node",
+            label: "Node",
+            status: "missing",
+            checkCommand: "node --version",
+        };
+        const externalPrereq = { id: "key", label: "API key", status: "missing" };
+        expect(isBlockingGoalPrerequisite(localPrereq)).toBe(false);
+        expect(isBlockingGoalPrerequisite(externalPrereq)).toBe(true);
+        const localOnly = goalRun({ prerequisites: [localPrereq] });
+        expect(goalHasBlockingPrerequisites(localOnly)).toBe(false);
+        expect(goalHasUnmetLocalPrerequisites(localOnly)).toBe(true);
+        const withExternal = goalRun({ prerequisites: [localPrereq, externalPrereq] });
+        expect(goalHasBlockingPrerequisites(withExternal)).toBe(true);
+    });
     it("updates a Goal run with checked prerequisite statuses before workers start", async () => {
         const tmpProject = await fs.mkdtemp(path.join(os.tmpdir(), "goal-prereq-test-project-"));
         try {
             const result = await runGoalPrerequisiteChecks(tmpProject, goalRun({
                 prerequisites: [
-                    { id: "pass", label: "Passing check", status: "unknown", checkCommand: "true" },
+                    {
+                        id: "pass",
+                        label: "Passing check",
+                        status: "unknown",
+                        kind: "local",
+                        checkCommand: "true",
+                    },
                     { id: "fail", label: "Failing check", status: "unknown", checkCommand: "false" },
                 ],
             }));
@@ -101,6 +136,7 @@ describe("goal prerequisite checks", () => {
                 expect.objectContaining({
                     id: "pass",
                     status: "met",
+                    kind: "local",
                     evidence: expect.stringContaining("exited 0"),
                 }),
                 expect.objectContaining({

package/dist/core/goal-prerequisites.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"goal-prerequisites.test.js","sourceRoot":"","sources":["../../src/core/goal-prerequisites.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"goal-prerequisites.test.js","sourceRoot":"","sources":["../../src/core/goal-prerequisites.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,4BAA4B,EAC5B,8BAA8B,EAC9B,0BAA0B,EAC1B,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,+BAA+B,EAC/B,yBAAyB,EACzB,8BAA8B,EAC9B,oCAAoC,GACrC,MAAM,yBAAyB,CAAC;AAEjC,SAAS,OAAO,CAAC,YAA8B,EAAE;IAC/C,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,oCAAoC;QAC1C,MAAM,EAAE,OAAO;QACf,SAAS,EAAE,0BAA0B;QACrC,SAAS,EAAE,0BAA0B;QACrC,WAAW,EAAE,cAAc;QAC3B,eAAe,EAAE,EAAE;QACnB,aAAa,EAAE,EAAE;QACjB,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,EAAE;QAChB,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,EAAE;QACZ,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,CAAC,oCAAoC,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC;YAC5E,IAAI,EAAE,KAAK;YACX,MAAM,EAAE,4BAA4B;SACrC,CAAC,CAAC;QACH,MAAM,CAAC,oCAAoC,CAAC,uBAAuB,CAAC,CAAC,CAAC,OAAO,CAAC;YAC5E,IAAI,EAAE,KAAK;YACX,MAAM,EAAE,0BAA0B;SACnC,CAAC,CAAC;QACH,MAAM,CAAC,oCAAoC,CAAC,0BAA0B,CAAC,CAAC,CAAC,OAAO,CAAC;YAC/E,IAAI,EAAE,KAAK;YACX,MAAM,EAAE,qCAAqC;SAC9C,CAAC,CAAC;QACH,MAAM,CAAC,oCAAoC,CAAC,sBAAsB,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAE7F,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,6BAA6B,CAAC,CAAC,CAAC;QAC3F,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,+BAA+B,CAAC;gBACnD,GAAG,EAAE,UAAU;gBACf,OAAO,EAAE,oCAAoC;aAC9C,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;YACxD,MAAM,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3F,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,2BAA2B,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAE3E,MAAM,MAAM,GAAG,MAAM,+BAA+B,CAAC;gBACnD,GAAG,EAAE,UAAU;gBACf,OAAO,EAAE,qBAAqB;aAC/B,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;QACtE,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,CACJ,8BAA8B,CAAC;YAC7B,EAAE,EAAE,SAAS;YACb,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE,kBAAkB;YAC5B,YAAY,EAAE,MAAM;SACrB,CAAC,CACH,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,MAAM,CACJ,8BAA8B,CAAC;YAC7B,EAAE,EAAE,WAAW;YACf,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,KAAK;YACb,YAAY,EAAE,MAAM;SACrB,CAAC,CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,MAAM,CACJ,8BAA8B,CAAC;YAC7B,EAAE,EAAE,SAAS;YACb,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,SAAS;YACjB,YAAY,EAAE,MAAM;SACrB,CAAC,CACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAC7F,OAAO,CACR,CAAC;QACF,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtF,MAAM,CACJ,gBAAgB,CAAC;YACf,EAAE,EAAE,GAAG;YACP,KAAK,EAAE,GAAG;YACV,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE,MAAM;SACrB,CAAC,CACH,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnB,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CACtF,OAAO,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,WAAW,GAAG;YAClB,EAAE,EAAE,MAAM;YACV,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,SAAkB;YAC1B,YAAY,EAAE,gBAAgB;SAC/B,CAAC;QACF,MAAM,cAAc,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAkB,EAAE,CAAC;QAEnF,MAAM,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5D,MAAM,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE9D,MAAM,SAAS,GAAG,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,4BAA4B,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5D,MAAM,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE7D,MAAM,YAAY,GAAG,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;QAC/E,MAAM,CAAC,4BAA4B,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;QAC1F,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,2BAA2B,CAAC,CAAC,CAAC;QACzF,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAC5C,UAAU,EACV,OAAO,CAAC;gBACN,aAAa,EAAE;oBACb;wBACE,EAAE,EAAE,MAAM;wBACV,KAAK,EAAE,eAAe;wBACtB,MAAM,EAAE,SAAS;wBACjB,IAAI,EAAE,OAAO;wBACb,YAAY,EAAE,MAAM;qBACrB;oBACD,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE;iBACjF;aACF,CAAC,CACH,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC;gBACvC,MAAM,CAAC,gBAAgB,CAAC;oBACtB,EAAE,EAAE,MAAM;oBACV,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC;iBAC9C,CAAC;gBACF,MAAM,CAAC,gBAAgB,CAAC;oBACtB,EAAE,EAAE,MAAM;oBACV,MAAM,EAAE,SAAS;oBACjB,QAAQ,EAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU,CAAC;iBAC9C,CAAC;aACH,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/core/goal-store.d.ts

@@ -1,8 +1,32 @@
 import type { GoalControllerDecision } from "./goal-controller.js";
 export type GoalRunStatus = "draft" | "blocked" | "ready" | "running" | "verifying" | "passed" | "failed" | "paused";
 export type GoalTaskStatus = "pending" | "running" | "verifying" | "done" | "failed" | "blocked";
+/**
+ * Whether a task's committed candidate is auto-integrated into main
+ * (`candidate`) or left for manual handling (`manual`). Ordering is expressed by
+ * `dependsOn`, not this axis.
+ */
+export type GoalTaskIntegration = "candidate" | "manual";
+/**
+ * @deprecated Legacy four-way axis. Inputs are folded to {@link GoalTaskIntegration}
+ * on normalize: `manual` → `manual`; everything else → `candidate`.
+ */
 export type GoalTaskMergeStrategy = "parallel_candidate" | "after_dependencies" | "serial" | "manual";
+export declare function foldGoalTaskIntegration(value: GoalTaskIntegration | GoalTaskMergeStrategy | undefined): GoalTaskIntegration;
+export type GoalIntegrationStatus = "none" | "applied" | "committed";
+export interface GoalIntegrationState {
+    status: GoalIntegrationStatus;
+    /** main HEAD after integration. */
+    headSha?: string;
+    /** integration base the candidates branched from. */
+    baseRef?: string;
+    /** integrated file paths (for the journal/diagnosis). */
+    files?: string[];
+    /** ISO; injected clock, never Date.now() inline in pure code. */
+    updatedAt: string;
+}
 export type GoalPrerequisiteStatus = "unknown" | "met" | "missing";
+export type GoalPrerequisiteKind = "local" | "external";
 export type GoalEvidenceKind = "log" | "command" | "screenshot" | "file" | "summary";
 export type GoalVerificationStatus = "pass" | "fail" | "unknown";
 export interface GoalVerificationResult {
@@ -24,6 +48,12 @@ export interface GoalPrerequisite {
     id: string;
     label: string;
     status: GoalPrerequisiteStatus;
+    /**
+     * Whether the agent can satisfy this prerequisite locally ("local") or it
+     * genuinely requires user-supplied external input ("external"). When omitted,
+     * {@link prerequisiteKind} infers it: a runnable checkCommand implies local.
+     */
+    kind?: GoalPrerequisiteKind;
     checkCommand?: string;
     instructions?: string;
     evidence?: string;
@@ -66,6 +96,18 @@ export interface GoalTaskWorktree {
     status: "planned" | "created" | "failed";
     error?: string;
 }
+/**
+ * Structured, committed candidate packet produced by a worktree worker. Lets
+ * integration read exactly what changed (committed commit + changed files)
+ * instead of reverse-engineering a dirty worktree.
+ */
+export interface GoalTaskCandidate {
+    baseRef: string;
+    headSha: string;
+    branchName: string;
+    changedFiles: string[];
+    committed: boolean;
+}
 export interface GoalTask {
     id: string;
     title: string;
@@ -76,8 +118,9 @@ export interface GoalTask {
     dependsOn?: string[];
     parallelGroup?: string;
     expectedChangedScope?: string[];
-    mergeStrategy?: GoalTaskMergeStrategy;
+    integration?: GoalTaskIntegration;
     worktree?: GoalTaskWorktree;
+    candidate?: GoalTaskCandidate;
     verification?: GoalVerificationResult;
     lastSummary?: string;
 }
@@ -112,6 +155,13 @@ export interface GoalRun {
     evidence: GoalEvidence[];
     verifier?: GoalVerifier;
     completionAudit?: GoalCompletionAudit;
+    integration?: GoalIntegrationState;
+    /**
+     * ISO time of the most recent NON-audit, NON-integration worker completion.
+     * Drives verifier/audit staleness deterministically (replaces the
+     * "Worker ... after verifier" evidence scans).
+     */
+    lastSubstantiveWorkerAt?: string;
     blockers: string[];
     activeWorkerId?: string;
     continueRequestedAt?: string;
@@ -148,6 +198,8 @@ export interface GoalRunInput {
     evidence?: GoalEvidence[];
     verifier?: GoalVerifier;
     completionAudit?: GoalCompletionAudit;
+    integration?: GoalIntegrationState;
+    lastSubstantiveWorkerAt?: string;
     blockers?: string[];
     activeWorkerId?: string;
     continueRequestedAt?: string;
@@ -162,8 +214,11 @@ export interface GoalTaskInput {
     dependsOn?: string[];
     parallelGroup?: string;
     expectedChangedScope?: string[];
+    integration?: GoalTaskIntegration;
+    /** @deprecated legacy input; folded to {@link integration} on normalize. */
     mergeStrategy?: GoalTaskMergeStrategy;
     worktree?: GoalTaskWorktree;
+    candidate?: GoalTaskCandidate;
     verification?: GoalVerificationResult;
     lastSummary?: string;
 }
@@ -198,7 +253,31 @@ export declare function appendGoalDecision(cwd: string, runId: string, decision:
 }): Promise<GoalRun | null>;
 export declare function appendGoalEvidence(cwd: string, runId: string, input: GoalEvidenceInput): Promise<GoalRun | null>;
 export declare function updateGoalTask(cwd: string, runId: string, taskId: string, patch: Partial<GoalTask> | GoalTaskInput): Promise<GoalRun | null>;
+/**
+ * Record the typed integration state from code (git truth), so the controller
+ * never has to parse evidence labels to know whether candidates reached main.
+ */
+export declare function setGoalIntegrationState(cwd: string, runId: string, state: GoalIntegrationState): Promise<GoalRun | null>;
+/**
+ * Stamp the most recent substantive (non-audit, non-integration) worker
+ * completion time, driving verifier/audit staleness deterministically.
+ */
+export declare function recordGoalSubstantiveWorker(cwd: string, runId: string, atIso: string): Promise<GoalRun | null>;
+/**
+ * Infer whether a prerequisite is locally resolvable by the agent or genuinely
+ * external (user-supplied). An explicit `kind` wins; otherwise a runnable
+ * `checkCommand` implies the agent can both check and satisfy it locally.
+ */
+export declare function prerequisiteKind(item: GoalPrerequisite): GoalPrerequisiteKind;
+/**
+ * Local unmet prerequisites no longer block the Goal — the controller schedules
+ * a worker task to resolve them. Only unmet **external** prerequisites (true
+ * user-supplied inputs) are blocking.
+ */
 export declare function isBlockingGoalPrerequisite(item: GoalPrerequisite): boolean;
+export declare function isUnmetLocalGoalPrerequisite(item: GoalPrerequisite): boolean;
+export declare function unmetLocalGoalPrerequisites(run: GoalRun): GoalPrerequisite[];
+export declare function goalHasUnmetLocalPrerequisites(run: GoalRun): boolean;
 export declare function hasBlockingGoalPrerequisites(prerequisites: readonly GoalPrerequisite[]): boolean;
 export declare function goalHasBlockingPrerequisites(run: GoalRun): boolean;
 export declare function formatGoalPrerequisiteInstruction(item: GoalPrerequisite): string;