@gajae-code/coding-agent 0.13.3 → 0.14.0

package/src/config/model-registry.ts

@@ -26,12 +26,14 @@ import {
 	PROVIDER_DESCRIPTORS,
 	readModelCache,
 	registerCustomApi,
+	resolveOAuthStorageProvider,
 	type SimpleStreamOptions,
 	type ThinkingConfig,
 	UNK_CONTEXT_WINDOW,
 	UNK_MAX_TOKENS,
 	unregisterCustomApis,
 } from "@gajae-code/ai/core";
+import { resolveLoopbackOpenAIBaseUrl } from "@gajae-code/ai/utils/discovery/openai-compatible";
 
 // Sentinel for local-only OAuth token (LM Studio, vLLM) — declared inline to avoid loading
 // any provider module at startup. Must match `DEFAULT_LOCAL_TOKEN` in oauth/lm-studio.ts.
@@ -94,6 +96,14 @@ export type { CanonicalModelIndex, CanonicalModelRecord, CanonicalModelVariant,
 export { isAuthenticated, kNoAuth };
 
 const MAX_SESSION_CANONICAL_VARIANTS = 64;
+function firstPositiveDiscoveryNumber(...values: readonly unknown[]): number | undefined {
+	for (const value of values) {
+		const number =
+			typeof value === "number" ? value : typeof value === "string" && value.trim() ? Number(value) : NaN;
+		if (Number.isFinite(number) && number > 0) return number;
+	}
+	return undefined;
+}
 function redactDiscoveryUrl(value: string | URL): string {
 	try {
 		const url = typeof value === "string" ? new URL(value) : value;
@@ -180,7 +190,9 @@ export function requiresExplicitThinkingChoice(model: Model, role: GjcModelAssig
 		(model.provider === "xai" && (model.id === "grok-4.5" || model.id === "grok-4.6"))
 	)
 		return true;
-	return role !== null && GJC_MODEL_ASSIGNMENT_TARGETS[role].settingsPath === "task.agentModelOverrides";
+	if (role === null) return false;
+	if (role === "default") return true;
+	return GJC_MODEL_ASSIGNMENT_TARGETS[role].settingsPath === "task.agentModelOverrides";
 }
 
 /** Alias for ModelRoleInfo - used for both built-in and custom roles */
@@ -594,7 +606,8 @@ function getProviderBaseUrlEnvKeys(provider: string): string[] {
  * never the project `.env`.
  */
 function resolveProviderBaseUrlFromEnv(provider: string): string | undefined {
-	return $pickCredentialEnv(...getProviderBaseUrlEnvKeys(provider));
+	const baseUrl = $pickCredentialEnv(...getProviderBaseUrlEnvKeys(provider));
+	return provider === "omlx" && baseUrl ? resolveLoopbackOpenAIBaseUrl(baseUrl, "http://127.0.0.1:8080/v1") : baseUrl;
 }
 
 function normalizeLocalOpenAICompatBaseUrl(baseUrl: string): string {
@@ -790,10 +803,8 @@ function extractGoogleOAuthToken(value: string | undefined): string | undefined
 }
 
 function getOAuthCredentialsForProvider(authStorage: AuthStorage, provider: string): OAuthCredential[] {
-	const providerEntry = authStorage.getAll()[provider];
-	if (!providerEntry) {
-		return [];
-	}
+	const providerEntry = authStorage.getAll()[resolveOAuthStorageProvider(provider)];
+	if (!providerEntry) return [];
 	const entries = Array.isArray(providerEntry) ? providerEntry : [providerEntry];
 	return entries.filter((entry): entry is OAuthCredential => entry.type === "oauth");
 }
@@ -1257,7 +1268,15 @@ export class ModelRegistry {
 	#configuredDiscoveryProviderIds: ReadonlySet<string> = new Set();
 	#descriptorDiscoveryEvidence = new Map<
 		string,
-		{ fresh: boolean; modelIds: ReadonlySet<string>; authGeneration: string; endpoint: string }
+		{
+			fresh: boolean;
+			modelIds: ReadonlySet<string>;
+			profileModelIds?: ReadonlySet<string>;
+			profileFresh?: boolean;
+			profileEndpoint?: string;
+			authGeneration: string;
+			endpoint: string;
+		}
 	>();
 	#descriptorDiscoveryGenerations = new Map<string, number>();
 	#configuredDiscoveryEvidence = new Map<
@@ -1677,7 +1696,9 @@ export class ModelRegistry {
 
 	#normalizeDiscoverableModels(providerConfig: DiscoveryProviderConfig, models: Model<Api>[]): Model<Api>[] {
 		const liveBaseUrl =
-			providerConfig.discovery.type === "openai-models-list" || providerConfig.discovery.type === "lm-studio"
+			providerConfig.discovery.type === "openai-models-list" ||
+			providerConfig.discovery.type === "lm-studio" ||
+			providerConfig.discovery.type === "omlx"
 				? this.#normalizeOpenAIModelsListBaseUrl(
 						this.#getProviderBaseUrlForDiscovery(providerConfig.provider) ?? providerConfig.baseUrl,
 					)
@@ -1701,7 +1722,9 @@ export class ModelRegistry {
 		});
 	}
 	#sanitizeDiscoverableModelsForCache(providerConfig: DiscoveryProviderConfig, models: Model<Api>[]): Model<Api>[] {
-		return providerConfig.discovery.type === "openai-models-list" || providerConfig.discovery.type === "lm-studio"
+		return providerConfig.discovery.type === "openai-models-list" ||
+			providerConfig.discovery.type === "lm-studio" ||
+			providerConfig.discovery.type === "omlx"
 			? this.#stripModelBaseUrlQueries(models)
 			: models;
 	}
@@ -1754,6 +1777,18 @@ export class ModelRegistry {
 			this.#optionalAuthProviders.add("lm-studio");
 			this.#keylessProviders.add("lm-studio");
 		}
+		if (!configuredProviders.has("omlx") && !disabledProviders.has("omlx")) {
+			this.#discoveryManager.addProvider({
+				provider: "omlx",
+				api: "openai-completions",
+				baseUrl: resolveLoopbackOpenAIBaseUrl(Bun.env.OMLX_BASE_URL, "http://127.0.0.1:8080/v1"),
+				discovery: { type: "omlx" },
+				optional: true,
+			});
+			// Implicit oMLX auth is optional and may be added after startup.
+			this.#optionalAuthProviders.add("omlx");
+			this.#keylessProviders.add("omlx");
+		}
 	}
 
 	#loadCustomModels(): CustomModelsResult {
