@iowarp/clio-coder 0.3.8 → 0.3.9

package/src/domains/dispatch/extension.ts

@@ -12,6 +12,7 @@
 import { createHash, randomBytes } from "node:crypto";
 import { type Dirent, existsSync, readdirSync, readFileSync } from "node:fs";
 import { isAbsolute, relative, resolve as resolvePath, sep } from "node:path";
+import { performance } from "node:perf_hooks";
 import { BusChannels, type DispatchCompletedPayload, type DispatchRunIdentity } from "../../core/bus-events.js";
 import { DEFAULT_SETTINGS, type DelegationToolGovernance } from "../../core/defaults.js";
 import type { DomainBundle, DomainContext, DomainExtension } from "../../core/domain-loader.js";
@@ -76,6 +77,9 @@ import { type EffectivePricing, resolveEffectivePricing } from "../providers/cat
 import {
 	type CapabilityFlags,
 	canonicalizeWireModelId,
+	type EndpointCapacity,
+	endpointCapacitiesForStatuses,
+	endpointCapacityForStatus,
 	firstRuntimeResolutionError,
 	isDispatchEligibleRuntime,
 	type ProvidersContract,
@@ -166,7 +170,14 @@ import {
 } from "./failure-classification.js";
 import { routeFactVerdict } from "./fleet-preflight.js";
 import { competeStanceLiner, isBoundedGateRolePrompt } from "./gate-role-prompts.js";
-import { classifyHeartbeat, DEFAULT_HEARTBEAT_SPEC, type HeartbeatSpec, type HeartbeatStatus } from "./heartbeat.js";
+import {
+	classifyHeartbeat,
+	DEFAULT_HEARTBEAT_SPEC,
+	type HeartbeatSpec,
+	type HeartbeatStamp,
+	type HeartbeatStatus,
+	heartbeatMonotonicAt,
+} from "./heartbeat.js";
 import { hostVerificationRejection, runHostVerification } from "./host-verification.js";
 import { renderDispatchIntentRequirements } from "./intent-requirements.js";
 import { adaptJointRouteInput } from "./joint-route-adapter.js";
@@ -205,6 +216,7 @@ import {
 	planQueueSlot,
 	type ReservationCapacitySnapshot,
 	rebindDispatchReservationMember,
+	releaseDispatchReservation,
 	releaseDispatchReservationMember,
 	reservedBudgetUsd,
 	reservedPlanPeakSlots,
@@ -286,6 +298,7 @@ import {
 	type SpawnOptions as WorkerSpawnOptions,
 	type WorkerSpec,
 } from "./worker-spawn.js";
+import type { WriteBoundaryAttribution, WriteBoundaryAttributionDowngrade } from "./write-boundary.js";
 
 interface RunTokenMeter {
 	inputTokens: number;
@@ -337,7 +350,7 @@ interface ActiveRun {
 	/** ACP event-inactivity window; null for native runs (heartbeat spec governs those). */
 	stallTimeoutMs: number | null;
 	lineage: RunLineage;
-	heartbeatAt: { current: number } | null;
+	heartbeatAt: HeartbeatStamp | null;
 	heartbeatStatus: HeartbeatStatus;
 	meter: RunTokenMeter;
 	pricing: EffectivePricing["rates"];
@@ -373,6 +386,8 @@ export interface DispatchBundleOptions {
 	heartbeatIntervalMs?: number;
 	resilienceCooldownMs?: number;
 	now?: () => number;
+	/** Monotonic clock for heartbeat age and ACP event-inactivity spans. */
+	monotonicNow?: () => number;
 	/** Immutable per-attempt session settings view; falls back to the shared snapshot. */
 	getSettings?: () => EffectiveSettings;
 	/** Live hard-block state cloned into each mediated worker spec. */
@@ -2397,6 +2412,7 @@ export function createDispatchBundle(
 		return DEFAULT_RESILIENCE_COOLDOWN_MS;
 	};
 	const now = options?.now ?? (() => Date.now());
+	const monotonicNow = options?.monotonicNow ?? (() => performance.now());
 	// Durable evidence owner used by shadow observation and active readiness.
 	const routeObserver: RouteObserver = options?.routeObserver ?? createRouteObserver({});
 
@@ -2406,9 +2422,9 @@ export function createDispatchBundle(
 	const targetCooldowns = new Map<string, { until: number; reason: string }>();
 	const ownedReservations = new Set<string>();
 	/**
-	 * Paths each finalized run's own tool calls aimed a successful mutation at,
-	 * newest last. `null` records a run whose write record is unusable, which is
-	 * a different answer from an empty list and has to survive as one.
+	 * Attribution from each finalized run's successful tool calls, newest last.
+	 * An incomplete record retains its paths as a lower bound beside the reasons
+	 * it cannot be read as a closed list.
 	 *
 	 * Held in memory rather than sealed into the receipt: the only reader is the
 	 * write boundary closing a window seconds later in this process, and a
@@ -2416,13 +2432,13 @@ export function createDispatchBundle(
 	 * Bounded because a long session finalizes many runs and none of this is
 	 * needed once its window has closed.
 	 */
-	const runWriteTargets = new Map<string, ReadonlyArray<string> | null>();
-	const recordRunWriteTargets = (runId: string, paths: ReadonlyArray<string> | null): void => {
-		runWriteTargets.set(runId, paths);
-		while (runWriteTargets.size > RUN_WRITE_TARGET_HISTORY) {
-			const oldest = runWriteTargets.keys().next();
+	const runWriteAttributions = new Map<string, WriteBoundaryAttribution>();
+	const recordRunWriteAttribution = (runId: string, attribution: WriteBoundaryAttribution): void => {
+		runWriteAttributions.set(runId, attribution);
+		while (runWriteAttributions.size > RUN_WRITE_TARGET_HISTORY) {
+			const oldest = runWriteAttributions.keys().next();
 			if (oldest.done === true) break;
-			runWriteTargets.delete(oldest.value);
+			runWriteAttributions.delete(oldest.value);
 		}
 	};
 	const capacityAdmission = createCapacityAdmissionController({
@@ -2430,7 +2446,7 @@ export function createDispatchBundle(
 			const settings = getEffectiveSettings();
 			const nodes: Record<string, number> = { local: configuredGlobalCapacity(settings) };
 			for (const node of settings?.fleet?.nodes ?? []) nodes[node.id] = node.maxWorkers;
-			return { global: configuredGlobalCapacity(settings), nodes };
+			return { global: configuredGlobalCapacity(settings), nodes, endpoints: configuredEndpointLimits() };
 		},
 		now,
 		reservedPlanPeak: (planId) =>
@@ -2443,6 +2459,21 @@ export function createDispatchBundle(
 		}),
 	);
 
+	function configuredEndpointLimits(): Readonly<Record<string, number>> {
+		return Object.fromEntries(
+			Object.entries(endpointCapacitiesForStatuses(providers.list())).map(([key, value]) => [key, value.limit]),
+		);
+	}
+
+	function endpointCapacityForTarget(targetId: string): EndpointCapacity | null {
+		const status = providers.list().find((entry) => entry.target.id === targetId);
+		if (status === undefined) return null;
+		const endpoint = endpointCapacityForStatus(status);
+		if (endpoint === null) return null;
+		const configured = endpointCapacitiesForStatuses(providers.list())[endpoint.key];
+		return configured ?? endpoint;
+	}
+
 	function reservationCapacitySnapshot(settings: EffectiveSettings): ReservationCapacitySnapshot {
 		const preflight = scheduling.preflight();
 		// Reservation planning compares against a fresh read, never the display cache.
@@ -2452,9 +2483,21 @@ export function createDispatchBundle(
 		};
 		for (const node of settings?.fleet?.nodes ?? [])
 			nodes[node.id] = { active: usage.nodes[node.id] ?? 0, limit: node.maxWorkers };
+		const endpoints = Object.fromEntries(
+			Object.entries(configuredEndpointLimits()).map(([key, limit]) => [
+				key,
+				{
+					active: usage.endpoints[key] ?? 0,
+					limit,
+					leases: usage.endpointHolders[key]?.leases ?? 0,
+					foregroundStreams: usage.endpointHolders[key]?.foregroundStreams ?? 0,
+				},
+			]),
+		);
 		return {
 			global: { active: usage.global, limit: configuredGlobalCapacity(settings) },
 			nodes,
+			endpoints,
 			budget: { currentUsd: preflight.currentUsd, ceilingUsd: preflight.ceilingUsd },
 		};
 	}
@@ -2466,6 +2509,7 @@ export function createDispatchBundle(
 				memberId: task.memberId,
 				wave: task.wave,
 				nodeId: task.resolution.node.id,
+				...(task.resolution.endpoint !== undefined ? { endpointKey: task.resolution.endpoint.key } : {}),
 				costUpperBoundUsd: task.resolution.routeApproval?.totalCostUpperBoundUsd ?? task.resolution.costUpperBoundUsd,
 			})),
 			capacity: reservationCapacitySnapshot(getEffectiveSettings()),
@@ -2520,7 +2564,12 @@ export function createDispatchBundle(
 		return scheduling.maxWorkers?.() ?? (configured === "auto" || configured === undefined ? 4 : Math.max(1, configured));
 	}
 
-	async function admitAssignmentCapacity(req: DispatchRequest, nodeId: string, timing: RunPhaseMarks) {
+	async function admitAssignmentCapacity(
+		req: DispatchRequest,
+		nodeId: string,
+		timing: RunPhaseMarks,
+		endpoint?: EndpointCapacity | null,
+	) {
 		const queuedAt = now();
 		timing.queuedAt = new Date(queuedAt).toISOString();
 		const assignmentId = req.lineage?.rootRunId ?? `pending-${queuedAt.toString(36)}-${randomBytes(6).toString("hex")}`;
@@ -2538,9 +2587,16 @@ export function createDispatchBundle(
 			const admitted = await capacityAdmission.admit({
 				assignmentId,
 				nodeId,
+				...(endpoint !== null && endpoint !== undefined ? { endpointKey: endpoint.key } : {}),
 				deadlineAt,
 				...plan,
-				...(req.reservation !== undefined && req.lineage === undefined ? { reservation: req.reservation } : {}),
+				// A fleet's first attempt carries lineage and still owns the held
+				// reservation member that admission must transfer into its lease.
+				// Retries carry the same reservation identity after that member was
+				// consumed, so they reacquire/rebind the assignment lease normally.
+				...(req.reservation !== undefined && (req.lineage === undefined || req.lineage.attempt === 0)
+					? { reservation: req.reservation }
+					: {}),
 			});
 			timing.admittedAt = new Date(admitted.admittedAt).toISOString();
 			return admitted.lease;
@@ -2557,6 +2613,7 @@ export function createDispatchBundle(
 	function rebindReservationSlot(
 		req: DispatchRequest,
 		nodeId: string,
+		endpoint: EndpointCapacity | null,
 		costUsd: number,
 		settings: EffectiveSettings,
 	): void {
@@ -2565,6 +2622,7 @@ export function createDispatchBundle(
 		const rebind = {
 			...req.reservation,
 			nodeId,
+			...(endpoint !== null ? { endpointKey: endpoint.key } : {}),
 			costUpperBoundUsd: req.routeApproval?.totalCostUpperBoundUsd ?? costUsd,
 			capacity,
 			nowMs: now(),
@@ -2672,6 +2730,21 @@ export function createDispatchBundle(
 
 	type RetryScheduleResult = { scheduled: true } | { scheduled: false; settlementDetail?: string };
 
+	/** A reserved plan member owns its retry chain independently of the shared fleet root assignment. */
+	function retryChainIsLive(run: ActiveRun): boolean {
+		if (run.aborted) return false;
+		const reservation = run.req.reservation;
+		if (reservation === undefined) return assignments.get(run.lineage.rootRunId)?.status === "running";
+		try {
+			const record = getDispatchReservation(reservation.ownerId);
+			const member = record?.members.find((entry) => entry.memberId === reservation.memberId);
+			return record?.status === "active" && member !== undefined && member.status !== "released";
+		} catch (error) {
+			reportDispatchDiagnostic(`read retry liveness for reservation member ${reservation.memberId}`, error);
+			return false;
+		}
+	}
+
 	function maybeScheduleRetry(
 		run: ActiveRun,
 		outcome: RunOutcome,
@@ -2681,7 +2754,7 @@ export function createDispatchBundle(
 	): RetryScheduleResult {
 		if (draining) return { scheduled: false };
 		const rootRunId = run.lineage.rootRunId;
-		if (assignments.get(rootRunId)?.status !== "running") return { scheduled: false };
+		if (!retryChainIsLive(run)) return { scheduled: false };
 		if (!RETRYABLE_OUTCOMES.has(outcome)) {
 			retryBackoff.delete(rootRunId);
 			return { scheduled: false };
@@ -2828,7 +2901,7 @@ export function createDispatchBundle(
 		reason = "retry",
 		decision: RetryDecision = decideRetry("internal", run.lineage.attempt, assignmentPolicyFor(run.req).maxRetries),
 	): Promise<void> {
-		if (draining || assignments.get(run.lineage.rootRunId)?.status !== "running") return;
+		if (draining || !retryChainIsLive(run)) return;
 		const excludesNode = decision.excludedRouteParts.includes("node");
 		// Record the failed node so placement can choose an eligible survivor.
 		const rerouteHops =
@@ -3010,8 +3083,8 @@ export function createDispatchBundle(
 		}
 	}
 
-	function heartbeatIso(heartbeatMs: number): string {
-		return new Date(heartbeatMs).toISOString();
+	function heartbeatIso(heartbeat: HeartbeatStamp): string {
+		return new Date(heartbeat.current).toISOString();
 	}
 
 	function heartbeatRunStatus(status: HeartbeatStatus): RunStatus {
@@ -3032,7 +3105,7 @@ export function createDispatchBundle(
 			event: {
 				type: "heartbeat_status",
 				status,
-				heartbeatAt: run.heartbeatAt ? heartbeatIso(run.heartbeatAt.current) : null,
+				heartbeatAt: run.heartbeatAt ? heartbeatIso(run.heartbeatAt) : null,
 			},
 		});
 	}
@@ -3050,16 +3123,16 @@ export function createDispatchBundle(
 	 */
 	function checkActiveHeartbeats(): void {
 		if (!ledger) return;
-		const tickNow = now();
+		const tickMonotonic = monotonicNow();
 		for (const run of active.values()) {
 			if (run.aborted || run.stallKilled || !run.heartbeatAt) continue;
-			const heartbeatMs = run.heartbeatAt.current;
-			if (!Number.isFinite(heartbeatMs)) continue;
+			const heartbeatMonotonic = heartbeatMonotonicAt(run.heartbeatAt);
+			if (!Number.isFinite(heartbeatMonotonic) || !Number.isFinite(run.heartbeatAt.current)) continue;
 			if (run.runtimeKind === "acp-delegation") {
-				ledger.update(run.runId, { heartbeatAt: heartbeatIso(heartbeatMs) });
+				ledger.update(run.runId, { heartbeatAt: heartbeatIso(run.heartbeatAt) });
 				const stallMs = run.stallTimeoutMs;
 				if (stallMs === null || stallMs <= 0) continue;
-				if (tickNow - heartbeatMs <= stallMs) continue;
+				if (tickMonotonic - heartbeatMonotonic <= stallMs) continue;
 				run.stallKilled = true;
 				run.heartbeatStatus = "dead";
 				emitHeartbeatStatus(run, "dead");
@@ -3070,10 +3143,10 @@ export function createDispatchBundle(
 				}
 				continue;
 			}
-			const status = classifyHeartbeat(heartbeatMs, tickNow, heartbeatSpec);
+			const status = classifyHeartbeat(heartbeatMonotonic, tickMonotonic, heartbeatSpec);
 			const patch: Partial<RunEnvelope> = {
 				status: heartbeatRunStatus(status),
-				heartbeatAt: heartbeatIso(heartbeatMs),
+				heartbeatAt: heartbeatIso(run.heartbeatAt),
 			};
 			ledger.update(run.runId, patch);
 			// Node staleness display feeds off the freshest worker heartbeat.
@@ -3493,7 +3566,7 @@ export function createDispatchBundle(
 
 		assertBudgetAdmitsRoute(req, { rates: null, provenance: "unknown" }, settings);
 
-		const capacityLease = await admitAssignmentCapacity(req, "local", timing);
+		const capacityLease = await admitAssignmentCapacity(req, "local", timing, null);
 		const leaseSlot = createLeaseSlotGuard(capacityAdmission, capacityLease.leaseId, req.lineage !== undefined);
 
 		// Resolve the ledger before starting the ACP process: an external agent
@@ -3519,6 +3592,8 @@ export function createDispatchBundle(
 				safety,
 				autonomy: lifecycle.autonomy,
 				clientVersion: readClioVersion(),
+				now,
+				monotonicNow,
 			});
 		} catch (error) {
 			leaseSlot.release();
@@ -3707,7 +3782,7 @@ export function createDispatchBundle(
 			ledgerRef.update(envelope.id, {
 				status: "running",
 				pid: acp.pid,
-				heartbeatAt: heartbeatIso(acp.heartbeatAt.current),
+				heartbeatAt: heartbeatIso(acp.heartbeatAt),
 				lineage,
 				identity,
 				node: LOCAL_RUN_NODE,
@@ -4104,7 +4179,7 @@ export function createDispatchBundle(
 					cacheReadTokenCount: receiptDraft.cacheReadTokenCount ?? 0,
 					cacheWriteTokenCount: receiptDraft.cacheWriteTokenCount ?? 0,
 					reasoningTokenCount: receiptDraft.reasoningTokenCount ?? 0,
-					heartbeatAt: heartbeatIso(acp.heartbeatAt.current),
+					heartbeatAt: heartbeatIso(acp.heartbeatAt),
 				};
 				ledgerRef.update(envelope.id, ledgerPatch);
 				const receipt = ledgerRef.recordReceipt(envelope.id, sealRouteDecision(receiptDraft, routeDecision));
@@ -4262,7 +4337,7 @@ export function createDispatchBundle(
 					"dispatch: writeRoots cannot be enforced on an ACP delegation target; the external agent runs its own tool surface. Dispatch to a native or claude-sdk worker.",
 				);
 			}
-			rebindReservationSlot(req, "local", UNKNOWN_PRICING_ADMISSION_ESTIMATE_USD, settings);
+			rebindReservationSlot(req, "local", null, UNKNOWN_PRICING_ADMISSION_ESTIMATE_USD, settings);
 			routeObservation = observeShadowRoute(req, undefined, settings);
 			return attachRouteObservation({
 				...(await dispatchAcpDelegation(req, settings, timing, routeObservation.decision, observer)),
@@ -4296,10 +4371,12 @@ export function createDispatchBundle(
 			model: lifecycle.target.wireModelId,
 			node: placement?.node?.id ?? "local",
 		};
+		const endpoint = endpointCapacityForTarget(lifecycle.target.target.id);
 		assertRouteWithinApprovedEnvelope(req, effectiveRoute);
 		rebindReservationSlot(
 			req,
 			effectiveRoute.node,
+			endpoint,
 			conservativeRouteAdmissionEstimateUsd(lifecycle.target.effectivePricing, admissionMaxOutputTokens(settings)),
 			settings,
 		);
@@ -4318,7 +4395,7 @@ export function createDispatchBundle(
 			shadow: () => observeShadowRoute(req, placed, settings),
 		});
 
-		const capacityLease = await admitAssignmentCapacity(req, placement?.node.id ?? "local", timing);
+		const capacityLease = await admitAssignmentCapacity(req, placement?.node.id ?? "local", timing, endpoint);
 		const leaseSlot = createLeaseSlotGuard(capacityAdmission, capacityLease.leaseId, req.lineage !== undefined);
 
 		const ledgerRef = (() => {
@@ -4387,6 +4464,8 @@ export function createDispatchBundle(
 		try {
 			worker = (placement?.spawn ?? spawnWorker)(spec, {
 				cwd: lifecycle.cwd,
+				now,
+				monotonicNow,
 				...(agentLedgerId !== null ? { onLedgerPost } : {}),
 			});
 		} catch (error) {
@@ -4443,10 +4522,21 @@ export function createDispatchBundle(
 		const upstreamResponses: RunReceiptUpstreamResponse[] = [];
 		const skillActivations: SkillActivation[] = [];
 		const finishContractEntries: unknown[] = [];
+		let runIdForPermissionAudit: string | null = null;
 		// The worker's own tool calls, folded into what this run changed and what
 		// it validated. The sealed mutation-report contract is measured against
 		// this, so a reported path the run never touched cannot seal as fact.
-		const runEffects = createRunEffectsRecorder(lifecycle.cwd);
+		const runEffects = createRunEffectsRecorder(lifecycle.cwd, {
+			onWriteRecordDowngraded(downgrade) {
+				const runId = runIdForPermissionAudit;
+				if (runId === null) return;
+				context.bus.emit(BusChannels.DispatchProgress, {
+					runId,
+					agentId: req.agentId,
+					event: { type: "clio_write_record_downgraded", payload: downgrade },
+				});
+			},
+		});
 		let finishContractAssistantText = "";
 		let finishContractAssistantTurnId: string | null = null;
 		let failureMessage: string | undefined;
@@ -4456,7 +4546,6 @@ export function createDispatchBundle(
 		const acceptsOutcomeCodeEvents =
 			lifecycle.runtimeKind === "http" ||
 			(lifecycle.runtimeKind === "sdk" && lifecycle.target.runtime.id === "claude-sdk");
-		let runIdForPermissionAudit: string | null = null;
 		let workerPolicyPermissionCounter = 0;
 		const outputCapture = createWorkerOutputCapture();
 		const markObservedPhase = (field: "firstModelTokenAt" | "firstToolAt"): void => {
@@ -4739,7 +4828,7 @@ export function createDispatchBundle(
 				...(req.council !== undefined ? { council: req.council } : {}),
 				...(req.plan !== undefined ? { plan: req.plan } : {}),
 				...(lifecycle.personaOverride ? { personaOverride: lifecycle.personaOverride } : {}),
-				...(heartbeatAt ? { heartbeatAt: heartbeatIso(heartbeatAt.current) } : {}),
+				...(heartbeatAt ? { heartbeatAt: heartbeatIso(heartbeatAt) } : {}),
 			});
 			observer?.onAdmitted({
 				runId: envelope.id,
@@ -4755,6 +4844,7 @@ export function createDispatchBundle(
 			// per-worker meter. All optional so consumers degrade to local/plain.
 			const fleetIdentity = {
 				budget: lifecycle.budgetEnvelope,
+				...(endpoint !== null ? { endpoint: { key: endpoint.key, label: endpoint.label, limit: endpoint.limit } } : {}),
 				...(placement !== undefined && placement !== null ? { node: placement.node.id } : {}),
 				...(req.gate !== undefined ? { gate: { role: req.gate.role, cycle: req.gate.cycle } } : {}),
 				...(req.council !== undefined ? { council: req.council } : {}),
@@ -5331,7 +5421,7 @@ export function createDispatchBundle(
 					...(receiptDraft.cacheWriteTokenCount !== undefined
 						? { cacheWriteTokenCount: receiptDraft.cacheWriteTokenCount }
 						: {}),
-					...(activeRun.heartbeatAt ? { heartbeatAt: heartbeatIso(activeRun.heartbeatAt.current) } : {}),
+					...(activeRun.heartbeatAt ? { heartbeatAt: heartbeatIso(activeRun.heartbeatAt) } : {}),
 				};
 				if (receiptDraft.reasoningTokenCount !== undefined) {
 					ledgerPatch.reasoningTokenCount = receiptDraft.reasoningTokenCount;
@@ -5354,9 +5444,28 @@ export function createDispatchBundle(
 				// the set. That run's window keeps today's blame-the-whole-diff
 				// behaviour; a run that never touched such a tool keeps the
 				// protection.
-				const writeRecordUsable =
-					receipt.safety?.toolTelemetry?.coverage === "complete" && observedRunEffects.writeRecordComplete;
-				recordRunWriteTargets(envelope.id, writeRecordUsable ? [...observedRunEffects.mutatedPaths] : null);
+				const toolTelemetryComplete = receipt.safety?.toolTelemetry?.coverage === "complete";
+				const downgrades: WriteBoundaryAttributionDowngrade[] = observedRunEffects.writeRecordDowngrades.map((entry) => ({
+					reason: entry.reason,
+					tool: entry.tool,
+					toolCallId: entry.toolCallId,
+					runId: envelope.id,
+					stepId: null,
+				}));
+				if (!toolTelemetryComplete) {
+					downgrades.push({
+						reason: "incomplete_tool_telemetry",
+						tool: null,
+						toolCallId: null,
+						runId: envelope.id,
+						stepId: null,
+					});
+				}
+				recordRunWriteAttribution(envelope.id, {
+					recorded: [...observedRunEffects.mutatedPaths],
+					complete: toolTelemetryComplete && observedRunEffects.writeRecordComplete,
+					downgrades,
+				});
 				await ledgerRef.persist();
 				if (worktreeReceipt?.applied === true && req.taskWorktree !== undefined) {
 					try {
@@ -5628,12 +5737,14 @@ export function createDispatchBundle(
 			allowedTools: effectiveTools,
 			settings,
 		});
+		const endpoint = endpointCapacityForTarget(target.target.id);
 		return {
 			agentId: req.agentId,
 			specFingerprint: agentSpecFingerprint(agentSpec),
 			targetId: target.target.id,
 			wireModelId: target.wireModelId,
 			runtimeId: target.runtime.id,
+			...(endpoint !== null ? { endpoint: { key: endpoint.key, label: endpoint.label, limit: endpoint.limit } } : {}),
 			node: previewNode(req).node,
 			thinkingLevel: target.thinkingLevel,
 			toolSignature: toolSignature(effectiveTools),
@@ -6133,19 +6244,21 @@ export function createDispatchBundle(
 	 */
 	function snapshot(): DispatchSnapshot {
 		const tickNow = now();
+		const tickMonotonic = monotonicNow();
 		const running: DispatchSnapshot["running"] = [];
 		const totals = { ...finalizedTotals };
 		const costAmounts = [...finalizedCosts];
 		for (const run of active.values()) {
 			let heartbeat: "alive" | "stale" | "dead" | "n/a" = "n/a";
-			if (run.heartbeatAt && Number.isFinite(run.heartbeatAt.current)) {
+			if (run.heartbeatAt && Number.isFinite(heartbeatMonotonicAt(run.heartbeatAt))) {
+				const heartbeatMonotonic = heartbeatMonotonicAt(run.heartbeatAt);
 				if (run.runtimeKind === "acp-delegation") {
 					const stallMs = run.stallTimeoutMs;
 					if (stallMs !== null && stallMs > 0) {
-						heartbeat = tickNow - run.heartbeatAt.current > stallMs ? "dead" : "alive";
+						heartbeat = tickMonotonic - heartbeatMonotonic > stallMs ? "dead" : "alive";
 					}
 				} else {
-					heartbeat = classifyHeartbeat(run.heartbeatAt.current, tickNow, heartbeatSpec);
+					heartbeat = classifyHeartbeat(heartbeatMonotonic, tickMonotonic, heartbeatSpec);
 				}
 			}
 			const meter = run.meter;
@@ -6271,6 +6384,7 @@ export function createDispatchBundle(
 		routeCandidates,
 		reservations: {
 			prepare: prepareReservation,
+			release: (ownerId) => releaseDispatchReservation(ownerId, now()),
 			rollback: (ownerId) => rollbackDispatchReservation(ownerId, now()),
 			rollbackUnconsumed: (ownerId) => rollbackUnconsumedDispatchReservation(ownerId, now()),
 			get: getDispatchReservation,
@@ -6291,7 +6405,17 @@ export function createDispatchBundle(
 		observedRunWrites(runId) {
 			// A run this process never finalized, or finalized long enough ago to
 			// have been evicted, is unknown rather than silent, so both answer null.
-			return runWriteTargets.get(runId) ?? null;
+			const attribution = runWriteAttributions.get(runId);
+			return attribution?.complete === true ? [...attribution.recorded] : null;
+		},
+		observedRunWriteAttribution(runId) {
+			const attribution = runWriteAttributions.get(runId);
+			if (attribution === undefined) return null;
+			return {
+				recorded: [...attribution.recorded],
+				complete: attribution.complete,
+				downgrades: attribution.downgrades?.map((entry) => ({ ...entry })) ?? [],
+			};
 		},
 		assignments: {
 			get: (id) => assignments.get(id),

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

@@ -46,6 +46,7 @@ import {
 import { verifyReceiptIntegrity } from "./receipt-integrity.js";
 import { type FleetRunRecord, writeFleetRun } from "./state.js";
 import type { RunReceipt } from "./types.js";
+import type { WriteBoundaryAttribution } from "./write-boundary.js";
 import { createWriteBoundaryEnforcer } from "./write-boundary-enforcer.js";
 
 /** Owner id for a plan with no model runs; it holds nothing to release. */
@@ -278,10 +279,29 @@ export async function executeFleetRun(input: ExecuteFleetRunInput): Promise<Flee
 			// A code step runs a registered command in a subprocess. Nothing
 			// enumerates what that command wrote, so the step contributes no record
 			// and its window falls back to blaming the whole diff.
-			if (step === undefined || step.kind !== "agent") return null;
+			if (step === undefined) return null;
+			if (step.kind !== "agent") {
+				return {
+					recorded: [],
+					complete: false,
+					downgrades: [
+						{
+							reason: "code_step_untracked",
+							tool: null,
+							toolCallId: null,
+							runId: null,
+							stepId,
+						},
+					],
+				} satisfies WriteBoundaryAttribution;
+			}
 			const receipt = receiptsByStep.get(stepId);
 			if (receipt === undefined) return null;
-			return dispatch.observedRunWrites?.(receipt.runId) ?? null;
+			if (dispatch.observedRunWriteAttribution !== undefined) {
+				return dispatch.observedRunWriteAttribution(receipt.runId);
+			}
+			const recorded = dispatch.observedRunWrites?.(receipt.runId) ?? null;
+			return recorded === null ? null : { recorded, complete: true, downgrades: [] };
 		},
 		onVerdict(verdict, path) {
 			// Concurrent changes are reported too. The window did not fail for them
@@ -704,7 +724,7 @@ export async function executeFleetRun(input: ExecuteFleetRunInput): Promise<Flee
 			cancel: (assignmentId) => dispatch.abort(assignmentId),
 			release: (ownerId) => {
 				if (ownerId === NO_WORKER_RESERVATION) return;
-				dispatch.reservations?.rollbackUnconsumed(ownerId);
+				dispatch.reservations?.release(ownerId);
 			},
 			releaseUnconsumed: (ownerId) => {
 				if (ownerId === NO_WORKER_RESERVATION) return;

package/src/domains/dispatch/heartbeat.ts

@@ -1,13 +1,13 @@
 /**
  * Pure heartbeat watchdog classifier (Phase 6 slice 3).
  *
- * Maps a last-seen heartbeat timestamp to one of three states. The dispatch
- * domain drives this on each scheduler tick; the orchestrator uses `stale` to
- * surface a warning in the UI and `dead` to reap a subprocess whose event
- * stream has gone quiet for too long.
+ * Maps a last-seen monotonic stamp to one of three states. The dispatch domain
+ * drives this on each scheduler tick; the orchestrator uses `stale` to surface
+ * a warning in the UI and `dead` to reap a subprocess whose event stream has
+ * gone quiet for too long.
  *
- * No I/O, no clocks of its own. Callers pass `now` to keep the function pure
- * and easy to test.
+ * No I/O, no clocks of its own. Callers pass both monotonic values to keep the
+ * function pure and easy to test.
  */
 
 export interface HeartbeatSpec {
@@ -17,10 +17,34 @@ export interface HeartbeatSpec {
 
 export type HeartbeatStatus = "alive" | "stale" | "dead";
 
+/**
+ * Mutable heartbeat facts shared by a transport and the dispatch watchdog.
+ * `current` is an absolute wall-clock instant for display and persistence.
+ * `monotonic` is from this process's monotonic clock and is the only value
+ * liveness code may compare with a later clock read.
+ *
+ * The monotonic field is optional only for injected legacy test handles. Real
+ * transports always provide it. Treating an old handle's `current` as its
+ * monotonic stamp preserves the structural test seam without reintroducing a
+ * subtraction between two wall-clock reads in the product path.
+ */
+export interface HeartbeatStamp {
+	current: number;
+	monotonic?: number;
+}
+
 export const DEFAULT_HEARTBEAT_SPEC: HeartbeatSpec = { windowMs: 5000, graceMs: 10000 };
 
-export function classifyHeartbeat(heartbeatAt: number, now: number, spec: HeartbeatSpec): HeartbeatStatus {
-	const age = now - heartbeatAt;
+export function heartbeatMonotonicAt(heartbeat: HeartbeatStamp): number {
+	return heartbeat.monotonic ?? heartbeat.current;
+}
+
+export function classifyHeartbeat(
+	heartbeatMonotonicAt: number,
+	monotonicNow: number,
+	spec: HeartbeatSpec,
+): HeartbeatStatus {
+	const age = monotonicNow - heartbeatMonotonicAt;
 	if (age <= spec.windowMs) return "alive";
 	if (age <= spec.windowMs + spec.graceMs) return "stale";
 	return "dead";

package/src/domains/dispatch/index.ts

@@ -161,12 +161,15 @@ export {
 export type {
 	WorkspaceSnapshot,
 	WriteBoundaryAttribution,
+	WriteBoundaryAttributionDowngrade,
+	WriteBoundaryAttributionDowngradeReason,
 	WriteBoundaryStatus,
 	WriteBoundaryVerdict,
 } from "./write-boundary.js";
 export {
 	assertWriteBoundaryVisibleToGit,
 	captureWorkspaceSnapshot,
+	describeWriteBoundaryAttributionDowngrade,
 	diffWorkspace,
 	enforceWriteBoundary,
 	WRITE_BOUNDARY_VIOLATION_REASON,

package/src/domains/dispatch/orphan-recovery.ts

@@ -172,6 +172,11 @@ function sealedEnvelopeFor(runId: string): RunEnvelope | null {
  * whole orchestrator downtime, which is not a measurement of anything. The
  * last heartbeat is the honest bound; a row that never heartbeat has only its
  * own start, which reads as a zero-length run rather than an invented one.
+ *
+ * A restart has no shared monotonic origin with the process that owned the
+ * worker, so recovery never estimates heartbeat age. It first adjudicates the
+ * host-scoped pid and uses the persisted wall-clock heartbeat only as this
+ * display/evidence bound after that process is known to be gone.
  */
 function closeAbandonedRows(ledger: Ledger): { closed: number; sealed: number } {
 	let closed = 0;