root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FN-5741: persist merge-request handoff shadow contract

Browse Source 
Introduce Phase 1 write-only persistence for merge-request handoff acceptance across core and engine paths.

- add persisted merge-request record types, schema/settings plumbing, and store write-path support
- update merger/executor/self-healing/run-audit flows to emit and consume the handoff-accepted shadow marker
- expand core/engine/roadmap tests and docs to cover the new merge-request shadow contract
- add a patch changeset for @runfusion/fusion for this bundled package update

Files changed:
 .changeset/fn-5741-merge-request-shadow.md         |   5 +
 AGENTS.md                                          |   1 +
 docs/architecture.md                               |   2 +
 docs/settings-reference.md                         |   1 +
 packages/core/src/__tests__/db-migrate.test.ts     |  12 +-
 packages/core/src/__tests__/db.test.ts             |  34 ++--
 packages/core/src/__tests__/goals-schema.test.ts   |   2 +-
 packages/core/src/__tests__/insight-store.test.ts  |  10 +-
 .../src/__tests__/merge-request-record.test.ts     |  97 +++++++++++
 packages/core/src/__tests__/mission-store.test.ts  |   2 +-
 packages/core/src/__tests__/run-audit.test.ts      |   2 +-
 packages/core/src/__tests__/secrets-schema.test.ts |   6 +-
 .../core/src/__tests__/settings-parity.test.ts     |   3 +
 .../core/src/__tests__/store-merge-queue.test.ts   |   2 +-
 packages/core/src/__tests__/task-documents.test.ts |   2 +-
 packages/core/src/db.ts                            |  49 +++++-
 packages/core/src/index.ts                         |   4 +-
 packages/core/src/settings-schema.ts               |  30 ++++
 packages/core/src/store.ts                         | 189 ++++++++++++++++++++-
 packages/core/src/types.ts                         |  37 ++++
 .../src/__tests__/merger-merge-lifecycle.test.ts   |  54 ++++++
 .../merge-request-shadow-handoff.test.ts           |  74 ++++++++
 packages/engine/src/executor.ts                    |  15 +-
 packages/engine/src/merger.ts                      |  37 ++++
 packages/engine/src/run-audit.ts                   |   1 +
 packages/engine/src/self-healing.ts                |  16 +-
 .../src/store/__tests__/roadmap-store.test.ts      |   4 +-
 27 files changed, 646 insertions(+), 45 deletions(-)

Fusion-Task-Id: FN-5741

Fusion-Task-Lineage: 3fec14c3-47ff-4f14-bc02-24021518c992
This commit is contained in:
gsxdsm
2026-05-30 14:42:50 -07:00
parent ac72f17cdb
commit 20c1c3261e
27 changed files with 646 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core/src/__tests__/db-migrate.test.ts
View File

@@ -715,7 +715,7 @@ describe("schema migration", () => {
const row = db.prepare("SELECT deletedAt FROM tasks WHERE id = 'FN-legacy'").get() as { deletedAt: string | null };
expect(row.deletedAt).toBeNull();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
db.close();
});
@@ -748,7 +748,7 @@ describe("schema migration", () => {
{ id: "WS-001", mode: "prompt", gateMode: "advisory" },
{ id: "WS-002", mode: "script", gateMode: "advisory" },
]);
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
db.close();
});
@@ -798,7 +798,7 @@ describe("schema migration", () => {
reviewerContextRetryCount: 0,
reviewerFallbackRetryCount: 0,
});
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
db.close();
});
@@ -827,7 +827,7 @@ describe("schema migration", () => {
const columns = db.prepare("PRAGMA table_info(milestones)").all() as Array<{ name: string }>;
expect(columns.map((column) => column.name)).toContain("acceptanceCriteria");
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
db.close();
});
@@ -868,7 +868,7 @@ describe("schema migration", () => {
const missionColumns = db.prepare("PRAGMA table_info(missions)").all() as Array<{ name: string }>;
expect(missionColumns.map((column) => column.name)).toContain("autoMerge");
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
db.close();
});
@@ -902,7 +902,7 @@ describe("schema migration", () => {
{ id: "WS-002", mode: "script", enabled: 1, gateMode: "advisory" },
{ id: "WS-003", mode: "prompt", enabled: 0, gateMode: "advisory" },
]);
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
db.close();
});

34
packages/core/src/__tests__/db.test.ts
View File

