@iowarp/clio-coder 0.4.0 → 0.4.1

package/src/domains/dispatch/extension.ts

@@ -456,8 +456,8 @@ function calculateUsageCostUsd(meter: RunTokenMeter, pricing: EffectivePricing["
  * admit a route before settings are resolved, and it defers to the one place
  * that owns the default rather than restating the number here.
  */
-export function admissionMaxOutputTokens(settings: EffectiveSettings): number {
-	return settings?.defaults.maxTokens ?? DEFAULT_SETTINGS.defaults.maxTokens;
+function admissionMaxOutputTokens(settings: EffectiveSettings): number {
+	return settings?.chat.maxOutputTokens ?? DEFAULT_SETTINGS.chat.maxOutputTokens;
 }
 
 function conservativeRouteAdmissionEstimateUsd(pricing: EffectivePricing, maxOutputTokens: number): number {
@@ -509,7 +509,7 @@ function eventContainsFirstModelToken(event: Record<string, unknown>): boolean {
 }
 
 function eventStartsTool(event: Record<string, unknown>): boolean {
-	return event.type === "tool_execution_start" || event.type === "clio_tool_start";
+	return event.type === "tool_execution_start" || event.type === "clio_coder_tool_start";
 }
 
 function finitePositive(value: unknown): number | undefined {
@@ -686,7 +686,7 @@ async function awaitEventDrain(drained: Promise<void>, graceMs = DISPATCH_DRAIN_
 function reportDispatchDiagnostic(scope: string, error: unknown): void {
 	const message = error instanceof Error ? error.message : String(error);
 	try {
-		process.stderr.write(`[clio:dispatch] ${scope}: ${message}\n`);
+		process.stderr.write(`[clio-coder:dispatch] ${scope}: ${message}\n`);
 	} catch {
 		// stderr itself is best-effort
 	}
@@ -892,7 +892,7 @@ export interface WorkspaceRootFacts {
  * claimed `npm test` then "validated" in 4ms. None of that is a model failure.
  * The harness knows the cwd exactly and was sending it nowhere.
  */
-export function readWorkspaceRootFacts(
+function readWorkspaceRootFacts(
 	cwd: string,
 	readEntries: (dir: string) => Dirent[] = readDirentsSafely,
 ): WorkspaceRootFacts {
@@ -922,7 +922,7 @@ function readDirentsSafely(dir: string): Dirent[] {
  * projection of CLIO-CODER.md: a read-only scout that cannot afford the handbook read
  * still needs its first shell call to land in the right place.
  */
-export function renderWorkerWorkspaceContext(workspace: WorkspaceRootFacts): string {
+function renderWorkerWorkspaceContext(workspace: WorkspaceRootFacts): string {
 	const lines = ["# Workspace", `Root: ${workspace.root}`, "Your process starts here; relative paths resolve from it."];
 	if (workspace.entries.length > 0) {
 		lines.push(`Top level: ${workspace.entries.join(", ")}${workspace.truncated ? ", …" : ""}`);
@@ -975,7 +975,7 @@ function renderPipelineInput(input: PipelineInput): PipelineInputRender {
  * the command actually printed rather than a summary of it. Like pipeline
  * input, this is data and is never presented as instructions.
  */
-export function renderPredecessorHandoffs(handoffs: ReadonlyArray<ExecutionHandoff>): WorkerPromptMessage | null {
+function renderPredecessorHandoffs(handoffs: ReadonlyArray<ExecutionHandoff>): WorkerPromptMessage | null {
 	if (handoffs.length === 0) return null;
 	const body = [
 		"Outputs from this step's declared predecessors, in dependency order.",
@@ -1105,7 +1105,7 @@ export interface WorkerDynamicContext {
  * the projected "Verification expectations" body (verification-class runs
  * only); when off, output is byte-identical to the historical renderer.
  */
-export function renderWorkerProjectContext(
+function renderWorkerProjectContext(
 	project: ProjectStructuredContext,
 	options: { includeVerification?: boolean } = {},
 ): string {
@@ -1147,7 +1147,7 @@ function workerProjectContextIncludesVerification(body: string): boolean {
 	return body.includes("\nVerification expectations:\n");
 }
 
-export function buildDynamicPromptMessages(
+function buildDynamicPromptMessages(
 	req: DispatchRequest,
 	dynamicContext: WorkerDynamicContext = {},
 ): WorkerPromptMessage[] {
@@ -1355,7 +1355,7 @@ interface DispatchLifecycleStage {
 interface AcpDelegationLifecycleStage {
 	admission: DispatchAdmissionStage;
 	pathScope: DispatchPathScope;
-	agentConfig: ReturnType<ConfigContract["get"]>["delegation"]["agents"][number];
+	agentConfig: ReturnType<ConfigContract["get"]>["integrations"]["externalAgents"]["entries"][number];
 	cwd: string;
 	systemPrompt: string;
 	dynamicPromptMessages: ReadonlyArray<WorkerPromptMessage>;
@@ -1607,7 +1607,7 @@ function workerToolCallHardCap(settings: EffectiveSettings): number {
 	const parsedEnvCap = rawEnvCap && /^[1-9]\d*$/.test(rawEnvCap) ? Number(rawEnvCap) : Number.NaN;
 	return Number.isSafeInteger(parsedEnvCap)
 		? parsedEnvCap
-		: (settings?.guardrails.workerToolCallCap ?? GUARDRAIL_DEFAULTS.workerToolCallCap);
+		: (settings?.fleet.limits.toolCallsPerRun ?? GUARDRAIL_DEFAULTS.workerToolCallCap);
 }
 
 function resolveEffectiveWorkerBudget(input: {
@@ -1735,15 +1735,15 @@ function acpRuntimeLimitations(): string[] {
 }
 
 function readWorkerTargets(settings: ReturnType<ConfigContract["get"]> | undefined): WorkerTargets {
-	const workerDefault = settings?.workers?.default
+	const workerDefault = settings?.fleet?.default
 		? {
-				target: settings.workers.default.target ?? null,
-				model: settings.workers.default.model ?? null,
-				thinkingLevel: (settings.workers.default.thinkingLevel ?? "off") as ThinkingLevel,
+				target: settings.fleet.default.target ?? null,
+				model: settings.fleet.default.model ?? null,
+				thinkingLevel: (settings.fleet.default.thinkingLevel ?? "off") as ThinkingLevel,
 			}
 		: null;
 	const workerProfiles: WorkerProfileMap = {};
-	for (const [name, profile] of Object.entries(settings?.workers?.profiles ?? {})) {
+	for (const [name, profile] of Object.entries(settings?.fleet?.profiles ?? {})) {
 		workerProfiles[name] = {
 			target: profile.target ?? null,
 			model: profile.model ?? null,
@@ -1751,7 +1751,7 @@ function readWorkerTargets(settings: ReturnType<ConfigContract["get"]> | undefin
 		};
 	}
 	const agentBindings: WorkerAgentBindingMap = {};
-	for (const [agentId, profileName] of Object.entries(settings?.workers?.agentBindings ?? {})) {
+	for (const [agentId, profileName] of Object.entries(settings?.fleet?.agentProfiles ?? {})) {
 		const id = agentId.trim();
 		const profile = profileName.trim();
 		if (id.length > 0 && profile.length > 0) agentBindings[id] = profile;
@@ -1928,17 +1928,17 @@ function buildDispatchWorkerSpec(input: DispatchWorkerSpecInput, config?: Config
 	if (input.req.trustProjectCompatRoots !== undefined) {
 		spec.trustProjectCompatRoots = input.req.trustProjectCompatRoots;
 	} else if (settings) {
-		spec.trustProjectCompatRoots = settings.skills.trustProjectCompatRoots === true;
+		spec.trustProjectCompatRoots = settings.integrations.projectResources.trustProjectImports === true;
 	}
-	spec.gitCommitAttribution = settings?.attribution.gitCommits ?? true;
+	spec.gitCommitAttribution = settings?.integrations.git.commitAttribution ?? true;
 	// Non-stall posture (Symphony §10.5): a dispatched worker has no operator
 	// to answer a permission prompt by default, so the resolution policy ships
 	// with the spec and the worker enforces it within bounded time. Under the
 	// escalate posture the configured timeout/fallback bounds ride along so the
 	// worker still cannot hang when no operator resolves the ask.
-	spec.onPermission = settings?.workers.onPermission ?? "deny";
+	spec.onPermission = settings?.fleet.permissions.mode ?? "deny";
 	if (spec.onPermission === "escalate") {
-		const escalation = settings?.workers.escalation;
+		const escalation = settings?.fleet.permissions.escalation;
 		if (escalation) spec.escalation = { timeoutMs: escalation.timeoutMs, fallback: escalation.fallback };
 	}
 	assertRuntimeCanHonorWorkerPermissionMode(input.target.runtime, spec.onPermission);
@@ -2032,7 +2032,7 @@ function autonomyEnforcementForAcpDelegation(
 			dangerousBypass: true,
 		};
 	}
-	// clio-policy applies the exact autonomy mapping to every permission
+	// clio-coder-policy applies the exact autonomy mapping to every permission
 	// request. deny-all is stricter than every autonomy level, but is still a
 	// Clio-mediated upper bound rather than an external approximation.
 	return { grade: "mediated", autonomy, ...authorityEvidence, externalMode: toolGovernance };
@@ -2426,7 +2426,7 @@ export function createDispatchBundle(
 	const heartbeatIntervalMs = options?.heartbeatIntervalMs ?? DEFAULT_HEARTBEAT_INTERVAL_MS;
 	const getResilienceCooldownMs = (): number => {
 		if (options?.resilienceCooldownMs !== undefined) return options.resilienceCooldownMs;
-		const settingsVal = getEffectiveSettings()?.workers?.resilienceCooldownMs;
+		const settingsVal = getEffectiveSettings()?.fleet?.retry.routeCooldownMs;
 		if (settingsVal !== undefined && settingsVal >= 0) return settingsVal;
 		return DEFAULT_RESILIENCE_COOLDOWN_MS;
 	};
@@ -2598,7 +2598,7 @@ export function createDispatchBundle(
 	}
 
 	function configuredGlobalCapacity(settings: EffectiveSettings): number {
-		const configured = settings?.budget.concurrency;
+		const configured = settings?.fleet.concurrency;
 		return scheduling.maxWorkers?.() ?? (configured === "auto" || configured === undefined ? 4 : Math.max(1, configured));
 	}
 
@@ -2724,7 +2724,7 @@ export function createDispatchBundle(
 	const finalizedCosts: Array<{ usd: number; provenance: import("../providers/index.js").CostProvenance }> = [];
 
 	function workersMaxRetries(settings: EffectiveSettings = getEffectiveSettings()): number {
-		const value = settings?.workers?.maxRetries;
+		const value = settings?.fleet?.retry.maxRetries;
 		return typeof value === "number" && Number.isInteger(value) && value >= 0 ? value : 2;
 	}
 
@@ -3418,11 +3418,11 @@ export function createDispatchBundle(
 			providers,
 		);
 		enforceCapabilityGate(target.target.id, target.modelCapabilities, req.requiredCapabilities);
-		assertRuntimeCanHonorWorkerPermissionMode(target.runtime, settings?.workers.onPermission ?? "deny");
+		assertRuntimeCanHonorWorkerPermissionMode(target.runtime, settings?.fleet.permissions.mode ?? "deny");
 		assertWorkerBudgetEnforceable(target.runtime, spec.budget !== null || req.budget !== undefined);
 
 		const cwd = req.cwd ?? process.cwd();
-		const sessionAutonomy = settings?.autonomy ?? "auto-edit";
+		const sessionAutonomy = settings?.safety.autonomy ?? "auto-edit";
 		const effectiveAutonomy = clampWorkerAutonomy(sessionAutonomy, req.autonomy);
 		const effectiveTools = withLedgerToolNarrowing(
 			effectiveToolNames(admission.allowedTools, target, pathScope.writeBoundaries.length > 0, deniedToolNames(req)),
@@ -3445,7 +3445,7 @@ export function createDispatchBundle(
 				recipe.skills !== undefined &&
 				recipe.skills.length > 0 &&
 				req.noSkills !== true,
-			onPermission: settings?.workers.onPermission ?? "deny",
+			onPermission: settings?.fleet.permissions.mode ?? "deny",
 			persona: {
 				id: `persona.${recipe.id}`,
 				relPath: recipe.filepath,
@@ -3473,7 +3473,7 @@ export function createDispatchBundle(
 			capabilityClass: spec.capabilityClass,
 			projectContextTier: tier,
 			autonomy: effectiveAutonomy,
-			onPermission: settings?.workers.onPermission ?? "deny",
+			onPermission: settings?.fleet.permissions.mode ?? "deny",
 			project,
 			workspace: readWorkspaceRootFacts(cwd),
 		});
@@ -3493,7 +3493,7 @@ export function createDispatchBundle(
 		// Match chat-loop's LOCAL_API_KEY_FALLBACK so dispatch-spawned workers can
 		// reach openai-compat local endpoints (LM Studio, llama.cpp) without
 		// requiring the user to invent a credential.
-		const apiKey = auth?.apiKey ?? (auth === null ? "clio-local-target" : undefined);
+		const apiKey = auth?.apiKey ?? (auth === null ? "clio-coder-local-target" : undefined);
 		const runtimeKind: RunKind = target.runtime.kind;
 		const limitations = runtimeLimitations(runtimeKind, target.runtime.id);
 		return {
@@ -3548,16 +3548,16 @@ export function createDispatchBundle(
 			}
 		}
 		if (!settings) throw new Error("dispatch: effective settings required for ACP delegation");
-		const configured = settings.delegation.agents.find((entry) => entry.id === agentId);
+		const configured = settings.integrations.externalAgents.entries.find((entry) => entry.id === agentId);
 		if (!configured) throw new Error(`dispatch: ACP delegation agent '${agentId}' not configured`);
-		const toolGovernance = configured.toolGovernance ?? "clio-policy";
+		const toolGovernance = configured.toolGovernance ?? "clio-coder-policy";
 		if (options?.autonomyOverride === true && toolGovernance === "agent-managed") {
 			throw new Error(
-				`dispatch: ACP delegation agent '${agentId}' uses toolGovernance='agent-managed', which cannot enforce an explicit one-run autonomy override; choose clio-policy or deny-all governance, or omit --autonomy`,
+				`dispatch: ACP delegation agent '${agentId}' uses toolGovernance='agent-managed', which cannot enforce an explicit one-run autonomy override; choose clio-coder-policy or deny-all governance, or omit --autonomy`,
 			);
 		}
 		const admission = resolveDelegationAdmissionStage(req, safety);
-		const sessionAutonomy = settings.autonomy ?? "auto-edit";
+		const sessionAutonomy = settings.safety.autonomy ?? "auto-edit";
 		const autonomy = clampWorkerAutonomy(sessionAutonomy, req.autonomy);
 		if (toolGovernance === "agent-managed" && autonomy !== sessionAutonomy) {
 			throw new Error(
@@ -3755,15 +3755,15 @@ export function createDispatchBundle(
 				if (eventContainsFirstModelToken(event)) markObservedPhase("firstModelTokenAt");
 				if (eventStartsTool(event)) markObservedPhase("firstToolAt");
 			}
-			if (event.type === "clio_tool_start" && event.payload && typeof event.payload.tool === "string") {
+			if (event.type === "clio_coder_tool_start" && event.payload && typeof event.payload.tool === "string") {
 				recordToolStart(inFlightTools, event.payload);
 			}
 			// ACP is an external protocol peer, never an authority for Clio's
 			// deterministic terminal taxonomy. Ignore even syntactically valid
 			// assertions; only a future coordinator-side classifier may set one.
-			if (event.type === "clio_run_outcome" && !reportedSpoofedOutcome) {
+			if (event.type === "clio_coder_run_outcome" && !reportedSpoofedOutcome) {
 				reportedSpoofedOutcome = true;
-				reportDispatchDiagnostic("ACP outcome event", new Error("ignored untrusted clio_run_outcome assertion"));
+				reportDispatchDiagnostic("ACP outcome event", new Error("ignored untrusted clio_coder_run_outcome assertion"));
 			}
 			if (isRecord(event)) {
 				const finishEntry = appendDispatchFinishContractEntry(finishContractEntries, event);
@@ -3794,7 +3794,7 @@ export function createDispatchBundle(
 					if (message !== null) failureMessage = message;
 				}
 			}
-			if (event.type === "clio_permission_resolved" && event.payload && typeof event.payload.tool === "string") {
+			if (event.type === "clio_coder_permission_resolved" && event.payload && typeof event.payload.tool === "string") {
 				const requestId =
 					typeof event.payload.requestId === "string" ? event.payload.requestId : `delegation-permission-${Date.now()}`;
 				const origin = runIdForPermissionAudit !== null ? `delegation:${runIdForPermissionAudit}` : "delegation:unknown";
@@ -3820,7 +3820,7 @@ export function createDispatchBundle(
 					...(runIdForPermissionAudit !== null ? { requestedBy: runIdForPermissionAudit } : {}),
 				});
 			}
-			if (event.type === "clio_tool_finish" && event.payload && typeof event.payload.tool === "string") {
+			if (event.type === "clio_coder_tool_finish" && event.payload && typeof event.payload.tool === "string") {
 				recordToolCompletion(inFlightTools, event.payload);
 				recordToolFinish(toolStats, event.payload);
 				if (event.payload.decision === "allowed") safetyDecisionCounts.allowed += 1;
@@ -4022,7 +4022,7 @@ export function createDispatchBundle(
 			const finalFailureMessage = result.failureMessage ?? failureMessage;
 			const finalToolStats = snapshotToolStats(toolStats);
 			const unfinished = snapshotUnfinishedTools(inFlightTools);
-			const toolGovernance = lifecycle.agentConfig.toolGovernance ?? "clio-policy";
+			const toolGovernance = lifecycle.agentConfig.toolGovernance ?? "clio-coder-policy";
 			return {
 				runId: envelope.id,
 				agentId: req.agentId,
@@ -4075,7 +4075,7 @@ export function createDispatchBundle(
 				dynamicHash: lifecycle.dynamicHash,
 				promptSignature: lifecycle.promptSignature,
 				toolSignature: lifecycle.toolSignature,
-				clioVersion: readClioVersion(),
+				clioCoderVersion: readClioVersion(),
 				piMonoVersion: readPiMonoVersion(),
 				platform: process.platform,
 				nodeVersion: process.version,
@@ -4089,7 +4089,7 @@ export function createDispatchBundle(
 				quality: createRunReceiptQuality({ runtimeEnforceable: false, enforcementPassed: null, resultContract: null }),
 				autonomyEnforcement: autonomyEnforcementForAcpDelegation(
 					lifecycle.autonomy,
-					lifecycle.agentConfig.toolGovernance ?? "clio-policy",
+					lifecycle.agentConfig.toolGovernance ?? "clio-coder-policy",
 					lifecycle.sessionAutonomy,
 					req.autonomy,
 				),
@@ -4119,7 +4119,7 @@ export function createDispatchBundle(
 					toolCallsRequested: result.delegation.toolCallsRequested,
 					toolCallsApproved: result.delegation.toolCallsApproved,
 					toolCallsDenied: result.delegation.toolCallsDenied,
-					toolGovernance: lifecycle.agentConfig.toolGovernance ?? "clio-policy",
+					toolGovernance: lifecycle.agentConfig.toolGovernance ?? "clio-coder-policy",
 					toolCallLog: acp.toolCallLog(),
 				},
 				sessionId: result.delegation.acpSessionId,
@@ -4354,7 +4354,7 @@ export function createDispatchBundle(
 		const requestedAt = new Date(now()).toISOString();
 		const timing: RunPhaseMarks = { requestedAt, decisionStartedAt: requestedAt };
 		const settings = getEffectiveSettings();
-		const isAcpAgent = settings?.delegation?.agents?.some((entry) => entry.id === req.agentId) ?? false;
+		const isAcpAgent = settings?.integrations.externalAgents?.entries?.some((entry) => entry.id === req.agentId) ?? false;
 		if (isAcpAgent && !req.delegationAgentId) {
 			req.delegationAgentId = req.agentId;
 		}
@@ -4374,7 +4374,7 @@ export function createDispatchBundle(
 			const recipe = agents.get(req.agentId);
 			const activation = consumeActiveRouteApproval({
 				request: req,
-				settings: settings?.routing,
+				settings: settings?.fleet.adaptiveRouting,
 				capabilityClass: recipe === null ? null : normalizeAgentSpec(recipe).capabilityClass,
 				failover: failoverModeFor(req),
 				requestedAt,
@@ -4668,7 +4668,7 @@ export function createDispatchBundle(
 				context.bus.emit(BusChannels.DispatchProgress, {
 					runId,
 					agentId: req.agentId,
-					event: { type: "clio_write_record_downgraded", payload: downgrade },
+					event: { type: "clio_coder_write_record_downgraded", payload: downgrade },
 				});
 			},
 		});
@@ -4722,8 +4722,8 @@ export function createDispatchBundle(
 					policySource?: string;
 					reason?: string;
 					skillActivation?: unknown;
-					// Worker permission-escalation fields (clio_permission_escalated /
-					// clio_permission_resolved escalate path).
+					// Worker permission-escalation fields (clio_coder_permission_escalated /
+					// clio_coder_permission_resolved escalate path).
 					requestId?: string;
 					summary?: string;
 					target?: string;
@@ -4736,12 +4736,12 @@ export function createDispatchBundle(
 				if (eventContainsFirstModelToken(event)) markObservedPhase("firstModelTokenAt");
 				if (eventStartsTool(event)) markObservedPhase("firstToolAt");
 			}
-			if (event.type === "clio_tool_start" && event.payload && typeof event.payload.tool === "string") {
+			if (event.type === "clio_coder_tool_start" && event.payload && typeof event.payload.tool === "string") {
 				recordToolStart(inFlightTools, event.payload);
 			}
-			if (event.type === "clio_steer_received") acknowledgeSteer(event.payload?.sequence);
+			if (event.type === "clio_coder_steer_received") acknowledgeSteer(event.payload?.sequence);
 			if (
-				event.type === "clio_run_outcome" &&
+				event.type === "clio_coder_run_outcome" &&
 				isRunOutcomeCode(event.payload?.outcomeCode) &&
 				event.payload.outcomeCode !== "worker_final_output_missing" &&
 				event.payload.outcomeCode !== "host_verification_rejected"
@@ -4764,7 +4764,11 @@ export function createDispatchBundle(
 				}
 				recordWorkerRunEffect(runEffects, event);
 			}
-			if (event.type === "clio_permission_escalated" && event.payload && typeof event.payload.requestId === "string") {
+			if (
+				event.type === "clio_coder_permission_escalated" &&
+				event.payload &&
+				typeof event.payload.requestId === "string"
+			) {
 				escalationCounts.requested += 1;
 				const ctx = isRecord(event.payload.decision) ? event.payload.decision : null;
 				const classification = ctx !== null && isRecord(ctx.classification) ? ctx.classification : null;
@@ -4825,7 +4829,7 @@ export function createDispatchBundle(
 					if (message !== null) failureMessage = message;
 				}
 			}
-			if (event.type === "clio_permission_resolved" && event.payload && typeof event.payload.tool === "string") {
+			if (event.type === "clio_coder_permission_resolved" && event.payload && typeof event.payload.tool === "string") {
 				// Escalation resolutions already have a request event. Policy
 				// deny/fail is non-stalling, so dispatch mints the adjacent pair.
 				const source = event.payload.source;
@@ -4878,7 +4882,7 @@ export function createDispatchBundle(
 					...(runIdForPermissionAudit !== null ? { requestedBy: runIdForPermissionAudit } : {}),
 				});
 			}
-			if (event.type === "clio_tool_finish" && event.payload && typeof event.payload.tool === "string") {
+			if (event.type === "clio_coder_tool_finish" && event.payload && typeof event.payload.tool === "string") {
 				recordToolCompletion(inFlightTools, event.payload);
 				recordToolFinish(toolStats, event.payload);
 				if (isSkillActivation(event.payload.skillActivation)) {
@@ -5237,7 +5241,7 @@ export function createDispatchBundle(
 				dynamicHash: lifecycle.dynamicHash,
 				promptSignature: lifecycle.promptSignature,
 				toolSignature: lifecycle.toolSignature,
-				clioVersion: readClioVersion(),
+				clioCoderVersion: readClioVersion(),
 				piMonoVersion: readPiMonoVersion(),
 				platform: process.platform,
 				nodeVersion: process.version,
@@ -5262,7 +5266,7 @@ export function createDispatchBundle(
 				...(skillActivations.length > 0 ? { skillActivations: [...skillActivations] } : {}),
 				autonomyEnforcement: autonomyEnforcementForWorkerSpec(
 					spec,
-					lifecycle.settings?.autonomy ?? "auto-edit",
+					lifecycle.settings?.safety.autonomy ?? "auto-edit",
 					req.autonomy,
 				),
 				safety: {
@@ -5775,7 +5779,7 @@ export function createDispatchBundle(
 		req: DispatchRequest,
 		settings: EffectiveSettings = getEffectiveSettings(),
 	): DispatchPlanTaskResolution {
-		const isAcpAgent = settings?.delegation?.agents?.some((entry) => entry.id === req.agentId) ?? false;
+		const isAcpAgent = settings?.integrations.externalAgents?.entries?.some((entry) => entry.id === req.agentId) ?? false;
 		if (isAcpAgent && !req.delegationAgentId) req = { ...req, delegationAgentId: req.agentId };
 		const validation = routeValidationProjection(req, true);
 		const validated = validateJobSpec(validation.jobSpec);
@@ -5851,7 +5855,7 @@ export function createDispatchBundle(
 			req,
 		);
 		assertPostRuntimeToolCompatibility(req.agentId, agentSpec, effectiveTools, target);
-		assertRuntimeCanHonorWorkerPermissionMode(target.runtime, settings?.workers.onPermission ?? "deny");
+		assertRuntimeCanHonorWorkerPermissionMode(target.runtime, settings?.fleet.permissions.mode ?? "deny");
 		assertWorkerBudgetEnforceable(target.runtime, agentSpec.budget !== null || req.budget !== undefined);
 		assertResponseSchemaEnforceable(target.runtime, target.modelCapabilities, req.responseSchema, effectiveTools.length);
 		assertWriteRootsEnforceable(target.runtime, pathScope.writeBoundaries);
@@ -5913,7 +5917,7 @@ export function createDispatchBundle(
 			specs,
 			request: req,
 			mode,
-			activeAgentRoles: settings?.routing.agentAutomation.activeAgentRoles ?? [],
+			activeAgentRoles: settings?.fleet.adaptiveRouting.agentRoles ?? [],
 			...(agentIntent === undefined ? {} : { intentOverride: agentIntent }),
 		});
 		const settingsFingerprint = computeSettingsFingerprint(settings ?? null);
@@ -6008,7 +6012,7 @@ export function createDispatchBundle(
 		const recipe = agents.get(req.agentId);
 		return planActiveRoute({
 			request: req,
-			settings: settings?.routing,
+			settings: settings?.fleet.adaptiveRouting,
 			capabilityClass: recipe === null ? null : normalizeAgentSpec(recipe).capabilityClass,
 			failover: failoverModeFor(req),
 			fixed,
@@ -6219,7 +6223,7 @@ export function createDispatchBundle(
 			costProvenance: "unknown",
 			compiledPromptHash: null,
 			staticCompositionHash: null,
-			clioVersion: readClioVersion(),
+			clioCoderVersion: readClioVersion(),
 			piMonoVersion: readPiMonoVersion(),
 			platform: process.platform,
 			nodeVersion: process.version,

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" };
 }