@123toto/ai-app-assistant-server 0.2.0 → 0.2.2

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { A as AiAppAssistant, a as AiAppAssistantStreamEvent, b as AiAppAssistantConfiguration, B as BuiltInProvider } from './managed-server-CthTKEQ6.cjs';
-export { c as AiAppAssistantAccessRule, d as AiAppAssistantConfigurationActor, e as AiAppAssistantConfigurationAdministration, f as AiAppAssistantConfigurationAuditChange, g as AiAppAssistantConfigurationAuditEntry, h as AiAppAssistantConfigurationAuditField, i as AiAppAssistantConfigurationChangeEvent, j as AiAppAssistantConfigurationConflictError, k as AiAppAssistantConfigurationManager, l as AiAppAssistantConfigurationManagerOptions, m as AiAppAssistantConfigurationRepository, n as AiAppAssistantConfigurationSaveResult, o as AiAppAssistantConfigurationSynchronizer, p as AiAppAssistantConfigurationView, q as AiAppAssistantGenerationEvent, r as AiAppAssistantGenerationOperation, s as AiAppAssistantKeyValueStore, t as AiAppAssistantManagedConfigurationSetup, u as AiAppAssistantManagedStorage, v as AiAppAssistantManagementError, w as AiAppAssistantManagementErrorCode, x as AiAppAssistantQuotaPolicy, y as AiAppAssistantQuotaResult, z as AiAppAssistantQuotaStore, C as AiAppAssistantRecentFailure, D as AiAppAssistantRedisClient, E as AiAppAssistantRedisQuotaClient, F as AiAppAssistantRedisTelemetryClient, G as AiAppAssistantRuntimeIdentity, H as AiAppAssistantSecretProtector, I as AiAppAssistantTelemetryStore, J as AiAppAssistantTelemetrySummary, K as AiModelDiscoveryError, L as AiModelInfo, N as AiProviderInfo, O as CreateAiAppAssistantConfigurationRepositoryOptions, P as CreateManagedAiAppAssistantRuntimeOptions, Q as CreateManagedAiAppAssistantServerOptions, R as ListAiModelsOptions, S as ManagedAiAppAssistantFetchHandlerOptions, T as ManagedAiAppAssistantFetchHandlers, U as ManagedAiAppAssistantRuntime, M as ManagedAiAppAssistantServer, V as createAes256GcmSecretProtector, W as createAiAppAssistant, X as createAiAppAssistantConfigurationRepository, Y as createAiAppAssistantFailureEvent, Z as createDisabledSecretProtector, _ as createManagedAiAppAssistantFetchHandlers, $ as createManagedAiAppAssistantRuntime, a0 as createManagedAiAppAssistantServer, a1 as createMemoryAiAppAssistantQuotaStore, a2 as createMemoryAiAppAssistantStore, a3 as createMemoryAiAppAssistantTelemetryStore, a4 as createPollingAiAppAssistantConfigurationSynchronizer, a5 as createRedisAiAppAssistantQuotaStore, a6 as createRedisAiAppAssistantStore, a7 as createRedisAiAppAssistantTelemetryStore, a8 as listAiModels, a9 as listAiProviders, aa as validateAndSaveAiAppAssistantConfiguration } from './managed-server-CthTKEQ6.cjs';
+import { A as AiAppAssistant, a as AiAppAssistantStreamEvent, b as AiAppAssistantConfiguration, B as BuiltInProvider } from './managed-server-wXfu_9rp.cjs';
+export { c as AI_APP_ASSISTANT_PROVIDERS, d as AiAppAssistantAccessRule, e as AiAppAssistantConfigurationActor, f as AiAppAssistantConfigurationAdministration, g as AiAppAssistantConfigurationAuditChange, h as AiAppAssistantConfigurationAuditEntry, i as AiAppAssistantConfigurationAuditField, j as AiAppAssistantConfigurationChangeEvent, k as AiAppAssistantConfigurationConflictError, l as AiAppAssistantConfigurationManager, m as AiAppAssistantConfigurationManagerOptions, n as AiAppAssistantConfigurationRepository, o as AiAppAssistantConfigurationSaveResult, p as AiAppAssistantConfigurationSynchronizer, q as AiAppAssistantConfigurationView, r as AiAppAssistantGenerationEvent, s as AiAppAssistantGenerationOperation, t as AiAppAssistantKeyValueStore, u as AiAppAssistantManagedConfigurationSetup, v as AiAppAssistantManagedStorage, w as AiAppAssistantManagementError, x as AiAppAssistantManagementErrorCode, y as AiAppAssistantQuotaPolicy, z as AiAppAssistantQuotaResult, C as AiAppAssistantQuotaStore, D as AiAppAssistantRecentFailure, E as AiAppAssistantRedisClient, F as AiAppAssistantRedisQuotaClient, G as AiAppAssistantRedisTelemetryClient, H as AiAppAssistantRuntimeIdentity, I as AiAppAssistantSecretProtector, J as AiAppAssistantTelemetryStore, K as AiAppAssistantTelemetrySummary, L as AiModelDiscoveryError, N as AiModelInfo, O as AiProviderInfo, P as CreateAiAppAssistantConfigurationRepositoryOptions, Q as CreateManagedAiAppAssistantRuntimeOptions, R as CreateManagedAiAppAssistantServerOptions, S as ListAiModelsOptions, T as ManagedAiAppAssistantFetchHandlerOptions, U as ManagedAiAppAssistantFetchHandlers, V as ManagedAiAppAssistantRuntime, M as ManagedAiAppAssistantServer, W as createAes256GcmSecretProtector, X as createAiAppAssistant, Y as createAiAppAssistantConfigurationRepository, Z as createAiAppAssistantFailureEvent, _ as createDisabledSecretProtector, $ as createManagedAiAppAssistantFetchHandlers, a0 as createManagedAiAppAssistantRuntime, a1 as createManagedAiAppAssistantServer, a2 as createMemoryAiAppAssistantQuotaStore, a3 as createMemoryAiAppAssistantStore, a4 as createMemoryAiAppAssistantTelemetryStore, a5 as createPollingAiAppAssistantConfigurationSynchronizer, a6 as createRedisAiAppAssistantQuotaStore, a7 as createRedisAiAppAssistantStore, a8 as createRedisAiAppAssistantTelemetryStore, a9 as listAiModels, aa as listAiProviders, ab as validateAndSaveAiAppAssistantConfiguration } from './managed-server-wXfu_9rp.cjs';
 import { AiAppAssistantRequest, AiAppAssistantResponse } from '@123toto/ai-app-assistant-contracts';
 export { AiAppAssistantConfigurationFieldSource, AiAppAssistantConfigurationInput, AiAppAssistantConfigurationOptions, AiAppAssistantConnectionResult, AiAppAssistantConnectionTestInput, AiAppAssistantCredentials, AiAppAssistantManagedConfigurationView, AiAppAssistantModelInfoContract, AiAppAssistantProvider, AiAppAssistantProviderInfoContract, AiAppAssistantRequest, AiAppAssistantResponse, AiAppAssistantRuntimeConnection, AiAppAssistantRuntimeConnectionStatus, AiAppAssistantTransportEvent, EvidenceSource, GeneratedAnswer, PROTOCOL_VERSION, aiAppAssistantAccessRuleSchema, aiAppAssistantConfigurationInputSchema, aiAppAssistantConfigurationOptionsSchema, aiAppAssistantConfigurationSaveResultSchema, aiAppAssistantConnectionResultSchema, aiAppAssistantConnectionTestInputSchema, aiAppAssistantCredentialsSchema, aiAppAssistantManagedConfigurationViewSchema, aiAppAssistantModelInfoSchema, aiAppAssistantProviderInfoSchema, aiAppAssistantProviderSchema, aiAppAssistantRequestSchema, aiAppAssistantResponseSchema, aiAppAssistantTransportEventSchema } from '@123toto/ai-app-assistant-contracts';
 import { IncomingMessage, ServerResponse } from 'node:http';
