npm - @xopcai/xopc - Versions diffs - 0.0.162 → 0.0.163 - Mend

@xopcai/xopc 0.0.162 → 0.0.163

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (230) hide show

package/dist/gateway/static/root/index.html CHANGED Viewed

@@ -11,7 +11,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=20260713-1" />
     <link rel="manifest" href="/site.webmanifest?v=20260713-1" />
     <title>xopc</title>
-    <script type="module" crossorigin src="/assets/index-C8JkTS6d.js"></script>
+    <script type="module" crossorigin src="/assets/index-HZdBKfk_.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-aKtaBQYM.js">
     <link rel="modulepreload" crossorigin href="/assets/preload-helper-zJ_50EbN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-BOUWij0V.js">
@@ -24,17 +24,17 @@
     <link rel="modulepreload" crossorigin href="/assets/check-DUBLcKHA.js">
     <link rel="modulepreload" crossorigin href="/assets/circle-alert-BEjgurr2.js">
     <link rel="modulepreload" crossorigin href="/assets/middleware-Pd0e8Igk.js">
-    <link rel="modulepreload" crossorigin href="/assets/messages-BwQ3WssU.js">
-    <link rel="modulepreload" crossorigin href="/assets/locale-store-0lpYdNDr.js">
+    <link rel="modulepreload" crossorigin href="/assets/messages-BzI9Wx30.js">
+    <link rel="modulepreload" crossorigin href="/assets/locale-store-Ys6RP7Be.js">
     <link rel="modulepreload" crossorigin href="/assets/cn-JdwAhgNB.js">
     <link rel="modulepreload" crossorigin href="/assets/schemas-DgQq6Z5S.js">
     <link rel="modulepreload" crossorigin href="/assets/product-delivery-BTRT9kCS.js">
     <link rel="modulepreload" crossorigin href="/assets/config-reload-event-Bjh2zoKp.js">
     <link rel="modulepreload" crossorigin href="/assets/copy-to-clipboard-HOJ79TWv.js">
-    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-DbzLyJ3R.js">
-    <link rel="modulepreload" crossorigin href="/assets/activity-store-hpcNv9MZ.js">
-    <link rel="modulepreload" crossorigin href="/assets/theme-store-C1oaqeD2.js">
-    <link rel="stylesheet" crossorigin href="/assets/index-hmrG55qg.css">
+    <link rel="modulepreload" crossorigin href="/assets/gateway-startup-retry-CSRvCqxh.js">
+    <link rel="modulepreload" crossorigin href="/assets/activity-store-Xj95LzTv.js">
+    <link rel="modulepreload" crossorigin href="/assets/theme-store-DflSp9o4.js">
+    <link rel="stylesheet" crossorigin href="/assets/index-BXtJvaQl.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/package.js CHANGED Viewed

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.0.162";
+var version = "0.0.163";
 //#endregion
 export { version };

