@xopcai/xopc 0.0.364 → 0.0.367

package/dist/src/agent/agent-manager.js

@@ -8,7 +8,6 @@ import { getSessionMetadata } from "../storage/sqlite/session-read-repository.js
 import { init_sqlite } from "../storage/sqlite/index.js";
 import { expandWorkspacePathString, init_workspace_path } from "../config/workspace-path.js";
 import { init_agent_scope, listAgentEntries, resolveAgentProfileDir } from "./agent-scope.js";
-import { extractTextContent } from "./context/workspace.js";
 import { init_paths, resolveBundledSkillsDir } from "../config/paths.js";
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { traceTools } from "../observability/runtime.js";
@@ -19,6 +18,10 @@ import { init_sync_provider_auth, resolveProviderApiKeySync } from "../auth/sync
 import { getApiKeySync, getDefaultModelSync, init_providers, resolveModel } from "../providers/index.js";
 import { createExtensionAwareStreamFn } from "../providers/extension-stream-bridge.js";
 import { continuesAfterTool, trackAiUsageStream } from "../usage/recorder.js";
+import { extractTextContent } from "./context/workspace.js";
+import { resolveUserContextSessionAccess } from "../user-context/access-policy.js";
+import { isPersonalConversation } from "../personal-agent/repository.js";
+import { PersonalPromptContext } from "../personal-agent/prompt-context.js";
 import { buildExecutionScopeContextForPrompt } from "./context/execution-scope.js";
 import { clearBootstrapSnapshot } from "./bootstrap/bootstrap-cache.js";
 import { resolveBootstrapContextSync } from "./bootstrap/bootstrap-files.js";
@@ -35,7 +38,6 @@ import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "./ski
 import { replaceAgentSystemPrompt } from "./prompt/agent-system-prompt.js";
 import { evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner } from "./embedded/session-runner.js";
 import { createAgentTurnPolicy } from "./orchestration/agent-turn-policy.js";
-import { resolveUserContextSessionAccess } from "../user-context/access-policy.js";
 import { createAgentCapabilitySessionState, resolveAgentCapabilityCatalog } from "./capabilities/registry.js";
 import "./capabilities/index.js";
 import { sortToolsForPromptCache } from "./tools/cache-stability.js";
