@shivaedev/work-fleet 0.5.0 → 0.7.0

package/src/reportFileDirectory.ts

@@ -1,7 +1,7 @@
 import { constants } from "node:fs";
 import { type FileHandle, open } from "node:fs/promises";
 import { Effect } from "effect";
-import { publication } from "@shivaedev/work-board/integration/publication.ts";
+import { publication } from "@shivaedev/work-board/server/integration/publication.ts";
 import { reportFileIo, withReportFile } from "#reportFileFailure.ts";
 
 export interface ReportDirectory {

package/src/scheduling/areas.ts

@@ -23,7 +23,7 @@ export function mergeWaitExpired(record: FleetRecord, now: number, mergeWaitMs:
 	);
 }
 
-function holdsAreas(record: FleetRecord, now: number, mergeWaitMs: number): boolean {
+export function holdsAreas(record: FleetRecord, now: number, mergeWaitMs: number): boolean {
 	return (
 		!["completed", "released"].includes(record.stage)
 		&& record.attempts.length > 0
@@ -68,7 +68,7 @@ export const checkAreas = Effect.fn("Fleet.checkAreas")(function* (
 	}
 	const ahead = records
 		.slice(0, index)
-		.find((entry) => entry.stage === "prepared" && entry.admissionReady !== false && entry.areas?.some((area) => areas.includes(area)));
+		.find((entry) => entry.stage === "prepared" && scheduling.waiters.includes(entry.workId) && entry.areas?.some((area) => areas.includes(area)));
 	if (ahead !== undefined) {
 		const queuedArea = areas.find((area) => ahead.areas?.includes(area));
 		return yield* Effect.fail(new StorageAdmission({ message: `waiting for area ${queuedArea} queued ahead by ${ahead.workId}` }));

package/src/session/service.ts

@@ -1,5 +1,5 @@
 import { Cause, Context, Effect } from "effect";
-import { defineService } from "@shivaedev/effect-service/define-service.ts";
+import { defineService } from "@shivaedev/effect-service/defineService.ts";
 import {
 	type ContinueSession,
 	type ReconcileSession,

package/src/storage/fleetMigrations.ts

@@ -4,6 +4,7 @@ import { addShapeColumns } from "#storage/addShapeColumns.ts";
 import { backfillDecisionCodes } from "#storage/backfillDecisionCodes.ts";
 import { modelTables } from "#storage/modelTables.ts";
 import { pruneEmptyCycles } from "#storage/pruneEmptyCycles.ts";
+import { childTable } from "#storage/recordChildren.ts";
 import { recordTimeColumns } from "#storage/recordTimes.ts";
 import { shapeV12 } from "#storage/shapeV12.ts";
 import { shapeV14 } from "#storage/shapeV14.ts";
@@ -56,5 +57,14 @@ export const fleetMigrations = Effect.fn("FleetStore.fleetMigrations")(function*
 			yield* addShapeColumns(namespace, shapeV12, shapeV14);
 			yield* sql`alter table ${sql(`${namespace}_dispatches`)} add column now boolean, add column ignore_areas boolean`;
 		}),
+		"15_remove_admission_ready": Effect.gen(function* () {
+			yield* sql`alter table ${sql(`${namespace}_records`)} drop column ${sql("admissionReady")}`;
+			yield* sql`alter table ${sql(childTable(namespace, ["history"]))} drop column ${sql("admissionReady")}`;
+		}),
+		"16_orchestrator_decisions": sql`update ${sql(`${namespace}_records`)} as records set version = version + 1, "attentionOwner" = 'orchestrator'
+			where stage = 'needs-human' and "attentionOwner" = 'maintainer'
+				and ("decision__code" = 'reviewed-pr-ready' or ("decision__code" = 'fleet-stale' and "decision__reason" = 'Board context changed'))
+				and not exists (select 1 from ${sql(childTable(namespace, ["supersededDecisions"]))} as superseded
+					where superseded.work_id = records.work_id and superseded."reassignedTo__decisionId" = records."decision__id")`,
 	});
 });

package/src/storage/makeFleetTransaction.ts

@@ -8,9 +8,9 @@ export const makeFleetTransaction = Effect.gen(function* () {
 	const sql = yield* SqlClient.SqlClient;
 	const current = yield* Effect.serviceOption(Reactivity.Reactivity);
 	const reactivity = current._tag === "Some" ? current.value : yield* Reactivity.make;
-	return <A, E, R>(keys: readonly Key[], body: Effect.Effect<A, E, R>) =>
+	return <A, E, R>(keys: readonly Key[] | ((value: A) => readonly Key[]), body: Effect.Effect<A, E, R>) =>
 		transact(
-			Effect.tap(body, () => invalidateOnCommit(invalidationKeys(keys))),
+			Effect.tap(body, (value) => invalidateOnCommit(invalidationKeys(typeof keys === "function" ? keys(value) : keys))),
 			{ onSqlError: (error) => error },
 		).pipe(Effect.provideService(SqlClient.SqlClient, sql), Effect.provideService(Reactivity.Reactivity, reactivity));
 });

package/src/storage/makeForeignReservations.ts

@@ -14,16 +14,27 @@ export const makeForeignReservations = Effect.fn("FleetStore.makeForeignReservat
 		tableName: `${namespace}_foreign_reservations`,
 	});
 	const lock = sql`select pg_advisory_xact_lock(hashtextextended(${`work_fleet_admission:${namespace}`}, 0))`;
