@gajae-code/coding-agent 0.18.0 → 0.18.5

package/dist/types/tools/eval-backends.d.ts

@@ -0,0 +1,37 @@
+import type { ToolSession } from ".";
+export interface EvalBackendsAllowance {
+    python: boolean;
+    js: boolean;
+}
+/**
+ * Parse the `GJC_PY` multi-value token into per-backend booleans.
+ *
+ * Tokens (case-insensitive):
+ * - `0` / `bash` → JavaScript only (`{ py: false, js: true }`)
+ * - `1` / `py`   → Python only (`{ py: true, js: false }`)
+ * - `js`         → JavaScript only (`{ py: false, js: true }`)
+ * - `mix` / `both` → both backends (`{ py: true, js: true }`)
+ *
+ * Returns `null` when `GJC_PY` is unset, empty, or holds an unrecognized
+ * token, so the caller can fall back to the legacy `PI_PY` / `PI_JS` flags or
+ * per-key settings. This matches the documented contract that invalid values
+ * are ignored.
+ */
+export declare function parseGjcPy(env: Record<string, string | undefined>): {
+    py: boolean;
+    js: boolean;
+} | null;
+/**
+ * Resolve eval-backend allowance from environment only. `GJC_PY` wins when set
+ * to a recognized token; otherwise the legacy `PI_PY` / `PI_JS` flags apply.
+ * Returns `null` when no env override is set so the caller can defer to settings.
+ */
+export declare function resolveEvalBackendsFromEnv(env: Record<string, string | undefined>): EvalBackendsAllowance | null;
+/** Read per-backend allowance from settings (defaults true). */
+export declare function readEvalBackendsAllowance(session: ToolSession): EvalBackendsAllowance;
+/**
+ * Materialize the active eval backend allowance. `GJC_PY` takes precedence
+ * over the legacy `PI_PY` / `PI_JS` env flags, which in turn override the
+ * per-key settings (defaults true). When no env override is set, settings win.
+ */
+export declare function resolveEvalBackends(session: ToolSession): EvalBackendsAllowance;

package/dist/types/tools/eval.d.ts

@@ -42,11 +42,7 @@ export type EvalToolResult = {
     details: EvalToolDetails | undefined;
 };
 export type EvalProxyExecutor = (params: EvalToolParams, signal?: AbortSignal) => Promise<EvalToolResult>;
-export interface EvalToolDescriptionOptions {
-    py?: boolean;
-    js?: boolean;
-}
-export declare function getEvalToolDescription(options?: EvalToolDescriptionOptions): string;
+export { type EvalToolDescriptionOptions, getEvalToolDescription } from "./session-descriptions";
 export interface EvalToolOptions {
     proxyExecutor?: EvalProxyExecutor;
 }
@@ -105,4 +101,3 @@ export declare const evalToolRenderer: {
     mergeCallAndResult: boolean;
     inline: boolean;
 };
-export {};

package/dist/types/tools/index.d.ts

@@ -405,42 +405,7 @@ export interface BuiltinCapabilityCatalogEntry {
 }
 export declare const BUILTIN_CAPABILITY_CATALOG: readonly BuiltinCapabilityCatalogEntry[];
 export type ToolName = keyof typeof BUILTIN_TOOLS;
-export interface EvalBackendsAllowance {
-    python: boolean;
-    js: boolean;
-}
-/**
- * Parse the `GJC_PY` multi-value token into per-backend booleans.
- *
- * Tokens (case-insensitive):
- * - `0` / `bash` → JavaScript only (`{ py: false, js: true }`)
- * - `1` / `py`   → Python only (`{ py: true, js: false }`)
- * - `js`         → JavaScript only (`{ py: false, js: true }`)
- * - `mix` / `both` → both backends (`{ py: true, js: true }`)
- *
- * Returns `null` when `GJC_PY` is unset, empty, or holds an unrecognized
- * token, so the caller can fall back to the legacy `PI_PY` / `PI_JS` flags or
- * per-key settings. This matches the documented contract that invalid values
- * are ignored.
- */
-export declare function parseGjcPy(env: Record<string, string | undefined>): {
-    py: boolean;
-    js: boolean;
-} | null;
-/**
- * Resolve eval-backend allowance from environment only. `GJC_PY` wins when set
- * to a recognized token; otherwise the legacy `PI_PY` / `PI_JS` flags apply.
- * Returns `null` when no env override is set so the caller can defer to settings.
- */
-export declare function resolveEvalBackendsFromEnv(env: Record<string, string | undefined>): EvalBackendsAllowance | null;
-/** Read per-backend allowance from settings (defaults true). */
-export declare function readEvalBackendsAllowance(session: ToolSession): EvalBackendsAllowance;
-/**
- * Materialize the active eval backend allowance. `GJC_PY` takes precedence
- * over the legacy `PI_PY` / `PI_JS` env flags, which in turn override the
- * per-key settings (defaults true). When no env override is set, settings win.
- */
-export declare function resolveEvalBackends(session: ToolSession): EvalBackendsAllowance;
+export { type EvalBackendsAllowance, parseGjcPy, readEvalBackendsAllowance, resolveEvalBackends, resolveEvalBackendsFromEnv, } from "./eval-backends";
 /**
  * Create tools from the descriptor registry.
  */

