@gajae-code/coding-agent 0.18.11 → 0.19.0

package/dist/types/config/file-lock.d.ts

@@ -1,7 +1,9 @@
-import type { NativeDirectoryTreeResult, NativeExactUnlinkResult } from "@gajae-code/natives";
+import type { NativeDirectoryTreeResult, NativeDirectoryTreeSnapshot, NativeExactUnlinkResult } from "@gajae-code/natives";
 import { renameDirectoryNoReplacePathAsync, renameNoReplacePathAsync } from "@gajae-code/natives";
 export interface FileLockOptions {
     staleMs?: number;
+    /** Age after which an ownerless removal transition may be adopted; defaults to `staleMs`. */
+    orphanTransitionAgeMs?: number;
     retries?: number;
     retryDelayMs?: number;
     signal?: AbortSignal;
@@ -13,6 +15,7 @@ export interface FileLockOptions {
     previousOwnerHostIds?: readonly string[];
 }
 export type FileLockAcquireReason = "acquire_timeout" | "orphan_transition";
+export type FileLockPublicationFailureCode = "access_denied" | "sharing_violation";
 /**
  * Why the acquire path could not retire a lock directory whose owner it had already
  * proven dead. Attached to `FileLockAcquireError` so a host whose lock-removal path
@@ -38,20 +41,57 @@ export declare class FileLockAcquireError extends Error {
     readonly reason: FileLockAcquireReason;
     readonly orphanPath?: string | undefined;
     readonly removalFailure?: FileLockStaleRemovalFailure | undefined;
+    readonly publicationFailureCode?: FileLockPublicationFailureCode | undefined;
+    /** True only when exhaustion proved a same-host owner process is live. */
+    readonly holderIsLive: boolean;
     readonly code: FileLockAcquireReason;
-    constructor(filePath: string, lockPath: string, attempts: number, holder: string, reason?: FileLockAcquireReason, orphanPath?: string | undefined, removalFailure?: FileLockStaleRemovalFailure | undefined);
+    constructor(filePath: string, lockPath: string, attempts: number, holder: string, reason?: FileLockAcquireReason, orphanPath?: string | undefined, removalFailure?: FileLockStaleRemovalFailure | undefined, publicationFailureCode?: FileLockPublicationFailureCode | undefined, 
+    /** True only when exhaustion proved a same-host owner process is live. */
+    holderIsLive?: boolean);
+}
+export declare class FileLockStagingCleanupError extends Error {
+    readonly lockPath: string;
+    readonly stagingPath: string;
+    readonly code: string | undefined;
+    constructor(lockPath: string, stagingPath: string, cause: unknown);
 }
 export declare function isFileLockAcquireTimeout(error: unknown): error is FileLockAcquireError;
+type FileLockStagingFileIdentity = {
+    dev: string;
+    ino: string;
+};
+type FileLockStagingRootIdentity = {
+    rootDev: string;
+    rootIno: string;
+    treeSnapshot?: NativeDirectoryTreeSnapshot;
+    infoFileIdentity?: FileLockStagingFileIdentity;
+};
+export declare const FILE_LOCK_ORPHAN_TRANSITION_ADOPTION_AGE_MS: number;
 /** Release retries cover transient handle denial and a competing exact-removal quarantine cleanup. */
 export declare const FILE_LOCK_RELEASE_RETRY_ATTEMPTS = 20;
 export declare const FILE_LOCK_RELEASE_RETRY_DELAY_MS = 25;
 export declare const FileLockTestHooks: {
     afterParentMkdir?: (lockPath: string) => void | Promise<void>;
+    afterStagingInfoWrite?: (stagingPath: string) => void | Promise<void>;
+    stagingInfoIdentity?: (infoPath: string, capture: () => Promise<FileLockStagingFileIdentity>) => Promise<FileLockStagingFileIdentity>;
+    stagingInfoCleanup?: (infoPath: string, callerFd: number, quarantineName: string) => NativeExactUnlinkResult | Promise<NativeExactUnlinkResult>;
+    beforeDetachedLockCleanup?: (detachedPath: string) => boolean | Promise<boolean>;
+    afterRemovalOwnerPublish?: (transitionPath: string) => void | Promise<void>;
+    afterRemovalTransitionMissing?: (transitionPath: string) => void | Promise<void>;
+    afterForeignTransitionMissing?: (transitionPath: string) => void | Promise<void>;
+    beforeRemovalRecordUnlink?: (recordPath: string) => boolean | Promise<boolean>;
     beforeRemovalOwnerPublish?: (transitionPath: string) => void | Promise<void>;
+    cleanupPendingStaging?: (stagingPath: string) => Promise<void>;
+    stagingRootIdentity?: (stagingPath: string) => FileLockStagingRootIdentity | Promise<FileLockStagingRootIdentity>;
     nativePublicationBindings?: () => {
         renameNoReplacePathAsync: typeof renameNoReplacePathAsync;
         renameDirectoryNoReplacePathAsync: typeof renameDirectoryNoReplacePathAsync;
     };
+    stagingIdentityEvidence?: () => {
+        processIncarnation: string | null;
+        startTime: string | null;
+    };
+    processIncarnation?: (pid: number) => string | null;
     nativeQuarantineBindings?: () => NativeFileLockBindings;
     nativeExactRemovalProbe?: () => boolean | Promise<boolean>;
 };
@@ -170,6 +210,15 @@ type NativeFileLockBindings = {
     }, detachOnly?: boolean): NativeExactUnlinkResult;
 };
 export declare function acquireFileLock(filePath: string, options?: FileLockOptions): Promise<() => Promise<void>>;
