@gajae-code/coding-agent 0.18.11 → 0.19.0

package/src/config/model-resolver.ts

@@ -97,7 +97,7 @@ export async function refreshMissingQualifiedModelProviders(
 			.getRefreshableProviders()
 			.find(candidate => candidate.toLowerCase() === parsedSelector.provider.toLowerCase());
 		if (!provider || refreshedProviders.has(provider)) continue;
-		const availableModels = modelRegistry.getAvailable();
+		const availableModels = modelRegistry.getAvailable(credentialSessionId);
 		const rawModelId = selector.slice(selector.indexOf("/") + 1);
 		if (
 			resolveProviderModelReference(provider, rawModelId, availableModels) ||
@@ -1047,9 +1047,10 @@ export function resolveModelOverride(
 	settings?: Settings,
 	sessionId?: string,
 	aliasIntent?: "preset-equivalent" | "reject",
+	credentialSessionId?: string,
 ): { model?: Model<Api>; thinkingLevel?: ThinkingLevel; explicitThinkingLevel: boolean } {
 	if (modelPatterns.length === 0) return { explicitThinkingLevel: false };
-	const availableModels = modelRegistry.getAvailable();
+	const availableModels = modelRegistry.getAvailable(credentialSessionId);
 	const matchPreferences = { usageOrder: settings?.getStorage()?.getModelUsageOrder() };
 	for (const pattern of modelPatterns) {
 		const { model, thinkingLevel, explicitThinkingLevel } = resolveModelRoleValue(pattern, availableModels, {
@@ -1081,6 +1082,8 @@ export interface ModelChainResolutionOptions {
 	canonicalSessionId?: string | null;
 	credentialSessionId?: string;
 	isCredentialUnavailable?: (provider: string) => boolean;
+	/** Read-only auth eligibility for staged profile preflight when no access token can be exposed. */
+	isProviderAuthAvailable?: (provider: string) => boolean;
 	signal?: AbortSignal;
 }
 
@@ -1139,13 +1142,13 @@ async function resolveModelChainEntries(
 	startIndex: number,
 	circuitPolicy: { skipOpenCircuits: boolean },
 ): Promise<ModelChainResolution & { firstOpenCircuit?: { index: number; skipCount: number } }> {
-	const availableModels = modelRegistry.getAvailable();
-	const matchPreferences = { usageOrder: settings?.getStorage()?.getModelUsageOrder() };
-	const skips: Array<{ selector: string; reason: string }> = [];
-	const authFailedModels = new Set<string>();
 	const canonicalSessionId =
 		options?.canonicalSessionId === null ? undefined : (options?.canonicalSessionId ?? sessionId);
 	const credentialSessionId = options?.credentialSessionId ?? sessionId;
+	const availableModels = modelRegistry.getAvailable(credentialSessionId);
+	const matchPreferences = { usageOrder: settings?.getStorage()?.getModelUsageOrder() };
+	const skips: Array<{ selector: string; reason: string }> = [];
+	const authFailedModels = new Set<string>();
 	let firstOpenCircuit: { index: number; skipCount: number } | undefined;
 	for (let activeIndex = startIndex; activeIndex < modelPatterns.length; activeIndex += 1) {
 		const selector = modelPatterns[activeIndex];
@@ -1198,7 +1201,7 @@ async function resolveModelChainEntries(
 				skips.push({ selector, reason: "credential_unavailable" });
 				break;
 			}
-			if (isAuthenticatedOrKeyless(key)) {
+			if (isAuthenticatedOrKeyless(key) || options?.isProviderAuthAvailable?.(candidate.model.provider)) {
 				return { ...candidate, activeIndex, skips };
 			}
 			skips.push({ selector, reason: "unauthenticated" });
@@ -1277,7 +1280,8 @@ export async function resolveModelOverrideWithAuthFallback(
 	parentFallbackSelector?: string;
 	skips: Array<{ selector: string; reason: string }>;
 }> {
-	const availableModels = modelRegistry.getAvailable();
+	const credentialSessionId = options?.credentialSessionId ?? authSessionId;
+	const availableModels = modelRegistry.getAvailable(credentialSessionId);
 	const matchPreferences = { usageOrder: settings?.getStorage()?.getModelUsageOrder() };
 	let requestedModel: Model<Api> | undefined;
 	let requestedResolution: ResolvedModelRoleValue | undefined;
@@ -1292,6 +1296,7 @@ export async function resolveModelOverrideWithAuthFallback(
 			settings,
 			undefined,
 			options?.aliasIntent,
+			credentialSessionId,
 		).model;
 		if (parentActiveModel) {
 			modelRegistry.seedCanonicalVariant?.(canonicalScope, parentActiveModel);
@@ -1313,7 +1318,7 @@ export async function resolveModelOverrideWithAuthFallback(
 			matchPreferences,
 			modelRegistry,
 			sessionId: canonicalScope,
-			credentialSessionId: authSessionId,
+			credentialSessionId,
 			aliasIntent: options?.aliasIntent,
 		});
 		if (!requestedModel && candidate.model) {
@@ -1333,7 +1338,7 @@ export async function resolveModelOverrideWithAuthFallback(
 				continue;
 			}
 		}
-		const key = await modelRegistry.getApiKey(candidate.model, authSessionId);
+		const key = await modelRegistry.getApiKey(candidate.model, credentialSessionId);
 		if (isAuthenticatedOrKeyless(key)) {
 			return { ...candidate, requestedModel: candidate.model, authFallbackUsed: false, activeIndex, skips };
 		}
@@ -1343,8 +1348,9 @@ export async function resolveModelOverrideWithAuthFallback(
 		) {
 			const equivalentRetry = await resolveModelChainWithAuth([pattern], modelRegistry, settings, authSessionId, {
 				managedFallback: options.managedFallback,
-				aliasIntent: options.aliasIntent,
+				aliasIntent: options?.aliasIntent,
 				canonicalSessionId: canonicalScope,
+				credentialSessionId,
 			});
 			if (equivalentRetry.model) {
 				return {
@@ -1365,10 +1371,17 @@ export async function resolveModelOverrideWithAuthFallback(
 		return { explicitThinkingLevel: false, requestedModel, authFallbackUsed: false, activeIndex, skips };
 	}
 	const fallback = parentActiveModelPattern
-		? resolveModelOverride([parentActiveModelPattern], modelRegistry, settings, authSessionId, options?.aliasIntent)
+		? resolveModelOverride(
+				[parentActiveModelPattern],
+				modelRegistry,
+				settings,
+				credentialSessionId,
+				options?.aliasIntent,
+				credentialSessionId,
+			)
 		: { explicitThinkingLevel: false };
 	if (fallback.model) {
-		const fallbackKey = await modelRegistry.getApiKey(fallback.model, authSessionId);
+		const fallbackKey = await modelRegistry.getApiKey(fallback.model, credentialSessionId);
 		if (isAuthenticatedOrKeyless(fallbackKey)) {
 			const isParentSubstitution = requestedModel === undefined || !modelsAreEqual(fallback.model, requestedModel);
 			return {
@@ -1450,8 +1463,9 @@ export async function resolveModelScope(
 	patterns: string[],
 	modelRegistry: Pick<ModelRegistry, "getAvailable" | "getCanonicalVariants">,
 	preferences?: ModelMatchPreferences,
+	credentialSessionId?: string,
 ): Promise<ScopedModel[]> {
-	const availableModels = modelRegistry.getAvailable();
+	const availableModels = modelRegistry.getAvailable(credentialSessionId);
 
 	const scopedModels: ScopedModel[] = [];
 	const addScopedModel = (selection: ScopedModel): void => {
@@ -1556,13 +1570,14 @@ export async function resolveAllowedModels(
 	modelRegistry: Pick<ModelRegistry, "getAvailable" | "getCanonicalVariants">,
 	settings: Settings | undefined,
 	preferences?: ModelMatchPreferences,
+	credentialSessionId?: string,
 ): Promise<Model<Api>[]> {
-	const available = modelRegistry.getAvailable();
+	const available = modelRegistry.getAvailable(credentialSessionId);
 	const patterns = settings?.get("enabledModels");
 	if (!patterns || patterns.length === 0) {
 		return available;
 	}
-	const scoped = await resolveModelScope(patterns, modelRegistry, preferences);
+	const scoped = await resolveModelScope(patterns, modelRegistry, preferences, credentialSessionId);
 	if (scoped.length === 0) {
 		return [];
 	}
@@ -1686,6 +1701,7 @@ export async function findInitialModel(options: {
 	defaultModelId?: string;
 	defaultThinkingSelector?: ThinkingLevel;
 	modelRegistry: InitialModelRegistry;
+	credentialSessionId?: string;
 }): Promise<InitialModelResult> {
 	const {
 		cliProvider,
@@ -1696,6 +1712,7 @@ export async function findInitialModel(options: {
 		defaultModelId,
 		defaultThinkingSelector,
 		modelRegistry,
+		credentialSessionId,
 	} = options;
 
 	let model: Model<Api> | undefined;
@@ -1703,7 +1720,11 @@ export async function findInitialModel(options: {
 
 	// 1. CLI args take priority
 	if (cliProvider && cliModel) {
-		const found = resolveProviderModelReference(cliProvider, cliModel, modelRegistry.getAvailable());
+		const found = resolveProviderModelReference(
+			cliProvider,
+			cliModel,
+			modelRegistry.getAvailable(credentialSessionId),
+		);
 
 		if (!found) {
 			console.error(chalk.red(`Model ${cliProvider}/${cliModel} not found`));
@@ -1728,7 +1749,11 @@ export async function findInitialModel(options: {
 
 	// 3. Try saved default from settings
 	if (defaultProvider && defaultModelId) {
-		const found = resolveProviderModelReference(defaultProvider, defaultModelId, modelRegistry.getAvailable());
+		const found = resolveProviderModelReference(
+			defaultProvider,
+			defaultModelId,
+			modelRegistry.getAvailable(credentialSessionId),
+		);
 
 		if (found) {
 			model = found;
@@ -1743,7 +1768,7 @@ export async function findInitialModel(options: {
 	}
 
 	// 4. Try first available model with valid API key
-	const availableModels = modelRegistry.getAvailable();
+	const availableModels = modelRegistry.getAvailable(credentialSessionId);
 
 	if (availableModels.length > 0) {
 		// Try to find a default model from known providers
@@ -1772,11 +1797,16 @@ export async function restoreModelFromSession(
 	currentModel: Model<Api> | undefined,
 	shouldPrintMessages: boolean,
 	modelRegistry: RestorableModelRegistry,
+	credentialSessionId?: string,
 ): Promise<{ model: Model<Api> | undefined; fallbackMessage: string | undefined }> {
-	const restoredModel = resolveProviderModelReference(savedProvider, savedModelId, modelRegistry.getAvailable());
+	const restoredModel = resolveProviderModelReference(
+		savedProvider,
+		savedModelId,
+		modelRegistry.getAvailable(credentialSessionId),
+	);
 
 	// Check if restored model exists and has a valid API key
-	const hasApiKey = restoredModel ? !!(await modelRegistry.getApiKey(restoredModel)) : false;
+	const hasApiKey = restoredModel ? !!(await modelRegistry.getApiKey(restoredModel, credentialSessionId)) : false;
 
 	if (restoredModel && hasApiKey) {
 		if (shouldPrintMessages) {
@@ -1804,7 +1834,7 @@ export async function restoreModelFromSession(
 	}
 
 	// Try to find any available model
-	const availableModels = modelRegistry.getAvailable();
+	const availableModels = modelRegistry.getAvailable(credentialSessionId);
 
 	if (availableModels.length > 0) {
 		// Try to find a default model from known providers

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

@@ -26,6 +26,7 @@ export const ModelCompatSchema = z.object({
 	sendSessionHeaders: z.boolean().optional(),
 	supportsResponsesSessionAffinity: z.boolean().optional(),
 	supportsServiceTier: z.boolean().optional(),
+	supportsUltrafastTier: z.boolean().optional(),
 	supportsMultipleSystemMessages: z.boolean().optional(),
 	supportsReasoningEffort: z.boolean().optional(),
 	reasoningEffortMap: ReasoningEffortMapSchema.optional(),
@@ -68,6 +69,8 @@ export const GJC_MODEL_ASSIGNMENT_TARGET_IDS = [
 ] as const;
 export const EffortSchema = z.enum(GJC_MODEL_EFFORT_IDS);
 const CacheRetentionSchema = z.enum(["none", "short", "long"]);
+const MAX_STREAM_IDLE_TIMEOUT_MS = 2 ** 31 - 1;
+const StreamIdleTimeoutMsSchema = z.number().int().finite().nonnegative().max(MAX_STREAM_IDLE_TIMEOUT_MS);
 
 const ThinkingControlModeSchema = z.enum([
 	"effort",
@@ -166,6 +169,7 @@ const ModelDefinitionSchema = z
 		wireModelId: z.string().min(1).optional(),
 		requestTransform: RequestTransformSchema.optional(),
 		cacheRetention: CacheRetentionSchema.optional(),
+		streamIdleTimeoutMs: StreamIdleTimeoutMsSchema.optional(),
 	})
 	.strict();
 
@@ -193,6 +197,7 @@ export const ModelOverrideSchema = z
 		wireModelId: z.string().min(1).optional(),
 		requestTransform: RequestTransformSchema.optional(),
 		cacheRetention: CacheRetentionSchema.optional(),
+		streamIdleTimeoutMs: StreamIdleTimeoutMsSchema.optional(),
 	})
 	.strict();
 
@@ -257,6 +262,7 @@ const ProviderConfigSchema = z
 		 */
 		transport: z.literal("pi-native").optional(),
 		cacheRetention: CacheRetentionSchema.optional(),
+		streamIdleTimeoutMs: StreamIdleTimeoutMsSchema.optional(),
 		openaiCompat: LocalOpenAICompatSchema.optional(),
 	})
 	.strict();

package/src/config/settings-schema.ts

@@ -1,5 +1,6 @@
 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 { type CredentialPreferenceEntryValue, parseCredentialPreferenceList } from "../session/startup-auth-config";
 import { TASK_SIMPLE_MODES } from "../task/simple-mode";
 import { getThinkingLevelMetadata } from "../thinking-metadata";
 import { DEFAULT_EDIT_MODE_SETTING, EDIT_MODE_SETTINGS, EDIT_MODES, type EditMode } from "../utils/edit-mode";
@@ -214,7 +215,11 @@ interface ArrayDef<T> {
 type RecordValueDef =
 	| { type: "model-selector-value" }
 	| { type: "string-enum"; values: readonly string[] }
-	| { type: "credential-selector" };
+	| { type: "credential-selector" }
+	| { type: "credential-preference-list" };
+
+/** A provider's `auth.credentialPreferences` value: one account or a non-empty ordered list of entries. */
+export type CredentialPreferenceSettingValue = string | CredentialPreferenceEntryValue[];
 
 interface ConstrainedRecordValueDef {
 	type: "autorouting-selector-value";
@@ -452,6 +457,13 @@ export const SETTINGS_SCHEMA = {
 		valueSchema: { type: "credential-selector" } as const,
 	},
 	"auth.credentialPinStoreIdentity": { type: "string", default: undefined },
+	// Ordered soft per-provider OAuth account preferences with optional per-entry usage caps. Global-only, like pins;
+	// read at startup.
+	"auth.credentialPreferences": {
+		type: "record",
+		default: {} as Record<string, CredentialPreferenceSettingValue>,
+		valueSchema: { type: "credential-preference-list" } as const,
+	},
 	"session.directoryMigration": {
 		type: "enum",
 		values: ["copy-retain", "disabled"] as const,
@@ -493,6 +505,13 @@ export const SETTINGS_SCHEMA = {
 		description: "Grace period before a master-spawned child orphaned by confirmed master loss is closed.",
 		validate: (value: number) => Number.isSafeInteger(value) && value >= 60_000 && value <= 3_600_000,
 	},
+	"sdk.brokerAbandonedGraceMs": {
+		type: "number",
+		default: 120_000,
+		description:
+			"Grace before a detached broker with no client connection, no live session host, and no open spawn authority exits on its own. A supervised `gjc sdk broker run` service never reaps itself.",
+		validate: (value: number) => Number.isSafeInteger(value) && value >= 60_000 && value <= 3_600_000,
+	},
 
 	// Notifications (shared daemon with Telegram/Discord/Slack presentation adapters)
 	"notifications.enabled": { type: "boolean", default: false },
@@ -1470,19 +1489,30 @@ export const SETTINGS_SCHEMA = {
 
 	serviceTier: {
 		type: "enum",
-		values: ["none", "auto", "default", "flex", "scale", "priority", "openai-only", "claude-only"] as const,
+		values: [
+			"none",
+			"auto",
+			"default",
+			"flex",
+			"scale",
+			"priority",
+			"ultrafast",
+			"openai-only",
+			"claude-only",
+		] as const,
 		default: "none",
 		ui: {
 			tab: "model",
 			label: "Service Tier",
 			description:
-				'Processing priority hint (none = omit). OpenAI accepts the tier values directly; Anthropic realizes `priority` as `speed: "fast"` on supported Opus models. Scoped values target one family.',
+				'Processing priority hint (none = omit). OpenAI accepts the tier values directly; ultrafast is a 6x premium tier. Anthropic realizes `priority` as `speed: "fast"` on supported Opus models. Scoped values target one family.',
 			options: [
 				{ value: "none", label: "None", description: "Omit service_tier parameter" },
 				{ value: "auto", label: "Auto", description: "Use provider default tier selection (OpenAI)" },
 				{ value: "default", label: "Default", description: "Standard priority processing (OpenAI)" },
 				{ value: "flex", label: "Flex", description: "Flexible capacity tier when available (OpenAI)" },
 				{ value: "scale", label: "Scale", description: "Scale Tier credits when available (OpenAI)" },
+				{ value: "ultrafast", label: "Ultrafast", description: "Ultrafast processing at a 6x premium (OpenAI)" },
 				{
 					value: "priority",
 					label: "Priority",
@@ -1512,6 +1542,7 @@ export const SETTINGS_SCHEMA = {
 			"flex",
 			"scale",
 			"priority",
+			"ultrafast",
 			"openai-only",
 			"claude-only",
 		] as const,
@@ -1532,6 +1563,7 @@ export const SETTINGS_SCHEMA = {
 				{ value: "default", label: "Default", description: "Standard priority processing (OpenAI)" },
 				{ value: "flex", label: "Flex", description: "Flexible capacity tier when available (OpenAI)" },
 				{ value: "scale", label: "Scale", description: "Scale Tier credits when available (OpenAI)" },
+				{ value: "ultrafast", label: "Ultrafast", description: "Ultrafast processing at a 6x premium (OpenAI)" },
 				{
 					value: "priority",
 					label: "Priority",
@@ -1778,7 +1810,7 @@ export const SETTINGS_SCHEMA = {
 			tab: "interaction",
 			label: "Prompt Suggestions",
 			description:
-				"Predict your likely next prompt after each turn (smol-model call) and show it as ghost text; Tab accepts",
+				"Predict your likely next prompt after each turn (one extra default-role model call) and show it as ghost text; Tab accepts",
 		},
 	},
 
@@ -2821,6 +2853,12 @@ export const SETTINGS_SCHEMA = {
 		type: "string",
 		default: undefined,
 	},
+	// xxHash64 hex pin for settingsPath. Only the user/global value is a pin;
+	// a project file cannot authorize the TOML path it names.
+	"shellMinimizer.settingsHash": {
+		type: "string",
+		default: undefined,
+	},
 	"shellMinimizer.only": { type: "array", default: EMPTY_STRING_ARRAY },
 	"shellMinimizer.except": { type: "array", default: EMPTY_STRING_ARRAY },
 	"shellMinimizer.maxCaptureBytes": {
@@ -3004,6 +3042,17 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"reportIssue.enabled": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tools",
+			label: "Tool issue reporting",
+			description:
+				"Enable the report_issue tool: the model records tool behavior that contradicts the tool's description into the local ~/.gjc/tool-issues.db. Nothing is sent anywhere.",
+		},
+	},
+
 	"debug.enabled": {
 		type: "boolean",
 		default: true,
@@ -3554,6 +3603,11 @@ export const SETTINGS_SCHEMA = {
 		default: [] as string[],
 	},
 
+	"mcp.discoveryDeferAutoload": {
+		type: "boolean",
+		default: false,
+	},
+
 	"mcp.notifications": {
 		type: "boolean",
 		default: false,
@@ -3780,6 +3834,17 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
+	"task.compactSubagentPanel": {
+		type: "boolean",
+		default: false,
+		ui: {
+			tab: "tasks",
+			label: "Compact Subagent Panel",
+			description:
+				"Collapse awaited subagents into one summary line (expand tool output to see each one) and refresh only when the summary changes",
+		},
+	},
+
 	"task.enableLsp": {
 		type: "boolean",
 		default: false,
@@ -4358,6 +4423,9 @@ function validRecordValue(valueSchema: RecordValueDef, value: unknown): boolean
 				/^account:\S+$/.test(value))
 		);
 	}
+	if (valueSchema.type === "credential-preference-list") {
+		return parseCredentialPreferenceList(value) !== undefined;
+	}
 	return typeof value === "string" && valueSchema.values.includes(value);
 }
 
@@ -4700,6 +4768,7 @@ export interface BashInterceptorRule {
 export interface ShellMinimizerSettings {
 	enabled: boolean;
 	settingsPath: string | undefined;
+	settingsHash: string | undefined;
 	only: string[];
 	except: string[];
 	maxCaptureBytes: number;