package/dist/types/tools/session-descriptions.d.ts

@@ -0,0 +1,22 @@
+import { type TaskToolSchemaInstance } from "../task/types";
+interface DescriptionSettings {
+    get(key: "task.maxConcurrency" | "task.isolation.mode" | "task.simple" | "task.disabledAgents" | "eval.py" | "eval.js" | "readLineNumbers" | "readHashLines" | "edit.mode"): unknown;
+    getEffectiveAutorouting(): {
+        active: boolean;
+    };
+}
+interface DescriptionSession {
+    settings: DescriptionSettings;
+    getSessionSpawns?: () => string | null;
+    hasEditTool?: boolean;
+}
+export interface EvalToolDescriptionOptions {
+    py?: boolean;
+    js?: boolean;
+}
+export declare function getEvalToolDescription(options?: EvalToolDescriptionOptions): string;
+export declare function evalToolDescriptionForSession(session: DescriptionSession | null | undefined): string;
+export declare function searchToolDescriptionForSession(session: DescriptionSession): string;
+export declare function renderTaskDescription(session: DescriptionSession): string;
+export declare function taskParametersForSession(session?: DescriptionSession): TaskToolSchemaInstance;
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@gajae-code/coding-agent",
-	"version": "0.18.0",
+	"version": "0.18.5",
 	"description": "Gajae Code CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://gajae-code.com",
 	"author": "Yeachan-Heo and Gajae Code Contributors",
@@ -57,12 +57,12 @@
 		"@agentclientprotocol/sdk": "1.3.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@gajae-code/stats": "0.18.0",
-		"@gajae-code/agent-core": "0.18.0",
-		"@gajae-code/ai": "0.18.0",
-		"@gajae-code/natives": "0.18.0",
-		"@gajae-code/tui": "0.18.0",
-		"@gajae-code/utils": "0.18.0",
+		"@gajae-code/stats": "0.18.5",
+		"@gajae-code/agent-core": "0.18.5",
+		"@gajae-code/ai": "0.18.5",
+		"@gajae-code/natives": "0.18.5",
+		"@gajae-code/tui": "0.18.5",
+		"@gajae-code/utils": "0.18.5",
 		"@puppeteer/browsers": "^2.13.0",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",

package/scripts/generate-sdk-operation-inventory.ts