@@ -2445,6 +2480,7 @@ export class ModelRegistry {
 			case "llama.cpp":
 				return this.#discoverLlamaCppModels(providerConfig, apiKey);
 			case "lm-studio":
+			case "omlx":
 			case "openai-models-list":
 				return this.#discoverOpenAIModelsList(providerConfig, apiKey);
 			case "models-dev":
@@ -2606,12 +2642,13 @@ export class ModelRegistry {
 			const manager = createModelManager({
 				...options,
 				cacheDbPath: this.#cacheDbPath,
+				cacheDynamicModelProvenance: Bun.hash(`${authGeneration}\u0000${endpoint}`).toString(36),
 				canPublishCache: isCurrentDiscovery,
 				...(options.fetchDynamicModels
 					? {
 							fetchDynamicModels: async () => {
 								const models = await options.fetchDynamicModels?.();
-								if (models === null) return null;
+								if (models === null || models === undefined) return null;
 								const sanitizedModels = this.#stripModelBaseUrlQueries(models ?? []);
 								if (canUseCredentialDerivedXiaomiEndpoint) {
 									credentialDerivedEndpoint = sanitizedModels[0]?.baseUrl;
@@ -2645,9 +2682,15 @@ export class ModelRegistry {
 					...(baseUrl !== model.baseUrl ? { baseUrl } : {}),
 				};
 			});
+			const preservesExistingDescriptorEvidence =
+				(result.dynamicModelIds === undefined && !result.fetched && !result.stale) ||
+				(result.stale && result.cacheFresh && result.cacheAuthoritative && evidence?.fresh === true) ||
+				(strategy === "offline" && result.dynamicModelIds === undefined);
 			if (
 				isCurrentDiscovery() &&
+				!preservesExistingDescriptorEvidence &&
 				(result.fetched ||
+					result.dynamicModelIds !== undefined ||
 					result.stale ||
 					this.#descriptorDiscoveryEvidence.get(options.providerId)?.authGeneration !== authGeneration ||
 					this.#descriptorDiscoveryEvidence.get(options.providerId)?.endpoint !== endpoint)
@@ -2655,6 +2698,13 @@ export class ModelRegistry {
 				this.#descriptorDiscoveryEvidence.set(options.providerId, {
 					fresh: result.fetched,
 					modelIds: new Set(models.map(model => model.id)),
+					...(result.dynamicModelIds === undefined
+						? {}
+						: {
+								profileModelIds: new Set(result.dynamicModelIds),
+								profileFresh: !result.stale,
+								profileEndpoint: endpoint,
+							}),
 					authGeneration,
 					endpoint: this.#normalizeDiscoveryEvidenceEndpoint(models[0]?.baseUrl ?? endpoint),
 				});
@@ -2974,20 +3024,21 @@ export class ModelRegistry {
 			}
 			throw new Error(`HTTP ${response.status} from ${redactDiscoveryUrl(modelsUrl)}`);
 		}
-		const payload = (await response.json()) as {
-			data?: Array<{ id: string; name?: string; context_length?: number }>;
-		};
-		const models = payload.data ?? [];
+		const payload: unknown = await response.json();
+		if (!isRecord(payload) || !Array.isArray(payload.data)) {
+			throw new Error(`Malformed OpenAI models-list response from ${redactDiscoveryUrl(modelsUrl)}`);
+		}
+		const models = payload.data;
 		const discovered: Model<Api>[] = [];
 		for (const item of models) {
+			if (!isRecord(item) || typeof item.id !== "string" || !item.id.trim()) continue;
 			const id = item.id;
-			if (!id) continue;
 			const referenceModel = resolveCustomModelReference(id);
 			const api = this.#resolveDiscoveredModelApi(providerConfig, id);
 			discovered.push(
 				enrichModelThinking({
 					id,
-					name: item.name ?? referenceModel?.name ?? id,
+					name: typeof item.name === "string" ? item.name : (referenceModel?.name ?? id),
 					api,
 					provider: providerConfig.provider,
 					baseUrl: requestBaseUrl,
@@ -2996,8 +3047,23 @@ export class ModelRegistry {
 					input: referenceModel?.input ?? ["text"],
 					output: referenceModel?.output,
 					cost: referenceModel?.cost ?? { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-					contextWindow: item.context_length ?? referenceModel?.contextWindow ?? UNK_CONTEXT_WINDOW,
-					maxTokens: referenceModel?.maxTokens ?? UNK_MAX_TOKENS,
+					contextWindow:
+						firstPositiveDiscoveryNumber(
+							item.max_model_len,
+							item.context_length,
+							item.context_window,
+							item.max_context_length,
+							referenceModel?.contextWindow,
+							UNK_CONTEXT_WINDOW,
+						) ?? UNK_CONTEXT_WINDOW,
+					maxTokens:
+						firstPositiveDiscoveryNumber(
+							item.max_completion_tokens,
+							item.max_tokens,
+							item.max_output_tokens,
+							referenceModel?.maxTokens,
+							UNK_MAX_TOKENS,
+						) ?? UNK_MAX_TOKENS,
 					headers: providerConfig.headers,
 					compat: {
 						...referenceModel?.compat,
@@ -3707,6 +3773,39 @@ export class ModelRegistry {
 		this.#availableModelsEnvFingerprint = envFingerprint;
 		return this.#availableModelsCache;
 	}
+
+	/**
+	 * Get authenticated models, excluding bundled entries that a fresh provider
+	 * catalog has positively shown to be unavailable. Bundled entries remain
+	 * usable until live catalog evidence exists so offline startup is unchanged.
+	 */
+	getAvailableForProfileActivation(): Model<Api>[] {
+		return this.getAvailable().filter(model => {
+			const evidence = this.#descriptorDiscoveryEvidence.get(model.provider);
+			if (!evidence?.profileFresh || evidence.profileModelIds === undefined) return true;
+			if (this.#hasCustomModelOverlay(model.provider, model.id)) return true;
+			const bundledModelIds = new Set(
+				(getBundledModels(model.provider as Parameters<typeof getBundledModels>[0]) as Model<Api>[]).map(
+					candidate => candidate.id,
+				),
+			);
+			if (!bundledModelIds.has(model.id)) return true;
+			if (
+				evidence.authGeneration !== this.#getProviderEvidenceGeneration(model.provider) ||
+				evidence.profileEndpoint !==
+					this.#normalizeDiscoveryEvidenceEndpoint(this.#getProviderBaseUrlForDiscovery(model.provider) ?? "")
+			)
+				return true;
+			return evidence.profileModelIds.has(model.id);
+		});
+	}
+
+	#hasCustomModelOverlay(provider: string, id: string): boolean {
+		return [...this.#customModelOverlays, ...this.#runtimeModelOverlays].some(
+			overlay => overlay.provider === provider && overlay.id === id,
+		);
+	}
+
 	#hasFreshOrStaticModelEvidence(model: Model<Api>): boolean {
 		const evidence = this.#providerActivity.get(model.provider);
 		if (
@@ -3767,7 +3866,9 @@ export class ModelRegistry {
 					this.#normalizeDiscoveryEvidenceEndpoint(
 						discoveryType === "ollama"
 							? `${this.#normalizeOllamaBaseUrl(baseUrl)}/v1`
-							: discoveryType === "openai-models-list" || discoveryType === "lm-studio"
+							: discoveryType === "openai-models-list" ||
+									discoveryType === "lm-studio" ||
+									discoveryType === "omlx"
 								? this.#normalizeOpenAIModelsListBaseUrl(baseUrl)
 								: (baseUrl ?? ""),
 					);
@@ -3890,13 +3991,18 @@ export class ModelRegistry {
 	async getApiKey(
 		model: Model<Api>,
 		sessionId?: string,
-		options: { credentialSelector?: AuthCredentialSelector; signal?: AbortSignal } = {},
+		options: {
+			credentialSelector?: AuthCredentialSelector;
+			preferredCredentialSelector?: AuthCredentialSelector;
+			signal?: AbortSignal;
+		} = {},
 	): Promise<string | undefined> {
 		return this.#getApiKeyOrNoAuth(model.provider, () =>
 			this.authStorage.getApiKey(model.provider, sessionId, {
 				baseUrl: model.baseUrl,
 				modelId: model.id,
 				credentialSelector: options.credentialSelector,
+				preferredCredentialSelector: options.preferredCredentialSelector,
 				signal: options.signal,
 			}),
 		);
@@ -3909,12 +4015,17 @@ export class ModelRegistry {
 		provider: string,
 		sessionId?: string,
 		baseUrl?: string,
-		options: { credentialSelector?: AuthCredentialSelector; signal?: AbortSignal } = {},
+		options: {
+			credentialSelector?: AuthCredentialSelector;
+			preferredCredentialSelector?: AuthCredentialSelector;
+			signal?: AbortSignal;
+		} = {},
 	): Promise<string | undefined> {
 		return this.#getApiKeyOrNoAuth(provider, () =>
 			this.authStorage.getApiKey(provider, sessionId, {
 				baseUrl,
 				credentialSelector: options.credentialSelector,
+				preferredCredentialSelector: options.preferredCredentialSelector,
 				signal: options.signal,
 			}),
 		);

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

@@ -198,7 +198,7 @@ export const ModelOverrideSchema = z
 export type ModelOverride = z.infer<typeof ModelOverrideSchema>;
 
 export const ProviderDiscoverySchema = z.object({
-	type: z.enum(["ollama", "llama.cpp", "lm-studio", "openai-models-list", "models-dev"]),
+	type: z.enum(["ollama", "llama.cpp", "lm-studio", "omlx", "openai-models-list", "models-dev"]),
 	apiByModelPrefix: z.record(z.string().min(1), z.enum(["openai-completions", "anthropic-messages"])).optional(),
 	modelsDevProvider: z.string().min(1).optional(),
 });

package/src/config/settings-schema.ts

@@ -181,7 +181,10 @@ interface ArrayDef<T> {
 	ui?: UiBase;
 }
 
-type RecordValueDef = { type: "model-selector-value" } | { type: "string-enum"; values: readonly string[] };
+type RecordValueDef =
+	| { type: "model-selector-value" }
+	| { type: "string-enum"; values: readonly string[] }
+	| { type: "credential-selector" };
 
 interface RecordDef<T> {
 	type: "record";
@@ -270,6 +273,22 @@ export const SETTINGS_SCHEMA = {
 	// per-machine overrides remain trivial.
 	"auth.broker.url": { type: "string", default: undefined },
 	"auth.broker.token": { type: "string", default: undefined },
+	"auth.credentialRankingMode": {
+		type: "enum",
+		values: ["balanced", "earliest-reset"] as const,
+		default: "balanced",
+		ui: {
+			tab: "providers",
+			label: "Credential Ranking",
+			description: "Choose balanced distribution or earliest-reset-first OAuth account selection.",
+		},
+	},
+	"auth.credentialPins": {
+		type: "record",
+		default: {} as Record<string, string>,
+		valueSchema: { type: "credential-selector" } as const,
+	},
+	"auth.credentialPinStoreIdentity": { type: "string", default: undefined },
 	"session.directoryMigration": {
 		type: "enum",
 		values: ["copy-retain", "disabled"] as const,
@@ -293,6 +312,12 @@ export const SETTINGS_SCHEMA = {
 		description: "SDK-owned prompt deadline; ACP has no separate timeout.",
 		validate: (value: number) => Number.isSafeInteger(value) && value >= 60_000 && value <= 86_400_000,
 	},
+	"sdk.promptMaxRuntimeMs": {
+		type: "number",
+		default: 21_600_000,
+		description: "Hard maximum runtime for an SDK prompt from acceptance, bounding progress-aware renewals.",
+		validate: (value: number) => Number.isSafeInteger(value) && value >= 60_000 && value <= 86_400_000,
+	},
 
 	// Notifications (shared daemon with Telegram/Discord/Slack presentation adapters)
 	"notifications.enabled": { type: "boolean", default: false },
@@ -416,7 +441,7 @@ export const SETTINGS_SCHEMA = {
 			tab: "interaction",
 			label: "Terminal Bell",
 			description:
-				"Emit a BEL character for local terminal notifications. Windows Terminal may keep BEL silent depending on profile/system sound settings; use completion.notifyCommand for a PowerShell Console.Beep workaround.",
+				"Emit a BEL character for local terminal notifications. macOS enables this by default unless explicitly disabled. Windows Terminal may keep BEL silent depending on profile/system sound settings; use completion.notifyCommand for a PowerShell Console.Beep workaround.",
 		},
 	},
 	"notifications.bellOnComplete": {
@@ -606,6 +631,11 @@ export const SETTINGS_SCHEMA = {
 		default: 1,
 		validate: (value: number) => Number.isInteger(value) && value >= 1 && value <= 10,
 	},
+	"gjc.ultragoal.nudgeBudget": {
+		type: "number",
+		default: 10,
+		validate: (value: number) => Number.isInteger(value) && value >= 0,
+	},
 
 	// ────────────────────────────────────────────────────────────────────────
 	// Appearance
@@ -1571,6 +1601,17 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"crashReport.nudge": {
+		type: "boolean",
+		default: true,
+		ui: {
+			tab: "interaction",
+			label: "Crash Report Nudge",
+			description:
+				"At interactive startup, show one rate-limited line when unreported crash signatures exist. Reads local state only; nothing is ever transmitted without the explicit consent flow in `gjc crash report`.",
+		},
+	},
+
 	collapseChangelog: {
 		type: "boolean",
 		default: false,
@@ -3304,7 +3345,8 @@ export const SETTINGS_SCHEMA = {
 		ui: {
 			tab: "tasks",
 			label: "Prefer Task Delegation",
-			description: "Encourage the agent to delegate work to subagents unless changes are trivial",
+			description:
+				"Encourage the agent to delegate work to subagents unless changes are trivial (on by default when executor/planner run on a different provider than the default role)",
 		},
 	},
 
@@ -3479,9 +3521,29 @@ export const SETTINGS_SCHEMA = {
 
 	"skills.enableClaudeProject": { type: "boolean", default: DEFAULT_SKILL_DISCOVERY_SETTINGS.enableClaudeProject },
 
-	"skills.enablePiUser": { type: "boolean", default: DEFAULT_SKILL_DISCOVERY_SETTINGS.enablePiUser },
+	"skills.trustProjectSkills": {
+		type: "boolean",
+		ui: {
+			tab: "customization",
+			label: "Trust Project Skills",
+			description:
+				"Load skills from project .gjc/skills, .claude/skills, and .codex/skills. Set to false to ignore project-controlled skills while keeping user skills.",
+		},
+	},
+
+	"skills.trustUserSkills": {
+		type: "boolean",
+		ui: {
+			tab: "customization",
+			label: "Trust User Skills",
+			description:
+				"Load skills from ~/.gjc/agent/skills (and legacy ~/.gjc/skills / <config>/skills). Set to false to ignore user-installed skills while keeping project skills.",
+		},
+	},
+
+	"skills.enablePiUser": { type: "boolean", ui: { tab: "customization", label: "Trust User Skills (legacy)" } },
 
-	"skills.enablePiProject": { type: "boolean", default: DEFAULT_SKILL_DISCOVERY_SETTINGS.enablePiProject },
+	"skills.enablePiProject": { type: "boolean", ui: { tab: "customization", label: "Trust Project Skills (legacy)" } },
 
 	"skills.customDirectories": { type: "array", default: DEFAULT_SKILL_DISCOVERY_SETTINGS.customDirectories },
 
@@ -3810,7 +3872,7 @@ export function getEnumValues(path: SettingPath): readonly string[] | undefined
 	return "values" in def ? (def.values as readonly string[]) : undefined;
 }
 
-export const CONFIG_SCHEMA_VERSION = 1;
+export { CONFIG_SCHEMA_VERSION } from "./config-schema-version";
 
 export type SettingsSchemaIssue = {
 	path: string;
@@ -3866,6 +3928,14 @@ function validRecordValue(valueSchema: RecordValueDef, value: unknown): boolean
 	if (valueSchema.type === "model-selector-value") {
 		return typeof value === "string" || (Array.isArray(value) && value.every(item => typeof item === "string"));
 	}
+	if (valueSchema.type === "credential-selector") {
+		return (
+			typeof value === "string" &&
+			((value.startsWith("id:") && /^[1-9]\d*$/.test(value.slice(3))) ||
+				/^email:[^@\s]+@[^@\s]+$/.test(value) ||
+				/^account:\S+$/.test(value))
+		);
+	}
 	return typeof value === "string" && valueSchema.values.includes(value);
 }