@@ -89,9 +89,17 @@ declare function createAiAppAssistantServer<TContext = undefined>(options: Creat
 
 interface AiAppAssistantDeploymentDefaultsOptions {
     enabled: boolean;
-    /** `provider:model`, for example `mistral:mistral-small-latest`. */
+    /** Provider selected by the host application. Allows `model` to remain a plain model identifier. */
+    provider?: BuiltInProvider;
+    /** Plain model identifier when `provider` is set, or legacy `provider:model` identifier. */
     model?: string;
+    /** API key for the selected provider. Prefer this for one-provider deployments. */
+    apiKey?: string;
+    /** Provider endpoint override. Required by local providers such as Ollama. */
+    baseURL?: string;
+    /** @deprecated Prefer `provider` with the singular `apiKey` option. */
     apiKeys?: Partial<Record<BuiltInProvider, string | undefined>>;
+    /** @deprecated Prefer `provider` with the singular `baseURL` option. */
     baseURLs?: Partial<Record<BuiltInProvider, string | undefined>>;
     access?: AiAppAssistantConfiguration["access"];
     quota?: AiAppAssistantConfiguration["quota"];

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { A as AiAppAssistant, a as AiAppAssistantStreamEvent, b as AiAppAssistantConfiguration, B as BuiltInProvider } from './managed-server-BGQ-1jkx.js';
-export { c as AiAppAssistantAccessRule, d as AiAppAssistantConfigurationActor, e as AiAppAssistantConfigurationAdministration, f as AiAppAssistantConfigurationAuditChange, g as AiAppAssistantConfigurationAuditEntry, h as AiAppAssistantConfigurationAuditField, i as AiAppAssistantConfigurationChangeEvent, j as AiAppAssistantConfigurationConflictError, k as AiAppAssistantConfigurationManager, l as AiAppAssistantConfigurationManagerOptions, m as AiAppAssistantConfigurationRepository, n as AiAppAssistantConfigurationSaveResult, o as AiAppAssistantConfigurationSynchronizer, p as AiAppAssistantConfigurationView, q as AiAppAssistantGenerationEvent, r as AiAppAssistantGenerationOperation, s as AiAppAssistantKeyValueStore, t as AiAppAssistantManagedConfigurationSetup, u as AiAppAssistantManagedStorage, v as AiAppAssistantManagementError, w as AiAppAssistantManagementErrorCode, x as AiAppAssistantQuotaPolicy, y as AiAppAssistantQuotaResult, z as AiAppAssistantQuotaStore, C as AiAppAssistantRecentFailure, D as AiAppAssistantRedisClient, E as AiAppAssistantRedisQuotaClient, F as AiAppAssistantRedisTelemetryClient, G as AiAppAssistantRuntimeIdentity, H as AiAppAssistantSecretProtector, I as AiAppAssistantTelemetryStore, J as AiAppAssistantTelemetrySummary, K as AiModelDiscoveryError, L as AiModelInfo, N as AiProviderInfo, O as CreateAiAppAssistantConfigurationRepositoryOptions, P as CreateManagedAiAppAssistantRuntimeOptions, Q as CreateManagedAiAppAssistantServerOptions, R as ListAiModelsOptions, S as ManagedAiAppAssistantFetchHandlerOptions, T as ManagedAiAppAssistantFetchHandlers, U as ManagedAiAppAssistantRuntime, M as ManagedAiAppAssistantServer, V as createAes256GcmSecretProtector, W as createAiAppAssistant, X as createAiAppAssistantConfigurationRepository, Y as createAiAppAssistantFailureEvent, Z as createDisabledSecretProtector, _ as createManagedAiAppAssistantFetchHandlers, $ as createManagedAiAppAssistantRuntime, a0 as createManagedAiAppAssistantServer, a1 as createMemoryAiAppAssistantQuotaStore, a2 as createMemoryAiAppAssistantStore, a3 as createMemoryAiAppAssistantTelemetryStore, a4 as createPollingAiAppAssistantConfigurationSynchronizer, a5 as createRedisAiAppAssistantQuotaStore, a6 as createRedisAiAppAssistantStore, a7 as createRedisAiAppAssistantTelemetryStore, a8 as listAiModels, a9 as listAiProviders, aa as validateAndSaveAiAppAssistantConfiguration } from './managed-server-BGQ-1jkx.js';
+import { A as AiAppAssistant, a as AiAppAssistantStreamEvent, b as AiAppAssistantConfiguration, B as BuiltInProvider } from './managed-server-CusQWWBB.js';
+export { c as AI_APP_ASSISTANT_PROVIDERS, d as AiAppAssistantAccessRule, e as AiAppAssistantConfigurationActor, f as AiAppAssistantConfigurationAdministration, g as AiAppAssistantConfigurationAuditChange, h as AiAppAssistantConfigurationAuditEntry, i as AiAppAssistantConfigurationAuditField, j as AiAppAssistantConfigurationChangeEvent, k as AiAppAssistantConfigurationConflictError, l as AiAppAssistantConfigurationManager, m as AiAppAssistantConfigurationManagerOptions, n as AiAppAssistantConfigurationRepository, o as AiAppAssistantConfigurationSaveResult, p as AiAppAssistantConfigurationSynchronizer, q as AiAppAssistantConfigurationView, r as AiAppAssistantGenerationEvent, s as AiAppAssistantGenerationOperation, t as AiAppAssistantKeyValueStore, u as AiAppAssistantManagedConfigurationSetup, v as AiAppAssistantManagedStorage, w as AiAppAssistantManagementError, x as AiAppAssistantManagementErrorCode, y as AiAppAssistantQuotaPolicy, z as AiAppAssistantQuotaResult, C as AiAppAssistantQuotaStore, D as AiAppAssistantRecentFailure, E as AiAppAssistantRedisClient, F as AiAppAssistantRedisQuotaClient, G as AiAppAssistantRedisTelemetryClient, H as AiAppAssistantRuntimeIdentity, I as AiAppAssistantSecretProtector, J as AiAppAssistantTelemetryStore, K as AiAppAssistantTelemetrySummary, L as AiModelDiscoveryError, N as AiModelInfo, O as AiProviderInfo, P as CreateAiAppAssistantConfigurationRepositoryOptions, Q as CreateManagedAiAppAssistantRuntimeOptions, R as CreateManagedAiAppAssistantServerOptions, S as ListAiModelsOptions, T as ManagedAiAppAssistantFetchHandlerOptions, U as ManagedAiAppAssistantFetchHandlers, V as ManagedAiAppAssistantRuntime, M as ManagedAiAppAssistantServer, W as createAes256GcmSecretProtector, X as createAiAppAssistant, Y as createAiAppAssistantConfigurationRepository, Z as createAiAppAssistantFailureEvent, _ as createDisabledSecretProtector, $ as createManagedAiAppAssistantFetchHandlers, a0 as createManagedAiAppAssistantRuntime, a1 as createManagedAiAppAssistantServer, a2 as createMemoryAiAppAssistantQuotaStore, a3 as createMemoryAiAppAssistantStore, a4 as createMemoryAiAppAssistantTelemetryStore, a5 as createPollingAiAppAssistantConfigurationSynchronizer, a6 as createRedisAiAppAssistantQuotaStore, a7 as createRedisAiAppAssistantStore, a8 as createRedisAiAppAssistantTelemetryStore, a9 as listAiModels, aa as listAiProviders, ab as validateAndSaveAiAppAssistantConfiguration } from './managed-server-CusQWWBB.js';
 import { AiAppAssistantRequest, AiAppAssistantResponse } from '@123toto/ai-app-assistant-contracts';
 export { AiAppAssistantConfigurationFieldSource, AiAppAssistantConfigurationInput, AiAppAssistantConfigurationOptions, AiAppAssistantConnectionResult, AiAppAssistantConnectionTestInput, AiAppAssistantCredentials, AiAppAssistantManagedConfigurationView, AiAppAssistantModelInfoContract, AiAppAssistantProvider, AiAppAssistantProviderInfoContract, AiAppAssistantRequest, AiAppAssistantResponse, AiAppAssistantRuntimeConnection, AiAppAssistantRuntimeConnectionStatus, AiAppAssistantTransportEvent, EvidenceSource, GeneratedAnswer, PROTOCOL_VERSION, aiAppAssistantAccessRuleSchema, aiAppAssistantConfigurationInputSchema, aiAppAssistantConfigurationOptionsSchema, aiAppAssistantConfigurationSaveResultSchema, aiAppAssistantConnectionResultSchema, aiAppAssistantConnectionTestInputSchema, aiAppAssistantCredentialsSchema, aiAppAssistantManagedConfigurationViewSchema, aiAppAssistantModelInfoSchema, aiAppAssistantProviderInfoSchema, aiAppAssistantProviderSchema, aiAppAssistantRequestSchema, aiAppAssistantResponseSchema, aiAppAssistantTransportEventSchema } from '@123toto/ai-app-assistant-contracts';
 import { IncomingMessage, ServerResponse } from 'node:http';
@@ -89,9 +89,17 @@ declare function createAiAppAssistantServer<TContext = undefined>(options: Creat
 
 interface AiAppAssistantDeploymentDefaultsOptions {
     enabled: boolean;
-    /** `provider:model`, for example `mistral:mistral-small-latest`. */
+    /** Provider selected by the host application. Allows `model` to remain a plain model identifier. */
+    provider?: BuiltInProvider;
+    /** Plain model identifier when `provider` is set, or legacy `provider:model` identifier. */
     model?: string;
+    /** API key for the selected provider. Prefer this for one-provider deployments. */
+    apiKey?: string;
+    /** Provider endpoint override. Required by local providers such as Ollama. */
+    baseURL?: string;
+    /** @deprecated Prefer `provider` with the singular `apiKey` option. */
     apiKeys?: Partial<Record<BuiltInProvider, string | undefined>>;
+    /** @deprecated Prefer `provider` with the singular `baseURL` option. */
     baseURLs?: Partial<Record<BuiltInProvider, string | undefined>>;
     access?: AiAppAssistantConfiguration["access"];
     quota?: AiAppAssistantConfiguration["quota"];

package/dist/index.js

@@ -751,6 +751,7 @@ function quotaResult(count, resetAt, maxRequests, now) {
 }
 
 // src/provider-catalog.ts
+var AI_APP_ASSISTANT_PROVIDERS = ["anthropic", "google", "mistral", "ollama", "openai"];
 var PROVIDERS = Object.freeze([
   { id: "anthropic", label: "Anthropic", requiresApiKey: true, supportsModelDiscovery: true },
   { id: "google", label: "Google Gemini", requiresApiKey: true, supportsModelDiscovery: true },
@@ -896,12 +897,17 @@ var AiAppAssistantConfigurationManager = class {
     this.#repository = options.repository;
     this.#quotaStore = options.quotaStore ?? createMemoryAiAppAssistantQuotaStore();
   }
+  /** Returns the current state of the host-controlled global kill switch. */
+  isEnabled() {
+    return typeof this.#options.enabled === "function" ? this.#options.enabled() : this.#options.enabled ?? true;
+  }
   /** Returns the built-in provider catalogue; no credentials are exposed. */
   listProviders() {
     return listAiProviders();
   }
   /** Discovers models with an explicit key or the currently configured secret. */
   async listModels(input) {
+    this.assertEnabled();
     const apiKey = await this.resolveApiKey(input.provider, input.apiKey);
     if (this.#options.listModels) {
       return this.#options.listModels({ ...input, ...apiKey ? { apiKey } : {} });
@@ -927,7 +933,10 @@ var AiAppAssistantConfigurationManager = class {
         let connected = event.connectionValidated;
         if (event.reloadRequired) {
           this.#recentConnectionValidation = void 0;
-          if (connected) {
+          if (!this.isEnabled()) {
+            connected = false;
+            this.#runtimeConnection = { status: "disabled", checkedAt: this.now() };
+          } else if (connected) {
             const configuration = await this.getRuntimeConfiguration();
             this.#runtimeConnection = configuration ? {
               status: "connected",
@@ -957,6 +966,7 @@ var AiAppAssistantConfigurationManager = class {
   }
   /** Tests credentials and briefly caches a successful result for the next save. */
   async testConnection(input) {
+    this.assertEnabled();
     const apiKey = await this.resolveApiKey(input.provider, input.apiKey);
     const connection = this.#options.testConnection ? await this.#options.testConnection({ ...input, ...apiKey ? { apiKey } : {} }) : await testAiSdkConnection({
       model: `${input.provider}:${input.model}`,
@@ -985,6 +995,10 @@ var AiAppAssistantConfigurationManager = class {
   /** Checks the effective stored/deployment connection used by live questions. */
   async validateRuntimeConnection() {
     this.#lastReconnectAttempt = Date.now();
+    if (!this.isEnabled()) {
+      this.#runtimeConnection = { status: "disabled", checkedAt: this.now() };
+      return false;
+    }
     const configuration = await this.getRuntimeConfiguration();
     if (!configuration || configuration.provider !== "ollama" && !configuration.apiKey) {
       this.#runtimeConnection = {
@@ -1027,6 +1041,7 @@ var AiAppAssistantConfigurationManager = class {
     const initialActive = this.effectiveConfiguration(initial);
     const initialApiKey = input.apiKey ?? (initialActive?.provider === input.provider ? initialActive.apiKey : void 0) ?? this.resolveDefaultApiKey(input.provider);
     const initialConnectionChanged = connectionChanged(initialActive, input);
+    if (!this.isEnabled() && initialConnectionChanged) throw disabled();
     let connection = initialConnectionChanged ? await this.validateConnectionForSave(input, initialApiKey) : this.lastKnownConnection(input.provider, input.model);
     if (initialConnectionChanged && !connection.success) {
       return { saved: false, connection, reloadRequired: false };
@@ -1255,6 +1270,7 @@ var AiAppAssistantConfigurationManager = class {
   }
   /** Combines configuration, provider health and application access rules. */
   async canUse(identity) {
+    if (!this.isEnabled()) return false;
     const configuration = await this.getRuntimeConfiguration();
     if (!configuration || configuration.provider !== "ollama" && !configuration.apiKey) return false;
     if (!await this.ensureRuntimeConnection()) return false;
@@ -1273,6 +1289,7 @@ var AiAppAssistantConfigurationManager = class {
   }
   /** Enforces access and quota immediately before any model call. */
   async assertCanAsk(identity) {
+    this.assertEnabled();
     if (!await this.canUse(identity)) {
       throw forbidden("AI assistant access is not enabled for this user");
     }
@@ -1288,6 +1305,7 @@ var AiAppAssistantConfigurationManager = class {
   }
   /** Retries a failed provider lazily, with a shared backoff across requests. */
   async ensureRuntimeConnection() {
+    if (!this.isEnabled()) return false;
     if (this.#runtimeConnection.status === "connected") return true;
     const intervalMs = Math.max(1e3, this.#options.reconnectIntervalMs ?? 3e4);
     if (Date.now() - this.#lastReconnectAttempt < intervalMs) return false;
@@ -1395,6 +1413,9 @@ var AiAppAssistantConfigurationManager = class {
   now() {
     return (this.#options.now?.() ?? /* @__PURE__ */ new Date()).toISOString();
   }
+  assertEnabled() {
+    if (!this.isEnabled()) throw disabled();
+  }
   async publishAndEmit(event) {
     await this.#options.synchronizer?.publish(event);
     await this.emit(event);
@@ -1518,6 +1539,13 @@ function configurationChanges(previous, input, allowModelChangesByOthers) {
 function forbidden(message) {
   return new AiAppAssistantManagementError(403, "forbidden", message);
 }
+function disabled() {
+  return new AiAppAssistantManagementError(
+    503,
+    "assistant_disabled",
+    "AI assistant is disabled"
+  );
+}
 
 // src/telemetry.ts
 function createMemoryAiAppAssistantTelemetryStore(options) {
@@ -1687,6 +1715,11 @@ function createManagedAiAppAssistantRuntime(options) {
     return reloadQueue;
   });
   const rebuild = async (event) => {
+    if (!options.configuration.isEnabled()) {
+      assistant = void 0;
+      activeGenerator = void 0;
+      return;
+    }
     const connected = event.connectionValidated || await options.configuration.validateRuntimeConnection();
     const configuration = await options.configuration.getRuntimeConfiguration();
     if (!connected || !configuration) {
@@ -2078,21 +2111,38 @@ function createAiAppAssistantDeploymentDefaults(options) {
   const apiKeys = Object.fromEntries(
     Object.entries(options.apiKeys ?? {}).map(([provider2, value]) => [provider2, value?.trim() || void 0])
   );
-  const resolveApiKey = (provider2) => apiKeys[provider2];
+  const selectedProvider = options.provider;
+  const selectedApiKey = options.apiKey?.trim() || void 0;
+  const resolveApiKey = (provider2) => provider2 === selectedProvider ? selectedApiKey ?? apiKeys[provider2] : apiKeys[provider2];
   if (!options.enabled || !options.model?.trim()) return { resolveApiKey };
-  const match = options.model.trim().match(/^([^:/]+)[:/](.+)$/);
-  if (!match) throw new TypeError(`Invalid AI App Assistant model identifier: ${options.model}`);
-  const provider = match[1] === "gemini" ? "google" : match[1];
+  const rawModel = options.model.trim();
+  const legacyMatch = selectedProvider ? void 0 : rawModel.match(/^([^:/]+)[:/](.+)$/);
+  const explicitMatch = selectedProvider ? rawModel.match(/^([^:]+):(.+)$/) : void 0;
+  if (!selectedProvider && !legacyMatch) {
+    throw new TypeError(`Invalid AI App Assistant model identifier: ${options.model}`);
+  }
+  const parsedProvider = legacyMatch?.[1] ?? explicitMatch?.[1];
+  const modelProvider = parsedProvider === "gemini" ? "google" : parsedProvider ?? selectedProvider;
+  const provider = modelProvider;
   if (!listAiProviders().some((candidate) => candidate.id === provider)) {
-    throw new TypeError(`Unsupported AI App Assistant provider: ${match[1]}`);
+    throw new TypeError(`Unsupported AI App Assistant provider: ${modelProvider}`);
+  }
+  if (selectedProvider && explicitMatch && provider !== selectedProvider) {
+    throw new TypeError(
+      `AI App Assistant provider '${selectedProvider}' does not match model identifier '${options.model}'`
+    );
   }
+  const model = legacyMatch?.[2]?.trim() ?? explicitMatch?.[2]?.trim() ?? rawModel;
   const apiKey = resolveApiKey(provider);
-  const baseURL = options.baseURLs?.[provider]?.trim() || void 0;
+  const baseURL = (provider === selectedProvider ? options.baseURL?.trim() : void 0) || options.baseURLs?.[provider]?.trim() || void 0;
+  if (provider === "ollama" && !baseURL) {
+    throw new TypeError("AI App Assistant local provider 'ollama' requires a base URL");
+  }
   return {
     resolveApiKey,
     configuration: {
       provider,
-      model: match[2].trim(),
+      model,
       connectionSource: "environment",
       ...apiKey ? { apiKey } : {},
       ...baseURL ? { baseURL } : {},
@@ -2319,6 +2369,7 @@ import {
   aiAppAssistantTransportEventSchema
 } from "@123toto/ai-app-assistant-contracts";
 export {
+  AI_APP_ASSISTANT_PROVIDERS,
   AiAppAssistantConfigurationConflictError,
   AiAppAssistantConfigurationManager,
   AiAppAssistantManagementError,