@iowarp/clio-coder 0.3.9 → 0.4.1

package/src/cli/acp.ts

@@ -58,7 +58,7 @@ function parseAcpFlags(args: ReadonlyArray<string>): AcpFlags | string {
  * Throws when the path cannot be resolved, which the caller reports as an
  * unusable `--cwd`.
  */
-export function resolveAcpCwd(value: string): string {
+function resolveAcpCwd(value: string): string {
 	return realpathSync(path.resolve(value));
 }
 
@@ -66,11 +66,15 @@ export async function runAcpCommand(
 	args: ReadonlyArray<string>,
 	options: { apiKey?: string; noContextFiles?: boolean; noSkills?: boolean; skillPaths?: ReadonlyArray<string> } = {},
 ): Promise<number> {
-	if (args.includes("--help") || args.includes("-h")) {
+	// The top-level argv parser normally rewrites --acp to the `acp` command
+	// sentinel. Keep the command boundary tolerant too, so another dispatcher
+	// can pass the flag spelling through without changing ACP option semantics.
+	const normalizedArgs = args[0] === "--acp" ? args.slice(1) : args;
+	if (normalizedArgs.includes("--help") || normalizedArgs.includes("-h")) {
 		process.stdout.write(HELP);
 		return 0;
 	}
-	const flags = parseAcpFlags(args);
+	const flags = parseAcpFlags(normalizedArgs);
 	if (typeof flags === "string") {
 		printError(flags);
 		process.stderr.write(HELP);
@@ -103,7 +107,7 @@ export async function runAcpCommand(
 				transportOptions: {
 					write: writeRawStdout,
 					diagnostics: (line) => {
-						process.stderr.write(`[clio:acp] ${line}\n`);
+						process.stderr.write(`[clio-coder:acp] ${line}\n`);
 					},
 				},
 				...(flags.permissionTimeoutMs === undefined ? {} : { permissionTimeoutMs: flags.permissionTimeoutMs }),

package/src/cli/argv.ts

@@ -70,6 +70,11 @@ export interface GlobalCliFlags {
 	noContextFiles: boolean;
 	noSkills: boolean;
 	skillPaths: string[];
+	/**
+	 * Panes activation from the command line. `--with-panes` and `--no-panes`
+	 * both beat the `panes.enabled` setting; absent means the setting decides.
+	 */
+	panes?: "with" | "without";
 	rest: string[];
 	error?: string;
 }
@@ -85,6 +90,8 @@ const GLOBAL_ONLY_FLAGS: ReadonlyMap<string, string> = new Map([
 	["--api-key", "--api-key <key>"],
 	["--no-context-files", "--no-context-files"],
 	["-nc", "-nc"],
+	["--with-panes", "--with-panes"],
+	["--no-panes", "--no-panes"],
 ]);
 
 /**
@@ -128,6 +135,7 @@ export function extractGlobalFlags(
 	let apiKey: string | undefined;
 	let noContextFiles = false;
 	let noSkills = false;
+	let panes: "with" | "without" | undefined;
 	const skillPaths: string[] = [];
 	for (let i = 0; i < argv.length; i++) {
 		const arg = argv[i];
@@ -140,6 +148,14 @@ export function extractGlobalFlags(
 			rest.push(...argv.slice(i));
 			break;
 		}
+		if (arg === "--acp") {
+			// Treat the global spelling as a command boundary. Rewriting only the
+			// sentinel keeps every trailing ACP option on the exact same dispatcher
+			// and parser path as `clio-coder acp`, without importing that command into
+			// the dependency-light startup graph.
+			rest.push("acp", ...argv.slice(i + 1));
+			break;
+		}
 		if (ROOT_FLAG_TOKENS.has(arg)) {
 			rest.push(arg);
 			continue;
@@ -152,6 +168,12 @@ export function extractGlobalFlags(
 			noSkills = true;
 			continue;
 		}
+		if (arg === "--with-panes" || arg === "--no-panes") {
+			// Last occurrence wins, so a wrapper script's baked-in choice can be
+			// overridden by appending the opposite flag.
+			panes = arg === "--with-panes" ? "with" : "without";
+			continue;
+		}
 		if (arg === "--api-key" || arg === "--skill") {
 			const value = argv[i + 1];
 			if (value === undefined || value.startsWith("-") || isSubcommand(value)) {
@@ -162,6 +184,7 @@ export function extractGlobalFlags(
 					rest,
 					error: `${arg} requires a value`,
 					...(apiKey === undefined ? {} : { apiKey }),
+					...(panes === undefined ? {} : { panes }),
 				};
 			}
 			if (arg === "--api-key") apiKey = value;
@@ -176,6 +199,7 @@ export function extractGlobalFlags(
 			rest,
 			error: unknownGlobalOptionError(arg),
 			...(apiKey === undefined ? {} : { apiKey }),
+			...(panes === undefined ? {} : { panes }),
 		};
 	}
 	return {
@@ -184,5 +208,6 @@ export function extractGlobalFlags(
 		skillPaths,
 		rest,
 		...(apiKey === undefined ? {} : { apiKey }),
+		...(panes === undefined ? {} : { panes }),
 	};
 }

package/src/cli/auth.ts

@@ -104,8 +104,8 @@ function renderStatusRows(rows: ReadonlyArray<ConnectableProviderRow>): string {
 
 function defaultAuthTarget(rows: ReadonlyArray<ConnectableProviderRow>): string | undefined {
 	const settings = readSettings();
-	const activeTarget = settings.orchestrator.target
-		? settings.targets.find((entry) => entry.id === settings.orchestrator.target)
+	const activeTarget = settings.chat.target
+		? settings.targets.find((entry) => entry.id === settings.chat.target)
 		: undefined;
 	if (activeTarget && rows.some((row) => row.entry.runtimeId === activeTarget.runtime)) {
 		return activeTarget.runtime;

package/src/cli/bootstrap-generate.ts

@@ -79,9 +79,9 @@ export interface BootstrapRoute {
  */
 export function resolveBootstrapRoute(settings: Readonly<ClioSettings>): BootstrapRoute {
 	for (const agentId of [CONTEXT_BOOTSTRAP_AGENT_ID, "scout"]) {
-		const profileName = settings.workers.agentBindings[agentId];
+		const profileName = settings.fleet.agentProfiles[agentId];
 		if (!profileName) continue;
-		const profile = settings.workers.profiles[profileName];
+		const profile = settings.fleet.profiles[profileName];
 		if (!profile) throw new Error(`bootstrap profile '${profileName}' is not configured (bound to '${agentId}')`);
 		if (!profile.target) throw new Error(`bootstrap profile '${profileName}' has no target (bound to '${agentId}')`);
 		return {
@@ -90,7 +90,7 @@ export function resolveBootstrapRoute(settings: Readonly<ClioSettings>): Bootstr
 			...(profile.thinkingLevel ? { thinkingLevel: profile.thinkingLevel } : {}),
 		};
 	}
-	const fallback = settings.workers.default;
+	const fallback = settings.fleet.default;
 	if (!fallback?.target) {
 		throw new Error(
 			`bootstrap has no route: workers.agentBindings.${CONTEXT_BOOTSTRAP_AGENT_ID} is unbound and ` +
@@ -233,7 +233,7 @@ async function collectDispatchAssistantText(
 				message: "bootstrap agent started repository exploration",
 			});
 		}
-		if (isRecord(event) && event.type === "clio_tool_start") {
+		if (isRecord(event) && event.type === "clio_coder_tool_start") {
 			const tool = toolNameFromEvent(event);
 			if (tool) {
 				input.progress?.({
@@ -244,7 +244,7 @@ async function collectDispatchAssistantText(
 				});
 			}
 		}
-		if (isRecord(event) && event.type === "clio_tool_finish") {
+		if (isRecord(event) && event.type === "clio_coder_tool_finish") {
 			const tool = toolNameFromEvent(event);
 			const outcome = toolOutcomeFromEvent(event) ?? "done";
 			if (tool) {

package/src/cli/clio.ts

@@ -6,7 +6,7 @@ import { classifyDefaultTarget, describeVerdict } from "./default-target.js";
 
 /** Headless and ACP keep their established non-TUI transports even when an
  * embedding process leaves the interactive marker in the environment. */
-export function terminalLeaseEligible(
+function terminalLeaseEligible(
 	options: Pick<BootOptions, "headless" | "acp">,
 	env: Readonly<Record<string, string | undefined>> = process.env,
 ): boolean {
@@ -44,6 +44,11 @@ export async function runClioCommand(options: BootOptions = {}): Promise<number>
 			const configured = await runConfigureCommand([]);
 			if (configured !== 0) return configured;
 			startupSettings = readStrictLayeredSettings(process.cwd()).settings;
+			const configuredVerdict = classifyDefaultTarget(startupSettings);
+			if (configuredVerdict.kind !== "usable" && configuredVerdict.kind !== "missing-credential") {
+				process.stderr.write(`${describeVerdict(configuredVerdict)} Configuration did not complete; startup cancelled.\n`);
+				return 2;
+			}
 		}
 	}
 	let terminalLease: import("../interactive/terminal-lease.js").TerminalLease | undefined;

package/src/cli/config-inspect.ts

@@ -317,12 +317,12 @@ function inspectSafetyAndMemory(cwd: string, graph: CustomizationGraph): void {
 		const layered = readLayeredSettings(cwd);
 		graph.entries.push({
 			category: "safety",
-			id: "autonomy",
-			scope: settingsSourceFor(layered.sources, "autonomy"),
+			id: "safety.autonomy",
+			scope: settingsSourceFor(layered.sources, "safety.autonomy"),
 			reloadClass: "hot",
 			trust: "n/a",
 			precedence: "single",
-			detail: { autonomy: layered.settings.autonomy ?? "auto-edit" },
+			detail: { autonomy: layered.settings.safety.autonomy ?? "auto-edit" },
 		});
 	} catch (err) {
 		graph.issues.push(`safety: ${err instanceof Error ? err.message : String(err)}`);

package/src/cli/configure-interop.ts

@@ -22,7 +22,7 @@ function describe(proposal: InteropProposal): string {
 		renderProposalEntry(proposal),
 		"",
 		`projectContext stays ${INHERITED_PROJECT_CONTEXT}: this agent receives your task text, never the project projection.`,
-		`toolGovernance is clio-policy: its tool calls are gated by Clio safety.`,
+		`toolGovernance is clio-coder-policy: its tool calls are gated by Clio safety.`,
 	];
 	if (proposal.needsNetworkInstall) {
 		lines.push(`The ACP adapter is not installed locally; npx fetches it the first time you delegate.`);

package/src/cli/configure.ts

@@ -19,6 +19,8 @@ import {
 	listKnownModelsForRuntime,
 	listProviderSupportEntries,
 	type ProviderSupportEntry,
+	readTargetModelSnapshot,
+	recordTargetModelSnapshot,
 	resolveRuntimeAuthTarget,
 	supportGroupLabel,
 } from "../domains/providers/index.js";
@@ -78,7 +80,7 @@ Non-interactive flags:
   --force                          save a model outside the runtime catalog, or one the
                                    target does not advertise, without refusing
   --gateway                        mark the target as a gateway
-  --lifecycle <user-managed|clio-managed>
+  --lifecycle <user-managed|clio-coder-managed>
                                   resident model lifecycle policy
   --set-orchestrator               use this target for chat
   --set-background                 use this target for proactive task memory
@@ -103,6 +105,7 @@ const DEFAULT_PORTS: Record<string, number> = {
 	lemonade: 8000,
 	"anthropic-compat": 8000,
 	"openai-compat": 8000,
+	litellm: 4000,
 };
 
 interface ParsedArgs {
@@ -222,8 +225,8 @@ function parseSetupArgs(argv: ReadonlyArray<string>): ParsedArgs {
 				break;
 			case "--lifecycle": {
 				const v = need();
-				if (v !== "user-managed" && v !== "clio-managed") {
-					throw new Error("--lifecycle must be user-managed or clio-managed");
+				if (v !== "user-managed" && v !== "clio-coder-managed") {
+					throw new Error("--lifecycle must be user-managed or clio-coder-managed");
 				}
 				out.lifecycle = v;
 				break;
@@ -317,7 +320,9 @@ function printRuntimeList(includeHidden: boolean): void {
 				: runtime?.auth === "api-key"
 					? status?.available
 						? "credential"
-						: "needs-key"
+						: targetRequiresAuth({ id: entry.runtimeId, runtime: entry.runtimeId }, runtime)
+							? "needs-key"
+							: "key-optional"
 					: (runtime?.auth ?? "none");
 		rows.push({
 			group: supportGroupLabel(entry.group),
@@ -387,8 +392,8 @@ function catalogContextWindowFor(runtime: RuntimeDescriptor, modelId: string): n
 /**
  * Check the resolved model against the catalog where there is one and against
  * the target's own list where there is not. A runtime with no catalog used to
- * pass any string here while the same command wrote the live list that ruled
- * it out into `wireModels`, so the target saved as `ok` and failed on its first
+ * pass any string here while the same command had a live list that ruled it
+ * out, so the target saved as `ok` and failed on its first
  * turn. Without a catalog or a live list there is nothing to check against, and
  * the note says so rather than implying the id was verified.
  */
@@ -480,13 +485,13 @@ function setOrchestratorPointer(settings: ClioSettings, descriptor: TargetDescri
 			`cannot use target '${descriptor.id}' as orchestrator target because runtime '${runtime.id}' is not an HTTP/native runtime`,
 		);
 	}
-	settings.orchestrator.target = descriptor.id;
-	settings.orchestrator.model = model ?? descriptor.defaultModel ?? null;
+	settings.chat.target = descriptor.id;
+	settings.chat.model = model ?? descriptor.defaultModel ?? null;
 }
 
 function setWorkerDefaultPointer(settings: ClioSettings, descriptor: TargetDescriptor, model?: string | null): void {
-	settings.workers.default.target = descriptor.id;
-	settings.workers.default.model = model ?? descriptor.defaultModel ?? null;
+	settings.fleet.default.target = descriptor.id;
+	settings.fleet.default.model = model ?? descriptor.defaultModel ?? null;
 }
 
 function setBackgroundPointer(settings: ClioSettings, descriptor: TargetDescriptor, model?: string | null): void {
@@ -496,13 +501,13 @@ function setBackgroundPointer(settings: ClioSettings, descriptor: TargetDescript
 			`cannot use target '${descriptor.id}' as background target because runtime '${descriptor.runtime}' is not an HTTP/native runtime`,
 		);
 	}
-	settings.background.target = descriptor.id;
-	settings.background.model = model ?? descriptor.defaultModel ?? null;
+	settings.context.memory.target = descriptor.id;
+	settings.context.memory.model = model ?? descriptor.defaultModel ?? null;
 }
 
 function assertOrchestratorReplacementEligible(settings: ClioSettings, descriptor: TargetDescriptor): void {
-	if (settings.orchestrator.target !== descriptor.id && settings.background.target !== descriptor.id) return;
-	const role = settings.orchestrator.target === descriptor.id ? "orchestrator" : "background";
+	if (settings.chat.target !== descriptor.id && settings.context.memory.target !== descriptor.id) return;
+	const role = settings.chat.target === descriptor.id ? "orchestrator" : "background";
 	const runtime = getRuntimeRegistry().get(descriptor.runtime);
 	if (!runtime) {
 		throw new Error(
@@ -522,7 +527,7 @@ function setWorkerProfilePointer(
 ): void {
 	const trimmed = name.trim();
 	if (trimmed.length === 0) throw new Error("fleet profile name must be non-empty");
-	settings.workers.profiles[trimmed] = {
+	settings.fleet.profiles[trimmed] = {
 		target: descriptor.id,
 		model: model ?? descriptor.defaultModel ?? null,
 		thinkingLevel: "off",
@@ -602,10 +607,10 @@ function printSummary(settings: ClioSettings, descriptor: TargetDescriptor, prob
 		for (const line of probeLines(descriptor, probe)) process.stdout.write(`  ${line}\n`);
 	}
 	warnUndiscoveredContextWindow(descriptor, probe);
-	if (settings.orchestrator.target === descriptor.id) process.stdout.write("  orchestrator target\n");
-	if (settings.background.target === descriptor.id) process.stdout.write("  background memory target\n");
-	if (settings.workers.default.target === descriptor.id) process.stdout.write("  fleet default\n");
-	for (const [name, profile] of Object.entries(settings.workers.profiles)) {
+	if (settings.chat.target === descriptor.id) process.stdout.write("  orchestrator target\n");
+	if (settings.context.memory.target === descriptor.id) process.stdout.write("  background memory target\n");
+	if (settings.fleet.default.target === descriptor.id) process.stdout.write("  fleet default\n");
+	for (const [name, profile] of Object.entries(settings.fleet.profiles)) {
 		if (profile.target === descriptor.id) process.stdout.write(`  fleet profile ${name}\n`);
 	}
 	process.stdout.write(`\nsettings written to ${settingsPath()}\n`);
@@ -617,7 +622,6 @@ function buildDescriptor(
 	parts: {
 		url?: string;
 		model?: string;
-		wireModels?: string[];
 		apiKeyEnv?: string;
 		apiKeyRef?: string;
 		oauthProfile?: string;
@@ -631,19 +635,12 @@ function buildDescriptor(
 ): TargetDescriptor {
 	const descriptor: TargetDescriptor = { id, runtime: runtime.id };
 	if (parts.url) descriptor.url = parts.url;
-	const wireModels =
-		parts.wireModels?.filter((value, index, all) => value.trim().length > 0 && all.indexOf(value) === index) ?? [];
 	if (parts.model) descriptor.defaultModel = parts.model;
-	else {
-		const firstWireModel = wireModels[0];
-		if (firstWireModel) descriptor.defaultModel = firstWireModel;
-	}
 	const auth: NonNullable<TargetDescriptor["auth"]> = {};
 	if (parts.apiKeyEnv) auth.apiKeyEnvVar = parts.apiKeyEnv;
 	if (parts.apiKeyRef) auth.apiKeyRef = parts.apiKeyRef;
 	if (parts.oauthProfile) auth.oauthProfile = parts.oauthProfile;
 	if (Object.keys(auth).length > 0) descriptor.auth = auth;
-	if (wireModels.length > 0) descriptor.wireModels = wireModels;
 	if (parts.gateway) descriptor.gateway = true;
 	if (parts.lifecycle) descriptor.lifecycle = parts.lifecycle;
 	const caps: NonNullable<TargetDescriptor["capabilities"]> = {};
@@ -714,7 +711,7 @@ async function loginOAuthRuntime(rl: ReturnType<typeof createInterface>, runtime
  */
 interface WireModelInventory {
 	models: string[];
-	source: "catalog" | "probe" | "existing" | "none";
+	source: "catalog" | "probe" | "cache" | "legacy" | "none";
 	/** Per-model load state when the probe reported it. */
 	modelStates?: Readonly<Record<string, ProbeModelStatus>> | undefined;
 }
@@ -761,13 +758,21 @@ async function resolveSupportedWireModels(
 		// lists models only through probeModels still gets its ids checked.
 		const probe = await runtimeProbe(runtime, target, authToken);
 		if (probe?.ok && probe.models && probe.models.length > 0) {
+			recordTargetModelSnapshot(target, probe.models);
 			return { models: [...probe.models], source: "probe", modelStates: probe.modelStates };
 		}
 		const discovered = await runtimeProbeModels(runtime, target, authToken);
-		if (discovered.length > 0) return { models: discovered, source: "probe" };
+		if (discovered.length > 0) {
+			recordTargetModelSnapshot(target, discovered);
+			return { models: discovered, source: "probe" };
+		}
+	}
+	const cached = readTargetModelSnapshot(target);
+	if (cached && cached.models.length > 0) return { models: [...cached.models], source: "cache" };
+	if (existing?.wireModels && existing.wireModels.length > 0) {
+		recordTargetModelSnapshot(target, existing.wireModels);
+		return { models: [...existing.wireModels], source: "legacy" };
 	}
-	if (existing?.wireModels && existing.wireModels.length > 0)
-		return { models: [...existing.wireModels], source: "existing" };
 	return { models: [], source: "none" };
 }
 
@@ -905,7 +910,6 @@ async function runNonInteractive(runtime: RuntimeDescriptor, args: ParsedArgs):
 	const descriptor = buildDescriptor(runtime, args.id, {
 		...(url !== undefined ? { url } : {}),
 		...(model ? { model } : {}),
-		...(wireModels.length > 0 ? { wireModels } : {}),
 		...(apiKeyEnv !== undefined ? { apiKeyEnv } : {}),
 		...(apiKeyRef !== undefined ? { apiKeyRef } : {}),
 		...(oauthProfile !== undefined ? { oauthProfile } : {}),
@@ -966,6 +970,7 @@ async function runNonInteractive(runtime: RuntimeDescriptor, args: ParsedArgs):
 	applyConfiguration(settings);
 	updateSettings(applyConfiguration);
 	const probe = await runtimeProbe(runtime, descriptor);
+	if (probe?.ok && probe.models) recordTargetModelSnapshot(descriptor, probe.models);
 	printSummary(settings, descriptor, probe);
 	if (
 		runtime.auth === "oauth" &&
@@ -1150,7 +1155,7 @@ async function runInteractive(
 	let runtime = preselectedRuntime ?? (await pickRuntimeViaCategory(rl));
 	if (!runtime) {
 		printError("configuration cancelled");
-		return 0;
+		return 130;
 	}
 	const auth = openAuthStorage();
 	const settings = readSettings();
@@ -1272,10 +1277,7 @@ async function runInteractive(
 	}
 
 	let model: string | undefined = defaults.model;
-	let inventory: WireModelInventory =
-		existing?.wireModels && existing.wireModels.length > 0
-			? { models: [...existing.wireModels], source: "existing" }
-			: { models: [], source: "none" };
+	let inventory: WireModelInventory = { models: [], source: "none" };
 	const tentative = buildDescriptor(runtime, targetId, {
 		...(url !== undefined ? { url } : {}),
 		...(apiKeyEnv !== undefined ? { apiKeyEnv } : {}),
@@ -1367,7 +1369,6 @@ async function runInteractive(
 		...(apiKeyEnv !== undefined ? { apiKeyEnv } : {}),
 		...(apiKeyRef !== undefined ? { apiKeyRef } : {}),
 		...(oauthProfile !== undefined ? { oauthProfile } : {}),
-		...(wireModels.length > 0 ? { wireModels } : {}),
 		gateway: gatewayAnswer,
 		...(defaults.lifecycle !== undefined
 			? { lifecycle: defaults.lifecycle }
@@ -1395,6 +1396,7 @@ async function runInteractive(
 	}
 
 	const probe = await runtimeProbe(runtime, descriptor);
+	if (probe?.ok && probe.models) recordTargetModelSnapshot(descriptor, probe.models);
 	if (probe) {
 		process.stdout.write("\n");
 		for (const line of probeLines(descriptor, probe)) process.stdout.write(`${line}\n`);
@@ -1411,10 +1413,10 @@ async function runInteractive(
 		? false
 		: defaults.setOrchestrator
 			? true
-			: await askYesNo(rl, "use as orchestrator (chat) target?", !settings.orchestrator.target);
+			: await askYesNo(rl, "use as orchestrator (chat) target?", !settings.chat.target);
 	const setWorkerDefault = defaults.setWorkerDefault
 		? true
-		: await askYesNo(rl, "use as fleet default?", !settings.workers.default.target);
+		: await askYesNo(rl, "use as fleet default?", !settings.fleet.default.target);
 	const setBackground = !isOrchestratorEligibleRuntime(runtime)
 		? false
 		: defaults.setBackground
@@ -1426,7 +1428,7 @@ async function runInteractive(
 				rl,
 				"Orchestrator model",
 				wireModels,
-				settings.orchestrator.target === targetId ? (settings.orchestrator.model ?? model) : model,
+				settings.chat.target === targetId ? (settings.chat.model ?? model) : model,
 			)))
 		: undefined;
 	if (orchestratorModel === null) return 0;
@@ -1436,7 +1438,7 @@ async function runInteractive(
 				rl,
 				"Fleet model",
 				wireModels,
-				settings.workers.default.target === targetId ? (settings.workers.default.model ?? model) : model,
+				settings.fleet.default.target === targetId ? (settings.fleet.default.model ?? model) : model,
 			)))
 		: undefined;
 	if (workerModel === null) return 0;
@@ -1446,7 +1448,7 @@ async function runInteractive(
 				rl,
 				"Background memory model",
 				wireModels,
-				settings.background.target === targetId ? (settings.background.model ?? model) : model,
+				settings.context.memory.target === targetId ? (settings.context.memory.model ?? model) : model,
 			)))
 		: undefined;
 	if (backgroundModel === null) return 0;
@@ -1496,13 +1498,13 @@ export function runTargetRename(oldId: string, newId: string): number {
 		const target = settings.targets.find((e) => e.id === oldId);
 		if (!target) return;
 		target.id = newId;
-		if (settings.orchestrator.target === oldId) settings.orchestrator.target = newId;
-		if (settings.background.target === oldId) settings.background.target = newId;
-		if (settings.workers.default.target === oldId) settings.workers.default.target = newId;
-		for (const profile of Object.values(settings.workers.profiles)) {
+		if (settings.chat.target === oldId) settings.chat.target = newId;
+		if (settings.context.memory.target === oldId) settings.context.memory.target = newId;
+		if (settings.fleet.default.target === oldId) settings.fleet.default.target = newId;
+		for (const profile of Object.values(settings.fleet.profiles)) {
 			if (profile.target === oldId) profile.target = newId;
 		}
-		settings.scope = settings.scope.map((entry) => {
+		settings.chat.modelPicker.cycleSet = settings.chat.modelPicker.cycleSet.map((entry) => {
 			const [head, ...rest] = entry.split("/");
 			if (head !== oldId) return entry;
 			return rest.length === 0 ? newId : `${newId}/${rest.join("/")}`;

package/src/cli/default-target.ts

@@ -24,7 +24,7 @@ export type DefaultTargetVerdict =
 	| { kind: "missing-credential"; targetId: string; store: string };
 
 export function classifyDefaultTarget(settings: Readonly<ClioSettings> = readSettings()): DefaultTargetVerdict {
-	const targetId = settings.orchestrator.target;
+	const targetId = settings.chat.target;
 	if (!targetId) return { kind: "no-target" };
 	// A chat target naming an id that is not in `targets` cannot arrive here:
 	// the schema normalizes dangling routing references to null so that

package/src/cli/docs.ts

@@ -65,12 +65,12 @@ export interface DocsMenuEntry {
 }
 
 /** Resolve docs/html from the package root; present in a source checkout, absent from the npm package. */
-export function resolveDocsHtmlDir(): string {
+function resolveDocsHtmlDir(): string {
 	return resolve(resolvePackageRoot(), "docs", "html");
 }
 
 /** Content-type for a file path by extension. Pure. Defaults to octet-stream. */
-export function contentTypeFor(filePath: string): string {
+function contentTypeFor(filePath: string): string {
 	const dot = filePath.lastIndexOf(".");
 	if (dot === -1) return "application/octet-stream";
 	return CONTENT_TYPES[filePath.slice(dot).toLowerCase()] ?? "application/octet-stream";
@@ -82,7 +82,7 @@ export function contentTypeFor(filePath: string): string {
  * to `index.html`, and rejects any traversal segment so a request can never
  * escape the served directory.
  */
-export function resolveRequestPath(rawUrl: string): { ok: true; relative: string } | { ok: false; reason: string } {
+function resolveRequestPath(rawUrl: string): { ok: true; relative: string } | { ok: false; reason: string } {
 	const pathPart = (rawUrl.split(/[?#]/, 1)[0] ?? "").trim();
 	let decoded: string;
 	try {
@@ -112,7 +112,7 @@ function titleize(topic: string): string {
  * the file-name list, not the directory. `index.html` is the menu itself and is
  * excluded; a trailing `_blueprint` is stripped from the topic key.
  */
-export function synthesizeMenu(fileNames: ReadonlyArray<string>): DocsMenuEntry[] {
+function synthesizeMenu(fileNames: ReadonlyArray<string>): DocsMenuEntry[] {
 	const entries: DocsMenuEntry[] = [];
 	for (const name of fileNames) {
 		if (!name.toLowerCase().endsWith(".html")) continue;
@@ -129,7 +129,7 @@ export function synthesizeMenu(fileNames: ReadonlyArray<string>): DocsMenuEntry[
  * topic (`safety`), the blueprint file stem (`safety_blueprint`), or a full
  * `.html` name, case-insensitively. Returns null when nothing matches.
  */
-export function topicToFile(topic: string, fileNames: ReadonlyArray<string>): string | null {
+function topicToFile(topic: string, fileNames: ReadonlyArray<string>): string | null {
 	const wanted = topic
 		.trim()
 		.toLowerCase()
@@ -227,7 +227,7 @@ export interface StartDocsServerOptions {
 }
 
 /** Start the viewer bound to 127.0.0.1 on an ephemeral port. */
-export async function startDocsServer(options: StartDocsServerOptions): Promise<DocsServerHandle> {
+async function startDocsServer(options: StartDocsServerOptions): Promise<DocsServerHandle> {
 	const host = options.host ?? HOST;
 	const server = createServer(createDocsRequestHandler(options.htmlDir));
 	await new Promise<void>((resolveListen, rejectListen) => {