@@ -330,7 +330,7 @@ describe("Database", () => {
});
it("seeds schema version", () => {
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
});
it("includes tokenUsageCacheWriteTokens on freshly initialized tasks table", () => {
@@ -389,7 +389,7 @@ describe("Database", () => {
it("is idempotent - calling init() twice does not fail", () => {
expect(() => db.init()).not.toThrow();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
});
it("does not overwrite existing config on re-init", () => {
// Update the config
@@ -1459,7 +1459,7 @@ describe("schema migrations", () => {
db.init();
// Verify version bumped to 29 (includes v1→v2 through v26→v29)
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
// Verify new columns exist and existing data is intact
const cols = db.prepare("PRAGMA table_info(tasks)").all() as Array<{ name: string }>;
@@ -1484,11 +1484,11 @@ describe("schema migrations", () => {
const db = new Database(fusionDir);
db.init();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
// Re-init should not fail
db.init();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
db.close();
});
@@ -1523,7 +1523,7 @@ describe("schema migrations", () => {
db.init();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
const cols = db.prepare("PRAGMA table_info(tasks)").all() as Array<{ name: string }>;
expect(cols.map((col) => col.name)).toContain("priority");
@@ -1564,7 +1564,7 @@ describe("schema migrations", () => {
db.init();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
const cols = db.prepare("PRAGMA table_info(tasks)").all() as Array<{ name: string }>;
const colNames = cols.map((col) => col.name);
@@ -1636,7 +1636,7 @@ describe("schema migrations", () => {
db.init();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
const cols = db.prepare("PRAGMA table_info(tasks)").all() as Array<{ name: string }>;
const colNames = cols.map((col) => col.name);
@@ -1876,7 +1876,7 @@ describe("schema migrations", () => {
db.init();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
const cols = db.prepare("PRAGMA table_info(chat_messages)").all() as Array<{ name: string }>;
expect(cols.map((col) => col.name)).toContain("attachments");
@@ -1950,7 +1950,7 @@ describe("schema migrations", () => {
db.init();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
const tables = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name = 'agentRatings'").all() as Array<{ name: string }>;
expect(tables).toEqual([{ name: "agentRatings" }]);
@@ -1974,7 +1974,7 @@ describe("schema migrations", () => {
db.init();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
const tables = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name = 'mission_events'").all() as Array<{ name: string }>;
expect(tables).toEqual([{ name: "mission_events" }]);
@@ -2078,7 +2078,7 @@ describe("schema migrations", () => {
db.init();
// Verify version bumped to 29
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
// Verify new columns exist and existing data is intact
const cols = db.prepare("PRAGMA table_info(tasks)").all() as Array<{ name: string }>;
@@ -2297,7 +2297,7 @@ describe("schema migrations", () => {
localDb.init();
expect(localDb.getSchemaVersion()).toBe(99);
expect(localDb.getSchemaVersion()).toBe(100);
const columns = localDb.prepare("PRAGMA table_info(tasks)").all() as Array<{ name: string }>;
expect(columns.map((column) => column.name)).toContain("tokenUsageCacheWriteTokens");
@@ -2608,7 +2608,7 @@ describe("createDatabase factory", () => {
const db = createDatabase(fusionDir);
db.init();
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
expect(db.getLastModified()).toBeGreaterThan(0);
db.close();
@@ -2762,7 +2762,7 @@ describe("migration v77 task token budget columns", () => {
migrated = new Database(fusion);
migrated.init();
expect(migrated.getSchemaVersion()).toBe(99);
expect(migrated.getSchemaVersion()).toBe(100);
const rows = migrated.prepare("PRAGMA table_info(tasks)").all() as Array<{ name: string }>;
const names = new Set(rows.map((row) => row.name));
expect(names.has("tokenBudgetSoftAlertedAt")).toBe(true);
@@ -2808,7 +2808,7 @@ describe("migration v67 drops orphan project auth tables", () => {
migrated = new Database(fusion);
migrated.init();
expect(migrated.getSchemaVersion()).toBe(99);
expect(migrated.getSchemaVersion()).toBe(100);
const tables = migrated
.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name LIKE 'project_auth_%'")
.all() as Array<{ name: string }>;
@@ -2835,7 +2835,7 @@ describe("migration v67 drops orphan project auth tables", () => {
try {
fresh.init();
expect(fresh.getSchemaVersion()).toBe(99);
expect(fresh.getSchemaVersion()).toBe(100);
const tables = fresh
.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name LIKE 'project_auth_%'")
.all() as Array<{ name: string }>;

2
packages/core/src/__tests__/goals-schema.test.ts
View File

@@ -91,6 +91,6 @@ describe("goals schema", () => {
});
it("reports schema version 92", () => {
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
});
});

10
packages/core/src/__tests__/insight-store.test.ts
View File

@@ -1000,7 +1000,7 @@ describe("Migration: pre-33 DB upgrade", () => {
// Step 1: Create a fresh database at v33 (runs all migrations up to 33)
const db1 = createDatabase(legacyDir);
db1.init();
expect(db1.getSchemaVersion()).toBe(99);
expect(db1.getSchemaVersion()).toBe(100);
db1.close();
// Step 2: Manually downgrade to version 32 and drop insight tables
@@ -1035,7 +1035,7 @@ describe("Migration: pre-33 DB upgrade", () => {
expect(tableNamesBefore).not.toContain("project_insight_runs");
// Now run init — this triggers the v32→v33 migration
db3.init();
expect(db3.getSchemaVersion()).toBe(99);
expect(db3.getSchemaVersion()).toBe(100);
// Step 4: Verify insight tables exist after migration
const tablesAfter = db3.prepare(
@@ -1066,12 +1066,12 @@ describe("Migration: pre-33 DB upgrade", () => {
try {
const db1 = createDatabase(testDir);
db1.init();
expect(db1.getSchemaVersion()).toBe(99);
expect(db1.getSchemaVersion()).toBe(100);
db1.close();
const db2 = createDatabase(testDir);
expect(() => db2.init()).not.toThrow();
expect(db2.getSchemaVersion()).toBe(99);
expect(db2.getSchemaVersion()).toBe(100);
db2.close();
} finally {
rmSync(testDir, { recursive: true, force: true });
@@ -1085,7 +1085,7 @@ describe("Migration: pre-33 DB upgrade", () => {
// Step 1: Create a fresh DB and run migrations
const db1 = createDatabase(compatDir);
db1.init();
expect(db1.getSchemaVersion()).toBe(99);
expect(db1.getSchemaVersion()).toBe(100);
// Step 2: Strip lifecycle and cancelledAt columns by recreating the
// table without them. This simulates a DB that was created before the

97
packages/core/src/__tests__/merge-request-record.test.ts Normal file
View File

@@ -0,0 +1,97 @@
import { afterEach, beforeEach, describe, expect, it } from "vitest";
import { mkdtempSync } from "node:fs";
import { rm } from "node:fs/promises";
import { join } from "node:path";
import { tmpdir } from "node:os";
import { TaskStore } from "../store.js";
function makeTmpDir(): string {
return mkdtempSync(join(tmpdir(), "kb-merge-request-record-test-"));
}
describe("TaskStore merge request record + completion handoff marker", () => {
let rootDir: string;
let globalDir: string;
let store: TaskStore;
beforeEach(async () => {
rootDir = makeTmpDir();
globalDir = join(rootDir, ".fusion-global");
store = new TaskStore(rootDir, globalDir);
await store.init();
});
afterEach(async () => {
store.close();
await rm(rootDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 50 });
});
async function createTask(): Promise<string> {
const task = await store.createTask({ description: "merge request test" });
return task.id;
}
it("creates merge-request and marker tables on fresh schema", () => {
const db = store.getDatabase();
const tableRows = db
.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name IN ('merge_requests', 'completion_handoff_markers') ORDER BY name")
.all() as Array<{ name: string }>;
expect(tableRows).toEqual([{ name: "completion_handoff_markers" }, { name: "merge_requests" }]);
expect(db.getSchemaVersion()).toBe(100);
});
it("upserts merge request records", async () => {
const taskId = await createTask();
const created = store.upsertMergeRequestRecord(taskId, {
state: "queued",
now: "2026-05-30T00:00:00.000Z",
});
expect(created).toMatchObject({ taskId, state: "queued", attemptCount: 0, lastError: null });
const updated = store.upsertMergeRequestRecord(taskId, {
state: "manual-required",
now: "2026-05-30T00:00:01.000Z",
attemptCount: 2,
lastError: "waiting for user",
});
expect(updated).toMatchObject({ taskId, state: "manual-required", attemptCount: 2, lastError: "waiting for user" });
});
it("supports valid merge-request transitions", async () => {
const taskId = await createTask();
store.upsertMergeRequestRecord(taskId, { state: "queued", now: "2026-05-30T00:00:00.000Z" });
expect(store.transitionMergeRequestState(taskId, "running", { now: "2026-05-30T00:00:01.000Z" }).state).toBe("running");
expect(store.transitionMergeRequestState(taskId, "retrying", { now: "2026-05-30T00:00:02.000Z", attemptCount: 1 }).state).toBe("retrying");
expect(store.transitionMergeRequestState(taskId, "queued", { now: "2026-05-30T00:00:03.000Z" }).state).toBe("queued");
expect(store.transitionMergeRequestState(taskId, "running", { now: "2026-05-30T00:00:04.000Z" }).state).toBe("running");
expect(store.transitionMergeRequestState(taskId, "succeeded", { now: "2026-05-30T00:00:05.000Z" }).state).toBe("succeeded");
});
it("rejects invalid merge-request transitions", async () => {
const taskId = await createTask();
store.upsertMergeRequestRecord(taskId, { state: "queued" });
expect(() => store.transitionMergeRequestState(taskId, "succeeded")).toThrow(
`Invalid merge request state transition for ${taskId}: queued -> succeeded`,
);
});
it("sets and clears completion handoff marker", async () => {
const taskId = await createTask();
const marker = store.setCompletionHandoffAcceptedMarker(taskId, {
acceptedAt: "2026-05-30T00:00:00.000Z",
source: "executor:fn_task_done",
});
expect(marker).toEqual({
taskId,
acceptedAt: "2026-05-30T00:00:00.000Z",
source: "executor:fn_task_done",
});
expect(store.getCompletionHandoffAcceptedMarker(taskId)).toEqual(marker);
store.clearCompletionHandoffAcceptedMarker(taskId);
expect(store.getCompletionHandoffAcceptedMarker(taskId)).toBeNull();
});
});

2
packages/core/src/__tests__/mission-store.test.ts
View File

@@ -3318,7 +3318,7 @@ describe("MissionStore", () => {
describe("Loop State & Validator Run Schema (v31)", () => {
it("schema version is 40 after migration", () => {
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
});
it("mission_features table has loop state columns", () => {

2
packages/core/src/__tests__/run-audit.test.ts
View File

@@ -584,7 +584,7 @@ describe("Run Audit", () => {
});
it("schema version is bumped to 40", () => {
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
});
});
});

6
packages/core/src/__tests__/secrets-schema.test.ts
View File

@@ -42,7 +42,7 @@ describe("secrets schema migrations", () => {
const version = db
.prepare("SELECT value FROM __meta WHERE key = 'schemaVersion'")
.get() as { value: string };
expect(version.value).toBe("99");
expect(version.value).toBe("100");
} finally {
db.close();
rmSync(dir, { recursive: true, force: true });
@@ -105,7 +105,7 @@ describe("secrets schema migrations", () => {
const version = db
.prepare("SELECT value FROM __meta WHERE key = 'schemaVersion'")
.get() as { value: string };
expect(version.value).toBe("99");
expect(version.value).toBe("100");
} finally {
db.close();
rmSync(dir, { recursive: true, force: true });
@@ -155,7 +155,7 @@ describe("secrets schema migrations", () => {
.prepare("SELECT value FROM __meta WHERE key = 'schemaVersion'")
.get() as { value: string };
expect(projectVersion.value).toBe("99");
expect(projectVersion.value).toBe("100");
expect(centralVersion.value).toBe("13");
} finally {
projectDb.close();

3
packages/core/src/__tests__/settings-parity.test.ts
View File

@@ -56,6 +56,8 @@ describe("settings key parity", () => {
expect(isProjectSettingsKey("remoteAccess")).toBe(false);
expect(isProjectSettingsKey("researchSettings")).toBe(true);
expect(isGlobalSettingsKey("researchGlobalDefaults")).toBe(true);
expect(isProjectSettingsKey("mergeRequestContractShadowEnabled")).toBe(true);
expect(isGlobalSettingsKey("mergeRequestContractShadowEnabled")).toBe(true);
expect(isProjectSettingsKey("themeMode")).toBe(false);
expect(isGlobalSettingsKey("remoteAccess")).toBe(true);
expect(isGlobalSettingsKey("persistAgentToolOutput")).toBe(true);
@@ -307,6 +309,7 @@ describe("settings key parity", () => {
const overlap = (GLOBAL_SETTINGS_KEYS as readonly string[]).filter((key) => projectKeySet.has(key));
expect(overlap).toEqual([
"testMode",
"mergeRequestContractShadowEnabled",
"taskTokenBudget",
"githubTrackingDefaultRepo",
"worktrunk",

2
packages/core/src/__tests__/store-merge-queue.test.ts
View File

@@ -60,7 +60,7 @@ describe("TaskStore merge queue", () => {
expect.arrayContaining(["idx_mergeQueue_lease_ready", "idx_mergeQueue_leaseExpiresAt"]),
);
expect(store.getDatabase().getSchemaVersion()).toBe(99);
expect(store.getDatabase().getSchemaVersion()).toBe(100);
});
it("migrates a legacy v88 database and preserves task rows", async () => {

2
packages/core/src/__tests__/task-documents.test.ts
View File

@@ -51,7 +51,7 @@ describe("TaskStore task documents", () => {
expect(tableNames.has("task_documents")).toBe(true);
expect(tableNames.has("task_document_revisions")).toBe(true);
expect(db.getSchemaVersion()).toBe(99);
expect(db.getSchemaVersion()).toBe(100);
const index = db
.prepare(