@iowarp/clio-coder 0.4.0 → 0.4.2

package/src/domains/dispatch/fleet-node-prompt.ts

@@ -40,7 +40,7 @@ import { type ResultContract, resultContractShape } from "../agents/result-contr
  * its recipe keeps sole authority over the shape. Every other kind is fully
  * determined by its kind and can be quoted exactly.
  */
-export function fleetNodeAnswerDirective(kind: ResultContract["kind"]): string | null {
+function fleetNodeAnswerDirective(kind: ResultContract["kind"]): string | null {
 	if (kind === "architect-plan") return null;
 	return [
 		`Your result contract for this step is \`${kind}\`.`,

package/src/domains/dispatch/fleet-preflight.ts

@@ -18,7 +18,6 @@ import { performance } from "node:perf_hooks";
 import { readClioVersion } from "../../core/package-root.js";
 import { shellQuote } from "../../core/shell-quote.js";
 import { clioStateDir } from "../../core/xdg.js";
-import { atomicWrite } from "../../engine/session.js";
 import {
 	evaluateRouteFacts,
 	type FactState,
@@ -92,16 +91,6 @@ export function readFleetPreflightRecords(): FleetPreflightRecord[] {
 	}
 }
 
-/** Upsert records keyed by (nodeId, projectRoot). */
-export function recordFleetPreflight(records: ReadonlyArray<FleetPreflightRecord>): void {
-	const existing = readFleetPreflightRecords();
-	const merged = new Map<string, FleetPreflightRecord>();
-	for (const record of existing) merged.set(`${record.nodeId}\0${record.projectRoot}`, record);
-	for (const record of records) merged.set(`${record.nodeId}\0${record.projectRoot}`, record);
-	const file: FleetPreflightStoreFile = { version: 2, records: [...merged.values()] };
-	atomicWrite(storePath(), JSON.stringify(file, null, 2));
-}
-
 export interface FleetPreflightVerdict {
 	ok: boolean;
 	reason: string | null;
@@ -164,7 +153,8 @@ export function routeFactVerdict(
 	return evaluateRouteFacts(targets, resources, requirement, options);
 }
 
-const PREFLIGHT_MARKER = "clio-preflight/1";
+const PREFLIGHT_MARKER = "clio-coder-preflight/1";
+const LEGACY_PREFLIGHT_MARKER = "clio-preflight/1";
 const DEFAULT_PREFLIGHT_TIMEOUT_MS = 20_000;
 
 /**
@@ -187,8 +177,8 @@ function buildPreflightScript(
 	const cliBase = entry.endsWith(" worker") ? entry.slice(0, -" worker".length) : null;
 	const versionProbe =
 		cliBase !== null
-			? `v=$(${cliBase} --version 2>/dev/null | head -n 1); if [ -n "$v" ]; then echo "clio=$v"; else echo clio=missing; fi`
-			: `echo clio=custom-entry`;
+			? `v=$(${cliBase} --version 2>/dev/null | head -n 1); if [ -n "$v" ]; then echo "clioCoder=$v"; else echo clioCoder=missing; fi`
+			: `echo clioCoder=custom-entry`;
 	const lines = [
 		`echo ${shellQuote(PREFLIGHT_MARKER)}`,
 		`if cd ${shellQuote(projectRoot)} 2>/dev/null; then echo cwd=ok; else echo cwd=missing; fi`,
@@ -342,7 +332,7 @@ export async function runFleetNodePreflight(
 	// Probe latency is durable eligibility evidence compared across nodes and
 	// across passes, so it is measured on the monotonic clock.
 	const probeDurationMs = Math.round(performance.now() - probeStartedAt);
-	if (!result.stdout.includes(PREFLIGHT_MARKER)) {
+	if (!result.stdout.includes(PREFLIGHT_MARKER) && !result.stdout.includes(LEGACY_PREFLIGHT_MARKER)) {
 		const stderr = result.stderr.trim().split("\n").slice(-1)[0] ?? "";
 		record.detail = `unreachable (ssh exit ${result.code}${stderr.length > 0 ? `: ${stderr}` : ""})`;
 		return record;
@@ -364,8 +354,9 @@ export async function runFleetNodePreflight(
 	};
 	checks.pathParity = lines.includes("cwd=ok");
 	checks.stateDirWritable = lines.includes("state=ok");
-	const clioLine = lines.find((line) => line.startsWith("clio="));
-	const clioValue = clioLine?.slice("clio=".length) ?? "missing";
+	const clioCoderLine = lines.find((line) => line.startsWith("clioCoder="));
+	const legacyClioLine = lines.find((line) => line.startsWith("clio="));
+	const clioValue = clioCoderLine?.slice("clioCoder=".length) ?? legacyClioLine?.slice("clio=".length) ?? "missing";
 	if (clioValue === "custom-entry") {
 		// A custom clioCoderEntry that is not `<cli> worker` cannot be version-probed;
 		// the operator vouches for it. Presence is asserted, match is assumed.

package/src/domains/dispatch/fleet-run.ts

@@ -204,12 +204,6 @@ export interface FleetRunOutcome {
 	planHash: string;
 	result: ExecutionPlanResult;
 	receipts: ReadonlyArray<RunReceipt>;
-	/**
-	 * The bare sum of every receipt's `costUsd`, which adds unpriced zeros to
-	 * priced dollars and so cannot be rendered on its own. Retained for the
-	 * interactive fleet overlay, which still reads it. Render `totalCost`.
-	 */
-	totalCostUsd: number;
 	/**
 	 * The fold that keeps unpriced calls distinguishable from priced ones, so a
 	 * run whose every receipt came back `unknown` renders as not measured rather
@@ -862,7 +856,6 @@ export async function executeFleetRun(input: ExecuteFleetRunInput): Promise<Flee
 		planHash: input.plan.hash,
 		result,
 		receipts,
-		totalCostUsd: receipts.reduce((sum, receipt) => sum + receipt.costUsd, 0),
 		totalCost: aggregateCostAmounts(
 			receipts.map((receipt) => ({ usd: receipt.costUsd, provenance: receipt.costProvenance })),
 		),

package/src/domains/dispatch/gate-decisions.ts

@@ -380,7 +380,8 @@ function semanticError(value: unknown): string | null {
 			value.winner.index < 1 ||
 			!isSubjectRef(value.winner.subject) ||
 			typeof value.winner.branch !== "string" ||
-			value.winner.branch !== `clio/compete/${value.group}/${value.winner.index}`
+			(value.winner.branch !== `clio-coder/compete/${value.group}/${value.winner.index}` &&
+				value.winner.branch !== `clio/compete/${value.group}/${value.winner.index}`)
 		) {
 			return "gate decision winner invalid";
 		}
@@ -433,9 +434,12 @@ function pendingDecisionPath(id: string, stateDir = clioStateDir()): string {
 	return join(pendingDecisionsDirectory(stateDir), `${id}.json`);
 }
 
-function decisionPayload(decision: Omit<GateDecisionArtifact, "integrity">): Record<string, unknown> {
+function decisionPayload(
+	decision: Omit<GateDecisionArtifact, "integrity">,
+	legacyNaming = false,
+): Record<string, unknown> {
 	return {
-		contract: "clio.gateDecision.integrity",
+		contract: legacyNaming ? "clio.gateDecision.integrity" : "clio-coder.gateDecision.integrity",
 		version: decision.version,
 		id: decision.id,
 		group: decision.group,
@@ -467,9 +471,9 @@ function decisionPayload(decision: Omit<GateDecisionArtifact, "integrity">): Rec
 	};
 }
 
-function decisionDigest(decision: Omit<GateDecisionArtifact, "integrity">): string {
+function decisionDigest(decision: Omit<GateDecisionArtifact, "integrity">, legacyNaming = false): string {
 	return createHash("sha256")
-		.update(JSON.stringify(decisionPayload(decision)), "utf8")
+		.update(JSON.stringify(decisionPayload(decision, legacyNaming)), "utf8")
 		.digest("hex");
 }
 
@@ -502,7 +506,9 @@ export function verifyGateDecisionArtifact(artifact: GateDecisionArtifact): Gate
 	const invalid = semanticError(artifact);
 	if (invalid !== null) return { ok: false, reason: invalid };
 	if (!/^[0-9a-f]{64}$/.test(artifact.integrity.digest)) return { ok: false, reason: "gate decision integrity invalid" };
-	return decisionDigest(artifactWithoutIntegrity(artifact)) === artifact.integrity.digest
+	const withoutIntegrity = artifactWithoutIntegrity(artifact);
+	return decisionDigest(withoutIntegrity) === artifact.integrity.digest ||
+		decisionDigest(withoutIntegrity, true) === artifact.integrity.digest
 		? { ok: true }
 		: { ok: false, reason: "gate decision integrity mismatch" };
 }
@@ -597,10 +603,13 @@ function cloneGateDecisionArtifact(artifact: GateDecisionArtifact): GateDecision
 	};
 }
 
-function pendingRecordPayload(record: PendingGateRecordWithoutIntegrity): Record<string, unknown> {
+function pendingRecordPayload(
+	record: PendingGateRecordWithoutIntegrity,
+	legacyNaming = false,
+): Record<string, unknown> {
 	if (record.kind === "output") {
 		return {
-			contract: "clio.gateDecision.pending",
+			contract: legacyNaming ? "clio.gateDecision.pending" : "clio-coder.gateDecision.pending",
 			version: record.version,
 			kind: record.kind,
 			id: record.id,
@@ -617,12 +626,12 @@ function pendingRecordPayload(record: PendingGateRecordWithoutIntegrity): Record
 	}
 	const decisionWithoutIntegrity = artifactWithoutIntegrity(record.decision);
 	return {
-		contract: "clio.gateDecision.pending",
+		contract: legacyNaming ? "clio.gateDecision.pending" : "clio-coder.gateDecision.pending",
 		version: record.version,
 		kind: record.kind,
 		id: record.id,
 		decision: {
-			...decisionPayload(decisionWithoutIntegrity),
+			...decisionPayload(decisionWithoutIntegrity, legacyNaming),
 			integrity: { ...record.decision.integrity },
 		},
 		...(record.finalOutput !== undefined ? { finalOutput: record.finalOutput } : {}),
@@ -631,9 +640,9 @@ function pendingRecordPayload(record: PendingGateRecordWithoutIntegrity): Record
 	};
 }
 
-function pendingRecordDigest(record: PendingGateRecordWithoutIntegrity): string {
+function pendingRecordDigest(record: PendingGateRecordWithoutIntegrity, legacyNaming = false): string {
 	return createHash("sha256")
-		.update(JSON.stringify(pendingRecordPayload(record)), "utf8")
+		.update(JSON.stringify(pendingRecordPayload(record, legacyNaming)), "utf8")
 		.digest("hex");
 }
 
@@ -721,10 +730,12 @@ function pendingSemanticError(value: unknown): string | null {
 }
 
 /** Verify both the pending envelope and its nested final artifact, when resolved. */
-export function verifyPendingGateDecisionRecord(record: PendingGateDecisionRecord): GateDecisionVerification {
+function verifyPendingGateDecisionRecord(record: PendingGateDecisionRecord): GateDecisionVerification {
 	const invalid = pendingSemanticError(record);
 	if (invalid !== null) return { ok: false, reason: invalid };
-	return pendingRecordDigest(pendingRecordWithoutIntegrity(record)) === record.integrity.digest
+	const withoutIntegrity = pendingRecordWithoutIntegrity(record);
+	return pendingRecordDigest(withoutIntegrity) === record.integrity.digest ||
+		pendingRecordDigest(withoutIntegrity, true) === record.integrity.digest
 		? { ok: true }
 		: { ok: false, reason: "pending gate decision integrity mismatch" };
 }