@gajae-code/coding-agent 0.9.6 → 0.10.1

package/src/commands/launch.ts

@@ -13,19 +13,24 @@ import { prepareLaunchWorktree } from "../gjc-runtime/launch-worktree";
 import {
 	GJC_COORDINATOR_SESSION_ID_ENV,
 	GJC_COORDINATOR_SESSION_STATE_FILE_ENV,
+	GJC_TMUX_OWNER_GENERATION_ENV,
 } from "../gjc-runtime/session-state-sidecar";
 import { runRootCommand } from "../main";
 import { prepareAcpTerminalAuthArgs } from "../modes/acp/terminal-auth";
 
-async function persistCoordinatorLaunchFailure(error: unknown, cwd: string): Promise<void> {
-	const stateFile = process.env[GJC_COORDINATOR_SESSION_STATE_FILE_ENV]?.trim();
+export async function persistCoordinatorLaunchFailure(
+	error: unknown,
+	cwd: string,
+	env: NodeJS.ProcessEnv = process.env,
+): Promise<void> {
+	const stateFile = env[GJC_COORDINATOR_SESSION_STATE_FILE_ENV]?.trim();
 	if (!stateFile) return;
 	const message = error instanceof Error ? error.message : String(error);
 	const code = message.split(":", 1)[0] || "launch_failed";
 	const now = new Date().toISOString();
 	const payload = {
 		schema_version: 1,
-		session_id: process.env[GJC_COORDINATOR_SESSION_ID_ENV]?.trim() || null,
+		session_id: env[GJC_COORDINATOR_SESSION_ID_ENV]?.trim() || null,
 		state: "errored",
 		ready_for_input: false,
 		updated_at: now,
@@ -45,6 +50,9 @@ async function persistCoordinatorLaunchFailure(error: unknown, cwd: string): Pro
 			truncated: false,
 		},
 		error: { code, message, recoverable: true },
+		...(env[GJC_COORDINATOR_SESSION_ID_ENV]?.trim()
+			? { owner_generation: env[GJC_TMUX_OWNER_GENERATION_ENV] ?? null }
+			: {}),
 	};
 	await fs.mkdir(path.dirname(stateFile), { recursive: true });
 	await Bun.write(stateFile, `${JSON.stringify(payload, null, 2)}\n`);

package/src/commands/notify.ts

@@ -5,7 +5,7 @@ import { Args, Command, Flags } from "@gajae-code/utils/cli";
 import { type NotifyAction, type NotifyCommandArgs, runNotifyCliCommand } from "../cli/notify-cli";
 import { initTheme } from "../modes/theme/theme";
 
-const ACTIONS: NotifyAction[] = ["setup", "status", "daemon-internal"];
+const ACTIONS: NotifyAction[] = ["setup", "status", "health", "test", "recovery", "daemon-internal"];
 
 export default class Notify extends Command {
 	static description = "Configure Telegram notifications";
@@ -28,6 +28,8 @@ export default class Notify extends Command {
 		token: Flags.string({ description: "Telegram bot token (non-interactive setup)" }),
 		"chat-id": Flags.string({ description: "Telegram chat id to pair (non-interactive setup)" }),
 		redact: Flags.boolean({ description: "Enable redaction of remote notification content" }),
+		probe: Flags.boolean({ description: "notify health: probe Telegram reachability (getMe)" }),
+		message: Flags.string({ description: "notify test: custom message body" }),
 		"owner-id": Flags.string({ description: "Internal: daemon owner id" }),
 		"agent-dir": Flags.string({ description: "Internal: agent dir for the daemon" }),
 	};
@@ -53,6 +55,8 @@ export default class Notify extends Command {
 			token: flags.token as string | undefined,
 			chatId: (flags as Record<string, unknown>)["chat-id"] as string | undefined,
 			redact: Boolean(flags.redact),
+			probe: Boolean(flags.probe),
+			message: flags.message as string | undefined,
 		};
 
 		if (action !== "daemon-internal") await initTheme();

package/src/commands/session.ts

@@ -145,7 +145,12 @@ export default class Session extends Command {
 			}
 
 			if (action === "force-close" || action === "force-remove") {
-				const closed = forceCloseGjcTmuxSession(sessionName, process.env, flags["session-id"], flags["state-file"]);
+				const closed = await forceCloseGjcTmuxSession(
+					sessionName,
+					process.env,
+					flags["session-id"],
+					flags["state-file"],
+				);
 				if (json) {
 					writeJson({ ok: true, session: sessionJson(closed) });
 					return;

package/src/config/keybindings.ts

@@ -52,6 +52,7 @@ interface AppKeybindings {
 	"app.plan.toggle": true;
 	"app.history.search": true;
 	"app.stt.toggle": true;
+	"app.irc.sidebar.toggle": true;
 }
 
 export type AppKeybinding = keyof AppKeybindings;
@@ -214,6 +215,10 @@ export const KEYBINDINGS = {
 		defaultKeys: "alt+h",
 		description: "Toggle speech-to-text",
 	},
+	"app.irc.sidebar.toggle": {
+		defaultKeys: "alt+i",
+		description: "Toggle IRC sidebar",
+	},
 } as const satisfies KeybindingDefinitions;
 
 /**

package/src/config/model-profile-activation.ts

@@ -181,7 +181,7 @@ export function formatModelProfileCredentialError(profileLabel: string, provider
 	return `Model profile "${profileLabel}" requires credentials for: ${providers.join(", ")}. Run /login and configure the missing provider(s), then retry.`;
 }
 
-function resolveModelProfileName(profileName: string, profiles: ReadonlyMap<string, unknown>): string {
+export function resolveModelProfileName(profileName: string, profiles: ReadonlyMap<string, unknown>): string {
 	// A retired-name alias is fallback-only: never shadow a profile that actually
 	// exists under the requested name (e.g. a user-defined `codex-standard`).
 	if (profiles.has(profileName)) return profileName;

package/src/config/model-profiles.ts

@@ -70,22 +70,22 @@ const profile = (
 
 export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 	profile("codex-eco", ["openai-codex"], {
-		default: "openai-codex/gpt-5.6-sol:medium",
-		executor: "openai-codex/gpt-5.6-luna:low",
-		planner: "openai-codex/gpt-5.6-luna:medium",
-		critic: "openai-codex/gpt-5.6-luna:medium",
+		default: "openai-codex/gpt-5.6-terra:high",
+		executor: "openai-codex/gpt-5.6-luna:high",
+		planner: "openai-codex/gpt-5.6-terra:medium",
+		critic: "openai-codex/gpt-5.6-terra:high",
 		architect: "openai-codex/gpt-5.6-sol:medium",
 	}),
 	profile("codex-medium", ["openai-codex"], {
-		default: "openai-codex/gpt-5.6-sol:high",
-		executor: "openai-codex/gpt-5.6-luna:medium",
-		planner: "openai-codex/gpt-5.6-terra:medium",
-		critic: "openai-codex/gpt-5.6-terra:high",
+		default: "openai-codex/gpt-5.6-sol:medium",
+		executor: "openai-codex/gpt-5.6-terra:xhigh",
+		planner: "openai-codex/gpt-5.6-terra:high",
+		critic: "openai-codex/gpt-5.6-terra:xhigh",
 		architect: "openai-codex/gpt-5.6-sol:high",
 	}),
 	profile("codex-pro", ["openai-codex"], {
 		default: "openai-codex/gpt-5.6-sol:xhigh",
-		executor: "openai-codex/gpt-5.6-terra:medium",
+		executor: "openai-codex/gpt-5.6-terra:xhigh",
 		planner: "openai-codex/gpt-5.6-sol:high",
 		critic: "openai-codex/gpt-5.6-sol:xhigh",
 		architect: "openai-codex/gpt-5.6-sol:max",
@@ -256,13 +256,13 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 	}),
 	profile("opus-codex", ["anthropic", "openai-codex"], {
 		default: "anthropic/claude-opus-4-8:xhigh",
-		executor: "openai-codex/gpt-5.6-terra:low",
-		planner: "openai-codex/gpt-5.6-terra:medium",
-		critic: "openai-codex/gpt-5.6-terra:high",
+		executor: "openai-codex/gpt-5.6-terra:xhigh",
+		planner: "openai-codex/gpt-5.6-terra:high",
+		critic: "openai-codex/gpt-5.6-terra:xhigh",
 		architect: "openai-codex/gpt-5.6-sol:xhigh",
 	}),
 	profile("codex-opencodego", ["openai-codex", "opencode-go"], {
-		default: "openai-codex/gpt-5.6-sol:medium",
+		default: "openai-codex/gpt-5.6-terra:xhigh",
 		executor: "opencode-go/deepseek-v4-pro",
 		planner: "opencode-go/kimi-k2.6",
 		critic: "opencode-go/mimo-v2.5-pro",
@@ -270,7 +270,7 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 	}),
 	profile("fable-opus-codex", ["anthropic", "openai-codex"], {
 		default: "anthropic/claude-fable-5:high",
-		executor: "openai-codex/gpt-5.6-terra:high",
+		executor: "openai-codex/gpt-5.6-terra:xhigh",
 		planner: "anthropic/claude-opus-4-8:medium",
 		critic: "anthropic/claude-opus-4-8:high",
 		architect: "openai-codex/gpt-5.6-sol:xhigh",

package/src/config/settings-schema.ts

@@ -1,4 +1,5 @@
 import type { Effort } from "@gajae-code/ai/model-thinking";
+import { PET_MODE_IDS, PET_SKIN_IDS, PET_SKINS } from "@gajae-code/tui/components/gajae-pet";
 import { TASK_SIMPLE_MODES } from "../task/simple-mode";
 import { getThinkingLevelMetadata } from "../thinking-metadata";
 import { EDIT_MODES } from "../utils/edit-mode";
@@ -261,6 +262,7 @@ export const SETTINGS_SCHEMA = {
 	"notifications.telegram.chatId": { type: "string", default: undefined },
 	"notifications.telegram.rich.enabled": { type: "boolean", default: true },
 	"notifications.telegram.richDraft.enabled": { type: "boolean", default: false },
+	"notifications.telegram.topics.nameTemplate": { type: "string", default: undefined },
 	"notifications.discord.botToken": { type: "string", default: undefined },
 	"notifications.discord.channelId": { type: "string", default: undefined },
 	"notifications.slack.botToken": { type: "string", default: undefined },
@@ -271,6 +273,11 @@ export const SETTINGS_SCHEMA = {
 		default: "lean",
 		validate: (value: string) => value === "lean" || value === "verbose",
 	},
+	"notifications.sessionScope": {
+		type: "string",
+		default: "all",
+		validate: (value: string) => value === "all" || value === "primary",
+	},
 	"notifications.daemon.idleTimeoutMs": {
 		type: "number",
 		default: 60000,
@@ -510,6 +517,25 @@ export const SETTINGS_SCHEMA = {
 			description: "Use the session name color for the editor border and status line gap",
 		},
 	},
+
+	"pet.mode": {
+		type: "enum",
+		values: PET_MODE_IDS,
+		default: "off",
+		ui: {
+			tab: "appearance",
+			label: "Gajae Pet",
+			description: "16x16 real-pixel gajae living beside the composer (sixel/kitty terminals)",
+			options: [
+				{ value: "off", label: "Off", description: "No pet" },
+				...PET_SKIN_IDS.map(id => ({
+					value: id,
+					label: PET_SKINS[id].label,
+					description: PET_SKINS[id].description,
+				})),
+			],
+		},
+	},
 	"statusLine.maxRows": {
 		type: "number",
 		default: 1,
@@ -1224,7 +1250,8 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "interaction",
 			label: "Check for Updates",
-			description: "If false, skip update check",
+			description:
+				"At interactive startup, notify of newer versions; never install. Use `gjc update` only for recognized Bun global, Windows npm, or bundled-installer binaries; source, linked, and unrecognized installs use their original method.",
 		},
 	},
 
@@ -2164,6 +2191,16 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"irc.sidebar.enabled": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "tools",
+			label: "IRC Sidebar",
+			description: "Enable the IRC message sidebar (opens with the toggle key; starts closed)",
+		},
+	},
+
 	// Optional tools
 
 	"renderMermaid.enabled": {
@@ -3417,6 +3454,9 @@ export interface NotificationsSettings {
 		richDraft: {
 			enabled: boolean;
 		};
+		topics: {
+			nameTemplate: string | undefined;
+		};
 	};
 	discord: {
 		botToken: string | undefined;

package/src/config/settings.ts

@@ -55,6 +55,12 @@ export interface RawSettings {
 	[key: string]: unknown;
 }
 
+type SettingsPatch = {
+	readonly path: string;
+	readonly value: unknown;
+	readonly generation: number;
+};
+
 export interface SettingsOptions {
 	/** Current working directory for project settings discovery */
 	cwd?: string;
@@ -207,12 +213,14 @@ export class Settings {
 	/** Merged view (global + project + overrides) */
 	#merged: RawSettings = {};
 
-	/** Paths modified during this session (for partial save) */
-	#modified = new Set<string>();
+	/** Latest dirty patch for each path, owned by its generation. */
+	#modified = new Map<string, SettingsPatch>();
+	#nextGeneration = 0;
 
 	/** Pending save (debounced) */
 	#saveTimer?: NodeJS.Timeout;
-	#savePromise?: Promise<void>;
+	#saveTail: Promise<void> = Promise.resolve();
+	#globalModelRoleTail: Promise<void> = Promise.resolve();
 
 	/** Whether to persist changes */
 	#persist: boolean;
@@ -320,9 +328,13 @@ export class Settings {
 	 */
 	set<P extends SettingPath>(path: P, value: SettingValue<P>): void {
 		const prev = this.get(path);
-		const segments = path.split(".");
-		setByPath(this.#global, segments, value);
-		this.#modified.add(path);
+		const patch: SettingsPatch = {
+			path,
+			value: structuredClone(value),
+			generation: ++this.#nextGeneration,
+		};
+		setByPath(this.#global, path.split("."), structuredClone(patch.value));
+		this.#modified.set(path, patch);
 		this.#rebuildMerged();
 		this.#queueSave();
 
@@ -366,12 +378,8 @@ export class Settings {
 			clearTimeout(this.#saveTimer);
 			this.#saveTimer = undefined;
 		}
-		if (this.#savePromise) {
-			await this.#savePromise;
-		}
-		if (this.#modified.size > 0) {
-			await this.#saveNow();
-		}
+		const save = this.#modified.size > 0 ? this.#saveNow() : this.#saveTail;
+		await save;
 	}
 
 	/**
@@ -385,12 +393,8 @@ export class Settings {
 			clearTimeout(this.#saveTimer);
 			this.#saveTimer = undefined;
 		}
-		if (this.#savePromise) {
-			await this.#savePromise;
-		}
-		if (this.#modified.size > 0) {
-			await this.#saveNow({ throwOnError: true });
-		}
+		const save = this.#modified.size > 0 ? this.#saveNow({ throwOnError: true }) : this.#saveTail;
+		await save;
 	}
 
 	async cloneForCwd(cwd: string): Promise<Settings> {
@@ -480,7 +484,6 @@ export class Settings {
 	 * Set a model role (helper for modelRoles record).
 	 */
 	setModelRole(role: ModelRole | string, modelId: string): void {
-		const current = shallowStringRecord(getByPath(this.#global, ["modelRoles"]));
 		const runtimeOverrides = getByPath(this.#overrides, ["modelRoles"]);
 		const updateRuntimeOverride =
 			!!runtimeOverrides &&
@@ -488,12 +491,55 @@ export class Settings {
 			!Array.isArray(runtimeOverrides) &&
 			Object.hasOwn(runtimeOverrides, role);
 
-		this.set("modelRoles", { ...current, [role]: modelId });
+		this.setGlobalModelRole(role, modelId);
 
 		if (updateRuntimeOverride) {
 			this.override("modelRoles", { ...shallowStringRecord(runtimeOverrides), [role]: modelId });
 		}
 	}
+
+	setGlobalModelRole(role: ModelRole | string, modelId: string | undefined): void {
+		const current = shallowStringRecord(getByPath(this.#global, ["modelRoles"]));
+		if (modelId === undefined) {
+			const { [role]: _removed, ...remaining } = current;
+			this.set("modelRoles", remaining);
+			return;
+		}
+		this.set("modelRoles", { ...current, [role]: modelId });
+	}
+
+	setGlobalModelRoleAndFlush(role: ModelRole | string, modelId: string | undefined): Promise<void> {
+		const transaction = this.#globalModelRoleTail.then(async () => {
+			const hadModelRoles = Object.hasOwn(this.#global, "modelRoles");
+			const previousModelRoles = structuredClone(this.#global.modelRoles);
+			const previousPatch = this.#modified.get("modelRoles");
+			this.setGlobalModelRole(role, modelId);
+			const generation = this.#modified.get("modelRoles")?.generation;
+			if (this.#saveTimer) {
+				clearTimeout(this.#saveTimer);
+				this.#saveTimer = undefined;
+			}
+			const save = this.#saveNow({ throwOnError: true });
+			try {
+				await save;
+			} catch (error) {
+				const currentPatch = this.#modified.get("modelRoles");
+				if (currentPatch?.generation === generation) {
+					if (hadModelRoles) this.#global.modelRoles = previousModelRoles;
+					else delete this.#global.modelRoles;
+					if (previousPatch) this.#modified.set("modelRoles", previousPatch);
+					else this.#modified.delete("modelRoles");
+					this.#rebuildMerged();
+				}
+				throw error;
+			}
+		});
+		this.#globalModelRoleTail = transaction.then(
+			() => undefined,
+			() => undefined,
+		);
+		return transaction;
+	}
 	/**
 	 * Set an agent model override while keeping any live runtime override aligned.
 	 *
@@ -824,15 +870,10 @@ export class Settings {
 	#queueSave(): void {
 		if (!this.#persist || !this.#configPath) return;
 
-		// Debounce: wait 100ms for more changes
-		if (this.#saveTimer) {
-			clearTimeout(this.#saveTimer);
-		}
+		if (this.#saveTimer) clearTimeout(this.#saveTimer);
 		this.#saveTimer = setTimeout(() => {
 			this.#saveTimer = undefined;
-			this.#saveNow().catch(err => {
-				logger.warn("Settings: background save failed", { error: String(err) });
-			});
+			void this.#saveNow();
 		}, 100);
 	}
 
@@ -840,30 +881,40 @@ export class Settings {
 		if (!this.#persist || !this.#configPath || this.#modified.size === 0) return;
 
 		const configPath = this.#configPath;
-		const modifiedPaths = [...this.#modified];
-		this.#modified.clear();
+		const patches = [...this.#modified.values()];
 
-		try {
-			await withFileLock(configPath, async () => {
-				// Re-read to preserve external changes
+		const save = this.#saveTail.then(() =>
+			withFileLock(configPath, async () => {
 				const current = await this.#loadYaml(configPath);
-
-				// Apply only our modified paths
-				for (const modPath of modifiedPaths) {
-					const segments = modPath.split(".");
-					const value = getByPath(this.#global, segments);
-					setByPath(current, segments, value);
+				for (const patch of patches) {
+					setByPath(current, patch.path.split("."), patch.value);
+				}
+				await Bun.write(configPath, YAML.stringify(current, null, 2));
+				for (const patch of patches) {
+					if (this.#modified.get(patch.path)?.generation === patch.generation) {
+						this.#modified.delete(patch.path);
+					}
 				}
-
-				// Update our global with any external changes we preserved
 				this.#global = current;
-				await Bun.write(configPath, YAML.stringify(this.#global, null, 2));
-			});
+				for (const patch of this.#modified.values()) {
+					setByPath(this.#global, patch.path.split("."), structuredClone(patch.value));
+				}
+			}),
+		);
+		this.#saveTail = save.then(
+			() => undefined,
+			() => undefined,
+		);
+
+		try {
+			await save;
 		} catch (error) {
 			logger.warn("Settings: save failed", { error: String(error) });
-			// Re-add failed paths for retry
-			for (const p of modifiedPaths) {
-				this.#modified.add(p);
+			for (const patch of patches) {
+				const currentPatch = this.#modified.get(patch.path);
+				if (currentPatch?.generation === patch.generation) {
+					this.#modified.set(patch.path, patch);
+				}
 			}
 			if (options.throwOnError) {
 				this.#rebuildMerged();

package/src/coordinator/contract.ts

@@ -12,6 +12,7 @@ export const COORDINATOR_MCP_TOOL_NAMES = [
 	"gjc_coordinator_watch_events",
 	"gjc_coordinator_register_session",
 	"gjc_coordinator_start_session",
+	"gjc_coordinator_stop_session",
 	"gjc_coordinator_send_prompt",
 	"gjc_coordinator_submit_question_answer",
 	"gjc_coordinator_read_turn",

package/src/coordinator-mcp/model-preset.ts

@@ -0,0 +1,100 @@
+import * as path from "node:path";
+import { getAgentDir } from "@gajae-code/utils";
+import { resolveModelProfileName } from "../config/model-profile-activation";
+import { type ModelProfileDefinition, mergeModelProfiles } from "../config/model-profiles";
+import { ModelsConfigFile } from "../config/model-registry";
+
+/**
+ * Loads the merged built-in + custom model-profile registry the way the `gjc`
+ * CLI resolves `--mpreset`, so coordinator MCP launches select the same
+ * authoritative profile the spawned child will activate. Custom profiles live
+ * in the shared models config, which the child inherits, so both sides agree.
+ */
+export type CoordinatorModelProfileLoader = () =>
+	| Map<string, ModelProfileDefinition>
+	| Promise<Map<string, ModelProfileDefinition>>;
+
+const MAX_ECHOED_MPRESET_LENGTH = 128;
+
+/**
+ * Thrown by the default loader when `models.yml` exists but is invalid or
+ * unreadable. This lets the resolver fail closed with a distinct, stable reason
+ * instead of silently collapsing a broken registry to the built-ins-only set
+ * (which would misreport a caller's valid custom profile as unknown).
+ */
+export class CoordinatorModelProfileRegistryError extends Error {
+	constructor(cause?: unknown) {
+		super("coordinator_model_profile_registry_error");
+		this.name = "CoordinatorModelProfileRegistryError";
+		if (cause !== undefined) (this as { cause?: unknown }).cause = cause;
+	}
+}
+
+export const loadCoordinatorModelProfiles: CoordinatorModelProfileLoader = () => {
+	const configFile = ModelsConfigFile.relocate(path.join(getAgentDir(), "models.yml"));
+	configFile.invalidate();
+	const loaded = configFile.tryLoad();
+	// A present-but-invalid config must fail closed; absence (`value` undefined
+	// with a non-error status) is fine and yields the built-in profiles only.
+	if (loaded.status === "error") throw new CoordinatorModelProfileRegistryError(loaded.error);
+	return mergeModelProfiles(loaded.value?.profiles);
+};
+
+function sortedProfileNames(profiles: ReadonlyMap<string, ModelProfileDefinition>): string[] {
+	return [...profiles.keys()].sort((left, right) => left.localeCompare(right));
+}
+
+export type CoordinatorMpresetResolution =
+	| { ok: true; mpreset: string | null }
+	| { ok: false; reason: "unknown_model_profile"; mpreset: string; available_profiles: string[] }
+	| { ok: false; reason: "model_profile_registry_error"; mpreset: string; available_profiles: string[] };
+
+/**
+ * Resolve a coordinator `mpreset` argument against the merged profile registry.
+ *
+ * Only an absent (`undefined`/`null`) value is a no-op (`mpreset: null`); an
+ * explicit empty/whitespace string is a caller error and is rejected rather
+ * than silently launching at the default tier. Legacy aliases are canonicalized
+ * exactly like the CLI (e.g. `codex-standard` -> `codex-medium`) so coordinator
+ * selection stays in parity with `gjc --mpreset <profile>`; the resolved value
+ * is the canonical profile name. Unknown names are rejected with the
+ * available-profile listing and never reach a spawned child command, and a
+ * broken registry fails closed with `model_profile_registry_error`.
+ */
+export async function resolveCoordinatorMpreset(
+	raw: unknown,
+	loadProfiles: CoordinatorModelProfileLoader,
+): Promise<CoordinatorMpresetResolution> {
+	if (raw === undefined || raw === null) return { ok: true, mpreset: null };
+	const requested = typeof raw === "string" ? raw.trim() : "";
+	const echoed = requested.slice(0, MAX_ECHOED_MPRESET_LENGTH);
+	let profiles: Map<string, ModelProfileDefinition>;
+	try {
+		profiles = await loadProfiles();
+	} catch (error) {
+		if (error instanceof CoordinatorModelProfileRegistryError) {
+			return { ok: false, reason: "model_profile_registry_error", mpreset: echoed, available_profiles: [] };
+		}
+		throw error;
+	}
+	// Non-string input and explicit blank/whitespace strings can never name a
+	// profile; only absent/null (handled above) means "no selection".
+	if (typeof raw !== "string" || requested.length === 0) {
+		return {
+			ok: false,
+			reason: "unknown_model_profile",
+			mpreset: echoed,
+			available_profiles: sortedProfileNames(profiles),
+		};
+	}
+	const canonical = resolveModelProfileName(requested, profiles);
+	if (!profiles.has(canonical)) {
+		return {
+			ok: false,
+			reason: "unknown_model_profile",
+			mpreset: echoed,
+			available_profiles: sortedProfileNames(profiles),
+		};
+	}
+	return { ok: true, mpreset: canonical };
+}

package/src/coordinator-mcp/policy.ts

@@ -1,6 +1,12 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { coordinatorMcpStateRoot, gjcRoot } from "../gjc-runtime/session-layout";
+import {
+	DEFAULT_SESSION_IDLE_TTL_MS,
+	DEFAULT_SESSION_SWEEP_INTERVAL_MS,
+	MIN_SESSION_IDLE_TTL_MS,
+	MIN_SESSION_SWEEP_INTERVAL_MS,
+} from "./session-reaper";
 
 export type CoordinatorMutationClass = "sessions" | "questions" | "reports";
 
@@ -16,6 +22,9 @@ export interface CoordinatorMcpConfig {
 	namespace: CoordinatorNamespace;
 	stateRoot: string;
 	sessionCommand: string | null;
+	sessionIdleTtlMs: number;
+	sessionSweepIntervalMs: number;
+	forceStopEnabled: boolean;
 }
 
 export interface CoordinatorMutationRequest {
@@ -32,6 +41,16 @@ const LEGACY_MUTATION_CLASS_ALIASES = new Map<string, CoordinatorMutationClass>(
 	["report", "reports"],
 ]);
 
+function parsePositiveIntMs(value: string | undefined, fallback: number, floor: number): number {
+	const parsed = Number.parseInt((value ?? "").trim(), 10);
+	if (!Number.isFinite(parsed) || parsed <= 0) return fallback;
+	return Math.max(floor, parsed);
+}
+
+function parseBool(value: string | undefined): boolean {
+	return /^(1|true|yes|on)$/i.test((value ?? "").trim());
+}
+
 function parseList(value: string | undefined): string[] {
 	return (value ?? "")
 		.split(/[\n,;:]+/)
@@ -98,6 +117,17 @@ export function buildCoordinatorMcpConfig(env: NodeJS.ProcessEnv = process.env):
 		},
 		stateRoot: path.resolve(stateRoot),
 		sessionCommand: env.GJC_COORDINATOR_MCP_SESSION_COMMAND?.trim() || null,
+		sessionIdleTtlMs: parsePositiveIntMs(
+			env.GJC_COORDINATOR_MCP_SESSION_IDLE_TTL_MS,
+			DEFAULT_SESSION_IDLE_TTL_MS,
+			MIN_SESSION_IDLE_TTL_MS,
+		),
+		sessionSweepIntervalMs: parsePositiveIntMs(
+			env.GJC_COORDINATOR_MCP_SESSION_SWEEP_INTERVAL_MS,
+			DEFAULT_SESSION_SWEEP_INTERVAL_MS,
+			MIN_SESSION_SWEEP_INTERVAL_MS,
+		),
+		forceStopEnabled: parseBool(env.GJC_COORDINATOR_MCP_FORCE_STOP),
 	};
 }