@gajae-code/coding-agent 0.4.4 → 0.5.0

package/src/commands/session.ts

@@ -18,7 +18,9 @@ function writeText(lines: string[]): void {
 function writeJsonFailure(error: unknown): void {
 	const message = error instanceof Error ? error.message : String(error);
 	const [reason = "session_error"] = message.split(":");
-	writeJson({ ok: false, reason });
+	const hintIndex = message.indexOf(" — ");
+	const detail = hintIndex >= 0 ? message.slice(hintIndex + " — ".length).trim() : "";
+	writeJson(detail ? { ok: false, reason, detail } : { ok: false, reason });
 }
 
 interface SessionJsonDto {

package/src/commands/setup.ts

@@ -28,6 +28,8 @@ export default class Setup extends Command {
 		repo: Flags.string({ description: "Hermes MCP repo namespace" }),
 		profile: Flags.string({ description: "Hermes MCP profile namespace" }),
 		"session-command": Flags.string({ description: "Explicit GJC session command for Hermes to launch" }),
+		"no-worktree": Flags.boolean({ description: "Disable default GJC --worktree isolation for Hermes sessions" }),
+		"worktree-name": Flags.string({ description: "Named GJC --worktree branch for Hermes sessions" }),
 		"state-root": Flags.string({ description: "Hermes MCP coordination state root" }),
 		mutation: Flags.string({
 			description: "Hermes MCP mutation classes: sessions,questions,reports,all",
@@ -68,6 +70,8 @@ export default class Setup extends Command {
 				repo: flags.repo,
 				profile: flags.profile,
 				sessionCommand: flags["session-command"],
+				noWorktree: flags["no-worktree"],
+				worktreeName: flags["worktree-name"],
 				stateRoot: flags["state-root"],
 				mutation: flags.mutation,
 				artifactByteCap: flags["artifact-byte-cap"],

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

@@ -1,6 +1,7 @@
 import type { ThinkingLevel } from "@gajae-code/agent-core";
 import type { Api, Model } from "@gajae-code/ai";
 import type { AgentSession } from "../session/agent-session";
+import { formatClampedModelSelector } from "../thinking";
 import {
 	aggregateModelProfileRequiredProviders,
 	formatAvailableProfileNames,
@@ -10,8 +11,14 @@ import { type GjcModelAssignmentTargetId, isAuthenticated, type ModelRegistry }
 import { resolveModelRoleValue } from "./model-resolver";
 import type { Settings } from "./settings";
 
+type ModelProfileActivationSession = Pick<AgentSession, "model" | "thinkingLevel" | "sessionId"> & {
+	setModelTemporary?: AgentSession["setModelTemporary"];
+	setActiveModelProfile?: (name: string | undefined) => void;
+	getActiveModelProfile?: () => string | undefined;
+};
+
 export interface PrepareModelProfileActivationOptions {
-	session: Pick<AgentSession, "model" | "thinkingLevel" | "sessionId">;
+	session: ModelProfileActivationSession;
 	modelRegistry: Pick<
 		ModelRegistry,
 		| "getModelProfile"
@@ -29,7 +36,7 @@ export interface PrepareModelProfileActivationOptions {
 
 export interface PreparedModelProfileActivation {
 	profileName: string;
-	session: Pick<AgentSession, "model" | "thinkingLevel" | "sessionId" | "setModelTemporary">;
+	session: ModelProfileActivationSession & { setModelTemporary: AgentSession["setModelTemporary"] };
 	settings: Pick<Settings, "get" | "override" | "set" | "flush">;
 	previousModel: Model<Api> | undefined;
 	previousThinkingLevel: ThinkingLevel | undefined;
@@ -37,6 +44,7 @@ export interface PreparedModelProfileActivation {
 	defaultModel: Model<Api> | undefined;
 	defaultThinkingLevel: ThinkingLevel | undefined;
 	agentModelOverrides: Record<string, string>;
+	previousActiveModelProfile: string | undefined;
 }
 
 export function formatModelProfileCredentialError(profileName: string, providers: readonly string[]): string {
@@ -89,7 +97,7 @@ export async function prepareModelProfileActivation(
 		if (!resolved.model) {
 			throw new Error(`Model profile "${options.profileName}" ${role} selector did not resolve: ${selector}`);
 		}
-		agentModelOverrides[role] = selector;
+		agentModelOverrides[role] = formatClampedModelSelector(selector, resolved.model);
 	}
 
 	return {
@@ -102,6 +110,7 @@ export async function prepareModelProfileActivation(
 		defaultModel: resolvedDefault?.model,
 		defaultThinkingLevel: resolvedDefault?.thinkingLevel,
 		agentModelOverrides,
+		previousActiveModelProfile: options.session.getActiveModelProfile?.(),
 	};
 }
 
@@ -113,6 +122,7 @@ export async function applyPreparedModelProfileActivation(
 	const previousThinkingLevel = prepared.previousThinkingLevel;
 	const previousAgentModelOverrides = prepared.previousAgentModelOverrides;
 	const previousPersistedDefault = prepared.settings.get("modelProfile.default");
+	const previousActiveModelProfile = prepared.previousActiveModelProfile;
 	let modelChanged = false;
 	let overridesChanged = false;
 	let defaultChanged = false;
@@ -134,6 +144,7 @@ export async function applyPreparedModelProfileActivation(
 			defaultChanged = true;
 			await prepared.settings.flush();
 		}
+		prepared.session.setActiveModelProfile?.(prepared.profileName);
 	} catch (error) {
 		if (defaultChanged) {
 			prepared.settings.set("modelProfile.default", previousPersistedDefault);
@@ -141,6 +152,7 @@ export async function applyPreparedModelProfileActivation(
 		if (overridesChanged) {
 			prepared.settings.override("task.agentModelOverrides", previousAgentModelOverrides);
 		}
+		prepared.session.setActiveModelProfile?.(previousActiveModelProfile);
 		if (modelChanged && previousModel) {
 			await prepared.session.setModelTemporary(previousModel, previousThinkingLevel);
 		}

package/src/config/model-profiles.ts

@@ -54,71 +54,270 @@ const profile = (
 });
 
 export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
-	profile("opencode-go-eco", ["opencode-go"], {
-		default: "opencode-go/deepseek-v4-flash",
-		executor: "opencode-go/qwen3.5-plus",
-		architect: "opencode-go/glm-5",
-		planner: "opencode-go/minimax-m2.5",
-		critic: "opencode-go/kimi-k2.5",
-	}),
-	profile("opencode-go-standard", ["opencode-go"], {
-		default: "opencode-go/kimi-k2.6",
-		executor: "opencode-go/qwen3.6-plus",
-		architect: "opencode-go/glm-5.1",
-		planner: "opencode-go/minimax-m2.7",
-		critic: "opencode-go/deepseek-v4-pro",
-	}),
-	profile("opencode-go-pro", ["opencode-go"], {
-		default: "opencode-go/qwen3.7-max",
-		executor: "opencode-go/kimi-k2.6",
-		architect: "opencode-go/deepseek-v4-pro:high",
-		planner: "opencode-go/glm-5.1:high",
-		critic: "opencode-go/minimax-m2.7:high",
-	}),
 	profile("codex-eco", ["openai-codex"], {
-		default: "openai-codex/gpt-5.4-mini",
-		executor: "openai-codex/gpt-5.4-nano",
-		architect: "openai-codex/gpt-5.4-mini",
-		planner: "openai-codex/gpt-5.4-mini",
-		critic: "openai-codex/gpt-5.4-mini",
-	}),
-	profile("codex-standard", ["openai-codex"], {
-		default: "openai-codex/gpt-5.4:medium",
-		executor: "openai-codex/gpt-5.4:low",
-		architect: "openai-codex/gpt-5.4:xhigh",
-		planner: "openai-codex/gpt-5.4:medium",
-		critic: "openai-codex/gpt-5.4:high",
+		default: "openai-codex/gpt-5.5:low",
+		executor: "openai-codex/gpt-5.5:minimal",
+		planner: "openai-codex/gpt-5.5:low",
+		critic: "openai-codex/gpt-5.5:medium",
+		architect: "openai-codex/gpt-5.5:high",
+	}),
+	profile("codex-medium", ["openai-codex"], {
+		default: "openai-codex/gpt-5.5:medium",
+		executor: "openai-codex/gpt-5.5:low",
+		planner: "openai-codex/gpt-5.5:medium",
+		critic: "openai-codex/gpt-5.5:high",
+		architect: "openai-codex/gpt-5.5:xhigh",
 	}),
 	profile("codex-pro", ["openai-codex"], {
-		default: "openai-codex/gpt-5.5",
-		executor: "openai-codex/gpt-5.2-codex",
-		architect: "openai-codex/gpt-5.1-codex-max:high",
+		default: "openai-codex/gpt-5.5:xhigh",
+		executor: "openai-codex/gpt-5.5:medium",
 		planner: "openai-codex/gpt-5.5:high",
-		critic: "openai-codex/gpt-5.3-codex-spark:high",
+		critic: "openai-codex/gpt-5.5:xhigh",
+		architect: "openai-codex/gpt-5.5:xhigh",
 	}),
-	profile("opencode-go-codex-eco", ["opencode-go", "openai-codex"], {
-		default: "opencode-go/deepseek-v4-flash",
-		executor: "opencode-go/qwen3.5-plus",
-		architect: "openai-codex/gpt-5.4-mini",
-		planner: "openai-codex/gpt-5.4-mini",
-		critic: "openai-codex/gpt-5.4-mini",
-	}),
-	profile("opencode-go-codex-standard", ["opencode-go", "openai-codex"], {
+	profile("opencodego", ["opencode-go"], {
 		default: "opencode-go/kimi-k2.6",
-		executor: "opencode-go/qwen3.6-plus",
-		architect: "openai-codex/gpt-5.4",
-		planner: "openai-codex/gpt-5.4",
-		critic: "openai-codex/gpt-5.4",
-	}),
-	profile("opencode-go-codex-pro", ["opencode-go", "openai-codex"], {
-		default: "opencode-go/qwen3.7-max",
-		executor: "opencode-go/kimi-k2.6",
-		architect: "openai-codex/gpt-5.1-codex-max:high",
-		planner: "openai-codex/gpt-5.5:high",
-		critic: "openai-codex/gpt-5.3-codex-spark:high",
+		executor: "opencode-go/deepseek-v4-flash",
+		planner: "opencode-go/qwen3.7-max",
+		critic: "opencode-go/mimo-v2.5-pro",
+		architect: "opencode-go/deepseek-v4-pro",
+	}),
+	profile("claude-opus", ["anthropic"], {
+		default: "anthropic/claude-opus-4-8:xhigh",
+		executor: "anthropic/claude-sonnet-4-6",
+		planner: "anthropic/claude-opus-4-8:low",
+		critic: "anthropic/claude-opus-4-8:high",
+		architect: "anthropic/claude-opus-4-8:xhigh",
+	}),
+	profile("glm-eco", ["zai"], {
+		default: "zai/glm-5.1:low",
+		executor: "zai/glm-5.1:minimal",
+		planner: "zai/glm-5.1:low",
+		critic: "zai/glm-5.1:medium",
+		architect: "zai/glm-5.1:high",
+	}),
+	profile("glm-medium", ["zai"], {
+		default: "zai/glm-5.1:medium",
+		executor: "zai/glm-5.1:low",
+		planner: "zai/glm-5.1:medium",
+		critic: "zai/glm-5.1:high",
+		architect: "zai/glm-5.1:xhigh",
+	}),
+	profile("glm-pro", ["zai"], {
+		default: "zai/glm-5.1:xhigh",
+		executor: "zai/glm-5.1:medium",
+		planner: "zai/glm-5.1:high",
+		critic: "zai/glm-5.1:xhigh",
+		architect: "zai/glm-5.1:xhigh",
+	}),
+	profile("kimi-coding-plan-eco", ["kimi-code"], {
+		default: "kimi-code/kimi-k2.7-code:low",
+		executor: "kimi-code/kimi-k2.7-code:minimal",
+		planner: "kimi-code/kimi-k2.7-code:low",
+		critic: "kimi-code/kimi-k2.7-code:medium",
+		architect: "kimi-code/kimi-k2.7-code:high",
+	}),
+	profile("kimi-coding-plan-medium", ["kimi-code"], {
+		default: "kimi-code/kimi-k2.7-code:medium",
+		executor: "kimi-code/kimi-k2.7-code:low",
+		planner: "kimi-code/kimi-k2.7-code:medium",
+		critic: "kimi-code/kimi-k2.7-code:high",
+		architect: "kimi-code/kimi-k2.7-code:xhigh",
+	}),
+	profile("kimi-coding-plan-pro", ["kimi-code"], {
+		default: "kimi-code/kimi-k2.7-code:xhigh",
+		executor: "kimi-code/kimi-k2.7-code:medium",
+		planner: "kimi-code/kimi-k2.7-code:high",
+		critic: "kimi-code/kimi-k2.7-code:xhigh",
+		architect: "kimi-code/kimi-k2.7-code:xhigh",
+	}),
+	profile("mimo-eco", ["xiaomi"], {
+		default: "xiaomi/mimo-v2.5-pro:low",
+		executor: "xiaomi/mimo-v2.5-pro:minimal",
+		planner: "xiaomi/mimo-v2.5-pro:low",
+		critic: "xiaomi/mimo-v2.5-pro:medium",
+		architect: "xiaomi/mimo-v2.5-pro:high",
+	}),
+	profile("mimo-medium", ["xiaomi"], {
+		default: "xiaomi/mimo-v2.5-pro:medium",
+		executor: "xiaomi/mimo-v2.5-pro:low",
+		planner: "xiaomi/mimo-v2.5-pro:medium",
+		critic: "xiaomi/mimo-v2.5-pro:high",
+		architect: "xiaomi/mimo-v2.5-pro:xhigh",
+	}),
+	profile("mimo-pro", ["xiaomi"], {
+		default: "xiaomi/mimo-v2.5-pro:xhigh",
+		executor: "xiaomi/mimo-v2.5-pro:medium",
+		planner: "xiaomi/mimo-v2.5-pro:high",
+		critic: "xiaomi/mimo-v2.5-pro:xhigh",
+		architect: "xiaomi/mimo-v2.5-pro:xhigh",
+	}),
+	profile("grok-eco", ["xai"], {
+		default: "xai/grok-4.3:low",
+		executor: "xai/grok-4.3:minimal",
+		planner: "xai/grok-4.3:low",
+		critic: "xai/grok-4.3:medium",
+		architect: "xai/grok-4.3:high",
+	}),
+	profile("grok-medium", ["xai"], {
+		default: "xai/grok-4.3:medium",
+		executor: "xai/grok-4.3:low",
+		planner: "xai/grok-4.3:medium",
+		critic: "xai/grok-4.3:high",
+		architect: "xai/grok-4.3:xhigh",
+	}),
+	profile("grok-pro", ["xai"], {
+		default: "xai/grok-4.3:xhigh",
+		executor: "xai/grok-4.3:medium",
+		planner: "xai/grok-4.3:high",
+		critic: "xai/grok-4.3:xhigh",
+		architect: "xai/grok-4.3:xhigh",
+	}),
+	profile("cursor-eco", ["cursor"], {
+		default: "cursor/composer-1.5:low",
+		executor: "cursor/composer-1.5:minimal",
+		planner: "cursor/composer-1.5:low",
+		critic: "cursor/composer-1.5:medium",
+		architect: "cursor/composer-1.5:high",
+	}),
+	profile("cursor-medium", ["cursor"], {
+		default: "cursor/composer-1.5:medium",
+		executor: "cursor/composer-1.5:low",
+		planner: "cursor/composer-1.5:medium",
+		critic: "cursor/composer-1.5:high",
+		architect: "cursor/composer-1.5:xhigh",
 	}),
+	profile("cursor-pro", ["cursor"], {
+		default: "cursor/composer-1.5:xhigh",
+		executor: "cursor/composer-1.5:medium",
+		planner: "cursor/composer-1.5:high",
+		critic: "cursor/composer-1.5:xhigh",
+		architect: "cursor/composer-1.5:xhigh",
+	}),
+	profile("minimax-eco", ["minimax-code"], {
+		default: "minimax-code/minimax-v3:low",
+		executor: "minimax-code/minimax-v3:minimal",
+		planner: "minimax-code/minimax-v3:low",
+		critic: "minimax-code/minimax-v3:medium",
+		architect: "minimax-code/minimax-v3:high",
+	}),
+	profile("minimax-medium", ["minimax-code"], {
+		default: "minimax-code/minimax-v3:medium",
+		executor: "minimax-code/minimax-v3:low",
+		planner: "minimax-code/minimax-v3:medium",
+		critic: "minimax-code/minimax-v3:high",
+		architect: "minimax-code/minimax-v3:xhigh",
+	}),
+	profile("minimax-pro", ["minimax-code"], {
+		default: "minimax-code/minimax-v3:xhigh",
+		executor: "minimax-code/minimax-v3:medium",
+		planner: "minimax-code/minimax-v3:high",
+		critic: "minimax-code/minimax-v3:xhigh",
+		architect: "minimax-code/minimax-v3:xhigh",
+	}),
+	profile("opus-codex", ["anthropic", "openai-codex"], {
+		default: "anthropic/claude-opus-4-8:xhigh",
+		executor: "openai-codex/gpt-5.5:low",
+		planner: "openai-codex/gpt-5.5:medium",
+		critic: "openai-codex/gpt-5.5:high",
+		architect: "openai-codex/gpt-5.5:xhigh",
+	}),
+	profile("codex-opencodego", ["openai-codex", "opencode-go"], {
+		default: "openai-codex/gpt-5.5:medium",
+		executor: "opencode-go/deepseek-v4-pro",
+		planner: "opencode-go/kimi-k2.6",
+		critic: "opencode-go/mimo-v2.5-pro",
+		architect: "openai-codex/gpt-5.5:xhigh",
+	}),
+];
+
+export interface ModelProfilePresentation {
+	displayName: string;
+	providerGroup: string;
+}
+
+const PROFILE_PRESENTATION: Record<string, ModelProfilePresentation> = {
+	"codex-eco": { displayName: "Codex Eco", providerGroup: "CODEX" },
+	"codex-medium": { displayName: "Codex Medium", providerGroup: "CODEX" },
+	"codex-pro": { displayName: "Codex Pro", providerGroup: "CODEX" },
+	opencodego: { displayName: "OpenCodeGo", providerGroup: "OPENCODEGO" },
+	"claude-opus": { displayName: "Claude Opus", providerGroup: "CLAUDE" },
+	"glm-eco": { displayName: "GLM Eco", providerGroup: "GLM" },
+	"glm-medium": { displayName: "GLM Medium", providerGroup: "GLM" },
+	"glm-pro": { displayName: "GLM Pro", providerGroup: "GLM" },
+	"kimi-coding-plan-eco": { displayName: "Kimi Coding Plan Eco", providerGroup: "KIMI CODING PLAN" },
+	"kimi-coding-plan-medium": { displayName: "Kimi Coding Plan Medium", providerGroup: "KIMI CODING PLAN" },
+	"kimi-coding-plan-pro": { displayName: "Kimi Coding Plan Pro", providerGroup: "KIMI CODING PLAN" },
+	"mimo-eco": { displayName: "Mimo Eco", providerGroup: "MIMO" },
+	"mimo-medium": { displayName: "Mimo Medium", providerGroup: "MIMO" },
+	"mimo-pro": { displayName: "Mimo Pro", providerGroup: "MIMO" },
+	"grok-eco": { displayName: "Grok Eco", providerGroup: "GROK" },
+	"grok-medium": { displayName: "Grok Medium", providerGroup: "GROK" },
+	"grok-pro": { displayName: "Grok Pro", providerGroup: "GROK" },
+	"cursor-eco": { displayName: "Cursor Eco", providerGroup: "CURSOR" },
+	"cursor-medium": { displayName: "Cursor Medium", providerGroup: "CURSOR" },
+	"cursor-pro": { displayName: "Cursor Pro", providerGroup: "CURSOR" },
+	"minimax-eco": { displayName: "MiniMax Eco", providerGroup: "MINIMAX" },
+	"minimax-medium": { displayName: "MiniMax Medium", providerGroup: "MINIMAX" },
+	"minimax-pro": { displayName: "MiniMax Pro", providerGroup: "MINIMAX" },
+	"opus-codex": { displayName: "Opus + Codex", providerGroup: "COMBOS" },
+	"codex-opencodego": { displayName: "Codex + OpenCodeGo", providerGroup: "COMBOS" },
+};
+
+const PROFILE_GROUP_ORDER = [
+	"CODEX",
+	"OPENCODEGO",
+	"CLAUDE",
+	"GLM",
+	"KIMI CODING PLAN",
+	"MIMO",
+	"GROK",
+	"CURSOR",
+	"MINIMAX",
+	"COMBOS",
 ];
 
+const PROFILE_RECOMMENDATIONS: Record<string, string> = {
+	"openai-codex": "codex-medium",
+	anthropic: "claude-opus",
+	"opencode-go": "opencodego",
+	zai: "glm-medium",
+	"kimi-code": "kimi-coding-plan-medium",
+	xiaomi: "mimo-medium",
+	xai: "grok-medium",
+	cursor: "cursor-medium",
+	"minimax-code": "minimax-medium",
+};
+
+export function getModelProfilePresentation(name: string): ModelProfilePresentation {
+	return PROFILE_PRESENTATION[name] ?? { displayName: name, providerGroup: "COMBOS" };
+}
+
+export function groupModelProfilesForPresetLanding(
+	profiles: ReadonlyMap<string, ModelProfileDefinition>,
+): Map<string, ModelProfileDefinition[]> {
+	const groups = new Map<string, ModelProfileDefinition[]>();
+	for (const group of PROFILE_GROUP_ORDER) groups.set(group, []);
+	for (const profile of profiles.values()) {
+		const group = getModelProfilePresentation(profile.name).providerGroup;
+		if (!groups.has(group)) groups.set(group, []);
+		groups.get(group)?.push(profile);
+	}
+	for (const [group, entries] of groups) {
+		if (entries.length === 0) groups.delete(group);
+		else entries.sort((a, b) => a.name.localeCompare(b.name));
+	}
+	return groups;
+}
+
+export function recommendModelProfileForProvider(
+	providerId: string,
+	profiles: ReadonlyMap<string, ModelProfileDefinition>,
+): ModelProfileDefinition | undefined {
+	const recommended = PROFILE_RECOMMENDATIONS[providerId];
+	return recommended ? profiles.get(recommended) : undefined;
+}
+
 export function mergeModelProfiles(userProfiles?: ModelsConfig["profiles"]): Map<string, ModelProfileDefinition> {
 	const profiles = new Map<string, ModelProfileDefinition>();
 	for (const definition of BUILTIN_MODEL_PROFILES) {

package/src/config/model-resolver.ts

@@ -776,30 +776,33 @@ export async function resolveModelOverrideWithAuthFallback(
 	thinkingLevel?: ThinkingLevel;
 	explicitThinkingLevel: boolean;
 	authFallbackUsed: boolean;
+	requestedModel?: Model<Api>;
+	fallbackReason?: "auth_unavailable";
 }> {
 	const primary = resolveModelOverride(modelPatterns, modelRegistry, settings);
+	const unchanged = { ...primary, requestedModel: primary.model, authFallbackUsed: false };
 	if (!primary.model || !parentActiveModelPattern) {
-		return { ...primary, authFallbackUsed: false };
+		return unchanged;
 	}
 
 	const primaryKey = await modelRegistry.getApiKey(primary.model, sessionId);
 	if (primaryKey === kNoAuth || isAuthenticated(primaryKey)) {
-		return { ...primary, authFallbackUsed: false };
+		return unchanged;
 	}
 
 	const fallback = resolveModelOverride([parentActiveModelPattern], modelRegistry, settings);
 	if (!fallback.model) {
-		return { ...primary, authFallbackUsed: false };
+		return unchanged;
 	}
 	if (modelsAreEqual(fallback.model, primary.model)) {
-		return { ...primary, authFallbackUsed: false };
+		return unchanged;
 	}
 	const fallbackKey = await modelRegistry.getApiKey(fallback.model, sessionId);
 	if (!isAuthenticated(fallbackKey)) {
-		return { ...primary, authFallbackUsed: false };
+		return unchanged;
 	}
 
-	return { ...fallback, authFallbackUsed: true };
+	return { ...fallback, requestedModel: primary.model, authFallbackUsed: true, fallbackReason: "auth_unavailable" };
 }
 
 /**

package/src/config/models-config-schema.ts

@@ -36,6 +36,8 @@ export const OpenAICompatSchema = z.object({
 	allowsSyntheticReasoningContentForToolCalls: z.boolean().optional(),
 	requiresAssistantContentForToolCalls: z.boolean().optional(),
 	supportsToolChoice: z.boolean().optional(),
+	supportsForcedToolChoice: z.boolean().optional(),
+	toolChoiceSupport: z.enum(["none", "auto", "required", "named"]).optional(),
 	disableReasoningOnForcedToolChoice: z.boolean().optional(),
 	disableReasoningOnToolChoice: z.boolean().optional(),
 	thinkingFormat: z.enum(["openai", "openrouter", "zai", "qwen", "qwen-chat-template"]).optional(),

package/src/config/settings-schema.ts

@@ -1,7 +1,10 @@
-import { THINKING_EFFORTS } from "@gajae-code/ai/model-thinking";
+import type { Effort } from "@gajae-code/ai/model-thinking";
 import { TASK_SIMPLE_MODES } from "../task/simple-mode";
-import { getThinkingLevelMetadata } from "../thinking";
+import { getThinkingLevelMetadata } from "../thinking-metadata";
 import { EDIT_MODES } from "../utils/edit-mode";
+
+const THINKING_EFFORTS = ["minimal", "low", "medium", "high", "xhigh", "max"] as readonly Effort[];
+
 import {
 	DEFAULT_DISABLED_EXTENSIONS,
 	DEFAULT_SKILL_DISCOVERY_SETTINGS,
@@ -665,7 +668,7 @@ export const SETTINGS_SCHEMA = {
 	defaultThinkingLevel: {
 		type: "enum",
 		values: THINKING_EFFORTS,
-		default: "high",
+		default: THINKING_EFFORTS[3],
 		ui: {
 			tab: "model",
 			label: "Thinking Level",

package/src/coordinator/contract.ts

@@ -9,6 +9,7 @@ export const COORDINATOR_MCP_TOOL_NAMES = [
 	"gjc_coordinator_list_artifacts",
 	"gjc_coordinator_read_artifact",
 	"gjc_coordinator_read_coordination_status",
+	"gjc_coordinator_register_session",
 	"gjc_coordinator_start_session",
 	"gjc_coordinator_send_prompt",
 	"gjc_coordinator_submit_question_answer",