@@ -203,6 +203,8 @@ const LOCKED_EXCLUSIONS: Readonly<Record<string, string>> = {
 	"agent_session:queueDeferredMessage": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:queueDeferredMessageForTests": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:getContextUsageObservabilityForTests": "test-only observability, not a user-facing control seam",
+	"agent_session:getAutoCompactionThresholdTokens":
+		"internal compaction-threshold accessor feeding the /context breakdown; exposed through context.get, not an independent SDK operation",
 	"agent_session:purgeQueuedCustomMessages": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:clearQueue": "internal accessor/plumbing, not a user-facing control seam",
 	"agent_session:popLastQueuedMessage": "internal accessor/plumbing, not a user-facing control seam",

package/src/cli/doctor/managed-link.ts

@@ -217,11 +217,11 @@ export async function describeManagedLink(
 	const parent = await fs.lstat(parentPath, { bigint: true }).catch(() => undefined);
 	const trustedReceipt =
 		!!body && ownedReceipt(receipt) && publicCandidates.some(candidate => candidate.path === body.source);
+	// The recorded st_dev is not compared: macOS APFS gives the same volume a new st_dev after a reboot,
+	// which made every pre-reboot receipt look foreign (#5990). The inode binds the link, and the volume
+	// is re-derived from the parent directory observed in the same snapshot.
 	const identityMatches =
-		!!body &&
-		!!link &&
-		body.identity.dev === link.stat.dev.toString() &&
-		body.identity.ino === link.stat.ino.toString();
+		!!body && !!link && body.identity.ino === link.stat.ino.toString() && link.stat.dev === link.parent.dev;
 	const owned = trustedReceipt && (link ? identityMatches : occupant === undefined);
 	const recordedCandidate = body && publicCandidates.find(candidate => candidate.path === body.source);
 	let status: ManagedLinkDescriptor["status"] = "unknown";

package/src/cli/doctor/repairs.ts

@@ -892,7 +892,15 @@ export async function executeSelectedDoctorRepair(
 				outcome =
 					result.kind === "restarted"
 						? { kind: result.kind, successorIncarnation: result.successor.incarnation }
-						: { kind: result.kind, ...("reason" in result ? { reason: result.reason } : {}) };
+						: {
+								kind: result.kind,
+								// A broker refusal carries the broker's own code (e.g. restart_busy).
+								...("reason" in result
+									? { reason: result.reason }
+									: "code" in result
+										? { reason: result.code }
+										: {}),
+							};
 			} else {
 				settings = await Settings.loadForScope({ cwd: context.cwd, agentDir: context.agentRoot.locator });
 				const result = await restartDaemonForDoctor({

package/src/cli/stats-cli.ts

@@ -70,41 +70,6 @@ export interface StatsCommandArgs {
 	summary: boolean;
 }
 
-// =============================================================================
-// Argument Parser
-// =============================================================================
-
-/**
- * Parse stats subcommand arguments.
- * Returns undefined if not a stats command.
- */
-export function parseStatsArgs(args: string[]): StatsCommandArgs | undefined {
-	if (args.length === 0 || args[0] !== "stats") {
-		return undefined;
-	}
-
-	const result: StatsCommandArgs = {
-		port: 3847,
-		json: false,
-		summary: false,
-	};
-
-	for (let i = 1; i < args.length; i++) {
-		const arg = args[i];
-		if (arg === "--json" || arg === "-j") {
-			result.json = true;
-		} else if (arg === "--summary" || arg === "-s") {
-			result.summary = true;
-		} else if ((arg === "--port" || arg === "-p") && i + 1 < args.length) {
-			result.port = parseInt(args[++i], 10);
-		} else if (arg.startsWith("--port=")) {
-			result.port = parseInt(arg.split("=")[1], 10);
-		}
-	}
-
-	return result;
-}
-
 function formatCost(n: number): string {
 	if (n < 0.01) return `$${n.toFixed(4)}`;
 	if (n < 1) return `$${n.toFixed(3)}`;
@@ -131,7 +96,10 @@ export async function runStatsCommand(cmd: StatsCommandArgs): Promise<void> {
 	const { processed, files } = await syncAllSessions({ onProgress: progress.onProgress });
 	progress.finish();
 	const total = await getTotalMessageCount();
-	console.log(`Synced ${processed} new entries from ${files} files (${total} total)\n`);
+	const synced = `Synced ${processed} new entries from ${files} files (${total} total)\n`;
+	// `--json` stdout must be exactly the JSON document so it can be piped into a parser.
+	if (cmd.json) process.stderr.write(`${synced}\n`);
+	else console.log(synced);
 
 	if (cmd.json) {
 		const stats = await getDashboardStats();

package/src/cli-main.ts

@@ -95,14 +95,10 @@ async function showHelp(config: CliConfig): Promise<void> {
 }
 
 async function installRuntimeGlobals(): Promise<void> {
-	const { installH2Fetch } = await import("@gajae-code/ai/utils/h2-fetch");
-	// Activate HTTP/2 for all `fetch()` calls (provider streams, OAuth, model
-	// discovery, web tools). Bun's HTTP/2 client is gated on a startup flag we
-	// can't toggle from JS, so we patch globalThis.fetch to pass
-	// `protocol: "http2"` per request, with transparent HTTP/1.1 fallback on
-	// `HTTP2Unsupported`. See @gajae-code/ai/utils/h2-fetch for details.
-	installH2Fetch();
-
+	// fetch() deliberately stays on HTTP/1.1. Bun's HTTP/2 client (per-request
+	// `protocol: "http2"`) wedges a pooled connection while uploading large
+	// request bodies (~300KB): every later request on it waits forever for
+	// response headers. Do not re-enable HTTP/2 without re-running that probe.
 	const { warnIfMacOSNoFileLimitTooLow } = await import("./cli/nofile-limit");
 	warnIfMacOSNoFileLimitTooLow();
 

package/src/cli.ts

@@ -37,14 +37,10 @@ export const commands: CommandEntry[] = [
 ];
 
 async function installRuntimeGlobals(writeNoFileWarning?: (text: string) => void): Promise<void> {
-	const { installH2Fetch } = await import("@gajae-code/ai/utils/h2-fetch");
-	// Activate HTTP/2 for all `fetch()` calls (provider streams, OAuth, model
-	// discovery, web tools). Bun's HTTP/2 client is gated on a startup flag we
-	// can't toggle from JS, so we patch globalThis.fetch to pass
-	// `protocol: "http2"` per request, with transparent HTTP/1.1 fallback on
-	// `HTTP2Unsupported`. See @gajae-code/ai/utils/h2-fetch for details.
-	installH2Fetch();
-
+	// fetch() deliberately stays on HTTP/1.1. Bun's HTTP/2 client (per-request
+	// `protocol: "http2"`) wedges a pooled connection while uploading large
+	// request bodies (~300KB): every later request on it waits forever for
+	// response headers. Do not re-enable HTTP/2 without re-running that probe.
 	const { warnIfMacOSNoFileLimitTooLow } = await import("./cli/nofile-limit");
 	warnIfMacOSNoFileLimitTooLow({ writeStderr: writeNoFileWarning });
 

package/src/commands/commit.ts

@@ -32,8 +32,8 @@ export default class Commit extends Command {
 		};
 
 		await initTheme();
-		// The agentic commit flow opens HTTP/2 keep-alive sockets to the model
-		// provider (via `installH2Fetch`) and spins up an AgentSession with
+		// The agentic commit flow opens keep-alive sockets to the model
+		// provider and spins up an AgentSession with
 		// background async-job + extension machinery. `session.dispose()` releases
 		// what it can, but Bun's fetch keeps idle connections warm and a few
 		// timers (Settings autosave, OAuth refresh) stay armed long enough to

package/src/commands/sdk.ts

@@ -642,8 +642,7 @@ export async function runSessionHost(
 			},
 			absent.result,
 		);
-
-		throw new Error("SDK startup did not complete before readiness cutoff.");
+		return;
 	}
 
 	const rollback = new SdkStartupRollbackTracker();

package/src/config/autorouting-tier-map.ts

@@ -45,8 +45,9 @@ export const TIER_MAP_VERSION = 1;
 
 export const CURATED_TIER_LABELS = {
 	"anthropic/claude-haiku-4-5": [{ tier: "fast", rank: 1 }],
-	"anthropic/claude-sonnet-5": [{ tier: "balanced", rank: 1 }],
-	"anthropic/claude-sonnet-4-6": [{ tier: "balanced", rank: 2 }],
+	"anthropic/claude-sonnet-5-5": [{ tier: "balanced", rank: 1 }],
+	"anthropic/claude-sonnet-5": [{ tier: "balanced", rank: 2 }],
+	"anthropic/claude-sonnet-4-6": [{ tier: "balanced", rank: 3 }],
 	"anthropic/claude-opus-5-5": [{ tier: "strong", effort: "high", rank: 1 }],
 	"anthropic/claude-opus-5": [{ tier: "strong", effort: "high", rank: 2 }],
 	"anthropic/claude-opus-4-8": [{ tier: "strong", effort: "high", rank: 3 }],
@@ -55,6 +56,7 @@ export const CURATED_TIER_LABELS = {
 		{ tier: "balanced", effort: "medium", rank: 1 },
 	],
 	"openai-codex/gpt-6-sol": [{ tier: "strong", effort: "high", rank: 1 }],
+	"openai-codex/gpt-6.1-sol": [{ tier: "strong", effort: "high", rank: 2 }],
 	"google/gemini-3.5-flash-lite": [{ tier: "fast", rank: 1 }],
 	"google/gemini-2.5-flash-lite": [{ tier: "fast", rank: 2 }],
 	"google/gemini-3.5-flash": [{ tier: "balanced", rank: 1 }],
@@ -75,6 +77,22 @@ export const CURATED_TIER_LABELS = {
 
 /** Generated from packages/ai/src/models.json at feature land: 3936 in-scope baseline skips. */
 export const TIER_MAP_SKIP_LIST = {
+	"amazon-bedrock/anthropic.claude-sonnet-5-5": { rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated" },
+	"amazon-bedrock/au.anthropic.claude-sonnet-5-5": {
+		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
+	},
+	"amazon-bedrock/eu.anthropic.claude-sonnet-5-5": {
+		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
+	},
+	"amazon-bedrock/global.anthropic.claude-sonnet-5-5": {
+		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
+	},
+	"amazon-bedrock/jp.anthropic.claude-sonnet-5-5": {
+		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
+	},
+	"amazon-bedrock/us.anthropic.claude-sonnet-5-5": {
+		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
+	},
 	"kiro/claude-opus-5-5": { rationale: "post-rebase catalog addition from dev; not yet curated" },
 	"kiro/claude-opus-5.5": { rationale: "post-rebase catalog addition from dev; not yet curated" },
 	"alibaba-token-plan/qwen3.8-flash": { rationale: "post-rebase catalog addition from dev; not yet curated" },

package/src/config/model-preset-registry.ts

@@ -652,6 +652,9 @@ function assertRegistryIdentityPolicy(value: unknown): void {
 }
 
 function assertCanonicalUnicode(value: string): void {
+	// Native well-formedness check first; the scan below only runs to name the
+	// offending surrogate when the string is malformed.
+	if (value.isWellFormed()) return;
 	for (let index = 0; index < value.length; index++) {
 		const code = value.charCodeAt(index);
 		if (code >= 0xd800 && code <= 0xdbff) {
@@ -665,6 +668,18 @@ function assertCanonicalUnicode(value: string): void {
 	}
 }
 
+/** Characters JSON.stringify escapes in strings (lone surrogates are rejected earlier). */
+const JSON_STRING_ESCAPES = /["\\\u0000-\u001f]/;
+
+/**
+ * Quote a string exactly as JSON.stringify does. Registry documents are almost
+ * entirely plain ASCII identifiers, so skipping the per-call JSON.stringify for
+ * strings with nothing to escape removes most of the serializer's cost.
+ */
+function quoteCanonicalString(value: string): string {
+	return JSON_STRING_ESCAPES.test(value) ? JSON.stringify(value) : `"${value}"`;
+}
+
 function serializeCanonicalJson(value: unknown, stack: Set<object>): string {
 	if (value === null) return "null";
 	if (typeof value === "boolean") return value ? "true" : "false";
@@ -674,7 +689,7 @@ function serializeCanonicalJson(value: unknown, stack: Set<object>): string {
 	}
 	if (typeof value === "string") {
 		assertCanonicalUnicode(value);
-		return JSON.stringify(value);
+		return quoteCanonicalString(value);
 	}
 	if (typeof value !== "object") throw new TypeError(`Canonical JSON rejects ${typeof value}.`);
 	if (stack.has(value)) throw new TypeError("Canonical JSON rejects cycles.");
@@ -694,7 +709,7 @@ function serializeCanonicalJson(value: unknown, stack: Set<object>): string {
 		const entries: string[] = [];
 		for (const key of Object.keys(record).sort()) {
 			assertCanonicalUnicode(key);
-			entries.push(`${JSON.stringify(key)}:${serializeCanonicalJson(record[key], stack)}`);
+			entries.push(`${quoteCanonicalString(key)}:${serializeCanonicalJson(record[key], stack)}`);
 		}
 		return `{${entries.join(",")}}`;
 	} finally {

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

@@ -17,6 +17,7 @@ import {
 export { resolveModelProfileName } from "./model-profile-contract";
 
 import {
+	createRegistrySelectorIndex,
 	GJC_MODEL_ASSIGNMENT_TARGETS,
 	type GjcModelAssignmentTargetId,
 	isAuthenticated,
@@ -675,6 +676,7 @@ export async function resolveMissingSessionModelRecovery(options: {
 		options.skips.every(skip => skip.reason === "unknown_model");
 	if (!allSelectorsUnknown) return undefined;
 	const fullCatalog = options.modelRegistry.getAll();
+	const catalogIndex = createRegistrySelectorIndex(fullCatalog);
 	const savedSelectorsMissingFromCatalog = resolveConfiguredModelPatterns(
 		options.defaultEntries,
 		options.settings,
@@ -688,7 +690,7 @@ export async function resolveMissingSessionModelRecovery(options: {
 			}).model
 		)
 			return false;
-		return !registrySelectorResolvesToModel(selector, fullCatalog);
+		return !registrySelectorResolvesToModel(selector, catalogIndex);
 	});
 	const savedConcreteDefault = options.savedDefault ? parseModelString(options.savedDefault) : undefined;
 	const savedConcreteDefaultMissingFromCatalog =

package/src/config/model-profiles.ts

@@ -93,6 +93,13 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 		critic: "openai-codex/gpt-6-sol:max",
 		architect: "openai-codex/gpt-6-sol:xhigh",
 	}),
+	profile("codex-sol61", ["openai-codex"], {
+		default: "openai-codex/gpt-6.1-sol:medium",
+		executor: "openai-codex/gpt-6.1-sol:medium",
+		planner: "openai-codex/gpt-6.1-sol:high",
+		critic: "openai-codex/gpt-6.1-sol:xhigh",
+		architect: "openai-codex/gpt-6-astra:xhigh",
+	}),
 	profile("lunamaxxing", ["openai-codex"], {
 		default: "openai-codex/gpt-6-luna:medium",
 		executor: "openai-codex/gpt-6-luna:xhigh",
@@ -256,14 +263,14 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 	}),
 	profile("claude-opus", ["anthropic"], {
 		default: ["anthropic/claude-opus-5-5:medium", "anthropic/claude-opus-4-6:xhigh"],
-		executor: "anthropic/claude-sonnet-5",
+		executor: "anthropic/claude-sonnet-5-5",
 		planner: ["anthropic/claude-opus-5-5:medium", "anthropic/claude-opus-4-6:low"],
 		critic: ["anthropic/claude-opus-5-5:high", "anthropic/claude-opus-4-6:high"],
 		architect: ["anthropic/claude-opus-5-5:high", "anthropic/claude-opus-4-6:xhigh"],
 	}),
 	profile("claude-fable", ["anthropic"], {
 		default: "anthropic/claude-fable-5-1:xhigh",
-		executor: "anthropic/claude-sonnet-5",
+		executor: "anthropic/claude-sonnet-5-5",
 		planner: "anthropic/claude-fable-5-1:low",
 		critic: "anthropic/claude-fable-5-1:high",
 		architect: "anthropic/claude-fable-5-1:xhigh",
@@ -491,7 +498,7 @@ export const BUILTIN_MODEL_PROFILES: readonly ModelProfileDefinition[] = [
 	profile("opus-codex", ["anthropic", "openai-codex"], {
 		default: "anthropic/claude-opus-5-5:medium",
 		executor: "openai-codex/gpt-5.6-terra:low",
-		planner: "anthropic/claude-sonnet-5",
+		planner: "anthropic/claude-sonnet-5-5",
 		critic: "openai-codex/gpt-6-sol:xhigh",
 		architect: "openai-codex/gpt-6-sol:high",
 	}),
@@ -555,6 +562,7 @@ 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" },
+	"codex-sol61": { displayName: "Codex Sol 6.1", providerGroup: "CODEX" },
 	lunamaxxing: { displayName: "LunaMaxxing", providerGroup: "CODEX" },
 	"astra-lite": { displayName: "ASTRA-Lite", providerGroup: "CODEX" },
 	"astra-default": { displayName: "ASTRA-Default", providerGroup: "CODEX" },

package/src/config/model-registry.ts

@@ -782,26 +782,53 @@ function registryModelMetadataWithoutApiSpecificFields(model: Model<Api>): Parti
 	return metadata;
 }
 
-export function registrySelectorResolvesToModel(selector: string, models: readonly Model<Api>[]): boolean {
+/**
+ * Lowercased lookup keys for a model catalog, so selector resolution is a set
+ * lookup instead of a scan that re-lowercases every model id per selector.
+ */
+export interface RegistrySelectorIndex {
+	/** `id` and `provider/id`. */
+	exact: ReadonlySet<string>;
+	/** `id` alone. */
+	ids: ReadonlySet<string>;
+	/** Model ids per provider, for parsed `provider/id` selectors (nested, so no delimiter can collide). */
+	providerIds: ReadonlyMap<string, ReadonlySet<string>>;
+	/** Every `/`-delimited suffix of each id (`a/b/c` → `b/c`, `c`). */
+	idSuffixes: ReadonlySet<string>;
+}
+
+export function createRegistrySelectorIndex(models: readonly Model<Api>[]): RegistrySelectorIndex {
+	const exact = new Set<string>();
+	const ids = new Set<string>();
+	const providerIds = new Map<string, Set<string>>();
+	const idSuffixes = new Set<string>();
+	for (const model of models) {
+		const id = model.id.toLowerCase();
+		const provider = model.provider.toLowerCase();
+		ids.add(id);
+		exact.add(id);
+		exact.add(`${provider}/${id}`);
+		let providerModelIds = providerIds.get(provider);
+		if (!providerModelIds) {
+			providerModelIds = new Set<string>();
+			providerIds.set(provider, providerModelIds);
+		}
+		providerModelIds.add(id);
+		for (let slash = id.indexOf("/"); slash !== -1; slash = id.indexOf("/", slash + 1)) {
+			idSuffixes.add(id.slice(slash + 1));
+		}
+	}
+	return { exact, ids, providerIds, idSuffixes };
+}
+
+export function registrySelectorResolvesToModel(selector: string, index: RegistrySelectorIndex): boolean {
 	const normalizedSelector = selector.trim().toLowerCase();
-	if (
-		models.some(
-			model =>
-				model.id.toLowerCase() === normalizedSelector ||
-				`${model.provider}/${model.id}`.toLowerCase() === normalizedSelector,
-		)
-	)
-		return true;
+	if (index.exact.has(normalizedSelector)) return true;
 	const suffix = splitSelectorThinkingSuffix(normalizedSelector);
 	const baseSelector = suffix.thinkingLevel === undefined ? normalizedSelector : suffix.selector;
 	const parsed = parseModelString(baseSelector);
-	if (parsed)
-		return models.some(
-			model => model.provider.toLowerCase() === parsed.provider && model.id.toLowerCase() === parsed.id,
-		);
-	return models.some(
-		model => model.id.toLowerCase() === baseSelector || model.id.toLowerCase().endsWith(`/${baseSelector}`),
-	);
+	if (parsed) return index.providerIds.get(parsed.provider)?.has(parsed.id) ?? false;
+	return index.ids.has(baseSelector) || index.idSuffixes.has(baseSelector);
 }
 
 function filterMaterializedRegistryProfiles(
@@ -810,6 +837,7 @@ function filterMaterializedRegistryProfiles(
 	dynamicProviders: ReadonlySet<string>,
 ): Map<string, ModelProfileDefinition> {
 	const filtered = new Map<string, ModelProfileDefinition>();
+	const index = createRegistrySelectorIndex(models);
 	for (const [name, profile] of profiles) {
 		if (
 			profile.source === "registry" &&
@@ -818,7 +846,7 @@ function filterMaterializedRegistryProfiles(
 				return (
 					selectors.length > 0 &&
 					!selectors.some(selector => {
-						if (registrySelectorResolvesToModel(selector, models)) return true;
+						if (registrySelectorResolvesToModel(selector, index)) return true;
 						const suffix = splitSelectorThinkingSuffix(selector);
 						const parsed = parseModelString(suffix.thinkingLevel ? suffix.selector : selector);
 						return parsed !== undefined && dynamicProviders.has(parsed.provider);

package/src/config/settings-schema.ts

@@ -2050,9 +2050,15 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "context",
 			label: "Compaction Threshold",
-			description: "Percent threshold for context maintenance; set to Default to use legacy reserve-based behavior",
+			description:
+				"Percent threshold for context maintenance; the 300,000-token default cap applies only with adaptive mode disabled (except during context promotion)",
 			options: [
-				{ value: "default", label: "Default", description: "Legacy reserve-based threshold" },
+				{
+					value: "default",
+					label: "Default",
+					description:
+						"300,000-token default cap applies only with adaptive mode disabled (except during context promotion)",
+				},
 				{ value: "10", label: "10%", description: "Extremely early maintenance" },
 				{ value: "20", label: "20%", description: "Very early maintenance" },
 				{ value: "30", label: "30%", description: "Early maintenance" },