@@ -258,6 +260,7 @@ var AgentManager = class {
 			getPrimaryModel: () => this.resolveModelStringToModel(this.pickDefaultModelRef()),
 			getMemoryManager: () => this.getCurrentWorkspaceRuntime().memoryManager,
 			getSkillManager: () => this.getCurrentWorkspaceRuntime().skillManager,
+			getAgentSkillAvailability: (agentId) => this.getAgentSkillAvailability(agentId),
 			getSessionStore: this.config.getSessionStore,
 			gatewayClarify: this.config.gatewayClarify,
 			getAutomationService: this.config.getAutomationService,
@@ -393,7 +396,7 @@ var AgentManager = class {
 	prepareSkillTurn(conversationId, text) {
 		this.getOrCreateAgent(conversationId);
 		const inst = this.agents.get(conversationId);
-		if (!text.includes("/skill:")) return {
+		if (isPersonalConversation(conversationId) || !text.includes("/skill:")) return {
 			text,
 			activatedCapabilityNames: this.activeCapabilityNames(inst)
 		};
@@ -969,7 +972,9 @@ var AgentManager = class {
 	composeDynamicProjectContext(...sections) {
 		return sections.map((section) => section?.trim()).filter((section) => Boolean(section)).join("\n\n") || void 0;
 	}
+	personalPromptContext = new PersonalPromptContext();
 	buildExecutionScopeContext(conversationId) {
+		if (isXopcDatabaseOpen() && isPersonalConversation(conversationId)) return this.personalPromptContext.build(this.config.config, conversationId);
 		const access = resolveUserContextSessionAccess(this.config.config, conversationId);
 		return buildExecutionScopeContextForPrompt(conversationId, {
 			includeKnowledge: access.knowledge,
@@ -1133,6 +1138,33 @@ var AgentManager = class {
 	}
 	resolveToolPolicy(profile, toolName, args) {
 		const gatewayPolicy = profile.config.tools[toolName];
+		if (toolName === "user_context_read" || toolName === "knowledge_read") {
+			const command = args?.command;
+			if (command === "search" || command === "get") {
+				const legacyId = `${toolName.slice(0, -5)}_${command}`;
+				const legacyPolicy = profile.config.tools[legacyId];
+				const policies = [gatewayPolicy && {
+					id: toolName,
+					...gatewayPolicy
+				}, legacyPolicy && {
+					id: legacyId,
+					...legacyPolicy
+				}].filter((policy) => Boolean(policy));
+				const rank = {
+					allow: 0,
+					ask: 1,
+					deny: 2
+				};
+				policies.sort((a, b) => rank[b.mode] - rank[a.mode]);
+				const selected = policies[0];
+				if (!selected) return void 0;
+				const limits = policies.flatMap((policy) => policy.maxCallsPerTurn ? [policy.maxCallsPerTurn] : []);
+				return {
+					...selected,
+					...limits.length ? { maxCallsPerTurn: Math.min(...limits) } : {}
+				};
+			}
+		}
 		if (gatewayPolicy && gatewayPolicy.mode !== "allow") return {
 			id: toolName,
 			...gatewayPolicy

package/dist/src/agent/background-review/run-background-review.js

@@ -4,12 +4,12 @@ import { finishContextExtractionRun } from "../../storage/sqlite/context-extract
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { loadCompactionSourceSnapshot } from "../../storage/sqlite/transcript-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
-import { extractTextContent } from "../context/workspace.js";
 import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { getApiKeySync, init_providers, resolveModel } from "../../providers/index.js";
 import { createExtensionAwareStreamFn } from "../../providers/extension-stream-bridge.js";
 import { trackAiUsageStream } from "../../usage/recorder.js";
+import { extractTextContent } from "../context/workspace.js";
 import { getAssertionSlot, listUserAssertions } from "../../user-model/repository.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { isAssistantTurnAborted, isAssistantTurnFailed } from "../orchestration/llm-turn-retry.js";

package/dist/src/agent/commands/command-registry.js

@@ -3,8 +3,8 @@ import { redactSensitiveOutput } from "../../utils/logger/redact.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_global_singleton, resolveGlobalSingleton } from "../../utils/global-singleton.js";
 import { init_paths } from "../../config/paths.js";
-import { spawnProcess } from "../../process/run-process.js";
 import { DurableState } from "../../storage/sqlite/durable-state.js";
+import { spawnProcess } from "../../process/run-process.js";
 import { isolatedCommand, removeCommandContainer } from "./command-isolation.js";
 import { readWorkspaceRevision } from "../coding/workspace-revision.js";
 import { join } from "node:path";

package/dist/src/agent/context/execution-context.js

@@ -2,10 +2,10 @@ import { getSqliteDatabase, init_transaction } from "../../storage/sqlite/transa
 import { init_collaboration_rule_repository, listCollaborationRules } from "../../storage/sqlite/collaboration-rule-repository.js";
 import { searchKnowledgeItems } from "../../knowledge-memory/repository.js";
 import "../../knowledge-memory/index.js";
-import { retrievalLexicalSimilarity } from "../../retrieval/textFeatures.js";
 import { listUserAssertions } from "../../user-model/repository.js";
 import { calculateExecutionValue } from "../../user-model/importance.js";
 import { canUseAssertion } from "../../user-model/usage-policy.js";
+import { retrievalLexicalSimilarity } from "../../retrieval/textFeatures.js";
 import { getExecutionContextFeedbackScores } from "./audit.js";
 import { buildUserContextBlock } from "../memory/context-fence.js";
 import { randomUUID } from "node:crypto";

package/dist/src/agent/context/project-context.js

@@ -1,11 +1,11 @@
 import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
+import { knowledgeItemAllowed, listKnowledgeItems, searchKnowledgeItems } from "../../knowledge-memory/repository.js";
+import "../../knowledge-memory/index.js";
+import { ProjectStore } from "../../projects/project-store.js";
+import { getProjectForSession, getProjectWorkspacePathForSession } from "../../projects/workspace.js";
 import { sanitizeForPromptLiteral } from "../prompt/sanitize-for-prompt.js";
 import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
 import { LocalAppStore } from "../../local-apps/store.js";
-import { ProjectStore } from "../../projects/project-store.js";
-import { getProjectForSession, getProjectWorkspacePathForSession } from "../../projects/workspace.js";
-import { knowledgeItemAllowed, listKnowledgeItems, searchKnowledgeItems } from "../../knowledge-memory/repository.js";
-import "../../knowledge-memory/index.js";
 //#region src/agent/context/project-context.ts
 init_task_repository();
 const MAX_TEXT = 1200;

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

@@ -6,9 +6,9 @@ import { setTraceIdentity, startObservation, traceOperation, traceRun } from "..
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
 import { appendDynamicPromptSection } from "../prompt/cache-boundary.js";
+import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { resolveAgentTurnTimeoutMs } from "../orchestration/run-agent-turn-with-timeout.js";
-import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";
 import { evaluateContextBudget } from "../memory/context-budget.js";
 import { assessContext, recoverContext as recoverContext$1 } from "../memory/context-recovery.js";

package/dist/src/agent/external-tools/endpoint-provider.js

@@ -1,7 +1,7 @@
-import { executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
-import { canonicalCapabilityJson } from "../../capabilities/runtime/dispatcher.js";
 import { COMPUTER_CONTROL_TOOL, init_src } from "../../../packages/computer-control-contract/src/index.js";
 import { BROWSER_CONTROL_ENDPOINT_TOOL_NAME } from "../../../packages/browser-control-contract/src/index.js";
+import { executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
+import { canonicalCapabilityJson } from "../../capabilities/runtime/dispatcher.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
 import { createHash } from "node:crypto";
 //#region src/agent/external-tools/endpoint-provider.ts

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

@@ -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-2". */
+    /** Model id, e.g. "gpt-image-2.5-flare". */
     model: string;
     /** Short, human-readable failure summary. */
     error: string;

package/dist/src/agent/failover-error.js

@@ -1,6 +1,8 @@
 import { isTimeoutAbortError } from "../media-shared/http/deadline.js";
 import { ProviderHttpError } from "../media-shared/http/provider-http-errors.js";
 import "../media-shared/http/index.js";
+import { ImageProviderError } from "../../packages/image-providers/src/validation.js";
+import "../../packages/image-providers/src/index.js";
 //#region src/agent/failover-error.ts
 /**
 * FailoverError — uniform terminal error after all candidate provider/model
@@ -80,6 +82,11 @@ function reasonFromHttpStatus(status) {
 * {@link FallbackAttempt}-friendly shape.
 */
 function classifyAttemptError(e) {
+	if (e instanceof ImageProviderError) return {
+		reason: reasonFromHttpStatus(e.status),
+		status: e.status,
+		message: e.message
+	};
 	if (e instanceof ProviderHttpError) return {
 		reason: reasonFromHttpStatus(e.status),
 		status: e.status,

package/dist/src/agent/image/generation/native-provider.d.ts

@@ -0,0 +1,2 @@
+import type { ImageGenerationProvider } from './types.js';
+export declare function buildNativeImageProvider(providerId: string): ImageGenerationProvider;

package/dist/src/agent/image/generation/native-provider.js

@@ -0,0 +1,118 @@
+import { privateNetworkPolicyToSsrfGuardOptions } from "../../../media-shared/http/private-network.js";
+import { resolveProviderHttpRequestConfig } from "../../../media-shared/http/resolve-provider-http-request-config.js";
+import { fetchWithTimeoutGuarded } from "../../../media-shared/http/provider-http.js";
+import "../../../media-shared/http/index.js";
+import { getImageProviderSpec } from "../../../../packages/image-providers/src/catalog.js";
+import { executeImageProvider } from "../../../../packages/image-providers/src/execute.js";
+import "../../../../packages/image-providers/src/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/native-provider.ts
+function buildNativeImageProvider(providerId) {
+	const spec = getImageProviderSpec(providerId);
+	const modelCapabilities = Object.fromEntries(spec.models.map((model) => [model.id, model.capabilities]));
+	return {
+		id: spec.id,
+		label: spec.name,
+		documentationUrl: spec.documentationUrl,
+		apiKeyUrl: spec.apiKeyUrl,
+		defaultModel: spec.models[0].id,
+		models: spec.models.map((model) => model.id),
+		capabilities: spec.models[0].capabilities,
+		modelCapabilities,
+		configFields: [...spec.regions ? [{
+			key: "region",
+			label: "Region",
+			type: "select",
+			required: true,
+			options: [{
+				value: "cn",
+				label: "China"
+			}, {
+				value: "intl",
+				label: "International"
+			}]
+		}] : [], {
+			key: "baseUrl",
+			label: "Base URL",
+			type: "url",
+			placeholder: spec.baseUrl
+		}],
+		isConfigured: (ctx) => isProviderApiKeyConfigured({
+			providerId,
+			cfg: ctx.cfg,
+			agentId: ctx.agentId
+		}) && (!spec.regions || Boolean(ctx.cfg?.providers?.[providerId]?.region)),
+		async generateImage(req) {
+			const apiKey = resolveApiKeyForProvider({
+				providerId,
+				cfg: req.cfg,
+				agentId: req.agentId,
+				store: req.authStore
+			});
+			if (!apiKey) throw new Error(`${spec.name} API key missing`);
+			const settings = req.cfg?.providers?.[providerId];
+			if (settings?.azure) throw new Error("Configure Azure images as an explicit custom image provider");
+			const baseUrl = settings?.baseUrl ?? (spec.regions ? spec.regions[settings?.region] : spec.baseUrl);
+			if (!baseUrl) throw new Error(`${spec.name} requires region or baseUrl`);
+			const http = resolveProviderHttpRequestConfig({
+				providerId,
+				cfg: req.cfg,
+				fallbackTimeoutMs: spec.timeoutMs
+			});
+			const timeoutMs = req.timeoutMs ?? http.timeoutMs ?? spec.timeoutMs;
+			const signal = AbortSignal.any([AbortSignal.timeout(timeoutMs), ...req.signal ? [req.signal] : []]);
+			const result = await executeImageProvider({
+				providerId,
+				baseUrl,
+				apiKey,
+				signal,
+				fetchImpl: ((url, init) => {
+					const headers = new Headers(new URL(String(url)).origin === new URL(baseUrl).origin ? http.headers : void 0);
+					new Headers(init?.headers).forEach((value, key) => headers.set(key, value));
+					return fetchWithTimeoutGuarded(String(url), {
+						label: spec.name,
+						timeoutMs,
+						signal,
+						init: {
+							...init,
+							headers,
+							redirect: "error"
+						},
+						...privateNetworkPolicyToSsrfGuardOptions()
+					});
+				}),
+				request: {
+					model: req.model,
+					prompt: req.prompt,
+					count: req.count,
+					size: req.size,
+					aspectRatio: req.aspectRatio,
+					resolution: req.resolution,
+					quality: req.quality,
+					outputFormat: req.outputFormat,
+					background: req.background ?? req.providerOptions?.openai?.background,
+					openai: req.providerOptions?.openai,
+					inputImages: req.inputImages?.map((image, index) => ({
+						blob: new Blob([new Uint8Array(image.buffer)], { type: image.mimeType }),
+						fileName: image.fileName ?? `input-${index}.png`
+					}))
+				}
+			});
+			return {
+				model: req.model,
+				images: result.images.map((image) => ({
+					buffer: Buffer.from(image.bytes),
+					mimeType: image.mimeType
+				})),
+				metadata: {
+					requestId: result.requestId,
+					usage: result.usage
+				}
+			};
+		}
+	};
+}
+//#endregion
+export { buildNativeImageProvider };

package/dist/src/agent/image/generation/openai-images-provider.d.ts

@@ -48,7 +48,7 @@ export interface OpenAiImagesProviderOptions {
     resolveEndpoint: (req: ImageGenerationRequest) => OpenAiImagesEndpointResolution;
     /** Default per-call timeout. Combined with provider-level config in provider-http. */
     defaultTimeoutMs?: number;
-    /** Default count clamp. Provider may also enforce via `capabilities.generate.maxCount`. */
+    /** Default image count. Provider may also enforce via `capabilities.generate.maxCount`. */
     defaultCount?: number;
     defaultSize?: string;
 }

package/dist/src/agent/image/generation/openai-images-provider.js

@@ -1,23 +1,24 @@
 import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
-import { imageAssetFromBase64, imageFileExtensionForMimeType } from "./image-assets.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, postMultipartRequest, readJsonResponseLimited } from "../../../media-shared/http/provider-http.js";
 import "../../../media-shared/http/index.js";
+import { ImageProviderError, validateImageRequest } from "../../../../packages/image-providers/src/validation.js";
+import { decodeBase64, imageFromBytes } from "../../../../packages/image-providers/src/http.js";
+import "../../../../packages/image-providers/src/index.js";
 //#region src/agent/image/generation/openai-images-provider.ts
+/** Strict implementation of the OpenAI Images REST protocol. */
 init_logger();
 const log = createLogger("ImageGen:OpenAIImages");
-const DEFAULT_OUTPUT_MIME = "image/png";
 const DEFAULT_TIMEOUT_MS = 12e4;
 const MAX_RESPONSE_BYTES = 64 * 1024 * 1024;
-const MAX_IMAGE_BYTES = 32 * 1024 * 1024;
 const MAX_TOTAL_IMAGE_BYTES = 64 * 1024 * 1024;
 function createOpenAiImagesProvider(options) {
-	const defaultMaxCount = options.capabilities.generate?.maxCount ?? 4;
 	const defaultCount = options.defaultCount ?? 1;
-	const defaultSize = options.defaultSize ?? "1024x1024";
+	const defaultSize = options.defaultSize ?? options.capabilities.geometry?.sizes?.[0];
 	return {
 		id: options.id,
 		label: options.label,
@@ -44,8 +45,20 @@ function createOpenAiImagesProvider(options) {
 			});
 			const ssrfGuardOptions = privateNetworkPolicyToSsrfGuardOptions(endpoint.privateNetworkPolicy);
 			const isEdit = (req.inputImages?.length ?? 0) > 0;
-			const count = clampCount(req.count, defaultCount, defaultMaxCount);
-			const size = req.size?.trim() || defaultSize;
+			const count = req.count ?? defaultCount;
+			const size = req.size?.trim() || (req.aspectRatio || req.resolution || !options.capabilities.generate?.supportsSize ? void 0 : defaultSize);
+			if (!options.models.includes(req.model)) throw new ImageProviderError(`Unsupported image model: ${req.model}`, 400);
+			validateImageRequest({
+				...req,
+				count,
+				size,
+				background: req.background ?? req.providerOptions?.openai?.background,
+				openai: req.providerOptions?.openai,
+				inputImages: req.inputImages?.map((image, index) => ({
+					blob: new Blob([new Uint8Array(image.buffer)], { type: image.mimeType }),
+					fileName: image.fileName ?? `input-${index}`
+				}))
+			}, options.capabilities);
 			const url = isEdit ? joinPath(endpoint.baseUrl, endpoint.editsPath ?? "/images/edits") : joinPath(endpoint.baseUrl, endpoint.generationsPath ?? "/images/generations");
 			log.debug({
 				providerId: options.id,
@@ -72,7 +85,11 @@ function createOpenAiImagesProvider(options) {
 				size,
 				httpDefaults,
 				ssrfGuardOptions
-			}), req);
+			}), {
+				...req,
+				count
+			});
+			if (mapped.length > count) throw new ImageProviderError("Provider returned too many images", 502);
 			if (mapped.length === 0) throw new Error(`${options.id} returned no images.`);
 			return {
 				images: mapped,
@@ -86,10 +103,13 @@ async function postGenerateRequest(params) {
 		model: params.req.model,
 		prompt: params.req.prompt,
 		n: params.count,
-		size: params.size,
-		response_format: "b64_json"
+		...params.size ? { size: params.size } : {}
 	};
 	applyOpenAiOptions(body, params.req);
+	if (params.req.aspectRatio || params.req.resolution) body.xopc = { image: {
+		aspectRatio: params.req.aspectRatio,
+		resolution: params.req.resolution
+	} };
 	const timeoutMs = pickTimeoutMsOrFallback(params.req.timeoutMs, params.httpDefaults.timeoutMs, DEFAULT_TIMEOUT_MS);
 	return await readJsonResponseLimited(await postJsonRequest(params.url, {
 		label: params.providerId,
@@ -106,9 +126,15 @@ async function postEditRequest(params) {
 		model: params.req.model,
 		prompt: params.req.prompt,
 		n: String(params.count),
-		size: params.size,
-		response_format: "b64_json"
+		...params.size ? { size: params.size } : {}
 	};
+	const options = {};
+	applyOpenAiOptions(options, params.req);
+	for (const [key, value] of Object.entries(options)) fields[key] = String(value);
+	if (params.req.aspectRatio || params.req.resolution) fields.xopc = JSON.stringify({ image: {
+		aspectRatio: params.req.aspectRatio,
+		resolution: params.req.resolution
+	} });
 	const form = new FormData();
 	for (const [k, v] of Object.entries(fields)) if (typeof v === "string") form.append(k, v);
 	for (let idx = 0; idx < inputImages.length; idx++) {
@@ -117,7 +143,7 @@ async function postEditRequest(params) {
 		const u8 = img.buffer instanceof Uint8Array ? img.buffer : new Uint8Array(img.buffer);
 		const copy = new Uint8Array(u8.byteLength);
 		copy.set(u8);
-		form.append(field, new Blob([copy], { type: img.mimeType || DEFAULT_OUTPUT_MIME }), pickEditFileName(img, idx));
+		form.append(field, new Blob([copy], { type: img.mimeType }), pickEditFileName(img, idx));
 	}
 	const headers = new Headers(params.headers);
 	headers.delete("content-type");
@@ -135,26 +161,20 @@ function mapOpenAiImagesResponse(raw, req) {
 	if (!raw || typeof raw !== "object") return [];
 	const data = raw.data;
 	if (!Array.isArray(data)) return [];
-	const ext = imageFileExtensionForMimeType(req.outputFormat ? `image/${req.outputFormat}` : DEFAULT_OUTPUT_MIME);
+	if (data.length > (req.count ?? 1)) throw new ImageProviderError("Provider returned too many images", 502);
 	const out = [];
 	let totalBytes = 0;
-	data.forEach((entry, index) => {
-		const b64 = entry?.b64_json;
-		if (typeof b64 !== "string" || b64.length === 0) return;
-		const estimatedBytes = Math.ceil(b64.replace(/\s+/g, "").length * 3 / 4);
-		if (estimatedBytes > MAX_IMAGE_BYTES) throw new Error(`OpenAI Images response image exceeds ${MAX_IMAGE_BYTES} bytes.`);
-		totalBytes += estimatedBytes;
-		if (totalBytes > MAX_TOTAL_IMAGE_BYTES) throw new Error(`OpenAI Images response images exceed ${MAX_TOTAL_IMAGE_BYTES} bytes total.`);
-		const asset = imageAssetFromBase64({
-			base64: b64,
-			mimeType: req.outputFormat ? `image/${req.outputFormat}` : void 0,
-			fileName: `image-${index + 1}.${ext}`
-		});
+	for (const [index, entry] of data.entries()) {
+		const image = imageFromBytes(decodeBase64(entry?.b64_json));
+		totalBytes += image.bytes.byteLength;
+		if (totalBytes > MAX_TOTAL_IMAGE_BYTES) throw new ImageProviderError("Generated images exceed total byte limit", 502);
 		out.push({
-			...asset,
+			buffer: Buffer.from(image.bytes),
+			mimeType: image.mimeType,
+			fileName: `image-${index + 1}.${imageFileExtensionForMimeType(image.mimeType)}`,
 			...typeof entry.revised_prompt === "string" ? { revisedPrompt: entry.revised_prompt } : {}
 		});
-	});
+	}
 	return out;
 }
 function applyAuthorizationHeader(params) {
@@ -191,10 +211,6 @@ function pickEditFileName(img, idx) {
 	const ext = imageFileExtensionForMimeType(img.mimeType);
 	return `image-${idx + 1}.${ext}`;
 }
-function clampCount(requested, fallback, max) {
-	if (typeof requested !== "number" || !Number.isFinite(requested) || requested <= 0) return fallback;
-	return Math.min(max, Math.max(1, Math.floor(requested)));
-}
 function joinPath(baseUrl, subPath) {
 	return `${baseUrl.replace(/\/+$/, "")}${subPath.startsWith("/") ? subPath : `/${subPath}`}`;
 }

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

@@ -1,12 +1,10 @@
 import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
 import { init_models_json, loadModelsJson } from "../../../config/models-json.js";
+import { listImageProviderSpecs } from "../../../../packages/image-providers/src/catalog.js";
+import "../../../../packages/image-providers/src/index.js";
 import { buildCustomOpenAiImagesProvider } from "./custom-openai-images-provider.js";
-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";
+import { buildNativeImageProvider } from "./native-provider.js";
 import { buildXopcCloudImageGenerationProvider } from "./providers/xopc-cloud.js";
 //#region src/agent/image/generation/provider-registry.ts
 init_models_json();
@@ -14,14 +12,7 @@ init_logger();
 const log = createLogger("ImageGenerationRegistry");
 function buildBuiltInProviders() {
 	const cloud = buildXopcCloudImageGenerationProvider();
-	return [
-		...cloud ? [cloud] : [],
-		buildOpenAIImageGenerationProvider(),
-		buildDashScopeImageGenerationProvider(),
-		buildMinimaxImageGenerationProvider(),
-		buildGoogleImageGenerationProvider(),
-		buildFalImageGenerationProvider()
-	];
+	return [...cloud ? [cloud] : [], ...listImageProviderSpecs().map((spec) => buildNativeImageProvider(spec.id))];
 }
 let providers = buildBuiltInProviders();
 let providersById = new Map(providers.map((provider) => [provider.id, provider]));

package/dist/src/agent/image/generation/providers/xopc-cloud.js

@@ -9,9 +9,9 @@ init_provider_auth_service();
 init_xopc_cloud_config();
 function buildXopcCloudImageGenerationProvider() {
 	const source = getModelCatalogStore().getSource("xopc-cloud");
-	const models = source?.models.filter((model) => model.availability === "available" && model.kind === "image" && model.operations.includes("images.generate")).sort((left, right) => compareCatalogModels(left, right, source.recommended?.["image-generation"])) ?? [];
+	const models = source?.models.filter((model) => model.availability === "available" && model.kind === "image" && model.operations.includes("images.generate") && Boolean(model.imageGeneration)).sort((left, right) => compareCatalogModels(left, right, source.recommended?.["image-generation"])) ?? [];
 	if (models.length === 0) return void 0;
-	const modelCapabilities = Object.fromEntries(models.map((model) => [model.id, toProviderCapabilities(model)]));
+	const modelCapabilities = Object.fromEntries(models.map((model) => [model.id, model.imageGeneration]));
 	const defaultModel = models[0].id;
 	const baseUrl = source?.baseUrl ?? resolveXopcModelRouterUrl();
 	const executors = new Map(models.map((model) => [model.id, createOpenAiImagesProvider({
@@ -19,11 +19,12 @@ function buildXopcCloudImageGenerationProvider() {
 		label: "XOPC Model Service",
 		defaultModel: model.id,
 		models: [model.id],
+		defaultTimeoutMs: 6e5,
 		capabilities: modelCapabilities[model.id],
 		isConfigured: () => true,
 		resolveApiKey: (request) => getProviderAuthService().resolveApiKey("xopc-cloud", request.signal),
 		resolveEndpoint: () => ({ baseUrl }),
-		...model.imageGeneration?.sizes[0] ? { defaultSize: model.imageGeneration.sizes[0] } : {}
+		...model.imageGeneration?.geometry?.sizes?.[0] ? { defaultSize: model.imageGeneration.geometry.sizes[0] } : {}
 	})]));
 	return {
 		id: "xopc-cloud",
@@ -37,37 +38,7 @@ function buildXopcCloudImageGenerationProvider() {
 		async generateImage(request) {
 			const executor = executors.get(request.model);
 			if (!executor) throw new Error(`Image model is not available from XOPC Model Service: ${request.model}`);
-			const geometry = modelCapabilities[request.model]?.geometry;
-			const size = request.size ?? (request.aspectRatio && geometry?.aspectRatios?.includes(request.aspectRatio) ? request.aspectRatio : void 0) ?? (request.resolution && geometry?.resolutions?.includes(request.resolution) ? request.resolution : void 0);
-			return executor.generateImage({
-				...request,
-				...size ? { size } : {}
-			});
-		}
-	};
-}
-function toProviderCapabilities(model) {
-	const image = model.imageGeneration;
-	return {
-		generate: {
-			maxCount: image?.maxCount ?? 1,
-			supportsSize: Boolean(image?.sizes.length),
-			supportsAspectRatio: Boolean(image?.aspectRatios?.length)
-		},
-		edit: {
-			enabled: model.operations.includes("images.edit"),
-			maxInputImages: image?.maxInputImages ?? 0,
-			supportsSize: Boolean(image?.sizes.length),
-			supportsAspectRatio: Boolean(image?.aspectRatios?.length)
-		},
-		geometry: {
-			sizes: image?.sizes ?? [],
-			aspectRatios: image?.aspectRatios ?? []
-		},
-		output: {
-			qualities: image?.qualities ?? [],
-			formats: image?.formats ?? [],
-			backgrounds: image?.backgrounds ?? []
+			return executor.generateImage(request);
 		}
 	};
 }

package/dist/src/agent/image/generation/runtime-types.d.ts

@@ -10,9 +10,9 @@ import type { Config } from '../../../config/schema.js';
 import type { ToolModelConfig } from '../tool-model-config.js';
 import type { AuthProfileStore } from '../../../providers/auth-runtime/index.js';
 import type { FallbackAttempt } from '../../failover-error.js';
-import type { GeneratedImageAsset, ImageGenerationBackground, ImageGenerationIgnoredOverride, ImageGenerationNormalization, ImageGenerationOutputFormat, ImageGenerationProvider, ImageGenerationProviderOptions, ImageGenerationQuality, ImageGenerationResolution, ImageGenerationSourceImage } from './types.js';
+import type { GeneratedImageAsset, ImageGenerationBackground, ImageGenerationOutputFormat, ImageGenerationProvider, ImageGenerationProviderOptions, ImageGenerationQuality, ImageGenerationResolution, ImageGenerationSourceImage } from './types.js';
 export interface GenerateImageParams {
-    /** Active xopc config. Optional in Step 2 to keep tool-level callers compatible. */
+    /** Active xopc config. */
     cfg?: Config;
     prompt: string;
     agentId?: string;
@@ -41,8 +41,6 @@ export interface GenerateImageRuntimeResult {
     provider: string;
     model: string;
     attempts: FallbackAttempt[];
-    normalization?: ImageGenerationNormalization;
-    ignoredOverrides: ImageGenerationIgnoredOverride[];
     metadata?: Record<string, unknown>;
 }
 /**