+/**
+ * Describes the retained removal transition blocking `filePath`, if one exists.
+ *
+ * `acquireFileLock` reports this on exhaustion, but a caller whose own budget
+ * aborts the acquisition first would otherwise never learn that a stale
+ * transition — not ordinary contention — is what blocked it. Such a caller can
+ * ask directly after an abort so the block is surfaced instead of swallowed.
+ */
+export declare function describeRetainedLockTransition(filePath: string, options?: FileLockOptions): Promise<FileLockAcquireError | undefined>;
 /**
  * Serializes all contenders, including callers in the same process. Because this
  * API exposes no ownership token, recursive acquisition is indistinguishable
@@ -177,7 +226,7 @@ export declare function acquireFileLock(filePath: string, options?: FileLockOpti
  * that fact through its own `lockHeld` path instead of acquiring it again.
  */
 export declare function withFileLock<T>(filePath: string, fn: () => Promise<T>, options?: FileLockOptions): Promise<T>;
-/** Strictly recognize the staging names emitted by tryAcquireLock. */
+/** Return a name-encoded staging PID for GC discovery. */
 export declare function fileLockStagingOwnerPid(name: string): number | null;
 export interface FileLockStagingResult {
     path: string;

package/dist/types/config/model-discovery-manager.d.ts

@@ -53,6 +53,8 @@ export declare class ModelDiscoveryManager<TProvider extends DiscoveryProvider>
     get providers(): readonly TProvider[];
     providerIds(): Set<string>;
     getState(provider: string): ProviderDiscoveryState | undefined;
+    /** Retain accepted discovery evidence for unchanged providers during a local reload. */
+    retainStatesFrom(source: ModelDiscoveryManager<TProvider>, providers: ReadonlySet<string>): void;
     invalidate(provider: string): void;
     loadCached(provider: TProvider, cacheDbPath?: string, expectedProvenance?: string): readonly Model<Api>[];
     beginRefresh(provider: string): DiscoveryRefreshToken;

package/dist/types/config/model-profile-activation.d.ts

@@ -1,6 +1,6 @@
 import { ThinkingLevel } from "@gajae-code/agent-core";
 import { type Api, type Model } from "@gajae-code/ai/core";
-import type { AgentSession, DefaultFallbackRuntimeState } from "../session/agent-session";
+import type { AgentSession, AgentSessionProfileInstalledOverrideState, DefaultFallbackRuntimeState } from "../session/agent-session";
 import { type ModelProfileDefinition } from "./model-profiles";
 export { resolveModelProfileName } from "./model-profile-contract";
 import { type GjcModelAssignmentTargetId, type ModelRegistry } from "./model-registry";
@@ -13,10 +13,20 @@ type UserCanonicalVariantSelection = {
 type ModelProfileActivationSession = Pick<AgentSession, "model" | "thinkingLevel" | "sessionId" | "getConfiguredModelChain" | "setConfiguredModelChain"> & {
     credentialSessionId?: string;
     setModelTemporary?: AgentSession["setModelTemporary"];
-    setActiveModelProfile?: (name: string | undefined) => void;
+    setActiveModelProfile?: (name: string | undefined, activatedByThisProcess?: boolean) => void;
     getActiveModelProfile?: () => string | undefined;
+    getActivatedModelProfile?: () => string | undefined;
     /** Record which runtime override keys this activation installed (session-scoped). */
-    noteProfileInstalledOverrides?: (modelRoles: readonly string[], agentModelOverrides: readonly string[], preProfileModel: Model<Api> | undefined) => void;
+    noteProfileInstalledOverrides?: (modelRoles: readonly string[], agentModelOverrides: readonly string[], preProfileModel: Model<Api> | undefined, baseline?: {
+        modelRoles: Readonly<Record<string, ModelSelectorValue>>;
+        agentModelOverrides: Readonly<Record<string, ModelSelectorValue>>;
+    }, installed?: {
+        modelRoles: Readonly<Record<string, ModelSelectorValue>>;
+        agentModelOverrides: Readonly<Record<string, ModelSelectorValue>>;
+    }, manual?: {
+        modelRoles: readonly string[];
+        agentModelOverrides: readonly string[];
+    }, configuredDefaultChain?: readonly string[]) => void;
     /** Drop the recorded profile-installed override keys (e.g. after materialization). */
     clearProfileInstalledOverrides?: () => void;
     /** Current profile-installed override keys, for deriving the activation base. */
@@ -24,11 +34,15 @@ type ModelProfileActivationSession = Pick<AgentSession, "model" | "thinkingLevel
         modelRoles: readonly string[];
         agentModelOverrides: readonly string[];
     };
+    /** Profile-installed baselines, preserved when a refreshed profile drops an assignment. */
+    getProfileInstalledOverrideState?: () => AgentSessionProfileInstalledOverrideState;
+    restoreProfileInstalledOverrideState?: (state: AgentSessionProfileInstalledOverrideState) => void;
     /** Re-apply vendor-separated delegation (task tool + prompt) after the role layer changed. */
     syncEagerDelegation?: () => Promise<void>;
     getSessionDefaultModelSelector?: () => string | undefined;
     recordResumeDefaultModel?: (selector: string | undefined) => void;
     getUserCanonicalVariantSelection?: () => UserCanonicalVariantSelection;
+    getUserModelSelectionRevision?: () => number;
     seedDefaultFallbackResolution?: (activeIndex: number, skips: Array<{
         selector: string;
         reason: string;
@@ -36,7 +50,10 @@ type ModelProfileActivationSession = Pick<AgentSession, "model" | "thinkingLevel
     getDefaultFallbackRuntimeState?: () => DefaultFallbackRuntimeState;
     restoreDefaultFallbackRuntimeState?: (state: DefaultFallbackRuntimeState) => void;
     restoreModelSelectionForRollback?: AgentSession["restoreModelSelectionForRollback"];
-    modelRegistry?: Pick<ModelRegistry, "getSessionCanonicalVariant" | "restoreSessionCanonicalVariant" | "clearCanonicalVariant" | "getAvailable" | "lookupAliasExists" | "resolveModelByLookupAlias" | "authStorage" | "isCredentiallessProvider">;
+    prepareModelSelectionForProfileActivation?: AgentSession["prepareModelSelectionForProfileActivation"];
+    commitPreparedProfileModelSelection?: AgentSession["commitPreparedProfileModelSelection"];
+    finishPreparedProfileModelSelection?: AgentSession["finishPreparedProfileModelSelection"];
+    modelRegistry?: Pick<ModelRegistry, "getSessionCanonicalVariant" | "restoreSessionCanonicalVariant" | "clearCanonicalVariant" | "getModelProfile" | "getAvailable" | "lookupAliasExists" | "resolveModelByLookupAlias" | "authStorage" | "isCredentiallessProvider"> & Partial<Pick<ModelRegistry, "seedCanonicalVariant">>;
     getConfiguredModelChainState?: (role: string) => ConfiguredModelChainState | undefined;
 };
 type ConfiguredModelChainState = {
@@ -45,18 +62,46 @@ type ConfiguredModelChainState = {
     identity?: string;
     explicitHead: boolean;
 };
+type PublishedModelProfileActivationState = {
+    model: Model<Api> | undefined;
+    thinkingLevel: ThinkingLevel | undefined;
+    modelRolesOverride: Readonly<Record<string, ModelSelectorValue>> | undefined;
+    agentModelOverridesOverride: Readonly<Record<string, ModelSelectorValue>> | undefined;
+    defaultChainState: ConfiguredModelChainState | undefined;
+    defaultFallbackRuntimeState: DefaultFallbackRuntimeState | undefined;
+    activeModelProfile: string | undefined;
+    activatedModelProfile: string | undefined;
+    profileInstalledOverrideState: AgentSessionProfileInstalledOverrideState | undefined;
+    sessionDefaultModel: string | undefined;
+    persistedModelRoles: Readonly<Record<string, ModelSelectorValue>> | undefined;
+    persistedAgentModelOverrides: Readonly<Record<string, ModelSelectorValue>> | undefined;
+    persistedDefaultProfile: string | undefined;
+    persistedDefaultThinkingLevel: Exclude<ThinkingLevel, "inherit"> | undefined;
+    defaultThinkingLevelOverride: Exclude<ThinkingLevel, "inherit"> | undefined;
+    defaultProfileOverride: string | undefined;
+};
 export interface PrepareModelProfileActivationOptions {
     session: ModelProfileActivationSession;
-    modelRegistry: Pick<ModelRegistry, "getModelProfile" | "getModelProfiles" | "getAvailableModelProfileNames" | "getApiKeyForProvider" | "getAll" | "resolveCanonicalModel" | "getCanonicalVariants" | "getCanonicalId" | "isSelectorCircuitOpen"> & Partial<Pick<ModelRegistry, "getAvailable" | "resolveModelByLookupAlias" | "lookupAliasExists" | "clearCanonicalVariant" | "seedCanonicalVariant" | "getSessionCanonicalVariant" | "restoreSessionCanonicalVariant" | "getConfiguredProviderIds" | "isKnownProvider">> & {
+    modelRegistry: Pick<ModelRegistry, "getModelProfile" | "getModelProfiles" | "getAvailableModelProfileNames" | "getApiKeyForProvider" | "getAll" | "resolveCanonicalModel" | "getCanonicalVariants" | "getCanonicalId" | "isSelectorCircuitOpen"> & Partial<Pick<ModelRegistry, "getAvailable" | "hasUsableAuthForProvider" | "isStagedReloadCandidate" | "resolveModelByLookupAlias" | "lookupAliasExists" | "clearCanonicalVariant" | "seedCanonicalVariant" | "getSessionCanonicalVariant" | "restoreSessionCanonicalVariant" | "getConfiguredProviderIds" | "getConfiguredModelBindings" | "isKnownProvider">> & {
         getError?: ModelRegistry["getError"];
         authStorage?: ModelRegistry["authStorage"];
     };
     settings: Pick<Settings, "get" | "getGlobal" | "getOverride">;
+    /** Live mutation target when `settings` is a validated staged view. */
+    settingsForApply?: Settings;
+    prepareSessionModelSelection?: boolean;
+    preserveManualOverrides?: boolean;
+    preserveCanonicalVariant?: boolean;
+    signal?: AbortSignal;
     profileName: string;
 }
 export interface ApplyModelProfileActivationOptions {
     persistDefault?: boolean;
     thinkingLevelOverride?: ThinkingLevel;
+    preserveDefaultModelSelection?: boolean;
+    preserveLiveModelSelection?: boolean;
+    deferRuntimePublication?: boolean;
+    signal?: AbortSignal;
     /** Cancels deferred activation if a newer user model selection exists. */
     isCurrent?: () => boolean;
 }
@@ -77,11 +122,16 @@ export interface PreparedModelProfileActivation {
     previousDefaultProfileOverride: string | undefined;
     previousPersistedDefaultProfile: string | undefined;
     previousPersistedDefaultThinkingLevel: Exclude<ThinkingLevel, "inherit"> | undefined;
-    previousDefaultThinkingLevelOverride: ThinkingLevel | undefined;
+    previousDefaultThinkingLevelOverride: Exclude<ThinkingLevel, "inherit"> | undefined;
     baseAgentModelOverrides: Record<string, ModelSelectorValue>;
     baseModelRoles: Record<string, ModelSelectorValue>;
     previousDefaultChain: readonly string[] | undefined;
     previousDefaultChainState: ConfiguredModelChainState | undefined;
+    previousProfileInstalledOverrideState: AgentSessionProfileInstalledOverrideState | undefined;
+    preparedDefaultModelSelection: Awaited<ReturnType<NonNullable<ModelProfileActivationSession["prepareModelSelectionForProfileActivation"]>>> | undefined;
+    defaultChainPublished: boolean;
+    defaultModelPublished: boolean;
+    publishedState: PublishedModelProfileActivationState | undefined;
     previousDefaultFallbackRuntimeState: DefaultFallbackRuntimeState | undefined;
     defaultModel: Model<Api> | undefined;
     defaultThinkingLevel: ThinkingLevel | undefined;
@@ -96,7 +146,10 @@ export interface PreparedModelProfileActivation {
     }>;
     modelRoles: Record<string, ModelSelectorValue>;
     agentModelOverrides: Record<string, ModelSelectorValue>;
+    manualModelRoleOverrides: ReadonlySet<string>;
+    manualAgentModelOverrides: ReadonlySet<string>;
     previousActiveModelProfile: string | undefined;
+    previousActivatedModelProfile: string | undefined;
     /**
      * The session resume default ("provider/id") captured BEFORE activation —
      * the model resume would restore prior to this profile. Snapshotted
@@ -119,16 +172,26 @@ export interface PreparedModelProfileActivation {
     modelRegistry: PrepareModelProfileActivationOptions["modelRegistry"];
 }
 export interface MaterializeModelProfileAssignmentOptions {
-    session: Pick<ModelProfileActivationSession, "model" | "thinkingLevel" | "sessionId" | "credentialSessionId" | "getConfiguredModelChain" | "getConfiguredModelChainState" | "setConfiguredModelChain" | "setActiveModelProfile" | "getActiveModelProfile" | "getDefaultFallbackRuntimeState" | "restoreDefaultFallbackRuntimeState" | "modelRegistry" | "clearProfileInstalledOverrides">;
+    session: Pick<ModelProfileActivationSession, "model" | "thinkingLevel" | "sessionId" | "credentialSessionId" | "getConfiguredModelChain" | "getConfiguredModelChainState" | "setConfiguredModelChain" | "setActiveModelProfile" | "getActiveModelProfile" | "getActivatedModelProfile" | "getProfileInstalledOverrideState" | "getDefaultFallbackRuntimeState" | "restoreDefaultFallbackRuntimeState" | "modelRegistry" | "clearProfileInstalledOverrides">;
     settings: Pick<Settings, "clearOverride" | "get" | "getGlobal" | "getOverride" | "override" | "set" | "unset">;
     role: GjcModelAssignmentTargetId;
     selector: string;
 }
 export interface MaterializeModelProfileAssignmentsOptions {
-    session: Pick<ModelProfileActivationSession, "model" | "thinkingLevel" | "sessionId" | "credentialSessionId" | "getConfiguredModelChain" | "getConfiguredModelChainState" | "setConfiguredModelChain" | "setActiveModelProfile" | "getActiveModelProfile" | "getDefaultFallbackRuntimeState" | "restoreDefaultFallbackRuntimeState" | "modelRegistry" | "clearProfileInstalledOverrides">;
+    session: Pick<ModelProfileActivationSession, "model" | "thinkingLevel" | "sessionId" | "credentialSessionId" | "getConfiguredModelChain" | "getConfiguredModelChainState" | "setConfiguredModelChain" | "setActiveModelProfile" | "getActiveModelProfile" | "getActivatedModelProfile" | "getProfileInstalledOverrideState" | "getDefaultFallbackRuntimeState" | "restoreDefaultFallbackRuntimeState" | "modelRegistry" | "clearProfileInstalledOverrides">;
     settings: Pick<Settings, "clearOverride" | "get" | "getGlobal" | "getOverride" | "override" | "set" | "unset">;
     assignments: ReadonlyMap<GjcModelAssignmentTargetId, string> | Partial<Record<GjcModelAssignmentTargetId, string>>;
 }
+/**
+ * Resolve the profile a materialization may consume.
+ *
+ * Only a profile this process actually activated owns role-only materialization.
+ * A persisted profile whose activation failed or was only restored from history
+ * stays in place. An explicit default selection may supersede that durable profile.
+ */
+export declare function resolveMaterializationProfileIdentity(activatedProfile: string | undefined, durableProfile: string | undefined, includesDefault: boolean): string | undefined;
+/** Resolve startup-override materialization in activated-chain, profile, then global-default order. */
+export declare function resolveMaterializedDefaultSelector(activatedDefaultChain: readonly string[] | undefined, profileDefault: ModelSelectorValue | undefined, globalDefault: ModelSelectorValue | undefined): ModelSelectorValue | undefined;
 export declare function materializeActiveModelProfileAssignment(options: MaterializeModelProfileAssignmentOptions): boolean;
 export declare function materializeActiveModelProfileAssignments(options: MaterializeModelProfileAssignmentsOptions): boolean;
 export declare class ModelProfileCredentialError extends Error {
@@ -253,7 +316,12 @@ export declare function resolveModelProfileDefaultChain(options: {
 }>;
 export declare function rewriteSelectorForProxy(selector: string, proxyProvider: string, proxyMode: ModelProfileProxyMode, allModels: Model<Api>[], directlyAuthenticated: ReadonlySet<string>, routableProviders: ReadonlySet<string>): string;
 export declare function prepareModelProfileActivation(options: PrepareModelProfileActivationOptions): Promise<PreparedModelProfileActivation>;
+/** Publish the prepared model selection and role layer without awaiting. */
+export declare function publishPreparedModelProfileActivation(prepared: PreparedModelProfileActivation, options?: Pick<ApplyModelProfileActivationOptions, "preserveDefaultModelSelection" | "preserveLiveModelSelection">): void;
+export declare function finishPreparedModelProfileActivation(prepared: PreparedModelProfileActivation): Promise<void>;
 export declare function applyPreparedModelProfileActivation(prepared: PreparedModelProfileActivation, options?: ApplyModelProfileActivationOptions): Promise<void>;
+/** Restore an applied activation when its enclosing settings/registry commit fails. */
+export declare function rollbackPreparedModelProfileActivation(prepared: PreparedModelProfileActivation, options?: ApplyModelProfileActivationOptions): Promise<void>;
 export interface MaterializeModelProfileForDeletionResult {
     modelRoles: Record<string, ModelSelectorValue>;
     agentModelOverrides: Record<string, ModelSelectorValue>;
@@ -267,8 +335,10 @@ export interface MaterializeModelProfileForDeletionResult {
     previousDefaultProfile: string | undefined;
     previousPersistedDefaultProfile: string | undefined;
     previousActiveModelProfile: string | undefined;
+    previousActivatedModelProfile: string | undefined;
     previousDefaultChainState: ConfiguredModelChainState | undefined;
     previousDefaultFallbackRuntimeState: DefaultFallbackRuntimeState | undefined;
+    previousProfileInstalledOverrideState: AgentSessionProfileInstalledOverrideState | undefined;
     /**
      * Restores the session sticky canonical variant that was snapshotted before
      * materialization cleared it. Internal closure capturing the registry,
@@ -283,7 +353,7 @@ export declare function materializeModelProfileForDeletion(options: PrepareModel
 }): Promise<MaterializeModelProfileForDeletionResult>;
 export declare function restoreMaterializedModelProfileForDeletion(options: {
     settings: Pick<Settings, "clearOverride" | "flushOrThrow" | "override" | "set" | "unset">;
-    session: Pick<ModelProfileActivationSession, "setActiveModelProfile" | "setConfiguredModelChain" | "restoreDefaultFallbackRuntimeState">;
+    session: Pick<ModelProfileActivationSession, "setActiveModelProfile" | "setConfiguredModelChain" | "restoreDefaultFallbackRuntimeState" | "restoreProfileInstalledOverrideState">;
     snapshot: MaterializeModelProfileForDeletionResult;
 }): Promise<void>;
 export declare function activateModelProfile(options: PrepareModelProfileActivationOptions, applyOptions?: ApplyModelProfileActivationOptions): Promise<void>;

package/dist/types/config/model-registry.d.ts

@@ -5,15 +5,15 @@ import { type ActiveProviderDescriptor } from "../sdk/providers";
 import type { AuthStorage } from "../session/auth-storage";
 import type { ActiveSearchModelContext, WebSearchMode } from "../web/search/types";
 import { type BillingPath } from "./billing-path";
-import { ConfigError, ConfigFile } from "./config-file";
+import { ConfigError, ConfigFile, type LoadResult } from "./config-file";
 import { isAuthenticated, kNoAuth } from "./model-auth";
 import { type ConfiguredModelBindings } from "./model-bindings-applier";
 import { type ProviderDiscoveryState } from "./model-discovery-manager";
-import { type ModelPresetRegistryDependencies, type ModelPresetRegistryRefreshResult } from "./model-preset-registry";
+import { type AcceptedModelPresetRegistry, type ModelPresetRegistryDependencies, type ModelPresetRegistryRefreshResult } from "./model-preset-registry";
 export type { ProviderDiscoveryState, ProviderDiscoveryStatus } from "./model-discovery-manager";
 import { type CanonicalModelIndex, type CanonicalModelRecord, type CanonicalModelVariant, type ModelEquivalenceConfig } from "./model-equivalence";
 import { type ModelProfileDefinition } from "./model-profiles";
-import { GJC_MODEL_ASSIGNMENT_TARGET_IDS, type ModelProfileConfig } from "./models-config-schema";
+import { GJC_MODEL_ASSIGNMENT_TARGET_IDS, type ModelProfileConfig, type ModelsConfig } from "./models-config-schema";
 import { type EffectiveProviderAuth } from "./provider-selection-policy";
 import { type Settings } from "./settings";
 export type { BillingPath, BillingPathKind } from "./billing-path";
@@ -78,6 +78,7 @@ export declare const ModelsConfigFile: ConfigFile<{
             sendSessionHeaders?: boolean | undefined;
             supportsResponsesSessionAffinity?: boolean | undefined;
             supportsServiceTier?: boolean | undefined;
+            supportsUltrafastTier?: boolean | undefined;
             supportsMultipleSystemMessages?: boolean | undefined;
             supportsReasoningEffort?: boolean | undefined;
             reasoningEffortMap?: {
@@ -163,6 +164,7 @@ export declare const ModelsConfigFile: ConfigFile<{
                 sendSessionHeaders?: boolean | undefined;
                 supportsResponsesSessionAffinity?: boolean | undefined;
                 supportsServiceTier?: boolean | undefined;
+                supportsUltrafastTier?: boolean | undefined;
                 supportsMultipleSystemMessages?: boolean | undefined;
                 supportsReasoningEffort?: boolean | undefined;
                 reasoningEffortMap?: {
@@ -212,6 +214,7 @@ export declare const ModelsConfigFile: ConfigFile<{
                 extraBody?: Record<string, unknown> | undefined;
             } | undefined;
             cacheRetention?: "long" | "none" | "short" | undefined;
+            streamIdleTimeoutMs?: number | undefined;
         }[] | undefined;
         modelOverrides?: Record<string, {
             name?: string | undefined;
@@ -241,6 +244,7 @@ export declare const ModelsConfigFile: ConfigFile<{
                 sendSessionHeaders?: boolean | undefined;
                 supportsResponsesSessionAffinity?: boolean | undefined;
                 supportsServiceTier?: boolean | undefined;
+                supportsUltrafastTier?: boolean | undefined;
                 supportsMultipleSystemMessages?: boolean | undefined;
                 supportsReasoningEffort?: boolean | undefined;
                 reasoningEffortMap?: {
@@ -290,10 +294,12 @@ export declare const ModelsConfigFile: ConfigFile<{
                 extraBody?: Record<string, unknown> | undefined;
             } | undefined;
             cacheRetention?: "long" | "none" | "short" | undefined;
+            streamIdleTimeoutMs?: number | undefined;
         }> | undefined;
         disableStrictTools?: boolean | undefined;
         transport?: "pi-native" | undefined;
         cacheRetention?: "long" | "none" | "short" | undefined;
+        streamIdleTimeoutMs?: number | undefined;
         openaiCompat?: {
             baseUrl: string;
             apiKey?: string | undefined;
@@ -325,6 +331,7 @@ interface ProviderOverride {
     transport?: Model<Api>["transport"];
     requestTransform?: ModelRequestTransform;
     cacheRetention?: CacheRetention;
+    streamIdleTimeoutMs?: number;
     isOAuth?: boolean;
 }
 /**
@@ -359,7 +366,7 @@ export declare function registrySelectorResolvesToModel(selector: string, index:
  * See `xiaomi-tp-discovery-merge.test.ts` and the `refresh()` baseUrl-override
  * regression in `model-registry.test.ts`.
  */
-export declare function mergeDiscoveredModel<TApi extends Api>(model: Model<TApi>, existing: Model<Api> | undefined, providerOverride?: Pick<ProviderOverride, "baseUrl" | "headers" | "transport" | "requestTransform" | "cacheRetention">): Model<TApi>;
+export declare function mergeDiscoveredModel<TApi extends Api>(model: Model<TApi>, existing: Model<Api> | undefined, providerOverride?: Pick<ProviderOverride, "baseUrl" | "headers" | "transport" | "requestTransform" | "cacheRetention" | "streamIdleTimeoutMs">): Model<TApi>;
 export interface CanonicalModelQueryOptions {
     availableOnly?: boolean;
     candidates?: readonly Model<Api>[];
@@ -373,6 +380,27 @@ export interface CanonicalModelSelection {
     record: CanonicalModelRecord;
     model: Model<Api> | undefined;
 }
+/** Internal pure parser shared by discovery; exported for regression coverage. */
+export declare function extractGoogleOAuthProjectId(value: string | undefined, accessToken: string): string | undefined;
+export interface ModelsConfigReloadCandidate {
+    readonly valid: boolean;
+    readonly changed: boolean;
+    readonly diagnostics: {
+        readonly valid: boolean;
+        readonly errors: readonly unknown[];
+    };
+    readonly registry: ModelRegistry;
+    isCurrent(): boolean;
+    commit(): void;
+    rollback(): void;
+    finalize(): void;
+}
+interface ModelRegistryInternalOptions {
+    readonly configFile: ConfigFile<ModelsConfig>;
+    readonly configSource: LoadResult<ModelsConfig>;
+    readonly runtimeSource: ModelRegistry;
+    readonly acceptedPresets: AcceptedModelPresetRegistry;
+}
 /**
  * Model registry - loads and manages models, resolves API keys via AuthStorage.
  */
@@ -382,7 +410,15 @@ export declare class ModelRegistry {
     /**
      * @param authStorage - Auth storage for API key resolution
      */
-    constructor(authStorage: AuthStorage, modelsPath?: string, registrySettings?: Pick<Settings, "get" | "getGlobal"> & Partial<Pick<Settings, "commitAtomicBatchWithCurrent">>, modelPresetRegistryDependencies?: ModelPresetRegistryDependencies);
+    constructor(authStorage: AuthStorage, modelsPath?: string, registrySettings?: Pick<Settings, "get" | "getGlobal"> & Partial<Pick<Settings, "commitAtomicBatchWithCurrent">>, modelPresetRegistryDependencies?: ModelPresetRegistryDependencies, internalOptions?: ModelRegistryInternalOptions);
+    getModelsConfigPath(): string | undefined;
+    stageModelsConfigReload(snapshot: {
+        path: string;
+        text: string | null;
+        identity: string;
+    }, registrySettings?: Pick<Settings, "get" | "getGlobal">): Promise<ModelsConfigReloadCandidate>;
+    withConsumerLease<T>(body: () => T | Promise<T>, signal?: AbortSignal): Promise<T>;
+    acquirePublicationFence(signal?: AbortSignal): Promise<() => void>;
     dispose(): Promise<void>;
     onCatalogChanged(listener: () => void): () => void;
     /** Replace the read-only settings snapshot used by profile-scoped resolution. */
@@ -426,11 +462,25 @@ export declare class ModelRegistry {
     getConfiguredModelBindings(): ConfiguredModelBindings | undefined;
     /**
      * Get all models (embedded + accepted registry + custom).
+     * Supplying a credential session selects only that session's Google OAuth discovery catalog.
      * If models.yml had errors, returns embedded plus accepted registry models.
      */
-    getAll(): Model<Api>[];
+    getAll(credentialSessionId?: string): Model<Api>[];
     /** Provider ids declared in models.yml, including override-only providers. */
     getConfiguredProviderIds(): readonly string[];
+    /** Configured API-key sources in models.yml precedence order, excluding absent environment values. */
+    getProviderConfigApiKeySources(provider: string): Array<{
+        kind: "environment";
+        name: string;
+        provider: string;
+    } | {
+        kind: "models-yml";
+        provider: string;
+    }>;
+    /** Environment variable name for a provider API key supplied by runtime setup. */
+    getProviderRuntimeApiKeyEnvName(provider: string): string | undefined;
+    /** Whether a runtime extension's provider API key is currently installed in AuthStorage. */
+    hasRuntimeProviderApiKey(provider: string): boolean;
     /**
      * Whether this registry can serve a provider id from any active source.
      *
@@ -553,8 +603,9 @@ export declare class ModelRegistry {
      * is authoritative for visibility: live discovery only enriches entries and
      * adds unknown ids, and never removes a bundled model. A provider that cannot
      * serve a model reports its own error when the model is used.
+     * Without a credential session, project-scoped Google OAuth discoveries are omitted.
      */
-    getAvailable(): Model<Api>[];
+    getAvailable(credentialSessionId?: string): Model<Api>[];
     getActiveProviders(): ActiveProviderDescriptor[];
     /**
      * Check whether auth is configured for a model's provider.
@@ -583,7 +634,7 @@ export declare class ModelRegistry {
     /**
      * Find a model by provider and ID.
      */
-    find(provider: string, modelId: string): Model<Api> | undefined;
+    find(provider: string, modelId: string, credentialSessionId?: string): Model<Api> | undefined;
     /**
      * Get the base URL associated with a provider, if any model defines one.
      */
@@ -600,6 +651,15 @@ export declare class ModelRegistry {
         preferredCredentialSelector?: AuthCredentialSelector;
         signal?: AbortSignal;
     }): Promise<string | undefined>;
+    /** Get a model API key together with the stored row that resolved it, when any. */
+    getApiKeyWithCredentialRowId(model: Model<Api>, sessionId?: string, options?: {
+        credentialSelector?: AuthCredentialSelector;
+        preferredCredentialSelector?: AuthCredentialSelector;
+        signal?: AbortSignal;
+    }): Promise<{
+        apiKey: string | undefined;
+        credentialRowId: number | undefined;
+    }>;
     /**
      * Get API key for a provider (e.g., "openai").
      */
@@ -608,6 +668,10 @@ export declare class ModelRegistry {
         preferredCredentialSelector?: AuthCredentialSelector;
         signal?: AbortSignal;
     }): Promise<string | undefined>;
+    /** Check credential availability without resolving keys or refreshing OAuth tokens. */
+    hasUsableAuthForProvider(provider: string, sessionId?: string): boolean;
+    /** @internal Whether this registry is an unpublished staged reload candidate. */
+    isStagedReloadCandidate(): boolean;
     /**
      * Check if a model is using OAuth credentials (subscription).
      */

package/dist/types/config/model-resolver.d.ts

@@ -144,7 +144,7 @@ export declare function resolveModelFromSettings(options: {
 /**
  * Resolve a list of override patterns to the first matching model.
  */
-export declare function resolveModelOverride(modelPatterns: string[], modelRegistry: ModelLookupRegistry, settings?: Settings, sessionId?: string, aliasIntent?: "preset-equivalent" | "reject"): {
+export declare function resolveModelOverride(modelPatterns: string[], modelRegistry: ModelLookupRegistry, settings?: Settings, sessionId?: string, aliasIntent?: "preset-equivalent" | "reject", credentialSessionId?: string): {
     model?: Model<Api>;
     thinkingLevel?: ThinkingLevel;
     explicitThinkingLevel: boolean;
@@ -164,6 +164,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;
 }
 /**
@@ -245,7 +247,7 @@ export declare function resolveRoleSelection(roles: readonly string[], settings:
  * For each non-glob pattern, alias IDs are preferred over dated versions; otherwise
  * the latest dated version is selected.
  */
-export declare function resolveModelScope(patterns: string[], modelRegistry: Pick<ModelRegistry, "getAvailable" | "getCanonicalVariants">, preferences?: ModelMatchPreferences): Promise<ScopedModel[]>;
+export declare function resolveModelScope(patterns: string[], modelRegistry: Pick<ModelRegistry, "getAvailable" | "getCanonicalVariants">, preferences?: ModelMatchPreferences, credentialSessionId?: string): Promise<ScopedModel[]>;
 /**
  * Resolve the set of models a session is allowed to use, given the active
  * settings. Starts from `modelRegistry.getAvailable()` (so disabled providers
@@ -258,7 +260,7 @@ export declare function resolveModelScope(patterns: string[], modelRegistry: Pic
  * model matches any pattern — callers MUST treat this as "no usable model"
  * rather than falling back to the global default (see issue #1022).
  */
-export declare function resolveAllowedModels(modelRegistry: Pick<ModelRegistry, "getAvailable" | "getCanonicalVariants">, settings: Settings | undefined, preferences?: ModelMatchPreferences): Promise<Model<Api>[]>;
+export declare function resolveAllowedModels(modelRegistry: Pick<ModelRegistry, "getAvailable" | "getCanonicalVariants">, settings: Settings | undefined, preferences?: ModelMatchPreferences, credentialSessionId?: string): Promise<Model<Api>[]>;
 export interface ResolveCliModelResult {
     model: Model<Api> | undefined;
     selector?: string;
@@ -295,11 +297,12 @@ export declare function findInitialModel(options: {
     defaultModelId?: string;
     defaultThinkingSelector?: ThinkingLevel;
     modelRegistry: InitialModelRegistry;
+    credentialSessionId?: string;
 }): Promise<InitialModelResult>;
 /**
  * Restore model from session, with fallback to available models
  */
-export declare function restoreModelFromSession(savedProvider: string, savedModelId: string, currentModel: Model<Api> | undefined, shouldPrintMessages: boolean, modelRegistry: RestorableModelRegistry): Promise<{
+export declare function restoreModelFromSession(savedProvider: string, savedModelId: string, currentModel: Model<Api> | undefined, shouldPrintMessages: boolean, modelRegistry: RestorableModelRegistry, credentialSessionId?: string): Promise<{
     model: Model<Api> | undefined;
     fallbackMessage: string | undefined;
 }>;

package/dist/types/config/models-config-schema.d.ts

@@ -5,6 +5,7 @@ export declare const ModelCompatSchema: z.ZodObject<{
     sendSessionHeaders: z.ZodOptional<z.ZodBoolean>;
     supportsResponsesSessionAffinity: z.ZodOptional<z.ZodBoolean>;
     supportsServiceTier: z.ZodOptional<z.ZodBoolean>;
+    supportsUltrafastTier: z.ZodOptional<z.ZodBoolean>;
     supportsMultipleSystemMessages: z.ZodOptional<z.ZodBoolean>;
     supportsReasoningEffort: z.ZodOptional<z.ZodBoolean>;
     reasoningEffortMap: z.ZodOptional<z.ZodObject<{
@@ -76,6 +77,7 @@ export declare const OpenAICompatSchema: z.ZodObject<{
     sendSessionHeaders: z.ZodOptional<z.ZodBoolean>;
     supportsResponsesSessionAffinity: z.ZodOptional<z.ZodBoolean>;
     supportsServiceTier: z.ZodOptional<z.ZodBoolean>;
+    supportsUltrafastTier: z.ZodOptional<z.ZodBoolean>;
     supportsMultipleSystemMessages: z.ZodOptional<z.ZodBoolean>;
     supportsReasoningEffort: z.ZodOptional<z.ZodBoolean>;
     reasoningEffortMap: z.ZodOptional<z.ZodObject<{
@@ -265,6 +267,7 @@ export declare const ModelOverrideSchema: z.ZodObject<{
         sendSessionHeaders: z.ZodOptional<z.ZodBoolean>;
         supportsResponsesSessionAffinity: z.ZodOptional<z.ZodBoolean>;
         supportsServiceTier: z.ZodOptional<z.ZodBoolean>;
+        supportsUltrafastTier: z.ZodOptional<z.ZodBoolean>;
         supportsMultipleSystemMessages: z.ZodOptional<z.ZodBoolean>;
         supportsReasoningEffort: z.ZodOptional<z.ZodBoolean>;
         reasoningEffortMap: z.ZodOptional<z.ZodObject<{
@@ -345,6 +348,7 @@ export declare const ModelOverrideSchema: z.ZodObject<{
         none: "none";
         short: "short";
     }>>;
+    streamIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strict>;
 export type ModelOverride = z.infer<typeof ModelOverrideSchema>;
 export declare const ProviderDiscoverySchema: z.ZodObject<{
@@ -397,6 +401,7 @@ export declare const ModelsConfigSchema: z.ZodObject<{
             sendSessionHeaders: z.ZodOptional<z.ZodBoolean>;
             supportsResponsesSessionAffinity: z.ZodOptional<z.ZodBoolean>;
             supportsServiceTier: z.ZodOptional<z.ZodBoolean>;
+            supportsUltrafastTier: z.ZodOptional<z.ZodBoolean>;
             supportsMultipleSystemMessages: z.ZodOptional<z.ZodBoolean>;
             supportsReasoningEffort: z.ZodOptional<z.ZodBoolean>;
             reasoningEffortMap: z.ZodOptional<z.ZodObject<{
@@ -582,6 +587,7 @@ export declare const ModelsConfigSchema: z.ZodObject<{
                 sendSessionHeaders: z.ZodOptional<z.ZodBoolean>;
                 supportsResponsesSessionAffinity: z.ZodOptional<z.ZodBoolean>;
                 supportsServiceTier: z.ZodOptional<z.ZodBoolean>;
+                supportsUltrafastTier: z.ZodOptional<z.ZodBoolean>;
                 supportsMultipleSystemMessages: z.ZodOptional<z.ZodBoolean>;
                 supportsReasoningEffort: z.ZodOptional<z.ZodBoolean>;
                 reasoningEffortMap: z.ZodOptional<z.ZodObject<{
@@ -662,6 +668,7 @@ export declare const ModelsConfigSchema: z.ZodObject<{
                 none: "none";
                 short: "short";
             }>>;
+            streamIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
         }, z.core.$strict>>>;
         modelOverrides: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
@@ -731,6 +738,7 @@ export declare const ModelsConfigSchema: z.ZodObject<{
                 sendSessionHeaders: z.ZodOptional<z.ZodBoolean>;
                 supportsResponsesSessionAffinity: z.ZodOptional<z.ZodBoolean>;
                 supportsServiceTier: z.ZodOptional<z.ZodBoolean>;
+                supportsUltrafastTier: z.ZodOptional<z.ZodBoolean>;
                 supportsMultipleSystemMessages: z.ZodOptional<z.ZodBoolean>;
                 supportsReasoningEffort: z.ZodOptional<z.ZodBoolean>;
                 reasoningEffortMap: z.ZodOptional<z.ZodObject<{
@@ -811,6 +819,7 @@ export declare const ModelsConfigSchema: z.ZodObject<{
                 none: "none";
                 short: "short";
             }>>;
+            streamIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
         }, z.core.$strict>>>;
         disableStrictTools: z.ZodOptional<z.ZodBoolean>;
         transport: z.ZodOptional<z.ZodLiteral<"pi-native">>;
@@ -819,6 +828,7 @@ export declare const ModelsConfigSchema: z.ZodObject<{
             none: "none";
             short: "short";
         }>>;
+        streamIdleTimeoutMs: z.ZodOptional<z.ZodNumber>;
         openaiCompat: z.ZodOptional<z.ZodObject<{
             baseUrl: z.ZodString;
             apiKey: z.ZodOptional<z.ZodString>;