package/dist/src/agent/client-error-format.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-export type AgentRunErrorKind = 'provider_setup_required' | 'provider_auth_invalid' | 'rate_limit' | 'timeout' | 'billing' | 'unknown';
+export type AgentRunErrorKind = 'provider_setup_required' | 'provider_auth_invalid' | 'rate_limit' | 'timeout' | 'billing' | 'xopc_quota_exhausted' | 'xopc_platform_limit' | 'unknown';
 export type AgentRunErrorPayload = {
     kind: AgentRunErrorKind;
     code: string;

package/dist/src/agent/client-error-format.js CHANGED Viewed

@@ -1,6 +1,8 @@
 import { classifyFailoverReason, isAuthErrorMessage } from "./fallback/reason.js";
 //#region src/agent/client-error-format.ts
 const API_KEY_MISSING_RE = /^No API key found for (\S+)/i;
+const XOPC_QUOTA_RE = /model_quota_exhausted|model quota exhausted/i;
+const XOPC_PLATFORM_LIMIT_RE = /platform_token_limit_exceeded|platform (?:hourly|daily) token limit reached/i;
 function reasonToKind(reason) {
 	switch (reason) {
 		case "auth": return "provider_auth_invalid";
@@ -66,10 +68,12 @@ function formatAgentRunErrorForClient(rawError, context) {
 		});
 	}
 	const reason = classifyFailoverReason(trimmed);
-	const kind = reasonToKind(reason);
+	const xopcPlatformLimit = context?.provider === "xopc-cloud" && XOPC_PLATFORM_LIMIT_RE.test(trimmed);
+	const xopcQuotaExhausted = context?.provider === "xopc-cloud" && (XOPC_QUOTA_RE.test(trimmed) || reason === "billing");
+	const kind = xopcPlatformLimit ? "xopc_platform_limit" : xopcQuotaExhausted ? "xopc_quota_exhausted" : reasonToKind(reason);
 	const payload = {
 		kind,
-		code: reasonToCode(reason),
+		code: xopcPlatformLimit ? "platform_token_limit_exceeded" : xopcQuotaExhausted ? "model_quota_exhausted" : reasonToCode(reason),
 		message: trimmed,
 		...context?.provider ? { provider: context.provider } : {},
 		...context?.modelRef ? { modelRef: context.modelRef } : {}

package/dist/src/agent/embedded/run-for-session.js CHANGED Viewed

@@ -16,10 +16,31 @@ async function runEmbeddedTurnForSession(params) {
 	await params.beforeTurn?.();
 	const agent = agentManager.getOrCreateAgent(sessionKey);
 	const mm = modelManager;
-	await mm.applyModelForSession(agent, sessionKey);
-	const modelRef = String(mm.getModelForSession(sessionKey));
+	const configuredModelRef = String(mm.getModelForSession(sessionKey));
+	const candidates = typeof mm.getFallbackCandidatesForSession === "function" ? mm.getFallbackCandidatesForSession(sessionKey) : [];
+	const candidateModelRefs = candidates.length > 0 ? candidates.map((candidate) => `${candidate.provider}/${candidate.model}`) : [configuredModelRef];
+	const resolvedCandidates = [];
+	for (const [index, ref] of candidateModelRefs.entries()) try {
+		const resolved = index === 0 && typeof mm.getResolvedModelForSession === "function" ? mm.getResolvedModelForSession(sessionKey) : resolveModel(ref);
+		resolvedCandidates.push({
+			ref,
+			model: resolved
+		});
+	} catch (err) {
+		log.warn({
+			err,
+			sessionKey,
+			runId,
+			modelRef: ref
+		}, "Skipping unavailable model candidate");
+	}
+	const primary = resolvedCandidates[0];
+	if (!primary) throw new Error(`No available model candidates for '${configuredModelRef}'`);
+	const modelRef = primary.ref;
+	const model = primary.model;
+	if (typeof mm.applyResolvedModel === "function") mm.applyResolvedModel(agent, model, modelRef);
+	else await mm.applyModelForSession(agent, sessionKey);
 	agentManager.setModelForSession(sessionKey, modelRef);
-	const model = mm.getResolvedModelForSession(sessionKey);
 	const tools = agent.state.tools;
 	const systemPrompt = agent.state.systemPrompt ?? "";
 	const thinkingLevel = params.thinkingOverride ?? agent.state.thinkingLevel;
@@ -53,36 +74,22 @@ async function runEmbeddedTurnForSession(params) {
 		});
 		const turnTools = mergeTurnTools(tools, mcpResolved.tools);
 		try {
-			const candidates = typeof mm.getFallbackCandidatesForSession === "function" ? mm.getFallbackCandidatesForSession(sessionKey) : [];
-			const candidateModelRefs = candidates.length > 0 ? candidates.map((candidate) => `${candidate.provider}/${candidate.model}`) : [modelRef];
 			log.info({
 				sessionKey,
 				runId,
-				primaryModelRef: candidateModelRefs[0],
-				candidateModelRefs
+				configuredModelRef,
+				primaryModelRef: modelRef,
+				candidateModelRefs: resolvedCandidates.map((candidate) => candidate.ref)
 			}, "Agent model fallback candidates resolved");
 			let lastResult;
 			let lastError;
-			const primaryModelRef = candidateModelRefs[0] ?? modelRef;
+			const primaryModelRef = modelRef;
 			const beforeLen = Array.isArray(agent.state?.messages) ? agent.state.messages.length : void 0;
-			for (let i = 0; i < candidateModelRefs.length; i++) {
-				const candidateModelRef = candidateModelRefs[i] ?? modelRef;
+			for (let i = 0; i < resolvedCandidates.length; i++) {
+				const candidate = resolvedCandidates[i];
+				const candidateModelRef = candidate.ref;
 				const isFallbackAttempt = i > 0;
-				let candidateModel = model;
-				if (candidateModelRef !== modelRef) try {
-					candidateModel = resolveModel(candidateModelRef);
-				} catch (err) {
-					lastError = err;
-					log.warn({
-						err,
-						sessionKey,
-						runId,
-						modelRef: candidateModelRef,
-						attempt: i + 1,
-						total: candidateModelRefs.length
-					}, "Skipping model fallback candidate (resolve failed)");
-					continue;
-				}
+				const candidateModel = candidate.model;
 				if (typeof mm.applyResolvedModel === "function") mm.applyResolvedModel(agent, candidateModel, candidateModelRef);
 				agentManager.setModelForSession(sessionKey, candidateModelRef);
 				if (isFallbackAttempt) log.info({
@@ -91,7 +98,7 @@ async function runEmbeddedTurnForSession(params) {
 					primaryModelRef,
 					fallbackModelRef: candidateModelRef,
 					attempt: i + 1,
-					total: candidateModelRefs.length
+					total: resolvedCandidates.length
 				}, "Agent model fallback started");
 				try {
 					const turnResult = await runXopcEmbeddedTurn({
@@ -117,32 +124,32 @@ async function runEmbeddedTurnForSession(params) {
 							primaryModelRef,
 							fallbackModelRef: candidateModelRef,
 							attempt: i + 1,
-							total: candidateModelRefs.length
+							total: resolvedCandidates.length
 						}, "Agent model fallback succeeded");
 						return turnResult;
 					}
 					lastResult = turnResult;
-					const hasNextCandidate = i + 1 < candidateModelRefs.length;
+					const hasNextCandidate = i + 1 < resolvedCandidates.length;
 					log.warn({
 						sessionKey,
 						runId,
 						modelRef: candidateModelRef,
 						attempt: i + 1,
-						total: candidateModelRefs.length,
+						total: resolvedCandidates.length,
 						hasNextCandidate,
 						errorMessage: turnResult.errorMessage
 					}, hasNextCandidate ? "Agent model turn failed, trying fallback" : "Agent model turn failed, no fallback remains");
 				} catch (err) {
 					lastError = err;
 					if (err instanceof DOMException && err.name === "AbortError") throw err;
-					const hasNextCandidate = i + 1 < candidateModelRefs.length;
+					const hasNextCandidate = i + 1 < resolvedCandidates.length;
 					log.warn({
 						err,
 						sessionKey,
 						runId,
 						modelRef: candidateModelRef,
 						attempt: i + 1,
-						total: candidateModelRefs.length,
+						total: resolvedCandidates.length,
 						hasNextCandidate
 					}, hasNextCandidate ? "Agent model call threw, trying fallback" : "Agent model call threw, no fallback remains");
 				}

package/dist/src/agent/embedded/session-runner.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ export type EmbeddedRunnerFingerprintInput = {
     toolNames: readonly string[];
     systemPrompt: string;
     thinkingLevel: string;
+    credentialRevision: string;
 };
 export declare function buildEmbeddedRunnerFingerprint(input: EmbeddedRunnerFingerprintInput): string;
 export type AcquireEmbeddedSessionRunnerParams = {

package/dist/src/agent/embedded/session-runner.js CHANGED Viewed

@@ -3,15 +3,20 @@ import { init_logger } from "../../utils/logger.js";
 import { guardSessionManager } from "./session-tool-result-guard.js";
 import { transformUserMessageForPersistence } from "../inbound/attachment-pipeline.js";
 import { openSqliteHydratingSessionManager } from "./sqlite-hydrating-session-manager.js";
-import { applyXopcProviderApiKey, createEmbeddedModelRuntime } from "./xopc-auth-storage.js";
+import { applyXopcProviderApiKey, createEmbeddedModelRuntime, resolveXopcProviderApiKey } from "./xopc-auth-storage.js";
 import { wrapStreamFnForXopcExtensions } from "./xopc-stream-bridge.js";
 import { xopcToolsToDefinitions } from "./xopc-tools-bridge.js";
 import { applySystemPromptOverrideToSession } from "./system-prompt-override.js";
+import { createHash } from "node:crypto";
 import { DefaultResourceLoader, SettingsManager, createAgentSession, getAgentDir } from "@earendil-works/pi-coding-agent";
 //#region src/agent/embedded/session-runner.ts
 init_logger();
 const log = createLogger("EmbeddedSessionRunner");
 const DEFAULT_IDLE_TTL_MS = 5 * 6e4;
+function providerCredentialRevision(providerId) {
+	const apiKey = resolveXopcProviderApiKey(providerId);
+	return apiKey ? createHash("sha256").update(apiKey).digest("base64url") : "none";
+}
 function buildEmbeddedRunnerFingerprint(input) {
 	const tools = [...input.toolNames].sort().join("\0");
 	const promptMarker = `${input.systemPrompt.length}:${input.systemPrompt.slice(0, 128)}`;
@@ -21,7 +26,8 @@ function buildEmbeddedRunnerFingerprint(input) {
 		input.modelRef,
 		tools,
 		promptMarker,
-		input.thinkingLevel
+		input.thinkingLevel,
+		input.credentialRevision
 	].join("");
 }
 function isEmbeddedSessionRunnerEnabled() {
@@ -91,7 +97,8 @@ var EmbeddedSessionRunnerPool = class {
 			modelRef: params.modelRef,
 			toolNames: params.tools.map((t) => t.name),
 			systemPrompt: params.systemPrompt,
-			thinkingLevel: params.thinkingLevel ?? "medium"
+			thinkingLevel: params.thinkingLevel ?? "medium",
+			credentialRevision: providerCredentialRevision(params.model.provider)
 		});
 		const reuseEnabled = this.isEnabledFn();
 		const existing = this.pool.get(params.sessionKey);
@@ -199,7 +206,8 @@ var EmbeddedSessionRunnerPool = class {
 				modelRef: params.modelRef,
 				toolNames,
 				systemPrompt,
-				thinkingLevel: thinkingLevel ?? "medium"
+				thinkingLevel: thinkingLevel ?? "medium",
+				credentialRevision: providerCredentialRevision(model.provider)
 			}),
 			session,
 			piSm,

package/dist/src/agent/failover-error.d.ts CHANGED Viewed

@@ -19,7 +19,7 @@ export type FailoverReason = 'timeout' | 'aborted' | 'auth' | 'rate_limit' | 'ba
 export interface FallbackAttempt {
     /** Provider id, e.g. "openai". */
     provider: string;
-    /** Model id, e.g. "gpt-image-1". */
+    /** Model id, e.g. "gpt-image-2". */
     model: string;
     /** Short, human-readable failure summary. */
     error: string;

package/dist/src/agent/image/generation/openai-compatible-image-provider.d.ts CHANGED Viewed

@@ -5,13 +5,12 @@
  * speak the same `/images/generations` and `/images/edits` REST shape.
  * This factory wraps that wire format on top of shared provider HTTP, normalization,
  * and auth-runtime so vendor modules only need to declare:
- *   - id / aliases / models / capabilities
+ *   - id / models / capabilities
  *   - baseUrl resolution
  *   - apiKey resolution
  *   - optional request body / response transforms
  *
  */
-import type { ImageProviderUiMetadata } from './image-provider-ui.js';
 import type { GeneratedImageAsset, ImageGenerationProvider, ImageGenerationProviderCapabilities, ImageGenerationProviderConfiguredContext, ImageGenerationRequest } from './types.js';
 /** Subset of the official OpenAI image response we map. */
 export interface OpenAiCompatibleImageResponse {
@@ -46,8 +45,7 @@ export interface OpenAiCompatibleEndpointResolution {
 }
 export interface OpenAiCompatibleImageProviderOptions {
     id: string;
-    aliases?: string[];
-    label?: string;
+    label: string;
     defaultModel: string;
     models: string[];
     capabilities: ImageGenerationProviderCapabilities;
@@ -74,8 +72,6 @@ export interface OpenAiCompatibleImageProviderOptions {
     /** Default count clamp. Provider may also enforce via `capabilities.generate.maxCount`. */
     defaultCount?: number;
     defaultSize?: string;
-    /** Gateway console presets for `cfg.providers.<id>.baseUrl`. */
-    ui?: ImageProviderUiMetadata;
 }
 export declare function createOpenAiCompatibleImageProvider(options: OpenAiCompatibleImageProviderOptions): ImageGenerationProvider;
 export declare function mapDefaultOpenAiResponse(raw: unknown, req: ImageGenerationRequest): GeneratedImageAsset[];

package/dist/src/agent/image/generation/openai-compatible-image-provider.js CHANGED Viewed

@@ -17,13 +17,11 @@ function createOpenAiCompatibleImageProvider(options) {
 	const defaultSize = options.defaultSize ?? "1024x1024";
 	return {
 		id: options.id,
-		...options.aliases ? { aliases: options.aliases } : {},
-		...options.label ? { label: options.label } : {},
+		label: options.label,
 		defaultModel: options.defaultModel,
 		models: options.models,
 		capabilities: options.capabilities,
 		isConfigured: options.isConfigured,
-		...options.ui ? { ui: options.ui } : {},
 		async generateImage(req) {
 			const apiKey = options.resolveApiKey(req) ?? null;
 			const endpoint = options.resolveEndpoint(req);

package/dist/src/agent/image/generation/provider-registry.d.ts CHANGED Viewed

@@ -1,46 +1,5 @@
-import type { Config } from '../../../config/schema.js';
-import type { ImageProviderUiMetadata } from './image-provider-ui.js';
-import type { ImageGenerationProviderCapabilities, ImageGenerationRequest, ImageGenerationResult } from './types.js';
-/** Lifecycle context for {@link ImageGenerationProvider#isConfigured}. */
-export interface ImageGenerationProviderConfiguredContext {
-    cfg?: Config;
-    agentDir?: string;
-}
-export interface ImageGenerationProvider {
-    /** Lower-case provider id (registry key). */
-    id: string;
-    /** Optional aliases — alternate ids that resolve to this provider. */
-    aliases?: string[];
-    label?: string;
-    defaultModel?: string;
-    models?: string[];
-    /** Provider capability map. */
-    capabilities?: ImageGenerationProviderCapabilities;
-    /**
-     * Synchronous configuration check (Step 2 — was async in Step 1).
-     * MUST NOT touch keychain or trigger OS prompts.
-     */
-    isConfigured?: (ctx: ImageGenerationProviderConfiguredContext) => boolean;
-    /** Gateway console presets (regions / base URLs); defined by each bundled extension. */
-    ui?: ImageProviderUiMetadata;
-    generateImage(req: ImageGenerationRequest): Promise<ImageGenerationResult>;
-}
-export declare function registerImageGenerationProvider(provider: ImageGenerationProvider): void;
-/**
- * Resolve a provider by id or alias.
- *
- * `cfg` is honoured to skip providers disabled via `cfg.extensions[<id>].enabled = false`.
- */
-export declare function getImageGenerationProvider(providerId: string, cfg?: Config): ImageGenerationProvider | undefined;
-export declare function listImageGenerationProviders(cfg?: Config): ImageGenerationProvider[];
-export interface ImageGenerationProviderSummary {
-    id: string;
-    label?: string;
-    defaultModel?: string;
-    models: string[];
-    aliases?: string[];
-    capabilities?: ImageGenerationProviderCapabilities;
-    ui?: ImageProviderUiMetadata;
-}
-export declare function listImageGenerationProvidersSummary(cfg?: Config): ImageGenerationProviderSummary[];
-export declare function clearImageGenerationRegistryForTests(): void;
+import type { ImageGenerationProvider, ImageGenerationProviderSummary } from './types.js';
+export declare function getImageGenerationProvider(providerId: string): ImageGenerationProvider | undefined;
+export declare function listImageGenerationProviders(): ImageGenerationProvider[];
+export declare function listImageGenerationProvidersSummary(): ImageGenerationProviderSummary[];
+export type { ImageGenerationProvider, ImageGenerationProviderSummary } from './types.js';

package/dist/src/agent/image/generation/provider-registry.js CHANGED Viewed

@@ -1,80 +1,31 @@
+import { buildDashScopeImageGenerationProvider } from "./providers/dashscope.js";
+import { buildFalImageGenerationProvider } from "./providers/fal.js";
+import { buildGoogleImageGenerationProvider } from "./providers/google.js";
+import { buildMinimaxImageGenerationProvider } from "./providers/minimax.js";
+import { buildOpenAIImageGenerationProvider } from "./providers/openai.js";
 //#region src/agent/image/generation/provider-registry.ts
-/**
-* Provider ids that must never be registered (defensive — guards against
-* accidentally shadowing well-known internal namespaces / prototype keys).
-*/
-const UNSAFE_PROVIDER_IDS = new Set([
-	"__proto__",
-	"constructor",
-	"prototype"
-]);
-const registry = /* @__PURE__ */ new Map();
-const aliasIndex = /* @__PURE__ */ new Map();
-function normalizeId(id) {
-	return id.trim().toLowerCase();
+const providers = [
+	buildOpenAIImageGenerationProvider(),
+	buildDashScopeImageGenerationProvider(),
+	buildMinimaxImageGenerationProvider(),
+	buildGoogleImageGenerationProvider(),
+	buildFalImageGenerationProvider()
+];
+const providersById = new Map(providers.map((provider) => [provider.id, provider]));
+function getImageGenerationProvider(providerId) {
+	return providersById.get(providerId);
 }
-function isExtensionDisabled(cfg, providerId) {
-	if (!cfg) return false;
-	const extensions = cfg?.extensions;
-	if (!extensions || typeof extensions !== "object") return false;
-	const entry = extensions[providerId];
-	if (!entry || typeof entry !== "object") return false;
-	return entry.enabled === false;
+function listImageGenerationProviders() {
+	return [...providers];
 }
-function registerImageGenerationProvider(provider) {
-	if (!provider.id?.trim()) throw new Error("Image generation provider id is required");
-	const id = normalizeId(provider.id);
-	if (UNSAFE_PROVIDER_IDS.has(id)) throw new Error(`Image generation provider id is reserved: ${provider.id}`);
-	for (const [alias, target] of [...aliasIndex.entries()]) if (target === id) aliasIndex.delete(alias);
-	registry.set(id, provider);
-	for (const aliasRaw of provider.aliases ?? []) {
-		if (typeof aliasRaw !== "string") continue;
-		const alias = normalizeId(aliasRaw);
-		if (!alias || alias === id) continue;
-		if (UNSAFE_PROVIDER_IDS.has(alias)) continue;
-		if (registry.has(alias)) continue;
-		aliasIndex.set(alias, id);
-	}
-}
-/**
-* Resolve a provider by id or alias.
-*
-* `cfg` is honoured to skip providers disabled via `cfg.extensions[<id>].enabled = false`.
-*/
-function getImageGenerationProvider(providerId, cfg) {
-	if (typeof providerId !== "string") return void 0;
-	const id = normalizeId(providerId);
-	if (!id) return void 0;
-	const direct = registry.get(id);
-	if (direct) return isExtensionDisabled(cfg, direct.id) ? void 0 : direct;
-	const aliasTarget = aliasIndex.get(id);
-	if (!aliasTarget) return void 0;
-	const aliased = registry.get(aliasTarget);
-	if (!aliased) return void 0;
-	return isExtensionDisabled(cfg, aliased.id) ? void 0 : aliased;
-}
-function listImageGenerationProviders(cfg) {
-	const out = [];
-	for (const provider of registry.values()) {
-		if (isExtensionDisabled(cfg, provider.id)) continue;
-		out.push(provider);
-	}
-	return out;
-}
-function listImageGenerationProvidersSummary(cfg) {
-	return listImageGenerationProviders(cfg).map((provider) => ({
+function listImageGenerationProvidersSummary() {
+	return providers.map((provider) => ({
 		id: provider.id,
-		...provider.label ? { label: provider.label } : {},
-		...provider.defaultModel ? { defaultModel: provider.defaultModel } : {},
-		models: provider.models ?? (provider.defaultModel ? [provider.defaultModel] : []),
-		...provider.aliases?.length ? { aliases: [...provider.aliases] } : {},
-		...provider.capabilities ? { capabilities: provider.capabilities } : {},
-		...provider.ui ? { ui: provider.ui } : {}
+		label: provider.label,
+		defaultModel: provider.defaultModel,
+		models: [...provider.models],
+		capabilities: provider.capabilities
 	}));
 }
-function clearImageGenerationRegistryForTests() {
-	registry.clear();
-	aliasIndex.clear();
-}
 //#endregion
-export { clearImageGenerationRegistryForTests, getImageGenerationProvider, listImageGenerationProviders, listImageGenerationProvidersSummary, registerImageGenerationProvider };
+export { getImageGenerationProvider, listImageGenerationProviders, listImageGenerationProvidersSummary };

package/dist/{extensions/dashscope/src/image-generation-provider.d.ts → src/agent/image/generation/providers/dashscope.d.ts} RENAMED Viewed

@@ -1,4 +1,4 @@
-import type { ImageGenerationProvider, ImageGenerationRequest, ImageGenerationResult } from '@xopcai/xopc/agent/image/generation/types.js';
+import type { ImageGenerationProvider, ImageGenerationRequest, ImageGenerationResult } from '../types.js';
 /**
  * Wan image model ids for **HTTP synchronous** `multimodal-generation/generation`.
  * - **2.7** (`wan2.7-image-pro` / `wan2.7-image`): see Wan 2.7 image API (size presets 1K/2K/4K, `thinking_mode`, …).
@@ -19,7 +19,7 @@ export declare const DASHSCOPE_IMAGE_ENDPOINTS: {
     readonly singapore: "https://dashscope-intl.aliyuncs.com/api/v1/services/aigc/multimodal-generation/generation";
 };
 export type DashScopeImageRegion = keyof typeof DASHSCOPE_IMAGE_ENDPOINTS;
-export declare function resolveDashScopeImageGenerationUrl(req?: ImageGenerationRequest, defaultRegion?: DashScopeImageRegion): string;
+export declare function resolveDashScopeImageGenerationUrl(req: ImageGenerationRequest): string;
 /** Map tool size (e.g. `1024x1024`) to DashScope `宽*高` format. */
 export declare function mapSizeToDashScopeFormat(size?: string): string;
 export declare function isWan27ImageModel(model: string): boolean;
@@ -31,8 +31,5 @@ export declare function mapSizeToWan27Format(size: string | undefined, modelId:
 export declare function generateDashScopeImages(params: {
     req: ImageGenerationRequest;
     apiKey: string;
-    providerId?: string;
-    defaultRegion?: DashScopeImageRegion;
 }): Promise<ImageGenerationResult>;
-export declare function buildDashScopeCnImageGenerationProvider(): ImageGenerationProvider;
-export declare function buildDashScopeIntlImageGenerationProvider(): ImageGenerationProvider;
+export declare function buildDashScopeImageGenerationProvider(): ImageGenerationProvider;

package/dist/{extensions/dashscope/src/image-generation-provider.js → src/agent/image/generation/providers/dashscope.js} RENAMED Viewed

@@ -1,21 +1,17 @@
-import { createLogger } from "../../../src/utils/logger/index.js";
-import { init_logger } from "../../../src/utils/logger.js";
-import { imageFileExtensionForMimeType } from "../../../src/agent/image/generation/image-assets.js";
-import { pickTimeoutMsOrFallback } from "../../../src/media-shared/http/deadline.js";
-import { privateNetworkPolicyToSsrfGuardOptions } from "../../../src/media-shared/http/private-network.js";
-import { resolveProviderHttpRequestConfig } from "../../../src/media-shared/http/resolve-provider-http-request-config.js";
-import { postJsonRequest } from "../../../src/media-shared/http/provider-http.js";
-import "../../../src/media-shared/http/index.js";
-import { resolveApiKeyForProvider } from "../../../src/providers/auth-runtime/resolve-api-key.js";
-import { isProviderApiKeyConfigured } from "../../../src/providers/auth-runtime/is-configured.js";
-import "../../../src/providers/auth-runtime/index.js";
-//#region extensions/dashscope/src/image-generation-provider.ts
+import { createLogger } from "../../../../utils/logger/index.js";
+import { init_logger } from "../../../../utils/logger.js";
+import { imageFileExtensionForMimeType } from "../image-assets.js";
+import { pickTimeoutMsOrFallback } from "../../../../media-shared/http/deadline.js";
+import { privateNetworkPolicyToSsrfGuardOptions } from "../../../../media-shared/http/private-network.js";
+import { resolveProviderHttpRequestConfig } from "../../../../media-shared/http/resolve-provider-http-request-config.js";
+import { postJsonRequest } from "../../../../media-shared/http/provider-http.js";
+import "../../../../media-shared/http/index.js";
+import { resolveApiKeyForProvider } from "../../../../providers/auth-runtime/resolve-api-key.js";
+import { isProviderApiKeyConfigured } from "../../../../providers/auth-runtime/is-configured.js";
+import "../../../../providers/auth-runtime/index.js";
+//#region src/agent/image/generation/providers/dashscope.ts
 /**
-* Bundled DashScope (Alibaba) image-generation provider.
-*
-* Migrated from src/agent/image/generation/dashscope-generate.ts. Logic stays
-* identical; the only change is registration is now driven by the bundled
-* provider generator.
+* Built-in DashScope (Alibaba Model Studio) image-generation provider.
 */
 init_logger();
 const log = createLogger("ImageGen:DashScope");
@@ -67,23 +63,18 @@ const DASHSCOPE_IMAGE_ENDPOINTS = {
 	singapore: "https://dashscope-intl.aliyuncs.com/api/v1/services/aigc/multimodal-generation/generation"
 };
 const DEFAULT_OUTPUT_MIME = "image/png";
-function providerConfigId(req, fallback = "dashscope-cn") {
-	return req?.provider?.trim() || fallback;
-}
-function resolveDashScopeImageGenerationUrl(req, defaultRegion = "beijing") {
-	const id = providerConfigId(req);
-	const cfgImageBase = readDashScopeCfgString(req?.cfg, id, "imageBaseUrl");
-	if (cfgImageBase) return cfgImageBase.replace(/\/+$/, "");
-	const cfgBase = readDashScopeCfgString(req?.cfg, id, "baseUrl");
+function resolveDashScopeImageGenerationUrl(req) {
+	const cfgBase = readDashScopeCfgString(req.cfg, "baseUrl");
 	if (cfgBase) return cfgBase.replace(/\/+$/, "");
-	const trimmed = process.env.DASHSCOPE_IMAGE_BASE_URL?.trim();
-	if (trimmed) return trimmed.replace(/\/+$/, "");
-	return DASHSCOPE_IMAGE_ENDPOINTS[defaultRegion];
+	const region = readDashScopeCfgString(req.cfg, "region");
+	if (region === "cn") return DASHSCOPE_IMAGE_ENDPOINTS.beijing;
+	if (region === "intl") return DASHSCOPE_IMAGE_ENDPOINTS.singapore;
+	throw new Error("DashScope image generation requires providers.dashscope.region (cn or intl)");
 }
-function readDashScopeCfgString(cfg, providerId, key) {
+function readDashScopeCfgString(cfg, key) {
 	const providers = cfg?.providers;
 	if (!providers || typeof providers !== "object") return void 0;
-	const entry = providers[providerId];
+	const entry = providers.dashscope;
 	if (!entry || typeof entry !== "object") return void 0;
 	const v = entry[key];
 	return typeof v === "string" && v.trim() ? v.trim() : void 0;
@@ -150,7 +141,7 @@ async function fetchImageBuffers(urls, signal) {
 }
 async function generateDashScopeImages(params) {
 	const { req, apiKey } = params;
-	const providerId = params.providerId ?? req.provider ?? "dashscope-cn";
+	const providerId = "dashscope";
 	if (req.inputImages && req.inputImages.length > 0) throw new Error("Image-to-image is not supported for Qwen/DashScope in this build");
 	const n = Math.min(4, Math.max(1, req.count ?? 1));
 	const model = req.model?.trim() || DASHSCOPE_DEFAULT_IMAGE_MODEL;
@@ -174,7 +165,7 @@ async function generateDashScopeImages(params) {
 		}] },
 		parameters
 	};
-	const url = resolveDashScopeImageGenerationUrl(req, params.defaultRegion);
+	const url = resolveDashScopeImageGenerationUrl(req);
 	const httpDefaults = resolveProviderHttpRequestConfig({
 		providerId,
 		cfg: req.cfg,
@@ -216,45 +207,31 @@ async function generateDashScopeImages(params) {
 		model
 	};
 }
-function createDashScopeImageGenerationProvider(options) {
+function buildDashScopeImageGenerationProvider() {
 	return {
-		id: options.id,
-		label: options.label,
+		id: "dashscope",
+		label: "Alibaba Model Studio",
 		defaultModel: DASHSCOPE_DEFAULT_IMAGE_MODEL,
 		models: [...DASHSCOPE_IMAGE_MODELS],
 		capabilities: DASHSCOPE_CAPABILITIES,
 		isConfigured: (ctx) => isProviderApiKeyConfigured({
-			providerId: options.id,
-			cfg: ctx.cfg
-		}),
+			providerId: "dashscope",
+			cfg: ctx.cfg,
+			agentId: ctx.agentId
+		}) && ["cn", "intl"].includes(readDashScopeCfgString(ctx.cfg, "region") ?? ""),
 		async generateImage(req) {
 			const apiKey = resolveApiKeyForProvider({
-				providerId: options.id,
-				cfg: req.cfg
+				providerId: "dashscope",
+				cfg: req.cfg,
+				agentId: req.agentId
 			});
-			if (!apiKey) throw new Error(`DashScope API key missing (set DASHSCOPE_API_KEY or providers.${options.id}.apiKey)`);
+			if (!apiKey) throw new Error("DashScope API key missing (set DASHSCOPE_API_KEY or save a credential)");
 			return generateDashScopeImages({
 				req,
-				apiKey,
-				providerId: options.id,
-				defaultRegion: options.defaultRegion
+				apiKey
 			});
 		}
 	};
 }
-function buildDashScopeCnImageGenerationProvider() {
-	return createDashScopeImageGenerationProvider({
-		id: "dashscope-cn",
-		label: "DashScope (Alibaba · China)",
-		defaultRegion: "beijing"
-	});
-}
-function buildDashScopeIntlImageGenerationProvider() {
-	return createDashScopeImageGenerationProvider({
-		id: "dashscope-intl",
-		label: "DashScope (Alibaba · International)",
-		defaultRegion: "singapore"
-	});
-}
 //#endregion
-export { DASHSCOPE_DEFAULT_IMAGE_MODEL, DASHSCOPE_IMAGE_ENDPOINTS, DASHSCOPE_IMAGE_MODELS, buildDashScopeCnImageGenerationProvider, buildDashScopeIntlImageGenerationProvider, generateDashScopeImages, isWan27ImageModel, mapSizeToDashScopeFormat, mapSizeToWan27Format, resolveDashScopeImageGenerationUrl };
+export { DASHSCOPE_DEFAULT_IMAGE_MODEL, DASHSCOPE_IMAGE_ENDPOINTS, DASHSCOPE_IMAGE_MODELS, buildDashScopeImageGenerationProvider, generateDashScopeImages, isWan27ImageModel, mapSizeToDashScopeFormat, mapSizeToWan27Format, resolveDashScopeImageGenerationUrl };