+	function exists(owner: string) {
+		return reservations.findMany({ where: { owner } }).pipe(Effect.map((rows) => rows.length > 0));
+	}
 	return {
 		foreignReservations: () => reservations.findMany({ orderBy: { direction: "asc", field: "owner" } }),
-		releaseForeign: (owner: string) =>
-			commit(
-				[fleetRecords.list],
+		releaseForeign: Effect.fn("FleetStore.releaseForeign")(function* (owner: string) {
+			if (!(yield* exists(owner))) {
+				return;
+			}
+			yield* commit(
+				(deleted) => (deleted ? [fleetRecords.list] : []),
 				Effect.gen(function* () {
 					yield* lock;
+					if (!(yield* exists(owner))) {
+						return false;
+					}
 					yield* reservations.delete(owner);
+					return true;
 				}),
-			),
+			);
+		}),
 		reserveForeign: (owner: string, occupancy: { readonly executing: boolean; readonly backlog: boolean } = { backlog: true, executing: true }) =>
 			commit(
 				[fleetRecords.list],

package/src/storage/model.ts

@@ -20,7 +20,7 @@ export interface AdmissionLimits {
 	readonly maxBacklog?: number;
 	readonly maxExecuting?: number;
 	readonly quota?: { readonly observedAt: number; readonly available: number };
-	readonly scheduling?: { readonly now: number; readonly areaMergeWaitMs: number };
+	readonly scheduling?: { readonly now: number; readonly areaMergeWaitMs: number; readonly waiters: readonly string[] };
 }
 
 export function recordColumns(schema: Schema.Top = FleetRecord) {

package/dist/engine/releaseOnly.d.ts

@@ -1,3 +0,0 @@
-import type { DecisionCode } from "#DecisionCode.ts";
-export declare function releaseOnly(code: DecisionCode | undefined): string | undefined;
-//# sourceMappingURL=releaseOnly.d.ts.map

package/dist/engine/releaseOnly.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"releaseOnly.d.ts","sourceRoot":"","sources":["../../src/engine/releaseOnly.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAqBrD,wBAAgB,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,sBAEzD"}

package/dist/engine/releaseOnly.js

@@ -1,19 +0,0 @@
-const explanations = {
-    "checks-result-invalid": "Retry cannot validate a malformed adopted result; release and prepare with a valid PR identity and commit SHA.",
-    "delivery-pr-required": "Retry cannot replace an adopted PR identity; release and inspect ownership before preparing a valid GitHub result.",
-    "duplicate-turns": "Retry cannot select one result from duplicate accepted turns; release only after every matching turn is confirmed terminal.",
-    "foreign-pr": "Retry cannot move a PR into the configured repository; release this cycle and prepare work with the correct repository ownership.",
-    "incomplete-context": "Retry cannot reconstruct missing preparation context; release and prepare with complete context.",
-    "incomplete-observation": "Retry cannot establish preparation compatibility; release and prepare with a complete main observation.",
-    "no-change-checks-unconfigured": "Retry cannot validate a no-change result in this host; release and prepare work in a runtime with configured no-change checks.",
-    "not-ancestor": "Retry cannot rebase preparation onto unrelated main history; release and prepare against current main.",
-    "relevant-change": "Retry cannot refresh affected preparation context; release and prepare against current main.",
-    "report-published": "Retry cannot undo GitHub publication because closed pull requests remain publication evidence; release this report cycle and inspect the published work.",
-    "report-too-large": "Retry cannot shorten the immutable completed report; release and prepare a worker to produce a shorter report.",
-    "result-identity-changed": "Retry cannot transfer ownership to a different result; release and inspect the replacement before preparing again.",
-    "worker-receipt-missing": "Retry cannot establish adopted worker ownership from the saved evidence; release and inspect ownership before preparing again.",
-};
-export function releaseOnly(code) {
-    return code === undefined ? undefined : explanations[code];
-}
-//# sourceMappingURL=releaseOnly.js.map

package/dist/engine/releaseOnly.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"releaseOnly.js","sourceRoot":"","sources":["../../src/engine/releaseOnly.ts"],"names":[],"mappings":"AAEA,MAAM,YAAY,GAAoD;IACrE,uBAAuB,EAAE,gHAAgH;IACzI,sBAAsB,EAAE,oHAAoH;IAC5I,iBAAiB,EAAE,6HAA6H;IAChJ,YAAY,EAAE,mIAAmI;IACjJ,oBAAoB,EAAE,kGAAkG;IACxH,wBAAwB,EAAE,yGAAyG;IACnI,+BAA+B,EAC9B,gIAAgI;IACjI,cAAc,EAAE,wGAAwG;IACxH,iBAAiB,EAAE,8FAA8F;IACjH,kBAAkB,EACjB,0JAA0J;IAC3J,kBAAkB,EAAE,gHAAgH;IACpI,yBAAyB,EAAE,oHAAoH;IAC/I,wBAAwB,EACvB,gIAAgI;CACjI,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,IAA8B;IACzD,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5D,CAAC"}

package/src/engine/releaseOnly.ts

@@ -1,24 +0,0 @@
-import type { DecisionCode } from "#DecisionCode.ts";
-
-const explanations: Readonly<Partial<Record<DecisionCode, string>>> = {
-	"checks-result-invalid": "Retry cannot validate a malformed adopted result; release and prepare with a valid PR identity and commit SHA.",
-	"delivery-pr-required": "Retry cannot replace an adopted PR identity; release and inspect ownership before preparing a valid GitHub result.",
-	"duplicate-turns": "Retry cannot select one result from duplicate accepted turns; release only after every matching turn is confirmed terminal.",
-	"foreign-pr": "Retry cannot move a PR into the configured repository; release this cycle and prepare work with the correct repository ownership.",
-	"incomplete-context": "Retry cannot reconstruct missing preparation context; release and prepare with complete context.",
-	"incomplete-observation": "Retry cannot establish preparation compatibility; release and prepare with a complete main observation.",
-	"no-change-checks-unconfigured":
-		"Retry cannot validate a no-change result in this host; release and prepare work in a runtime with configured no-change checks.",
-	"not-ancestor": "Retry cannot rebase preparation onto unrelated main history; release and prepare against current main.",
-	"relevant-change": "Retry cannot refresh affected preparation context; release and prepare against current main.",
-	"report-published":
-		"Retry cannot undo GitHub publication because closed pull requests remain publication evidence; release this report cycle and inspect the published work.",
-	"report-too-large": "Retry cannot shorten the immutable completed report; release and prepare a worker to produce a shorter report.",
-	"result-identity-changed": "Retry cannot transfer ownership to a different result; release and inspect the replacement before preparing again.",
-	"worker-receipt-missing":
-		"Retry cannot establish adopted worker ownership from the saved evidence; release and inspect ownership before preparing again.",
-};
-
-export function releaseOnly(code: DecisionCode | undefined) {
-	return code === undefined ? undefined : explanations[code];
-}