@xopcai/xopc 0.0.210 → 0.0.213

package/dist/src/agent/tools/image-generate-tool.js

@@ -1,6 +1,8 @@
 import { getAgentDefaultImageGenerationModelConfig, init_schema } from "../../config/schema.js";
 import { imageAssetFromDataUrl, imageFileExtensionForMimeType, mimeTypeFromFileName, parseImageDataUrl, sniffImageMimeType } from "../image/generation/image-assets.js";
 import { persistToolMedia } from "./tool-media.js";
+import { buildCapabilityPlansForConfig } from "../../capabilities/readiness/from-config.js";
+import "../../capabilities/readiness/index.js";
 import { applyImageGenerationModelConfigDefaults } from "../image/image-helpers.js";
 import { isFailoverError } from "../failover-error.js";
 import { getImageGenerationProvider } from "../image/generation/provider-registry.js";
@@ -127,14 +129,28 @@ async function loadInputImages(params) {
 }
 function resolveImageGenerationModelConfigForTool(params) {
 	const explicit = params.cfg ? getAgentDefaultImageGenerationModelConfig(params.cfg, params.agentId) : void 0;
-	if (explicit?.primary?.trim()) return {
-		primary: explicit.primary.trim(),
-		...explicit.fallbacks?.length ? { fallbacks: explicit.fallbacks } : {},
-		...explicit.timeoutMs ? { timeoutMs: explicit.timeoutMs } : {},
-		...explicit.autoProviderFallback ? { autoProviderFallback: true } : {}
-	};
+	if (explicit?.primary?.trim()) {
+		const plan = buildCapabilityPlansForConfig(params.cfg)["image-generation"];
+		const primarySlash = explicit.primary.indexOf("/");
+		const primaryProvider = primarySlash > 0 ? explicit.primary.slice(0, primarySlash) : "";
+		const managed = plan.primary ? [plan.primary, ...plan.fallbacks].filter((candidate) => explicit.autoProviderFallback || candidate.provider === primaryProvider).map((candidate) => `${candidate.provider}/${candidate.model}`) : [];
+		const fallbacks = [...new Set([...explicit.fallbacks ?? [], ...managed])].filter((ref) => ref !== explicit.primary);
+		return {
+			primary: explicit.primary.trim(),
+			...fallbacks.length ? { fallbacks } : {},
+			...explicit.timeoutMs ? { timeoutMs: explicit.timeoutMs } : {},
+			...explicit.autoProviderFallback ? { autoProviderFallback: true } : {}
+		};
+	}
+	let planned;
+	if (params.cfg) try {
+		planned = buildCapabilityPlansForConfig(params.cfg)["image-generation"];
+	} catch {
+		planned = void 0;
+	}
+	const plannedRefs = planned?.primary ? [planned.primary, ...planned.fallbacks].map((candidate) => `${candidate.provider}/${candidate.model}`) : [];
 	const providers = listImageGenerationProvidersSummary();
-	const candidates = [];
+	const candidates = [...plannedRefs];
 	for (const providerSummary of providers) {
 		const provider = getImageGenerationProvider(providerSummary.id);
 		let configured = false;

package/dist/src/agent-runtime/index.js

@@ -1,7 +1,7 @@
+import { buildMemoryRuntime } from "./memory-runtime.js";
 import { checkBoundary } from "./boundary-guard.js";
 import { resolveModelRole } from "./model-router.js";
 import { buildRuntimeToolRegistry } from "./tool-registry.js";
-import { buildMemoryRuntime } from "./memory-runtime.js";
 import { resolveWorkflow, validateWorkflowForRuntime } from "./workflow-runtime.js";
 import { buildAgentRuntimeProfile } from "./runtime-profile.js";
 import { appendAgentRunEvent, createAgentRunTrace, finishAgentRunTrace, hashEffectiveManifest } from "./run-trace.js";

package/dist/src/agent-runtime/runtime-profile.js

@@ -1,9 +1,9 @@
 import { buildAgentManifestPromptSection } from "../agent-manifest/prompt.js";
 import "../agent-manifest/index.js";
+import { buildMemoryRuntime } from "./memory-runtime.js";
 import { checkBoundary } from "./boundary-guard.js";
 import { resolveModelRole } from "./model-router.js";
 import { buildRuntimeToolRegistry } from "./tool-registry.js";
-import { buildMemoryRuntime } from "./memory-runtime.js";
 import { resolveWorkflow, validateWorkflowForRuntime } from "./workflow-runtime.js";
 //#region src/agent-runtime/runtime-profile.ts
 function buildAgentRuntimeProfile(params) {

package/dist/src/auth/oauth/xopc-cloud.js

@@ -380,7 +380,7 @@ var init_xopc_cloud = __esmMin((() => {
 	init_pkce();
 	CLIENT_ID = "xopc-native";
 	DEFAULT_CONSOLE_URL = "https://console.xopc.ai";
-	DEFAULT_SCOPE = "models:read models:invoke account:usage offline_access";
+	DEFAULT_SCOPE = "models:read models:invoke account:usage connectors:read connectors:manage connectors:execute offline_access";
 	CALLBACK_PATH = "/oauth/callback";
 	AUTHORIZATION_TIMEOUT_MS = 5 * 6e4;
 	xopcCloudOAuthProvider = {

package/dist/src/capabilities/readiness/from-config.d.ts

@@ -0,0 +1,10 @@
+import type { Config } from '../../config/schema.js';
+import { type ModelCatalogSnapshot } from '../../providers/model-catalog-store.js';
+import type { CapabilityId, CapabilityPlan } from './types.js';
+interface BuildPlansOptions {
+    catalog?: ModelCatalogSnapshot;
+    providerReady?: (providerId: string) => boolean;
+    localSttReady?: boolean;
+}
+export declare function buildCapabilityPlansForConfig(config: Config, options?: BuildPlansOptions): Record<CapabilityId, CapabilityPlan>;
+export {};

package/dist/src/capabilities/readiness/from-config.js

@@ -0,0 +1,128 @@
+import { getAgentDefaultImageGenerationModelConfig, getAgentDefaultImageModelConfig, init_schema, parseModelRef } from "../../config/schema.js";
+import { getModelCatalogStore, init_model_catalog_store } from "../../providers/model-catalog-store.js";
+import { init_providers, isProviderConfiguredSync } from "../../providers/index.js";
+import { compareCatalogModels } from "../../providers/model-catalog-ranking.js";
+import { DEFAULT_LOCAL_VOICE_MODEL_ID, hasInstalledLocalVoiceModel } from "../../voice/local/models.js";
+import { planCapabilities } from "./planner.js";
+//#region src/capabilities/readiness/from-config.ts
+init_schema();
+init_model_catalog_store();
+init_providers();
+function buildCapabilityPlansForConfig(config, options = {}) {
+	const catalog = options.catalog ?? getModelCatalogStore().load();
+	const cloud = catalog.sources["xopc-cloud"];
+	const providerReady = options.providerReady ?? defaultProviderReady;
+	const cloudReady = providerReady("xopc-cloud");
+	const agentId = config.agents.default ?? config.agents.list[0]?.id ?? "main";
+	const stt = config.tools?.media?.audio;
+	const tts = config.messages?.tts;
+	const policies = {
+		vision: { explicit: refs(getAgentDefaultImageModelConfig(config)) },
+		"image-generation": { explicit: refs(getAgentDefaultImageGenerationModelConfig(config, agentId)) },
+		stt: {
+			disabled: stt?.enabled === false,
+			explicit: stt ? sttRefs(stt) : void 0
+		},
+		tts: {
+			disabled: tts?.enabled === false,
+			explicit: tts ? ttsRefs(tts) : void 0
+		}
+	};
+	markExplicitReadiness(policies, catalog, providerReady);
+	return planCapabilities({
+		policies,
+		automatic: {
+			vision: cloudCandidates("vision", cloud?.models ?? [], cloudReady, 0, cloud?.recommended?.vision),
+			"image-generation": cloudCandidates("image-generation", cloud?.models ?? [], cloudReady, 0, cloud?.recommended?.["image-generation"]),
+			stt: [candidate("stt", "xopc-local", DEFAULT_LOCAL_VOICE_MODEL_ID, "installed-local", options.localSttReady ?? hasInstalledLocalVoiceModel(), 0), ...cloudCandidates("stt", cloud?.models ?? [], cloudReady, 100, cloud?.recommended?.stt)],
+			tts: [...cloudCandidates("tts", cloud?.models ?? [], cloudReady, 0, cloud?.recommended?.tts), candidate("tts", "edge", "edge", "credentialless-fallback", true, 1e3)]
+		},
+		catalogVersion: cloud?.etag
+	});
+}
+function defaultProviderReady(providerId) {
+	if (providerId === "edge") return true;
+	if (providerId === "xopc-local") return hasInstalledLocalVoiceModel();
+	return isProviderConfiguredSync(providerId);
+}
+function refs(config) {
+	if (!config) return void 0;
+	return [config.primary, ...config.fallbacks ?? []].map((ref) => parseModelRef(ref)).filter((ref) => ref !== null);
+}
+function sttRefs(config) {
+	if (!config) return void 0;
+	const modelRefs = [...config.models ?? [], ...config.sharedModels ?? []].filter((entry) => entry.capabilities?.includes("audio") !== false).flatMap((entry) => entry.provider && entry.model ? [{
+		provider: entry.provider,
+		model: entry.model
+	}] : []);
+	if (modelRefs.length > 0) return modelRefs;
+	const provider = config.provider;
+	const slice = config.providers?.[provider];
+	return [{
+		provider,
+		model: typeof slice?.model === "string" ? slice.model : provider
+	}];
+}
+function ttsRefs(config) {
+	if (!config) return void 0;
+	const slice = config.providers?.[config.provider];
+	const model = typeof slice?.model === "string" ? slice.model : config.provider;
+	const refs = [{
+		provider: config.provider,
+		model
+	}];
+	if (config.fallback?.enabled) for (const provider of config.fallback.order) {
+		const fallbackSlice = config.providers?.[provider];
+		refs.push({
+			provider,
+			model: typeof fallbackSlice?.model === "string" ? fallbackSlice.model : provider
+		});
+	}
+	return refs;
+}
+function markExplicitReadiness(policies, catalog, providerReady) {
+	for (const [capability, policy] of Object.entries(policies)) policy.explicit = policy.explicit?.map((entry) => {
+		const ready = explicitReady(capability, entry.provider, entry.model, catalog, providerReady);
+		return {
+			...entry,
+			ready,
+			reasons: ready ? [] : ["explicit_model_unavailable"]
+		};
+	});
+}
+function explicitReady(capability, provider, model, catalog, providerReady) {
+	if (!providerReady(provider)) return false;
+	if (provider !== "xopc-cloud") return true;
+	return (catalog.sources["xopc-cloud"]?.models ?? []).some((entry) => entry.id === model && matchesCapability(entry, capability));
+}
+function cloudCandidates(capability, models, authorized, basePriority = 0, recommendedModel) {
+	return models.filter((model) => model.availability === "available" && matchesCapability(model, capability)).sort((left, right) => compareCatalogModels(left, right, recommendedModel)).map((model, index) => candidate(capability, "xopc-cloud", model.id, "xopc-cloud-managed", authorized, basePriority + index, {
+		...model.tts?.defaultVoice ? { defaultVoice: model.tts.defaultVoice } : {},
+		...model.stability ? { stability: model.stability } : {},
+		...model.tier ? { tier: model.tier } : {},
+		...model.bestEffort !== void 0 ? { bestEffort: model.bestEffort } : {}
+	}));
+}
+function matchesCapability(model, capability) {
+	if (model.availability !== "available") return false;
+	switch (capability) {
+		case "vision": return model.kind === "language" && model.input.includes("image");
+		case "image-generation": return model.kind === "image" && model.operations.includes("images.generate");
+		case "stt": return model.kind === "stt" && model.operations.includes("audio.transcription");
+		case "tts": return model.kind === "tts" && model.operations.includes("audio.speech") && Boolean(model.tts?.defaultVoice);
+	}
+}
+function candidate(capability, provider, model, source, ready, priority, metadata) {
+	return {
+		capability,
+		provider,
+		model,
+		source,
+		ready,
+		priority,
+		reasons: ready ? [] : [provider === "xopc-cloud" ? "oauth_not_connected" : "provider_not_ready"],
+		...metadata ? { metadata } : {}
+	};
+}
+//#endregion
+export { buildCapabilityPlansForConfig };

package/dist/src/capabilities/readiness/index.d.ts

@@ -0,0 +1,3 @@
+export { buildCapabilityPlansForConfig } from './from-config.js';
+export { planCapabilities, planCapability } from './planner.js';
+export type { CandidateSource, CapabilityCandidate, CapabilityId, CapabilityPlan, CapabilityPlannerInput, CapabilityPolicy, } from './types.js';

package/dist/src/capabilities/readiness/index.js

@@ -0,0 +1,3 @@
+import { planCapabilities, planCapability } from "./planner.js";
+import { buildCapabilityPlansForConfig } from "./from-config.js";
+export { buildCapabilityPlansForConfig, planCapabilities, planCapability };

package/dist/src/capabilities/readiness/planner.d.ts

@@ -0,0 +1,3 @@
+import type { CapabilityId, CapabilityPlan, CapabilityPlannerInput } from './types.js';
+export declare function planCapabilities(input: CapabilityPlannerInput): Record<CapabilityId, CapabilityPlan>;
+export declare function planCapability(capability: CapabilityId, input: CapabilityPlannerInput): CapabilityPlan;

package/dist/src/capabilities/readiness/planner.js

@@ -0,0 +1,56 @@
+//#region src/capabilities/readiness/planner.ts
+const CAPABILITIES = [
+	"vision",
+	"image-generation",
+	"stt",
+	"tts"
+];
+function planCapabilities(input) {
+	return Object.fromEntries(CAPABILITIES.map((capability) => [capability, planCapability(capability, input)]));
+}
+function planCapability(capability, input) {
+	const policy = input.policies[capability];
+	if (policy.disabled) return {
+		capability,
+		status: "disabled",
+		fallbacks: [],
+		rejected: [],
+		selectionSource: "none",
+		catalogVersion: input.catalogVersion
+	};
+	const explicit = (policy.explicit ?? []).map((entry, index) => ({
+		capability,
+		provider: entry.provider,
+		model: entry.model,
+		source: "explicit-config",
+		ready: entry.ready ?? true,
+		priority: index,
+		reasons: entry.reasons ?? (entry.ready === false ? ["explicit_model_unavailable"] : [])
+	}));
+	const automatic = [...input.automatic[capability] ?? []].sort((left, right) => left.priority - right.priority || left.provider.localeCompare(right.provider) || left.model.localeCompare(right.model));
+	const candidates = dedupeCandidates([...explicit, ...automatic]);
+	const ready = candidates.filter((candidate) => candidate.ready);
+	const rejected = candidates.filter((candidate) => !candidate.ready);
+	const primary = ready[0];
+	const explicitRejected = rejected.some((candidate) => candidate.source === "explicit-config");
+	return {
+		capability,
+		status: primary ? explicitRejected ? "degraded" : "ready" : "unavailable",
+		...primary ? { primary } : {},
+		fallbacks: ready.slice(1),
+		rejected,
+		selectionSource: primary?.source ?? "none",
+		catalogVersion: input.catalogVersion
+	};
+}
+function dedupeCandidates(candidates) {
+	const seen = /* @__PURE__ */ new Set();
+	return candidates.filter((candidate) => {
+		const key = `${candidate.provider}/${candidate.model}`;
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	});
+}
+//#endregion
+export { planCapabilities, planCapability };

package/dist/src/capabilities/readiness/types.d.ts

@@ -0,0 +1,35 @@
+export type CapabilityId = 'vision' | 'image-generation' | 'stt' | 'tts';
+export type CandidateSource = 'native-model' | 'explicit-config' | 'installed-local' | 'xopc-cloud-managed' | 'configured-provider' | 'credentialless-fallback';
+export interface CapabilityCandidate {
+    capability: CapabilityId;
+    provider: string;
+    model: string;
+    source: CandidateSource;
+    ready: boolean;
+    priority: number;
+    reasons: string[];
+    metadata?: Record<string, unknown>;
+}
+export interface CapabilityPlan {
+    capability: CapabilityId;
+    status: 'ready' | 'degraded' | 'unavailable' | 'disabled';
+    primary?: CapabilityCandidate;
+    fallbacks: CapabilityCandidate[];
+    rejected: CapabilityCandidate[];
+    selectionSource: CandidateSource | 'none';
+    catalogVersion?: string | null;
+}
+export interface CapabilityPolicy {
+    disabled?: boolean;
+    explicit?: Array<{
+        provider: string;
+        model: string;
+        ready?: boolean;
+        reasons?: string[];
+    }>;
+}
+export interface CapabilityPlannerInput {
+    policies: Record<CapabilityId, CapabilityPolicy>;
+    automatic: Partial<Record<CapabilityId, CapabilityCandidate[]>>;
+    catalogVersion?: string | null;
+}

package/dist/src/capabilities/readiness/types.js

@@ -0,0 +1 @@
+export {};

package/dist/src/cli/commands/agent.js

@@ -12,6 +12,7 @@ import { formatExamples, register } from "../registry.js";
 import { getContextWithOpts } from "../context.js";
 import { getWorkspacePath } from "../../config/workspace-path-helpers.js";
 import "../../config/index.js";
+import { getXopcCloudCatalogCoordinator } from "../../providers/xopc-cloud-catalog-coordinator.js";
 import { listSessions } from "./agent/sessions.js";
 import { renderStreamToTerminal } from "./agent/stream-renderer.js";
 import { startInteractiveChat } from "./agent/interactive.js";
@@ -38,6 +39,14 @@ function createAgentCommand(_ctx) {
 		}
 		const modelFromConfig = getAgentDefaultModelRef(config);
 		const modelId = options.model?.trim() || modelFromConfig;
+		if (modelId?.startsWith("xopc-cloud/")) {
+			const readiness = await getXopcCloudCatalogCoordinator().ensure({
+				reason: "agent-run",
+				network: "if-empty",
+				timeoutMs: 1e4
+			});
+			if (readiness.state === "unavailable" || readiness.state === "not-authorized") throw new Error(readiness.error?.message ?? "XOPC Cloud model catalog is unavailable");
+		}
 		const bus = new MessageBus();
 		if (ctx.isVerbose) log.info({
 			model: modelId,

package/dist/src/cli/commands/auth.js

@@ -3,6 +3,7 @@ import { init_logger } from "../../utils/logger.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
 import { getAllProviders, init_providers } from "../../providers/index.js";
 import { formatExamples, register } from "../registry.js";
+import { disconnectProvider } from "../../providers/provider-disconnect.js";
 import { listAllProfiles, listProfilesForProvider, removeAuthProfile, upsertAuthProfile } from "../../auth/profiles/profiles.js";
 import { getOAuthProvider, getSupportedOAuthProviders } from "../utils/oauth-providers.js";
 import { colorizeStatus, colors } from "../utils/colors.js";
@@ -69,7 +70,7 @@ function createAuthCommand(_ctx) {
 			else log.warn(`Profile not found: ${options.profile}`);
 			return;
 		}
-		await new CredentialResolver().deleteProviderCredential(provider);
+		await disconnectProvider(provider);
 		log.info(`All credentials removed for provider: ${provider}`);
 	});
 	cmd.command("login <provider>").description("Login to a provider using OAuth").option("-p, --profile <profileId>", "Profile ID (default: provider:default)").action(async (provider, _options) => {
@@ -98,7 +99,7 @@ function createAuthCommand(_ctx) {
 			else log.warn(`Profile not found: ${options.profile}`);
 			return;
 		}
-		await new CredentialResolver().deleteProviderCredential(provider);
+		await disconnectProvider(provider);
 		log.info(`Logged out from provider: ${provider}`);
 	});
 	const profilesCmd = cmd.command("profiles").description("Manage auth profiles");
@@ -147,7 +148,7 @@ function createAuthCommand(_ctx) {
 		const providers = /* @__PURE__ */ new Set();
 		for (const profile of profiles) providers.add(profile.provider);
 		for (const token of oauthTokens) providers.add(token.provider);
-		for (const provider of providers) await resolver.deleteProviderCredential(provider);
+		for (const provider of providers) await disconnectProvider(provider);
 		log.info("All authentication credentials cleared.");
 	});
 	cmd.command("providers").description("List supported providers and their auth methods").action(() => {

package/dist/src/cli/commands/doctor/checks/database-schema.js

@@ -52,7 +52,7 @@ async function checkDatabaseSchema(ctx) {
 		id: "database-schema",
 		label: "Database schema",
 		status: "pass",
-		message: `SQLite schema v${status.dbVersion} (current release v123).`,
+		message: `SQLite schema v${status.dbVersion} (current release v125).`,
 		hints: []
 	};
 }

package/dist/src/cli/commands/models.js

@@ -6,6 +6,7 @@ import { formatExamples, register } from "../registry.js";
 import { getContextWithOpts } from "../context.js";
 import "../../config/index.js";
 import { prepareUpdateGlobalDefaults } from "../../gateway/global-defaults-admin.js";
+import { disconnectProvider } from "../../providers/provider-disconnect.js";
 import { colors } from "../utils/colors.js";
 import { runCliOAuthLogin } from "../utils/oauth-login.js";
 import { input } from "@inquirer/prompts";
@@ -191,7 +192,7 @@ async function runAuthLogin(provider, options) {
 	}
 }
 async function runAuthLogout(provider) {
-	await new CredentialResolver().deleteProviderCredential(provider);
+	await disconnectProvider(provider);
 	console.log(`✅ Credentials removed for ${provider}`);
 }
 function attachModelsListOptions(command) {

package/dist/src/cli/commands/onboard/model.d.ts

@@ -2,26 +2,8 @@
  * Catalog-driven model configuration for onboarding.
  */
 import type { Config } from '../../../config/schema.js';
-import { type ModelCatalogStore } from '../../../providers/model-catalog-store.js';
-import { XopcCloudModelSource } from '../../../providers/xopc-cloud-model-source.js';
+import { type XopcCloudCatalogCoordinator } from '../../../providers/xopc-cloud-catalog-coordinator.js';
 import type { CLIContext } from '../../registry.js';
-export declare function defaultXopcCloudImageModel(catalogStore?: ModelCatalogStore): string | undefined;
-export declare function defaultXopcCloudVisionModel(catalogStore?: ModelCatalogStore): string | undefined;
-export declare function defaultXopcCloudAudioModels(catalogStore?: ModelCatalogStore): {
-    stt?: string;
-    tts?: {
-        model: string;
-        voice: string;
-        maxCharacters: number;
-    };
-};
-export declare function setPrimaryModel(config: Config, workspacePath: string, modelRef: string, defaultImageGenerationModel?: string, defaultAudioModels?: {
-    stt?: string;
-    tts?: {
-        model: string;
-        voice: string;
-        maxCharacters: number;
-    };
-}, defaultVisionModel?: string): Config;
-export declare function refreshOnboardModelCatalogIfNeeded(provider: string, hasCatalogModels: boolean, source?: Pick<XopcCloudModelSource, 'refresh'>): Promise<void>;
+export declare function setPrimaryModel(config: Config, workspacePath: string, modelRef: string): Config;
+export declare function refreshOnboardModelCatalogIfNeeded(provider: string, hasCatalogModels: boolean, coordinator?: Pick<XopcCloudCatalogCoordinator, 'refresh'>): Promise<void>;
 export declare function setupModel(existingConfig: Config | null, ctx: CLIContext): Promise<Config>;

package/dist/src/cli/commands/onboard/model.js

@@ -2,7 +2,6 @@ import { getAgentDefaultModelRef, init_schema } from "../../../config/schema.js"
 import { resolveModelsJsonPath } from "../../../config/paths.js";
 import { init_models_json, loadModelsJson, saveModelsJson } from "../../../config/models-json.js";
 import { getApiKeyFromEnv } from "../../../providers/env-keys.js";
-import { getModelCatalogStore, init_model_catalog_store } from "../../../providers/model-catalog-store.js";
 import { getModelRegistry } from "../../../providers/model-registry.js";
 import { CredentialResolver, init_credentials } from "../../../auth/credentials.js";
 import { getAllProviders, getModelsByProvider, getProviderDisplayName, init_providers, providerSupportsApiKey, providerSupportsOAuth } from "../../../providers/index.js";
@@ -10,7 +9,7 @@ import { getDomesticProviderBaseUrl, getDomesticProviderPreset, getDomesticProvi
 import { getProviderHint, getRecommendedModelsForProvider, sortModelsForPicker, sortProvidersForPicker } from "../../../providers/presentation.js";
 import { prepareUpdateGlobalDefaults } from "../../../gateway/global-defaults-admin.js";
 import { discoverProviderModels, isProviderApiDiscoverable } from "../../../providers/model-discovery.js";
-import { XopcCloudModelSource } from "../../../providers/xopc-cloud-model-source.js";
+import { getXopcCloudCatalogCoordinator } from "../../../providers/xopc-cloud-catalog-coordinator.js";
 import { listProfilesForProvider } from "../../../auth/profiles/profiles.js";
 import { getOAuthProvider } from "../../utils/oauth-providers.js";
 import { colors } from "../../utils/colors.js";
@@ -24,29 +23,7 @@ init_credentials();
 init_models_json();
 init_schema();
 init_providers();
-init_model_catalog_store();
-function defaultXopcCloudImageModel(catalogStore = getModelCatalogStore()) {
-	const model = catalogStore.getSource("xopc-cloud")?.models.find((entry) => entry.availability === "available" && entry.kind === "image" && entry.operations.includes("images.generate"));
-	return model ? `xopc-cloud/${model.id}` : void 0;
-}
-function defaultXopcCloudVisionModel(catalogStore = getModelCatalogStore()) {
-	const model = catalogStore.getSource("xopc-cloud")?.models.find((entry) => entry.availability === "available" && entry.kind === "language" && entry.input.includes("image") && (entry.operations.includes("chat.completions") || entry.operations.includes("responses")));
-	return model ? `xopc-cloud/${model.id}` : void 0;
-}
-function defaultXopcCloudAudioModels(catalogStore = getModelCatalogStore()) {
-	const models = catalogStore.getSource("xopc-cloud")?.models.filter((entry) => entry.availability === "available") ?? [];
-	const stt = models.find((entry) => entry.kind === "stt");
-	const tts = models.find((entry) => entry.kind === "tts" && entry.tts?.defaultVoice);
-	return {
-		...stt ? { stt: stt.id } : {},
-		...tts?.tts?.defaultVoice ? { tts: {
-			model: tts.id,
-			voice: tts.tts.defaultVoice,
-			maxCharacters: tts.tts.maxCharacters
-		} } : {}
-	};
-}
-function setPrimaryModel(config, workspacePath, modelRef, defaultImageGenerationModel, defaultAudioModels, defaultVisionModel) {
+function setPrimaryModel(config, workspacePath, modelRef) {
 	const id = config.agents.default ?? config.agents.list[0]?.id ?? "main";
 	const index = config.agents.list.findIndex((entry) => entry.id === id);
 	let nextConfig = config;
@@ -73,57 +50,10 @@ function setPrimaryModel(config, workspacePath, modelRef, defaultImageGeneration
 		roles: {
 			...currentModels?.roles,
 			deep: { model: modelRef }
-		},
-		...!currentModels?.imageModel && defaultVisionModel ? { imageModel: { primary: defaultVisionModel } } : {},
-		...!currentModels?.imageGenerationModel && defaultImageGenerationModel ? { imageGenerationModel: { primary: defaultImageGenerationModel } } : {}
+		}
 	} });
 	if (prep.ok === false) throw new Error(prep.error);
-	let configured = prep.data.nextConfig;
-	if (defaultAudioModels?.stt && !configured.tools.media?.audio) configured = {
-		...configured,
-		tools: {
-			...configured.tools,
-			media: {
-				...configured.tools.media,
-				audio: {
-					enabled: true,
-					provider: "xopc-cloud",
-					models: [{
-						provider: "xopc-cloud",
-						model: defaultAudioModels.stt,
-						capabilities: ["audio"]
-					}],
-					providers: { "xopc-cloud": { model: defaultAudioModels.stt } },
-					fallback: {
-						enabled: false,
-						order: []
-					}
-				}
-			}
-		}
-	};
-	if (defaultAudioModels?.tts && !configured.messages?.tts) configured = {
-		...configured,
-		messages: {
-			...configured.messages,
-			tts: {
-				enabled: true,
-				provider: "xopc-cloud",
-				trigger: "off",
-				fallback: {
-					enabled: false,
-					order: []
-				},
-				maxTextLength: defaultAudioModels.tts.maxCharacters,
-				timeoutMs: 6e4,
-				providers: { "xopc-cloud": {
-					model: defaultAudioModels.tts.model,
-					voice: defaultAudioModels.tts.voice
-				} }
-			}
-		}
-	};
-	return configured;
+	return prep.data.nextConfig;
 }
 function formatRecommended(provider) {
 	const labels = getRecommendedModelsForProvider(provider, 3).map((m) => m.name || m.id);
@@ -166,11 +96,12 @@ function getModelsForProvider(provider) {
 		};
 	});
 }
-async function refreshOnboardModelCatalogIfNeeded(provider, hasCatalogModels, source) {
+async function refreshOnboardModelCatalogIfNeeded(provider, hasCatalogModels, coordinator = getXopcCloudCatalogCoordinator()) {
 	if (provider !== "xopc-cloud" || hasCatalogModels) return;
 	console.log("\n→ Loading models from XOPC Model Service...");
-	const result = await (source ?? new XopcCloudModelSource()).refresh();
-	if (result.status === "skipped") throw new Error("XOPC Model Service credentials are unavailable after OAuth login. Please sign in again.");
+	const result = await coordinator.refresh("oauth");
+	if (result.state === "not-authorized") throw new Error("XOPC Model Service credentials are unavailable after OAuth login. Please sign in again.");
+	if (result.error || result.modelCount === 0) throw new Error(result.error?.message ?? "XOPC Model Service did not publish any models for this account.");
 	console.log(colors.green(`✓ Loaded ${result.modelCount} models`));
 }
 function discoveredModelsToChoices(provider, models) {
@@ -545,14 +476,7 @@ async function setupModel(existingConfig, ctx) {
 		}))
 	});
 	console.log("\n✅ Model configured:", model);
-	const imageModel = provider === "xopc-cloud" ? defaultXopcCloudImageModel() : void 0;
-	const visionModel = provider === "xopc-cloud" ? defaultXopcCloudVisionModel() : void 0;
-	const audioModels = provider === "xopc-cloud" ? defaultXopcCloudAudioModels() : void 0;
-	if (visionModel) console.log("✅ Image understanding configured:", visionModel);
-	if (imageModel) console.log("✅ Image generation configured:", imageModel);
-	if (audioModels?.stt) console.log("✅ Speech recognition configured:", audioModels.stt);
-	if (audioModels?.tts) console.log("✅ Speech synthesis configured:", audioModels.tts.model);
-	return setPrimaryModel(config, ctx.workspacePath, model, imageModel, audioModels, visionModel);
+	return setPrimaryModel(config, ctx.workspacePath, model);
 }
 //#endregion
-export { defaultXopcCloudAudioModels, defaultXopcCloudImageModel, defaultXopcCloudVisionModel, refreshOnboardModelCatalogIfNeeded, setPrimaryModel, setupModel };
+export { refreshOnboardModelCatalogIfNeeded, setPrimaryModel, setupModel };

package/dist/src/cli/commands/tunnel.js

@@ -3,15 +3,15 @@ import { init_logger } from "../../utils/logger.js";
 import { loadConfig, saveConfig } from "../../config/loader.js";
 import { resolveGatewayEffectiveHost } from "../../config/gateway-bind.js";
 import { loadTunnelState } from "../../tunnel/tunnel-state.js";
+import { formatExamples, register } from "../registry.js";
+import "../../config/index.js";
 import { TUNNEL_RISK_SUMMARY_LINES, TunnelConsentError, assertTunnelMayStart, hasValidTunnelConsent } from "../../tunnel/consent.js";
 import { resolveTunnelBrokerUrl, resolveTunnelRegistrationSecret } from "../../tunnel/env.js";
-import { applyTunnelConsentToConfig, mergeTunnelConfigPatch, setTunnelEnabledInConfig } from "../../tunnel/tunnel-config.js";
 import { ensureFrpcBinary } from "../../tunnel/frpc-binary.js";
 import { getTunnelService } from "../../tunnel/tunnel-service.js";
 import { resolveFrpSubdomainHost } from "../../tunnel/frp-subdomain-host.js";
+import { applyTunnelConsentToConfig, mergeTunnelConfigPatch, setTunnelEnabledInConfig } from "../../tunnel/tunnel-config.js";
 import "../../tunnel/index.js";
-import { formatExamples, register } from "../registry.js";
-import "../../config/index.js";
 import { Command } from "commander";
 //#region src/cli/commands/tunnel.ts
 init_logger();

package/dist/src/cli/utils/oauth-login.d.ts

@@ -1,4 +1,5 @@
 import type { OAuthCredentials, OAuthLoginCallbacks, OAuthProviderInterface } from '../../auth/index.js';
+import { type CatalogReadiness } from '../../providers/xopc-cloud-catalog-coordinator.js';
 import { type OAuthProviderConfig } from './oauth-providers.js';
 export interface RunCliOAuthLoginOptions {
     provider: string;
@@ -8,6 +9,7 @@ export interface RunCliOAuthLoginResult {
     provider: string;
     credentials: OAuthCredentials;
     expires?: number;
+    catalog?: CatalogReadiness;
 }
 export declare function buildCliOAuthCallbacks(params: {
     config: OAuthProviderConfig;

package/dist/src/cli/utils/oauth-login.js

@@ -1,6 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
+import { getXopcCloudCatalogCoordinator } from "../../providers/xopc-cloud-catalog-coordinator.js";
 import { getOAuthProvider } from "./oauth-providers.js";
 import { input, select } from "@inquirer/prompts";
 //#region src/cli/utils/oauth-login.ts
@@ -75,10 +76,17 @@ async function runCliOAuthLogin(options) {
 		onProgress: options.onProgress
 	}));
 	await new CredentialResolver().saveOAuthCredentials(options.provider, credentials);
+	let catalog;
+	if (options.provider === "xopc-cloud") {
+		options.onProgress?.("Syncing XOPC Cloud model catalog...");
+		catalog = await getXopcCloudCatalogCoordinator().refresh("oauth");
+		if (catalog.error) options.onProgress?.(`Authorization succeeded, but model catalog sync failed: ${catalog.error.message}`);
+	}
 	return {
 		provider: options.provider,
 		credentials,
-		expires: credentials.expires
+		expires: credentials.expires,
+		catalog
 	};
 }
 //#endregion