Skip to content

Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.

feat: integrate gateway credits and official multimodal services

Leggettbde9bc4afee4
diff --git a/apps/daemon/src/api/routes.gateway-account.ts b/apps/daemon/src/api/routes.gateway-account.ts
index 060ee638..a53d1237 100644
--- a/apps/daemon/src/api/routes.gateway-account.ts
+++ b/apps/daemon/src/api/routes.gateway-account.ts
@@ -3,6 +3,7 @@ import { z } from 'zod';
import { apiError } from './errors.js';
import { GatewayError } from '../gateway/client.js';
import type { GatewayAccountService } from '../gateway/account-service.js';
+import { ModelProbeError } from '../gateway/model-selection-probe.js';
export async function registerGatewayAccountRoutes(server: FastifyInstance, service: GatewayAccountService) {
async function respond(work: () => Promise<unknown>, reply: import('fastify').FastifyReply) {
@@ -12,10 +13,16 @@ export async function registerGatewayAccountRoutes(server: FastifyInstance, serv
const code = cloud.status === 401 ? 'GATEWAY_AUTH_REQUIRED' : cloud.code === 'account_disabled' ? 'GATEWAY_ACCOUNT_DISABLED'
: cloud.status === 402 ? 'GATEWAY_CREDITS_INSUFFICIENT' : cloud.status === 409 ? 'GATEWAY_REQUEST_CONFLICT'
: cloud.code === 'services_not_ready' ? 'GATEWAY_SERVICES_NOT_READY' : 'GATEWAY_UNAVAILABLE';
- return reply.code(cloud.status).send(apiError(code, code === 'GATEWAY_REQUEST_CONFLICT' ? 'Wait for the active task to finish before switching accounts or service sources.' : cloud.message, { gatewayCode: cloud.code }));
+ return reply.code(cloud.status).send(apiError(code, code === 'GATEWAY_REQUEST_CONFLICT' ? 'Wait for the active task to finish before switching accounts or service sources.' : cloud.message, { gatewayCode: cloud.code,
+ ...(cloud instanceof ModelProbeError && cloud.publicFacts ? { publicFacts: cloud.publicFacts } : {}),
+ ...(cloud instanceof ModelProbeError && cloud.diagnostics ? { probeRequest: cloud.diagnostics } : {}) }));
}
}
- server.get('/gateway/account', (_r, reply) => respond(() => service.readState(), reply));
+ server.get('/gateway/account', (r, reply) => respond(() => {
+ const query = z.object({ refreshModels: z.literal('1').optional() }).safeParse(r.query);
+ if (!query.success) throw new GatewayError('invalid_parameters', 400);
+ return service.readState({ refreshModels: query.data.refreshModels === '1' });
+ }, reply));
server.post('/gateway/account/web', (r, reply) => respond(async () => {
const value = z.object({ destination: z.enum(['recharge', 'account', 'usage', 'faq']), locale: z.enum(['zh', 'en']), returnUrl: z.string().max(2048).optional() }).strict().safeParse(r.body);
if (!value.success) throw new GatewayError('invalid_parameters', 400);
@@ -39,6 +46,18 @@ export async function registerGatewayAccountRoutes(server: FastifyInstance, serv
server.post('/gateway/auth/activate', (_r, reply) => respond(async () => { await service.activate(); return service.readState(); }, reply));
server.patch('/gateway/source', (r, reply) => respond(async () => { const value = z.object({ source: z.enum(['manual', 'gateway']) }).strict().safeParse(r.body); if (!value.success) throw new GatewayError('invalid_source', 400); await service.setSource(value.data.source); return service.readState(); }, reply));
server.get('/gateway/billing', (_r, reply) => respond(() => service.readBalance(), reply));
+ server.patch('/gateway/supplier-region', (r, reply) => respond(async () => {
+ const value = z.object({ region: z.enum(['auto', 'domestic', 'overseas']) }).strict().safeParse(r.body);
+ if (!value.success) throw new GatewayError('invalid_parameters', 400);
+ return service.setRegion(value.data.region);
+ }, reply));
+ server.post('/gateway/model/probe', (r, reply) => respond(async () => {
+ const value = z.object({ modality: z.enum(['text', 'image', 'video', 'speech', 'transcription']), model: z.string().min(1).max(256),
+ textApi: z.enum(['responses', 'chat/completions']).optional() }).strict().safeParse(r.body);
+ if (!value.success) throw new GatewayError('invalid_model', 400);
+ if (value.data.textApi && value.data.modality !== 'text') throw new GatewayError('invalid_parameters', 400);
+ return service.probeModel(value.data.modality, value.data.model, value.data.textApi ? { textApi: value.data.textApi } : undefined);
+ }, reply));
server.patch('/gateway/model', (r, reply) => respond(async () => {
const value = z.object({ modality: z.enum(['text', 'image', 'video', 'speech', 'transcription']), model: z.string().min(1).max(256) }).strict().safeParse(r.body);
if (!value.success) throw new GatewayError('invalid_model', 400);
diff --git a/apps/daemon/src/api/routes.video-generation.ts b/apps/daemon/src/api/routes.video-generation.ts
index 641ad719..cabd1c42 100644
--- a/apps/daemon/src/api/routes.video-generation.ts
+++ b/apps/daemon/src/api/routes.video-generation.ts
@@ -10,6 +10,13 @@ export async function registerVideoGenerationRoutes(
server: FastifyInstance,
service: VideoGenerationService
): Promise<void> {
+ if (service.uploadReference) {
+ server.addContentTypeParser('application/vnd.opencreator.video-reference', { parseAs: 'buffer', bodyLimit: 100_000_000 }, (_request, body, done) => done(null, body));
+ server.post<{ Body: Buffer; Querystring: { mime?: string } }>('/video-generation/assets', { bodyLimit: 100_000_000 }, async (request, reply) => {
+ try { return await service.uploadReference!(request.body, request.query.mime ?? ''); }
+ catch (error) { return sendError(reply, error); }
+ });
+ }
server.post<{ Body: CreateVideoGenerationRequest }>(
'/video-generation/results',
{ config: { bodyLimit: 8 * 1024 * 1024 } },
diff --git a/apps/daemon/src/api/server.ts b/apps/daemon/src/api/server.ts
index f4e9d85c..1fe27c96 100644
--- a/apps/daemon/src/api/server.ts
+++ b/apps/daemon/src/api/server.ts
@@ -1,3 +1,4 @@
+import { isDirectTransport } from '../gateway/supplier.js';
import type Database from 'better-sqlite3';
import type { CodexAvailabilityProbe, CodexRuntimeComponentReadiness } from '@opencreator/protocol';
import cors from '@fastify/cors';
@@ -242,7 +243,8 @@ import { createGatewayClient, GatewayError, type GatewayClient } from '../gatewa
import { createGatewayRuntimeBindings } from '../gateway/runtime-bindings.js';
import { createOfficialFetch } from '../gateway/official-fetch.js';
import { createOfficialModelAccess } from '../gateway/model-access.js';
-import { preparePlatformProbe } from '../gateway/platform-probe.js';
+import { createModelSelectionProbe } from '../gateway/model-selection-probe.js';
+import { prepareOfficialRuntimeProbe } from '../gateway/runtime-probe.js';
import { createRuntimeSource } from '../gateway/runtime-source.js';
import { createGatewayCreatorSource } from '../gateway/creator-service-source.js';
import { createCodexAppServerHost } from '../codex/app-server-host-2026-07-28.js';
@@ -267,7 +269,7 @@ import { registerThreadRoutes } from './routes.threads.js';
import { registerWorkspaceFileRoutes } from './routes.workspace-files.js';
import { registerVideoMetadataRoutes } from './routes.video-metadata.js';
import { PlatformConnectionService } from '../platform-connections/service.js';
-import { supportedVideoSourcePlatform } from '@opencreator/protocol';
+import { supportedVideoSourcePlatform, gatewayModelReady } from '@opencreator/protocol';
import { registerPlatformConnectionRoutes } from './routes.platform-connections.js';
export type BuildServerInput = {
@@ -306,7 +308,7 @@ export type BuildServerInput = {
codexSessionProvider?: CodexSessionProvider;
codexModelCatalog?: CodexModelCatalog;
getCodexAvailabilityProbe?(): CodexAvailabilityProbe | undefined;
- onPrepareAvailabilityProbe?(prepare: () => ReturnType<typeof preparePlatformProbe>): void;
+ onPrepareAvailabilityProbe?(prepare: () => ReturnType<typeof prepareOfficialRuntimeProbe>): void;
memoryHistoryReader?(threadId: string): { items: import('@opencreator/protocol').ThreadHistoryItem[] } | undefined;
creatorServicesConfigStore?: CreatorServicesConfigStore;
videoMetadataService?: VideoMetadataService;
@@ -530,6 +532,7 @@ export async function buildServer(input: BuildServerInput) {
);
const officialManagers = new Map<string, AppServerRuntimeManager>();
let officialBindings: ReturnType<typeof createGatewayRuntimeBindings> | undefined;
+ let officialRuntimeIdentity: string | undefined;
const gatewayOrigin = input.gatewayOrigin ?? process.env.OPENCREATOR_GATEWAY_ORIGIN;
const unavailable = async (): Promise<never> => { throw new GatewayError('services_not_ready'); };
const readCommonProxy = async () => (await storedCreatorServicesConfigStore.read()).proxy;
@@ -538,12 +541,15 @@ export async function buildServer(input: BuildServerInput) {
refresh: unavailable, bootstrap: unavailable, avatar: unavailable, logout: unavailable, request: unavailable
};
let officialInjectors: Record<string, import('../agent-tools/run-injection.js').AgentScheduleProcessInjector> = {};
+ const modelSelectionProbe = createModelSelectionProbe({ dataDir,
+ fetcher: createOfficialFetch({ readProxy: readCommonProxy }), readProxy: readCommonProxy
+ });
const gatewayAccount: GatewayAccountService = createGatewayAccountService({
dataDir, client: gatewayClient,
+ probeModel: modelSelectionProbe.probe,
deferStartupActivation: true,
modelAccess: createOfficialModelAccess({
- dataDir, fetcher: createOfficialFetch({ readProxy: readCommonProxy }), readProxy: readCommonProxy,
- readProbeCredentials: () => gatewayAccount.probeCredentials()
+ dataDir, fetcher: createOfficialFetch({ readProxy: readCommonProxy }), readProxy: readCommonProxy
}),
hasActiveTasks: () => [appServerRuntimeManager, creatorAppServerRuntimeManager, stickmanContentRuntimeManager]
.some(manager => manager?.listScopes().some(scope => scope.active || scope.pending > 0))
@@ -554,23 +560,37 @@ export async function buildServer(input: BuildServerInput) {
officialBindings?.beginLogout();
await officialBindings?.close();
officialBindings = undefined;
+ officialRuntimeIdentity = undefined;
officialManagers.clear();
},
async activateRuntime(bootstrap) {
if (runtimeTransport !== 'app-server') throw new GatewayError('services_not_ready');
- const model = bootstrap.models.find(value => value.id === bootstrap.defaults.text && value.modality === 'text' && value.capabilities.includes('responses'));
+ const model = bootstrap.models.find(value => value.id === bootstrap.defaults.text && value.modality === 'text' && value.capabilities.includes('responses') && gatewayModelReady(value));
if (!model) throw new GatewayError('services_not_ready');
+ const identity = JSON.stringify([bootstrap.account.id, bootstrap.baseUrl, bootstrap.transport,
+ ...(isDirectTransport(bootstrap.transport) ? [] : [bootstrap.bindingVersion, bootstrap.keyVersion])]);
+ if (officialBindings && officialRuntimeIdentity === identity) {
+ // Turns already carry their own model; changing the default must keep live hosts and streams.
+ await officialBindings.updateModel(model.id);
+ return;
+ }
+ officialRuntimeIdentity = undefined;
await officialBindings?.close(); officialManagers.clear();
const home = join(runtimeDir, 'gateway-codex');
const bootstrapResult = bootstrapCreatorAgentRuntime({ ...creatorAgentBootstrapInput, codexHome: home, source: 'gateway' });
if (!bootstrapResult.available) throw new GatewayError('services_not_ready');
officialBindings = createGatewayRuntimeBindings({
- codexHome: home, baseUrl: bootstrap.baseUrl, model: model.id, direct: bootstrap.transport === 'openrouter-direct',
+ codexHome: home, baseUrl: bootstrap.baseUrl, model: model.id, direct: isDirectTransport(bootstrap.transport), gateway: bootstrap.transport === 'gateway',
readProxy: readCommonProxy,
- beginUse: async () => { const use = await gatewayAccount.beginModelUse(); return { key: use.credentials.modelKey, keyVersion: use.credentials.keyVersion, release: use.release, models: use.credentials.models,
- onModelFailure: (id, modality, facts) => gatewayAccount.reportModelFailure(use.credentials, id, modality, facts) }; },
- recoverKey: async keyVersion => { const updated = await gatewayAccount.recoverModelCredentials(keyVersion); return { key: updated.modelKey, keyVersion: updated.keyVersion }; },
- readCredentials: async () => ({ accountId: bootstrap.account.id, modelKey: bootstrap.modelKey, keyVersion: bootstrap.keyVersion }),
+ beginUse: async () => { const use = await gatewayAccount.beginModelUse(); return { key: use.credentials.modelKey, keyVersion: use.credentials.keyVersion, baseUrl: use.credentials.baseUrl, release: use.release, models: use.credentials.models,
+ onModelFailure: (id, modality, facts) => gatewayAccount.reportModelFailure(use.credentials, id, modality, facts),
+ onModelSuccess: (id, modality, operation) => gatewayAccount.reportModelSuccess(use.credentials, id, modality, operation) }; },
+ recoverKey: async keyVersion => { const updated = await gatewayAccount.recoverModelCredentials(keyVersion); if (updated.baseUrl !== bootstrap.baseUrl) throw new GatewayError('supplier_binding_changed', 409); return { key: updated.modelKey, keyVersion: updated.keyVersion }; },
+ readCredentials: async () => {
+ if (bootstrap.transport !== 'gateway' && bootstrap.modelKey) return { accountId: bootstrap.account.id, modelKey: bootstrap.modelKey, keyVersion: bootstrap.keyVersion };
+ const use = await gatewayAccount.beginModelUse({ recovery: true });
+ try { return use.credentials; } finally { await use.release(); }
+ },
closeRuntime: async () => { await Promise.all([...officialManagers.values()].map(manager => manager.close())); }
});
const prepared = await officialBindings.prepare();
@@ -582,6 +602,7 @@ export async function buildServer(input: BuildServerInput) {
createHost(host) { return createCodexAppServerHost({ ...host, codexHome: home, baseEnvironment: prepared.env }); }
}));
}
+ officialRuntimeIdentity = identity;
}
});
await gatewayAccount.initialize();
@@ -1013,6 +1034,7 @@ export async function buildServer(input: BuildServerInput) {
}
const creatorPreflight = createCreatorPreflight({
assertServiceSource: gatewayCreatorSource.assertJob,
+ validateOfficialModel: gatewayAccount.validateModel,
readCodexImageStatus,
videoMetadataService,
configStore: creatorServicesConfigStore,
@@ -1443,6 +1465,7 @@ export async function buildServer(input: BuildServerInput) {
closing = true;
await youtubeConnection.close();
await douyinConnection.close();
+ await modelSelectionProbe.close();
await gatewayAccount.close();
await backgroundStartup;
let firstError: unknown;
@@ -1498,7 +1521,7 @@ export async function buildServer(input: BuildServerInput) {
async listModels() {
const gateway = gatewayAccount.peekState();
if (gateway.source === 'manual') return codexModelCatalog.listModels();
- return { models: gateway.models.filter(model => model.modality === 'text' && model.capabilities.includes('responses')).map((model, index) => ({ id: model.id, model: model.id, displayName: /openrouter/i.test(model.id) ? 'Auto' : model.id.split('/').pop()!, description: '', supportedReasoningEfforts: [], defaultReasoningEffort: null, inputModalities: ['text' as const], isDefault: gateway.selectedModels?.text ? model.id === gateway.selectedModels.text : index === 0 })) };
+ return { models: gateway.models.filter(model => model.modality === 'text' && model.capabilities.includes('responses') && gatewayModelReady(model)).map((model, index) => ({ id: model.id, model: model.id, displayName: /openrouter/i.test(model.id) ? 'Auto' : model.id.split('/').pop()!, description: '', supportedReasoningEfforts: [], defaultReasoningEffort: null, inputModalities: ['text' as const], isDefault: gateway.selectedModels?.text ? model.id === gateway.selectedModels.text : index === 0 })) };
}
},
readiness: codexRuntimeReadiness,
@@ -1665,7 +1688,7 @@ export async function buildServer(input: BuildServerInput) {
}
});
- input.onPrepareAvailabilityProbe?.(() => preparePlatformProbe({ account: gatewayAccount, readProxy: readCommonProxy }));
+ input.onPrepareAvailabilityProbe?.(() => prepareOfficialRuntimeProbe({ account: gatewayAccount, readProxy: readCommonProxy }));
return server;
}
diff --git a/apps/daemon/src/creator-services/upstream-fetch.ts b/apps/daemon/src/creator-services/upstream-fetch.ts
index ccf92884..43f10364 100644
--- a/apps/daemon/src/creator-services/upstream-fetch.ts
+++ b/apps/daemon/src/creator-services/upstream-fetch.ts
@@ -117,7 +117,7 @@ export function creatorServiceFailureFacts(
const root = isRecord(payload) ? payload : {};
const data = isRecord(root.data) ? root.data : {};
const detail = isRecord(root.error) ? root.error : isRecord(data.error) ? data.error : isRecord(root.data) ? data : root;
- const code = detail.code ?? detail.error_code ?? detail.type
+ const code = detail.upstreamCode ?? detail.code ?? detail.error_code ?? detail.type
?? (options.httpStatus === undefined ? undefined : root.code ?? root.error_code);
const message = detail.task_status_msg ?? detail.message ?? detail.error_msg ?? detail.msg
?? root.message ?? root.error_msg ?? (typeof root.error === 'string' ? root.error : undefined);
diff --git a/apps/daemon/src/creator/image-settings.ts b/apps/daemon/src/creator/image-settings.ts
index 3aadd62f..b3e9d3c9 100644
--- a/apps/daemon/src/creator/image-settings.ts
+++ b/apps/daemon/src/creator/image-settings.ts
@@ -3,6 +3,7 @@ import type {
ImageGenerationProvider
} from '@opencreator/protocol';
import { imageGenerationCapabilities } from '../image-generation/provider.js';
+import { gatewayCreatorBinding } from '../gateway/creator-service-source.js';
export type ResolvedCreatorImageSettings = {
provider: ImageGenerationProvider;
@@ -22,18 +23,20 @@ export function resolveCreatorImageSettings(input: {
}): ResolvedCreatorImageSettings {
const provider = readImageProvider(input.provider, input.config.image.provider);
const capabilities = imageGenerationCapabilities(provider);
+ const gateway = gatewayCreatorBinding(input.config);
+ const options = gateway?.catalog?.find(model => model.modality === 'image' && model.id === gateway.models.image)?.imageOptions;
const requestedCount = typeof input.candidateCount === 'number'
? Math.floor(input.candidateCount)
: input.fallbackCandidateCount;
const candidateCount = provider === 'codex-native'
? 1
- : Math.min(input.maxCandidateCount, Math.max(1, requestedCount));
+ : Math.min(options?.maxImages ?? input.maxCandidateCount, input.maxCandidateCount, Math.max(1, requestedCount));
return {
provider,
model: provider === 'codex-native' ? 'codex-native' : input.config.image[provider].model,
candidateCount,
- supportsReferenceImage: capabilities.supportsReferenceImage,
- maxReferenceImages: capabilities.maxReferenceImages,
+ supportsReferenceImage: gateway ? gateway.capabilities?.image?.includes('edit') === true : capabilities.supportsReferenceImage,
+ maxReferenceImages: options?.maxReferences ?? (gateway ? 1 : capabilities.maxReferenceImages),
executionMode: provider === 'codex-native' ? 'local' : 'remote'
};
}
diff --git a/apps/daemon/src/creator/krillin/tts-service.ts b/apps/daemon/src/creator/krillin/tts-service.ts
index 3b0ed43e..1bbccd1c 100644
--- a/apps/daemon/src/creator/krillin/tts-service.ts
+++ b/apps/daemon/src/creator/krillin/tts-service.ts
@@ -225,11 +225,14 @@ export function createKrillinTtsService(input: {
}
const format = request.format ?? 'wav';
const speed = request.speed ?? 1;
- if (gateway && (speed !== 1 || request.instructions)) throw new KrillinTtsServiceError('unsupported_capability', 'This generation parameter is not verified for the official speech route', 400);
- if (!Number.isFinite(speed) || speed < 0.5 || speed > 2) {
+ const capabilities = selected?.capabilities ?? gateway?.capabilities?.speech ?? [];
+ if (gateway && (speed !== 1 && !capabilities.includes('speech_speed') || request.instructions && !capabilities.includes('speech_instructions'))) throw new KrillinTtsServiceError('unsupported_capability', 'This speech model does not support the selected speed or style', 400);
+ const minSpeed = gateway && capabilities.includes('speech_speed') ? 0.25 : 0.5;
+ const maxSpeed = gateway && capabilities.includes('speech_speed') ? 4 : 2;
+ if (!Number.isFinite(speed) || speed < minSpeed || speed > maxSpeed) {
throw new KrillinTtsServiceError(
'VALIDATION_FAILED',
- 'Speech speed must be between 0.5 and 2',
+ `Speech speed must be between ${minSpeed} and ${maxSpeed}`,
400
);
}
@@ -477,7 +480,7 @@ async function synthesizeOpenAi(
input: input.text,
...(input.official && input.voiceId === gatewayDefaultVoiceId ? {} : { voice: input.voiceId }),
response_format: input.format,
- ...(input.official ? {} : { speed: input.speed }),
+ ...(input.official && input.speed === 1 ? {} : { speed: input.speed }),
...(input.instructions === undefined ? {} : { instructions: input.instructions })
},
input
diff --git a/apps/daemon/src/creator/preflight.ts b/apps/daemon/src/creator/preflight.ts
index 2b900dd0..2d897f85 100644
--- a/apps/daemon/src/creator/preflight.ts
+++ b/apps/daemon/src/creator/preflight.ts
@@ -66,6 +66,7 @@ export function createCreatorPreflight(input: {
readCodexImageStatus?(): Promise<CodexImageStatus>;
videoMetadataService?: VideoMetadataService;
assertServiceSource?(jobId: string): void;
+ validateOfficialModel?(modality: import('@opencreator/protocol').GatewayModel['modality'], model: string): Promise<unknown>;
}) {
const executorIds = new Set(input.executorIds ?? []);
@@ -161,6 +162,41 @@ export function createCreatorPreflight(input: {
await checkRuntimeDependencies(job, stage, config, add);
await checkManagedDirectory(add);
+ const gateway = gatewayCreatorBinding(config);
+ if (gateway && blocked.length === 0 && input.validateOfficialModel) {
+ const modalities = new Set<import('@opencreator/protocol').GatewayModel['modality']>();
+ for (const check of ready) {
+ if (check.id === 'llm') modalities.add('text');
+ if (check.id === 'tts') modalities.add('speech');
+ if (check.id === 'transcription-config') modalities.add('transcription');
+ if (check.id === 'image-provider') modalities.add('image');
+ if (check.id === 'video-provider') modalities.add('video');
+ }
+ // Translation starts a workflow; validate its downstream models before processing the video.
+ if (job.templateId === 'video-translation' && ['download', 'subtitle'].includes(stage.id)) {
+ modalities.add('text');
+ if (inputState.sourceType !== 'subtitle' && (inputState.sourceType === 'file' || inputState.preferPlatformCaptions === false)) modalities.add('transcription');
+ if (inputState.dubbing === true) modalities.add('speech');
+ }
+ for (const modality of modalities) {
+ const choices = inputState.officialModels;
+ const selected = choices && typeof choices === 'object' && !Array.isArray(choices) ? choices[modality] : undefined;
+ const model = typeof selected === 'string' ? selected : gateway.models[modality];
+ try {
+ if (!model) throw new Error('No official model is selected. Choose another model.');
+ await input.validateOfficialModel(modality, model);
+ add('ready', { id: `official-model-catalog:${modality}`, title: 'Model configuration', message: `${model} is in the compatible model catalog.`, executionMode: 'remote' });
+ } catch (error) {
+ const code = (error as { code?: string })?.code;
+ const message = code === 'invalid_model' || !model
+ ? `${model ?? modality} is currently unavailable. Choose another model.`
+ : 'Model configuration could not be checked. Reconnect official services and try again.';
+ add('blocked', { id: `official-model-catalog:${modality}`, title: 'Model configuration check failed', message, executionMode: 'remote' },
+ { label: 'Choose another model', deepLink: `#/workbench?tool=${encodeURIComponent(job.templateId)}&jobId=${encodeURIComponent(job.id)}` });
+ }
+ }
+ }
+
return {
templateId: job.templateId,
templateVersion: job.templateVersion,
@@ -356,7 +392,8 @@ async function checkProviderConfig(
}
if (needs.has('tts')) {
const gateway = gatewayCreatorBinding(config);
- if (gateway && (stage.executor === 'smart-dubbing' || (typeof job.state.speed === 'number' && job.state.speed !== 1))) {
+ if (gateway && (stage.executor === 'smart-dubbing' && !gateway.capabilities?.speech?.includes('speech_instructions')
+ || typeof job.state.speed === 'number' && job.state.speed !== 1 && !gateway.capabilities?.speech?.includes('speech_speed'))) {
add('blocked', { id: 'tts-style-capability', title: 'Unsupported speech settings', message: 'Style and speed controls are not verified for this official speech model. Select another TTS service.', executionMode: 'remote' }, { label: 'Open speech settings', deepLink: '#/settings?tab=ai-services&section=tts' });
}
const provider = readTtsProvider(job, config);
@@ -408,8 +445,11 @@ async function checkProviderConfig(
add('blocked', { id: 'shot-spec-invalid', title: 'Storyboard data unavailable', message: 'Could not check storyboard reference requirements. Generate the storyboard again.', executionMode: 'local' });
}
}
- if (multiple) add('blocked', { id: 'reference-image-count', title: 'Unsupported number of reference images', message: 'The official image service is verified for one reference image. This task needs multiple references.', executionMode: 'remote' });
+ if (multiple && settings.maxReferenceImages < 2) add('blocked', { id: 'reference-image-count', title: 'Unsupported number of reference images', message: 'This image model does not support the multiple references required by this task.', executionMode: 'remote' });
}
+ if (gateway?.capabilities?.image?.includes('reference_required') && !hasReference) add('blocked', {
+ id: 'reference-image-required', title: 'Reference image missing', message: 'The selected image model requires a reference image.', executionMode: 'remote'
+ }, { label: 'Upload a reference image', deepLink: `#/workbench?tool=${encodeURIComponent(job.templateId)}&jobId=${encodeURIComponent(job.id)}` });
if (hasReference && !supportsReference) add('blocked', {
id: 'reference-image-capability', title: 'Reference image capability mismatch', message: `${provider} does not support reference image editing for this stage.`, executionMode: 'remote'
}, { label: 'Select a service that supports reference images', deepLink: '#/settings?tab=ai-services&section=image' });
@@ -430,6 +470,10 @@ async function checkProviderConfig(
}
}
if (stage.executor === 'krillinai' && stage.id === 'subtitle' && job.state.sourceType !== 'subtitle' && (job.state.sourceType === 'file' || job.state.preferPlatformCaptions === false)) {
+ const gateway = gatewayCreatorBinding(config);
+ if (gateway && !gateway.capabilities?.transcription?.includes('subtitle_timestamps')) add('blocked', {
+ id: 'transcription-timestamps', title: 'Subtitle timestamps unavailable', message: 'This speech recognition model returns text without timestamps. Select a transcription service with subtitle timestamps.', executionMode: 'remote'
+ }, { label: 'Open speech recognition settings', deepLink: '#/settings?tab=ai-services&section=transcription' });
const provider = capabilities.transcription.providers.find(candidate => candidate.provider === config.transcription.provider);
if (provider?.available !== true) return;
if (config.transcription.provider === 'openai' && !config.transcription.openai.apiKey.trim()) {
diff --git a/apps/daemon/src/creator/provider-requests.ts b/apps/daemon/src/creator/provider-requests.ts
index da7305bd..6f117785 100644
--- a/apps/daemon/src/creator/provider-requests.ts
+++ b/apps/daemon/src/creator/provider-requests.ts
@@ -2,7 +2,8 @@ import { createHash } from 'node:crypto';
import type {
CreatorJson,
CreatorProviderRequest,
- CreatorProviderRequestStatus
+ CreatorProviderRequestStatus,
+ CreatorStageRun
} from '@opencreator/protocol';
import { isPublicErrorFacts } from '@opencreator/protocol';
import { sanitizeIssueDetail, type CreatorIssueService } from './issues.js';
@@ -142,16 +143,66 @@ export class CreatorProviderRequestLedger {
return request;
}
- markUnknownRemoteAcceptance(id: string): CreatorProviderRequest {
+ markUnknownRemoteAcceptance(id: string, error?: unknown): CreatorProviderRequest {
const request = this.transition(
id,
['submitting', 'waiting_remote'],
'unknown_remote_acceptance'
);
- if (!this.finishProviderIssue(request, 'unknown')) this.captureProviderIssue(request, true);
+ if (!this.finishProviderIssue(request, 'unknown', error)) this.captureProviderIssue(request, true, error);
return request;
}
+ requestsForStage(stageRunId: string): CreatorProviderRequest[] {
+ const stage = this.repository.getStageRun(stageRunId);
+ if (stage === undefined) return [];
+ const lineage = this.stageLineage(stage);
+ return this.repository.listProviderRequests(stage.jobId).filter(request => lineage.has(request.stageRunId));
+ }
+
+ finishStage(stageRunId: string, result: 'succeeded' | 'failed' | 'canceled', error?: unknown): void {
+ const stage = this.repository.getStageRun(stageRunId);
+ if (stage === undefined) return;
+ const requests = this.requestsForStage(stageRunId).filter(request => request.gateway !== undefined);
+ if (result === 'failed') {
+ const request = requests.find(candidate => isPendingRemote(candidate.status))
+ ?? requests.find(candidate => candidate.stageRunId === stageRunId && candidate.status === 'failed');
+ if (request !== undefined) {
+ this.captureProviderIssue({ ...request, stageRunId, scopeKey: stage.scopeKey }, isPendingRemote(request.status), error);
+ }
+ return;
+ }
+ if (result !== 'succeeded') return;
+ const lineage = this.stageLineage(stage);
+ for (const issue of this.issueService?.list(stage.jobId) ?? []) {
+ if (issue.status === 'resolved' || issue.source !== 'provider'
+ || !['creator_provider_request_failed', 'creator_provider_resolution_required'].includes(issue.code)
+ || issue.stageRunId === undefined || !lineage.has(issue.stageRunId)
+ || issue.scopeKey !== (stage.scopeKey ?? undefined)
+ || !issue.publicFacts?.provider?.startsWith('opencreator-gateway-')) continue;
+ if (requests.some(request => request.provider === issue.publicFacts!.provider && isPendingRemote(request.status))) continue;
+ const resolutionAttemptId = issue.status === 'resolving'
+ ? this.repository.getIssueResolutionAttemptId(stage.jobId, issue.id)
+ : `stage:${stageRunId}:${issue.id}`;
+ if (resolutionAttemptId === undefined) continue;
+ if (issue.status === 'open') this.issueService?.beginResolution({ jobId: stage.jobId, issueId: issue.id, resolutionAttemptId,
+ associationKind: 'stage-run', associationId: stageRunId, stageRunId });
+ this.issueService?.finishResolution({ jobId: stage.jobId, issueId: issue.id, resolutionAttemptId, result: 'succeeded' });
+ }
+ }
+
+ private stageLineage(stage: CreatorStageRun): Set<string> {
+ const lineage = new Set<string>();
+ let current: CreatorStageRun | undefined = stage;
+ while (current !== undefined && !lineage.has(current.id)) {
+ lineage.add(current.id);
+ const parentId: unknown = current.progress.resumedFromStageRunId;
+ const parent = typeof parentId === 'string' ? this.repository.getStageRun(parentId) : undefined;
+ current = parent?.jobId === stage.jobId && parent.stageId === stage.stageId && parent.scopeKey === stage.scopeKey ? parent : undefined;
+ }
+ return lineage;
+ }
+
async recover(
id: string,
capabilities: CreatorProviderCapabilities
@@ -282,6 +333,8 @@ export class CreatorProviderRequestLedger {
error?: unknown
): void {
const stage = this.repository.getStageRun(request.stageRunId);
+ // The stage owns automatic recovery; a single attempt is not a task failure.
+ if (this.hasActiveStage(request)) return;
this.issueService?.capture({
jobId: request.jobId,
code: unknownRemoteAcceptance
@@ -289,6 +342,7 @@ export class CreatorProviderRequestLedger {
: 'creator_provider_request_failed',
source: 'provider',
category: 'provider',
+ ...(unknownRemoteAcceptance ? { summaryKey: 'issue.provider_pending' } : {}),
operation: 'creator.retry-stage',
stageId: stage?.stageId,
stageRunId: request.stageRunId,
@@ -331,8 +385,10 @@ export class CreatorProviderRequestLedger {
result: 'succeeded' | 'failed' | 'canceled' | 'unknown',
error?: unknown
): boolean {
+ if (this.hasActiveStage(request)) return false;
let issue = this.findProviderIssue(request, 'resolving');
- if (issue === undefined && result === 'succeeded' && !this.repository.listProviderRequests(request.jobId).some(other => (
+ let resolvedAcceptance = false;
+ if (issue === undefined && (result === 'succeeded' || result === 'failed') && !this.repository.listProviderRequests(request.jobId).some(other => (
other.id !== request.id && other.provider === request.provider && other.stageRunId === request.stageRunId
&& other.scopeKey === request.scopeKey && isPendingRemote(other.status)
))) {
@@ -342,6 +398,7 @@ export class CreatorProviderRequestLedger {
&& candidate.scopeKey === (request.scopeKey ?? undefined) && candidate.publicFacts?.provider === request.provider
));
if (issue !== undefined) {
+ resolvedAcceptance = true;
this.issueService?.beginResolution({
jobId: request.jobId,
issueId: issue.id,
@@ -357,13 +414,14 @@ export class CreatorProviderRequestLedger {
jobId: request.jobId,
issueId: issue.id,
resolutionAttemptId: request.id,
- result,
+ // A definitive failure resolves acceptance uncertainty; it remains a separate failure issue.
+ result: resolvedAcceptance ? 'succeeded' : result,
...(result === 'failed' && error !== undefined ? {
publicFacts: factsForProvider(error, request.provider),
...(error instanceof Error ? { technicalDetail: sanitizeIssueDetail(error.message) } : {})
} : {})
});
- return true;
+ return !(resolvedAcceptance && result === 'failed');
}
private findProviderIssue(
@@ -376,6 +434,14 @@ export class CreatorProviderRequestLedger {
&& issue.status === status
&& issue.scopeKey === (request.scopeKey ?? undefined)
&& (stageId === undefined || issue.stageId === stageId)
+ && (issue.publicFacts?.provider === undefined || issue.publicFacts.provider === request.provider)
+ && (status !== 'resolving' || this.repository.getIssueResolutionAttemptId(request.jobId, issue.id) === request.id)
+ ));
+ }
+
+ private hasActiveStage(request: CreatorProviderRequest): boolean {
+ return request.gateway !== undefined && this.repository.listStageRuns(request.jobId).some(stage => (
+ ['queued', 'running'].includes(stage.status) && this.stageLineage(stage).has(request.stageRunId)
));
}
diff --git a/apps/daemon/src/creator/repository.ts b/apps/daemon/src/creator/repository.ts
index 1912de00..1a2ebff9 100644
--- a/apps/daemon/src/creator/repository.ts
+++ b/apps/daemon/src/creator/repository.ts
@@ -37,7 +37,7 @@ type RepositoryOptions = {
};
export type CreatorServiceBinding = { source: 'manual' } | {
- source: 'gateway'; accountId: string; bindingVersion: string;
+ source: 'gateway'; accountId: string; bindingVersion: string; supplier?: string;
models: Record<string, string>; capabilities: Record<string, string[]>;
};
@@ -210,6 +210,7 @@ export type CreatorRepository = {
listActivities(jobId: string): CreatorActivity[];
captureIssue(input: NormalizedCreatorIssueInput): OpenCreatorIssue;
getIssue(jobId: string, issueId: string): OpenCreatorIssue | undefined;
+ getIssueResolutionAttemptId(jobId: string, issueId: string): string | undefined;
listIssues(jobId: string): OpenCreatorIssue[];
listIssueEvents(jobId: string, input?: {
cursor?: string;
@@ -807,6 +808,11 @@ export function createCreatorRepository(
})();
},
getIssue,
+ getIssueResolutionAttemptId(jobId, issueId) {
+ const row = db.prepare('SELECT resolution_attempt_id FROM creator_issues WHERE id = ? AND job_id = ?')
+ .get(issueId, jobId) as { resolution_attempt_id: string | null } | undefined;
+ return row?.resolution_attempt_id ?? undefined;
+ },
listIssues,
listIssueEvents(jobId, input = {}) {
const limit = Math.min(Math.max(input.limit ?? 50, 1), 100);
diff --git a/apps/daemon/src/creator/smart-dubbing/executor.ts b/apps/daemon/src/creator/smart-dubbing/executor.ts
index 4a395ca3..a9380063 100644
--- a/apps/daemon/src/creator/smart-dubbing/executor.ts
+++ b/apps/daemon/src/creator/smart-dubbing/executor.ts
@@ -26,7 +26,6 @@ export function createSmartDubbingExecutor(input: {
stage.reportProgress({ phase: 'validating', percent: 5 });
const request = readRequest(stage.job.state);
const official = input.isOfficial?.() === true;
- if (official && (request.style !== 'natural' || request.speed !== 1)) throw new CreatorExecutorError('unsupported_capability', 'The official speech model supports only natural delivery and default speed');
if (stage.signal.aborted) {
throw new CreatorExecutorError('creator_stage_canceled', 'Creator stage was canceled');
}
@@ -40,7 +39,7 @@ export function createSmartDubbingExecutor(input: {
...(request.voiceCode === undefined ? {} : { voiceId: request.voiceCode }),
format: request.format,
speed: request.speed,
- instructions: official ? undefined : smartDubbingInstructions(request.style),
+ instructions: official && request.style === 'natural' ? undefined : smartDubbingInstructions(request.style),
signal: stage.signal
});
if (stage.signal.aborted) {
diff --git a/apps/daemon/src/creator/stage-runner.ts b/apps/daemon/src/creator/stage-runner.ts
index 06fad09f..46ef5625 100644
--- a/apps/daemon/src/creator/stage-runner.ts
+++ b/apps/daemon/src/creator/stage-runner.ts
@@ -14,7 +14,7 @@ import type { CreatorExecutor } from './executor.js';
import { CreatorExecutorError } from './executor.js';
import type { CreatorRepository } from './repository.js';
import type { CreatorIssueService } from './issues.js';
-import { CreatorProviderRequestError } from './provider-requests.js';
+import { CreatorProviderRequestError, CreatorProviderRequestLedger } from './provider-requests.js';
import { publicFactsFromFailure } from './public-error-facts.js';
import { sha256CreatorFile } from './file-hash.js';
import {
@@ -46,6 +46,7 @@ export function createCreatorStageRunner(input: {
onStageSucceeded?(stage: CreatorStageRun): void;
}) {
const executors = new Map(input.executors.map(executor => [executor.id, executor]));
+ const providerLedger = new CreatorProviderRequestLedger(input.repository, input.issueService);
const active = new Map<string, AbortController>();
const laneTails = new Map<string, Promise<unknown>>();
const waiters: Array<() => void> = [];
@@ -328,6 +329,7 @@ export function createCreatorStageRunner(input: {
input.onJobChanged
);
finishStageIssueResolution(jobId, stageRun!.id, 'succeeded');
+ providerLedger.finishStage(stageRun!.id, 'succeeded');
});
const completed = input.repository.getStageRun(stageRun.id);
if (completed !== undefined) {
@@ -349,14 +351,14 @@ export function createCreatorStageRunner(input: {
failureCode,
failureMessage
);
- const providerRequests = input.repository.listProviderRequests(jobId)
- .filter(request => request.stageRunId === stageRun!.id);
+ const providerRequests = providerLedger.requestsForStage(stageRun.id);
const unknownProviderAcceptance = providerRequests.some(request => (
request.status === 'unknown_remote_acceptance'
));
const providerFailure = error instanceof CreatorProviderRequestError
|| providerRequests.some(request => (
- request.status === 'failed' || request.status === 'unknown_remote_acceptance'
+ request.stageRunId === stageRun!.id && request.status === 'failed'
+ || request.status === 'unknown_remote_acceptance'
));
input.repository.transaction(() => {
updateStageRun({
@@ -404,6 +406,9 @@ export function createCreatorStageRunner(input: {
},
input.onJobChanged
);
+ if (!outputValidation && configurationInput === null) {
+ providerLedger.finishStage(stageRun!.id, canceled ? 'canceled' : 'failed', error);
+ }
const resolution = finishStageIssueResolution(
jobId,
stageRun!.id,
@@ -505,6 +510,10 @@ export function createCreatorStageRunner(input: {
) {
const issue = input.issueService?.list(jobId).find(candidate => (
candidate.status === 'resolving' && candidate.stageRunId === stageRunId
+ && !(result === 'succeeded' && candidate.source === 'provider'
+ && ['creator_provider_request_failed', 'creator_provider_resolution_required'].includes(candidate.code)
+ && candidate.publicFacts?.provider?.startsWith('opencreator-gateway-'))
+ && input.repository.getIssueResolutionAttemptId(jobId, candidate.id) === stageRunId
));
if (issue === undefined) return undefined;
return input.issueService?.finishResolution({
diff --git a/apps/daemon/src/creator/stickman/image-executor.ts b/apps/daemon/src/creator/stickman/image-executor.ts
index b8573c08..e2961664 100644
--- a/apps/daemon/src/creator/stickman/image-executor.ts
+++ b/apps/daemon/src/creator/stickman/image-executor.ts
@@ -258,8 +258,8 @@ export function createStickmanImageExecutor(input: {
const { provider } = imageSettings;
const quality = readQuality(stage.job.state.quality);
if (gateway) {
- if (!gateway.capabilities?.image?.includes('edit') || referenceImages.length > 1) {
- throw new CreatorExecutorError('creator_stickman_image_provider_unsupported', 'The official image service supports one reference image. This shot cannot be generated.');
+ if (!imageSettings.supportsReferenceImage || referenceImages.length > imageSettings.maxReferenceImages) {
+ throw new CreatorExecutorError('creator_stickman_image_provider_unsupported', 'This image model does not support the references required by this shot.');
}
} else assertReferenceImageSupport(provider, referenceImages.length);
const model = imageSettings.model;
diff --git a/apps/daemon/src/creator/video/executor.ts b/apps/daemon/src/creator/video/executor.ts
index 081df18f..f2fc22f7 100644
--- a/apps/daemon/src/creator/video/executor.ts
+++ b/apps/daemon/src/creator/video/executor.ts
@@ -67,7 +67,8 @@ export function createVideoExecutor(input: {
logicalId: stage.stageRun.id,
onGatewayBinding: gateway => {
providerRequest = input.ledger?.registerBeforeSubmit({ jobId:stage.job.id, stageRunId:stage.stageRun.id, provider:'opencreator-gateway-video', requestKey:gateway.logicalId, gateway,
- request:{prompt:request.prompt,duration:request.duration,size:request.size,reference:request.referenceImage?.data ?? null} });
+ request:{model:request.model ?? null,prompt:request.prompt,duration:request.duration,size:request.size,reference:request.referenceImage?.data ?? null,
+ references:request.references ?? [],generateAudio:request.generateAudio ?? null,priceVersion:request.priceVersion ?? null} });
if (providerRequest) providerRequest = input.ledger!.markSubmitting(providerRequest.id);
},
onGatewayRequest: id => { if (providerRequest) providerRequest = input.ledger!.markWaitingRemote(providerRequest.id,id); },
@@ -248,6 +249,9 @@ async function videoRequest(
: {}),
size: readSize(stage.job.state.size),
duration: readDuration(stage.job.state.duration),
+ ...(Array.isArray(stage.job.state.videoReferences) ? { references: stage.job.state.videoReferences as CreateVideoGenerationRequest['references'] } : {}),
+ ...(typeof stage.job.state.generateAudio === 'boolean' ? { generateAudio: stage.job.state.generateAudio } : {}),
+ ...(typeof stage.job.state.videoPriceVersion === 'string' ? { priceVersion: stage.job.state.videoPriceVersion } : {}),
...(reference === undefined
? {}
: { referenceImage: await readReferenceImage(reference) })
@@ -298,6 +302,8 @@ function readResumedResultId(stage: CreatorExecutorInput): string | undefined {
}
function remoteProgress(result: VideoGenerationResult): Record<string, CreatorJson> {
+ if (result.phase === 'reconciling') return { status: 'running', phase: 'generating', percent: null, message: 'Waiting for confirmation of the existing video task' };
+ if (result.phase === 'downloading' && result.status !== 'completed') return { status: 'running', phase: 'downloading', percent: 90 };
if (result.status === 'completed') {
return {
status: 'running',
diff --git a/apps/daemon/src/gateway/account-service.ts b/apps/daemon/src/gateway/account-service.ts
index d7fe4a76..cccce5b0 100644
--- a/apps/daemon/src/gateway/account-service.ts
+++ b/apps/daemon/src/gateway/account-service.ts
@@ -1,8 +1,13 @@
-import type { GatewayAccountState, GatewayBalanceSnapshot, GatewayBalanceState, GatewayModel, PublicErrorFacts, ServiceSource } from '@opencreator/protocol';
+import { isDirectTransport, type SupplierRegion } from './supplier.js';
+import { createHash } from 'node:crypto';
+import type { GatewayAccountState, GatewayActivationStage, GatewayBalanceSnapshot, GatewayBalanceState, GatewayModel, GatewayModelOperation, GatewayModelProbeOptions, PublicErrorFacts, ServiceSource } from '@opencreator/protocol';
import { z } from 'zod';
import { createGatewayConfigStore, type GatewayCredentials } from './config-store.js';
-import { accountSchema, bootstrapSchema, cachedModelUsePolicy, catalogSchema, probeCredentialsSchema, GatewayError, type GatewayBootstrap, type GatewayClient, type GatewayDeviceGrant, type GatewayProbeCredentials } from './client.js';
+import { accountSchema, bootstrapSchema, cachedModelUsePolicy, catalogSchema, GatewayError, type GatewayBootstrap, type GatewayClient, type GatewayDeviceGrant } from './client.js';
import { officialModelPolicy, withModelCatalog, type OfficialModelAccess } from './model-access.js';
+import { ModelProbeError, type ModelProbeScope } from './model-selection-probe.js';
+import { gatewayModelSupports, gatewayModelReady, gatewayRecommendedModelId, type GatewayModelPurpose } from '@opencreator/protocol';
+import { migrateModelPreferences, resolveModelPreferences } from './model-preferences.js';
export function createGatewayAccountService(input: {
dataDir: string; client: GatewayClient;
@@ -12,6 +17,7 @@ export function createGatewayAccountService(input: {
hasPendingTasks?(): boolean;
automaticPolling?: boolean;
modelAccess?: OfficialModelAccess;
+ probeModel?(model: GatewayModel, scope: ModelProbeScope, force: boolean, options?: GatewayModelProbeOptions): Promise<void>;
deferStartupActivation?: boolean;
}) {
const store = createGatewayConfigStore(input.dataDir);
@@ -33,12 +39,16 @@ export function createGatewayAccountService(input: {
let balance: GatewayBalanceSnapshot | null = null;
let mutation = Promise.resolve();
let selectedModels: Record<string, string> = {};
+ let manualModels: Record<string, string> = {};
+ let preferencesInitialized = false;
+ let pendingGatewayCatalog: GatewayBootstrap | undefined;
+ let region: SupplierRegion = 'auto';
+ let supplierMigrating = false;
let localUses = 0;
- let platformProbeCredentials: GatewayProbeCredentials | undefined;
- let platformProbeWork: Promise<GatewayProbeCredentials> | undefined;
let accessWork: Promise<void> | undefined;
let accessController: AbortController | undefined;
let accessUpdatedAt = 0;
+ let modelAuthRecoveryAt = 0;
let accessBlocked = false;
let runtimeTextModel: string | undefined;
let accessPaused = false;
@@ -49,12 +59,38 @@ export function createGatewayAccountService(input: {
let maintenanceWork: Promise<void> | undefined;
let maintenanceFailures = 0;
let runtimeCloseWork: Promise<void> | undefined;
- const saveConfiguration = () => store.writeConfiguration({ source: state.source, bindingVersion: state.bindingVersion, selectedModels });
+ let activationRetryAt = 0;
+ const saveConfiguration = () => store.writeConfiguration({ source: state.source, bindingVersion: state.bindingVersion, selectedModels, region,
+ ...(preferencesInitialized ? { modelPreferencesVersion: 1 as const, manualModels } : {}) });
+ function resolveGatewayBootstrap(bootstrap: GatewayBootstrap): GatewayBootstrap {
+ if (bootstrap.transport !== 'gateway') return bootstrap;
+ if (!preferencesInitialized) {
+ manualModels = migrateModelPreferences(selectedModels, bootstrap.defaults);
+ preferencesInitialized = true;
+ }
+ const resolved = resolveModelPreferences(bootstrap.models, bootstrap.defaults, manualModels);
+ manualModels = resolved.manual;
+ state.recommendedModels = resolved.recommended;
+ state.modelSelectionModes = resolved.modes;
+ if (resolved.changed) state.modelSelectionNotice = 'selection_updated';
+ return { ...bootstrap, models: resolved.models, defaults: resolved.selected };
+ }
function serialize<T>(work: () => Promise<T>): Promise<T> { const result = mutation.then(work); mutation = result.then(() => undefined, () => undefined); return result; }
- function fail(error: unknown) { state.activationState = 'blocked'; state.activationError = { code: error instanceof GatewayError ? error.code : 'services_not_ready', message: 'The official service is not ready. Try again.' }; }
+ function fail(error: unknown, stage?: GatewayActivationStage) {
+ const code = error instanceof GatewayError ? error.code : 'services_not_ready';
+ state.activationState = 'blocked';
+ state.activationError = { code, message: code === 'model_catalog_unavailable' ? 'The model list is temporarily unavailable. Try again.'
+ : code === 'supplier_migrating' ? 'Your model supplier is being switched. Services will resume automatically.'
+ : code === 'no_available_models' ? 'No compatible text models are available.' : 'The official service is not ready. Try again.',
+ ...(stage ? { stage } : {}), ...(error instanceof GatewayError && error.diagnostics ? { request: error.diagnostics } : {}) };
+ activationRetryAt = Date.now() + 30_000;
+ }
+ function missingTextModel() {
+ return new GatewayError(input.modelAccess ? input.modelAccess.catalogAvailable() ? 'no_available_models' : 'model_catalog_unavailable' : 'services_not_ready');
+ }
function assertIdle() { if (localUses > 0 || input.hasActiveTasks()) throw new GatewayError('active_tasks', 409); }
function assertSignedIn() { if (!credentials || state.authState !== 'signed_in') throw new GatewayError('auth_required', 401); return credentials; }
- function usesCachedModelKey() { return credentials?.modelUsePolicy === cachedModelUsePolicy && credentials.transport === 'openrouter-direct' && credentials.keyRotation === false; }
+ function usesCachedModelKey() { return credentials?.modelUsePolicy === cachedModelUsePolicy && isDirectTransport(credentials.transport) && credentials.keyRotation === false; }
function restoreModelAccessError(code: NonNullable<GatewayCredentials['modelAccessError']>) {
if (code === 'auth_required') state = { ...state, authState: 'expired', activationState: 'inactive', bindingVersion: null, activationError: null };
else fail(new GatewayError(code, 403));
@@ -67,7 +103,7 @@ export function createGatewayAccountService(input: {
generation++;
credentials = { ...credentials!, modelAccessError: code };
restoreModelAccessError(code);
- runtimeTextModel = undefined; accessController?.abort();
+ runtimeTextModel = undefined; accessController?.abort(); input.modelAccess?.reset();
clearInterval(usageTimer); usageTimer = undefined;
// An async image worker may itself be waiting for this recovery to return.
runtimeCloseWork ??= input.closeRuntime().catch(() => undefined).finally(() => { runtimeCloseWork = undefined; });
@@ -80,8 +116,8 @@ export function createGatewayAccountService(input: {
catch (error) { await blockConfirmedModelAccess(error, expected, accountId); throw error; }
}
async function visibleBootstrap(bootstrap: GatewayBootstrap) {
- const eligible = withModelCatalog(bootstrap, officialModelPolicy(bootstrap.models));
- return input.modelAccess && eligible.transport === 'openrouter-direct' ? input.modelAccess.prepare(eligible) : eligible;
+ const eligible = withModelCatalog(resolveGatewayBootstrap(bootstrap), officialModelPolicy(bootstrap.models));
+ return input.modelAccess && isDirectTransport(eligible.transport) ? input.modelAccess.prepare(eligible) : eligible;
}
async function applyVisibleCatalog(next: GatewayBootstrap) {
if (!credentials) return;
@@ -92,34 +128,50 @@ export function createGatewayAccountService(input: {
}
}
async function refreshVisibleCatalog() {
- if (!input.modelAccess || closing || accessPaused || credentials?.modelAccessError || credentials?.transport !== 'openrouter-direct' || state.authState !== 'signed_in') return;
+ if (!input.modelAccess || closing || accessPaused || credentials?.modelAccessError || !isDirectTransport(credentials?.transport) || state.authState !== 'signed_in') return;
const original = bootstrapSchema.parse(credentials); const expected = generation;
await visibleBootstrap(original);
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') return;
+ if (input.modelAccess.needsKeyRefresh() && Date.now() - modelAuthRecoveryAt >= 30_000) {
+ modelAuthRecoveryAt = Date.now();
+ try { await synchronizeBinding(); } catch { /* Keep sign-in and allow a later catalog retry. */ }
+ }
await serialize(async () => {
if (generation === expected && state.authState === 'signed_in' && credentials?.account?.id === original.account.id && credentials.keyVersion === original.keyVersion) await applyVisibleCatalog(input.modelAccess!.filter(bootstrapSchema.parse(credentials)));
});
}
- async function reportModelFailure(scope: { accountId: string; keyVersion: string; accessContext?: string; models?: GatewayModel[] }, id: string, modality: GatewayModel['modality'], facts: PublicErrorFacts) {
+ type ModelResultScope = { accountId: string; keyVersion: string; accessContext?: string; models?: GatewayModel[] };
+ async function recordModelResult(scope: ModelResultScope, id: string, modality: GatewayModel['modality'], facts?: PublicErrorFacts, operation?: GatewayModelOperation) {
if (closing || accessPaused || state.authState !== 'signed_in') return;
await serialize(async () => {
- if (!input.modelAccess || state.authState !== 'signed_in' || credentials?.transport !== 'openrouter-direct'
+ if (!input.modelAccess || !credentials || state.authState !== 'signed_in' || !isDirectTransport(credentials.transport)
|| credentials.account?.id !== scope.accountId || credentials.keyVersion !== scope.keyVersion) return;
const bootstrap = bootstrapSchema.parse(credentials);
- const model = bootstrap.models.find(candidate => candidate.id === id && candidate.modality === modality);
+ const model = input.modelAccess.findModel(bootstrap, id, modality);
const submitted = scope.models?.find(candidate => candidate.id === id && candidate.modality === modality);
if (scope.models && JSON.stringify(submitted) !== JSON.stringify(model)) return;
- if (model && await input.modelAccess.recordFailure(scope.accessContext ?? '', model, facts)) await applyVisibleCatalog(input.modelAccess.filter(bootstrap));
+ if (!model) return;
+ if (facts && await input.modelAccess.recordFailure(scope.accessContext ?? '', model, facts)) await applyVisibleCatalog(input.modelAccess.filter(bootstrap));
+ else if (operation) await input.modelAccess.recordSuccess(scope.accessContext ?? '', model, operation);
});
}
+ const reportModelFailure = (scope: ModelResultScope, id: string, modality: GatewayModel['modality'], facts: PublicErrorFacts) => recordModelResult(scope, id, modality, facts);
+ const reportModelSuccess = (scope: ModelResultScope, id: string, modality: GatewayModel['modality'], operation: GatewayModelOperation) => recordModelResult(scope, id, modality, undefined, operation);
+ function snapshotState(): GatewayAccountState {
+ const snapshot = structuredClone(state);
+ if (input.modelAccess && credentials && isDirectTransport(credentials.transport) && state.authState === 'signed_in' && credentials.account) {
+ snapshot.modelAvailability = input.modelAccess.availability(bootstrapSchema.parse(credentials));
+ }
+ return snapshot;
+ }
function needsAccessibleRuntime() {
- return credentials?.transport === 'openrouter-direct' && !credentials.modelAccessError && state.authState === 'signed_in'
- && state.source === 'gateway' && !closing && !accessPaused && (state.activationState === 'ready' || accessBlocked)
+ return !!credentials && isDirectTransport(credentials.transport) && !credentials.modelAccessError && state.authState === 'signed_in'
+ && state.source === 'gateway' && !closing && !accessPaused && !supplierMigrating && (state.activationState === 'ready' || accessBlocked)
&& (!credentials.defaults?.text || accessBlocked || runtimeTextModel !== credentials.defaults.text);
}
async function synchronizeAccessibleRuntime() {
if (!needsAccessibleRuntime() || !credentials) return;
- if (!credentials.defaults?.text) { accessBlocked = true; fail(new GatewayError('services_not_ready')); return; }
+ if (!credentials.defaults?.text) { accessBlocked = true; fail(missingTextModel()); return; }
if ((!accessBlocked && runtimeTextModel === credentials.defaults.text) || localUses > 0 || input.hasActiveTasks() || input.hasPendingTasks?.()) return;
const next = { ...bootstrapSchema.parse(credentials), models: state.models };
try {
@@ -127,10 +179,10 @@ export function createGatewayAccountService(input: {
runtimeTextModel = next.defaults.text; accessBlocked = false;
state.bindingVersion = next.bindingVersion; state.activationState = 'ready'; state.activationError = null;
await saveConfiguration();
- } catch (error) { accessBlocked = true; runtimeTextModel = undefined; fail(error); await input.closeRuntime(); }
+ } catch (error) { accessBlocked = true; runtimeTextModel = undefined; fail(error, 'runtime'); await input.closeRuntime(); }
}
function scheduleModelAccess() {
- if (!input.modelAccess || closing || accessPaused || accessWork || credentials?.modelAccessError || credentials?.transport !== 'openrouter-direct' || state.authState !== 'signed_in'
+ if (!input.modelAccess || closing || accessPaused || accessWork || credentials?.modelAccessError || !isDirectTransport(credentials?.transport) || state.authState !== 'signed_in'
|| (state.activationState !== 'ready' && !accessBlocked) || Date.now() - accessUpdatedAt < 30_000) return;
accessUpdatedAt = Date.now();
const controller = new AbortController(); accessController = controller;
@@ -155,16 +207,21 @@ export function createGatewayAccountService(input: {
try {
const config = await store.readConfiguration();
selectedModels = config.selectedModels ?? {};
+ preferencesInitialized = config.modelPreferencesVersion === 1;
+ manualModels = config.manualModels ?? {};
+ region = config.region ?? 'auto'; state.supplierRegion = region;
state.selectedModels = { ...selectedModels };
credentials = await store.readCredentials();
state.source = credentials ? 'gateway' : 'manual';
await saveConfiguration();
if (!credentials) return;
+ state.supplier = credentials.supplier;
state.account = credentials.account ?? null; state.authState = 'signed_in'; state.models = credentials.models ?? [];
if (credentials.modelAccessError) { restoreModelAccessError(credentials.modelAccessError); return; }
if (input.deferStartupActivation) {
const cached = bootstrapSchema.safeParse(credentials);
- if (cached.success) state.models = (await visibleBootstrap(cached.data)).models;
+ if (cached.success) state.models = cached.data.transport === 'gateway'
+ ? withModelCatalog(cached.data, officialModelPolicy(cached.data.models)).models : (await visibleBootstrap(cached.data)).models;
state.activationState = 'loading';
return;
}
@@ -209,50 +266,67 @@ export function createGatewayAccountService(input: {
})();
try { await refreshWork; } finally { refreshWork = undefined; }
}
- async function activateCurrent() {
+ async function activateCurrent(rotate = true) {
await runtimeCloseWork;
// Connecting a new session must not wait for unrelated or persisted jobs.
if (state.activationState === 'ready') assertIdle();
- const cached = usesCachedModelKey() && !credentials?.modelAccessError ? bootstrapSchema.safeParse(credentials) : undefined;
- if (!cached?.success) await refresh();
+ const cached = usesCachedModelKey() && !supplierMigrating && !credentials?.modelAccessError && !input.modelAccess?.needsKeyRefresh() ? bootstrapSchema.safeParse(credentials) : undefined;
if (closing || accessPaused) return;
- const original = assertSignedIn(); const expected = generation;
+ let original = assertSignedIn(); const expected = generation;
+ let stage: GatewayActivationStage = 'credentials';
state.activationState = 'loading'; state.activationError = null;
try {
+ if (!cached?.success) await refresh();
+ if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') return;
+ original = assertSignedIn();
state.source = 'gateway'; state.bindingVersion = null;
+ stage = 'configuration';
await saveConfiguration();
+ stage = 'usage';
await reportUsage();
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') return;
- const bootstrap = cached?.success ? cached.data : await input.client.bootstrap(original.accessToken, { rotate: !input.hasPendingTasks?.(), modelUsePolicy: cachedModelUsePolicy });
+ stage = 'bootstrap';
+ const bootstrap = cached?.success ? cached.data : await input.client.bootstrap(original.accessToken, { rotate: rotate && !usesCachedModelKey() && !input.hasPendingTasks?.(), modelUsePolicy: cachedModelUsePolicy, ...(region === 'auto' ? {} : { region }) });
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') return;
if (original.account && bootstrap.account.id !== original.account.id) throw new GatewayError('account_mismatch');
state.account = bootstrap.account;
+ state.supplier = bootstrap.supplier ?? 'openrouter'; supplierMigrating = false;
+ state.transport = bootstrap.transport;
+ state.catalogVersion=bootstrap.catalogVersion; state.catalogUpdatedAt=bootstrap.catalogUpdatedAt; state.catalogRefreshState=bootstrap.catalogRefreshState;
for (const [modality, model] of Object.entries(selectedModels)) {
- if (bootstrap.models.some(candidate => candidate.modality === modality && candidate.id === model)) bootstrap.defaults[modality] = model;
+ if (bootstrap.transport !== 'gateway' && bootstrap.models.some(candidate => gatewayModelSupports(candidate,modality as GatewayModelPurpose) && candidate.id === model)) bootstrap.defaults[modality] = model;
}
+ stage = 'catalog';
const visible = await visibleBootstrap(bootstrap);
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') return;
selectedModels = { ...visible.defaults }; state.selectedModels = { ...selectedModels };
- credentials = { ...original, ...bootstrap, defaults: visible.defaults, modelAccessError: undefined };
+ credentials = { ...original, ...bootstrap, ...(bootstrap.transport === 'gateway' ? { modelKey: undefined, models: visible.models } : {}), defaults: visible.defaults, modelAccessError: undefined };
await store.writeCredentials(credentials);
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') return;
state.account = bootstrap.account; state.models = visible.models;
- accessBlocked = !visible.defaults.text;
- if (accessBlocked) throw new GatewayError('services_not_ready');
- await input.activateRuntime(visible);
- runtimeTextModel = visible.defaults.text;
+ accessBlocked = bootstrap.transport !== 'gateway' && !visible.defaults.text;
+ if (accessBlocked) throw missingTextModel();
+ stage = 'runtime';
+ if (bootstrap.transport !== 'gateway' || visible.models.some(model => model.id === visible.defaults.text && gatewayModelSupports(model, 'text') && gatewayModelReady(model))) {
+ await input.activateRuntime(visible);
+ runtimeTextModel = visible.defaults.text;
+ }
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') { await input.closeRuntime(); return; }
state.bindingVersion = bootstrap.bindingVersion;
catalogUpdatedAt = Date.now();
+ stage = 'configuration';
await saveConfiguration();
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') { await input.closeRuntime(); return; }
state = { ...state, source: 'gateway', activationState: 'ready', account: bootstrap.account, models: visible.models, bindingVersion: bootstrap.bindingVersion, activationError: null };
+ stage = 'usage';
await reportUsage();
+ activationRetryAt = 0;
startUsageHeartbeat();
} catch (error) {
runtimeTextModel = undefined;
+ if (error instanceof GatewayError && error.code === 'supplier_migrating') { supplierMigrating = true; scheduleMaintenance(60_000); }
if (await blockConfirmedModelAccess(error, expected, original.account?.id)) return;
- if (!closing && !accessPaused) fail(error);
+ if (!closing && !accessPaused && generation === expected && state.authState === 'signed_in') fail(error, stage);
await input.closeRuntime();
}
scheduleModelAccess();
@@ -279,16 +353,49 @@ export function createGatewayAccountService(input: {
try { await profileWork; }
finally { profileWork = undefined; }
}
- async function readCatalog() {
+ async function applyGatewayCatalog(bootstrap: GatewayBootstrap) {
+ const resolved = resolveModelPreferences(bootstrap.models, bootstrap.defaults, manualModels);
+ if (resolved.selected.text !== runtimeTextModel && (localUses > 0 || input.hasActiveTasks())) {
+ pendingGatewayCatalog = bootstrap;
+ state.catalogError = undefined;
+ return;
+ }
+ const next = resolveGatewayBootstrap(bootstrap);
+ if (next.defaults.text !== runtimeTextModel) {
+ if (next.defaults.text) await input.activateRuntime(next);
+ else await input.closeRuntime();
+ runtimeTextModel = next.defaults.text;
+ }
+ credentials = { ...assertSignedIn(), models: next.models, defaults: next.defaults,
+ catalogVersion: next.catalogVersion, catalogUpdatedAt: next.catalogUpdatedAt, catalogRefreshState: next.catalogRefreshState };
+ state.models = next.models; selectedModels = { ...next.defaults }; state.selectedModels = { ...selectedModels };
+ state.catalogVersion = next.catalogVersion; state.catalogUpdatedAt = next.catalogUpdatedAt; state.catalogRefreshState = next.catalogRefreshState; state.catalogError = undefined;
+ pendingGatewayCatalog = undefined;
+ await store.writeCredentials(credentials); await saveConfiguration();
+ }
+ async function readCatalog(force = false) {
if (closing || accessPaused || !credentials || state.authState !== 'signed_in' || state.source !== 'gateway' || state.activationState !== 'ready') return;
if (catalogWork) return catalogWork;
- if (input.hasActiveTasks() || input.hasPendingTasks?.() || Date.now() - catalogUpdatedAt < 30_000) return;
+ if (pendingGatewayCatalog && localUses === 0 && !input.hasActiveTasks()) {
+ const pending = pendingGatewayCatalog;
+ await serialize(async () => { if (credentials?.transport === 'gateway' && !closing && !accessPaused) await applyGatewayCatalog(pending); });
+ }
+ if ((!force && Date.now() - catalogUpdatedAt < 30_000) || (credentials.transport !== 'gateway' && (input.hasActiveTasks() || input.hasPendingTasks?.()))) return;
catalogUpdatedAt = Date.now();
+ const catalogGeneration = generation;
catalogWork = (async () => {
await refresh();
if (closing || accessPaused) return;
const original = assertSignedIn(); const expected = generation;
const catalog = catalogSchema.parse(await withAccountAccess(() => input.client.request('/api/v1/client/models', original.accessToken)));
+ if (original.transport === 'gateway') {
+ await serialize(async()=>{
+ if (closing || accessPaused || generation!==expected || credentials?.account?.id!==original.account?.id || state.authState!=='signed_in') return;
+ await applyGatewayCatalog({ ...bootstrapSchema.parse(assertSignedIn()), ...catalog, defaults: catalog.defaults ?? {}, models: catalog.models });
+ state.modelAvailability=catalog.modelAvailability?.flatMap(item=>{const model=catalog.models.find(m=>m.id===item.model);return model?[{...item,modality:model.modality}]:[];});
+ });
+ return;
+ }
await serialize(async () => {
if (closing || accessPaused || generation !== expected || credentials !== original || state.source !== 'gateway' || state.authState !== 'signed_in' || input.hasActiveTasks() || input.hasPendingTasks?.()) return;
if (original.rotationPending || JSON.stringify(catalog.models) !== JSON.stringify(original.models)) {
@@ -296,18 +403,34 @@ export function createGatewayAccountService(input: {
else await activateCurrent();
}
});
- })().catch(() => undefined);
+ })().catch(error => { if (generation===catalogGeneration && state.authState==='signed_in') state.catalogError='model_catalog_unavailable'; if(force) throw error; });
try { await catalogWork; } finally { catalogWork = undefined; }
}
function refreshState(): Promise<void> {
stateRefreshWork ??= (async () => {
- await readProfile(); await readCatalog();
+ await readProfile();
+ if (canRetryActivation()) {
+ const expected = generation;
+ await serialize(async () => {
+ if (expected === generation && canRetryActivation()) {
+ activationRetryAt = Date.now() + 30_000;
+ await activateCurrent(false);
+ }
+ });
+ }
+ await readCatalog();
await refreshVisibleCatalog();
if (needsAccessibleRuntime()) await serialize(synchronizeAccessibleRuntime);
scheduleModelAccess();
})().finally(() => { stateRefreshWork = undefined; });
return stateRefreshWork;
}
+ function canRetryActivation() {
+ return input.automaticPolling !== false && !closing && !accessPaused && state.source === 'gateway'
+ && state.authState === 'signed_in' && state.activationState === 'blocked' && !credentials?.modelAccessError
+ && ['gateway_unavailable', 'services_not_ready', 'invalid_gateway_response', 'model_catalog_unavailable', 'supplier_migrating', 'supplier_binding_changed'].includes(state.activationError?.code ?? '')
+ && Date.now() >= activationRetryAt && localUses === 0 && !input.hasActiveTasks() && !input.hasPendingTasks?.();
+ }
function schedulePoll(id: string, seconds: number) {
if (attempt?.attemptId !== id) return;
attempt.nextPollAt = Date.now() + Math.max(5, seconds) * 1000;
@@ -371,7 +494,7 @@ export function createGatewayAccountService(input: {
}
}
credentials = { ...tokens, accessExpiresAt: new Date(Date.now() + tokens.expiresIn * 1000).toISOString() };
- platformProbeCredentials = undefined; platformProbeWork = undefined;
+ input.modelAccess?.reset();
await store.writeCredentials(credentials);
if (generation !== current.generation || attempt !== current) return;
state.source = 'gateway'; state.authState = 'signed_in'; attempt = undefined;
@@ -395,26 +518,58 @@ export function createGatewayAccountService(input: {
}
function currentModelCredentials(recovery = false): Awaited<ReturnType<typeof readModelCredentials>> {
if (closing || accessPaused) throw new GatewayError('auth_required', 401);
+ if (supplierMigrating) throw new GatewayError('supplier_migrating', 409);
const value = assertSignedIn();
if (value.modelAccessError) throw new GatewayError(value.modelAccessError, value.modelAccessError === 'auth_required' ? 401 : 403);
- if (state.source !== 'gateway' || (!recovery && state.activationState !== 'ready') || !value.account || !value.modelKey || !value.keyVersion || !value.bindingVersion || !value.baseUrl || !value.models || !value.defaults) throw new GatewayError('services_not_ready');
- return { accountId: value.account.id, modelKey: value.modelKey, keyVersion: value.keyVersion, bindingVersion: value.bindingVersion, baseUrl: value.baseUrl, transport: value.transport, models: structuredClone(state.models), defaults: { ...value.defaults }, accessContext: input.modelAccess?.context() };
+ const modelKey = value.transport === 'gateway' ? value.accessToken : value.modelKey;
+ const keyVersion = value.transport === 'gateway' ? 'device:' + createHash('sha256').update(value.accessToken).digest('hex') : value.keyVersion;
+ if (state.source !== 'gateway' || (!recovery && state.activationState !== 'ready') || !value.account || !modelKey || !keyVersion || !value.bindingVersion || !value.baseUrl || !value.models || !value.defaults) throw new GatewayError('services_not_ready');
+ return { accountId: value.account.id, modelKey, keyVersion, bindingVersion: value.bindingVersion, baseUrl: value.baseUrl, transport: value.transport, models: structuredClone(state.models), defaults: { ...value.defaults }, accessContext: input.modelAccess?.context() };
}
const modelCredentials = () => readModelCredentials();
- async function probeCredentials(): Promise<GatewayProbeCredentials> {
- await initialize(); await refresh();
- const current = assertSignedIn(); const expected = generation;
- if (platformProbeCredentials && Date.parse(platformProbeCredentials.expiresAt) > Date.now() + 60_000) return platformProbeCredentials;
- if (platformProbeWork) return platformProbeWork;
- const work = (async () => {
- const value = probeCredentialsSchema.parse(await withAccountAccess(() => input.client.request('/api/v1/client/probe-credentials', current.accessToken, {})));
- if (generation !== expected || state.authState !== 'signed_in' || credentials?.account?.id !== current.account?.id) throw new GatewayError('auth_required', 401);
- if (value.modelKey === credentials?.modelKey || Date.parse(value.expiresAt) <= Date.now()) throw new GatewayError('services_not_ready');
- platformProbeCredentials = value;
- return value;
- })();
- platformProbeWork = work;
- try { return await work; } finally { if (platformProbeWork === work) platformProbeWork = undefined; }
+ async function validateModel(modality: GatewayModel['modality'], id: string) {
+ const scope = await readModelCredentials();
+ const model = scope.models.find(candidate => candidate.modality === modality && candidate.id === id
+ && gatewayModelReady(candidate) && (modality !== 'text' || candidate.capabilities.includes('responses') || candidate.capabilities.includes('chat')));
+ if (!model) throw new GatewayError('invalid_model', 400);
+ return model;
+ }
+ async function probeModel(modality: GatewayModel['modality'], id: string, options?: GatewayModelProbeOptions) {
+ await initialize();
+ const expected = generation;
+ const use = await beginModelUse();
+ try {
+ let scope = use.credentials;
+ let model = scope.models.find(candidate => candidate.modality === modality && candidate.id === id
+ && gatewayModelReady(candidate) && (modality !== 'text' || scope.transport !== 'gateway' || candidate.capabilities.includes(options?.textApi==='chat/completions'?'chat':'responses')));
+ if (!model) throw new GatewayError('invalid_model', 400);
+ if (!input.probeModel) throw new ModelProbeError('model_probe_unavailable');
+ try {
+ try { await input.probeModel(model, scope, true, options); }
+ catch (error) {
+ if (!(error instanceof ModelProbeError) || error.code !== 'model_probe_auth_required') throw error;
+ const updated = await recoverModelCredentials(scope.keyVersion);
+ if (updated.baseUrl !== scope.baseUrl) throw new GatewayError('supplier_binding_changed', 409);
+ if (updated.modelKey === scope.modelKey) throw error;
+ scope = updated;
+ model = scope.models.find(candidate => candidate.modality === modality && candidate.id === id
+ && gatewayModelReady(candidate) && (modality !== 'text' || scope.transport !== 'gateway' || candidate.capabilities.includes(options?.textApi==='chat/completions'?'chat':'responses')));
+ if (!model) throw new GatewayError('invalid_model', 400);
+ await input.probeModel(model, scope, true, options);
+ }
+ }
+ catch (error) {
+ if (error instanceof ModelProbeError && error.publicFacts) await reportModelFailure(scope, id, modality, error.publicFacts);
+ throw error;
+ }
+ if (closing || accessPaused || generation !== expected || currentModelCredentials().keyVersion !== scope.keyVersion
+ || credentials?.account?.id !== scope.accountId || state.authState !== 'signed_in') throw new GatewayError('auth_required', 401);
+ const operation: GatewayModelOperation = modality === 'text' ? options?.textApi ?? 'responses'
+ : modality === 'image' ? 'images/generations' : modality === 'video' ? 'video/jobs'
+ : modality === 'speech' ? 'audio/speech' : 'audio/transcriptions';
+ await reportModelSuccess(scope, id, modality, operation);
+ return { model: id, modality, costBearer: 'customer' as const, operation };
+ } finally { await use.release(); }
}
function reportUsage(allowClosing = false) {
const result = usageMutation.then(async () => {
@@ -441,7 +596,7 @@ export function createGatewayAccountService(input: {
usageTimer.unref();
}
function scheduleMaintenance(milliseconds: number) {
- if (closing || accessPaused || state.authState !== 'signed_in' || state.activationState !== 'ready' || !usesCachedModelKey() || input.automaticPolling === false) return;
+ if (closing || accessPaused || state.authState !== 'signed_in' || (state.activationState !== 'ready' && !supplierMigrating && !accessBlocked) || (!usesCachedModelKey() && !supplierMigrating) || input.automaticPolling === false) return;
usageTimer = setTimeout(() => {
usageTimer = undefined;
maintenanceWork = (async () => { await refresh(); await synchronizeBinding(); await serialize(synchronizeAccessibleRuntime); maintenanceFailures = 0; })()
@@ -461,21 +616,30 @@ export function createGatewayAccountService(input: {
async function performBindingSync() {
const current = assertSignedIn(); const expected = generation;
let bootstrap: GatewayBootstrap;
- try { bootstrap = await input.client.bootstrap(current.accessToken, { rotate: false }); }
- catch (error) { await blockConfirmedModelAccess(error, expected, current.account?.id); throw error; }
+ try { bootstrap = await input.client.bootstrap(current.accessToken, { rotate: false, ...(region === 'auto' ? {} : { region }) }); }
+ catch (error) {
+ if (error instanceof GatewayError && error.code === 'supplier_migrating') { supplierMigrating = true; fail(error, 'bootstrap'); }
+ await blockConfirmedModelAccess(error, expected, current.account?.id); throw error;
+ }
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') throw new GatewayError('auth_required', 401);
- if (bootstrap.account.id !== current.account?.id) throw new GatewayError('account_mismatch');
+ if (current.account && bootstrap.account.id !== current.account.id) throw new GatewayError('account_mismatch');
for (const [modality, model] of Object.entries(selectedModels)) {
- if (bootstrap.models.some(candidate => candidate.modality === modality && candidate.id === model)) bootstrap.defaults[modality] = model;
+ if (bootstrap.transport !== 'gateway' && bootstrap.models.some(candidate => gatewayModelSupports(candidate,modality as GatewayModelPurpose) && candidate.id === model)) bootstrap.defaults[modality] = model;
}
const visible = await visibleBootstrap(bootstrap);
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') throw new GatewayError('auth_required', 401);
- const deferCatalog = usesCachedModelKey() && (localUses > 0 || input.hasActiveTasks() || input.hasPendingTasks?.());
+ const bindingChanged = current.baseUrl !== bootstrap.baseUrl || current.supplier !== bootstrap.supplier;
+ const resumeRuntime = supplierMigrating || bindingChanged;
+ const deferCatalog = !resumeRuntime && usesCachedModelKey() && (localUses > 0 || input.hasActiveTasks() || input.hasPendingTasks?.());
const latest = assertSignedIn();
- credentials = { ...latest, ...bootstrap, defaults: deferCatalog ? latest.defaults : visible.defaults, models: deferCatalog ? latest.models : bootstrap.models };
+ credentials = { ...latest, ...bootstrap, ...(bootstrap.transport === 'gateway' ? { modelKey: undefined } : {}), defaults: deferCatalog ? latest.defaults : visible.defaults, models: deferCatalog ? latest.models : bootstrap.transport === 'gateway' ? visible.models : bootstrap.models };
await store.writeCredentials(credentials);
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in') throw new GatewayError('auth_required', 401);
state.bindingVersion = bootstrap.bindingVersion;
+ state.account = bootstrap.account;
+ state.supplier = bootstrap.supplier ?? 'openrouter'; supplierMigrating = false;
+ state.transport = bootstrap.transport;
+ if (resumeRuntime) { accessBlocked = true; runtimeTextModel = undefined; fail(new GatewayError('services_not_ready'), 'runtime'); }
if (!deferCatalog) {
state.models = visible.models; catalogUpdatedAt = Date.now();
selectedModels = { ...visible.defaults }; state.selectedModels = { ...selectedModels };
@@ -508,6 +672,12 @@ export function createGatewayAccountService(input: {
const beginModelUse = (options?: { recovery: boolean }) => acquireModelUse(options?.recovery);
async function recoverModelCredentials(keyVersion: string) {
await initialize();
+ if (credentials?.transport === 'gateway') {
+ if (currentModelCredentials(true).keyVersion !== keyVersion) return currentModelCredentials(true);
+ credentials.accessExpiresAt = new Date(0).toISOString();
+ await refresh();
+ return currentModelCredentials(true);
+ }
if (!usesCachedModelKey()) throw new GatewayError('model_auth_required', 401);
if (currentModelCredentials(true).keyVersion !== keyVersion) return currentModelCredentials(true);
await refresh();
@@ -518,7 +688,7 @@ export function createGatewayAccountService(input: {
await initialize();
accessPaused = true;
input.client.cancelPendingRequests?.();
- accessController?.abort(); await accessWork;
+ accessController?.abort(); input.modelAccess?.reset(); await accessWork;
await serialize(async () => {
await reportUsage().catch(() => undefined);
state.authState = 'signing_out'; state.activationState = 'inactive';
@@ -530,8 +700,8 @@ export function createGatewayAccountService(input: {
runtimeTextModel = undefined;
if (credentials) await input.client.logout(credentials.accessToken).catch(() => undefined);
await store.deleteCredentials(); state.source = 'manual'; state.bindingVersion = null; await saveConfiguration();
- credentials = undefined; platformProbeCredentials = undefined; balance = null; profileUpdatedAt = 0; catalogUpdatedAt = 0; accessUpdatedAt = 0; accessBlocked = false;
- state = { ...state, authState: 'signed_out', activationState: 'inactive', account: null, models: [], bindingVersion: null, activationError: null };
+ credentials = undefined; pendingGatewayCatalog = undefined; balance = null; profileUpdatedAt = 0; catalogUpdatedAt = 0; accessUpdatedAt = 0; modelAuthRecoveryAt = 0; accessBlocked = false; supplierMigrating = false;
+ state = { ...state, authState: 'signed_out', activationState: 'inactive', account: null, models: [], bindingVersion: null, activationError: null, supplier: undefined };
}).finally(() => { accessPaused = false; });
}
async function billing(path: string, body?: unknown) { await initialize(); await refresh(); const current = assertSignedIn(); return withAccountAccess(() => input.client.request(path, current.accessToken, body)); }
@@ -543,8 +713,18 @@ export function createGatewayAccountService(input: {
}
return {
initialize, startBackgroundRestore,
- peekState() { return structuredClone(state); },
- startAuthorization, cancelAuthorization, pollAuthorization, checkAuthorization, refresh, logout, modelCredentials, beginModelUse, recoverModelCredentials, probeCredentials, readBalance, billing, reportModelFailure,
+ peekState: snapshotState,
+ startAuthorization, cancelAuthorization, pollAuthorization, checkAuthorization, refresh, logout, modelCredentials, beginModelUse, recoverModelCredentials, validateModel, probeModel, readBalance, billing, reportModelFailure, reportModelSuccess,
+ async setRegion(next: SupplierRegion) {
+ await initialize();
+ return serialize(async () => {
+ assertIdle(); if (input.hasPendingTasks?.()) throw new GatewayError('active_tasks', 409);
+ if (assertSignedIn().supplier !== 'chatanywhere' || !['auto', 'domestic', 'overseas'].includes(next)) throw new GatewayError('invalid_parameters', 400);
+ region = next; state.supplierRegion = next;
+ await saveConfiguration(); await synchronizeBinding(); await input.closeRuntime(); runtimeTextModel = undefined;
+ await activateCurrent(false); return snapshotState();
+ });
+ },
readPlans() { return input.client.request('/api/v1/plans', ''); },
async readAvatar(accountId: string) {
await initialize(); await refresh();
@@ -554,15 +734,17 @@ export function createGatewayAccountService(input: {
if (expected !== generation || state.authState !== 'signed_in' || credentials?.account?.id !== accountId) throw new GatewayError('avatar_unavailable', 404);
return image;
},
- async activate() { await initialize(); const expected = generation; await serialize(async () => { if (expected === generation) await activateCurrent(); }); },
- async readState() {
+ async activate() { await initialize(); const expected = generation; await serialize(async () => { if (expected === generation) { input.modelAccess?.invalidateCatalog(); await activateCurrent(false); } }); },
+ async readState(options?: { refreshModels?: boolean }) {
await initialize();
// Login is visible while model preparation still owns the mutation queue.
- if (closing || state.activationState === 'loading' || state.authState === 'signing_out') return structuredClone(state);
+ if (closing || state.activationState === 'loading' || state.authState === 'signing_out') return snapshotState();
+ if (options?.refreshModels) input.modelAccess?.invalidateCatalog();
+ if (options?.refreshModels && credentials?.transport==='gateway') { await readCatalog(true); return snapshotState(); }
const work = refreshState();
- if (input.deferStartupActivation) void work.catch(() => undefined);
+ if (input.deferStartupActivation && !options?.refreshModels) void work.catch(() => undefined);
else await work;
- return structuredClone(state);
+ return snapshotState();
},
async setSource(source: ServiceSource) {
await initialize(); await serialize(async () => {
@@ -571,12 +753,21 @@ export function createGatewayAccountService(input: {
state.source = 'manual'; await saveConfiguration();
});
},
- async selectModel(modality: import('@opencreator/protocol').GatewayModel['modality'], model: string) {
- await initialize(); await refreshVisibleCatalog(); await serialize(async () => {
- assertIdle(); const current = assertSignedIn(); const expected = generation;
- if (state.source !== 'gateway' || state.activationState !== 'ready' || !current.defaults || !state.models.some(candidate => candidate.modality === modality && candidate.id === model && (modality !== 'text' || candidate.capabilities.includes('responses')))) throw new GatewayError('invalid_model', 400);
- if (input.hasPendingTasks?.()) throw new GatewayError('active_tasks', 409);
+ async selectModel(modality: GatewayModelPurpose, model: string) {
+ await initialize();
+ const selectionGeneration = generation;
+ if (model !== gatewayRecommendedModelId) await validateModel(modality, model);
+ await serialize(async () => {
+ if (generation !== selectionGeneration) throw new GatewayError('auth_required', 401);
+ const current = assertSignedIn(); const expected = generation;
+ const automatic = model === gatewayRecommendedModelId;
+ if (automatic) {
+ model = state.recommendedModels?.[modality] ?? '';
+ if (current.transport !== 'gateway' || !model) throw new GatewayError('invalid_model', 400);
+ }
+ if (state.source !== 'gateway' || state.activationState !== 'ready' || !current.defaults || !state.models.some(candidate => gatewayModelSupports(candidate,modality) && gatewayModelReady(candidate) && candidate.id === model)) throw new GatewayError('invalid_model', 400);
const next = { ...current, defaults: { ...current.defaults, [modality]: model } };
+ if (modality === 'text' && current.transport === 'gateway') assertIdle();
if (modality === 'text') { await input.activateRuntime(bootstrapSchema.parse(next)); runtimeTextModel = model; }
if (closing || accessPaused || generation !== expected || state.authState !== 'signed_in' || credentials?.modelAccessError) {
runtimeTextModel = undefined; await input.closeRuntime(); throw new GatewayError('auth_required', 401);
@@ -585,13 +776,18 @@ export function createGatewayAccountService(input: {
const latest = assertSignedIn();
credentials = { ...latest, defaults: { ...latest.defaults, [modality]: model } };
selectedModels = { ...credentials.defaults }; state.selectedModels = { ...selectedModels };
+ if (current.transport === 'gateway') {
+ if (automatic) delete manualModels[modality]; else manualModels[modality] = model;
+ state.modelSelectionModes = { ...state.modelSelectionModes, [modality]: automatic ? 'recommended' : 'manual' };
+ state.modelSelectionNotice = undefined;
+ }
await store.writeCredentials(credentials); await saveConfiguration();
});
- return structuredClone(state);
+ return snapshotState();
},
async close() {
const restoring = startupRestoreWork !== undefined && !startupRestoreFinished;
- closing = true; input.client.cancelPendingRequests?.(); accessController?.abort();
+ closing = true; input.client.cancelPendingRequests?.(); accessController?.abort(); input.modelAccess?.reset();
clearTimeout(pollTimer); clearInterval(usageTimer); usageTimer = undefined;
await initialization; await startupRestoreWork; await stateRefreshWork?.catch(() => undefined);
await maintenanceWork; await bindingSyncWork?.catch(() => undefined);
diff --git a/apps/daemon/src/gateway/chat-responses.ts b/apps/daemon/src/gateway/chat-responses.ts
new file mode 100644
index 00000000..f768a1f1
--- /dev/null
+++ b/apps/daemon/src/gateway/chat-responses.ts
@@ -0,0 +1,171 @@
+import { randomUUID } from 'node:crypto';
+import { GatewayError } from './client.js';
+
+type Item = Record<string, any>;
+type Tool = { name: string; custom: boolean; namespace?: string };
+const unsupported = () => new GatewayError('capability_unsupported', 400);
+
+// The Runtime sends full history with store=false. Never rely on supplier-side sessions.
+export function responsesToChat(body: Record<string, unknown>) {
+ if (body.previous_response_id) throw unsupported();
+ const tools = new Map<string, Tool>();
+ const nativeTools: Item[] = [];
+ const addTool = (tool: Item, namespace = '') => {
+ // Chat exposes client-executed tools; provider-hosted Responses tools have no Chat equivalent.
+ if (['web_search', 'web_search_preview', 'tool_search'].includes(tool.type)) return;
+ if (tool.type === 'namespace' && Array.isArray(tool.tools)) { tool.tools.forEach((t: Item) => addTool(t, tool.name)); return; }
+ if (!['function', 'custom'].includes(tool.type) || typeof tool.name !== 'string') throw unsupported();
+ const name = namespace ? `${namespace}__${tool.name}` : tool.name;
+ tools.set(name, { name: tool.name, custom: tool.type === 'custom', ...(namespace ? { namespace } : {}) });
+ nativeTools.push({ type: 'function', function: { name, description: tool.description,
+ parameters: tool.type === 'custom' ? { type: 'object', properties: { input: { type: 'string', description: `Unmodified tool input text.${tool.format ? ` Required format: ${JSON.stringify(tool.format)}` : ''}` } }, required: ['input'], additionalProperties: false } : tool.parameters ?? { type: 'object', properties: {} } } });
+ };
+ if (body.tools !== undefined && !Array.isArray(body.tools)) throw unsupported();
+ (body.tools as Item[] | undefined)?.forEach(t => addTool(t));
+ const messages: Item[] = [];
+ if (typeof body.instructions === 'string' && body.instructions) messages.push({ role: 'system', content: body.instructions });
+ const input = typeof body.input === 'string' ? [{ role: 'user', content: body.input }] : body.input;
+ if (!Array.isArray(input)) throw unsupported();
+ const toolName = (name: string) => [...tools].find(([id, t]) => id === name || t.name === name)?.[0] ?? name;
+ const content = (parts: unknown): unknown => {
+ if (typeof parts === 'string') return parts;
+ if (!Array.isArray(parts)) throw unsupported();
+ return parts.map((part: Item) => {
+ if (['input_text', 'output_text', 'text'].includes(part.type) && typeof part.text === 'string') return { type: 'text', text: part.text };
+ if (part.type === 'input_image' && typeof part.image_url === 'string') return { type: 'image_url', image_url: { url: part.image_url, ...(part.detail ? { detail: part.detail } : {}) } };
+ throw unsupported();
+ });
+ };
+ for (const item of input as Item[]) {
+ if (item.type === 'reasoning') continue;
+ if (item.type === 'function_call' || item.type === 'custom_tool_call') {
+ const name = toolName(item.namespace ? `${item.namespace}__${item.name}` : item.name);
+ const call = { id: item.call_id, type: 'function', function: { name, arguments: item.type === 'custom_tool_call' ? JSON.stringify({ input: item.input }) : item.arguments } };
+ const previous = messages.at(-1);
+ if (previous?.role === 'assistant' && previous.tool_calls) previous.tool_calls.push(call);
+ else messages.push({ role: 'assistant', content: null, tool_calls: [call] });
+ } else if (item.type === 'function_call_output' || item.type === 'custom_tool_call_output') {
+ const output = typeof item.output === 'string' ? item.output : Array.isArray(item.output) ? content(item.output) : JSON.stringify(item.output);
+ messages.push({ role: 'tool', tool_call_id: item.call_id, content: output });
+ } else if (['user', 'assistant', 'system', 'developer'].includes(item.role)) {
+ messages.push({ role: item.role === 'developer' ? 'system' : item.role, content: content(item.content) });
+ } else throw unsupported();
+ }
+ let toolChoice = body.tool_choice;
+ if (toolChoice && typeof toolChoice === 'object') {
+ const choice = toolChoice as Item;
+ if (!['function', 'custom'].includes(choice.type)) throw unsupported();
+ toolChoice = { type: 'function', function: { name: toolName(choice.name) } };
+ }
+ const request: Item = { model: body.model, messages, stream: body.stream === true };
+ if (nativeTools.length) request.tools = nativeTools;
+ if (toolChoice !== undefined) request.tool_choice = toolChoice;
+ for (const key of ['temperature', 'top_p', 'parallel_tool_calls']) if (body[key] !== undefined) request[key] = body[key];
+ if (body.max_output_tokens !== undefined) request.max_tokens = body.max_output_tokens;
+ const format = (body.text as Item | undefined)?.format;
+ if (format) request.response_format = format.type === 'json_schema' ? { type: 'json_schema', json_schema: { name: format.name, schema: format.schema, strict: format.strict } } : format;
+ return { body: request, tools };
+}
+
+function outputTool(call: Item, tools: Map<string, Tool>): Item {
+ const fn = call.function ?? {}; const tool = tools.get(fn.name);
+ if (tool?.custom) {
+ let input: unknown;
+ try { input = JSON.parse(fn.arguments).input; } catch { throw new GatewayError('invalid_gateway_response'); }
+ if (typeof input !== 'string') throw new GatewayError('invalid_gateway_response');
+ return { id: `ct_${randomUUID()}`, type: 'custom_tool_call', call_id: call.id, name: tool.name, ...(tool.namespace ? { namespace: tool.namespace } : {}), input, status: 'completed' };
+ }
+ if (typeof fn.name !== 'string' || typeof fn.arguments !== 'string' || typeof call.id !== 'string') throw new GatewayError('invalid_gateway_response');
+ return { id: `fc_${randomUUID()}`, type: 'function_call', call_id: call.id, name: tool?.name ?? fn.name, ...(tool?.namespace ? { namespace: tool.namespace } : {}), arguments: fn.arguments, status: 'completed' };
+}
+
+function usage(value: Item | undefined) {
+ return { input_tokens: value?.prompt_tokens ?? 0, output_tokens: value?.completion_tokens ?? 0, total_tokens: value?.total_tokens ?? 0,
+ input_tokens_details: { cached_tokens: value?.prompt_tokens_details?.cached_tokens ?? 0 }, output_tokens_details: { reasoning_tokens: value?.completion_tokens_details?.reasoning_tokens ?? 0 } };
+}
+
+export async function chatToResponses(response: Response, tools: Map<string, Tool>, model: unknown): Promise<Response> {
+ const id = `resp_${randomUUID()}`; const created = Math.floor(Date.now() / 1000);
+ const envelope = (output: Item[], status = 'completed', tokenUsage?: Item) => ({ id, object: 'response', created_at: created, status, model, output, usage: usage(tokenUsage), error: null });
+ if (!response.headers.get('content-type')?.includes('text/event-stream')) {
+ const payload = await response.json();
+ if (payload.error) return Response.json(payload);
+ const choice = payload.choices?.[0];
+ if (!choice || !['stop', 'tool_calls', 'length'].includes(choice.finish_reason)) throw new GatewayError('invalid_gateway_response');
+ const output: Item[] = [];
+ if (typeof choice.message?.content === 'string' && choice.message.content) output.push({ id: `msg_${randomUUID()}`, type: 'message', role: 'assistant', status: 'completed', content: [{ type: 'output_text', text: choice.message.content, annotations: [] }] });
+ for (const call of choice.message?.tool_calls ?? []) output.push(outputTool(call, tools));
+ return Response.json(envelope(output, choice.finish_reason === 'length' ? 'incomplete' : 'completed', payload.usage));
+ }
+ if (!response.body) throw new GatewayError('invalid_gateway_response');
+ const reader = response.body.getReader(); const decoder = new TextDecoder(); const encoder = new TextEncoder();
+ const output: Item[] = []; const calls = new Map<number, Item>();
+ let buffer = ''; let text = ''; let message: Item | undefined; let tokenUsage: Item | undefined; let finish: string | undefined; let sequence = 0; let receivedBytes = 0;
+ const event = (type: string, fields: Item) => encoder.encode(`event: ${type}\ndata: ${JSON.stringify({ type, sequence_number: sequence++, ...fields })}\n\n`);
+ async function* events() {
+ yield event('response.created', { response: envelope([], 'in_progress') });
+ let ended = false;
+ for (;;) {
+ const chunk = await reader.read();
+ receivedBytes += chunk.value?.byteLength ?? 0;
+ if (receivedBytes > 64 * 1024 * 1024) throw new GatewayError('invalid_gateway_response');
+ buffer += decoder.decode(chunk.value, { stream: !chunk.done });
+ // Normalize after decoding so split UTF-8 and CRLF frames remain valid.
+ buffer = buffer.replace(/\r\n/g, '\n');
+ let boundary: number;
+ while ((boundary = buffer.indexOf('\n\n')) >= 0) {
+ const frame = buffer.slice(0, boundary); buffer = buffer.slice(boundary + 2);
+ const data = frame.split('\n').filter(l => l.startsWith('data:')).map(l => l.slice(5).trimStart()).join('\n');
+ if (data === '[DONE]') { ended = true; break; }
+ if (!data) continue;
+ const payload = JSON.parse(data);
+ if (payload.error) { yield event('error', { error: payload.error }); return; }
+ if (payload.usage) tokenUsage = payload.usage;
+ const choice = payload.choices?.[0]; if (!choice) continue;
+ const delta = choice.delta ?? {};
+ if (typeof delta.content === 'string' && delta.content) {
+ if (!message) {
+ message = { id: `msg_${randomUUID()}`, type: 'message', role: 'assistant', status: 'in_progress', content: [] };
+ output.push(message);
+ yield event('response.output_item.added', { output_index: 0, item: message });
+ yield event('response.content_part.added', { item_id: message.id, output_index: 0, content_index: 0, part: { type: 'output_text', text: '', annotations: [] } });
+ }
+ text += delta.content;
+ yield event('response.output_text.delta', { item_id: message.id, output_index: 0, content_index: 0, delta: delta.content });
+ }
+ for (const call of delta.tool_calls ?? []) {
+ const index = call.index ?? 0; const current = calls.get(index) ?? { id: '', function: { name: '', arguments: '' } };
+ if (call.id) current.id += call.id;
+ if (call.function?.name) current.function.name += call.function.name;
+ if (call.function?.arguments) current.function.arguments += call.function.arguments;
+ calls.set(index, current);
+ }
+ if (choice.finish_reason) finish = choice.finish_reason;
+ }
+ if (buffer.length > 1024 * 1024 || text.length > 64 * 1024 * 1024) throw new GatewayError('invalid_gateway_response');
+ if (chunk.done || ended) break;
+ }
+ if (!finish || !['stop', 'tool_calls', 'length'].includes(finish)) throw new GatewayError('request_outcome_unknown', 409);
+ if (message) {
+ message.status = 'completed'; message.content = [{ type: 'output_text', text, annotations: [] }];
+ yield event('response.output_text.done', { item_id: message.id, output_index: 0, content_index: 0, text });
+ yield event('response.content_part.done', { item_id: message.id, output_index: 0, content_index: 0, part: message.content[0] });
+ yield event('response.output_item.done', { output_index: 0, item: message });
+ }
+ for (const [, call] of [...calls].sort(([a], [b]) => a - b)) {
+ const item = outputTool(call, tools); const index = output.length; output.push(item);
+ yield event('response.output_item.added', { output_index: index, item: { ...item, status: 'in_progress', ...(item.type === 'function_call' ? { arguments: '' } : { input: '' }) } });
+ yield event(item.type === 'function_call' ? 'response.function_call_arguments.done' : 'response.custom_tool_call_input.done', { item_id: item.id, output_index: index, arguments: item.arguments, input: item.input });
+ yield event('response.output_item.done', { output_index: index, item });
+ }
+ yield event(finish === 'length' ? 'response.incomplete' : 'response.completed', { response: envelope(output, finish === 'length' ? 'incomplete' : 'completed', tokenUsage) });
+ }
+ const generator = events();
+ return new Response(new ReadableStream<Uint8Array>({
+ async pull(controller) {
+ try { const next = await generator.next(); if (next.done) { controller.close(); await reader.cancel(); } else controller.enqueue(next.value); }
+ catch (error) { await reader.cancel().catch(() => undefined); controller.error(error); }
+ },
+ async cancel() { await reader.cancel(); await generator.return(); }
+ }), { headers: { 'Content-Type': 'text/event-stream' } });
+}
diff --git a/apps/daemon/src/gateway/chatanywhere-media.ts b/apps/daemon/src/gateway/chatanywhere-media.ts
new file mode 100644
index 00000000..c62d557d
--- /dev/null
+++ b/apps/daemon/src/gateway/chatanywhere-media.ts
@@ -0,0 +1,61 @@
+import type { GatewayModel } from '@opencreator/protocol';
+import { GatewayError } from './client.js';
+
+const unsupported = () => new GatewayError('capability_unsupported', 400);
+const sizes: Record<string, string> = { '1:1': '1024x1024', '3:2': '1536x1024', '2:3': '1024x1536' };
+
+export async function chatAnywhereTranscription(body: unknown, contentType: string) {
+ if (!Buffer.isBuffer(body)) throw unsupported();
+ const form = await new Request('http://localhost', { method: 'POST', headers: { 'Content-Type': contentType }, body: new Uint8Array(body) }).formData();
+ const file = form.get('file');
+ if (!file || typeof file === 'string' || !file.size || typeof form.get('model') !== 'string') throw unsupported();
+ const format = form.get('response_format') ?? 'json';
+ if (!['json', 'verbose_json'].includes(String(format))) throw unsupported();
+ const native = new FormData();
+ for (const [name, value] of form) {
+ if (name.startsWith('timestamp_granularities')) {
+ // This supplier documents verbose_json segments, not the granularity field.
+ if (value !== 'segment') throw unsupported();
+ continue;
+ }
+ if (!['file', 'model', 'prompt', 'language', 'response_format', 'temperature'].includes(name)) throw unsupported();
+ if (name === 'temperature' && (typeof value !== 'string' || !value.trim() || !Number.isFinite(Number(value)) || Number(value) < 0 || Number(value) > 1)) throw unsupported();
+ native.append(name, value);
+ }
+ return multipart(native);
+}
+
+export async function chatAnywhereImage(resource: string, body: unknown, contentType: string, model?: GatewayModel) {
+ const form = resource === 'images/edits' && Buffer.isBuffer(body)
+ ? await new Request('http://localhost', { method: 'POST', headers: { 'Content-Type': contentType }, body: new Uint8Array(body) }).formData() : undefined;
+ const fields: Record<string, unknown> = form ? Object.fromEntries([...form].filter(([, v]) => typeof v === 'string')) : { ...(body as Record<string, unknown>) };
+ if (form) fields.n = Number(form.get('n') ?? 1);
+ const { aspect_ratio, resolution, stream, response_format, ...native } = fields;
+ const valid = (v: unknown, options?: string[]) => v === undefined || v === '' || typeof v === 'string' && !!options?.includes(v);
+ const count = native.n ?? 1;
+ if (!model || model.modality !== 'image' || native.model !== model.id || !model.capabilities.includes(resource === 'images/edits' ? 'edit' : 'generate')
+ || typeof native.prompt !== 'string' || !native.prompt.trim() || stream !== undefined && stream !== false
+ || typeof count !== 'number' || !Number.isInteger(count) || count < 1 || count > (model.imageOptions?.maxImages ?? 1)
+ || !valid(aspect_ratio, model.imageOptions?.aspectRatios) || !valid(resolution, model.imageOptions?.resolutions)
+ || !valid(native.quality, model.imageOptions?.qualities) || !valid(native.output_format, model.imageOptions?.outputFormats)
+ || response_format !== undefined && response_format !== 'b64_json') throw unsupported();
+ native.size = aspect_ratio ? sizes[String(aspect_ratio)] : native.size || '1024x1024';
+ if (!Object.values(sizes).includes(String(native.size))) throw unsupported();
+ native.n = count;
+ if (!form) {
+ if (resource === 'images/edits') throw unsupported();
+ return { body: native, contentType: 'application/json' };
+ }
+ const files = [...form].filter(([name, value]) => ['image', 'image[]'].includes(name) && typeof value !== 'string').map(([, v]) => v as File);
+ if (!model.capabilities.includes('edit') || !files.length || files.length > (model.imageOptions?.maxReferences ?? 0)
+ || files.some(file => !file.size || file.size > 25_000_000 || !['image/png', 'image/webp', 'image/jpeg'].includes(file.type))) throw unsupported();
+ const converted = new FormData();
+ for (const [name, value] of Object.entries(native)) converted.set(name, String(value));
+ for (const file of files) converted.append(files.length === 1 ? 'image' : 'image[]', file);
+ return multipart(converted);
+}
+
+async function multipart(form: FormData) {
+ const request = new Request('http://localhost', { method: 'POST', body: form });
+ return { body: Buffer.from(await request.arrayBuffer()), contentType: request.headers.get('content-type')! };
+}
diff --git a/apps/daemon/src/gateway/client.ts b/apps/daemon/src/gateway/client.ts
index 4fd66ede..ba088e19 100644
--- a/apps/daemon/src/gateway/client.ts
+++ b/apps/daemon/src/gateway/client.ts
@@ -1,11 +1,15 @@
import { z } from 'zod';
-import type { GatewayModel } from '@opencreator/protocol';
+import type { GatewayModel, GatewayConnectionDiagnostics } from '@opencreator/protocol';
+import { isDirectTransport, isSupplierBase, supplierBases, type SupplierRegion } from './supplier.js';
const tokenSchema = z.object({ accessToken: z.string().min(12), refreshToken: z.string().min(12), expiresIn: z.number().int().positive() });
const modelSchema = z.object({
id: z.string().min(1), name: z.string().optional(),
modality: z.enum(['text', 'image', 'video', 'speech', 'transcription']),
capabilities: z.array(z.string()), voices: z.array(z.string().min(1)).optional(),
+ vendor: z.string().optional(), status: z.enum(['ready','temporarily_unavailable','retired']).optional(), statusReason: z.string().optional(), recommended: z.boolean().optional(),
+ price: z.object({version:z.string(),inputPerMillion:z.number().optional(),outputPerMillion:z.number().optional(),perMinute:z.number().optional(),perMillionCharacters:z.number().optional(),perRequest:z.number().optional(),videoUnitsPerSecond:z.record(z.number().int().positive().max(1_000_000_000_000)).optional()}).optional(),
+ videoOptions: z.object({ profile:z.string(), maxImages:z.number().int().min(0).max(30), maxVideos:z.number().int().min(0).max(10), maxAudios:z.number().int().min(0).max(10), firstLastFrames:z.boolean(), framesExclusive:z.boolean(), generateAudio:z.boolean(), referenceDuration:z.number().int().positive().optional() }).optional(),
sizes: z.array(z.string().regex(/^\d+x\d+$/)).optional(),
durations: z.array(z.number().int().positive()).optional(),
resolutions: z.array(z.string().min(1)).optional(),
@@ -20,24 +24,29 @@ const modelSchema = z.object({
maxImages: z.number().int().min(1).max(10), maxReferences: z.number().int().nonnegative()
}).optional()
});
-export const catalogSchema = z.object({ models: z.array(modelSchema).min(1) });
+const catalogMetadata = {
+ catalogVersion:z.string().optional(),catalogUpdatedAt:z.string().optional(),catalogRefreshState:z.enum(['ready','stale','unavailable']).optional(),
+};
+export const catalogSchema = z.object({ models: z.array(modelSchema), defaults:z.record(z.string()).optional(), ...catalogMetadata,
+ modelAvailability:z.array(z.object({model:z.string(),operation:z.enum(['responses','chat/completions','images/generations','images/edits','audio/speech','audio/transcriptions','video/jobs']),status:z.literal('recent_success'),checkedAt:z.string()})).optional(),
+});
export const accountSchema = z.object({ id: z.string().min(1), email: z.string(), verified: z.boolean(), avatarUrl: z.string().url().max(2048).optional() });
export const cachedModelUsePolicy = 'cached-key-v1';
export const bootstrapCredentialsSchema = z.object({
- schemaVersion: z.literal(1), account: accountSchema,
- transport: z.enum(['gateway', 'openrouter-direct']).optional(),
+ schemaVersion: z.union([z.literal(1), z.literal(2), z.literal(3)]), account: accountSchema,
+ transport: z.enum(['gateway', 'openrouter-direct', 'supplier-direct']).optional(),
+ supplier: z.enum(['openrouter', '88api', 'chatanywhere']).optional(),
keyRotation: z.boolean().optional(), rotationPending: z.boolean().optional(),
modelUsePolicy: z.literal(cachedModelUsePolicy).optional(),
- modelKey: z.string().min(1), keyVersion: z.string().min(1), bindingVersion: z.string().min(1), baseUrl: z.string().url(),
- models: z.array(modelSchema), defaults: z.record(z.string())
+ modelKey: z.string().min(1).optional(), keyVersion: z.string().min(1), bindingVersion: z.string().min(1), baseUrl: z.string().url(),
+ models: z.array(modelSchema), defaults: z.record(z.string()), ...catalogMetadata
});
-export const bootstrapSchema = bootstrapCredentialsSchema.refine(value => value.modelUsePolicy !== cachedModelUsePolicy || (value.transport === 'openrouter-direct' && value.keyRotation === false), 'Cached model credentials require a stable direct binding');
+export const bootstrapSchema = bootstrapCredentialsSchema
+ .refine(value => value.transport === 'gateway' && value.schemaVersion === 3 ? !value.modelKey && value.supplier === 'chatanywhere' && value.keyRotation === false : !!value.modelKey && value.schemaVersion !== 3, 'Invalid gateway credentials')
+ .refine(value => value.modelUsePolicy !== cachedModelUsePolicy || (isDirectTransport(value.transport) && value.keyRotation === false), 'Cached model credentials require a stable direct binding')
+ .refine(value => value.transport !== 'supplier-direct' || (value.schemaVersion === 2 && value.supplier !== 'openrouter' && isSupplierBase(value.supplier, value.baseUrl)), 'Invalid supplier binding')
+ .refine(value => value.transport !== 'openrouter-direct' || ((!value.supplier || value.supplier === 'openrouter') && value.baseUrl === supplierBases.openrouter), 'Invalid OpenRouter binding');
export type GatewayBootstrap = z.infer<typeof bootstrapSchema>;
-export const probeCredentialsSchema = z.object({
- costBearer: z.literal('platform'), modelKey: z.string().min(1), keyVersion: z.string().min(1),
- baseUrl: z.literal('https://openrouter.ai/api/v1'), expiresAt: z.string().datetime()
-});
-export type GatewayProbeCredentials = z.infer<typeof probeCredentialsSchema>;
export type GatewayTokens = z.infer<typeof tokenSchema>;
export type GatewayDeviceGrant = { attemptId: string; deviceSecret: string; authorizationUrl: string; interval: number; expiresIn: number };
export type GatewayClient = {
@@ -46,14 +55,14 @@ export type GatewayClient = {
pollDevice(id: string, secret: string): Promise<GatewayTokens>;
cancelDevice(id: string, secret: string): Promise<void>;
refresh(refresh: string): Promise<GatewayTokens>;
- bootstrap(access: string, options?: { rotate: boolean; modelUsePolicy?: typeof cachedModelUsePolicy }): Promise<GatewayBootstrap>;
+ bootstrap(access: string, options?: { rotate: boolean; modelUsePolicy?: typeof cachedModelUsePolicy; region?: SupplierRegion }): Promise<GatewayBootstrap>;
avatar(access: string, accountId: string): Promise<{ data: Uint8Array; contentType: string }>;
logout(access: string): Promise<void>;
request(path: string, access: string, body?: unknown): Promise<unknown>;
cancelPendingRequests?(): void;
};
export class GatewayError extends Error {
- constructor(readonly code: string, readonly status = 503) { super('The OpenCreator gateway request did not complete'); }
+ constructor(readonly code: string, readonly status = 503, readonly diagnostics?: GatewayConnectionDiagnostics) { super('The OpenCreator gateway request did not complete'); }
}
export function validateGatewayOrigin(origin: string) {
const u = new URL(origin);
@@ -64,41 +73,61 @@ export function validateGatewayOrigin(origin: string) {
export function createGatewayClient(origin: string, fetcher: typeof fetch = fetch): GatewayClient {
origin = validateGatewayOrigin(origin);
const pendingRequests = new Set<AbortController>();
- async function readResponse(path: string, access: string, body?: unknown) {
+ async function readResponse(path: string, access: string, body?: unknown, cancellation?: AbortSignal) {
if (!path.startsWith('/api/v1/') || path.includes('..')) throw new GatewayError('invalid_gateway_path');
const controller = new AbortController();
+ const signal = AbortSignal.any([controller.signal, AbortSignal.timeout(30_000), ...(cancellation ? [cancellation] : [])]);
pendingRequests.add(controller);
try {
let res: Response;
try {
- res = await fetcher(`${origin}${path}`, { method: body === undefined ? 'GET' : 'POST', redirect: 'error', signal: AbortSignal.any([controller.signal, AbortSignal.timeout(30_000)]),
+ res = await fetcher(`${origin}${path}`, { method: body === undefined ? 'GET' : 'POST', redirect: 'error', signal,
headers: { 'Content-Type': 'application/json', ...(access ? { Authorization: `Bearer ${access}` } : {}) }, ...(body === undefined ? {} : { body: JSON.stringify(body) }) });
- } catch { throw new GatewayError('gateway_unavailable'); }
+ } catch (error) { throw new GatewayError('gateway_unavailable', 503, connectionDiagnostics(path, error, signal)); }
const reader = res.body?.getReader();
- if (!reader) throw new GatewayError('invalid_gateway_response');
+ if (!reader) throw new GatewayError('invalid_gateway_response', 503, { path: path.split('?')[0]!, reason: 'invalid_response', httpStatus: res.status });
const chunks: Uint8Array[] = []; let size = 0;
try {
while (true) {
const item = await reader.read(); if (item.done) break;
size += item.value.byteLength;
- if (size > 1024 * 1024) { await reader.cancel(); throw new GatewayError('invalid_gateway_response'); }
+ if (size > 1024 * 1024) { await reader.cancel(); throw new GatewayError('invalid_gateway_response', 503, { path: path.split('?')[0]!, reason: 'invalid_response', httpStatus: res.status }); }
chunks.push(item.value);
}
- } catch (error) { if (error instanceof GatewayError) throw error; throw new GatewayError('gateway_unavailable'); }
+ } catch (error) { if (error instanceof GatewayError) throw error; throw new GatewayError('gateway_unavailable', 503, connectionDiagnostics(path, error, signal)); }
return { res, data: Buffer.concat(chunks) };
} finally { pendingRequests.delete(controller); }
}
- function responseError(data: Uint8Array, status: number): never {
+ async function readBillingSummary(access: string) {
+ const primary = new AbortController(); const backup = new AbortController();
+ let timer: NodeJS.Timeout | undefined;
+ try {
+ const first = readResponse('/api/v1/billing/summary', access, undefined, primary.signal);
+ // This read is free and idempotent; a stalled CDN connection need not block it.
+ const second = new Promise<Awaited<ReturnType<typeof readResponse>>>(resolve => {
+ timer = setTimeout(() => {
+ void readResponse('/api/v1/billing/summary', access, undefined, backup.signal)
+ .then(result => { if (result.res.ok) resolve(result); }).catch(() => undefined);
+ }, 800);
+ });
+ return await Promise.race([first, second]);
+ } finally {
+ clearTimeout(timer); primary.abort(); backup.abort();
+ }
+ }
+ function responseError(data: Uint8Array, status: number, path: string): never {
+ const diagnostics: GatewayConnectionDiagnostics = { path: path.split('?')[0]!, reason: 'http', httpStatus: status };
let value: unknown;
- try { value = JSON.parse(Buffer.from(data).toString('utf8')); } catch { throw new GatewayError('invalid_gateway_response'); }
+ try { value = JSON.parse(Buffer.from(data).toString('utf8')); } catch { throw new GatewayError('invalid_gateway_response', status, diagnostics); }
const parsed = z.object({ error: z.object({ code: z.string().regex(/^[a-z_]{1,64}$/) }) }).safeParse(value);
- throw new GatewayError(parsed.success ? parsed.data.error.code : 'gateway_unavailable', status);
+ throw new GatewayError(parsed.success ? parsed.data.error.code : 'gateway_unavailable', status, diagnostics);
}
async function request(path: string, access: string, body?: unknown): Promise<unknown> {
- const { res, data } = await readResponse(path, access, body);
- if (!res.ok) responseError(data, res.status);
+ const { res, data } = await (path === '/api/v1/billing/summary' && body === undefined
+ ? readBillingSummary(access) : readResponse(path, access, body));
+ if (!res.ok) responseError(data, res.status, path);
const text = data.toString('utf8');
- let value: unknown; try { value = JSON.parse(text); } catch { throw new GatewayError('invalid_gateway_response'); }
+ let value: unknown; try { value = JSON.parse(text); } catch { throw new GatewayError('invalid_gateway_response', 503, { path: path.split('?')[0]!, reason: 'invalid_response', httpStatus: res.status }); }
return value;
}
return {
@@ -110,16 +139,20 @@ export function createGatewayClient(origin: string, fetcher: typeof fetch = fetc
async refresh(refreshToken) { return tokenSchema.parse(await request('/api/v1/auth/refresh', '', { refreshToken })); },
async bootstrap(access, options) {
const query = new URLSearchParams();
+ query.set('protocolVersion', '3');
if (options) query.set('rotate', options.rotate ? '1' : '0');
if (options?.modelUsePolicy) query.set('modelUsePolicy', options.modelUsePolicy);
- const value = bootstrapSchema.parse(await request('/api/v1/client/bootstrap' + (query.size ? `?${query}` : ''), access));
- const expected = value.transport === 'openrouter-direct' ? 'https://openrouter.ai/api/v1' : `${origin}/v1`;
+ if (options?.region) query.set('region', options.region);
+ const parsed = bootstrapSchema.safeParse(await request('/api/v1/client/bootstrap' + (query.size ? `?${query}` : ''), access));
+ if (!parsed.success) throw new GatewayError('invalid_gateway_response');
+ const value = parsed.data;
+ const expected = value.transport === 'supplier-direct' && isSupplierBase(value.supplier, value.baseUrl) ? value.baseUrl : value.transport === 'openrouter-direct' ? supplierBases.openrouter : `${origin}/v1`;
if (value.baseUrl !== expected) throw new GatewayError('invalid_gateway_response');
return value;
},
async avatar(access, accountId) {
const { res, data } = await readResponse('/api/v1/me/avatar?accountId=' + encodeURIComponent(accountId), access);
- if (!res.ok) responseError(data, res.status);
+ if (!res.ok) responseError(data, res.status, '/api/v1/me/avatar');
const contentType = res.headers.get('content-type')?.split(';')[0] ?? '';
if (!['image/png', 'image/jpeg', 'image/gif', 'image/webp'].includes(contentType)) throw new GatewayError('invalid_gateway_response');
return { data, contentType };
@@ -128,4 +161,12 @@ export function createGatewayClient(origin: string, fetcher: typeof fetch = fetc
};
}
+function connectionDiagnostics(path: string, error: unknown, signal: AbortSignal): GatewayConnectionDiagnostics {
+ const value = error as { name?: string; code?: unknown; cause?: { code?: unknown } } | undefined;
+ const code = value?.cause?.code ?? value?.code;
+ const networkCode = typeof code === 'string' && /^[A-Z_]{2,64}$/.test(code) ? code : undefined;
+ return { path: path.split('?')[0]!, reason: signal.reason?.name === 'TimeoutError' || value?.name === 'TimeoutError' || networkCode?.includes('TIMEOUT') || networkCode === 'ETIMEDOUT' ? 'timeout' : 'network',
+ ...(networkCode ? { networkCode } : {}) };
+}
+
export function gatewayModel(models: GatewayModel[], modality: GatewayModel['modality']) { return models.find(model => model.modality === modality); }
diff --git a/apps/daemon/src/gateway/config-store.ts b/apps/daemon/src/gateway/config-store.ts
index a722888b..763ef6d1 100644
--- a/apps/daemon/src/gateway/config-store.ts
+++ b/apps/daemon/src/gateway/config-store.ts
@@ -17,7 +17,7 @@ export function createGatewayConfigStore(dataDir: string) {
return result;
}
const credentials = bootstrapCredentialsSchema.partial().extend({ accessToken: z.string(), refreshToken: z.string(), expiresIn: z.number(), accessExpiresAt: z.string(), modelAccessError: modelAccessErrorSchema.optional() });
- const configuration = z.object({ source: z.enum(['manual', 'gateway']), bindingVersion: z.string().nullable(), explicitlySelected: z.boolean().optional(), selectedModels: z.record(z.string()).optional() });
+ const configuration = z.object({ source: z.enum(['manual', 'gateway']), bindingVersion: z.string().nullable(), explicitlySelected: z.boolean().optional(), selectedModels: z.record(z.string()).optional(), modelPreferencesVersion: z.literal(1).optional(), manualModels: z.record(z.string()).optional(), region: z.enum(['auto', 'domestic', 'overseas']).optional() });
return {
readDeviceID(): Promise<string> {
return deviceID ??= (async () => {
diff --git a/apps/daemon/src/gateway/creator-service-source.ts b/apps/daemon/src/gateway/creator-service-source.ts
index 46bea373..1f84f1d2 100644
--- a/apps/daemon/src/gateway/creator-service-source.ts
+++ b/apps/daemon/src/gateway/creator-service-source.ts
@@ -1,8 +1,10 @@
-import { createDefaultCreatorServicesConfig, gatewayDefaultVoiceId, type CreatorServicesConfig, type CreatorProviderRequest, type CreatorStageRun, type CreatorJob, type GatewayModel } from '@opencreator/protocol';
+import { isDirectTransport } from './supplier.js';
+import { createDefaultCreatorServicesConfig, gatewayDefaultVoiceId, gatewayModelReady, type CreatorServicesConfig, type CreatorProviderRequest, type CreatorStageRun, type CreatorJob, type GatewayModel } from '@opencreator/protocol';
import type { FastifyInstance } from 'fastify';
import { createHash, randomBytes, randomUUID } from 'node:crypto';
import { AsyncLocalStorage } from 'node:async_hooks';
import { Readable } from 'node:stream';
+import { setTimeout as delay } from 'node:timers/promises';
import type { CreatorServicesConfigStore } from '../creator-services/config-store.js';
import { KRILLIN_LLM_ROUTE_PREFIX } from '../creator/krillin/codex-llm-gateway.js';
import type { GatewayAccountService } from './account-service.js';
@@ -11,13 +13,14 @@ import type { CreatorServiceBinding } from '../creator/repository.js';
import type { CreatorProviderRequestLedger, CreatorProviderLookupResult } from '../creator/provider-requests.js';
import { createDirectTransport, directRequestId } from './direct-transport.js';
import { createOfficialFetch } from './official-fetch.js';
+import { chatAnywhereImage } from './chatanywhere-media.js';
export type GatewayCreatorBinding = { accountId: string; bindingVersion: string; baseUrl: string; apiKey: string; models: Record<string, string>; catalog?: GatewayModel[]; capabilities?: Record<string, string[]>; speechVoices?: string[]; logicalId?: string; stageRunId?: string };
const bindings = new WeakMap<CreatorServicesConfig, GatewayCreatorBinding>();
export function gatewayCreatorBinding(config: CreatorServicesConfig) { return bindings.get(config); }
export function createGatewayCreatorSource(input: {
- account: Pick<GatewayAccountService, 'peekState' | 'modelCredentials'> & Partial<Pick<GatewayAccountService, 'beginModelUse' | 'recoverModelCredentials' | 'reportModelFailure'>>;
+ account: Pick<GatewayAccountService, 'peekState' | 'modelCredentials'> & Partial<Pick<GatewayAccountService, 'beginModelUse' | 'recoverModelCredentials' | 'reportModelFailure' | 'reportModelSuccess'>>;
manual: CreatorServicesConfigStore;
getLocalOrigin(): string | undefined;
fetcher?: typeof fetch;
@@ -27,18 +30,19 @@ export function createGatewayCreatorSource(input: {
ledger?: CreatorProviderRequestLedger;
directRequestsRoot?: string;
}) {
- const capabilities = new Map<string, { token: string; accountId: string; bindingVersion: string; logicalId?: string; jobId?: string }>();
+ const capabilities = new Map<string, { token: string; accountId: string; bindingVersion: string; supplierBase: string; logicalId?: string; stageRunId?: string; jobId?: string }>();
const context = new AsyncLocalStorage<{ snapshot: CreatorServiceBinding; logicalId: string; stageRunId: string; jobId: string }>();
- const inFlight = new Map<AbortController, Promise<void>>();
+ const inFlight = new Map<AbortController, { stageRunId?: string; done: Promise<void> }>();
const remoteTasks = new Set<string>();
const prefix = `${KRILLIN_LLM_ROUTE_PREFIX}/gateway/v1`;
const direct = input.directRequestsRoot ? createDirectTransport(input.directRequestsRoot,
input.fetcher ?? createOfficialFetch({ readProxy: async () => (await input.manual.read()).proxy }),
- input.account.recoverModelCredentials ? async (accountId, failedKey) => {
+ input.account.recoverModelCredentials ? async (accountId, failedKey, baseUrl) => {
const current = await input.account.modelCredentials();
if (current.accountId !== accountId) throw new GatewayError('auth_required', 401);
const updated = current.modelKey !== failedKey ? current : await input.account.recoverModelCredentials!(current.keyVersion);
if (updated.accountId !== accountId) throw new GatewayError('auth_required', 401);
+ if (updated.baseUrl !== baseUrl) throw new GatewayError('supplier_binding_changed', 409);
return updated.modelKey !== failedKey ? updated.modelKey : undefined;
} : undefined) : undefined;
function snapshot(): CreatorServiceBinding {
@@ -48,16 +52,32 @@ export function createGatewayCreatorSource(input: {
const models: Record<string, string> = {};
const caps: Record<string, string[]> = {};
for (const model of state.models) {
+ if(!gatewayModelReady(model))continue;
if (!models[model.modality] || state.selectedModels?.[model.modality] === model.id) {
models[model.modality] = model.id; caps[model.modality] = [...model.capabilities];
}
}
- return { source: 'gateway', accountId: state.account.id, bindingVersion: state.bindingVersion, models, capabilities: caps };
+ if(state.transport==='gateway'){
+ for (const modality of ['text','image','video','speech','transcription'] as const) {
+ const id = state.selectedModels?.[modality];
+ const selected = state.models.find(model => model.id === id && model.modality === modality && gatewayModelReady(model)
+ && (modality !== 'text' || model.capabilities.includes('chat'))
+ && (modality !== 'transcription' || model.capabilities.includes('subtitle_timestamps')));
+ if (selected) { models[modality] = selected.id; caps[modality] = [...selected.capabilities]; }
+ else { delete models[modality]; delete caps[modality]; }
+ }
+ }
+ return { source: 'gateway', accountId: state.account.id, bindingVersion: state.bindingVersion, supplier: state.supplier ?? 'openrouter', models, capabilities: caps };
}
function assertSnapshot(value: CreatorServiceBinding, recovery = false) {
const state = input.account.peekState();
if (value.source === 'gateway' && (state.authState !== 'signed_in' || (!recovery && state.activationState !== 'ready'))) throw new GatewayError('services_not_ready');
if (value.source !== state.source || (value.source === 'gateway' && value.accountId !== state.account?.id)) throw new GatewayError('task_source_mismatch', 409);
+ if (value.source === 'gateway' && state.supplier) {
+ const supplier = value.supplier ?? (value.bindingVersion.startsWith(`${value.accountId}:88api:`) ? '88api'
+ : value.bindingVersion.startsWith(`${value.accountId}:chatanywhere:`) ? 'chatanywhere' : 'openrouter');
+ if (supplier !== state.supplier) throw new GatewayError('supplier_binding_changed', 409);
+ }
}
function assertJob(jobId: string) { if (input.readJobBinding) assertSnapshot(input.readJobBinding(jobId)); }
async function binding(): Promise<GatewayCreatorBinding | undefined> {
@@ -69,14 +89,16 @@ export function createGatewayCreatorSource(input: {
if (!local) throw new GatewayError('services_not_ready');
const original = scope?.snapshot.source === 'gateway' ? scope.snapshot : undefined;
const bindingVersion = original?.bindingVersion ?? credentials.bindingVersion;
- let capability = [...capabilities.values()].find(value => value.accountId === credentials.accountId && value.bindingVersion === bindingVersion && value.logicalId === scope?.logicalId);
+ let capability = [...capabilities.values()].find(value => value.accountId === credentials.accountId && value.bindingVersion === bindingVersion && value.supplierBase === credentials.baseUrl && value.logicalId === scope?.logicalId && value.stageRunId === scope?.stageRunId);
if (!capability) {
- capability = { accountId: credentials.accountId, bindingVersion, logicalId: scope?.logicalId, jobId: scope?.jobId, token: `oclocal_${randomBytes(32).toString('base64url')}` };
+ capability = { accountId: credentials.accountId, bindingVersion, supplierBase: credentials.baseUrl, logicalId: scope?.logicalId, stageRunId: scope?.stageRunId, jobId: scope?.jobId, token: `oclocal_${randomBytes(32).toString('base64url')}` };
capabilities.set(capability.token, capability);
}
const speechModel = original?.models?.speech ?? credentials.defaults.speech;
const speechVoices = credentials.models.find(model => model.modality === 'speech' && model.id === speechModel)?.voices;
- return { accountId: credentials.accountId, bindingVersion, baseUrl: `${local}${prefix}`, apiKey: capability.token, models: original?.models ?? credentials.defaults, catalog: credentials.models, capabilities: original?.capabilities ?? Object.fromEntries(credentials.models.filter(model => credentials.defaults[model.modality] === model.id).map(model => [model.modality, model.capabilities])), speechVoices, logicalId: scope?.logicalId, stageRunId: scope?.stageRunId };
+ const defaults={...credentials.defaults};
+ if(credentials.transport==='gateway')defaults.transcription=credentials.models.find(model=>model.id===defaults.transcription&&model.capabilities.includes('subtitle_timestamps')&&gatewayModelReady(model))?.id??'';
+ return { accountId: credentials.accountId, bindingVersion, baseUrl: `${local}${prefix}`, apiKey: capability.token, models: original?.models ?? defaults, catalog: credentials.models, capabilities: original?.capabilities ?? Object.fromEntries(credentials.models.filter(model => defaults[model.modality] === model.id).map(model => [model.modality, model.capabilities])), speechVoices, logicalId: scope?.logicalId, stageRunId: scope?.stageRunId };
}
const store: CreatorServicesConfigStore = {
async read() {
@@ -95,28 +117,42 @@ export function createGatewayCreatorSource(input: {
async write(config) { if (input.account.peekState().source !== 'manual') throw new GatewayError('official_config_read_only', 409); return input.manual.write(config); },
async reset() { if (input.account.peekState().source !== 'manual') throw new GatewayError('official_config_read_only', 409); return input.manual.reset(); }
};
- return {
- store, binding, snapshot, assertJob,
- async queryProviderRequest(request: CreatorProviderRequest) {
+ async function queryProviderRequest(request: CreatorProviderRequest) {
if (input.readJobBinding) assertSnapshot(input.readJobBinding(request.jobId), true);
if (!input.ledger || !request.gateway || !request.provider.startsWith('opencreator-gateway-')) throw new GatewayError('capability_unsupported', 400);
const use = await input.account.beginModelUse?.({ recovery: true });
try {
- const credentials = use?.credentials ?? await input.account.modelCredentials();
+ let credentials = use?.credentials ?? await input.account.modelCredentials();
if (credentials.accountId !== request.gateway.accountId) throw new GatewayError('task_source_mismatch', 409);
- const requestId = request.remoteTaskId ?? (credentials.transport === 'openrouter-direct'
- ? directRequestId(credentials.accountId, request.requestKey) : undefined);
+ const requestId = request.remoteTaskId ?? (isDirectTransport(credentials.transport)
+ ? directRequestId(credentials.accountId, request.requestKey)
+ : credentials.transport === 'gateway'
+ ? `ocreq_${createHash('sha256').update(`${credentials.accountId}:${request.requestKey}`).digest('hex').slice(0, 48)}`
+ : undefined);
if (!requestId) throw new GatewayError('request_outcome_unknown', 409);
const signal = AbortSignal.timeout(30_000);
let lookupResult: Promise<CreatorProviderLookupResult> | undefined;
- const lookup = async (): Promise<CreatorProviderLookupResult> => {
+ let refreshedCredentials = false;
+ const lookupOnce = async (): Promise<CreatorProviderLookupResult> => {
let response: Response;
try {
- response = credentials.transport === 'openrouter-direct' && direct
- ? await direct.request({ account: credentials.accountId, key: credentials.modelKey, resource: `requests/${requestId}`, method: 'GET', body: undefined, contentType: 'application/json', identity: '', fingerprint: '', signal,
- onModelFailure: async (id, modality, facts) => { await input.account.reportModelFailure?.(credentials, id, modality, facts); } })
+ response = isDirectTransport(credentials.transport) && direct
+ ? await direct.request({ account: credentials.accountId, baseUrl: credentials.baseUrl, key: credentials.modelKey, resource: `requests/${requestId}`, method: 'GET', body: undefined, contentType: 'application/json', identity: '', fingerprint: '', signal,
+ onModelFailure: async (id, modality, facts) => { await input.account.reportModelFailure?.(credentials, id, modality, facts); },
+ onModelSuccess: async (id, modality, operation) => { await input.account.reportModelSuccess?.(credentials, id, modality, operation); } })
: await (input.fetcher ?? fetch)(`${credentials.baseUrl}/requests/${encodeURIComponent(requestId)}`, { method: 'GET', headers: { Authorization: `Bearer ${credentials.modelKey}` }, redirect: 'error', signal });
} catch (error) { if (error instanceof GatewayError && error.code === 'request_not_found') return { status: 'not_found' }; throw error; }
+ if (response.status === 401 && !refreshedCredentials && credentials.transport === 'gateway' && input.account.recoverModelCredentials) {
+ refreshedCredentials = true;
+ await response.body?.cancel();
+ const updated = await input.account.recoverModelCredentials(credentials.keyVersion);
+ if (updated.accountId !== credentials.accountId || updated.baseUrl !== credentials.baseUrl) throw new GatewayError('supplier_binding_changed', 409);
+ if (updated.modelKey !== credentials.modelKey) {
+ credentials = updated;
+ return lookupOnce();
+ }
+ }
+ if (response.status === 401) throw new GatewayError('auth_required', 401);
if (response.status === 404) return { status: 'not_found' };
if (!response.ok) throw new GatewayError('gateway_unavailable');
const result = await response.json() as { requestId?: string; state?: string };
@@ -127,13 +163,24 @@ export function createGatewayCreatorSource(input: {
if (!['submitting', 'waiting_upstream'].includes(result.state ?? '')) throw new GatewayError('invalid_gateway_response');
return { status: 'waiting_remote', remoteTaskId: requestId };
};
+ const lookup = async (): Promise<CreatorProviderLookupResult> => {
+ for (let attempt = 0; ; attempt++) {
+ try { return await lookupOnce(); }
+ catch (error) {
+ if (attempt >= 2 || signal.aborted || error instanceof GatewayError && ['task_source_mismatch', 'supplier_binding_changed', 'auth_required'].includes(error.code)) throw error;
+ await delay(250 * 2 ** attempt, undefined, { signal });
+ }
+ }
+ };
const provider = { lookupByRequestKey: true, lookup: () => lookupResult ??= lookup() };
await input.ledger.recover(request.id, provider);
for (const related of input.ledger.findByRemoteTaskId(request.jobId, requestId)) {
if (related.id !== request.id && related.gateway?.accountId === credentials.accountId && related.provider.startsWith('opencreator-gateway-')) await input.ledger.recover(related.id, provider);
}
} finally { await use?.release(); }
- },
+ }
+ return {
+ store, binding, snapshot, assertJob, queryProviderRequest,
async runForJob<T>(jobId: string, stageRunId: string, work: () => Promise<T>): Promise<T> {
let original = input.readJobBinding?.(jobId) ?? snapshot();
assertSnapshot(original);
@@ -144,7 +191,7 @@ export function createGatewayCreatorSource(input: {
original = { ...original, models: { ...original.models }, capabilities: { ...original.capabilities } };
const catalog = input.account.peekState().models;
for (const [modality, id] of Object.entries(choices)) {
- const selected = catalog.find(candidate => candidate.modality === modality && candidate.id === id && (modality !== 'text' || candidate.capabilities.includes('responses')));
+ const selected = catalog.find(candidate => candidate.modality === modality && candidate.id === id && gatewayModelReady(candidate) && (modality !== 'text' || candidate.capabilities.includes('chat') || candidate.capabilities.includes('responses')));
if (!selected) {
const resumed = typeof input.readStageRun?.(stageRunId)?.progress.resumedFromStageRunId === 'string';
if (!resumed || !['image', 'video'].includes(modality) || typeof id !== 'string') throw new GatewayError('invalid_model', 400);
@@ -166,11 +213,27 @@ export function createGatewayCreatorSource(input: {
logicalId = parent.id; stage = parent;
}
}
- return context.run({ snapshot: original, logicalId, stageRunId, jobId }, work);
+ let failed = false;
+ try {
+ return await context.run({ snapshot: original, logicalId, stageRunId, jobId }, work);
+ } catch (error) {
+ failed = true;
+ throw error;
+ } finally {
+ // A completed response can precede the gateway's accounting receipt.
+ const requests = [...inFlight.entries()].filter(([, entry]) => entry.stageRunId === stageRunId);
+ if (failed) for (const [controller] of requests) controller.abort();
+ await Promise.all(requests.map(([, entry]) => entry.done));
+ const pending = input.ledger?.requestsForStage(stageRunId).filter(request => request.gateway !== undefined
+ && ['submitting', 'waiting_remote', 'unknown_remote_acceptance'].includes(request.status)) ?? [];
+ for (let offset = 0; offset < pending.length; offset += 3) {
+ await Promise.allSettled(pending.slice(offset, offset + 3).map(queryProviderRequest));
+ }
+ }
},
async revoke() {
capabilities.clear(); remoteTasks.clear();
- const pending = [...inFlight.values()];
+ const pending = [...inFlight.values()].map(entry => entry.done);
for (const controller of inFlight.keys()) controller.abort();
await direct?.close();
await Promise.all(pending);
@@ -179,16 +242,17 @@ export function createGatewayCreatorSource(input: {
async register(server: FastifyInstance) {
await server.register(async scoped => {
scoped.addContentTypeParser('multipart/form-data', { parseAs: 'buffer', bodyLimit: 64 * 1024 * 1024 }, (_r, body, done) => done(null, body));
- scoped.route({ method: ['GET', 'POST'], url: `${prefix}/*`, bodyLimit: 64 * 1024 * 1024, async handler(request, reply) {
+ scoped.addContentTypeParser(/^(image|video|audio)\//, { parseAs: 'buffer', bodyLimit: 100_000_000 }, (_r, body, done) => done(null, body));
+ scoped.route({ method: ['GET', 'POST'], url: `${prefix}/*`, bodyLimit: 100_000_000, async handler(request, reply) {
const token = request.headers.authorization?.replace(/^Bearer /, '');
const original = token ? capabilities.get(token) : undefined;
if (!original || token !== original.token) return reply.code(401).send({ error: { code: 'auth_required', message: 'Local authorization has expired' } });
const resource = (request.params as { '*': string })['*'];
- if (!/^(chat\/completions|responses|images\/(generations|edits)|audio\/(speech|transcriptions)|video\/jobs(\/[A-Za-z0-9_-]{12,128}(\/result)?)?|videos\/tasks|requests\/[A-Za-z0-9_-]{12,128}(\/result)?)$/.test(resource)) return reply.code(404).send({ error: { code: 'capability_unsupported', message: 'Operation is unavailable' } });
+ if (!/^(chat\/completions|responses|images\/(generations|edits)|audio\/(speech|transcriptions)|video\/(quotes|assets|jobs(\/[A-Za-z0-9_-]{12,128}(\/result)?)?)|videos\/tasks|requests\/[A-Za-z0-9_-]{12,128}(\/result)?)$/.test(resource)) return reply.code(404).send({ error: { code: 'capability_unsupported', message: 'Operation is unavailable' } });
const controller = new AbortController();
const signal = AbortSignal.any([controller.signal, AbortSignal.timeout(180_000)]);
let complete!: () => void;
- inFlight.set(controller, new Promise<void>(resolve => { complete = resolve; }));
+ inFlight.set(controller, { stageRunId: original.stageRunId, done: new Promise<void>(resolve => { complete = resolve; }) });
let streaming = false;
let releaseUse: (() => Promise<void>) | undefined;
const chatStream = request.method === 'POST' && resource === 'chat/completions' && (request.body as { stream?: unknown })?.stream === true;
@@ -201,24 +265,29 @@ export function createGatewayCreatorSource(input: {
const sendStreamError = (error: unknown) => {
if (!reply.raw.destroyed && !reply.raw.writableEnded) reply.raw.end(`data: ${JSON.stringify({ error: {
code: error instanceof GatewayError ? error.code : 'gateway_unavailable',
+ type: 'upstream_error',
message: 'Official service request could not be completed'
} })}\n\n`);
};
let receipt: CreatorProviderRequest | undefined;
let reconcile = async () => {};
- const markUnknown = () => {
+ const markUnknown = (error?: unknown) => {
if (!receipt || !input.ledger) return;
receipt = input.ledger.findLatest(receipt.provider, receipt.requestKey);
- if (receipt && ['submitting', 'waiting_remote'].includes(receipt.status)) receipt = input.ledger.markUnknownRemoteAcceptance(receipt.id);
+ if (receipt && ['submitting', 'waiting_remote'].includes(receipt.status)) receipt = input.ledger.markUnknownRemoteAcceptance(receipt.id, error);
+ if (error !== undefined) request.log.warn({ requestId: receipt?.remoteTaskId, code: error instanceof GatewayError ? error.code : 'gateway_status_lookup_failed' }, 'Gateway request status could not be confirmed');
};
try {
// 提前建立 SSE 连接,避免账号协调和上游准备耗尽 Krillin 的响应头等待时间。
if (chatStream) {
reply.hijack();
reply.raw.writeHead(200, { 'Content-Type': 'text/event-stream; charset=utf-8', 'Cache-Control': 'no-cache, no-store, no-transform', connection: 'keep-alive', 'X-Accel-Buffering': 'no' });
- reply.raw.write(': connected\n\n');
+ // go-openai includes SSE comments in its error buffer, obscuring later API errors.
+ const keepAlive = `data: ${JSON.stringify({ id: `chatcmpl-${randomUUID()}`, object: 'chat.completion.chunk',
+ created: Math.floor(Date.now() / 1000), model: (request.body as { model?: string })?.model ?? '', choices: [] })}\n\n`;
+ reply.raw.write(keepAlive);
reply.raw.once('close', disconnected);
- heartbeat = setInterval(() => { if (!reply.raw.destroyed && !reply.raw.writableEnded) reply.raw.write(': keep-alive\n\n'); }, 10_000);
+ heartbeat = setInterval(() => { if (!reply.raw.destroyed && !reply.raw.writableEnded) reply.raw.write(keepAlive); }, 10_000);
heartbeat.unref();
}
const use = await input.account.beginModelUse?.({ recovery: request.method === 'GET' }); releaseUse = use?.release;
@@ -226,10 +295,12 @@ export function createGatewayCreatorSource(input: {
const credentials = use?.credentials ?? await input.account.modelCredentials();
signal.throwIfAborted();
if (capabilities.get(original.token) !== original || credentials.accountId !== original.accountId) throw new GatewayError('auth_required', 401);
+ if (credentials.baseUrl !== original.supplierBase) throw new GatewayError('supplier_binding_changed', 409);
const headers: Record<string,string> = { Authorization: `Bearer ${credentials.modelKey}`, 'Content-Type': request.headers['content-type'] ?? 'application/json' };
+ if (request.headers.prefer === 'respond-async' && resource.startsWith('images/')) headers.Prefer = 'respond-async';
const identity = request.headers['idempotency-key'];
- const body = request.method === 'GET' ? undefined : Buffer.isBuffer(request.body) ? new Uint8Array(request.body) : JSON.stringify(request.body);
- const digest = request.method === 'POST' && (credentials.transport === 'openrouter-direct' || (original.logicalId && typeof identity !== 'string')) ? await requestDigest(request.body, headers['Content-Type']!) : undefined;
+ let body = request.method === 'GET' ? undefined : Buffer.isBuffer(request.body) ? new Uint8Array(request.body) : JSON.stringify(request.body);
+ const digest = request.method === 'POST' && resource !== 'video/assets' && (isDirectTransport(credentials.transport) || (original.logicalId && typeof identity !== 'string')) ? await requestDigest(request.body, headers['Content-Type']!) : undefined;
signal.throwIfAborted();
if (request.method === 'POST') headers['Idempotency-Key'] = typeof identity === 'string' ? identity : original.logicalId
? `creator:${createHash('sha256').update(JSON.stringify([original.logicalId, resource, digest])).digest('hex')}`
@@ -237,29 +308,19 @@ export function createGatewayCreatorSource(input: {
if (input.ledger && original.logicalId && original.jobId && digest && /^(chat\/completions|responses|images\/(generations|edits)|audio\/(speech|transcriptions))$/.test(resource)) {
const provider = `opencreator-gateway-${resource}`;
const requestKey = headers['Idempotency-Key']!;
- receipt = input.ledger.findLatest(provider, requestKey) ?? input.ledger.registerBeforeSubmit({ jobId: original.jobId, stageRunId: original.logicalId, provider, requestKey, request: { operation: resource, fingerprint: digest }, gateway: { accountId: original.accountId, bindingVersion: original.bindingVersion, logicalId: requestKey } });
+ receipt = input.ledger.findLatest(provider, requestKey) ?? input.ledger.registerBeforeSubmit({ jobId: original.jobId, stageRunId: original.stageRunId ?? original.logicalId,
+ scopeKey: input.readStageRun?.(original.stageRunId ?? original.logicalId)?.scopeKey,
+ provider, requestKey, request: { operation: resource, fingerprint: digest }, gateway: { accountId: original.accountId, bindingVersion: original.bindingVersion, logicalId: requestKey } });
if (receipt.status === 'registered') receipt = input.ledger.markSubmitting(receipt.id);
reconcile = async () => {
try {
- await input.ledger!.recover(receipt!.id, { lookupByRequestKey: false, async lookup({ remoteTaskId }) {
- if (!remoteTaskId) return { status: 'not_found' };
- const response = credentials.transport === 'openrouter-direct' && direct
- ? await direct.request({ account: credentials.accountId, key: credentials.modelKey, resource: `requests/${remoteTaskId}`, method: 'GET', body: undefined, contentType: 'application/json', identity: '', fingerprint: '', signal,
- onModelFailure: async (id, modality, facts) => { await input.account.reportModelFailure?.(credentials, id, modality, facts); } })
- : await (input.fetcher ?? fetch)(`${credentials.baseUrl}/requests/${encodeURIComponent(remoteTaskId)}`, { method: 'GET', headers: { Authorization: `Bearer ${credentials.modelKey}` }, redirect: 'error', signal });
- if (!response.ok) throw new GatewayError('gateway_unavailable');
- const result = await response.json() as { requestId?: string; state?: string };
- if (result.requestId !== remoteTaskId) throw new GatewayError('invalid_gateway_response');
- if (result.state === 'succeeded') return { status: 'succeeded', remoteTaskId };
- if (result.state === 'failed' || result.state === 'canceled') return { status: 'failed', remoteTaskId };
- return result.state === 'outcome_unknown' ? { status: 'not_found' } : { status: 'waiting_remote', remoteTaskId };
- } });
- } catch { markUnknown(); }
+ await queryProviderRequest(input.ledger!.findLatest(receipt!.provider, receipt!.requestKey) ?? receipt!);
+ } catch (error) { markUnknown(error); }
};
}
signal.throwIfAborted();
let response: Response;
- if (credentials.transport === 'openrouter-direct') {
+ if (isDirectTransport(credentials.transport)) {
if (!direct) throw new GatewayError('services_not_ready');
let modelMetadata: GatewayModel | undefined;
let cachedResponse: Response | undefined;
@@ -274,9 +335,29 @@ export function createGatewayCreatorSource(input: {
if (!cachedResponse) throw new GatewayError('invalid_model', 400);
}
}
- response = cachedResponse ?? await direct.request({ account: credentials.accountId, key: credentials.modelKey, resource, method: request.method, body: request.body, contentType: headers['Content-Type']!, identity: headers['Idempotency-Key'] ?? '', fingerprint: digest ?? '', signal, model: modelMetadata, asyncImage: request.headers.prefer === 'respond-async',
- onModelFailure: async (id, modality, facts) => { await input.account.reportModelFailure?.(credentials, id, modality, facts); } });
- } else response = await (input.fetcher ?? fetch)(`${credentials.baseUrl}/${resource}`, { method: request.method, headers, body, redirect: 'error', signal });
+ response = cachedResponse ?? await direct.request({ account: credentials.accountId, baseUrl: credentials.baseUrl, key: credentials.modelKey, resource, method: request.method, body: request.body, contentType: headers['Content-Type']!, identity: headers['Idempotency-Key'] ?? '', fingerprint: digest ?? '', signal, model: modelMetadata, asyncImage: request.headers.prefer === 'respond-async',
+ onModelFailure: async (id, modality, facts) => { await input.account.reportModelFailure?.(credentials, id, modality, facts); },
+ onModelSuccess: async (id, modality, operation) => { await input.account.reportModelSuccess?.(credentials, id, modality, operation); } });
+ } else {
+ if (credentials.transport === 'gateway' && request.method === 'POST' && resource.startsWith('images/')) {
+ const id = Buffer.isBuffer(request.body)
+ ? (await new Request('http://localhost', { method: 'POST', headers: { 'Content-Type': headers['Content-Type']! }, body: new Uint8Array(request.body) }).formData()).get('model')
+ : (request.body as { model?: unknown })?.model;
+ const native = await chatAnywhereImage(resource, request.body, headers['Content-Type']!, credentials.models.find(model => model.id === id && model.modality === 'image'));
+ headers['Content-Type'] = native.contentType;
+ body = Buffer.isBuffer(native.body) ? new Uint8Array(native.body) : JSON.stringify(native.body);
+ }
+ response = await (input.fetcher ?? fetch)(`${credentials.baseUrl}/${resource}`, { method: request.method, headers, body, redirect: 'error', signal });
+ if (credentials.transport === 'gateway' && response.status === 401 && input.account.recoverModelCredentials) {
+ await response.body?.cancel();
+ const updated = await input.account.recoverModelCredentials(credentials.keyVersion);
+ if (updated.accountId !== credentials.accountId || updated.baseUrl !== credentials.baseUrl) throw new GatewayError('supplier_binding_changed', 409);
+ if (updated.modelKey !== credentials.modelKey) {
+ headers.Authorization = `Bearer ${updated.modelKey}`;
+ response = await (input.fetcher ?? fetch)(`${credentials.baseUrl}/${resource}`, { method: request.method, headers, body, redirect: 'error', signal });
+ }
+ }
+ }
signal.throwIfAborted();
const id = response.headers.get('x-request-id');
if (!chatStream) {
@@ -329,6 +410,7 @@ export function createGatewayCreatorSource(input: {
return reply.send(stream);
} catch (error) {
if (receipt && input.ledger && error instanceof GatewayError && [400, 401, 402, 403, 404, 422, 429].includes(error.status) && ['submitting', 'waiting_remote'].includes(receipt.status)) receipt = input.ledger.markFailed(receipt.id);
+ else if (receipt?.remoteTaskId) await reconcile();
else markUnknown();
if (chatStream) { sendStreamError(error); return reply; }
return reply.code(error instanceof GatewayError ? error.status : 503).send({ error: { code: error instanceof GatewayError ? error.code : 'gateway_unavailable', message: 'Official service request could not be completed' } });
diff --git a/apps/daemon/src/gateway/direct-runtime.ts b/apps/daemon/src/gateway/direct-runtime.ts
index cdcc43fe..f194b557 100644
--- a/apps/daemon/src/gateway/direct-runtime.ts
+++ b/apps/daemon/src/gateway/direct-runtime.ts
@@ -1,16 +1,21 @@
import { createServer } from 'node:http';
-import { randomBytes } from 'node:crypto';
+import { randomBytes, randomUUID } from 'node:crypto';
import { Readable } from 'node:stream';
import { pipeline } from 'node:stream/promises';
-import { errorFacts, statelessResponses, type OfficialModelFailureReporter } from './direct-transport.js';
+import { errorFacts, statelessResponses, type OfficialModelFailureReporter, type OfficialModelSuccessReporter } from './direct-transport.js';
import { officialEventStream } from './official-stream.js';
-import { GatewayError } from './client.js';
+import { GatewayError, validateGatewayOrigin } from './client.js';
import type { GatewayModel } from '@opencreator/protocol';
import { creatorServiceFailureFacts } from '../creator-services/upstream-fetch.js';
+import { publicFactsFromFailure } from '../creator/public-error-facts.js';
+import { isKnownDirectBase, supplierBases } from './supplier.js';
+import { responsesToChat, chatToResponses } from './chat-responses.js';
-export type DirectRuntimeUse = { key: string; keyVersion?: string; release(): Promise<void>; models?: GatewayModel[]; onModelFailure?: OfficialModelFailureReporter };
+export type DirectRuntimeUse = { key: string; keyVersion?: string; baseUrl?: string; release(): Promise<void>; models?: GatewayModel[]; onModelFailure?: OfficialModelFailureReporter; onModelSuccess?: OfficialModelSuccessReporter };
-export async function createDirectRuntime(key: string, fetcher: typeof fetch = fetch, beginUse?: () => Promise<DirectRuntimeUse>, recoverKey?: (keyVersion: string) => Promise<{ key: string; keyVersion: string }>) {
+export async function createDirectRuntime(key: string, fetcher: typeof fetch = fetch, beginUse?: () => Promise<DirectRuntimeUse>, recoverKey?: (keyVersion: string) => Promise<{ key: string; keyVersion: string }>, baseUrl: string = supplierBases.openrouter, gateway = false) {
+ if (gateway) { if (baseUrl !== `${validateGatewayOrigin(new URL(baseUrl).origin)}/v1`) throw new GatewayError('invalid_gateway_response'); }
+ else if (!isKnownDirectBase(baseUrl)) throw new GatewayError('invalid_gateway_response');
const token = `oclocal_${randomBytes(32).toString('base64url')}`;
const active = new Set<AbortController>();
const handlers = new Set<Promise<void>>();
@@ -21,18 +26,31 @@ export async function createDirectRuntime(key: string, fetcher: typeof fetch = f
const done = new Promise<void>(resolve => { complete = resolve; }); handlers.add(done);
const abort = () => controller.abort(); res.once('close', abort);
let release: (() => Promise<void>) | undefined;
+ let use: DirectRuntimeUse | undefined;
+ let model: string | undefined;
+ let failureReported = false;
+ let succeeded = false;
+ const reportFailure = async (facts: Parameters<OfficialModelFailureReporter>[2]) => {
+ failureReported = true;
+ if (model) { try { await use?.onModelFailure?.(model, 'text', facts); } catch {} }
+ };
try {
const chunks: Buffer[] = []; let size = 0;
for await (const chunk of req) { size += chunk.length; if (size > 64 * 1024 * 1024) throw new Error('Request too large'); chunks.push(Buffer.from(chunk)); }
const body = statelessResponses(JSON.parse(Buffer.concat(chunks).toString('utf8')) as Record<string, unknown>);
- const use = await beginUse?.(); release = use?.release;
+ model = typeof body.model === 'string' ? body.model : undefined;
+ use = await beginUse?.(); release = use?.release;
+ if (use?.baseUrl && use.baseUrl !== baseUrl) throw new GatewayError('supplier_binding_changed', 409);
if (use?.models && !use.models.some(model => model.modality === 'text' && model.id === body.model && model.capabilities.includes('responses'))) {
res.writeHead(400, { 'Content-Type': 'application/json' }).end(JSON.stringify({ error: { code: 'invalid_model', message: 'The selected model is unavailable' } })); return;
}
const signal = AbortSignal.any([controller.signal, AbortSignal.timeout(180_000)]);
+ const profile = use?.models?.find(candidate => candidate.id === model && candidate.modality === 'text');
+ const bridge = profile?.capabilities.includes('responses_via_chat') ? responsesToChat(body) : undefined;
+ const identity = randomUUID();
const submit = (modelKey: string) => {
signal.throwIfAborted();
- return fetcher('https://openrouter.ai/api/v1/responses', { method: 'POST', redirect: 'error', signal, headers: { Authorization: `Bearer ${modelKey}`, 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
+ return fetcher(`${baseUrl}/${bridge ? 'chat/completions' : 'responses'}`, { method: 'POST', redirect: 'error', signal, headers: { Authorization: `Bearer ${modelKey}`, 'Content-Type': 'application/json', ...(gateway ? { 'Idempotency-Key': identity } : {}) }, body: JSON.stringify(bridge?.body ?? body) });
};
let modelKey = use?.key ?? key;
let response = await submit(modelKey);
@@ -42,23 +60,46 @@ export async function createDirectRuntime(key: string, fetcher: typeof fetch = f
try { updated = await recoverKey(use.keyVersion); }
catch (error) {
signal.throwIfAborted();
- throw error instanceof GatewayError && [401, 403].includes(error.status) ? error : new GatewayError('model_auth_required', 401);
+ throw error instanceof GatewayError && [401, 403, 409].includes(error.status) ? error : new GatewayError('model_auth_required', 401);
}
if (updated.keyVersion !== use.keyVersion) { modelKey = updated.key; response = await submit(modelKey); }
}
if (!response.ok || !response.body) {
const facts = await errorFacts(response, modelKey, signal);
- if (typeof body.model === 'string') { try { await use?.onModelFailure?.(body.model, 'text', facts); } catch {} }
- res.writeHead([401, 402].includes(response.status) ? response.status : 503, { 'Content-Type': 'application/json' }).end(JSON.stringify({ error: { message: response.status === 401 ? 'The official model credentials expired. Sign in again.' : response.status === 402 ? 'Insufficient credits' : 'The official model service is unavailable' } })); return;
+ await reportFailure(facts);
+ const status = response.status >= 400 && response.status <= 599 ? response.status : 502;
+ res.writeHead(status, { 'Content-Type': 'application/json', 'Cache-Control': 'no-store', ...(facts.requestId ? { 'X-Request-ID': facts.requestId } : {}) }).end(JSON.stringify({ error: {
+ code: facts.upstreamCode ?? 'official_service_unavailable',
+ message: facts.upstreamMessage ?? (status === 401 ? 'The official model credentials expired. Sign in again.' : status === 402 ? 'Insufficient credits' : 'The official model service is unavailable'),
+ ...(facts.requestId ? { requestId: facts.requestId } : {})
+ } })); return;
}
- res.writeHead(200, { 'Content-Type': response.headers.get('content-type') ?? 'text/event-stream', 'Cache-Control': 'no-store' });
- const bodyStream = response.headers.get('content-type')?.includes('text/event-stream') ? officialEventStream(response.body, async error => {
- if (typeof body.model === 'string') await use?.onModelFailure?.(body.model, 'text', creatorServiceFailureFacts(error));
- }) : response.body;
+ const success = async () => {
+ succeeded = true;
+ if (model) { try { await use?.onModelSuccess?.(model, 'text', 'responses'); } catch {} }
+ };
+ if (bridge) response = await chatToResponses(response, bridge.tools, model);
+ if (!response.body) throw new GatewayError('invalid_gateway_response');
+ if (!response.headers.get('content-type')?.includes('text/event-stream')) {
+ const text = await response.text();
+ const payload = JSON.parse(text) as { error?: unknown; status?: string; output?: unknown[] };
+ if (payload.error) {
+ await reportFailure(creatorServiceFailureFacts(JSON.parse(text.replaceAll(modelKey, '[redacted]'))));
+ throw new GatewayError('official_service_unavailable');
+ }
+ if (payload.status === 'completed' && payload.output?.length) await success();
+ res.writeHead(200, { 'Content-Type': response.headers.get('content-type') ?? 'application/json', 'Cache-Control': 'no-store' }).end(text);
+ return;
+ }
+ res.writeHead(200, { 'Content-Type': 'text/event-stream', 'Cache-Control': 'no-store' });
+ const bodyStream = officialEventStream(response.body, async error => {
+ await reportFailure(creatorServiceFailureFacts(error));
+ }, success);
await pipeline(Readable.fromWeb(bodyStream as import('node:stream/web').ReadableStream), res);
} catch (error) {
- const status = error instanceof GatewayError && [401, 403].includes(error.status) ? error.status : 503;
- if (!res.headersSent) res.writeHead(status, { 'Content-Type': 'application/json' }).end(JSON.stringify({ error: { message: status === 401 ? 'The official model credentials expired. Sign in again.' : status === 403 ? 'The official model service is unavailable. Check your account status.' : 'The official model service is unavailable' } }));
+ if (use && !failureReported && !succeeded && !controller.signal.aborted) await reportFailure(publicFactsFromFailure(error));
+ const status = error instanceof GatewayError && error.status >= 400 && error.status <= 599 ? error.status : 503;
+ if (!res.headersSent) res.writeHead(status, { 'Content-Type': 'application/json' }).end(JSON.stringify({ error: { ...(error instanceof GatewayError ? { code: error.code } : {}), message: status === 401 ? 'The official model credentials expired. Sign in again.' : status === 403 ? 'The official model service is unavailable. Check your account status.' : 'The official model service is unavailable' } }));
else res.destroy();
} finally {
try { await release?.(); }
diff --git a/apps/daemon/src/gateway/direct-transport.ts b/apps/daemon/src/gateway/direct-transport.ts
index bc471cd3..48970d80 100644
--- a/apps/daemon/src/gateway/direct-transport.ts
+++ b/apps/daemon/src/gateway/direct-transport.ts
@@ -1,16 +1,22 @@
import { createHash } from 'node:crypto';
-import { gatewayDefaultVoiceId, gatewayVideoSizeParameters, safePublicRequestId, type GatewayModel, type PublicErrorFacts } from '@opencreator/protocol';
+import { gatewayDefaultVoiceId, gatewayModelOperations, gatewayVideoSizeParameters, safePublicRequestId, type GatewayModel, type GatewayModelOperation, type PublicErrorFacts } from '@opencreator/protocol';
import { join } from 'node:path';
import { readPrivateJsonFile, writePrivateJsonFile } from '../config/private-json-file.js';
import { GatewayError } from './client.js';
import { officialEventStream } from './official-stream.js';
import { creatorServiceFailureFacts } from '../creator-services/upstream-fetch.js';
import { publicFactsFromFailure } from '../creator/public-error-facts.js';
+import { isKnownDirectBase, isChatAnywhereBase, supplierBases } from './supplier.js';
+import { chatAnywhereImage, chatAnywhereTranscription } from './chatanywhere-media.js';
+import { chatAnywhereMediaHosts, downloadSupplierMedia, uploadSupplierMedia } from './supplier-media.js';
+import { eightyEightImageRequest, eightyEightImageResult } from './eighty-eight-image.js';
+import { eightyEightVideoRequest } from './eighty-eight-video.js';
+import { eightyEightTranscriptionRequest } from './eighty-eight-audio.js';
+import { responsesToChat, chatToResponses } from './chat-responses.js';
type Receipt = { account: string; fingerprint: string; state: 'submitting' | 'waiting_upstream' | 'succeeded' | 'failed' | 'outcome_unknown'; remoteId?: string; status?: number; mime?: string; content?: string; errorCode?: string; errorStatus?: number;
- model?: string; operation?: string; createdAt?: string; updatedAt?: string; upstreamRequestId?: string; upstreamGenerationId?: string; reportedCostUsd?: number; receivedBytes?: number; upstreamError?: PublicErrorFacts };
-const base = 'https://openrouter.ai/api/v1';
-export const DIRECT_MEDIA_ADAPTER_VERSION = 2;
+ baseUrl?: string; resultUrl?: string; model?: string; operation?: string; createdAt?: string; updatedAt?: string; upstreamRequestId?: string; upstreamGenerationId?: string; reportedCostUsd?: number; receivedBytes?: number; upstreamError?: PublicErrorFacts };
+export const DIRECT_MEDIA_ADAPTER_VERSION = 3;
export const DIRECT_IMAGE_TIMEOUT_MS = 10 * 60_000;
export function directRequestId(account: string, identity: string) {
@@ -22,6 +28,7 @@ class DirectUpstreamError extends GatewayError {
}
export type OfficialModelFailureReporter = (id: string, modality: GatewayModel['modality'], facts: PublicErrorFacts) => Promise<void>;
+export type OfficialModelSuccessReporter = (id: string, modality: GatewayModel['modality'], operation: GatewayModelOperation) => Promise<void>;
export async function errorFacts(response: Response, key: string, signal?: AbortSignal): Promise<PublicErrorFacts> {
const reader = response.body?.getReader();
@@ -47,12 +54,17 @@ function recordUpstreamMetadata(record: Receipt, value: unknown) {
if (typeof generationId === 'string') record.upstreamGenerationId = generationId;
if (typeof metadata.request_id === 'string') record.upstreamRequestId ??= safePublicRequestId(metadata.request_id);
const cost = metadata.usage?.cost;
- if (typeof cost === 'number' && Number.isFinite(cost) && cost >= 0) record.reportedCostUsd = cost;
+ if ((record.baseUrl ?? supplierBases.openrouter) === supplierBases.openrouter && typeof cost === 'number' && Number.isFinite(cost) && cost >= 0) record.reportedCostUsd = cost;
}
function recordVideoStatus(record: Receipt, value: unknown, key: string) {
- const remote = value as { status?: unknown } | null;
- if (!remote || typeof remote.status !== 'string' || !['pending', 'in_progress', 'completed', 'failed', 'cancelled', 'expired'].includes(remote.status)) throw new GatewayError('invalid_gateway_response');
+ const remote = value as { status?: unknown; url?: string; video_url?: string; result_url?: string } | null;
+ if (!remote || typeof remote.status !== 'string' || !['pending', 'queued', 'unknown', 'in_progress', 'completed', 'failed', 'cancelled', 'expired'].includes(remote.status)) throw new GatewayError('invalid_gateway_response');
+ if (record.baseUrl === supplierBases['88api'] && remote.status === 'completed') {
+ const url = remote.url ?? remote.video_url ?? remote.result_url;
+ if (typeof url !== 'string' || !url) throw new GatewayError('invalid_gateway_response');
+ record.resultUrl = url;
+ }
record.state = remote.status === 'completed' ? 'succeeded' : ['failed', 'cancelled', 'expired'].includes(remote.status) ? 'failed' : 'waiting_upstream';
recordUpstreamMetadata(record, remote);
if (record.state === 'failed') {
@@ -101,7 +113,7 @@ function completeEventStream(content: Buffer, resource?: string): boolean {
const event = JSON.parse(data) as { type?: string; error?: unknown; response?: { status?: string; error?: unknown } };
if (event.error || event.response?.error || ['error', 'response.failed', 'response.incomplete'].includes(event.type ?? '')
|| ['failed', 'incomplete', 'cancelled'].includes(event.response?.status ?? '')) return false;
- if (event.type === 'response.completed' && resource !== 'chat/completions') completed = true;
+ if (event.type === 'response.completed' && event.response?.status === 'completed' && resource !== 'chat/completions') completed = true;
} catch {}
}
return completed;
@@ -123,7 +135,7 @@ export function statelessResponses(body: Record<string, unknown>): Record<string
return { ...rest, store: false };
}
-export function createDirectTransport(root: string, fetcher: typeof fetch = fetch, recoverKey?: (account: string, failedKey: string) => Promise<string | undefined>) {
+export function createDirectTransport(root: string, fetcher: typeof fetch = fetch, recoverKey?: (account: string, failedKey: string, baseUrl: string) => Promise<string | undefined>) {
const pending = new Map<string, Promise<Response>>();
const fingerprints = new Map<string, string>();
const workers = new Map<string, AbortController>();
@@ -141,7 +153,7 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
const write = (id: string, record: Receipt) => writePrivateJsonFile(path(id), { ...record, updatedAt: new Date().toISOString() });
const response = (id: string, record: Receipt) => new Response(Buffer.from(record.content ?? '', 'base64'), { status: record.status ?? 200, headers: { 'Content-Type': record.mime ?? 'application/json', 'X-Request-ID': id } });
const accepted = (id: string) => Response.json({ requestId: id, state: 'waiting_upstream' }, { status: 202, headers: { 'X-Request-ID': id } });
- async function call(resource: string, options: RequestInit, key: string, account: string) {
+ async function call(resource: string, options: RequestInit, key: string, account: string, base: string) {
const submit = async (modelKey: string) => {
options.signal?.throwIfAborted();
const work = fetcher(`${base}/${resource}`, { ...options, redirect: 'error', headers: { ...options.headers, Authorization: `Bearer ${modelKey}` } });
@@ -155,7 +167,7 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
let result = await submit(modelKey);
if (result.status === 401 && recoverKey) {
await result.body?.cancel();
- const recovery = recoverKey(account, key);
+ const recovery = recoverKey(account, key, base);
let updated: string | undefined;
try { updated = options.signal ? await abortable(recovery, options.signal) : await recovery; }
catch (error) {
@@ -189,11 +201,22 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
for (const controller of workers.values()) controller.abort();
await Promise.allSettled(work);
},
- async request(input: { account: string; key: string; resource: string; method: string; body: unknown; contentType: string; identity: string; fingerprint: string; signal: AbortSignal; model?: GatewayModel; asyncImage?: boolean; onModelFailure?: OfficialModelFailureReporter }): Promise<Response> {
+ async request(input: { account: string; baseUrl?: string; key: string; resource: string; method: string; body: unknown; contentType: string; identity: string; fingerprint: string; signal: AbortSignal; model?: GatewayModel; asyncImage?: boolean; onModelFailure?: OfficialModelFailureReporter; onModelSuccess?: OfficialModelSuccessReporter }): Promise<Response> {
const { account, key, resource } = input;
+ const base = input.baseUrl ?? supplierBases.openrouter;
+ if (!isKnownDirectBase(base)) throw new GatewayError('invalid_gateway_response');
+ const eightyEight = base === supplierBases['88api'];
+ const chatAnywhere = isChatAnywhereBase(base);
+ const openRouter = base === supplierBases.openrouter;
+ if (chatAnywhere && /^(?:video|videos)\//.test(resource)) throw new GatewayError('capability_unsupported', 400);
const notify = async (id: string | undefined, modality: GatewayModel['modality'], facts: PublicErrorFacts | undefined) => {
if (id && facts) { try { await input.onModelFailure?.(id, modality, facts); } catch {} }
};
+ const success = async (id: string | undefined, modality: GatewayModel['modality'], operation: string | undefined) => {
+ if (id && gatewayModelOperations.includes(operation as GatewayModelOperation)) {
+ try { await input.onModelSuccess?.(id, modality, operation as GatewayModelOperation); } catch {}
+ }
+ };
const asyncImage = input.asyncImage === true && /^images\/(generations|edits)$/.test(resource) && input.method === 'POST';
const controller = asyncImage ? new AbortController() : undefined;
const signal = controller ? AbortSignal.any([controller.signal, AbortSignal.timeout(DIRECT_IMAGE_TIMEOUT_MS)]) : input.signal;
@@ -205,12 +228,30 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
record.state = 'outcome_unknown'; await write(id, record);
}
if (record.remoteId) {
+ if ((record.baseUrl ?? supplierBases.openrouter) !== base) throw new GatewayError('operation_conflict', 409);
if (lookup[2]) {
if (record.state !== 'succeeded') throw new GatewayError('request_outcome_unknown', 409);
- return call(`videos/${encodeURIComponent(record.remoteId)}/content?index=0`, { method: 'GET', signal }, key, account);
+ const content = eightyEight
+ ? await downloadSupplierMedia(fetcher, record.resultUrl ?? '', signal, 512 * 1024 * 1024)
+ : await call(`videos/${encodeURIComponent(record.remoteId)}/content?index=0`, { method: 'GET', signal }, key, account, base);
+ if (!content.body || !content.headers.get('content-type')?.startsWith('video/')) throw new GatewayError('invalid_gateway_response');
+ const reader = content.body.getReader();
+ let bytes = 0;
+ return new Response(new ReadableStream<Uint8Array>({
+ async pull(controller) {
+ try {
+ const item = await abortable(reader.read(), signal);
+ if (item.done) {
+ if (!bytes) throw new GatewayError('invalid_gateway_response');
+ await success(record.model, 'video', 'video/jobs'); controller.close();
+ } else { bytes += item.value.length; controller.enqueue(item.value); }
+ } catch (error) { await reader.cancel().catch(() => undefined); controller.error(error); }
+ },
+ cancel() { return reader.cancel(); }
+ }), { status: content.status, headers: content.headers });
}
let remote: unknown;
- try { remote = await (await call(`videos/${encodeURIComponent(record.remoteId)}`, { method: 'GET', signal }, key, account)).json(); }
+ try { remote = await (await call(`videos/${encodeURIComponent(record.remoteId)}`, { method: 'GET', signal }, key, account, base)).json(); }
catch (error) { if (error instanceof DirectUpstreamError) await notify(record.model, 'video', error.facts); throw error; }
recordVideoStatus(record, remote, key);
await write(id, record);
@@ -223,7 +264,7 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
const id = directRequestId(account, input.identity);
const existing = pending.get(id);
if (existing) {
- if (fingerprints.get(id) !== input.fingerprint) throw new GatewayError('operation_conflict', 409);
+ if (fingerprints.get(id) !== JSON.stringify([base, input.fingerprint])) throw new GatewayError('operation_conflict', 409);
if (asyncImage) return accepted(id);
await existing; return this.request(input);
}
@@ -231,15 +272,45 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
const ready = new Promise<void>(resolve => { registered = resolve; });
const work = (async () => {
const saved = await read(id);
- if (saved && (saved.account !== account || saved.fingerprint !== input.fingerprint)) throw new GatewayError('operation_conflict', 409);
+ if (saved && (saved.account !== account || saved.fingerprint !== input.fingerprint || (saved.baseUrl ?? supplierBases.openrouter) !== base)) throw new GatewayError('operation_conflict', 409);
if (saved?.remoteId) return Response.json({ requestId: id, state: saved.state }, { status: 202, headers: { 'X-Request-ID': id } });
if (saved?.state === 'succeeded') return response(id, saved);
if (saved && saved.state !== 'failed') throw new GatewayError('request_outcome_unknown', 409);
let body = input.body;
let endpoint = resource;
let contentType = input.contentType;
+ let chatBridge: ReturnType<typeof responsesToChat> | undefined;
+ const upload = (bytes: Buffer, mime: string) => uploadSupplierMedia(bytes, mime, fetcher,
+ body => call('media/uploads', { method: 'POST', signal, headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) }, key, account, base), signal);
+ let requiresTimestamps = false;
+ if (resource === 'audio/transcriptions') {
+ const transcription = Buffer.isBuffer(body)
+ ? await new Request('http://localhost', { method: 'POST', headers: { 'Content-Type': contentType }, body: new Uint8Array(body) }).formData()
+ : undefined;
+ requiresTimestamps ||= (transcription?.get('response_format') ?? (body as Record<string, unknown>)?.response_format) === 'verbose_json';
+ if (eightyEight && requiresTimestamps) throw new GatewayError('capability_unsupported', 400);
+ if (eightyEight) {
+ const native = await eightyEightTranscriptionRequest(body, contentType);
+ body = native.body; contentType = native.contentType;
+ }
+ if (chatAnywhere) {
+ const native = await chatAnywhereTranscription(body, contentType);
+ body = native.body; contentType = native.contentType;
+ }
+ }
if (resource === 'responses') body = statelessResponses(body as Record<string, unknown>);
- if (resource === 'images/edits') {
+ if (resource === 'responses' && input.model?.capabilities.includes('responses_via_chat')) {
+ chatBridge = responsesToChat(body as Record<string, unknown>); body = chatBridge.body; endpoint = 'chat/completions';
+ }
+ if (eightyEight && /^images\/(generations|edits)$/.test(resource)) {
+ const native = await eightyEightImageRequest(resource, body, contentType, input.model, upload);
+ body = native.body; contentType = native.contentType; endpoint = native.resource;
+ }
+ if (chatAnywhere && /^images\/(generations|edits)$/.test(resource)) {
+ const native = await chatAnywhereImage(resource, body, contentType, input.model);
+ body = native.body; contentType = native.contentType;
+ }
+ if (resource === 'images/edits' && openRouter) {
const form = await new Request('http://localhost', { method: 'POST', headers: { 'Content-Type': contentType }, body: new Uint8Array(body as Buffer) }).formData();
const fields: Record<string, unknown> = {}; const references: unknown[] = [];
for (const [name, value] of form.entries()) {
@@ -248,7 +319,9 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
}
body = { ...fields, input_references: references }; contentType = 'application/json'; endpoint = 'images';
}
- if (resource === 'images/generations') endpoint = 'images';
+ if (resource === 'images/generations') {
+ if (openRouter) endpoint = 'images';
+ }
if (endpoint === 'images') {
const { response_format: _format, size, quality, aspect_ratio, resolution, output_format, stream, ...fields } = body as Record<string, unknown>;
const options = input.model?.imageOptions;
@@ -268,17 +341,25 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
body = { ...fields, stream: false, ...(aspectRatio ? { aspect_ratio: aspectRatio } : {}), ...(resolution ? { resolution } : {}), ...(quality ? { quality } : {}), ...(outputFormat ? { output_format: outputFormat } : {}) };
}
if (resource === 'audio/speech') {
- const { voice, ...fields } = body as Record<string, unknown>;
- const format = input.model?.capabilities.includes('pcm_speech') ? 'pcm' : 'mp3';
- if (input.model?.verification && (typeof fields.input !== 'string' || !fields.input.trim()
- || (fields.speed !== undefined && fields.speed !== 1) || fields.instructions !== undefined
- || (!input.model.capabilities.includes('default_voice') && (typeof voice !== 'string' || !input.model.voices?.includes(voice))))) throw new GatewayError('capability_unsupported', 400);
+ const { voice, response_format: _format, ...fields } = body as Record<string, unknown>;
+ // OpenCreator consumes the actual audio MIME; native encoding also supports PCM-only providers.
+ const format = eightyEight ? 'wav' : input.model?.capabilities.includes('pcm_speech') ? 'pcm' : undefined;
+ if (eightyEight && Buffer.byteLength(String(fields.input ?? '') + String(fields.instructions ?? '') + (fields.speed === undefined ? '' : `Speak at ${fields.speed}x speed.`), 'utf8') > 8000) throw new GatewayError('capability_unsupported', 400);
+ if (typeof fields.input !== 'string' || !fields.input.trim()
+ || (fields.speed !== undefined && (eightyEight ? typeof fields.speed !== 'number' || fields.speed < 0.25 || fields.speed > 4 : fields.speed !== 1))
+ || (fields.instructions !== undefined && (!eightyEight || typeof fields.instructions !== 'string'))
+ || (input.model?.voices?.length && !input.model.capabilities.includes('default_voice')
+ && (typeof voice !== 'string' || !input.model.voices.includes(voice)))) throw new GatewayError('capability_unsupported', 400);
if (input.model?.capabilities.includes('default_voice')) {
if (voice && voice !== gatewayDefaultVoiceId) throw new GatewayError('capability_unsupported', 400);
- body = { ...fields, response_format: format };
- } else body = { ...fields, voice, response_format: format };
+ body = { ...fields, ...(format ? { response_format: format } : {}) };
+ } else body = { ...fields, voice, ...(format ? { response_format: format } : {}) };
}
if (resource === 'video/jobs' || resource === 'videos/tasks') {
+ if (eightyEight) {
+ body = await eightyEightVideoRequest(body as Record<string, unknown>, input.model, upload);
+ endpoint = 'videos';
+ } else {
const value = body as { model: string; prompt: string; duration?: number; size?: string; image?: string };
const sizeParams = input.model ? gatewayVideoSizeParameters(input.model, value.size ?? '') : value.size ? { size: value.size } : {};
if (!sizeParams || typeof value.model !== 'string' || !value.model || typeof value.prompt !== 'string' || !value.prompt.trim()
@@ -286,14 +367,17 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
|| (input.model?.durations && !input.model.durations.includes(value.duration!))) throw new GatewayError('capability_unsupported', 400);
if (value.image !== undefined && (typeof value.image !== 'string' || !value.image)) throw new GatewayError('capability_unsupported', 400);
if (value.image && input.model && !input.model.capabilities.includes('image_to_video')) throw new GatewayError('capability_unsupported', 400);
- body = { model: value.model, prompt: value.prompt, duration: value.duration, ...sizeParams, ...(value.image ? { frame_images: [{ type: 'image_url', image_url: { url: value.image }, frame_type: 'first_frame' }] } : {}) };
+ body = { model: value.model, prompt: value.prompt, duration: value.duration, ...sizeParams, ...(value.image ? eightyEight ? { images: [value.image] } : { frame_images: [{ type: 'image_url', image_url: { url: value.image }, frame_type: 'first_frame' }] } : {}) };
endpoint = 'videos';
+ }
}
const record: Receipt = { account, fingerprint: input.fingerprint, state: asyncImage ? 'waiting_upstream' : 'submitting', operation: resource, model: input.model?.id ?? (body && typeof body === 'object' && 'model' in body && typeof body.model === 'string' ? body.model : undefined), createdAt: new Date().toISOString() };
+ record.baseUrl = base;
await write(id, record);
registered();
try {
- const remote = await call(endpoint, { method: 'POST', signal, headers: { 'Content-Type': contentType }, body: Buffer.isBuffer(body) ? new Uint8Array(body) : JSON.stringify(body) }, key, account);
+ let remote = await call(endpoint, { method: 'POST', signal, headers: { 'Content-Type': contentType }, body: Buffer.isBuffer(body) ? new Uint8Array(body) : JSON.stringify(body) }, key, account, base);
+ if (chatBridge) remote = await chatToResponses(remote, chatBridge.tools, input.model?.id);
record.upstreamRequestId = safePublicRequestId(remote.headers.get('x-request-id') ?? undefined);
recordUpstreamMetadata(record, { generation_id: remote.headers.get('x-generation-id') });
record.status = remote.status;
@@ -327,19 +411,42 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
} finally { record.receivedBytes = size; void reader.cancel().catch(() => undefined); }
let content: Buffer = Buffer.concat(chunks);
if (endpoint === 'audio/speech' && /^audio\/pcm(?:;|$)/i.test(record.mime)) {
- content = pcmWave(content, record.mime); record.mime = 'audio/wav';
+ content = pcmWave(content, eightyEight ? 'audio/pcm;rate=24000;channels=1' : record.mime); record.mime = 'audio/wav';
}
record.content = content.toString('base64');
+ let payload: Record<string, unknown> | undefined;
+ if (record.mime.includes('application/json')) {
+ try { payload = JSON.parse(content.toString('utf8')); } catch {}
+ if (payload?.error) {
+ record.content = Buffer.from(content.toString('utf8').replaceAll(key, '[redacted]')).toString('base64');
+ const facts = creatorServiceFailureFacts(JSON.parse(content.toString('utf8').replaceAll(key, '[redacted]')), undefined, { requestId: record.upstreamRequestId });
+ const status = Number(facts.upstreamCode);
+ throw new DirectUpstreamError('official_service_unavailable', [400, 401, 402, 403, 404, 422, 429].includes(status) ? status : 503, facts);
+ }
+ }
+ if (endpoint === 'audio/speech' && (!content.length || record.mime.includes('application/json'))) throw new GatewayError('invalid_gateway_response');
if (endpoint === 'audio/transcriptions') {
+ if (!payload || typeof payload.text !== 'string') throw new GatewayError('invalid_gateway_response');
try { recordUpstreamMetadata(record, JSON.parse(content.toString('utf8'))); } catch {}
- if (input.model?.capabilities.includes('subtitle_timestamps')) {
+ if (requiresTimestamps) {
const value = JSON.parse(content.toString('utf8')) as { text?: unknown; words?: Array<{ word?: unknown; start?: unknown; end?: unknown }>; segments?: Array<{ text?: unknown; start?: unknown; end?: unknown }> };
const timings = [...(Array.isArray(value.words) ? value.words.map(word => ({ ...word, text: word.word })) : []), ...(Array.isArray(value.segments) ? value.segments : [])];
if (typeof value.text !== 'string' || !value.text.trim() || !timings.some(item => typeof item?.text === 'string' && item.text.trim()
&& typeof item.start === 'number' && Number.isFinite(item.start) && item.start >= 0 && typeof item.end === 'number' && Number.isFinite(item.end) && item.end > item.start)) throw new GatewayError('invalid_gateway_response');
}
}
- if (endpoint === 'images') {
+ if (endpoint === 'images' || ((eightyEight || chatAnywhere) && /^images\//.test(resource))) {
+ if (eightyEight && payload) payload = eightyEightImageResult(payload);
+ if ((eightyEight || chatAnywhere) && payload && Array.isArray(payload.data)) {
+ for (const item of payload.data as Array<{ b64_json?: string; url?: string }>) {
+ if (!item.b64_json && typeof item.url === 'string') {
+ const image = await downloadSupplierMedia(fetcher, item.url, signal, 64 * 1024 * 1024, chatAnywhere ? chatAnywhereMediaHosts : undefined);
+ if (!image.headers.get('content-type')?.startsWith('image/')) throw new GatewayError('invalid_gateway_response');
+ item.b64_json = Buffer.from(await image.arrayBuffer()).toString('base64'); delete item.url;
+ }
+ }
+ content = Buffer.from(JSON.stringify(payload)); record.content = content.toString('base64');
+ }
try { recordUpstreamMetadata(record, JSON.parse(content.toString('utf8'))); } catch {}
if (!completeImageResponse(content)) {
record.content = Buffer.from(content.toString('utf8').replaceAll(key, '[redacted]')).toString('base64');
@@ -348,6 +455,9 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
}
}
record.state = 'succeeded'; await write(id, record);
+ const validText = resource === 'responses' ? payload?.status === 'completed' && Array.isArray(payload.output) && payload.output.length > 0
+ : endpoint === 'chat/completions' ? Array.isArray(payload?.choices) && payload.choices.some(choice => choice.finish_reason === 'stop' || choice.finish_reason === 'tool_calls') : true;
+ if (validText) await success(record.model, input.model?.modality ?? 'text', resource);
return response(id, record);
}
let settlement = Promise.resolve();
@@ -357,6 +467,7 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
record.state = content ? 'succeeded' : 'outcome_unknown';
if (content) record.content = content.toString('base64');
await write(id, record);
+ if (content) await success(record.model, 'text', resource);
});
return settlement;
};
@@ -398,12 +509,12 @@ export function createDirectTransport(root: string, fetcher: typeof fetch = fetc
if (error instanceof DirectUpstreamError) { record.upstreamError = error.facts; record.upstreamRequestId ??= error.facts.requestId; }
else record.upstreamError ??= publicFactsFromFailure(error, undefined, { timedOut: signal.aborted && signal.reason instanceof DOMException && signal.reason.name === 'TimeoutError' });
await write(id, record);
- if (error instanceof DirectUpstreamError) await notify(record.model, input.model?.modality ?? 'text', error.facts);
+ await notify(record.model, input.model?.modality ?? 'text', record.upstreamError);
throw error;
}
})();
pending.set(id, work);
- fingerprints.set(id, input.fingerprint);
+ fingerprints.set(id, JSON.stringify([base, input.fingerprint]));
if (controller) workers.set(id, controller);
void work.finally(() => { pending.delete(id); fingerprints.delete(id); workers.delete(id); }).catch(() => undefined);
return asyncImage ? Promise.race([ready.then(() => accepted(id)), work]) : work;
diff --git a/apps/daemon/src/gateway/eighty-eight-audio.ts b/apps/daemon/src/gateway/eighty-eight-audio.ts
new file mode 100644
index 00000000..e2fb0647
--- /dev/null
+++ b/apps/daemon/src/gateway/eighty-eight-audio.ts
@@ -0,0 +1,13 @@
+import { GatewayError } from './client.js';
+
+export async function eightyEightTranscriptionRequest(body: unknown, contentType: string) {
+ if (!Buffer.isBuffer(body)) throw new GatewayError('capability_unsupported', 400);
+ const form = await new Request('http://localhost', { method: 'POST', headers: { 'Content-Type': contentType }, body: new Uint8Array(body) }).formData();
+ const file = form.get('file'); const model = form.get('model'); const format = form.get('response_format');
+ if (!file || typeof file === 'string' || !file.size || file.size > 15_000_000 || typeof model !== 'string' || !model
+ || format && !['json', 'text'].includes(String(format)) || [...form.keys()].some(k => k.startsWith('timestamp_granularities'))) throw new GatewayError('capability_unsupported', 400);
+ const converted = new FormData(); converted.set('file', file); converted.set('model', model);
+ const prompt = form.get('prompt'); if (typeof prompt === 'string') converted.set('prompt', prompt);
+ const request = new Request('http://localhost', { method: 'POST', body: converted });
+ return { body: Buffer.from(await request.arrayBuffer()), contentType: request.headers.get('content-type')! };
+}
diff --git a/apps/daemon/src/gateway/eighty-eight-image.ts b/apps/daemon/src/gateway/eighty-eight-image.ts
new file mode 100644
index 00000000..ee39234b
--- /dev/null
+++ b/apps/daemon/src/gateway/eighty-eight-image.ts
@@ -0,0 +1,100 @@
+import type { GatewayModel } from '@opencreator/protocol';
+import { GatewayError } from './client.js';
+import { publicMediaReference, type MediaUploader } from './supplier-media.js';
+
+const imageSizes: Record<string, string> = { '1:1': '1024x1024', '3:2': '1536x1024', '2:3': '1024x1536' };
+const unsupported = () => new GatewayError('capability_unsupported', 400);
+
+export async function eightyEightImageRequest(resource: string, body: unknown, contentType: string, model?: GatewayModel, upload?: MediaUploader) {
+ const form = resource === 'images/edits' && Buffer.isBuffer(body)
+ ? await new Request('http://localhost', { method: 'POST', headers: { 'Content-Type': contentType }, body: new Uint8Array(body) }).formData() : undefined;
+ const fields: Record<string, unknown> = form ? Object.fromEntries([...form].filter(([, v]) => typeof v === 'string')) : { ...(body as Record<string, unknown>) };
+ if (form) fields.n = Number(form.get('n') ?? 1);
+ const { aspect_ratio, resolution, size, ...native } = fields;
+ const options = model?.imageOptions;
+ const id = String(native.model ?? ''); const lower = id.toLowerCase();
+ const count = native.n ?? 1;
+ const valid = (v: unknown, allowed?: string[]) => v === undefined || v === '' || typeof v === 'string' && !!allowed?.includes(v);
+ if (!id || model && id !== model.id || typeof native.prompt !== 'string' || !native.prompt.trim()
+ || native.stream !== undefined && native.stream !== false || typeof count !== 'number' || !Number.isInteger(count) || count < 1 || count > (options?.maxImages ?? 10)
+ || options && (!valid(aspect_ratio, options.aspectRatios) || !valid(resolution, options.resolutions) || !valid(native.quality, options.qualities) || !valid(native.output_format, options.outputFormats))) throw unsupported();
+ const files = form ? [...form].filter(([name, value]) => ['image', 'image[]'].includes(name) && typeof value !== 'string').map(([, v]) => v as File) : [];
+ const refs = Array.isArray(native.images) ? native.images : native.image ? [native.image] : [];
+ if (files.length + refs.length > (options?.maxReferences ?? 16) || (files.length + refs.length > 0 && model && !model.capabilities.includes('edit'))
+ || (resource === 'images/edits' || model?.capabilities.includes('reference_required')) && !files.length && !refs.length) throw unsupported();
+ delete native.stream; delete native.image; delete native.images;
+ if (lower.startsWith('gemini-')) {
+ if (count !== 1 || aspect_ratio || resolution || native.quality || native.output_format) throw unsupported();
+ const images = [...refs];
+ for (const file of files) images.push(`data:${file.type || 'image/png'};base64,${Buffer.from(await file.arrayBuffer()).toString('base64')}`);
+ if (images.some(v => typeof v !== 'string')) throw unsupported();
+ return { resource: 'chat/completions', body: { model: id, stream: false, messages: [{ role: 'user', content: images.length
+ ? [{ type: 'text', text: native.prompt }, ...images.map(url => ({ type: 'image_url', image_url: { url } }))] : native.prompt }] }, contentType: 'application/json' };
+ }
+ if (lower.startsWith('midjourney-')) {
+ if (count !== 1 || files.length || refs.length || resolution || native.quality || native.output_format) throw unsupported();
+ let prompt = native.prompt;
+ const existing = /--(?:ar|aspect)\s+(\d+:\d+)\b/.exec(prompt)?.[1];
+ if (aspect_ratio && existing && aspect_ratio !== existing) throw unsupported();
+ if (aspect_ratio && !existing) prompt += ` --ar ${aspect_ratio}`;
+ return { resource: 'images/generations', body: { model: id, prompt }, contentType: 'application/json' };
+ }
+ native.n = count; native.response_format = 'b64_json';
+ if (lower.includes('seedream')) {
+ if (resolution && native.quality && resolution !== native.quality) throw unsupported();
+ native.size = resolution || (['1K', '2K'].includes(String(size)) ? size : undefined) || native.quality || '1K';
+ if (files.length > 1 || refs.length) {
+ if (!upload) throw unsupported();
+ const images = await Promise.all(refs.map(ref => publicMediaReference(ref, upload)));
+ for (const file of files) images.push(await upload(Buffer.from(await file.arrayBuffer()), file.type || 'image/png'));
+ native.images = images;
+ return { resource: 'images/generations', body: native, contentType: 'application/json' };
+ }
+ } else if (lower.startsWith('gpt-image-')) {
+ if (resolution && resolution !== '1K' || aspect_ratio && !imageSizes[String(aspect_ratio)]) throw unsupported();
+ native.size = aspect_ratio ? imageSizes[String(aspect_ratio)] : size || '1024x1024';
+ if (!['auto', ...Object.values(imageSizes)].includes(String(native.size))) throw unsupported();
+ } else if (lower.startsWith('grok-imagine-')) {
+ if (resolution || aspect_ratio || native.quality || native.output_format) throw unsupported();
+ if (size) native.size = size;
+ } else throw unsupported();
+ if (refs.length) native.images = refs;
+ if (!files.length) return { resource, body: native, contentType: 'application/json' };
+ const converted = new FormData();
+ for (const [name, value] of Object.entries(native)) converted.set(name, String(value));
+ for (const file of files) converted.append(files.length > 1 ? 'image[]' : 'image', file);
+ const request = new Request('http://localhost', { method: 'POST', body: converted });
+ return { resource: 'images/edits', body: Buffer.from(await request.arrayBuffer()), contentType: request.headers.get('content-type')! };
+}
+
+export function eightyEightImageResult(payload: Record<string, unknown>): Record<string, unknown> {
+ if (Array.isArray(payload.data)) return payload;
+ const data: Array<{ b64_json?: string; url?: string }> = [];
+ const seen = new Set<string>();
+ const address = (value: unknown) => {
+ if (typeof value !== 'string' || seen.has(value)) return;
+ const match = /^data:image\/[a-z0-9.+-]+;base64,([A-Za-z0-9+/=]+)$/i.exec(value);
+ if (match) data.push({ b64_json: match[1] });
+ else if (value.startsWith('https://')) data.push({ url: value });
+ else return;
+ seen.add(value);
+ };
+ const visit = (value: unknown, depth = 0) => {
+ if (depth > 8 || !value) return;
+ if (typeof value === 'string') {
+ if (value.startsWith('data:image/')) address(value);
+ for (const match of value.matchAll(/!\[[^\]]*\]\((data:image\/[^\s)]+|https:\/\/[^\s)]+)\)/g)) address(match[1]);
+ } else if (Array.isArray(value)) value.forEach(v => visit(v, depth + 1));
+ else if (typeof value === 'object') {
+ const item = value as Record<string, any>;
+ if (typeof item.b64_json === 'string') data.push({ b64_json: item.b64_json });
+ if ((item.inlineData?.mimeType ?? item.inline_data?.mime_type)?.startsWith('image/')) data.push({ b64_json: item.inlineData?.data ?? item.inline_data?.data });
+ address(typeof item.image_url === 'string' ? item.image_url : item.image_url?.url);
+ if (['image_url', 'output_image', 'image'].includes(item.type)) address(item.url);
+ for (const key of ['content', 'images', 'parts']) visit(item[key], depth + 1);
+ }
+ };
+ const choices = payload.choices as Array<{ message?: unknown }> | undefined;
+ visit(choices?.[0]?.message);
+ return { ...payload, data };
+}
diff --git a/apps/daemon/src/gateway/eighty-eight-video.ts b/apps/daemon/src/gateway/eighty-eight-video.ts
new file mode 100644
index 00000000..03cca611
--- /dev/null
+++ b/apps/daemon/src/gateway/eighty-eight-video.ts
@@ -0,0 +1,76 @@
+import { gatewayVideoSizeParameters, type GatewayModel } from '@opencreator/protocol';
+import { GatewayError } from './client.js';
+import { publicMediaReference, type MediaUploader } from './supplier-media.js';
+
+export async function eightyEightVideoRequest(value: Record<string, unknown>, model: GatewayModel | undefined, upload: MediaUploader) {
+ const fail = () => { throw new GatewayError('capability_unsupported', 400); };
+ const id = typeof value.model === 'string' ? value.model : ''; const lower = id.toLowerCase();
+ const { size, image, images, seconds, metadata, ...body } = value;
+ if (!id || model && model.id !== id || typeof body.prompt !== 'string') fail();
+ if (size) {
+ const parameters = model ? gatewayVideoSizeParameters(model, String(size)) : { size };
+ if (!parameters) fail();
+ Object.assign(body, parameters);
+ }
+ if (seconds !== undefined && body.duration !== undefined) fail();
+ const duration = body.duration ?? (seconds !== undefined ? Number(seconds) : undefined);
+ const automatic = duration === -1 && (lower.startsWith('wan') || lower.startsWith('doubao-'));
+ if (duration !== undefined && (!Number.isInteger(duration) || !automatic && (Number(duration) < 1 || model?.durations?.length && !model.durations.includes(Number(duration))))) fail();
+ if (duration !== undefined) body.duration = duration;
+ const ratio = body.ratio ?? body.aspect_ratio;
+ if (body.ratio && body.aspect_ratio && body.ratio !== body.aspect_ratio) fail();
+ if (ratio && ratio !== 'adaptive' && model?.aspectRatios?.length && !model.aspectRatios.includes(String(ratio))) fail();
+ if (ratio === 'adaptive' && !lower.startsWith('wan') && !lower.startsWith('doubao-')) fail();
+ if (body.resolution && model?.resolutions?.length && !model.resolutions.includes(String(body.resolution).toLowerCase())) fail();
+ delete body.aspect_ratio; delete body.ratio;
+ if (ratio) body[lower.startsWith('grok-') ? 'aspect_ratio' : 'ratio'] = ratio;
+ else if (lower.startsWith('sd2.5')) body.ratio = '16:9';
+ const refs = images === undefined ? image === undefined ? [] : [image] : Array.isArray(images) ? [...images] : fail();
+ if (image !== undefined && images !== undefined) fail();
+ const meta = metadata === undefined ? {} : metadata && typeof metadata === 'object' && !Array.isArray(metadata) ? { ...metadata as Record<string, unknown> } : fail();
+ const newer = lower.includes('2.5') || lower.includes('2-5');
+ const maxImages = lower.startsWith('grok-') ? 1 : lower.startsWith('veo-') ? 3 : lower.startsWith('gemini-omni') ? 10 : lower.startsWith('kling') || newer ? 30 : lower.startsWith('wan') ? 10 : 9;
+ if (refs.length > maxImages || refs.length && model && !model.capabilities.includes('image_to_video')) fail();
+ if (refs.length) body.images = await Promise.all(refs.map(ref => publicMediaReference(ref, upload)));
+ for (const key of ['referenceVideos', 'referenceAudios']) {
+ if (meta[key] !== undefined) {
+ if (!Array.isArray(meta[key])) fail();
+ meta[key] = await Promise.all((meta[key] as unknown[]).map(ref => publicMediaReference(ref, upload)));
+ }
+ }
+ for (const key of ['firstFrame', 'lastFrame']) if (meta[key] !== undefined) meta[key] = await publicMediaReference(meta[key], upload);
+ for (const key of ['first_frame', 'last_frame', 'input_reference']) if (body[key] !== undefined) body[key] = await publicMediaReference(body[key], upload);
+ if (lower.startsWith('gemini-omni') && meta.referenceVideos !== undefined) {
+ if (body.video || body.videos) fail();
+ body.videos = meta.referenceVideos; delete meta.referenceVideos;
+ }
+ if (body.video !== undefined) body.video = await publicMediaReference(body.video, upload);
+ if (body.videos !== undefined) {
+ if (!Array.isArray(body.videos)) fail();
+ body.videos = await Promise.all((body.videos as unknown[]).map(ref => publicMediaReference(ref, upload)));
+ }
+ if (lower.startsWith('grok-') && (Object.keys(meta).length || body.video || body.videos || body.generate_audio !== undefined || body.generateAudio !== undefined)) fail();
+ if (lower.startsWith('veo-') && (refs.length === 3 || meta.video_mode === 'reference' || body.task === 'reference_to_video') && duration !== undefined && duration !== 8) fail();
+ if ((lower.startsWith('veo-') || lower.startsWith('gemini-omni')) && meta.referenceAudios !== undefined) fail();
+ if (body.task === 'extend' && (lower.startsWith('veo-') || lower.startsWith('gemini-omni'))) {
+ if (duration !== undefined || ratio || size || lower.startsWith('veo-') && body.resolution !== undefined || !body.video) fail();
+ }
+ if (lower.startsWith('wan')) {
+ const media = body.media === undefined ? [] : Array.isArray(body.media) ? [...body.media] : fail();
+ if (refs.length) media.push(...(body.images as string[]).map(url => ({ type: 'first_frame', url })));
+ delete body.images;
+ for (const [key, type] of [['firstFrame', 'first_frame'], ['lastFrame', 'last_frame'], ['referenceVideos', 'reference_video'], ['referenceAudios', 'reference_audio']] as const) {
+ if (meta[key]) for (const url of Array.isArray(meta[key]) ? meta[key] as unknown[] : [meta[key]]) media.push({ type, url });
+ delete meta[key];
+ }
+ const counts: Record<string, number> = {};
+ const limits: Record<string, number> = { first_frame: 1, last_frame: 1, reference_image: 10, reference_video: 5, reference_audio: 5 };
+ body.media = await Promise.all(media.map(async item => {
+ if (!item || typeof item !== 'object' || !(item.type in limits) || (counts[item.type] = (counts[item.type] ?? 0) + 1) > limits[item.type]!) fail();
+ return { type: item.type, url: await publicMediaReference(item.url, upload) };
+ }));
+ if (counts.last_frame && !counts.first_frame || counts.first_frame && Object.keys(counts).some(t => t.startsWith('reference_'))) fail();
+ } else if (body.media !== undefined) fail();
+ if (Object.keys(meta).length) body.metadata = meta;
+ return body;
+}
diff --git a/apps/daemon/src/gateway/model-access.ts b/apps/daemon/src/gateway/model-access.ts
index 52430914..f6b26308 100644
--- a/apps/daemon/src/gateway/model-access.ts
+++ b/apps/daemon/src/gateway/model-access.ts
@@ -2,26 +2,36 @@ import { createHash } from 'node:crypto';
import { isIP } from 'node:net';
import { join } from 'node:path';
import { z } from 'zod';
-import type { GatewayModel, PublicErrorFacts } from '@opencreator/protocol';
+import { gatewayModelOperations, gatewayModelCompatible, gatewayModelReady, type GatewayModel, type GatewayModelAvailability, type GatewayModelOperation, type PublicErrorFacts } from '@opencreator/protocol';
import { readPrivateJsonFile, writePrivateJsonFile } from '../config/private-json-file.js';
-import { probeCredentialsSchema, type GatewayBootstrap, type GatewayProbeCredentials } from './client.js';
+import { catalogSchema, type GatewayBootstrap } from './client.js';
+import { imageModelsSchema, officialCatalogModels, openRouterModelSchema, videoModelsSchema } from './openrouter-model-catalog.js';
-const allowedTTL = 24 * 60 * 60_000;
const blockedTTL = 60 * 60_000;
-const retryTTL = 5 * 60_000;
-const entrySchema = z.object({
+const catalogTTL = 5 * 60_000;
+const successTTL = 5 * 60_000;
+const retryTTL = 30_000;
+const legacyEntrySchema = z.object({
status: z.enum(['allowed', 'blocked', 'unknown']), profile: z.string(),
nextCheck: z.number(), validUntil: z.number()
});
-const cacheSchema = z.object({
+const legacyCacheSchema = z.object({
version: z.literal(2), base: z.string(), network: z.string(), country: z.string(),
- models: z.record(entrySchema), catalogIDs: z.array(z.string()), catalogExpiresAt: z.number()
+ models: z.record(legacyEntrySchema), catalogIDs: z.array(z.string()), catalogExpiresAt: z.number()
+});
+const cacheSchema = z.object({
+ version: z.literal(3), base: z.string(), network: z.string(), country: z.string(),
+ models: z.record(z.object({ profile: z.string(), blockedUntil: z.number() })),
+ catalogIDs: z.array(z.string()), catalogExpiresAt: z.number(),
+ catalogModels: z.array(catalogSchema.shape.models.element).optional(),
+ successes: z.record(z.object({ profile: z.string(), operation: z.enum(gatewayModelOperations), checkedAt: z.number(), validUntil: z.number() })).default({})
});
type AccessCache = z.infer<typeof cacheSchema>;
const digest = (value: unknown) => createHash('sha256').update(JSON.stringify(value)).digest('hex');
const modelKey = (model: Pick<GatewayModel, 'id' | 'modality'>) => `${model.modality}:${model.id}`;
const profileKey = ({ name: _name, ...model }: GatewayModel) => digest(model);
-const emptyCache = (base = ''): AccessCache => ({ version: 2, base, network: '', country: '', models: {}, catalogIDs: [], catalogExpiresAt: 0 });
+const accountScope = (bootstrap: GatewayBootstrap) => digest([bootstrap.baseUrl, bootstrap.account.id, bootstrap.keyVersion, bootstrap.modelKey]);
+const emptyCache = (base = ''): AccessCache => ({ version: 3, base, network: '', country: '', models: {}, successes: {}, catalogIDs: [], catalogExpiresAt: 0 });
export function modelAccessGroup(model: GatewayModel): string | undefined {
const [vendor, slug] = model.id.replace(/^~/, '').split('/');
@@ -32,12 +42,17 @@ export function modelAccessGroup(model: GatewayModel): string | undefined {
}
export function officialModelPolicy(models: GatewayModel[]) {
- return models.filter(model => modelAccessGroup(model) !== 'anthropic'
+ // Account catalog availability does not override OpenCreator's adapter compatibility.
+ return models.filter(model => model.vendor?.toLowerCase() !== 'anthropic' && !/^claude-/i.test(model.id) && modelAccessGroup(model) !== 'anthropic'
&& !model.id.endsWith(':batch')
&& !(model.modality === 'text' && modelAccessGroup(model) === 'openrouter'));
}
export function withModelCatalog(bootstrap: GatewayBootstrap, models: GatewayModel[]): GatewayBootstrap {
+ if (bootstrap.transport === 'gateway') {
+ const defaults = Object.fromEntries(Object.entries(bootstrap.defaults).filter(([key]) => !['textProcessing', 'subtitle'].includes(key)));
+ return { ...bootstrap, models: officialModelPolicy(models).filter(gatewayModelCompatible), defaults };
+ }
const defaults: Record<string, string> = {};
for (const model of models) {
if (model.modality === 'text' && !model.capabilities.includes('responses')) continue;
@@ -48,160 +63,250 @@ export function withModelCatalog(bootstrap: GatewayBootstrap, models: GatewayMod
// Only model access failures affect admission. Quota, content policy and outages do not.
export function isModelAccessFailure(facts: PublicErrorFacts): boolean {
- const status = facts.httpStatus ?? Number(facts.upstreamCode);
+ const status = facts.httpStatus && facts.httpStatus >= 400 ? facts.httpStatus : Number(facts.upstreamCode);
const message = facts.upstreamMessage ?? '';
if (/key limit|balance|credits|quota|rate limit|moderation|content policy|safety filter/i.test(message)) return false;
const regionOrTerms = /provider terms of service|(?:country|region|location).{0,80}(?:not supported|restricted|not allowed|unavailable|prohibited)|(?:not available|unavailable|unsupported|restricted).{0,80}(?:country|region|location)/i.test(message);
- if (facts.kind === 'provider-failed' && !Number.isFinite(status) && regionOrTerms) return true;
+ if (facts.kind === 'provider-failed' && (!Number.isFinite(status) || status < 400) && regionOrTerms) return true;
if (![400, 403, 404].includes(status)) return false;
- return regionOrTerms || /no (?:available )?endpoints found|(?:model|provider).{0,80}(?:permission denied|not allowed|not found|not available|unavailable)|(?:permission denied|not allowed).{0,80}(?:model|provider)|does not support response_format/i.test(message);
+ return regionOrTerms || /no (?:available )?endpoints found|(?:model|provider).{0,80}(?:permission denied|not allowed|not found|not available|unavailable)|(?:permission denied|not allowed).{0,80}(?:model|provider)/i.test(message);
}
export function createOfficialModelAccess(input: {
dataDir: string; fetcher: typeof fetch; readProxy(): Promise<string>;
- readProbeCredentials(): Promise<GatewayProbeCredentials>;
}) {
const path = join(input.dataDir, 'config', 'gateway-model-access.json');
let cache = emptyCache();
let loaded: Promise<void> | undefined;
let saving = Promise.resolve();
- let metadataWork: Promise<void> | undefined;
- let metadataCheckedAt = 0;
- let identityValid = false;
- const context = () => identityValid && cache.network ? digest([cache.base, cache.network]) : '';
+ let metadataWork: { controller: AbortController; promise: Promise<void> } | undefined;
+ let networkCheckedAt = 0;
+ let catalogRetryAt = 0;
+ let catalogDirty = true;
+ let catalogUnauthorized = false;
+ let preparedAccount = '';
+ let generation = 0;
+ let sequence = 0;
+ let appliedSequence = 0;
+ const context = () => preparedAccount ? digest([cache.base, cache.network, generation]) : '';
function save() {
const snapshot = structuredClone(cache);
saving = saving.catch(() => undefined).then(() => writePrivateJsonFile(path, snapshot));
return saving;
}
async function prepare(bootstrap: GatewayBootstrap, signal?: AbortSignal) {
+ const invocation = ++sequence;
+ const originalGeneration = generation;
loaded ??= (async () => {
try {
- const parsed = cacheSchema.safeParse(await readPrivateJsonFile(path));
+ const value = await readPrivateJsonFile(path);
+ if (generation !== originalGeneration) return;
+ const parsed = cacheSchema.safeParse(value);
if (parsed.success) cache = parsed.data;
+ else {
+ const legacy = legacyCacheSchema.safeParse(value);
+ if (legacy.success) cache = { ...legacy.data, version: 3, successes: {}, models: Object.fromEntries(
+ Object.entries(legacy.data.models).filter(([, entry]) => entry.status === 'blocked' && entry.nextCheck > Date.now())
+ .map(([key, entry]) => [key, { profile: entry.profile, blockedUntil: Math.min(entry.nextCheck, Date.now() + blockedTTL) }])
+ ) };
+ }
} catch { /* A broken cache must not prevent sign-in. */ }
})();
await loaded;
- if (signal?.aborted) return filter(bootstrap);
- const base = digest([bootstrap.account.id, bootstrap.keyVersion, await input.readProxy()]);
- if (cache.base !== base) { cache = emptyCache(base); identityValid = false; metadataCheckedAt = 0; }
- if (metadataWork) await metadataWork;
- if (Date.now() - metadataCheckedAt >= 60_000 || metadataCheckedAt === 0) {
- metadataCheckedAt = Date.now();
+ const base = digest([accountScope(bootstrap), await input.readProxy()]);
+ if (signal?.aborted || (generation !== originalGeneration && invocation < appliedSequence)) return filter(bootstrap);
+ if (invocation < appliedSequence) { await metadataWork?.promise; return filter(bootstrap); }
+ appliedSequence = invocation;
+ if (cache.base !== base) {
+ metadataWork?.controller.abort(); metadataWork = undefined;
+ cache = emptyCache(base); generation++; networkCheckedAt = 0; catalogRetryAt = 0; catalogDirty = true; catalogUnauthorized = false;
+ }
+ preparedAccount = accountScope(bootstrap);
+ if (metadataWork) await metadataWork.promise;
+ if (cache.base !== base || signal?.aborted) return filter(bootstrap);
+ const expiredFailure = Object.values(cache.models).some(entry => entry.blockedUntil <= Date.now());
+ if (networkCheckedAt === 0 || Date.now() - networkCheckedAt >= 60_000 || (Date.now() >= catalogRetryAt
+ && (catalogDirty || cache.catalogExpiresAt <= Date.now() || expiredFailure))) {
const expectedBase = cache.base;
- const work = (async () => {
- const requestSignal = signal ? AbortSignal.any([signal, AbortSignal.timeout(8000)]) : AbortSignal.timeout(8000);
- identityValid = false;
+ let expectedGeneration = generation;
+ const controller = new AbortController();
+ const requestSignal = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
+ const current = () => cache.base === expectedBase && generation === expectedGeneration && !requestSignal.aborted;
+ const work = { controller, promise: Promise.resolve() };
+ work.promise = (async () => {
+ if (bootstrap.supplier === '88api' || bootstrap.supplier === 'chatanywhere') {
+ networkCheckedAt = Date.now();
+ if (Date.now() < catalogRetryAt || (!catalogDirty && cache.catalogExpiresAt > Date.now())) return;
+ try {
+ const response = await input.fetcher(`${bootstrap.baseUrl}/models`, { redirect: 'error',
+ signal: AbortSignal.any([requestSignal, AbortSignal.timeout(8000)]), headers: { Authorization: `Bearer ${bootstrap.modelKey}` } });
+ if (!response.ok) {
+ if (current() && [401, 403].includes(response.status)) { catalogUnauthorized = response.status === 401; cache.catalogExpiresAt = 0; }
+ throw new Error('Unknown supplier account catalog');
+ }
+ const value = z.object({ data: z.array(z.object({ id: z.string().min(1) })) }).parse(await response.json());
+ if (!current()) return;
+ const ids = new Set(value.data.map(model => model.id));
+ cache.catalogIDs = [...ids];
+ cache.catalogModels = bootstrap.models.filter(model => ids.has(model.id));
+ cache.catalogExpiresAt = Date.now() + catalogTTL;
+ cache.models = Object.fromEntries(Object.entries(cache.models).filter(([, entry]) => entry.blockedUntil > Date.now()));
+ catalogRetryAt = 0; catalogDirty = false; catalogUnauthorized = false;
+ await save();
+ } catch { if (current()) { catalogRetryAt = Date.now() + retryTTL; await save(); } }
+ return;
+ }
+ if (networkCheckedAt === 0 || Date.now() - networkCheckedAt >= 60_000) {
+ networkCheckedAt = Date.now();
+ try {
+ const response = await input.fetcher('https://openrouter.ai/cdn-cgi/trace', {
+ redirect: 'error', signal: AbortSignal.any([requestSignal, AbortSignal.timeout(1500)])
+ });
+ const fields = new URLSearchParams((await response.text()).replace(/\r?\n/g, '&'));
+ const ip = fields.get('ip') ?? ''; const country = fields.get('loc') ?? '';
+ if (current() && response.ok && isIP(ip) && /^[A-Z]{2}$/.test(country)) {
+ const network = digest([ip, country]);
+ if (cache.network && cache.network !== network) {
+ cache = { ...emptyCache(expectedBase), network, country }; catalogRetryAt = 0; catalogDirty = true;
+ expectedGeneration = ++generation;
+ } else cache = { ...cache, network, country };
+ }
+ } catch { /* Exit detection is optional; the account catalog remains authoritative. */ }
+ }
+ if (!current() || Date.now() < catalogRetryAt || (!catalogDirty && cache.catalogExpiresAt > Date.now()
+ && !Object.values(cache.models).some(entry => entry.blockedUntil <= Date.now()))) return;
try {
- const response = await input.fetcher('https://openrouter.ai/cdn-cgi/trace', { redirect: 'error', signal: requestSignal });
- const fields = new URLSearchParams((await response.text()).replace(/\r?\n/g, '&'));
- const ip = fields.get('ip') ?? ''; const country = fields.get('loc') ?? '';
- if (!response.ok || !isIP(ip) || !/^[A-Z]{2}$/.test(country)) throw new Error('Unknown network');
- if (cache.base !== expectedBase || signal?.aborted) return;
- const network = digest([ip, country]);
- if (cache.network !== network) cache = { ...emptyCache(expectedBase), network, country };
- identityValid = true;
- cache.catalogExpiresAt = 0;
- const ids: string[] = [];
+ const catalogSignal = AbortSignal.any([requestSignal, AbortSignal.timeout(8000)]);
+ const entries: z.infer<typeof openRouterModelSchema>[] = [];
+ let total: number | undefined;
let offset = 0;
for (let page = 0; page < 10; page++) {
const response = await input.fetcher(`https://openrouter.ai/api/v1/models/user?output_modalities=all&limit=1000&offset=${offset}`, {
- redirect: 'error', signal: requestSignal, headers: { Authorization: `Bearer ${bootstrap.modelKey}` }
+ redirect: 'error', signal: catalogSignal, headers: { Authorization: `Bearer ${bootstrap.modelKey}` }
});
- if (!response.ok) throw new Error('Unknown account catalog');
- const value = z.object({ data: z.array(z.object({ id: z.string().min(1) })), links: z.object({ next: z.string().nullable().optional() }).optional() }).parse(await response.json());
- ids.push(...value.data.map(model => model.id));
+ if (!response.ok) {
+ if (current()) {
+ catalogUnauthorized = response.status === 401;
+ if ([401, 403].includes(response.status)) cache.catalogExpiresAt = 0;
+ }
+ throw new Error('Unknown account catalog');
+ }
+ const value = z.object({ data: z.array(openRouterModelSchema),
+ total_count: z.number().int().nonnegative().optional(),
+ links: z.object({ next: z.string().nullable().optional() }).optional() }).parse(await response.json());
+ if (total !== undefined && value.total_count !== undefined && total !== value.total_count) throw new Error('Account catalog changed during pagination');
+ total ??= value.total_count;
+ entries.push(...value.data);
if (!value.links?.next) break;
const next = new URL(value.links.next, 'https://openrouter.ai');
const nextOffset = Number(next.searchParams.get('offset'));
- if (next.origin !== 'https://openrouter.ai' || next.pathname !== '/api/v1/models/user' || !Number.isInteger(nextOffset) || nextOffset <= offset || page === 9 || !value.data.length) throw new Error('Invalid account catalog pagination');
+ // The shared response schema also uses /models links; only reuse its offset.
+ if (next.origin !== 'https://openrouter.ai' || !['/api/v1/models/user', '/api/v1/models'].includes(next.pathname) || !Number.isInteger(nextOffset) || nextOffset <= offset || page === 9 || !value.data.length) throw new Error('Invalid account catalog pagination');
offset = nextOffset;
}
- if (cache.base !== expectedBase || signal?.aborted) return;
- cache.catalogIDs = ids; cache.catalogExpiresAt = Date.now() + retryTTL;
+ const ids = entries.map(model => model.id);
+ if (total !== undefined && new Set(ids).size !== total) throw new Error('Incomplete account catalog');
+ async function metadata<T extends z.ZodTypeAny>(resource: string, schema: T, modality: GatewayModel['modality']): Promise<z.infer<T> | undefined> {
+ if (!bootstrap.models.some(model => model.modality === modality && ids.includes(model.id))) return undefined;
+ try {
+ const response = await input.fetcher(`https://openrouter.ai/api/v1/${resource}/models`, {
+ redirect: 'error', signal: AbortSignal.any([requestSignal, AbortSignal.timeout(3000)]),
+ headers: { Authorization: `Bearer ${bootstrap.modelKey}` }
+ });
+ if (response.ok) return schema.parse(await response.json());
+ } catch { /* Keep the gateway's existing capability metadata if discovery is unavailable. */ }
+ return undefined;
+ }
+ const [images, videos] = await Promise.all([
+ metadata('images', imageModelsSchema, 'image'), metadata('videos', videoModelsSchema, 'video')
+ ]);
+ if (!current()) return;
+ cache.catalogModels = officialCatalogModels(bootstrap.models, entries, images?.data, videos?.data);
+ cache.catalogIDs = [...new Set(ids)]; cache.catalogExpiresAt = Date.now() + catalogTTL;
+ cache.models = Object.fromEntries(Object.entries(cache.models).filter(([, entry]) => entry.blockedUntil > Date.now()));
+ catalogRetryAt = 0; catalogDirty = false; catalogUnauthorized = false;
await save();
} catch {
- if (cache.base === expectedBase && !signal?.aborted) await save();
+ if (current()) { catalogRetryAt = Date.now() + retryTTL; await save(); }
}
})();
metadataWork = work;
- try { await work; } finally { if (metadataWork === work) metadataWork = undefined; }
+ try { await work.promise; } finally { if (metadataWork === work) metadataWork = undefined; }
}
return filter(bootstrap);
}
- function filter(bootstrap: GatewayBootstrap) {
+ function compatibleModels(bootstrap: GatewayBootstrap) {
const ids = new Set(cache.catalogExpiresAt > Date.now() ? cache.catalogIDs : []);
- return withModelCatalog(bootstrap, officialModelPolicy(bootstrap.models).filter(model => {
- if (!identityValid || !ids.has(model.id)) return false;
+ const profiles = cache.catalogModels && new Map(cache.catalogModels.map(model => [modelKey(model), model]));
+ const models = bootstrap.models.flatMap(model => {
+ const profile = profiles?.get(modelKey(model));
+ return profiles && !profile ? [] : [model.modality === 'text' ? model : profile ?? model];
+ });
+ return officialModelPolicy(models).filter(model => {
+ if (preparedAccount !== accountScope(bootstrap) || !ids.has(model.id)) return false;
+ return model.modality !== 'text' || model.capabilities.includes('responses');
+ });
+ }
+ function findModel(bootstrap: GatewayBootstrap, id: string, modality: GatewayModel['modality']) {
+ return compatibleModels(bootstrap).find(model => model.id === id && model.modality === modality);
+ }
+ function filter(bootstrap: GatewayBootstrap) {
+ return withModelCatalog(bootstrap, compatibleModels(bootstrap).filter(model => {
const entry = cache.models[modelKey(model)];
const current = entry?.profile === profileKey(model) ? entry : undefined;
- if (current?.status === 'blocked') return false;
- if (model.modality === 'text') return model.capabilities.includes('responses') && current?.status === 'allowed' && current.validUntil > Date.now();
- const verified = model.verification;
- return verified?.adapterVersion === 2 && verified.countries.includes(cache.country)
- && (model.modality !== 'transcription' || model.capabilities.includes('subtitle_timestamps'));
+ if (current) return false;
+ if (model.modality === 'text') return model.capabilities.includes('responses');
+ return true;
}));
}
async function recordFailure(expectedContext: string, model: GatewayModel, facts: PublicErrorFacts) {
- if (!expectedContext || expectedContext !== context() || !isModelAccessFailure(facts)) return false;
- cache.models[modelKey(model)] = { status: 'blocked', profile: profileKey(model), nextCheck: Date.now() + blockedTTL, validUntil: 0 };
+ if (!expectedContext || expectedContext !== context()) return false;
+ const previousSuccesses = Object.keys(cache.successes).length;
+ for (const [key, entry] of Object.entries(cache.successes)) if (entry.profile === profileKey(model)) delete cache.successes[key];
+ if (!isModelAccessFailure(facts)) {
+ if (Object.keys(cache.successes).length !== previousSuccesses) await save();
+ return false;
+ }
+ cache.models[modelKey(model)] = { profile: profileKey(model), blockedUntil: Date.now() + blockedTTL };
+ catalogRetryAt = 0; catalogDirty = true;
+ await save();
+ return true;
+ }
+ async function recordSuccess(expectedContext: string, model: GatewayModel, operation: GatewayModelOperation) {
+ if (!expectedContext || expectedContext !== context()) return false;
+ // A parallel success must not erase a later explicit access rejection.
+ if (cache.models[modelKey(model)]?.profile === profileKey(model)) return false;
+ const now = Date.now();
+ for (const [key, entry] of Object.entries(cache.successes)) if (entry.validUntil <= now) delete cache.successes[key];
+ cache.successes[`${modelKey(model)}:${operation}`] = { profile: profileKey(model), operation, checkedAt: now, validUntil: now + successTTL };
await save();
return true;
}
- async function check(model: GatewayModel, key: string, signal: AbortSignal): Promise<'allowed' | 'blocked' | 'unknown'> {
- try {
- const response = await input.fetcher('https://openrouter.ai/api/v1/responses', {
- method: 'POST', redirect: 'error', signal: AbortSignal.any([signal, AbortSignal.timeout(8000)]),
- headers: { Authorization: `Bearer ${key}`, 'Content-Type': 'application/json' },
- body: JSON.stringify({ model: model.id, input: 'Call oc_access_check with ready true.', store: false, stream: false, max_output_tokens: 512,
- tools: [{ type: 'function', name: 'oc_access_check', description: 'Confirm model access.', parameters: { type: 'object', properties: { ready: { type: 'boolean' } }, required: ['ready'], additionalProperties: false } }],
- tool_choice: { type: 'function', name: 'oc_access_check' } })
- });
- const value = await response.json() as { status?: string; error?: { message?: unknown }; output?: Array<{ type?: string; name?: string; arguments?: string }> };
- const message = typeof value.error?.message === 'string' ? value.error.message : '';
- if (isModelAccessFailure({ kind: 'http-rejected', httpStatus: response.status, upstreamMessage: message })) return 'blocked';
- if (!response.ok) return 'unknown';
- const call = value.output?.find(item => item.type === 'function_call' && item.name === 'oc_access_check');
- return value.status === 'completed' && call && JSON.parse(call.arguments ?? '{}').ready === true ? 'allowed' : 'unknown';
- } catch { return 'unknown'; }
+ function availability(bootstrap: GatewayBootstrap): GatewayModelAvailability[] {
+ return compatibleModels(bootstrap).map(model => {
+ const profile = profileKey(model);
+ const blocked = cache.models[modelKey(model)];
+ if (blocked?.profile === profile) return { model: model.id, modality: model.modality, status: 'restricted' };
+ const success = Object.values(cache.successes).filter(entry => entry.profile === profile && entry.validUntil > Date.now())
+ .sort((a, b) => b.checkedAt - a.checkedAt)[0];
+ return { model: model.id, modality: model.modality, status: success ? 'recent_success' : 'unverified',
+ ...(success ? { operation: success.operation, checkedAt: new Date(success.checkedAt).toISOString() } : {}) };
+ });
}
async function refresh(bootstrap: GatewayBootstrap, signal: AbortSignal, onChange: () => Promise<void>) {
await prepare(bootstrap, signal);
- if (signal.aborted) return;
- await onChange();
- if (!context() || cache.catalogExpiresAt <= Date.now()) return;
- const ids = new Set(cache.catalogIDs);
- const priority = ['openai', 'google-gemini', 'deepseek', 'qwen', 'openai-oss', 'google-gemma'];
- const rank = (model: GatewayModel) => {
- if (model.id === bootstrap.defaults.text) return -1;
- const index = priority.indexOf(modelAccessGroup(model) ?? '');
- return index < 0 ? priority.length : index;
- };
- const pending = officialModelPolicy(bootstrap.models).filter(model => {
- const entry = cache.models[modelKey(model)];
- return model.modality === 'text' && model.capabilities.includes('responses') && ids.has(model.id)
- && (entry?.profile !== profileKey(model) || entry.nextCheck <= Date.now());
- }).sort((a, b) => rank(a) - rank(b)).slice(0, 12);
- const expectedContext = context();
- if (!pending.length || signal.aborted) return;
- const credentials = probeCredentialsSchema.parse(await input.readProbeCredentials());
- if (credentials.modelKey === bootstrap.modelKey || Date.parse(credentials.expiresAt) <= Date.now() || signal.aborted || context() !== expectedContext) return;
- const deadline = Date.now() + 20_000;
- async function worker() {
- while (pending.length && !signal.aborted && Date.now() < deadline && context() === expectedContext) {
- const model = pending.shift()!;
- const key = modelKey(model); const previous = cache.models[key];
- const result = await check(model, credentials.modelKey, signal);
- if (signal.aborted || context() !== expectedContext || cache.models[key] !== previous) continue;
- cache.models[key] = { status: result, profile: profileKey(model),
- validUntil: result === 'allowed' ? Date.now() + allowedTTL : 0,
- nextCheck: Date.now() + (result === 'allowed' ? allowedTTL : result === 'blocked' ? blockedTTL : retryTTL) };
- await save(); await onChange();
- }
- }
- await Promise.all([worker(), worker()]);
+ if (!signal.aborted) await onChange();
+ }
+ function reset() {
+ generation++; appliedSequence = ++sequence;
+ metadataWork?.controller.abort(); metadataWork = undefined;
+ cache = emptyCache(); preparedAccount = ''; networkCheckedAt = 0; catalogRetryAt = 0; catalogDirty = true; catalogUnauthorized = false;
+ loaded = Promise.resolve();
}
- return { prepare, filter, refresh, context, recordFailure };
+ function invalidateCatalog() { catalogRetryAt = 0; catalogDirty = true; }
+ const catalogAvailable = () => Boolean(preparedAccount && cache.catalogExpiresAt > Date.now());
+ const needsKeyRefresh = () => catalogUnauthorized && !catalogAvailable();
+ return { prepare, filter, refresh, context, recordFailure, recordSuccess, availability, findModel, reset, invalidateCatalog, catalogAvailable, needsKeyRefresh };
}
export type OfficialModelAccess = ReturnType<typeof createOfficialModelAccess>;
diff --git a/apps/daemon/src/gateway/model-preferences.ts b/apps/daemon/src/gateway/model-preferences.ts
new file mode 100644
index 00000000..0ca51b18
--- /dev/null
+++ b/apps/daemon/src/gateway/model-preferences.ts
@@ -0,0 +1,42 @@
+import { gatewayModelCompatible, gatewayModelReady, gatewayModelSupports, type GatewayModel, type GatewayModelPurpose } from '@opencreator/protocol';
+
+export const modelModalities: GatewayModelPurpose[] = ['text', 'image', 'video', 'speech', 'transcription'];
+const historicalDefaults: Record<string, string[]> = {
+ text: ['gpt-4o-mini', 'gpt-6-luna'], image: ['gpt-image-1', 'gpt-image-2'],
+ speech: ['tts-1', 'gpt-4o-mini-tts'], transcription: ['whisper-1'],
+};
+
+export function migrateModelPreferences(selected: Record<string, string>, priorDefaults: Record<string, string>): Record<string, string> {
+ const normalized: Record<string, string | undefined> = { ...selected, text: selected.text ?? selected.textProcessing, transcription: selected.subtitle ?? selected.transcription };
+ const manual: Record<string, string> = {};
+ for (const modality of modelModalities) {
+ const id = normalized[modality];
+ // Old clients persisted defaults and explicit choices identically. Known system
+ // defaults follow recommendations; other historical choices remain manual.
+ if (id && !historicalDefaults[modality]?.includes(id) && id !== priorDefaults[modality]) manual[modality] = id;
+ }
+ return manual;
+}
+
+export function resolveModelPreferences(models: GatewayModel[], defaults: Record<string, string>, manual: Record<string, string>) {
+ const compatible = models.filter(gatewayModelCompatible);
+ const selected: Record<string, string> = {};
+ const recommended: Record<string, string> = {};
+ const modes: Partial<Record<GatewayModelPurpose, 'recommended' | 'manual'>> = {};
+ const retained: Record<string, string> = {};
+ let changed = false;
+ for (const modality of modelModalities) {
+ const candidates = compatible.filter(model => gatewayModelSupports(model, modality) && gatewayModelReady(model));
+ const automatic = candidates.find(model => model.id === defaults[modality]) ?? candidates.find(model => model.recommended);
+ if (automatic) recommended[modality] = automatic.id;
+ const chosen = compatible.find(model => model.modality === modality && model.id === manual[modality] && model.status !== 'retired');
+ if (chosen) {
+ retained[modality] = chosen.id; selected[modality] = chosen.id; modes[modality] = 'manual';
+ } else {
+ if (manual[modality]) changed = true;
+ if (automatic) selected[modality] = automatic.id;
+ modes[modality] = 'recommended';
+ }
+ }
+ return { models: compatible, selected, recommended, modes, manual: retained, changed };
+}
diff --git a/apps/daemon/src/gateway/model-probe-audio.ts b/apps/daemon/src/gateway/model-probe-audio.ts
new file mode 100644
index 00000000..0cd59f68
--- /dev/null
+++ b/apps/daemon/src/gateway/model-probe-audio.ts
@@ -0,0 +1,7 @@
+import { gunzipSync } from 'node:zlib';
+
+// A short spoken "Hello" WAV, generated once; no runtime TTS request is needed for ASR probes.
+export const modelProbeAudio = () => gunzipSync(Buffer.from(
+ 'H4sIAAAAAAAAE+2b5XMU2Rew720Z90lmJhNXAiHBgrNA0GXRRRd3WGBxWNx9cXddWGTRoIu7BxIsAtGJTZKZjFvLed+lfn/DW/VW7dOfTvW5t845tz9199O3W5cuv3VGaFDawM4Tps6JUiGEMMJoeVuE0BKECKRCXXr06PtWif7jP/7jP/7jP/7jP/7jP/7jP/7jP/7j/zPGjZ4zek5ThEJRA5SE6qAYFIU0SIxIRCEhEiAxEiMtCkV6pERKpEZShBAA/f0ehRAiEYEw4uDfNwT/wgEL/0YYEUjwPebBDwxQiEIB4OHfVSzYoRKK4SvkQR6UQCU4wQm14AEOREiN9CgYyZAYESgAfvh3XwbsYAEL+IBEGAmQBhlROIpE0SgKGZASCZATSiEXPkIu2ECJIlAIkiAemO/XvxX5wAYO4IBEJHJBKRRBBZRCDfgBIQpxwIEHnGCBfMiAV5AJuWAFIdKjFqgTaorCEYmskA8fIAuy4BMUQg2QKAjFfZ+W4PusJIhELHjAC174d0IclEE+5EIGfIZc+ALlIEBqJEL/TkOMaIRRNXyCe/APvIcycIIbKsEBGAHEoV5oClqN+iE3pMNBuAl34W+YBgMhHbqhJ6gQrUT10Qc4CJcgB1JQOKqB7RAMBjgJHuBBiFLQTrQDrUU0agd+vj6cg2T0CCXjpbg9Ho0c/Gh+C78FFqBvyINaoHMgg5HQGfGIQYPRJ/gblsBCcMIqpMTTUDe4zqvgDbRHo9ElKOB/hjgUij34HRbip5DDn+M780/509AfkfgWGoa+oqn4Op6K9vBnuVTuKDuPU6GpRCxBoVHQHmFCSXL4IYzmH3IbuVROzkejeXgDfoVao96IhZ9gJaTDC1CgjTACzsIo/DPegIaiEDQFJvNBfDkfj/wohbDgB9ACOqAZKAVZ+ZWQgV6gSBDzk+Ey2oQaoOZIiZOIXvgoL4IRcJTP4bzcJLiDOuJ+qBsqwhoylriA/LCCm8a94ar5hmgjGo2eAsbzcVc8FdXAasjgo2EGDEB/o/VIinPReyxFV7iRnJnrBb+gFHwYLYRW/HwYjQaiCJyP5+J+6GcUisbDTXjAM9wqLhza4H9wD2I3HgBt+EZ8BKSjyXgg7oI6gAA5IAAMtMUS5OH78VW8Ae1Fn+Efvgu0+L9ntwY0UALZcAAV44sEgx9hCZ4Bl7gmvJhryn3hp8J+3IgogrqoBfKiE8QXtAWaQAPoATpYxP+IehCVaDlqA5egBezn28FVYGEV5+MWQDIMJMxEFHWbHIgBJeDD4OEesnLuIZ8ACRCNFqEveCO+jR6jRPwHGssnc4N4G9B4KD6Iu6A1/O98GtLjPXCRu8SO4M5DBNJhmpiIfsLTsRd9xKfwHv4kvwFovAELoBk/lL3J1HAD0QpMEalkGHET1SIhTgchKkEqiGArmaZ8F+IXYiJqg1xQhtvhAaBF21FPNJ1vybZmj/Fh6Diug8ehNsTfpB/RcBc1R9m8kd/Lbues3A0ukxcgD5pFnqYS8XZE8w+5TrAUzSRzyQ/oLfPCJ+ILyBPkMtyOfwY9+MXcSTaDn0WPF70XJOLHPA8z+AuBhswSvgwquThuBPcMRhJz6frCXnQF6Ueh/IJAeOAQV4DScBm0RqHsj8xv6Doawd0nfiG/4E+4N8pCe8HNa5EK6fjfuA78KNbKtkEzyFFkO7wGtvFfWBGj5u4ThGi3YAKZxD8MbA6UcLfxTZxMTKWa4h7+bdwxFEseILeiKPwVhvGz+QxewY/DqeTjwN/MYT4Ub6CLqG3ULGIS+p2RMUuYw2wxGgxz8CscjoIJkhhJ9SUPQAb/gHnKHcEbIJdL53sQi5CGP4aWwUP2UECLtaJp4gQhjxtAM/YhPwAvhsXsj9xmNow9CjGUjyrm3/KTiI50JNLwvxFvUB4eS0XAfTYULeK1vtHMZehHpMNGzks0poeQB1AmIvEETJKD+C2cgj/jz/Rd5W7RJTRHJ9Fu9BTmgwrewmFey40J7PdOC/wEY4mX5D8Cim5F9SNOElZiM35BvyQ5brk70V5mX+mIY6RkG3GmXKc0yGYIFtMeuivs9k509XCN9Ix03vCcCBSSM2UH5A8Vn+SjRA95zvuXe6d7g2994CC7m5NTMbQUrwYOiVAMBGMF0QDN4sfxCfh3bKXOCIrIz7zXv8tX4fmNyYb7ICDG4IVEhADTE8meZAeCQQg9Zncwa7hWfHPmJrsLxqNQ1IFQCc8IJ9D9IDvQw7/dW+RP443kPOFgSbg4kRwPIzzpjvm+NhBEeaiD1BfI5rfyqXx70iSQi4YRmXwoLOS3cf19kwLLoDukEnOoB/QJKokyEEu5QMDGpRNteA37GybRUbY/vx5l0/vE9SQ9SIP/oOu5O9x3z5PnGcsPoqfTvLi1pI5II9HR4/17bGnOx66TzqOO3713cV/JAsVSeUDWXZJN90ZG7zsXEbjojXLZ3CnsTipH+LNogSxU+1z1TtDeN8e53NvOFXAO8RmIu5IqwVeyM72JPkytRFHsYO4nyGV/8o337Pb9FngCkwR20QDJXvEA4VKCD7zz9ff+6Vpu2+qo9lmYAK4VTpYXqIYoT4kO8529s9xDPG9tT20HGCcRKbJI+yvuKHrKjtKjydnQLbCWuea76In3l7Pt8U1KJx4uf6joLY4nu+I3TB3/mkBXthcbz4zCH4juRCw1kBooSqBn4Mv8BN97d2enxB3mGcwGCQeJdojniVdJrgq+QpqXsqaaR1VhW6F7DjohUijfKiOk0bJ6wnDyJ6o5XA5YfIP8fIBnd0FL+qJst2KJbCC9Gt9HbyEF/Ow5dg/8QaZSVqq3aLmslURGdPX/5Bro8Nis9jfOjR7E9SJW4Q/EN0Ef0Qrys7+RY77tpaOBK8Z50XOaLQYHXoZ3CqTyZEkQruvP9dR4K13tHImBPqLf1We1t1XbVS51hXSKqIgaTfaiLnAVnnNOxtuAT8KP6B6S+vJiqUt4id4oKBUcIvvgMv49O4Ap9bb1JjCLubPcGH4Bv49xe4zOVHtde4hjnv2brYP9ti3ZfY1rSDQWTRDzeHag2nHadtE20qPCP4jjNXeCNmqPa3hlPflk0TTBI/Eo8WJqBK7ghiMsua98ElwQ/iJsiJ7TKmQ7sdD/yXXHMd2y3RLucHoiuUJ0kn4qOiq+TaexcY7llQ9Ma0sOlYZWvjUvqTHZr3rWOY/VWp2r/Uv9Qz1az3H+T0Ge6LPUKh0U9DT8csg6dYL0jkRJbw1kuHf4J1M/icNla7XjjWmRKdEHQl3BwTqFajTdlvngKne0sq22/mkTehvzJvKR8IVwsHCFcDh1nLe786rtRb6cI1925Xwu2Fbe2NLAftkxyLnANqXmkcvE1aFjDOsjRoY3Dj2p3CZ5Sr+EefxUdhKzjlPzT6GjeHPQvPBnsVfqHKu7Ov59aJH6hegGuuq/5V3knera48n0FfrecAeIf+i7giZ0a/Ib19wb6ha4dts7W/dWqosV+VXfZn7TfNuZrzC9M8+o3eaSMGMkS0K+RmyO2h22MaiJfD3kOOz2ey49U4ljqSaSJNWmILEhJaR9ZHls/zhLZDvdOsVq0U/EKK468Iwdy6/hmnLZXAIxiL5CGshRhAkOcsLAFc9+T4p7s8NunW5uXXInb+jXVXmTs9vnTixaUX3Lcsm5k7yrum4Mif4SNzhWHDZadZtT126r3Gy6UnbT8ovPKRlmuBDZsN7Yhqcbtkl6Flsv/KN6CrUw0NwZZWvlaObZG3ATdSVq2TPpG/F20W1yIxccmOtG7tWefr7W/gVetTfX/rUsKjcx607mtcwzWS2zE0uybK3x6+DUuFmNVrX4Un9Q+FfJHO+dqoElQ4u4krhqv/cUfimtFzKvzpZGvZs0anSk/uTo8apZWOT/7Mlx17pG+zYye9kZaCQ5lg4RF4qbCZ7CX/623jhPR+8sppqfytf4TtnyyuR5j949ftny9e33Mbn5BW8qbRhCTAnDG2qb1zZ5E3dATgdMNYklkflv8wWmnVYRd0b0a1Bi3LiGy1OzGvevnxD/c2hnWQ+8mClwjbPWWhKcssA0CBAC4RpphixTVEi4OCsrYmf4bf6G7DTG7VlmO1K1uSys4NKnzZk/vj+amf/JnB/pXC8dFxXf4ELTO82vpdjDQmQXmGHW2+XlhQ/yJ5kO1zTwH6Ki1NNjVjTUNJuYKmxor/tXRLnmoeh94Lk9yPayJqu6lb1xwIWKyK1CgfSApKnoM7UPLeQ6sneZBN9z5267xXKuYndx13x1TsrHNe8z3m760Mik80XLGkUtaTgptbghkdjBcExaCX57TVXXihelgysJq8vTlG6hbRM5vs7a5CWN3qYMr6MPG60cL5RTWzmda42zi+eqs7drt8/CzyKryH/Ib3gXeogegZNzsB24pQGxa6rVYW5UIsur+2X7h2nvHmT89XFZyWUXJaBCW6fUTf2Q8nOdoWENZXt4oedU7eDqzOou1om2n7xviL3yXbpDUdZ6j5P71dMm3oqzGywSI9mW2xY46//B1cH12M26/vC7AgP5n6mVJEe8wzG4I7EX5FxDJtgb4ZhcZSt8ktv3y7msLu/mvBN/OVvc2RZPXzMkJvyZkpPSoY41tIt6q7AL887Z2kFbR1ZHW2e6RrAHyGr5E+P0+C9JqUkT64TFz439ahyg2CPgsTqw1dbEstOW51jv/McT8B/jEvAHTBGXSJXgjGAa0Zqfw3xyxVW/LWqdm/95WtaCjLkZTz7c/brOnMwelreL6J1kScb1OsXeDZmtvEo1Z3W+686XtchGOuZ6WvBrhb+qvaG749PrJdbvWW9k7FHjH+oG4mlCAVUS6OFxu846cmuFtYec8f4s5h03H2WRzQUuuprYxa0I7PBcrnlhGlqwK2/h583vRmb8lbk6u3sZ49pOvdGVxTRMiE+ojooI1QadEi+j7uF53LDAe09DT2ff58ABPFMi0OJwYfzOuosTj8UOjnoWclo9VbqBomB84IobHDW1u2u3OCodSS7sH8IVASAV8YI4A4i57zZZIiueFD3Nrfwk+bjpQ+rHDd+emp+511KH1NND5kfERhYaGf2qIK/ikdQt6Ex0xF+5Q4ETzBZeSz4XT9I8DPkhalZsh+jFEXtDN+nXaMqkKaKTgkUo4DvuHuicY3tpPWzFjlTPQB/L9OCVvIzXM5muR1bKPN5EFSzIjc/u8Lnyc8v8FRVCeyv2juiO5pM+3HjDaAhBOkpzVhEqPSE6IGxKLUfNkZwIpqyCVIUjeJrxRfiAiHuhKSEXgi9qPipXSH8X+4W9iClcnn+N66otxDrVMrc2zcG5+/vL/UP84H3g/NO6vepO2cBiR/7mXF+2PS+rqLZihm0oo6VHS9uotFqbtp22v4ZUX1a0VmTL/VKVpLUIhGtFpHii1KTcoFXrhuub6Y/r1+qPBnfXGtQTlSmyF0ILeQGcgRhPX3uGRW1RWjNqV9lfOPt4StznnZttz2syzSPLUopq8yd/2/ItrXhi+dmaR+7PXC15UTxKMUzlV+drVmqaabyqbcrH8nSpWKITbxWvkEyX1Sjy1DuDlXq97pnuazAOIoPuqHspM+R9JLTAiv3sEf8TzxzHZdt9W2fbEltru9YR5yixPbOaq83mUxXJJrawZ77v29oirvRa9Q9uKfuAcAsXSv6Sv1OmK8PVOk2RKl21R5kmWydpIxktLhb3ka9T3dfMDi4LHh5cFrRE218zVivWYFWCcp70luAD0RpIhveccb1yxNuNtrvWmdZ91uuWeTV/VI+qOlIpLe9oWlvUunBRcbOyNWaNvch/EPaSG4S7xUZpgrxa/lYRo7arp6g0yl/lW6QyabB0j8yhfKU1By/V1dG30NFBoZrLyqvK18rfZZ1k5yQsWQxPWbnviOuzM8exz/7F3s3+zqq0hNWsNxdW7K7Qln0r2V80u3Bpyb2yD2aFPdr3kOtLOKhPgo/iCNkC2XW5TCVSL1Qxip3yX+QyhVThUvygaRe8WNdP9zg4LfiGtp96nWqJcr5io2KmVCYcR7XAiWyeb49ntavG2dw5zF7X1qp2Zo2xSm6+Xb6g7Ebp4OIjhYISv8lffr9mhiPYN5wbhAYSO+g+IiR5LP1Znqzsrlqs7KC4oMhWuBWPVVs144KqdY/023WjdVOD72nraV+pl6p2qsIVLSR9hCvIuYDYp777nibuSudpxwtbnVp3ze6q65VvyveWRZbtLQkuulwkLxlUOqXyB0sXxzlvHJvBh+Lm1HvBP6JvkiD5D8qJqvmqZNUN1TK1TMNpFgYZdCf13Qwz9DF6nf5oMBFk1NZTFys+yzaKi+gHRHd4x5h84Z6jrrFOrX1R7SzL+aqMylflnUrvllwo7lm0ptBXVG56WP6qKr32lVPl+4U9xEvxZkoutIraSfvLsxTNVW9UQnVXzXjtCW274CLdO70k5IeQuoYqfWt9iC4iWKj9qtquqJGuFe2gWuOFXHjgrPc39xYn7VDbEqx51XPMkyqmlm0x9S3JKtpcJCiRm34uG2AurNloO+666vUEWvOXURp5gQ4X/SU5LKuWd1baVa00CdrjQWN1D/WDQoYZxxlPGIcZPxgu6KYF/xbUQeNT/iIfI+knvEfugQDzkz/gGeK6Z99fe9IyvrpbZWGZplRV0rtoYEGDgt+Ljpf0L1tlbmnJsOW4Fnh3+TWcB6rwAeqE8LR4hfSE/LxCrBJp2mjXBw3XhRrOhawzBoy/hV40DghJNZTrrgXN0mxVmeULJQ2E28n70Ijt6c/xrHQdd6TaPJaWNR3MH8u7lHU2uYtXFfctvlTClRaWZ5iHWRrbDjhOuZv4NgRaclfhLB5PFQo2i3ZKpPJ3iquq15qDQZ90Aw0ZIe+NQaGvjG2M/UMiDb/qrEH7tIQ6TDFcGiWyUqdxB34sM8G3z/3aYam9b9lVHWNOqlheVmwqL5lZYizpYepRNqGiyGyvoWz7HYUuvbedfz7zjAtDKvIG3Ug0RLJcdkHhVTk0Z4NG6U7qwcCGdDKuNMYbU0OiDV9144KnayerJyhPyNqLtwqADMEGfgqz3NfCLXAMrV1p4areVS6uqCkbUHrSNNcUalpTOrM8rPJ61XYLUzvUscK12XPX14Q5xCUgG7GENgn7S36SbVVcVe3TPAxarFut32HYF+INeRXyMeRhCBXyUb9G1z3omNqnaChrIT5LXyEaoHx2mD/R08O5yfaLJafKXdmyYmSZxdTBtLXkbEkn05dSa/kw870au9Voz3fecO/ylvn7suPhChFOFwmLJJkyrHypaqPZHNRK11K/32AwLjYeMYpC1cZRIfkGp+5BULqmqcosWyR20WWEEXXiUgLHPROcnW35NaOqBlQ+LifKTpkySvQlI0tiTGaTpLypeWn1Nety+2HnYE+qr9Z/np0JPfFb0in4XRwpa6ZwKSdpWgatDyb1Aw0pIS2ML43zjG+NJ4yxIRP16cGztaTaJL8heSLMopZhOc8GuvvsrmP2L1ZxzRHzwgpb2bjSkpJ/StJLXCUTSs+V9zafqp5prWcf64x1v/cc9k0ItOCCUTmxmL4puijNkk9WLlB31T4I6qKro08x/BZyPWRLyLaQiJD9hoN6U3D3INCMVAnkl8T9BKvI/qgptzLwxWt2nbPPtT6v/mAuq2hX9szElGw3rTGNMtUr21cxompBTXfrXfsml9KzyrvATzJm9keYi5+QzwWdJD/K0hUZ6sfao8H19GcMScavxpahE0JDQiuNycYThnb6X4MtmgLlARkrukYPJ07wQxns+8Md5jxZu8AyvXqEeUhFq/IBZW9N20uSS2JMl0ztyiOreljA9tCl80b5QgNR7CW2L/8JfSXkAol4iiRP1lQl1UiC6unM+t+NdcN2hC4IvRuqNubp9+qW63oFL9FOVa9WLJUaRKvI0+gld97/1rvAqbS1sW6u7llRXkqUJhfXKSwqWFO0r+j3En+ZpnKApdTR36PzN+F6oDI0CkeSaZRfkC3qIq6R9lbUKL6qumnGaqfophgIw3NDYchnw1Z9vG5pEApC2lnqhopqaab4GX0Jt+QzmSX+Op6jzpm2vpaDVY0r25dvKosq3WEaYEoy7TDVLxte8Y95V+0Bd6lPwK1COkziRsQfxGzyMN1I2ER8WJoo6yQnlH2Ue1XLtR+D8nTzQzaEDA1JC9ml0wYP1UQq9YpC6UTRVDqSTIF7zHT/Bk8L9wTnJbvV+rPlY3U7c17F0Yq2VeHmkxVCs8t8ulpSe9Y20hUS6MgGc/PhOjAoQGzC+4lNQlK8VpQi3Si9Js2T65S/KP/SyPQX9M/1s0JiQlL0x4K16gmKBgqfuCPdlOyB53HT2B3+zR7wrPCecuU55M5JVpH5c/mvpQNLZMVbijxFZMn9koLy5rWRXgX3ULBM+lA+WG1W7pBGSHkJJUoXbBd5xYz4sdgrpiScdKx8ltKuPhW0W3/E0Fg/PHiYdrS6UN5IPExgJZ/Ba3aAv49H6qlwjXb47GJHue2FdVT1gvKK0ualRwq4vE/5MwqTC7+a1lTLPGnEZGmxeox+dYhWn6L+JmsrHSZ6Skmof8jO5EtqN51PJ0ncqpyg1zoq7HbEjXBDaLHOo92hrpD5RBJhJOnl1vjT3ZHO/o7Ljr2OC67hXsp71TXI9mvVWtO9wpn5dO76nE15Tb/9UnionLdr8EZFja5e5A8xkRF6w3Z1K0kbwS9UBLgDZ1mW+4XtyQ0jB0gGq9w6S9ieqJ0xkdHTwgIGd3Cl5pFim3gHdQ60gQWuj7VnLIctGZYQWzfnTnek3+8b5T5gm19Zt6RVQc/cg1/i83rn38jfUnbE9jd3Rr7ZODZqZty6uPVhQzQzJHXpbJTAzvJv9Jf6rf7ZzC74XRCkignpG8HGRMUviD0Q0TPErLulnaHIF2PqHIc9VO3k6m1VN2ra22QujT+fWwhPOSXb1T/A0btycFGrrxNzEz8P+lCY7ci/VHLfshI06qjwyrjf665KCI74rD0kYvAWSOPUgVrfNf/OQBX7C5pFT1YUGTLCV0fvil8QeyQCGZmg39ULZUsFIVjgb+voYBGZx1dNsoodC3xPudewEt/HZ7nmgXTPbmvH0rR85rMwc1/GyPc9Pncq+sEymVusuhuVXadz3XsJeZFPdYQSCTfjenwHf7hrrKPCcce9iTlH5MkG6JeEb40+FTssRhATGeUN667/R/1B2gdHu79VT6j8u/KJGSwrXFsDc/n2qBopiRFUMDUObnm3WNNMdT+Hvn30+sOrg++W5e0vKbFuoH4NWhNBJWyp2zVxRcxG/XHZCMEPKNhf5Eiq7WN74Qz3rAhUE2fkDXSzQ3tHN6/TKl4ccyqmcdi1YK8yk3jBzHZvqepXzpZvMbev7ewC/2OUJkgXqyScSCbaTTr8bS2SktU5R9/1enn0pSij66ekr39UDGTqKyeGHYlPr787WZ/gCO2u6SH2kHZugvug/ZT9Bzthj3VlsxHCH9TNDNlhT2P213mWGB7riCgMP6SpFkyH6a7lNUeqepYbKi5YPzkpX1e+K2WQTJEfl0+UjZEIKTpwovZxGf7GflBkGN+ueu19u/lzXtFnJyXfGv41YXKjiY3VdX4Ljw1Okq0WyvBp72L7asu5yuUVT6t9rj+IZooHuqsRVbHFcVzcH/HpsXFRQ8NqtcWCxf5B1t/K5xQNLRpdcdxa4ZrBrkLB1HBJlmKj+o3mlPqovB0Z73ltHlOQ/YnMWPfqzkvRy4TXuzJ9hX5fT+Wa6EONw1t+aXoh5Wg0Dj4iny3kea97Vm3TKn1ZeMnX0rW1X7gQ6UmdJPJOwtqkC4kxcZ1jN0RmGUarl1InfZW1IeUniwMlCaWDqn9x5/uDYJmwUn5W01HXy7BXf1hzXHoQrXAur9yU/+rjwLdXXpx8bnyW93TP20u5va2bxN2j3zQZ0/ZA24PNDtbtHjZCVSPsiTN8c2zx5tySFYVrCtuUT3LuIeposiMnJhrrt0t+UvdjbHRk+/B5+gmyfDzQbTFXFDXJ+SvvaXma7bj/BGpCz5FvUI/U7NVJjX+HVupp2TkIciVXXM8rfDf6Zfyrk6/PvTz6bN/LFp9Gmv7yDQyqnzyi7bYu5rR5qVPjV+p9kkjM+h7YY2qKS13ftN8ChbEVHT1poueGy3VcDbc0CW/4NfFOrD+iUqdQ3hc2hHqOX0vN37Jyld/+Nk2smepdSpeoC/TqEF9oo6g5kbND+mmzZV+J/s4pppk5RFbWm50vV7zY+IbJPPTx8ufn38iaueirnkq+37JDh9wOoalzoidoT9AdA33s9c1sWWdTecH9guySEVWx/iRpofFi3eimBc3DUlskV8bGhHcLbit9Q64JZFsHlP38rSzn3jdUklzd3hNFJGv7hnYMuxfbvk7/uIcRk4JPy3qRzb2pVTfy6ey7n998MGcEv8v/ODDb9Pm37P4FJyq6Oy+QDYwLU9gW9dv5Wp+sPyqiv2oRv8fRznKs8kDpj0XXC8PLvlRGWqdwKxSbw9KSvja1tDjefFijdonnIl5qdguFcN713JxTNCmvT/ZPOdfzCypsrtnkJ8228A4JH5Prp6ysy0fPDamvSiAmuQ6YhQU3P+/Lgnc5mQ2/TMqbnJ9W3KT8irl+1TLrz+5o9m9p18isJLoxNNmX/FdkpnIuKJ1LLGYzX/G24mb5jar6Nrn9ordGoNctiM6vZ22U0vRzI0diROTFoE1SDVXj+8kytuJRSaf87LwP+TsqtjpZdrMoTLcgcmnCnno7EhfHB0W/0d0Xv2dMVkOZ+Wu9Tw8/Pspe8217yZLyduaimjMWU80eyy5LD+t0R5q3BacTVxnj4vvEjY/rF7Uq6IRoH5fuLnOss9faHtm22DzO5v7OgZ58kvSM3hBJx7eoV5MUmyiJ6mM4pooShqIy/01bZ/O+sk8lXYuTSldW/+y28UGiQxp7GBtnSFgSczNqe+hOdZpgaOAf+5YquuTKt8bfPhR2KztfObR6si3VM9hzxZFqf2x7VJtbvbci3TzJbvHOQIXKiNAT4fuidkXcDe6qOClIgmNMhS/H28A3zj3ane9L85X6PxDvpc81542vo6fEn4vD0Z3DPga1k66jR6Ni72Z7jOVnc3L5rdLsijKLzXWKx+Iq9cSQZhEnot9GJ0eONl5XtxEN4rs7t1QpTO0LVAUXChNKe1bF2xSeHYHBbAwXzo4KJPmvO7tWPyt3l3iLr1Zstd7iHqmXGYvDpkSfjnivq1V8pHqi7SgOKrnt7HbmPtuQdXjH+s6hUJFb1iZIFpoQuTaKCX0Q3EE1QGwmm/GbvB3dfZ2nreE1P9b8aGloP+kbS9yWtFdfMywLN4afDykMLlPvlcZT57kU71ZbWXVxpaxiYeU4yxfHO+9PbAc0gPQTbVENe9e3wRVRu6hyb3GXnOsfS76cztldcLl2MtkpqH1kbVxQvQ111dHdDNtUdSWEqA8dDC5mIXeGGeDp49S6+vm38b1xB9FrVU3QGINNf0DbWt1B7hP8SITwrsDIgMF/xhNwj/Gu919nEsBJukT95HrVXvU7dTtVHcVuyR90dxzGG5lJvk2ec65bziiX0T3Km+PvzF4DHzYQR9EuLiqA3aQ1tuJRYe9sR2Zohu1t5sdthXbLC3QuqF/M+KRRDf0pk+rdjN6rS1f+JpHRO4gciOXSOFtgqeea671ruOe+38tOI55LWqg2adKClmuXqXcprMK+hBqTaDK/g7Uw97gY/grbjlsCQtyXzKKDhX+KJfJQeS9JvOiDQEwvwn7uDJfEP2GvMHeZ5kwDZhAzPnA0sJaN4bO4DObXwHlfqcNQXVC6ID/t44y3U15verP0w/qCFta2xOegDzEouU+jvQ3m1TNGO4Nvy38T3SdD8Z8oGkcRX9EA7g+mSWCpt6d3lJ9lu5NGcS95tsqgMaluyHeIXMRjvhc7mGnLvGIS+Y1oC76Gz+PTeD7ui/vjAcRZarSwmRhLKOkU2d/S+aJxtIgciBK5jMAVf2f/Wn+3wNxAKNOUMwCCw9xD9kJgnIe1fa3+pfzvwhU5yR+Xvu+TwWV6ck+UnLNOw/c1O8OnJFTWr0m+UvdG9CSDQT1WYqNEZAzujWMFBYJaIpNoTM6B40yqP8bfhB3Dj0EE7RU9kIyUpoj70W3JoYhmzf5FgUHsCX4zOkFE0s8FCwRRArvAIXgn0IlixdniE9Ic6RrJRvFNYUe6P3GWv8WuYY76GnoX+Fr7z/mDmUXcZ6CwmDhCJOEJ/N3Adnfr2gWVR4tv5Zk+Ls149dr9pm7m+2y16Vd7EvFG3Tw8MWFwfVf9TXVnxpDG9do18qXCOGoM+QO1mm5PHyOnEQfxI74rQ/kf+bYGkrkL0IeIEmSL+oqaCvRUNE7gf2Tu+rA/lBFzAehJYsFh0RBJlkQvuy+rlnaV5cpmyhwyk+y49A9JQBQm+IdYBw/YvMAjX6pX7av1HfWXMIl8FXQkXGRTer9gpLCv8A19i1jA9/VtsA2olBXNytZnDn6z6eWvr/pkvsmOLgqvfc/rpMv0e6MWxg9LzEy4GD09tE5QuSJT6hWcIx/TMmFnOpO6Ss0m9qPmfHqgj/+ovzEzn8vg1+BbtF6YTc+jSHIimsMhxu+T+mcyHu4sGkB1FI2QNVUUyL/JE+QbpB7xLeFJQbKwvnCZoKHgIz2ObkUtxQf45dwfbE/GF8hiXnMt0FQ8gpBT96lS6hg1luxL5pECcjZ2wlNutL/cgWpulh75tu6T8d2TV6kvy1+vyNqWG1Q21TkGP1H8EHI/6nhCZJ2+sUMi5uqnq65KrwsVFENOF/QQgWid+IT4rihMcAon8XmMMNAzoGXS2PpoNTmYuk6RVDquAyuZp94kz2LPKd9CVohqqb+kecoJ6vGaZM0M1WX5TjEWnKHsZAYZQnWjOwoTRemCIGoOjuMHBtp7E93fXAWe9oGXnIKQCvdLRsnS5FdlA6STxYcFEZQbP4OdvJU1+Ys9y53frJ3Ny0wv84055z6+yXz2/nBWv+yPBfvLG9g6MFXCrWqjvlX45uheUfPDehoSNTdllHgTdQUnEsOpnsJtoleir9LFcoHEJhDQF/E/fAF7MjDL/3vgOvOI6cjcYORcNitlBMwu9lcuDHLwEWqHiJfdUyL1E3WWeqAqQ/ZAVEJHk4kohl/GPeSW8/1hJcyANBjJV7F5zA5Gyq7mHsJToq5gqrhAOlT+Qf5ZdkhyUjiE6oeP8wPZeGZZoHtgX2B2oMy/01fq7u+4ZBVW1ZR2LpJ+u5DDfZmQ/Sx3akFy2dWadu77MFvcWPUkuIXRHfrG2EMfrK1V7JbQwiR6DLWYpsV6WYFcpErRHFHrFcGSA7QCvQxc9pxyMvbtDsJ91Fvt78odQS2JX4lZxESiAm/EPFaRDipWNES6Xb5YGaUeqG6p/CLtJlpECdAHpsQ31FvfG+zb4e/IsNxRZMebiJ7kQ3IUaSWeEb3JP6nXtFfQTzRPPE+yRhIq/ll4iBaR1+EsOyVg8v3p3eWReeZ4enjOu9+5zI4/bc8tB8wHy06XtCtaVLCgYGCRsbSXuXGtzvOKc1FZkvHKaRqnNlsr0rRVnpYNlpwUnfr3i7b4sjRX/k7ZR12gjlZnK1pLKeEw4hTX2//MfdbJOKY6L7k8njf+xayFJ/BaYj75I3WeOksBZaW/Cm4IWVEDyQVJlmSuJEKsFX6lNhFvQcyNY9YEtvnH+LcEypgYzsJfQA/xQ8JJ3qRY6hXNCTKFU0SbxDMl0yWNJcXiN6LNgn5UPLEU8tiPgUb+Dd57nkeea55rHp33kneud5Hns/ub64hDayOtA6rjKkvLoLSwVF92rVxeVWZx2zd6X3PFxHrhXNlB5XGVWZWpGqO8K7sjuSKeIjogzBTdlRRKT8oTVM3U81R1lT/Jd4ifU8NREvvI2961xvHenmP/1RnuyfdtZTbyQ7GYDKK60Tz9hS6lBwumCJYKmguLhW6hR4hEy4UqwWDqGXEHdeJns62Zr/6m/kp/aeAyM5Irhwe4MVmfLhVsEWpEhaJqUXfRRNEBUYUwQagVFgu+0Huo92QmEYGPQRd+OJseeOvf6cvz+Nzf3EPdj1zrXGtcbVxHnQKnwfHetrZWaR1RU6f6dtWwqvFVRdVvrG/sG93XA9FIQM8VJ8kvK2tUoWqL8i95V+kGcbVwpmCEwCiqIxHJflXkqaZqnmtOq0OUW6QSIUn8yfo8uY4xthnWAxZD7RN7puuE7x4bjxqQNnqL0CW8JBwqfC/YQrejzKSRSqVuUUvpOoJMQRvhaUEjegN5D4+DJWy1f6HvuneSV+1z+I+x++EL4aZXiG5L9soGyAXyQzK17KrEJtoqnC2IpwNkF3IbsQkfQvmwic9lFzHJgQ6+IZ427mRXtqOF40fHIMdIR7Ej3ZnrPOHc7ezqHOX40b7S1qR2knVxbbC9peNvl8NnYXuhhlRzURfpMblE2UC5VPG7vKusr8QgShUeFh4RfhJeEJukP8rXKk4oZyu1CqMsXJxJ1cBZ5oj3mHOPrXftsNo2th6Ome5wfyQnwN2pT4JCUStJJ0k/cRORTLiOziRXEATxFX/CPxIU+ZDcROVTJ6lu1AnyCJGKL8BiPp3Tc6/YOpyRnwUUfkasoiIFi4RdRVtEW0RRomjhQ7of9YTohWXIwlP8ZE7IHWSbsO+Y8czLQMDfxL/Sd91r8izxNPfku53usZ5rnreeht4sb5DP7a31lnhPe9O8lzy1brXb6trtznTHeCS+I4F+bDs+FpeTlfQT4RbxVkm09KT0urS3NEeCpSLpKEkjCStZI10ofSVtIwuWLZXOlTwUrRTQVCes5Z8HeviWek66ejgbOyWuSPcpz0dfJyaDS0JtCBW1i74oGCBcJhwmrCM8K3hNc9TvlIMcTJYSfxL7iePEaKI1kUbIiOM4Ft9HP6EPsAQGwQ/QA3bDZ8CoC7qI3qOzaCeagYRoCaRAOT+D1/Iu7jk3nKtlD7N+JobpEKjvD3gzPQ/dT13hrgpntrPWOcYV6r7jZtxaT7ynkSfME+ZZ4mni/dOXFfiBq4JW5BfBa7FY5pSPU15QliuOyylZtfiJsIRuTqnJWqI7+Zy8SLnoUOE64UghFgJdl5IRFXCWO8aoA0r/bV+yf0IggW3Lb0AOIpwuFLQSVYl40W2RT3hTMIFuSYWQUuJH/BztRKfQE1SFfsDHcCbOwm/we/wAb8NdcQyui1NxczwAn8UsTiCaEz2JboQPr8BW1BoNhcF8D64Ja2RUAcpf46W9/T0n3T7XDddF10lXuqvSNcD93t3V88lzwNvb5/Hd8y8MiJk9zBjWwG3mjDwF5bAKDcLTiE6kk7xNTaTP0mZ6hGCcgBL46DaCYMHf9APaKGDps/RV+h7dj86iplMZZA3RmFiHzyMTzIX68JzfxRfwcdAW5oIHfkHb0FuUgifjVfgWLsJSYhBxiagh6pNzyD/Jc+Q2chn5E+kh9hNDCII4gifgQbgRdiIrYtFrtB4NREb0DwwBIaTz4/g0vj5P8w5Oz7fh6/FaPozH/GEujPubbcCeZJKYJ4FlgSGBXwPbA28D4cwiJocxsoPZXex19h/2LvuEzWe9bB1uGveCq8fv4KWwA4LQApSLWuGZ+BC+he/g5/gN/oif41v4KX6H32MLbkosIu4SWnISeYy8S74g75OnyPlkc7KCOEiMIVoSHM7AD/EVvB9vxZvxHDwM98ARuBCdRUtQPxSKXGCDcvgEOfAOHsEdeADpcBhOQDrchEfwBarAAl/hHTyBUzAfekMkIOB4K5/Lf+JNvI2v4U28ladBAgxPQzx0gn4wDKbCGtgKq2ESDIfB0AKk4OCd/Df+Pn+Vf8Rn8a/4j7ybj4SeMB22wzX4BMXwDu7CdbgIB2ExrILzkAG10BIdQKXIiAfgtXgbnov74FD8Ee1Ao1ErlILaoDFoK3qNIvFovAYfwn/hLfgXHI0t6B+0Hk1FI9FoNBMdRE9QDQrDzXEz3BjHYQrnoMtoO5qLBqB2qDGKQkpEIReUQza8hSdwBS7CVbgJt+AB3IXzsA/mQ6/vfZv4J/w9/iX/kbfzRmgLA2AcTIfp0AeigYAP/F/8dn47f4i/xRfwJKTAYFgFR+AvOAsX4Tish+WwDH6HxXAInoADDKglGoGmoploDpqBxqA+qCNqiVJRa9QO9Ufj0Uy0Gm1Em9EGtAItRtPRRDQGjUCjvnc1Dk1C09F8tBgtQL+j2eg3NAn9hmaguWg+WoM2oFVoJZqDxqLuqDmK+24jKJAaBaMo1BC1Q2moDWqKopEQVcJ7uAZHYDfshRNwE7LABjIUi1JRKqqHDIiHTDgFy2EM9IX+MBHWwxnIADfIUAyqi0K/7/AIdsEcGArtoRl0gYmwGa5BMShREmqDOqP2KBWFI4QK4DGkwwk4BOfhCeSDDzSoLuqIhqBxaDT6BfVAbVEjVAfpkQCRSIjESIWMKBo1QG1QGuqAOqI2qBGKRyFIiaRIjARIivQoFtVF9VBj1AI1QQ1RPRSGNEjx3WqB70bIv74HwL/myr/+Cg9esEMF5EE2fPrueHyCbPgCJVAFVWAD33d/xAEOsIENrGAGE+TAZ/gCX+EbFEAZWMEKru85ZiiAL5ABL+E1PIMMyIGq776HHkWjRBSHopEBCRALDiiFYij97nyQSIdiUBJqjtqh1qgZaoAikRZJEYkYcIEH/N89AYQUSIciUNR3Ryfkfxks+MAOdvCCCxjASIwUSPk/e8YLViiGz/ABXkMmZEMeFIMVvMB+75wFN1RDEXyBd/AG3sALeApZkPvdjHF/n9C/Po8PXFALNd8nUQ1OCABCku/PTBAyICMyID3SIRXSIh0KQaEoBBmQDoWhyO+VRnw3h3RI+z373/xIFPu/00lA9VBdVB/VQ/Eo+n8uT9j3Vf9G8SgWGZERBaN//6nXIDVSIDmSIcl3I+lfJygAHnCBBWrBAmaohiqoAdv3Cn3gBhc4wQpVUA6VYIZSKIMKqIQyKIF8KAQTlEI5lEIBFIEJKr97QPj/uXv1fwAI++XWdEUAAA==',
+ 'base64'
+));
diff --git a/apps/daemon/src/gateway/model-selection-probe.ts b/apps/daemon/src/gateway/model-selection-probe.ts
new file mode 100644
index 00000000..05e78e61
--- /dev/null
+++ b/apps/daemon/src/gateway/model-selection-probe.ts
@@ -0,0 +1,179 @@
+import { createHash, randomUUID } from 'node:crypto';
+import { join } from 'node:path';
+import { setTimeout as delay } from 'node:timers/promises';
+import sharp from 'sharp';
+import { gatewayVideoSizes, type GatewayConnectionDiagnostics, type GatewayModel, type GatewayModelProbeOptions, type PublicErrorFacts } from '@opencreator/protocol';
+import { GatewayError, validateGatewayOrigin } from './client.js';
+import { chatAnywhereImage } from './chatanywhere-media.js';
+import { createDirectTransport, errorFacts } from './direct-transport.js';
+import { modelProbeAudio } from './model-probe-audio.js';
+import { isModelAccessFailure } from './model-access.js';
+import { isDirectTransport, isKnownDirectBase } from './supplier.js';
+
+export class ModelProbeError extends GatewayError {
+ constructor(code: string, readonly publicFacts?: PublicErrorFacts, diagnostics?: GatewayConnectionDiagnostics) {
+ super(code, 503, diagnostics);
+ }
+}
+
+export type ModelProbeScope = { accountId: string; modelKey: string; keyVersion: string; baseUrl: string; transport?: 'gateway' | 'openrouter-direct' | 'supplier-direct'; accessContext?: string };
+
+export function createModelSelectionProbe(input: {
+ dataDir: string;
+ fetcher: typeof fetch;
+ readProxy(): Promise<string>;
+ timeoutMs?: number;
+ pollMs?: number;
+}) {
+ const transport = createDirectTransport(join(input.dataDir, 'gateway', 'model-probes'), input.fetcher);
+ const passes = new Map<string, number>();
+ const pending = new Map<string, Promise<void>>();
+ const controllers = new Set<AbortController>();
+ let closed = false;
+
+ async function probe(model: GatewayModel, scope: ModelProbeScope, force = false, options?: GatewayModelProbeOptions) {
+ if (closed) throw new ModelProbeError('model_probe_unavailable');
+ const gateway = scope.transport === 'gateway' && scope.baseUrl === `${validateGatewayOrigin(new URL(scope.baseUrl).origin)}/v1`;
+ if (!scope.modelKey || !gateway && (!isDirectTransport(scope.transport) || !isKnownDirectBase(scope.baseUrl))) {
+ throw new ModelProbeError('model_probe_unavailable');
+ }
+ const fingerprint = createHash('sha256').update(JSON.stringify([
+ scope.baseUrl, scope.accountId, scope.modelKey, scope.keyVersion, scope.accessContext, await input.readProxy(), model, options?.textApi ?? 'responses'
+ ])).digest('hex');
+ const existing = pending.get(fingerprint);
+ if (existing) return existing;
+ if (!force && (passes.get(fingerprint) ?? 0) > Date.now()) return;
+ for (const [key, expiresAt] of passes) if (expiresAt <= Date.now()) passes.delete(key);
+ const controller = new AbortController();
+ controllers.add(controller);
+ const signal = AbortSignal.any([controller.signal, AbortSignal.timeout(input.timeoutMs ?? 5 * 60_000)]);
+ const work = (async () => {
+ const account = `model-probe:${scope.accountId}:${scope.keyVersion}`;
+ let failureFacts: PublicErrorFacts | undefined;
+ async function request(resource: string, body: unknown, method = 'POST', contentType = 'application/json'): Promise<Response> {
+ if (gateway) {
+ if (resource.startsWith('images/') && method === 'POST') { const native = await chatAnywhereImage(resource, body, contentType, model); body = native.body; contentType = native.contentType; }
+ const response = await input.fetcher(`${scope.baseUrl}/${resource}`, { method, redirect: 'error', signal, headers: { Authorization: `Bearer ${scope.modelKey}`, 'Content-Type': contentType, 'Idempotency-Key': randomUUID() }, ...(method === 'POST' ? { body: Buffer.isBuffer(body) ? new Uint8Array(body) : JSON.stringify(body) } : {}) });
+ if (!response.ok) {
+ failureFacts = await errorFacts(response, scope.modelKey, signal);
+ throw new GatewayError(response.status === 402 ? 'credits_insufficient' : 'official_service_unavailable', response.status);
+ }
+ return response;
+ }
+ return transport.request({ account, baseUrl: scope.baseUrl, key: scope.modelKey, resource, method, body,
+ contentType, identity: randomUUID(), fingerprint, signal, model,
+ onModelFailure: async (_id, _modality, facts) => { failureFacts = facts; } });
+ }
+ try {
+ switch (model.modality) {
+ case 'text': {
+ if (options?.textApi === 'chat/completions') {
+ const chat = await (await request('chat/completions', { model: model.id,
+ messages: [{ role: 'user', content: 'Reply with OK.' }], max_tokens: 256, stream: false })).json() as {
+ choices?: Array<{ message?: { content?: unknown }; finish_reason?: string }>;
+ };
+ if (!chat.choices?.some(choice => typeof choice.message?.content === 'string' && choice.message.content.trim()
+ && choice.finish_reason === 'stop')) throw new ModelProbeError('model_probe_inconclusive');
+ break;
+ }
+ const tools = [{ type: 'function', name: 'model_probe', description: 'Confirm connectivity.',
+ parameters: { type: 'object', properties: { ok: { type: 'boolean' } }, required: ['ok'], additionalProperties: false } }];
+ const result = await (await request('responses', { model: model.id, input: 'Call model_probe with ok=true.',
+ tools, tool_choice: { type: 'function', name: 'model_probe' }, max_output_tokens: 256, stream: false })).json() as {
+ status?: string; output?: Array<{ type?: string; name?: string; arguments?: string }>;
+ };
+ if (result.status !== 'completed' || !result.output?.some(item => {
+ try { return item.type === 'function_call' && item.name === 'model_probe' && JSON.parse(item.arguments ?? '').ok === true; }
+ catch { return false; }
+ })) throw new ModelProbeError('model_probe_inconclusive');
+ break;
+ }
+ case 'image': {
+ const options = model.imageOptions;
+ let resource = 'images/generations'; let contentType = 'application/json';
+ let body: unknown = { model: model.id, prompt: 'A red circle on a white background.', n: 1,
+ aspect_ratio: options?.aspectRatios?.includes('1:1') ? '1:1' : options?.aspectRatios?.[0],
+ resolution: smallest(options?.resolutions), quality: options?.qualities?.includes('low') ? 'low' : options?.qualities?.[0] };
+ if (model.capabilities.includes('reference_required')) {
+ const form = new FormData(); form.set('model', model.id); form.set('prompt', 'Make the circle blue.');
+ const png = await sharp({ create: { width: 32, height: 32, channels: 3, background: 'red' } }).png().toBuffer();
+ form.set('image', new Blob([new Uint8Array(png)], { type: 'image/png' }), 'reference.png');
+ const multipart = new Request('http://localhost', { method: 'POST', body: form });
+ resource = 'images/edits'; contentType = multipart.headers.get('content-type')!; body = Buffer.from(await multipart.arrayBuffer());
+ }
+ const result = await (await request(resource, body, 'POST', contentType)).json() as {
+ data?: Array<{ b64_json?: string }>;
+ };
+ if (!result.data?.[0]?.b64_json) throw new ModelProbeError('model_probe_inconclusive');
+ await sharp(Buffer.from(result.data[0].b64_json, 'base64')).raw().toBuffer();
+ break;
+ }
+ case 'speech': {
+ const response = await request('audio/speech', { model: model.id, input: 'Hello.', voice: model.voices?.[0] });
+ if (!response.headers.get('content-type')?.startsWith('audio/') || !(await response.arrayBuffer()).byteLength) {
+ throw new ModelProbeError('model_probe_inconclusive');
+ }
+ break;
+ }
+ case 'transcription': {
+ const form = new FormData();
+ form.set('model', model.id); form.set('response_format', 'json');
+ form.set('file', new Blob([new Uint8Array(modelProbeAudio())], { type: 'audio/wav' }), 'probe.wav');
+ const multipart = new Request('http://localhost', { method: 'POST', body: form });
+ const response = await request('audio/transcriptions', Buffer.from(await multipart.arrayBuffer()), 'POST', multipart.headers.get('content-type')!);
+ const result = await response.json() as { text?: unknown };
+ if (typeof result.text !== 'string' || !result.text.trim()) throw new ModelProbeError('model_probe_inconclusive');
+ break;
+ }
+ case 'video': {
+ const response = await request('video/jobs', { model: model.id, prompt: 'A red circle moves slowly on a white background.',
+ duration: model.durations?.length ? Math.min(...model.durations) : undefined, size: smallest(gatewayVideoSizes(model)) });
+ let result = await response.json() as { requestId?: string; state?: string; error?: { status?: number } };
+ if (!result.requestId) throw new ModelProbeError('model_probe_inconclusive');
+ const resource = `requests/${result.requestId}`;
+ while (['submitting', 'waiting_upstream'].includes(result.state ?? '')) {
+ await delay(input.pollMs ?? 2000, undefined, { signal });
+ result = await (await request(resource, undefined, 'GET')).json();
+ }
+ if (result.state !== 'succeeded') throw new ModelProbeError(
+ failureFacts && isModelAccessFailure(failureFacts) ? 'model_probe_failed' : 'model_probe_inconclusive', failureFacts);
+ const content = await request(`${resource}/result`, undefined, 'GET');
+ if (!content.headers.get('content-type')?.startsWith('video/') || !(await content.arrayBuffer()).byteLength) {
+ throw new ModelProbeError('model_probe_inconclusive');
+ }
+ break;
+ }
+ }
+ signal.throwIfAborted();
+ if (passes.size >= 256) passes.delete(passes.keys().next().value!);
+ passes.set(fingerprint, Date.now() + 5 * 60_000);
+ } catch (error) {
+ passes.delete(fingerprint);
+ if (error instanceof ModelProbeError) throw error;
+ const facts = (error as { facts?: PublicErrorFacts })?.facts ?? failureFacts;
+ if (error instanceof GatewayError && error.code === 'credits_insufficient') {
+ throw new ModelProbeError('model_probe_credits_insufficient', facts);
+ }
+ if (error instanceof GatewayError && [401, 429].includes(error.status)) {
+ throw new ModelProbeError(error.status === 401 ? 'model_probe_auth_required' : 'model_probe_unavailable', facts);
+ }
+ if (facts && isModelAccessFailure(facts)) {
+ throw new ModelProbeError('model_probe_failed', facts);
+ }
+ throw new ModelProbeError('model_probe_inconclusive', facts);
+ }
+ })();
+ pending.set(fingerprint, work);
+ try { await work; }
+ finally { pending.delete(fingerprint); controllers.delete(controller); }
+ }
+
+ return {
+ probe,
+ async close() { closed = true; for (const controller of controllers) controller.abort(); await Promise.allSettled(pending.values()); await transport.close(); passes.clear(); }
+ };
+}
+
+function smallest(values: string[] | undefined) {
+ return values?.slice().sort((a, b) => (parseFloat(a) || Infinity) - (parseFloat(b) || Infinity))[0];
+}
diff --git a/apps/daemon/src/gateway/official-fetch.ts b/apps/daemon/src/gateway/official-fetch.ts
index 7d0a64c0..c1850e47 100644
--- a/apps/daemon/src/gateway/official-fetch.ts
+++ b/apps/daemon/src/gateway/official-fetch.ts
@@ -10,6 +10,7 @@ export function createOfficialFetch(input: {
} = {}): typeof fetch {
let systemProxy: Promise<string> | undefined;
let proxyCheckedAt = 0;
+ const proxyAgents = new Map<string, HttpsProxyAgent<string>>();
async function proxy() {
const configured = (await input.readProxy?.())?.trim();
if (configured) return configured;
@@ -38,10 +39,15 @@ export function createOfficialFetch(input: {
const content = request.body ? Buffer.from(await request.arrayBuffer()) : undefined;
const headers = Object.fromEntries(request.headers);
if (content) headers['content-length'] = String(content.length);
+ let agent = proxyAgents.get(address);
+ if (!agent) {
+ agent = new HttpsProxyAgent(address, { keepAlive: true, maxFreeSockets: 2 });
+ proxyAgents.set(address, agent);
+ }
// Return the stream as soon as headers arrive; image persistence owns its deadline.
return new Promise<Response>((resolve, reject) => {
const remote = httpsRequest(request.url, {
- method: request.method, headers, agent: new HttpsProxyAgent(address), signal: request.signal
+ method: request.method, headers, agent, signal: request.signal
}, response => {
const responseHeaders = new Headers();
for (const [name, value] of Object.entries(response.headers)) {
diff --git a/apps/daemon/src/gateway/official-stream.ts b/apps/daemon/src/gateway/official-stream.ts
index 5475263b..af6a402c 100644
--- a/apps/daemon/src/gateway/official-stream.ts
+++ b/apps/daemon/src/gateway/official-stream.ts
@@ -1,14 +1,28 @@
// Preserve model output while replacing upstream operational errors with product-facing text.
-export function officialEventStream(stream: ReadableStream<Uint8Array>, onError?: (error: unknown) => void | Promise<void>) {
+export function officialEventStream(stream: ReadableStream<Uint8Array>, onError?: (error: unknown) => void | Promise<void>, onComplete?: () => void | Promise<void>, operation = 'responses') {
const decoder = new TextDecoder(); const encoder = new TextEncoder(); let buffered = '';
+ let failed = false;
+ let completed = false;
+ async function complete() {
+ if (failed || completed) return;
+ completed = true;
+ try { await onComplete?.(); } catch {}
+ }
async function sanitize(frame: string) {
const lines: string[] = [];
for (let line of frame.split('\n')) {
if (!line.startsWith('data:')) { lines.push(line); continue; }
+ if (line.slice(5).trim() === '[DONE]') {
+ if (operation === 'chat/completions') await complete();
+ lines.push(line); continue;
+ }
try {
const value = JSON.parse(line.slice(5)) as { type?: string; message?: string; error?: unknown; response?: { error?: unknown; status?: string } };
const error = value.error ?? value.response?.error ?? (value.type === 'error' ? value : undefined);
+ if (error || ['response.failed', 'response.incomplete'].includes(value.type ?? '')
+ || ['failed', 'incomplete', 'cancelled'].includes(value.response?.status ?? '')) failed = true;
if (error) { try { await onError?.(error); } catch {} }
+ if (operation === 'responses' && value.type === 'response.completed' && value.response?.status === 'completed') await complete();
if (value.type === 'error') { lines.push(`data: ${JSON.stringify({ type: 'error', error: { code: 'official_service_unavailable', message: 'The official model service is unavailable' } })}`); continue; }
if (value.error) value.error = { code: 'official_service_unavailable', message: 'The official model service is unavailable' };
if (value.response?.error) value.response.error = { code: 'official_service_unavailable', message: 'The official model service is unavailable' };
diff --git a/apps/daemon/src/gateway/openrouter-model-catalog.ts b/apps/daemon/src/gateway/openrouter-model-catalog.ts
new file mode 100644
index 00000000..b11b4de7
--- /dev/null
+++ b/apps/daemon/src/gateway/openrouter-model-catalog.ts
@@ -0,0 +1,77 @@
+import { z } from 'zod';
+import type { GatewayModel } from '@opencreator/protocol';
+
+const strings = z.array(z.string().min(1));
+const descriptor = z.object({
+ type: z.string(), values: strings.optional(), min: z.number().optional(), max: z.number().optional()
+});
+const parameters = z.record(descriptor);
+export const openRouterModelSchema = z.object({
+ id: z.string().min(1),
+ architecture: z.object({ input_modalities: strings.optional(), output_modalities: strings.optional() }).optional(),
+ supported_voices: strings.nullish(),
+ supported_parameters: z.union([strings, parameters]).optional()
+});
+export const imageModelsSchema = z.object({ data: z.array(z.object({
+ id: z.string().min(1), supported_parameters: parameters
+})) });
+export const videoModelsSchema = z.object({ data: z.array(z.object({
+ id: z.string().min(1), supported_sizes: strings.nullish(),
+ supported_durations: z.array(z.number().int().positive()).nullish(),
+ supported_resolutions: strings.nullish(), supported_aspect_ratios: strings.nullish(),
+ supported_frame_images: strings.nullish()
+})) });
+
+type CatalogModel = z.infer<typeof openRouterModelSchema>;
+type ImageModel = z.infer<typeof imageModelsSchema>['data'][number];
+type VideoModel = z.infer<typeof videoModelsSchema>['data'][number];
+
+export function officialCatalogModels(
+ candidates: GatewayModel[], catalog: CatalogModel[], images: ImageModel[] = [], videos: VideoModel[] = []
+): GatewayModel[] {
+ const directory = new Map(catalog.map(model => [model.id, model]));
+ const imageProfiles = new Map(images.map(model => [model.id, model]));
+ const videoProfiles = new Map(videos.map(model => [model.id, model]));
+ return candidates.flatMap(candidate => {
+ const entry = directory.get(candidate.id);
+ if (!entry || (entry.architecture?.output_modalities && !entry.architecture.output_modalities.includes(candidate.modality))) return [];
+ const model = structuredClone(candidate);
+ const setCapability = (name: string, enabled: boolean) => {
+ model.capabilities = model.capabilities.filter(value => value !== name);
+ if (enabled) model.capabilities.push(name);
+ };
+ if (model.modality === 'speech' && entry.supported_voices?.length) {
+ model.voices = [...new Set(entry.supported_voices)];
+ setCapability('default_voice', false);
+ }
+ if (model.modality === 'image') {
+ const profile = imageProfiles.get(model.id);
+ const options = profile?.supported_parameters
+ ?? (entry.supported_parameters && !Array.isArray(entry.supported_parameters) ? entry.supported_parameters : undefined);
+ if (options) {
+ const values = (name: string) => options[name]?.type === 'enum' ? options[name]?.values : undefined;
+ const maximum = (name: string, fallback: number, cap: number) => {
+ const value = options[name]?.max;
+ return typeof value === 'number' && Number.isInteger(value) && value >= 0 ? Math.min(value, cap) : fallback;
+ };
+ model.imageOptions = {
+ aspectRatios: values('aspect_ratio'), resolutions: values('resolution'),
+ qualities: values('quality'), outputFormats: values('output_format'),
+ maxImages: Math.max(1, maximum('n', 1, 10)), maxReferences: maximum('input_references', 0, 16)
+ };
+ setCapability('edit', model.imageOptions.maxReferences > 0);
+ }
+ }
+ if (model.modality === 'video') {
+ const profile = videoProfiles.get(model.id);
+ if (profile) {
+ model.sizes = profile.supported_sizes?.filter(value => /^\d+x\d+$/.test(value)) ?? [];
+ model.durations = profile.supported_durations ?? [];
+ model.resolutions = profile.supported_resolutions ?? [];
+ model.aspectRatios = profile.supported_aspect_ratios ?? [];
+ setCapability('image_to_video', profile.supported_frame_images?.includes('first_frame') === true);
+ }
+ }
+ return [model];
+ });
+}
diff --git a/apps/daemon/src/gateway/runtime-bindings.ts b/apps/daemon/src/gateway/runtime-bindings.ts
index b1365ad6..d5569bec 100644
--- a/apps/daemon/src/gateway/runtime-bindings.ts
+++ b/apps/daemon/src/gateway/runtime-bindings.ts
@@ -1,8 +1,10 @@
import { randomUUID } from 'node:crypto';
-import { chmodSync, existsSync, lstatSync, mkdirSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
import { isAbsolute, join } from 'node:path';
+import { parse, stringify } from '@iarna/toml';
import { createDirectRuntime, type DirectRuntimeUse } from './direct-runtime.js';
import { createOfficialFetch } from './official-fetch.js';
+import { isKnownDirectBase } from './supplier.js';
export type GatewayRuntimeBindingsInput = {
codexHome: string;
@@ -12,6 +14,7 @@ export type GatewayRuntimeBindingsInput = {
closeRuntime(): Promise<void>;
parentEnvironment?: NodeJS.ProcessEnv;
direct?: boolean;
+ gateway?: boolean;
readProxy?(): Promise<string>;
beginUse?(): Promise<DirectRuntimeUse>;
recoverKey?(keyVersion: string): Promise<{ key: string; keyVersion: string }>;
@@ -42,6 +45,16 @@ export function createGatewayRuntimeBindings(input: GatewayRuntimeBindingsInput)
if (!admitting || generation !== expectedGeneration) throw new Error('Official Runtime is signed out');
}
+ function writeConfiguration(config: string) {
+ const temporary = join(input.codexHome, `.config-${randomUUID()}.tmp`);
+ try {
+ writeFileSync(temporary, config, { flag: 'wx', mode: 0o600 });
+ renameSync(temporary, join(input.codexHome, 'config.toml'));
+ } finally {
+ rmSync(temporary, { force: true });
+ }
+ }
+
async function prepare(): Promise<GatewayRuntimePreparation> {
assertOpen();
if (preparation !== undefined) return preparation;
@@ -52,9 +65,9 @@ export function createGatewayRuntimeBindings(input: GatewayRuntimeBindingsInput)
if (!credentials.accountId || !credentials.modelKey || !credentials.keyVersion) {
throw new Error('Official Runtime credentials are unavailable');
}
- if (input.direct) {
- if (input.baseUrl !== 'https://openrouter.ai/api/v1') throw new Error('Invalid official endpoint');
- connection ??= await createDirectRuntime(credentials.modelKey, createOfficialFetch({ readProxy: input.readProxy }), input.beginUse, input.recoverKey);
+ if (input.direct || input.gateway) {
+ if (input.direct && !isKnownDirectBase(input.baseUrl)) throw new Error('Invalid official endpoint');
+ connection ??= await createDirectRuntime(credentials.modelKey, createOfficialFetch({ readProxy: input.readProxy }), input.beginUse, input.recoverKey, input.baseUrl, input.gateway);
assertOpen(preparingGeneration);
}
mkdirSync(input.codexHome, { recursive: true, mode: 0o700 });
@@ -67,6 +80,7 @@ export function createGatewayRuntimeBindings(input: GatewayRuntimeBindingsInput)
`model = ${JSON.stringify(input.model)}`,
'model_provider = "opencreator_gateway"',
'cli_auth_credentials_store = "file"',
+ ...(input.gateway ? ['web_search = "disabled"'] : []),
'[shell_environment_policy]',
'inherit = "core"',
'exclude = ["OC_GATEWAY_MODEL_KEY"]',
@@ -88,13 +102,7 @@ export function createGatewayRuntimeBindings(input: GatewayRuntimeBindingsInput)
'hooks = false',
''
].join('\n');
- const temporary = join(input.codexHome, `.config-${randomUUID()}.tmp`);
- try {
- writeFileSync(temporary, config, { flag: 'wx', mode: 0o600 });
- renameSync(temporary, join(input.codexHome, 'config.toml'));
- } finally {
- rmSync(temporary, { force: true });
- }
+ writeConfiguration(config);
const env: Record<string, string> = {};
const parent = input.parentEnvironment ?? process.env;
for (const name of ['PATH', 'SystemRoot', 'SYSTEMROOT', 'WINDIR', 'TEMP', 'TMP', 'TMPDIR', 'LANG', 'LC_ALL', 'LC_CTYPE', 'TZ']) {
@@ -122,6 +130,15 @@ export function createGatewayRuntimeBindings(input: GatewayRuntimeBindingsInput)
return {
prepare,
+ async updateModel(model: string) {
+ if (!model.trim()) throw new Error('Official Runtime model is required');
+ const prepared = await prepare();
+ assertOpen(prepared.generation);
+ const config = parse(readFileSync(join(input.codexHome, 'config.toml'), 'utf8'));
+ if (config.model === model) return;
+ config.model = model;
+ writeConfiguration(stringify(config));
+ },
beginLogout,
async close() {
beginLogout();
diff --git a/apps/daemon/src/gateway/platform-probe.ts b/apps/daemon/src/gateway/runtime-probe.ts
similarity index 57%
rename from apps/daemon/src/gateway/platform-probe.ts
rename to apps/daemon/src/gateway/runtime-probe.ts
index 378a429e..d936ad68 100644
--- a/apps/daemon/src/gateway/platform-probe.ts
+++ b/apps/daemon/src/gateway/runtime-probe.ts
@@ -1,11 +1,12 @@
+import { isDirectTransport } from './supplier.js';
import { mkdtemp, rm } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import type { GatewayAccountService } from './account-service.js';
import { createGatewayRuntimeBindings } from './runtime-bindings.js';
-export async function preparePlatformProbe(input: {
- account: Pick<GatewayAccountService, 'readState' | 'probeCredentials'>;
+export async function prepareOfficialRuntimeProbe(input: {
+ account: Pick<GatewayAccountService, 'readState' | 'beginModelUse'>;
readProxy(): Promise<string>;
}) {
const state = await input.account.readState();
@@ -13,16 +14,20 @@ export async function preparePlatformProbe(input: {
const model = state.models.find(candidate => candidate.id === state.selectedModels?.text
&& candidate.modality === 'text' && candidate.capabilities.includes('responses'));
if (!model) return undefined;
- const credentials = await input.account.probeCredentials();
- const home = await mkdtemp(join(tmpdir(), 'opencreator-platform-probe-'));
+ const use = await input.account.beginModelUse();
+ let home: string;
+ try { home = await mkdtemp(join(tmpdir(), 'opencreator-runtime-probe-')); }
+ catch (error) { await use.release(); throw error; }
+ const credentials = use.credentials;
const bindings = createGatewayRuntimeBindings({
- codexHome: home, baseUrl: credentials.baseUrl, model: model.id, direct: true,
+ codexHome: home, baseUrl: credentials.baseUrl, model: model.id, direct: isDirectTransport(credentials.transport), gateway: credentials.transport === 'gateway',
readProxy: input.readProxy,
- readCredentials: async () => ({ accountId: state.account!.id, modelKey: credentials.modelKey, keyVersion: credentials.keyVersion }),
+ readCredentials: async () => credentials,
closeRuntime: async () => undefined
});
const cleanup = async () => {
- try { await bindings.close(); } finally { await rm(home, { recursive: true, force: true }); }
+ try { await bindings.close(); }
+ finally { try { await rm(home, { recursive: true, force: true }); } finally { await use.release(); } }
};
try { return { ...await bindings.prepare(), cleanup }; }
catch (error) { await cleanup(); throw error; }
diff --git a/apps/daemon/src/gateway/runtime-source.ts b/apps/daemon/src/gateway/runtime-source.ts
index 079c25e0..23444995 100644
--- a/apps/daemon/src/gateway/runtime-source.ts
+++ b/apps/daemon/src/gateway/runtime-source.ts
@@ -1,5 +1,5 @@
-import type { GatewayAccountState } from '@opencreator/protocol';
-import type { AppServerRuntimeManager, AppServerRuntimeTurnInput } from '../codex/app-server-runtime-manager.js';
+import { gatewayModelCompatible, gatewayModelReady, type GatewayAccountState } from '@opencreator/protocol';
+import type { AppServerRuntimeExecution, AppServerRuntimeManager, AppServerRuntimeTurnInput } from '../codex/app-server-runtime-manager.js';
import { GatewayError } from './client.js';
export function createRuntimeSource(manual: AppServerRuntimeManager, readState: () => GatewayAccountState, readOfficial: () => AppServerRuntimeManager | undefined): AppServerRuntimeManager {
@@ -11,13 +11,17 @@ export function createRuntimeSource(manual: AppServerRuntimeManager, readState:
if (state.authState !== 'signed_in' || state.activationState !== 'ready' || !official) throw new GatewayError('services_not_ready');
return official;
}
- function turn(input: AppServerRuntimeTurnInput) {
+ function turn(input: AppServerRuntimeTurnInput): AppServerRuntimeExecution {
const state = readState();
const manager = current();
- const model = state.models.find(model => model.modality === 'text' && model.id === input.model) ?? state.models.find(model => model.modality === 'text' && model.id === state.selectedModels?.text) ?? state.models.find(model => model.modality === 'text');
if (state.source === 'manual') return manager.startTurn(input);
+ const models = state.models.filter(model => model.modality === 'text' && model.capabilities.includes('responses')
+ && gatewayModelReady(model) && (state.transport !== 'gateway' || gatewayModelCompatible(model)));
+ const model = input.model ? models.find(model => model.id === input.model)
+ : models.find(model => model.id === state.selectedModels?.text) ?? (state.transport === 'gateway' ? undefined : models[0]);
+ if (!model) throw new GatewayError('invalid_model', 400);
const identity = JSON.stringify([state.account?.id, state.bindingVersion, input.scope.kind, input.scope.id, input.thread.id]);
- return manager.startTurn({ ...input, profile: 'default', model: model?.id, codexThreadId: officialThreads.get(identity), runtimeInjection: undefined,
+ return manager.startTurn({ ...input, profile: 'default', model: model.id, codexThreadId: officialThreads.get(identity), runtimeInjection: undefined,
async onThreadStarted(id) { officialThreads.set(identity, id); await input.onThreadStarted?.(id); }
});
}
diff --git a/apps/daemon/src/gateway/supplier-media.ts b/apps/daemon/src/gateway/supplier-media.ts
new file mode 100644
index 00000000..90e5d3f4
--- /dev/null
+++ b/apps/daemon/src/gateway/supplier-media.ts
@@ -0,0 +1,78 @@
+import { GatewayError } from './client.js';
+import { createHash } from 'node:crypto';
+
+const deliveryHosts = new Set(['assets.88api.ai', 'cg-comfyui-prod.tos-cn-beijing.volces.com', 'store.vod-qcloud.com',
+ 'ark-acg-cn-beijing.tos-cn-beijing.volces.com', 'ark-acg-beijing.tos-cn-beijing.volces.com']);
+export const chatAnywhereMediaHosts = new Set(['api.chatanywhere.tech', 'api.chatanywhere.org', 'oaidalleapiprodscus.blob.core.windows.net']);
+
+function mediaURL(address: string, upload = false, hosts = deliveryHosts) {
+ let url: URL;
+ try { url = new URL(address); } catch { throw new GatewayError('invalid_gateway_response'); }
+ if (url.protocol !== 'https:' || !(upload ? url.hostname === 'assets.88api.ai' : hosts.has(url.hostname))
+ || (url.port && url.port !== '443') || url.username || url.password) throw new GatewayError('unsupported_media_origin');
+ return url;
+}
+
+export async function downloadSupplierMedia(fetcher: typeof fetch, address: string, signal: AbortSignal, maxBytes = 64 * 1024 * 1024, hosts = deliveryHosts): Promise<Response> {
+ let url = mediaURL(address, false, hosts);
+ for (let redirects = 0; redirects <= 4; redirects++) {
+ mediaURL(url.href, false, hosts);
+ const response = await fetcher(url.href, { method: 'GET', redirect: 'manual', signal, headers: {} });
+ if ([301, 302, 303, 307, 308].includes(response.status)) {
+ const location = response.headers.get('location'); await response.body?.cancel();
+ if (!location) throw new GatewayError('invalid_gateway_response');
+ try { url = new URL(location, url); } catch { throw new GatewayError('invalid_gateway_response'); }
+ continue;
+ }
+ if (!response.ok || !response.body) { await response.body?.cancel(); throw new GatewayError('invalid_gateway_response'); }
+ const reader = response.body.getReader(); let bytes = 0;
+ return new Response(new ReadableStream<Uint8Array>({
+ async pull(controller) {
+ try {
+ const item = await reader.read();
+ if (item.done) { if (!bytes) throw new GatewayError('invalid_gateway_response'); controller.close(); return; }
+ bytes += item.value.byteLength;
+ if (bytes > maxBytes) throw new GatewayError('invalid_gateway_response');
+ controller.enqueue(item.value);
+ } catch (error) { await reader.cancel().catch(() => undefined); controller.error(error); }
+ },
+ cancel() { return reader.cancel(); }
+ }), { headers: { 'Content-Type': response.headers.get('content-type') ?? 'application/octet-stream' } });
+ }
+ throw new GatewayError('invalid_gateway_response');
+}
+
+export type MediaUploader = (bytes: Buffer, mime: string) => Promise<string>;
+
+export async function uploadSupplierMedia(bytes: Buffer, mime: string, fetcher: typeof fetch,
+ authorize: (body: Record<string, unknown>) => Promise<Response>, signal: AbortSignal): Promise<string> {
+ if (!bytes.length || bytes.length > 100_000_000 || !/^(image|audio|video)\/[a-z0-9.+-]+$/i.test(mime)) throw new GatewayError('capability_unsupported', 400);
+ const permit = await (await authorize({ size: bytes.length, mime_type: mime, sha256: createHash('sha256').update(bytes).digest('base64url') })).json();
+ const target = mediaURL(permit.upload_url, true); const result = mediaURL(permit.url, true);
+ const headers = new Headers(permit.headers);
+ if (permit.method !== 'PUT' || headers.get('content-type') !== mime || !headers.get('x-media-upload-token')
+ || [...headers.keys()].some(name => !['content-type', 'x-media-upload-token'].includes(name))) throw new GatewayError('invalid_gateway_response');
+ let uploaded: Response | undefined;
+ try { uploaded = await fetcher(target.href, { method: 'PUT', redirect: 'error', signal, headers, body: new Uint8Array(bytes) }); }
+ catch { signal.throwIfAborted(); }
+ if (uploaded?.status === 201) { await uploaded.body?.cancel(); return result.href; }
+ const ambiguous = !uploaded || uploaded.status === 409 || uploaded.status >= 500;
+ await uploaded?.body?.cancel();
+ if (ambiguous) {
+ const existing = await fetcher(result.href, { method: 'HEAD', redirect: 'error', signal, headers: {} });
+ if (existing.ok && existing.headers.get('content-length') === String(bytes.length) && existing.headers.get('content-type')?.split(';')[0] === mime) return result.href;
+ await existing.body?.cancel();
+ }
+ throw new GatewayError('media_upload_failed', 503);
+}
+
+export async function publicMediaReference(value: unknown, upload: MediaUploader): Promise<string> {
+ if (typeof value !== 'string' || !value) throw new GatewayError('capability_unsupported', 400);
+ const data = /^data:((?:image|audio|video)\/[a-z0-9.+-]+);base64,([A-Za-z0-9+/]+={0,2})$/i.exec(value);
+ if (data) return upload(Buffer.from(data[2]!, 'base64'), data[1]!);
+ let url: URL;
+ try { url = new URL(value); } catch { throw new GatewayError('capability_unsupported', 400); }
+ if (url.protocol !== 'https:' || url.username || url.password || url.port && url.port !== '443'
+ || /^(localhost|.*\.localhost|.*\.local|\[.*\]|[\d.]+)$/i.test(url.hostname)) throw new GatewayError('capability_unsupported', 400);
+ return value;
+}
diff --git a/apps/daemon/src/gateway/supplier.ts b/apps/daemon/src/gateway/supplier.ts
new file mode 100644
index 00000000..2415e0fd
--- /dev/null
+++ b/apps/daemon/src/gateway/supplier.ts
@@ -0,0 +1,24 @@
+export const supplierBases = {
+ openrouter: 'https://openrouter.ai/api/v1',
+ '88api': 'https://api.88api.ai/v1',
+ chatanywhere: 'https://api.chatanywhere.tech/v1'
+} as const;
+
+export const chatAnywhereOverseasBase = 'https://api.chatanywhere.org/v1';
+export type SupplierRegion = 'auto' | 'domestic' | 'overseas';
+export function isChatAnywhereBase(base: string): boolean {
+ return base === supplierBases.chatanywhere || base === chatAnywhereOverseasBase;
+}
+export function isSupplierBase(supplier: string | undefined, base: string): boolean {
+ return supplier === 'chatanywhere' ? isChatAnywhereBase(base)
+ : supplier === '88api' ? base === supplierBases['88api']
+ : supplier === 'openrouter' ? base === supplierBases.openrouter : false;
+}
+
+export function isDirectTransport(transport: string | undefined): boolean {
+ return transport === 'openrouter-direct' || transport === 'supplier-direct';
+}
+
+export function isKnownDirectBase(baseUrl: string): boolean {
+ return Object.values(supplierBases).some(base => base === baseUrl) || baseUrl === chatAnywhereOverseasBase;
+}
diff --git a/apps/daemon/src/image-generation/provider.ts b/apps/daemon/src/image-generation/provider.ts
index 3ddfc82e..14daee20 100644
--- a/apps/daemon/src/image-generation/provider.ts
+++ b/apps/daemon/src/image-generation/provider.ts
@@ -92,7 +92,9 @@ export async function generateImageContents(
const referenceImages = options.referenceImages
?? (options.referenceImage === undefined ? [] : [options.referenceImage]);
const gateway = gatewayCreatorBinding(config);
- const capabilities = gateway ? { supportsReferenceImage: gateway.capabilities?.image?.includes('edit') === true, maxReferenceImages: gateway.capabilities?.image?.includes('edit') ? 1 : 0 } : imageGenerationCapabilities(request.provider);
+ const profile = gateway?.catalog?.find(model => model.modality === 'image' && model.id === gateway.models.image);
+ const capabilities = gateway ? { supportsReferenceImage: gateway.capabilities?.image?.includes('edit') === true,
+ maxReferenceImages: gateway.capabilities?.image?.includes('edit') ? profile?.imageOptions?.maxReferences ?? 1 : 0 } : imageGenerationCapabilities(request.provider);
const controller = new AbortController();
const timeout = setTimeout(() => controller.abort(new DOMException(gateway ? 'Image generation timed out. Check the request status before retrying to avoid duplicate charges.' : 'Image generation timed out. Try again.', 'TimeoutError')), gateway ? DIRECT_IMAGE_TIMEOUT_MS + 30_000 : REQUEST_TIMEOUT_MS);
const abort = () => controller.abort(options.signal?.reason);
@@ -262,7 +264,7 @@ async function generateOpenAiImages(
if (gatewayRequest && /^[A-Za-z0-9_-]{12,128}$/.test(gatewayRequest)) onGatewayRequest?.(gatewayRequest);
if (official && response.status === 202) {
const accepted = await response.json() as { requestId?: string };
- if (!accepted.requestId || accepted.requestId !== gatewayRequest || !/^ocdir_[a-f0-9]{48}$/.test(accepted.requestId)) {
+ if (!accepted.requestId || accepted.requestId !== gatewayRequest || !/^(?:ocdir|ocreq)_[a-f0-9]{48}$/.test(accepted.requestId)) {
throw new ImageGenerationProviderError('upstream_error', 'Invalid image generation receipt');
}
const statusUrl = openAiCompatibleEndpoint(provider.baseUrl, `requests/${accepted.requestId}`);
diff --git a/apps/daemon/src/main.ts b/apps/daemon/src/main.ts
index a66dc0ea..36bf3b7a 100644
--- a/apps/daemon/src/main.ts
+++ b/apps/daemon/src/main.ts
@@ -20,7 +20,7 @@ import {
import { resolveCodexHome } from './codex/home.js';
import { importLocalCodexConfiguration } from './codex/probe-home.js';
import { setTimeout as delay } from 'node:timers/promises';
-import type { preparePlatformProbe } from './gateway/platform-probe.js';
+import type { prepareOfficialRuntimeProbe } from './gateway/runtime-probe.js';
import {
CODEX_PROBE_TIMEOUT_MS,
probeCodex
@@ -33,6 +33,7 @@ import {
import {
createProductionServerInput,
parseRuntimeChannel,
+ requiresPaidStartupProbe,
resolveProductionRuntimePaths,
resolveProductionServerEnvironment
} from './startup.js';
@@ -137,8 +138,7 @@ async function main(): Promise<void> {
return;
}
- const shouldRunAvailabilityProbe =
- requiresProbe() && process.env.OPENCREATOR_CODEX_PROBE_VERIFIED !== '1';
+ const shouldRunAvailabilityProbe = requiresPaidStartupProbe();
let availabilityProbe: CodexAvailabilityProbe = shouldRunAvailabilityProbe
? { status: 'pending' }
: {
@@ -158,7 +158,7 @@ async function main(): Promise<void> {
startBackgroundRefresh() {}
};
const capabilities = capabilityResolution.state;
- let prepareAvailabilityProbe: (() => ReturnType<typeof preparePlatformProbe>) | undefined;
+ let prepareAvailabilityProbe: (() => ReturnType<typeof prepareOfficialRuntimeProbe>) | undefined;
const { buildServer } = await import('./api/server.js');
server = await buildServer(createProductionServerInput({
token,
@@ -223,16 +223,12 @@ async function main(): Promise<void> {
}).catch(() => {
if (!controller.signal.aborted) availabilityProbe = {
status: 'failed', checkedAt: new Date().toISOString(),
- errorCode: 'PLATFORM_PROBE_UNAVAILABLE', message: 'Platform availability probe is unavailable'
+ errorCode: 'OFFICIAL_PROBE_UNAVAILABLE', message: 'Official model availability probe is unavailable'
};
});
}
}
-function requiresProbe(): boolean {
- return process.env.OPENCREATOR_REQUIRE_CODEX_PROBE === '1';
-}
-
async function closeServer(): Promise<void> {
stopManagedParentWatch?.();
stopManagedParentWatch = undefined;
@@ -413,7 +409,7 @@ function probeErrorMessage(input: {
async function runAvailabilityProbe(input: {
codexBin: string;
dataDir: string;
- prepare(): ReturnType<typeof preparePlatformProbe>;
+ prepare(): ReturnType<typeof prepareOfficialRuntimeProbe>;
signal: AbortSignal;
update(probe: CodexAvailabilityProbe): void;
}): Promise<void> {
diff --git a/apps/daemon/src/startup.ts b/apps/daemon/src/startup.ts
index 6dc6590d..85f61fcd 100644
--- a/apps/daemon/src/startup.ts
+++ b/apps/daemon/src/startup.ts
@@ -30,6 +30,13 @@ export type ProductionRuntimePaths = {
codexHome: string;
};
+export function requiresPaidStartupProbe(env: NodeJS.ProcessEnv = process.env): boolean {
+ // Desktop readiness checks alone must not trigger billable model inference.
+ return env.OPENCREATOR_REQUIRE_CODEX_PROBE === '1'
+ && env.OPENCREATOR_ENABLE_PAID_STARTUP_PROBE === '1'
+ && env.OPENCREATOR_CODEX_PROBE_VERIFIED !== '1';
+}
+
export function resolveProductionServerEnvironment(
env: NodeJS.ProcessEnv = process.env
): Pick<
diff --git a/apps/daemon/src/video-generation/service.ts b/apps/daemon/src/video-generation/service.ts
index 151cc6ad..81288296 100644
--- a/apps/daemon/src/video-generation/service.ts
+++ b/apps/daemon/src/video-generation/service.ts
@@ -26,6 +26,7 @@ import {
} from '../creator-services/upstream-fetch.js';
import { publicFactsFromFailure } from '../creator/public-error-facts.js';
import type { GatewayCreatorBinding } from '../gateway/creator-service-source.js';
+import { writePrivateJsonFile } from '../config/private-json-file.js';
const MAX_PROMPT_LENGTH = 4_000;
const MAX_REFERENCE_IMAGE_BYTES = 5 * 1024 * 1024;
@@ -53,6 +54,7 @@ export type VideoGenerationOperationOptions = {
};
export type VideoGenerationService = {
+ uploadReference?(content: Buffer, mime: string): Promise<{ assetId: string; expiresAt: string }>;
create(
request: CreateVideoGenerationRequest,
options?: VideoGenerationOperationOptions
@@ -112,15 +114,15 @@ export function createVideoGenerationService(input: {
async function writeStored(value: StoredVideoGeneration) {
try {
await mkdir(resultDir(value.result.id), { recursive: true, mode: 0o700 });
- await writeFile(metadataPath(value.result.id), `${JSON.stringify(value)}\n`, { mode: 0o600 });
+ await writePrivateJsonFile(metadataPath(value.result.id), value);
} catch {
throw new VideoGenerationError('VIDEO_GENERATION_STORAGE_FAILED', 'Video generation metadata could not be stored', 500);
}
}
- async function gatewayCall(binding: GatewayCreatorBinding, resource: string, options: VideoGenerationOperationOptions, params?: Record<string, unknown>, logicalId?: string) {
+ async function gatewayCall(binding: GatewayCreatorBinding, resource: string, options: VideoGenerationOperationOptions, params?: Record<string, unknown>, logicalId?: string, timeoutMs = REQUEST_TIMEOUT_MS) {
const response = await (input.fetchImpl ?? fetch)(`${binding.baseUrl}/${resource}`, {
- method: params ? 'POST' : 'GET', redirect: 'error', signal: options.signal ?? AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+ method: params ? 'POST' : 'GET', redirect: 'error', signal: AbortSignal.any([AbortSignal.timeout(timeoutMs), ...(options.signal ? [options.signal] : [])]),
headers: { Authorization: `Bearer ${binding.apiKey}`, 'Content-Type': 'application/json', ...(logicalId ? { 'Idempotency-Key': logicalId } : {}) },
...(params ? { body: JSON.stringify(params) } : {})
});
@@ -137,23 +139,30 @@ export function createVideoGenerationService(input: {
const response = stored.upstreamId
? await gatewayCall(source, `requests/${encodeURIComponent(stored.upstreamId)}`, options)
: await gatewayCall(source, 'video/jobs', options, stored.gateway.params, stored.gateway.logicalId);
- const payload = await response.json() as { requestId?: string; state?: string };
- if (!payload.requestId || !/^[A-Za-z0-9_-]{12,128}$/.test(payload.requestId)) throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'Invalid official video receipt', 502);
+ const payload = await response.json() as { requestId?: string; state?: string; status?: string; phase?: string; progress?: number | null; errorCode?: string };
+ if (!payload.requestId || !/^(?:ocdir|ocreq)_[a-f0-9]{48}$/.test(payload.requestId)
+ || response.headers.get('X-Request-ID') !== payload.requestId || stored.upstreamId && stored.upstreamId !== payload.requestId
+ || !['submitting', 'waiting_upstream', 'succeeded', 'failed', 'canceled', 'outcome_unknown'].includes(payload.state ?? '')) throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'Invalid official video receipt', 502);
stored.upstreamId = payload.requestId;
options.onGatewayRequest?.(payload.requestId);
const completed = payload.state === 'succeeded';
- stored.result = { ...stored.result, status: completed ? 'in_progress' : ['failed','canceled'].includes(payload.state ?? '') ? 'failed' : 'in_progress', progress: completed ? 90 : 0, progressKnown: false, updatedAt: now().toISOString() };
+ const failed = ['failed','canceled'].includes(payload.state ?? '');
+ const progressKnown = typeof payload.progress === 'number' && Number.isFinite(payload.progress) && payload.progress >= 0 && payload.progress <= 100;
+ const phase = completed || payload.phase === 'downloading' ? 'downloading' : payload.state === 'outcome_unknown' ? 'reconciling' : payload.status === 'queued' ? 'queued' : payload.phase === 'preparing' ? 'preparing' : 'generating';
+ stored.result = { ...stored.result, status: failed ? 'failed' : phase === 'queued' || phase === 'preparing' ? 'queued' : 'in_progress',
+ phase, progress: completed ? 90 : progressKnown ? Math.min(payload.progress!, 90) : 0, progressKnown: completed || progressKnown,
+ ...(failed ? { error: payload.errorCode === 'video_reconciliation_expired' ? 'The video task could not be confirmed; reserved credits have been released' : 'The official video service could not complete this task' } : {}), updatedAt: now().toISOString() };
await writeStored(stored);
if (completed) {
options.onDownloadStart?.();
- const response = await gatewayCall(source, `requests/${encodeURIComponent(stored.upstreamId)}/result`, options);
+ const response = await gatewayCall(source, `requests/${encodeURIComponent(stored.upstreamId)}/result`, options, undefined, undefined, DOWNLOAD_TIMEOUT_MS);
const reader = response.body?.getReader(); const chunks: Buffer[] = []; let size = 0;
if (!reader) throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'The official video result is empty', 502);
for (;;) { const chunk = await reader.read(); if (chunk.done) break; size += chunk.value.length; if (size > MAX_VIDEO_BYTES) { await reader.cancel(); throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'The video result is too large', 502); } chunks.push(Buffer.from(chunk.value)); }
const content = Buffer.concat(chunks);
if (!content.length) throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'The official video result is empty', 502);
await writeFile(videoPath(stored.result.id), content, { mode: 0o600 });
- stored.result = { ...stored.result, status: 'completed', progress: 100, progressKnown: true, fileName: `OpenCreator-video-${stored.result.id}.mp4`, mime: 'video/mp4', size: content.length };
+ stored.result = { ...stored.result, status: 'completed', phase: undefined, progress: 100, progressKnown: true, fileName: `OpenCreator-video-${stored.result.id}.mp4`, mime: 'video/mp4', size: content.length, updatedAt: now().toISOString() };
await writeStored(stored);
}
return stored.result;
@@ -222,6 +231,20 @@ export function createVideoGenerationService(input: {
}
return {
+ async uploadReference(content, mime) {
+ const gateway = await input.gatewaySource?.binding();
+ if (!gateway || !gateway.models.video) throw new VideoGenerationError('VIDEO_GENERATION_CONFIG_REQUIRED', 'Sign in to upload official video references', 403);
+ if (!content.length || content.length > 100_000_000 || !/^(image|audio|video)\/[a-z0-9.+-]+$/i.test(mime)) throw new VideoGenerationError('VALIDATION_FAILED', 'Invalid video reference upload', 400);
+ const response = await (input.fetchImpl ?? fetch)(`${gateway.baseUrl}/video/assets`, { method: 'POST', redirect: 'error', signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+ headers: { Authorization: `Bearer ${gateway.apiKey}`, 'Content-Type': mime }, body: new Uint8Array(content) });
+ if (!response.ok) {
+ const failure = await creatorServiceErrorInfo(response, 'Official video upload', 'opencreator-gateway-video');
+ throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', failure.message, response.status, failure.publicFacts);
+ }
+ const result = await response.json() as { assetId?: string; expiresAt?: string };
+ if (!result.assetId || !/^ocasset_[a-f0-9]{48}$/.test(result.assetId) || !result.expiresAt || !Number.isFinite(Date.parse(result.expiresAt))) throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'Invalid video upload receipt', 502);
+ return { assetId: result.assetId, expiresAt: result.expiresAt };
+ },
async create(request, options = {}) {
const gateway = await input.gatewaySource?.binding();
validateRequest(request, gateway === undefined);
@@ -233,7 +256,20 @@ export function createVideoGenerationService(input: {
const id = createId(); validateResultId(id);
const logicalId = gateway.logicalId ?? options.logicalId ?? id;
options.onGatewayBinding?.({accountId:gateway.accountId,bindingVersion:gateway.bindingVersion,logicalId});
- const stored: StoredVideoGeneration = { upstreamId: '', gateway: { accountId: gateway.accountId, bindingVersion: gateway.bindingVersion, logicalId, params: { model: gateway.models.video, prompt: request.prompt.trim(), duration: request.duration, size: request.size, ...(request.referenceImage ? { image: referenceImageDataUrl(request.referenceImage) } : {}) } }, result: { id, prompt: request.prompt.trim(), provider: request.provider, model: gateway.models.video, videoSize: request.size, duration: request.duration, status: 'queued', progress: 0, progressKnown: false, createdAt: now().toISOString(), updatedAt: now().toISOString() } };
+ const params: Record<string, unknown> = { model: gateway.models.video, prompt: request.prompt.trim(), duration: request.duration, size: request.size,
+ ...(request.priceVersion || model.price ? { priceVersion: request.priceVersion ?? model.price!.version } : {}),
+ ...(request.generateAudio === undefined ? {} : { generate_audio: request.generateAudio }) };
+ const images = [...(request.referenceImage ? [referenceImageDataUrl(request.referenceImage)] : []), ...(request.references ?? []).filter(ref => ref.role === 'image').map(ref => ref.assetId)];
+ if (images.length) params.images = images;
+ for (const [role, key] of [['video', 'referenceVideos'], ['audio', 'referenceAudios']] as const) {
+ const refs = (request.references ?? []).filter(ref => ref.role === role).map(ref => ref.assetId);
+ if (refs.length) params[key] = refs;
+ }
+ for (const role of ['firstFrame', 'lastFrame'] as const) {
+ const ref = request.references?.find(candidate => candidate.role === role);
+ if (ref) params[role] = ref.assetId;
+ }
+ const stored: StoredVideoGeneration = { upstreamId: '', gateway: { accountId: gateway.accountId, bindingVersion: gateway.bindingVersion, logicalId, params }, result: { id, prompt: request.prompt.trim(), provider: request.provider, model: gateway.models.video, videoSize: request.size, duration: request.duration, status: 'queued', progress: 0, progressKnown: false, createdAt: now().toISOString(), updatedAt: now().toISOString() } };
await writeStored(stored); options.onPending?.(id);
return refreshGateway(stored, options);
}
@@ -805,6 +841,9 @@ function validateRequest(request: CreateVideoGenerationRequest, validateProvider
throw new VideoGenerationError('VALIDATION_FAILED', `video duration is not supported by ${request.provider}`, 400);
}
validateReferenceImage(request.referenceImage);
+ if (request.references !== undefined && (!Array.isArray(request.references) || request.references.length > 50 || request.references.some(ref => !isRecord(ref) || !['image','video','audio','firstFrame','lastFrame'].includes(ref.role) || typeof ref.assetId !== 'string' || !/^ocasset_[a-f0-9]{48}$/.test(ref.assetId)))) throw new VideoGenerationError('VALIDATION_FAILED', 'Invalid video references', 400);
+ if (['firstFrame', 'lastFrame'].some(role => (request.references ?? []).filter(ref => ref.role === role).length > 1)) throw new VideoGenerationError('VALIDATION_FAILED', 'Duplicate video frame references', 400);
+ if (validateProvider && (request.references?.length || request.generateAudio !== undefined)) throw new VideoGenerationError('VALIDATION_FAILED', 'These video options require official services', 400);
}
function validateReferenceImage(referenceImage: CreateVideoGenerationRequest['referenceImage']) {
diff --git a/apps/daemon/test/integration/creator-gateway-image.test.ts b/apps/daemon/test/integration/creator-gateway-image.test.ts
new file mode 100644
index 00000000..cf546c62
--- /dev/null
+++ b/apps/daemon/test/integration/creator-gateway-image.test.ts
@@ -0,0 +1,124 @@
+import Fastify from 'fastify';
+import { createDefaultCreatorServicesConfig, type GatewayModel } from '@opencreator/protocol';
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { expect, it, vi } from 'vitest';
+import { createCreatorAgentRepository } from '../../src/creator/agent/repository.js';
+import { createCreatorCommandDispatcher } from '../../src/creator/command-dispatcher.js';
+import { createImageExecutor } from '../../src/creator/image/executor.js';
+import { createCreatorIssueService } from '../../src/creator/issues.js';
+import { CreatorProviderRequestLedger } from '../../src/creator/provider-requests.js';
+import { createCreatorRepository } from '../../src/creator/repository.js';
+import { createCreatorService } from '../../src/creator/service.js';
+import { createCreatorStageRunner } from '../../src/creator/stage-runner.js';
+import { createDefaultCreatorTemplateRegistry } from '../../src/creator/templates/registry.js';
+import { createGatewayCreatorSource } from '../../src/gateway/creator-service-source.js';
+import { openRuntimeDatabase } from '../../src/storage/database.js';
+
+const image = Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aC1sAAAAASUVORK5CYII=', 'base64');
+
+async function fixture(prefix: 'ocreq' | 'ocdir', invalidReceipt = false) {
+ const root = await mkdtemp(join(tmpdir(), 'creator-gateway-image-'));
+ const db = openRuntimeDatabase(join(root, 'runtime.sqlite'));
+ const model: GatewayModel = { id: 'gpt-image-2', modality: 'image', capabilities: ['generate', 'edit'],
+ imageOptions: { maxImages: 1, maxReferences: 1, aspectRatios: ['1:1'], resolutions: ['1K'], qualities: ['low'] } };
+ const binding = { source: 'gateway' as const, accountId: 'a', bindingVersion: 'a:gateway:v1', supplier: 'chatanywhere' as const,
+ models: { image: model.id }, capabilities: { image: model.capabilities } };
+ const repository = createCreatorRepository(db, { serviceBinding: () => binding });
+ const issues = createCreatorIssueService(repository);
+ const ledger = new CreatorProviderRequestLedger(repository, issues);
+ const requestId = `${prefix}_${'a'.repeat(48)}`;
+ let submissions = 0;
+ const identities: string[] = [];
+ const fetcher = vi.fn<typeof fetch>(async (url, options) => {
+ expect(String(url)).toMatch(/^https:\/\/gateway\.example\/v1\//);
+ if (options?.method === 'POST') {
+ const identity = new Headers(options.headers).get('Idempotency-Key')!;
+ expect(identity).toBeTruthy();
+ identities.push(identity);
+ if (submissions > 0) {
+ expect(identity).toBe(identities[0]);
+ return Response.json({ data: [{ b64_json: image.toString('base64') }] }, { headers: { 'X-Request-ID': requestId } });
+ }
+ submissions++;
+ expect(new Headers(options.headers).get('Prefer')).toBe('respond-async');
+ return Response.json({ requestId: invalidReceipt ? `${prefix}_${'b'.repeat(48)}` : requestId, state: 'submitting' },
+ { status: 202, headers: { 'X-Request-ID': requestId } });
+ }
+ if (String(url).endsWith('/result')) return Response.json({ data: [{ b64_json: image.toString('base64') }] });
+ return Response.json({ requestId, state: 'succeeded', billingState: 'settled' });
+ });
+ let origin = '';
+ const manual = createDefaultCreatorServicesConfig();
+ const source = createGatewayCreatorSource({ ledger,
+ readJobBinding: repository.getServiceBinding, readJobState: id => repository.getJob(id)?.state, readStageRun: repository.getStageRun,
+ account: {
+ peekState: () => ({ source: 'gateway', transport: 'gateway', supplier: 'chatanywhere', authState: 'signed_in', activationState: 'ready',
+ account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: binding.bindingVersion,
+ selectedModels: binding.models, models: [model], activationError: null }),
+ modelCredentials: async () => ({ accountId: 'a', transport: 'gateway', modelKey: 'device-token', keyVersion: '1',
+ bindingVersion: binding.bindingVersion, baseUrl: 'https://gateway.example/v1', defaults: binding.models, models: [model] })
+ },
+ manual: { read: async () => manual, write: async c => c, reset: async () => manual }, getLocalOrigin: () => origin, fetcher
+ });
+ const server = Fastify();
+ await source.register(server);
+ origin = await server.listen({ host: '127.0.0.1', port: 0 });
+ const templates = createDefaultCreatorTemplateRegistry();
+ const service = createCreatorService({ repository, templates, providerRequestLedger: ledger });
+ const executor = createImageExecutor({ ledger, configStore: source.store });
+ const runner = createCreatorStageRunner({ repository, templates, issueService: issues, workRoot: join(root, 'jobs'),
+ executors: [{ id: 'image', run: stage => source.runForJob(stage.job.id, stage.stageRun.id, () => executor.run(stage)) }] });
+ const dispatcher = createCreatorCommandDispatcher({ repository, service, receipts: createCreatorAgentRepository(db), queryProviderRequest: source.queryProviderRequest });
+ const job = service.createJob({ projectId: 'project', templateId: 'image-generation', templateVersion: 2,
+ state: { prompt: 'A blue square', provider: 'openai', candidateCount: 1, size: '1024x1024', quality: 'low' } });
+ return { job, repository, dispatcher, runner, source, fetcher, identities, issues,
+ async close() { await runner.close(); await source.revoke(); await server.close(); db.close(); await rm(root, { recursive: true, force: true }); } };
+}
+
+it.each(['ocreq', 'ocdir'] as const)('saves a complete Creator image result from an asynchronous %s receipt', async prefix => {
+ const f = await fixture(prefix);
+ try {
+ const command = f.dispatcher.dispatch(f.job.id, { action: 'run-stage', expectedRevision: f.job.revision,
+ idempotencyKey: 'generate', input: { stageId: 'generate' } }, 'user');
+ await f.runner.runStageRun(command.commandReceipt.stageRunId!);
+ const result = f.repository.getJob(f.job.id)!;
+ expect(result.status).toBe('completed');
+ expect(result.state.latestResultVersion).toBe(1);
+ const artifact = result.artifacts.find(a => a.kind === 'generated_image')!;
+ expect(await readFile(artifact.path!)).toEqual(image);
+ expect(result.providerRequests.every(r => r.status === 'succeeded')).toBe(true);
+ expect(f.repository.listIssues(result.id).filter(i => i.status !== 'resolved')).toEqual([]);
+ expect(f.identities).toHaveLength(1);
+ expect(f.fetcher.mock.calls.some(([url]) => String(url).endsWith('/result'))).toBe(true);
+ } finally { await f.close(); }
+});
+
+it('rejects a mismatched receipt and recovers its paid image on retry with the original identity', async () => {
+ const f = await fixture('ocreq', true);
+ try {
+ const command = f.dispatcher.dispatch(f.job.id, { action: 'run-stage', expectedRevision: f.job.revision,
+ idempotencyKey: 'generate', input: { stageId: 'generate' } }, 'user');
+ await f.runner.runStageRun(command.commandReceipt.stageRunId!);
+ let job = f.repository.getJob(f.job.id)!;
+ expect(job.stages[0]).toMatchObject({ status: 'failed', errorMessage: 'Invalid image generation receipt' });
+ const receipt = job.providerRequests.find(r => r.provider === 'opencreator-gateway-image')!;
+ const queried = await f.dispatcher.dispatchAsync(job.id, { action: 'resolve-provider-request', expectedRevision: job.revision,
+ idempotencyKey: 'query', input: { ledgerId: receipt.id, decision: 'query' } }, 'user');
+ expect(queried.job.providerRequests.find(r => r.id === receipt.id)?.status).toBe('succeeded');
+ const retried = f.dispatcher.dispatch(job.id, { action: 'retry-stage', expectedRevision: queried.job.revision,
+ idempotencyKey: 'recover', input: { stageId: 'generate' } }, 'user');
+ const stageIssue = f.repository.listIssues(job.id).find(i => i.code === 'image_generation_failed')!;
+ f.issues.beginResolution({ jobId: job.id, issueId: stageIssue.id, resolutionAttemptId: retried.commandReceipt.stageRunId!,
+ associationKind: 'stage-run', associationId: retried.commandReceipt.stageRunId!, stageRunId: retried.commandReceipt.stageRunId! });
+ await f.runner.runStageRun(retried.commandReceipt.stageRunId!);
+ job = f.repository.getJob(job.id)!;
+ expect(job.status).toBe('completed');
+ expect(await readFile(job.artifacts.find(a => a.kind === 'generated_image')!.path!)).toEqual(image);
+ expect(f.identities).toHaveLength(2);
+ expect(new Set(f.identities).size).toBe(1);
+ expect(job.providerRequests.every(r => r.status === 'succeeded')).toBe(true);
+ expect(f.repository.listIssues(job.id).filter(i => i.status !== 'resolved')).toEqual([]);
+ } finally { await f.close(); }
+});
diff --git a/apps/daemon/test/integration/creator-gateway-services.test.ts b/apps/daemon/test/integration/creator-gateway-services.test.ts
index cbfe20fa..23ff76b7 100644
--- a/apps/daemon/test/integration/creator-gateway-services.test.ts
+++ b/apps/daemon/test/integration/creator-gateway-services.test.ts
@@ -9,9 +9,101 @@ import { join } from 'node:path';
import { openRuntimeDatabase } from '../../src/storage/database.js';
import { createCreatorRepository } from '../../src/creator/repository.js';
import { CreatorProviderRequestLedger } from '../../src/creator/provider-requests.js';
+import { createCreatorIssueService } from '../../src/creator/issues.js';
const close: Array<() => Promise<void>> = [];
afterEach(async () => { for (const callback of close.splice(0)) await callback(); });
+
+it.each(['failed', 'outcome_unknown'] as const)('reconciles a rejected Krillin stream with the gateway state (%s)', async remoteState => {
+ const root = await mkdtemp(join(tmpdir(), 'oc-gateway-krillin-error-'));
+ const db = openRuntimeDatabase(join(root, 'runtime.sqlite'));
+ const repository = createCreatorRepository(db);
+ const job = repository.createJob({ projectId: 'project', templateId: 'video-translation', templateVersion: 1, status: 'running', state: {} });
+ const stage = repository.createStageRun({ jobId: job.id, stageId: 'subtitle', executor: 'krillin', status: 'running' });
+ const manual = createDefaultCreatorServicesConfig();
+ const requestId = 'gateway_rejected_translation';
+ const fetcher = vi.fn<typeof fetch>(async (_url, options) => options?.method === 'GET'
+ ? Response.json({ requestId, state: remoteState })
+ : Response.json({ error: { code: 'official_service_unavailable' } }, { status: 503, headers: { 'X-Request-ID': requestId } }));
+ const source = module.createGatewayCreatorSource({
+ ledger: new CreatorProviderRequestLedger(repository),
+ readJobBinding: () => ({ source: 'gateway', accountId: 'a', bindingVersion: 'a:1', models: { text: 'text' }, capabilities: { text: ['chat'] } }),
+ account: {
+ peekState: () => ({ source: 'gateway', transport: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: 'a:1', models: [], activationError: null }),
+ modelCredentials: async () => ({ accountId: 'a', transport: 'gateway', modelKey: 'cloud-secret', keyVersion: '1', bindingVersion: 'a:1', baseUrl: 'https://gateway.example/v1', defaults: { text: 'text' }, models: [] })
+ },
+ manual: { read: async () => manual, write: async c => c, reset: async () => manual },
+ getLocalOrigin: () => 'http://127.0.0.1:39999', fetcher
+ });
+ const server = Fastify();
+ try {
+ await source.register(server);
+ const response = await source.runForJob(job.id, stage.id, async () => {
+ const config = await source.store.read();
+ return server.inject({ method: 'POST', url: '/internal/krillin-llm/gateway/v1/chat/completions',
+ headers: { Authorization: `Bearer ${config.llm.apiKey}` }, payload: { model: 'text', stream: true, messages: [{ role: 'user', content: 'translate' }] } });
+ });
+ const frames = response.body.trim().split('\n\n').map(frame => JSON.parse(frame.replace(/^data: /, '')));
+ expect(frames[0]).toMatchObject({ object: 'chat.completion.chunk', choices: [] });
+ expect(frames.at(-1)).toMatchObject({ error: { code: 'official_service_unavailable', type: 'upstream_error' } });
+ expect(repository.listProviderRequests(job.id)).toEqual([expect.objectContaining({ remoteTaskId: requestId,
+ status: remoteState === 'failed' ? 'failed' : 'unknown_remote_acceptance' })]);
+ expect(fetcher.mock.calls.filter(([, options]) => options?.method === 'POST')).toHaveLength(1);
+ expect(fetcher.mock.calls.filter(([, options]) => options?.method === 'GET')).toHaveLength(remoteState === 'outcome_unknown' ? 2 : 1);
+ expect(String(fetcher.mock.calls[1]![0])).toBe(`https://gateway.example/v1/requests/${requestId}`);
+ } finally {
+ await source.revoke(); await server.close(); db.close(); await rm(root, { recursive: true, force: true });
+ }
+});
+
+it.each(['temporary-network-error', 'expired-key'] as const)('recovers status lookup without another paid submission (%s)', async failure => {
+ const root = await mkdtemp(join(tmpdir(), 'oc-gateway-status-retry-'));
+ const db = openRuntimeDatabase(join(root, 'runtime.sqlite'));
+ const repository = createCreatorRepository(db);
+ const issues = createCreatorIssueService(repository);
+ const job = repository.createJob({ projectId: 'project', templateId: 'video-translation', templateVersion: 1, status: 'running', state: {} });
+ const stage = repository.createStageRun({ jobId: job.id, stageId: 'subtitle', executor: 'krillin', status: 'running' });
+ const manual = createDefaultCreatorServicesConfig();
+ const requestId = 'gateway_successful_translation';
+ let lookups = 0;
+ let modelKey = 'original-key';
+ const credentials = () => ({ accountId: 'a', transport: 'gateway' as const, modelKey, keyVersion: modelKey,
+ bindingVersion: 'a:1', baseUrl: 'https://gateway.example/v1', defaults: { text: 'text' }, models: [] });
+ const recover = vi.fn(async () => { modelKey = 'recovered-key'; return credentials(); });
+ const fetcher = vi.fn<typeof fetch>(async (_url, options) => {
+ if (options?.method !== 'GET') return Response.json({ choices: [{ message: { content: 'translated' } }] }, { headers: { 'X-Request-ID': requestId } });
+ if (++lookups === 1) {
+ if (failure === 'temporary-network-error') throw new TypeError('fetch failed');
+ return new Response(null, { status: 401 });
+ }
+ if (failure === 'expired-key') expect(new Headers(options.headers).get('Authorization')).toBe('Bearer recovered-key');
+ return Response.json({ requestId, state: 'succeeded' });
+ });
+ const source = module.createGatewayCreatorSource({ ledger: new CreatorProviderRequestLedger(repository, issues),
+ readStageRun: id => repository.getStageRun(id),
+ readJobBinding: () => ({ source: 'gateway', accountId: 'a', bindingVersion: 'a:1', models: { text: 'text' }, capabilities: { text: ['chat'] } }),
+ account: { peekState: () => ({ source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: 'a:1', models: [], activationError: null }),
+ modelCredentials: async () => credentials(), recoverModelCredentials: recover },
+ manual: { read: async () => manual, write: async c => c, reset: async () => manual },
+ getLocalOrigin: () => 'http://127.0.0.1:39999', fetcher });
+ const server = Fastify();
+ try {
+ await source.register(server);
+ const resumed = repository.createStageRun({ jobId: job.id, stageId: stage.stageId, executor: stage.executor,
+ status: 'running', progress: { resumedFromStageRunId: stage.id } });
+ await source.runForJob(job.id, resumed.id, async () => {
+ const config = await source.store.read();
+ expect((await server.inject({ method: 'POST', url: '/internal/krillin-llm/gateway/v1/chat/completions',
+ headers: { Authorization: `Bearer ${config.llm.apiKey}` }, payload: { model: 'text', messages: [{ role: 'user', content: 'translate' }] } })).statusCode).toBe(200);
+ });
+ expect(repository.listProviderRequests(job.id)).toEqual([expect.objectContaining({ stageRunId: resumed.id, status: 'succeeded', remoteTaskId: requestId })]);
+ expect(issues.list(job.id)).toEqual([]);
+ expect(fetcher.mock.calls.filter(([, options]) => options?.method === 'POST')).toHaveLength(1);
+ expect(lookups).toBe(2);
+ expect(recover).toHaveBeenCalledTimes(failure === 'expired-key' ? 1 : 0);
+ } finally { await source.revoke(); await server.close(); db.close(); await rm(root, { recursive: true, force: true }); }
+});
+
it('reuses the persisted legacy request identity after acceptance loss and Daemon restart', async () => {
const root = await mkdtemp(join(tmpdir(), 'oc-gateway-restart-'));
const upstream = Fastify();
@@ -194,10 +286,11 @@ it('uses a task-specific official model without changing account defaults and re
it('video uses the unified gateway task and preserves its account for query and download', async () => {
const root = await mkdtemp(join(tmpdir(), 'oc-gateway-video-')); close.push(() => rm(root, { recursive: true, force: true }));
+ const requestId = `ocreq_${'a'.repeat(48)}`;
const fetcher = vi.fn(async (url: URL | RequestInfo, options?: RequestInit) => {
- if (String(url).endsWith('/video/jobs')) return Response.json({ requestId: 'gateway_request_original', state: 'waiting_upstream' }, { status: 202 });
+ if (String(url).endsWith('/video/jobs')) return Response.json({ requestId, state: 'waiting_upstream' }, { status: 202, headers: { 'X-Request-ID': requestId } });
if (String(url).endsWith('/result')) return new Response(new Uint8Array([1,2,3]), { headers: { 'Content-Type': 'video/mp4' } });
- return Response.json({ requestId: 'gateway_request_original', state: 'succeeded' });
+ return Response.json({ requestId, state: 'succeeded' }, { headers: { 'X-Request-ID': requestId } });
}) as typeof fetch;
const binding = { accountId: 'a', bindingVersion: 'a:1', baseUrl: 'http://127.0.0.1:39999/internal/krillin-llm/gateway/v1', apiKey: 'local-token', models: { video: 'gateway-video' }, catalog: [{ id: 'gateway-video', modality: 'video' as const, capabilities: [], sizes: ['1280x720', '720x1280'], durations: [4, 5] }] };
const service = createVideoGenerationService({ dataDir: root, configStore: { read: async () => createDefaultCreatorServicesConfig(), write: async c => c, reset: async () => createDefaultCreatorServicesConfig() }, fetchImpl: fetcher, gatewaySource: { binding: async () => binding } });
diff --git a/apps/daemon/test/integration/creator-gateway-video.test.ts b/apps/daemon/test/integration/creator-gateway-video.test.ts
new file mode 100644
index 00000000..09a18ec6
--- /dev/null
+++ b/apps/daemon/test/integration/creator-gateway-video.test.ts
@@ -0,0 +1,103 @@
+import Fastify from 'fastify';
+import { createDefaultCreatorServicesConfig, type GatewayModel } from '@opencreator/protocol';
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { expect, it, vi } from 'vitest';
+import { createCreatorAgentRepository } from '../../src/creator/agent/repository.js';
+import { createCreatorCommandDispatcher } from '../../src/creator/command-dispatcher.js';
+import { createVideoExecutor } from '../../src/creator/video/executor.js';
+import { createVideoGenerationService } from '../../src/video-generation/service.js';
+import { createCreatorIssueService } from '../../src/creator/issues.js';
+import { CreatorProviderRequestLedger } from '../../src/creator/provider-requests.js';
+import { createCreatorRepository } from '../../src/creator/repository.js';
+import { createCreatorService } from '../../src/creator/service.js';
+import { createCreatorStageRunner } from '../../src/creator/stage-runner.js';
+import { createDefaultCreatorTemplateRegistry } from '../../src/creator/templates/registry.js';
+import { createGatewayCreatorSource } from '../../src/gateway/creator-service-source.js';
+import { openRuntimeDatabase } from '../../src/storage/database.js';
+
+const video = Buffer.from('gateway-generated-video');
+const asset = `ocasset_${'c'.repeat(48)}`;
+
+async function fixture(invalidReceipt = false) {
+ const root = await mkdtemp(join(tmpdir(), 'creator-gateway-video-'));
+ const db = openRuntimeDatabase(join(root, 'runtime.sqlite'));
+ const model: GatewayModel = { id: 'grok-video-3', modality: 'video', capabilities: ['generate', 'image_to_video'],
+ resolutions: ['720p'], aspectRatios: ['16:9'], durations: [4], price: { version: 'v1', videoUnitsPerSecond: { '720p': 2_000_000 } },
+ videoOptions: { profile: 'grok', maxImages: 1, maxVideos: 0, maxAudios: 0, firstLastFrames: false, framesExclusive: false, generateAudio: true, referenceDuration: 0 } };
+ const binding = { source: 'gateway' as const, accountId: 'a', bindingVersion: 'a:gateway:v1', supplier: 'chatanywhere' as const,
+ models: { video: model.id }, capabilities: { video: model.capabilities } };
+ const repository = createCreatorRepository(db, { serviceBinding: () => binding });
+ const issues = createCreatorIssueService(repository);
+ const ledger = new CreatorProviderRequestLedger(repository, issues);
+ const requestId = `ocreq_${'a'.repeat(48)}`;
+ let submissions = 0;
+ let polls = 0;
+ const identities: string[] = [];
+ const receipt = (body: Record<string, unknown>, status = 200) => Response.json({ requestId, ...body }, { status, headers: { 'X-Request-ID': requestId } });
+ const fetcher = vi.fn<typeof fetch>(async (url, options) => {
+ expect(String(url)).toMatch(/^https:\/\/gateway\.example\/v1\//);
+ if (String(url).endsWith('/video/assets')) return Response.json({ assetId: asset, expiresAt: '2030-01-01T00:00:00Z' });
+ if (options?.method === 'POST') {
+ submissions++;
+ identities.push(new Headers(options.headers).get('Idempotency-Key')!);
+ expect(JSON.parse(String(options.body))).toMatchObject({ model: model.id, duration: 4, size: '720p@16:9', priceVersion: 'v1', images: [asset], generate_audio: true });
+ return receipt({ requestId: invalidReceipt ? `ocreq_${'b'.repeat(48)}` : requestId, state: 'submitting', phase: 'pending', status: 'queued' }, 202);
+ }
+ if (String(url).endsWith('/result')) return new Response(new Uint8Array(video), { headers: { 'Content-Type': 'video/mp4' } });
+ polls++;
+ if (polls === 1) return receipt({ state: 'outcome_unknown', billingState: 'reconciling', phase: 'unknown', status: 'unknown' });
+ return receipt({ state: 'succeeded', billingState: 'settled', phase: 'finished', status: 'completed', progress: 100 });
+ });
+ let origin = '';
+ const manual = createDefaultCreatorServicesConfig();
+ const source = createGatewayCreatorSource({ ledger, readJobBinding: repository.getServiceBinding, readJobState: id => repository.getJob(id)?.state, readStageRun: repository.getStageRun,
+ account: {
+ peekState: () => ({ source: 'gateway', transport: 'gateway', supplier: 'chatanywhere', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: 'a@test', verified: true }, bindingVersion: binding.bindingVersion, selectedModels: binding.models, models: [model], activationError: null }),
+ modelCredentials: async () => ({ accountId: 'a', transport: 'gateway', modelKey: 'device-token', keyVersion: '1', bindingVersion: binding.bindingVersion, baseUrl: 'https://gateway.example/v1', defaults: binding.models, models: [model] })
+ }, manual: { read: async () => manual, write: async c => c, reset: async () => manual }, getLocalOrigin: () => origin, fetcher });
+ const server = Fastify(); await source.register(server); origin = await server.listen({ host: '127.0.0.1', port: 0 });
+ const templates = createDefaultCreatorTemplateRegistry();
+ const service = createCreatorService({ repository, templates, providerRequestLedger: ledger });
+ const generation = () => createVideoGenerationService({ dataDir: root, configStore: source.store, gatewaySource: source });
+ const executor = createVideoExecutor({ ledger, service: generation(), sleep: async () => undefined,
+ probeVideo: async () => ({ duration: 4, width: 1280, height: 720, hasVideo: true, hasAudio: false }) });
+ const runner = createCreatorStageRunner({ repository, templates, issueService: issues, workRoot: join(root, 'jobs'),
+ executors: [{ id: 'video', run: stage => source.runForJob(stage.job.id, stage.stageRun.id, () => executor.run(stage)) }] });
+ const dispatcher = createCreatorCommandDispatcher({ repository, service, receipts: createCreatorAgentRepository(db), queryProviderRequest: source.queryProviderRequest });
+ const job = service.createJob({ projectId: 'project', templateId: 'video-generation', templateVersion: 1,
+ state: { officialModels: binding.models, prompt: 'A square', provider: 'seedance', model: model.id, duration: 4, size: '720p@16:9', videoPriceVersion: 'v1', generateAudio: true,
+ videoReferences: [{ role: 'image', assetId: asset, fileName: 'reference.png' }] } });
+ return { job, repository, dispatcher, runner, source, generation, fetcher, identities, submissions: () => submissions,
+ async close() { await runner.close(); await source.revoke(); await server.close(); db.close(); await rm(root, { recursive: true, force: true }); } };
+}
+
+it('completes an official video through the scoped gateway and shared Creator task without a final error during reconciliation', async () => {
+ const f = await fixture();
+ try {
+ const command = f.dispatcher.dispatch(f.job.id, { action: 'run-stage', expectedRevision: f.job.revision, idempotencyKey: 'generate', input: { stageId: 'generate' } }, 'user');
+ await f.runner.runStageRun(command.commandReceipt.stageRunId!);
+ const job = f.repository.getJob(f.job.id)!;
+ expect(job.status).toBe('completed');
+ expect(await readFile(job.artifacts.find(a => a.kind === 'generated_video')!.path!)).toEqual(video);
+ expect(job.providerRequests.every(r => r.status === 'succeeded')).toBe(true);
+ expect(f.repository.listIssues(job.id).filter(i => i.status !== 'resolved')).toEqual([]);
+ expect(f.identities).toHaveLength(1);
+ expect(f.fetcher.mock.calls.some(([url]) => String(url).endsWith('/result'))).toBe(true);
+ } finally { await f.close(); }
+});
+
+it('rejects a mismatched receipt and resumes persisted video parameters with the same logical identity', async () => {
+ const f = await fixture(true);
+ try {
+ let localId = '';
+ await expect(f.source.runForJob(f.job.id, 'stage', () => f.generation().create({ provider: 'seedance', model: 'grok-video-3', prompt: 'A square', duration: 4,
+ size: '720p@16:9', priceVersion: 'v1', generateAudio: true, references: [{ role: 'image', assetId: asset, fileName: 'reference.png' }] },
+ { logicalId: 'logical-original', onPending: id => { localId = id; } }))).rejects.toThrow('Invalid official video receipt');
+ expect(localId).toBeTruthy();
+ await expect(f.source.runForJob(f.job.id, 'stage', () => f.generation().refresh(localId))).rejects.toThrow('Invalid official video receipt');
+ expect(f.identities).toHaveLength(2);
+ expect(new Set(f.identities).size).toBe(1);
+ } finally { await f.close(); }
+});
diff --git a/apps/daemon/test/integration/direct-services.test.ts b/apps/daemon/test/integration/direct-services.test.ts
index 59f6e9a3..3a3ce9ac 100644
--- a/apps/daemon/test/integration/direct-services.test.ts
+++ b/apps/daemon/test/integration/direct-services.test.ts
@@ -63,6 +63,39 @@ async function fixture(ledger?: CreatorProviderRequestLedger, options: Partial<P
await source.register(server); await registerCreatorServicesRoutes(server, source.store);
return { server, source, fetcher, state, manual, root, account, reportModelFailure };
}
+it.each(['tech', 'org'])('routes Creator subtitle transcription directly through ChatAnywhere (%s)', async domain => {
+ const f = await fixture();
+ const transcription: GatewayModel = { id: 'whisper-1', modality: 'transcription', capabilities: ['transcription_text', 'subtitle_timestamps'] };
+ f.state.models.splice(0, f.state.models.length, transcription);
+ f.state.selectedModels.transcription = transcription.id;
+ f.account.modelCredentials = async () => ({ accountId: 'a', bindingVersion: 'a:chatanywhere:1', keyVersion: 'ca-1', modelKey: 'private-ca-key', baseUrl: `https://api.chatanywhere.${domain}/v1`, transport: 'supplier-direct', models: f.state.models, defaults: { transcription: transcription.id } });
+ vi.mocked(f.fetcher).mockImplementation(async (_url, options) => {
+ const body = await new Request('http://localhost', { method: 'POST', headers: options?.headers, body: options?.body }).formData();
+ expect(body.get('file')).toBeInstanceOf(File);
+ expect(body.has('timestamp_granularities[]')).toBe(false);
+ return Response.json({ text: 'recognized', segments: [{ text: 'recognized', start: 0, end: 1 }] });
+ });
+ const config = await f.source.store.read();
+ const form = new FormData(); form.set('model', transcription.id); form.set('response_format', 'verbose_json');
+ form.set('timestamp_granularities[]', 'segment'); form.set('file', new Blob(['audio'], { type: 'audio/wav' }), 'audio.wav');
+ const request = new Request('http://localhost', { method: 'POST', body: form });
+ const response = await f.server.inject({ method: 'POST', url: '/internal/krillin-llm/gateway/v1/audio/transcriptions', headers: { Authorization: `Bearer ${config.transcription.openai.apiKey}`, 'Content-Type': request.headers.get('content-type')!, 'Idempotency-Key': 'ca-asr' }, payload: Buffer.from(await request.arrayBuffer()) });
+ expect(response.statusCode).toBe(200);
+ expect(response.json()).toMatchObject({ segments: [{ start: 0, end: 1 }] });
+ expect(f.fetcher).toHaveBeenCalledOnce();
+ expect(vi.mocked(f.fetcher).mock.lastCall?.[0]).toBe(`https://api.chatanywhere.${domain}/v1/audio/transcriptions`);
+});
+
+it('rejects a Creator capability issued before a supplier change without submitting inference', async () => {
+ const f = await fixture();
+ const config = await f.source.store.read();
+ const original = await f.account.modelCredentials();
+ f.account.modelCredentials = async () => ({ ...original, baseUrl: 'https://api.chatanywhere.tech/v1', modelKey: 'new-ca-key', transport: 'supplier-direct' });
+ const response = await f.server.inject({ method: 'POST', url: '/internal/krillin-llm/gateway/v1/audio/speech', headers: { Authorization: `Bearer ${config.tts.openai.apiKey}` }, payload: { model: 'vendor/speech', input: 'test', voice: 'tested_voice' } });
+ expect(response.statusCode).toBe(409);
+ expect(response.json()).toMatchObject({ error: { code: 'supplier_binding_changed' } });
+ expect(f.fetcher).not.toHaveBeenCalled();
+});
it.each(['account', 'headers', 'first-token'])('opens the translation stream before slow %s preparation and reuses the completed result', async delayed => {
const f = await fixture();
const origin = await f.server.listen({ host: '127.0.0.1', port: 0 });
@@ -90,7 +123,8 @@ it.each(['account', 'headers', 'first-token'])('opens the translation stream bef
const response = await submit();
expect(response.status).toBe(200);
const reader = response.body!.getReader();
- expect(new TextDecoder().decode((await reader.read()).value)).toContain(': connected');
+ const firstFrame = new TextDecoder().decode((await reader.read()).value);
+ expect(JSON.parse(firstFrame.replace(/^data: /, '').trim())).toMatchObject({ object: 'chat.completion.chunk', choices: [] });
if (delayed === 'account') expect(f.fetcher).not.toHaveBeenCalled();
resume();
let content = '';
@@ -192,8 +226,8 @@ it('sends multimodal requests directly, translates image edits, and replays a pa
expect(imageBody).toMatchObject({ aspect_ratio: '3:2' });
expect(imageBody).not.toHaveProperty('output_format');
expect(imageBody).not.toHaveProperty('size'); expect(imageBody).not.toHaveProperty('response_format');
- expect((await submit('audio/speech', { model: 'vendor/speech', input: 'hello', voice: 'alloy', response_format: 'wav' })).headers['content-type']).toBe('audio/mpeg');
- expect(JSON.parse(String(vi.mocked(f.fetcher).mock.lastCall?.[1]?.body)).response_format).toBe('mp3');
+ expect((await submit('audio/speech', { model: 'vendor/speech', input: 'hello', voice: 'tested_voice', response_format: 'wav' })).headers['content-type']).toBe('audio/mpeg');
+ expect(JSON.parse(String(vi.mocked(f.fetcher).mock.lastCall?.[1]?.body))).not.toHaveProperty('response_format');
const form = new FormData(); form.set('model', 'vendor/image'); form.set('prompt', 'edit'); form.set('image[]', new Blob(['image'], { type: 'image/png' }), 'image.png');
const request = new Request('http://localhost', { method: 'POST', body: form });
const edited = await f.server.inject({ method: 'POST', url: '/internal/krillin-llm/gateway/v1/images/edits', headers: { Authorization: `Bearer ${config.llm.apiKey}`, 'Content-Type': request.headers.get('content-type')!, 'Idempotency-Key': 'edit' }, payload: Buffer.from(await request.arrayBuffer()) });
@@ -242,6 +276,21 @@ it('uses the selected official speech model voice catalog and rejects incompatib
await expect(service.synthesize({ text: 'Hello', voiceId: 'alloy' })).rejects.toMatchObject({ code: 'VALIDATION_FAILED' });
expect(synthesize).toHaveBeenCalledOnce();
});
+
+it('passes multiple official references through the Creator image provider using the selected profile', async () => {
+ const f = await fixture();
+ f.state.models.find(model => model.modality === 'image')!.imageOptions = { maxImages: 1, maxReferences: 14 };
+ const config = await f.source.store.read();
+ const fetcher = vi.fn<typeof fetch>(async (_url, options) => {
+ const form = await new Request('http://localhost', { method: 'POST', headers: options?.headers, body: options?.body }).formData();
+ expect(form.getAll('image[]')).toHaveLength(2);
+ return Response.json({ data: [{ b64_json: 'aW1hZ2U=' }] });
+ });
+ const result = await generateImageContents({ provider: 'openai', prompt: 'test', size: '1024x1024', quality: 'medium', count: 1 }, config,
+ { fetchImpl: fetcher, referenceImages: [{ content: Buffer.from('one'), mime: 'image/png' }, { content: Buffer.from('two'), mime: 'image/png' }] });
+ expect(result.contents).toHaveLength(1);
+ expect(fetcher).toHaveBeenCalledOnce();
+});
it('delivers a playable WAV for an official PCM-only speech model', async () => {
const f = await fixture();
f.state.models.find(model => model.modality === 'speech')!.capabilities = ['pcm_speech'];
diff --git a/apps/daemon/test/integration/gateway-account-api.test.ts b/apps/daemon/test/integration/gateway-account-api.test.ts
index 9b60d2e5..c8b48d26 100644
--- a/apps/daemon/test/integration/gateway-account-api.test.ts
+++ b/apps/daemon/test/integration/gateway-account-api.test.ts
@@ -7,6 +7,51 @@ import { registerGatewayAccountRoutes } from '../../src/api/routes.gateway-accou
import { createGatewayClient } from '../../src/gateway/client.js';
import { GatewayError } from '../../src/gateway/client.js';
import { createGatewayAccountService, type GatewayAccountService } from '../../src/gateway/account-service.js';
+import { ModelProbeError } from '../../src/gateway/model-selection-probe.js';
+
+it('validates task probes and preserves upstream denials without exposing credentials', async () => {
+ const probeModel = vi.fn(async () => { throw new ModelProbeError('model_probe_failed', { kind: 'unauthorized', httpStatus: 403, upstreamMessage: 'Provider Terms Of Service restriction' }); });
+ const server = Fastify();
+ try {
+ await registerGatewayAccountRoutes(server, { probeModel } as unknown as GatewayAccountService);
+ const response = await server.inject({ method: 'POST', url: '/gateway/model/probe', payload: { modality: 'text', model: 'vendor/text' } });
+ expect(response.statusCode).toBe(503);
+ expect(response.json().error.details).toMatchObject({ gatewayCode: 'model_probe_failed', publicFacts: { httpStatus: 403, upstreamMessage: 'Provider Terms Of Service restriction' } });
+ expect(probeModel).toHaveBeenCalledWith('text', 'vendor/text', undefined);
+ probeModel.mockClear();
+ expect((await server.inject({ method: 'POST', url: '/gateway/model/probe', payload: { modality: 'unknown', model: 'vendor/text' } })).statusCode).toBe(400);
+ expect(probeModel).not.toHaveBeenCalled();
+ } finally { await server.close(); }
+});
+
+it('reports missing platform probe support consistently for task checks and settings choices', async () => {
+ const diagnostics = { path: '/api/v1/client/probe-credentials', reason: 'http' as const, httpStatus: 404 };
+ const probeError = new ModelProbeError('model_probe_not_supported', undefined, diagnostics);
+ const service = { probeModel: vi.fn(async () => { throw probeError; }), selectModel: vi.fn(async () => { throw probeError; }) };
+ const server = Fastify();
+ try {
+ await registerGatewayAccountRoutes(server, service as unknown as GatewayAccountService);
+ for (const [method, url] of [['POST', '/gateway/model/probe'], ['PATCH', '/gateway/model']] as const) {
+ const response = await server.inject({ method, url, payload: { modality: 'text', model: 'vendor/text' } });
+ expect(response.statusCode).toBe(503);
+ expect(response.json().error.details).toEqual({ gatewayCode: 'model_probe_not_supported', probeRequest: diagnostics });
+ expect(response.json().error.code).toBe('GATEWAY_UNAVAILABLE');
+ }
+ } finally { await server.close(); }
+});
+
+it('validates and forwards explicit model refreshes without caching the account response', async () => {
+ const readState = vi.fn(async () => ({ models: [] })); const server = Fastify();
+ try {
+ await registerGatewayAccountRoutes(server, { readState } as unknown as GatewayAccountService);
+ const response = await server.inject('/gateway/account?refreshModels=1');
+ expect(response.statusCode).toBe(200); expect(response.headers['cache-control']).toBe('no-store');
+ expect(readState).toHaveBeenLastCalledWith({ refreshModels: true });
+ readState.mockClear();
+ expect((await server.inject('/gateway/account?refreshModels=invalid')).statusCode).toBe(400);
+ expect(readState).not.toHaveBeenCalled();
+ } finally { await server.close(); }
+});
it('proxies account-owned orders and encoded grant cursors without caching', async () => {
const billing = vi.fn(async () => ({ items: [] }));
diff --git a/apps/daemon/test/integration/gateway-runtime-protocol.test.ts b/apps/daemon/test/integration/gateway-runtime-protocol.test.ts
index cea5f05f..40a5a0ee 100644
--- a/apps/daemon/test/integration/gateway-runtime-protocol.test.ts
+++ b/apps/daemon/test/integration/gateway-runtime-protocol.test.ts
@@ -7,7 +7,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
import { createCodexAppServerHost, type CodexAppServerHost } from '../../src/codex/app-server-host-2026-07-28.js';
import { createGatewayRuntimeBindings } from '../../src/gateway/runtime-bindings.js';
import { createDirectRuntime } from '../../src/gateway/direct-runtime.js';
-import { preparePlatformProbe } from '../../src/gateway/platform-probe.js';
+import { prepareOfficialRuntimeProbe } from '../../src/gateway/runtime-probe.js';
import * as officialFetch from '../../src/gateway/official-fetch.js';
import { probeCodex } from '../../src/codex/probe.js';
import type { GatewayAccountState } from '@opencreator/protocol';
@@ -22,14 +22,14 @@ afterEach(async () => {
type ModelRequest = { headers: Record<string, string | string[] | undefined>; body: Record<string, unknown> };
-async function fixture(reply: (res: ServerResponse, requests: ModelRequest[]) => void, directMode = false) {
+async function fixture(reply: (res: ServerResponse, requests: ModelRequest[]) => void, directMode = false, supplierBase = 'https://openrouter.ai/api/v1', chatMode = false) {
expect(existsSync(codexBin), 'bundled Runtime is required for this integration gate').toBe(true);
expect(createHash('sha256').update(readFileSync(codexBin)).digest('hex')).toBe(manifest.binary.sha256);
const root = mkdtempSync(join(tmpdir(), 'oc-real-gateway-'));
cleanup.push(() => rmSync(root, { recursive: true, force: true }));
const requests: ModelRequest[] = [];
const server = createServer(async (req, res) => {
- if (req.url !== '/v1/responses') {
+ if (req.url !== (chatMode ? '/v1/chat/completions' : '/v1/responses')) {
res.writeHead(404).end();
return;
}
@@ -45,7 +45,11 @@ async function fixture(reply: (res: ServerResponse, requests: ModelRequest[]) =>
}));
const address = server.address();
if (!address || typeof address === 'string') throw new Error('Missing fixture address');
- const bridge = directMode ? await createDirectRuntime('test-official-key-a', async (_url, options) => fetch(`http://127.0.0.1:${address.port}/v1/responses`, options)) : undefined;
+ const bridge = directMode ? await createDirectRuntime('test-official-key-a', async (url, options) => {
+ const endpoint = chatMode ? 'chat/completions' : 'responses';
+ expect(url).toBe(`${supplierBase}/${endpoint}`);
+ return fetch(`http://127.0.0.1:${address.port}/v1/${endpoint}`, options);
+ }, chatMode ? async () => ({ key: 'test-official-key-a', release: async () => {}, models: [{ id: 'gpt-5.2', modality: 'text', capabilities: ['responses', 'responses_via_chat'] }] }) : undefined, undefined, supplierBase) : undefined;
if (bridge) cleanup.push(() => bridge.close());
let host: CodexAppServerHost | undefined;
const binding = createGatewayRuntimeBindings({
@@ -61,8 +65,8 @@ async function fixture(reply: (res: ServerResponse, requests: ModelRequest[]) =>
codexBin, codexHome: prepared.codexHome, cwd: root, profile: 'default',
baseEnvironment: prepared.env, spawnTimeoutMs: 10_000, forceKillGraceMs: 100
});
- const run = () => host!.run({
- cwd: root, sandbox: 'danger-full-access', model: 'gpt-5.2',
+ const run = (model = 'gpt-5.2') => host!.run({
+ cwd: root, sandbox: 'danger-full-access', model,
prompt: 'Report the current directory and then say gateway ready.', timeoutMs: 15_000
});
return { binding, prepared, host, requests, run, root, supplierUrl: `http://127.0.0.1:${address.port}/v1/responses` };
@@ -99,11 +103,35 @@ const message = {
};
describe('bundled Runtime official gateway boundary', () => {
- it('runs startup inference with the platform key and user tasks with the user key', async () => {
+ it('changes the default during a live stream without interrupting it and sends the next turn to the new model', async () => {
+ let pending!: ServerResponse;
+ const f = await fixture((res, requests) => {
+ if (requests.length === 1) pending = res;
+ else complete(res, [message]);
+ });
+ const first = f.run();
+ const pid = f.host.pid;
+ await expect.poll(() => f.requests.length, { timeout: 10_000 }).toBe(1);
+ try {
+ await f.binding.updateModel('gpt-4.1-mini');
+ expect(f.host.pid).toBe(pid);
+ expect(() => process.kill(pid!, 0)).not.toThrow();
+ expect(pending.destroyed).toBe(false);
+ expect(f.requests[0]!.body.model).toBe('gpt-5.2');
+ } finally { complete(pending, [message]); }
+ expect((await first.result).turnStatus).toBe('completed');
+ expect((await f.run('gpt-4.1-mini').result).turnStatus).toBe('completed');
+ expect(f.requests).toHaveLength(2);
+ expect(f.requests[1]!.body.model).toBe('gpt-4.1-mini');
+ expect(f.host.pid).toBe(pid);
+ }, 30_000);
+
+ it('runs startup inference and user tasks with the same OpenRouter key', async () => {
const f = await fixture(res => complete(res, [message]));
const fetcher = vi.spyOn(officialFetch, 'createOfficialFetch')
.mockReturnValue((_target, options) => fetch(f.supplierUrl, options));
cleanup.push(() => { fetcher.mockRestore(); });
+ const release = vi.fn(async () => undefined);
const account = {
readState: async (): Promise<GatewayAccountState> => ({
source: 'gateway', authState: 'signed_in', activationState: 'ready',
@@ -111,12 +139,13 @@ describe('bundled Runtime official gateway boundary', () => {
models: [{ id: 'gpt-5.2', modality: 'text', capabilities: ['responses'] }],
selectedModels: { text: 'gpt-5.2' }, activationError: null
}),
- probeCredentials: vi.fn(async () => ({
- costBearer: 'platform' as const, modelKey: 'test-platform-probe-key', keyVersion: 'probe-1',
- baseUrl: 'https://openrouter.ai/api/v1' as const, expiresAt: new Date(Date.now() + 60_000).toISOString()
- }))
+ beginModelUse: vi.fn(async () => ({ credentials: {
+ accountId: 'a', modelKey: 'test-official-key-a', keyVersion: '1', bindingVersion: '1',
+ baseUrl: 'https://openrouter.ai/api/v1', transport: 'openrouter-direct' as const,
+ models: [{ id: 'gpt-5.2', modality: 'text' as const, capabilities: ['responses'] }], defaults: { text: 'gpt-5.2' }
+ }, release }))
};
- const prepared = await preparePlatformProbe({ account, readProxy: async () => '' });
+ const prepared = await prepareOfficialRuntimeProbe({ account, readProxy: async () => '' });
expect(prepared).toBeDefined();
cleanup.push(() => prepared!.cleanup());
const result = await probeCodex({
@@ -125,7 +154,7 @@ describe('bundled Runtime official gateway boundary', () => {
});
expect(result.ready).toBe(true);
expect(f.requests).toHaveLength(1);
- expect(f.requests[0]!.headers.authorization).toBe('Bearer test-platform-probe-key');
+ expect(f.requests[0]!.headers.authorization).toBe('Bearer test-official-key-a');
expect(JSON.stringify(f.requests[0]!.body.input)).toContain('startup availability probe');
expect((await f.run().result).turnStatus).toBe('completed');
expect(f.requests).toHaveLength(2);
@@ -133,35 +162,55 @@ describe('bundled Runtime official gateway boundary', () => {
const home = prepared!.codexHome;
await prepared!.cleanup();
expect(existsSync(home)).toBe(false);
+ expect(release).toHaveBeenCalledOnce();
}, 30_000);
- it('waits for platform authorization and fails without submitting a user-funded probe', async () => {
- const probeCredentials = vi.fn(async () => { throw new Error('platform unavailable'); });
+ it('waits for sign-in and fails before inference when model credentials are unavailable', async () => {
+ const beginModelUse = vi.fn(async () => { throw new Error('model credentials unavailable'); });
const state: GatewayAccountState = {
source: 'manual', authState: 'signed_out', activationState: 'inactive',
account: null, bindingVersion: null, models: [], activationError: null
};
- const account = { readState: async () => state, probeCredentials };
- expect(await preparePlatformProbe({ account, readProxy: async () => '' })).toBeUndefined();
- expect(probeCredentials).not.toHaveBeenCalled();
+ const account = { readState: async () => state, beginModelUse };
+ expect(await prepareOfficialRuntimeProbe({ account, readProxy: async () => '' })).toBeUndefined();
+ expect(beginModelUse).not.toHaveBeenCalled();
Object.assign(state, {
source: 'gateway', authState: 'signed_in', account: { id: 'a', email: 'a@test', verified: true },
models: [{ id: 'gpt-5.2', modality: 'text', capabilities: ['responses'] }], selectedModels: { text: 'gpt-5.2' }
});
- await expect(preparePlatformProbe({ account, readProxy: async () => '' })).rejects.toThrow('platform unavailable');
- expect(probeCredentials).toHaveBeenCalledOnce();
+ await expect(prepareOfficialRuntimeProbe({ account, readProxy: async () => '' })).rejects.toThrow('model credentials unavailable');
+ expect(beginModelUse).toHaveBeenCalledOnce();
});
- it('preserves complete tool history through the direct stateless connection', async () => {
+ it.each(['https://openrouter.ai/api/v1', 'https://api.88api.ai/v1'])('preserves complete tool history through the direct stateless connection %s', async supplierBase => {
const f = await fixture((res, requests) => {
if (requests.length === 1) complete(res, [{ id: 'fc_direct', type: 'function_call', call_id: 'call_direct', name: 'exec_command', arguments: JSON.stringify({ cmd: 'pwd', max_output_tokens: 100 }), status: 'completed' }]);
else complete(res, [message]);
- }, true);
+ }, true, supplierBase);
expect((await f.run().result).turnStatus).toBe('completed');
expect(f.requests).toHaveLength(2);
expect(f.requests.every(request => request.body.store === false && !request.body.previous_response_id && request.headers.authorization === 'Bearer test-official-key-a')).toBe(true);
expect(JSON.stringify(f.requests[1]!.body.input)).toContain('function_call_output');
expect(JSON.stringify(f.requests[1]!.body.input)).toContain('call_direct');
}, 30_000);
+ it.each(['function', 'custom'])('executes a real Runtime %s tool round trip through the 88API Chat-to-Responses bridge', async toolType => {
+ const f = await fixture((res, requests) => {
+ res.writeHead(200, { 'Content-Type': 'text/event-stream' });
+ const choice = requests.length === 1
+ ? { delta: { tool_calls: [{ index: 0, id: 'call_chat', type: 'function', function: toolType === 'custom'
+ ? { name: 'apply_patch', arguments: JSON.stringify({ input: `*** Begin Patch\n*** Add File: ${join(f.root, 'chat-bridge.txt')}\n+bridge ready\n*** End Patch` }) }
+ : { name: 'exec_command', arguments: JSON.stringify({ cmd: 'pwd', max_output_tokens: 100 }) } }] }, finish_reason: 'tool_calls' }
+ : { delta: { content: 'gateway ready' }, finish_reason: 'stop' };
+ res.end(`data: ${JSON.stringify({ choices: [choice] })}\n\ndata: [DONE]\n\n`);
+ }, true, 'https://api.88api.ai/v1', true);
+ const result = await f.run().result;
+ expect(result.turnStatus, JSON.stringify({ result, requests: f.requests.length })).toBe('completed');
+ expect(f.requests).toHaveLength(2);
+ expect(f.requests[0]!.body).not.toHaveProperty('input');
+ expect(JSON.stringify(f.requests[1]!.body.messages)).toContain('call_chat');
+ expect(JSON.stringify(f.requests[1]!.body.messages)).toContain('"role":"tool"');
+ expect(f.requests.every(request => request.headers.authorization === 'Bearer test-official-key-a')).toBe(true);
+ if (toolType === 'custom') expect(readFileSync(join(f.root, 'chat-bridge.txt'), 'utf8')).toBe('bridge ready\n');
+ }, 30_000);
it('uses only the official key for Responses streaming and leaves no auth.json', async () => {
const f = await fixture(res => complete(res, [message]));
const result = await f.run().result;
@@ -197,6 +246,16 @@ describe('bundled Runtime official gateway boundary', () => {
expect(f.requests.every(request => request.headers.authorization === 'Bearer test-official-key-a')).toBe(true);
}, 30_000);
+ it.each([400, 429])('does not resubmit when the local relay preserves HTTP %s', async status => {
+ const f = await fixture(res => {
+ res.writeHead(status, { 'Content-Type': 'application/json' }).end(JSON.stringify({ error: {
+ code: 'upstream_rejected', message: 'The selected parameter was rejected', requestId: 'ocreq_rejected'
+ } }));
+ }, true);
+ expect((await f.run().result).turnStatus).toBe('failed');
+ expect(f.requests).toHaveLength(1);
+ }, 30_000);
+
it.each(['rejected', 'stream_lost'] as const)('does not blindly resubmit after %s', async mode => {
const f = await fixture(res => {
if (mode === 'rejected') {
diff --git a/apps/daemon/test/unit/creator-preflight.test.ts b/apps/daemon/test/unit/creator-preflight.test.ts
index c6dc98b5..058acede 100644
--- a/apps/daemon/test/unit/creator-preflight.test.ts
+++ b/apps/daemon/test/unit/creator-preflight.test.ts
@@ -50,17 +50,60 @@ describe('creator preflight', () => {
expect(get).not.toHaveBeenCalled();
expect([...result.ready, ...result.blocked].map(item => item.id)).not.toContain('transcription-config');
});
- it('blocks multiple official Stickman references before submitting any generation', async () => {
+ it('validates only the official text model for subtitle-only translation', async () => {
+ root = await mkdtemp(join(tmpdir(), 'creator-srt-official-preflight-'));
+ const path = join(root, 'source.srt');
+ await writeFile(path, '1\n00:00:02,250 --> 00:00:04,750\nHello\n');
+ const config = createDefaultCreatorServicesConfig();
+ const source = createGatewayCreatorSource({
+ account: { peekState: () => ({ source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: 'a:1', models: [], activationError: null }),
+ modelCredentials: async () => ({ accountId: 'a', modelKey: 'customer-key', keyVersion: '1', bindingVersion: 'a:1', baseUrl: 'https://gateway.example/v1', defaults: { text: 'official-text' }, models: [] }) },
+ manual: { read: async () => config, write: async c => c, reset: async () => config }, getLocalOrigin: () => 'http://127.0.0.1:39999'
+ });
+ const job = fakeJob('video-translation', { sourceType: 'subtitle', importedSourceSubtitleId: 'source-srt', preferPlatformCaptions: false });
+ job.artifacts = [{ id: 'source-srt', jobId: job.id, kind: 'source_subtitle', version: 1, status: 'completed', path,
+ scopeKey: null, inputFingerprint: null, sha256: null, sourceArtifactIds: [], metadata: {}, createdAt: job.createdAt }];
+ const validateOfficialModel = vi.fn(async () => {});
+ const result = await createCreatorPreflight({ configStore: source.store, validateOfficialModel,
+ readCapabilities: () => createKrillinCreatorServicesCapabilities('darwin', 'arm64'), resourceRoot: root,
+ jobsRoot: join(root, 'jobs'), executorIds: ['krillinai'], validateRuntimeAssets: false
+ }).check(job, createVideoTranslationTemplate().stages.find(stage => stage.id === 'subtitle')!);
+ expect(result.blocked).toEqual([]);
+ expect(validateOfficialModel).toHaveBeenCalledExactlyOnceWith('text', 'official-text');
+ });
+ it.each([false, true])('checks the task-selected model catalog without inference and blocks invalid choices (%s)', async denied => {
+ root = await mkdtemp(join(tmpdir(), 'creator-model-probe-'));
+ const config = createDefaultCreatorServicesConfig();
+ const source = createGatewayCreatorSource({
+ account: { peekState: () => ({ source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: 'a:1', models: [], activationError: null }),
+ modelCredentials: async () => ({ accountId: 'a', modelKey: 'customer-key', keyVersion: '1', bindingVersion: 'a:1', baseUrl: 'https://gateway.example/v1', defaults: { image: 'default-image' }, models: [] }) },
+ manual: { read: async () => config, write: async c => c, reset: async () => config }, getLocalOrigin: () => 'http://127.0.0.1:39999'
+ });
+ const validateOfficialModel = vi.fn(async () => {
+ if (denied) throw Object.assign(new Error('unavailable'), { code: 'invalid_model' });
+ });
+ const result = await createCreatorPreflight({ configStore: source.store, validateOfficialModel,
+ readCapabilities: () => createKrillinCreatorServicesCapabilities('darwin', 'arm64'), resourceRoot: root,
+ jobsRoot: join(root, 'jobs'), executorIds: ['image'], validateRuntimeAssets: false
+ }).check(fakeJob('image-generation', { provider: 'openai', prompt: 'Draw a circle', officialModels: { image: 'task-image' } }), createImageGenerationTemplate().stages[0]!);
+ expect(validateOfficialModel).toHaveBeenCalledWith('image', 'task-image');
+ expect(result.canStart).toBe(!denied);
+ if (denied) expect(result.blocked).toContainEqual(expect.objectContaining({ id: 'official-model-catalog:image',
+ message: expect.stringContaining('Choose another model.') }));
+ else expect(result.ready).toContainEqual(expect.objectContaining({ id: 'official-model-catalog:image',
+ message: expect.stringContaining('compatible model catalog') }));
+ });
+ it.each([1, 14])('checks the official Stickman reference limit (%s) before generation', async maxReferences => {
root = await mkdtemp(join(tmpdir(), 'creator-official-references-'));
const config = createDefaultCreatorServicesConfig();
const source = createGatewayCreatorSource({
- account: { peekState: () => ({ source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: 'a:1', models: [], activationError: null }), modelCredentials: async () => ({ accountId: 'a', modelKey: 'secret', keyVersion: '1', bindingVersion: 'a:1', baseUrl: 'https://gateway.example/v1', defaults: { image: 'image' }, models: [{ id: 'image', modality: 'image', capabilities: ['edit'] }] }) },
+ account: { peekState: () => ({ source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: 'a:1', models: [], activationError: null }), modelCredentials: async () => ({ accountId: 'a', modelKey: 'secret', keyVersion: '1', bindingVersion: 'a:1', baseUrl: 'https://gateway.example/v1', defaults: { image: 'image' }, models: [{ id: 'image', modality: 'image', capabilities: ['edit'], imageOptions: { maxImages: 1, maxReferences } }] }) },
manual: { read: async () => config, write: async c => c, reset: async () => config }, getLocalOrigin: () => 'http://127.0.0.1:39999'
});
const job = fakeJob('stickman-video', { provider: 'gemini' });
job.artifacts = ['character_reference', 'style_reference'].map((kind, i) => ({ id: `ref-${i}`, jobId: job.id, kind, version: 1, scopeKey: null, inputFingerprint: null, sourceArtifactIds: [], path: join(root, `${i}.png`), status: 'completed', metadata: {}, sha256: 'hash', producerStageRunId: null, createdAt: job.createdAt, updatedAt: job.updatedAt }));
const result = await createCreatorPreflight({ configStore: source.store, readCapabilities: () => createKrillinCreatorServicesCapabilities('darwin', 'arm64'), resourceRoot: root, jobsRoot: join(root, 'jobs'), validateRuntimeAssets: false }).check(job, createStickmanVideoTemplate().stages.find(stage => stage.executor === 'stickman-image')!);
- expect(result.blocked).toContainEqual(expect.objectContaining({ id: 'reference-image-count', message: expect.stringContaining('one reference image') }));
+ expect(result.blocked.some(item => item.id === 'reference-image-count')).toBe(maxReferences < 2);
});
it.each(['reference', 'speech-style'])('blocks unverified official %s before executing', async feature => {
root = await mkdtemp(join(tmpdir(), 'creator-official-capability-'));
diff --git a/apps/daemon/test/unit/creator-provider-requests.test.ts b/apps/daemon/test/unit/creator-provider-requests.test.ts
index 678f4f22..fe6a8e89 100644
--- a/apps/daemon/test/unit/creator-provider-requests.test.ts
+++ b/apps/daemon/test/unit/creator-provider-requests.test.ts
@@ -47,6 +47,71 @@ function setup(path = join(tempDir, 'runtime.sqlite')) {
}
describe('creator provider request ledger', () => {
+ it('leaves a stage retry resolving during automatic request failures and closes it with the stage outcome', () => {
+ tempDir = mkdtempSync(join(tmpdir(), 'creator-managed-stage-retry-'));
+ const { db, repository, job, stage } = setup();
+ const issues = createCreatorIssueService(repository);
+ const ledger = new CreatorProviderRequestLedger(repository, issues);
+ try {
+ const issue = issues.capture({ jobId: job.id, source: 'provider', code: 'creator_provider_request_failed',
+ stageId: stage.stageId, stageRunId: stage.id, scopeKey: stage.scopeKey!,
+ publicFacts: { kind: 'unknown', provider: 'opencreator-gateway-chat/completions' } });
+ issues.beginResolution({ jobId: job.id, issueId: issue.id, stageRunId: stage.id,
+ resolutionAttemptId: stage.id, associationKind: 'stage-run', associationId: stage.id });
+ for (const status of ['failed', 'succeeded'] as const) {
+ const request = ledger.registerBeforeSubmit({ jobId: job.id, stageRunId: stage.id, scopeKey: stage.scopeKey,
+ provider: 'opencreator-gateway-chat/completions', requestKey: status, request: {},
+ gateway: { accountId: 'a', bindingVersion: 'a:1', logicalId: status } });
+ ledger.markSubmitting(request.id);
+ if (status === 'failed') ledger.markFailed(request.id);
+ else ledger.markSucceeded(request.id);
+ expect(issues.get(job.id, issue.id)?.status).toBe('resolving');
+ }
+ repository.updateStageRun({ id: stage.id, status: 'succeeded' });
+ ledger.finishStage(stage.id, 'succeeded');
+ expect(issues.get(job.id, issue.id)).toMatchObject({ status: 'resolved', occurrenceCount: 1 });
+ } finally { db.close(); }
+ });
+
+ it('keeps automatic recovery private and resolves old failures only after every pending receipt is confirmed', async () => {
+ tempDir = mkdtempSync(join(tmpdir(), 'creator-managed-recovery-'));
+ const { db, repository, job, stage } = setup();
+ const issues = createCreatorIssueService(repository);
+ const ledger = new CreatorProviderRequestLedger(repository, issues);
+ const provider = 'opencreator-gateway-chat/completions';
+ const register = (requestKey: string) => {
+ const request = ledger.registerBeforeSubmit({ jobId: job.id, stageRunId: stage.id, scopeKey: stage.scopeKey,
+ provider, requestKey, request: {}, gateway: { accountId: 'a', bindingVersion: 'a:1', logicalId: requestKey } });
+ ledger.markSubmitting(request.id);
+ return request;
+ };
+ try {
+ const failed = register('failed-attempt');
+ ledger.markFailed(failed.id);
+ const pending = register('pending-attempt');
+ ledger.markUnknownRemoteAcceptance(pending.id);
+ expect(issues.list(job.id)).toEqual([]);
+ repository.updateStageRun({ id: stage.id, status: 'failed' });
+ ledger.finishStage(stage.id, 'failed');
+ expect(issues.list(job.id)).toEqual([expect.objectContaining({ code: 'creator_provider_resolution_required', retryable: false })]);
+ issues.capture({ jobId: job.id, stageRunId: stage.id, stageId: stage.stageId, scopeKey: stage.scopeKey!,
+ source: 'provider', code: 'creator_provider_request_failed', publicFacts: { kind: 'unknown', provider } });
+ const resumed = repository.createStageRun({ jobId: job.id, stageId: stage.stageId, executor: stage.executor,
+ scopeKey: stage.scopeKey, status: 'running', progress: { resumedFromStageRunId: stage.id } });
+ const other = register('other-pending-attempt');
+ ledger.markUnknownRemoteAcceptance(other.id);
+ await ledger.recover(pending.id, { lookupByRequestKey: true, lookup: async () => ({ status: 'succeeded' }) });
+ expect(issues.list(job.id).every(issue => issue.status === 'open')).toBe(true);
+ repository.updateStageRun({ id: resumed.id, status: 'succeeded' });
+ ledger.finishStage(resumed.id, 'succeeded');
+ expect(issues.list(job.id).every(issue => issue.status === 'open')).toBe(true);
+ await ledger.recover(other.id, { lookupByRequestKey: true, lookup: async () => ({ status: 'succeeded' }) });
+ ledger.finishStage(resumed.id, 'succeeded');
+ expect(issues.list(job.id).every(issue => issue.status === 'resolved')).toBe(true);
+ expect(ledger.requestsForStage(resumed.id)).toHaveLength(3);
+ } finally { db.close(); }
+ });
+
it.each(['succeeded', 'failed', 'waiting_remote'] as const)('reconciles a registered request with authoritative lookup evidence (%s)', async status => {
tempDir = mkdtempSync(join(tmpdir(), 'creator-registered-recovery-'));
const { db, job, stage, ledger } = setup();
@@ -56,7 +121,7 @@ describe('creator provider request ledger', () => {
expect(recovered).toMatchObject({ status, remoteTaskId: 'original-remote' });
} finally { db.close(); }
});
- it('closes the matching unknown-receipt issue only after all requests in its scope are recovered', async () => {
+ it.each(['succeeded', 'failed'] as const)('closes the matching unknown-receipt issue only after all requests in its scope are recovered (%s)', async status => {
tempDir = mkdtempSync(join(tmpdir(), 'creator-provider-stream-recovery-'));
const { db, repository, job, stage } = setup();
const issues = createCreatorIssueService(repository);
@@ -71,14 +136,14 @@ describe('creator provider request ledger', () => {
const failedIssue = issues.capture({ jobId: job.id, stageRunId: stage.id, stageId: stage.stageId,
scopeKey: stage.scopeKey ?? undefined, source: 'provider', code: 'creator_provider_request_failed',
publicFacts: { kind: 'unknown', provider: requests[0]!.provider } });
- const lookup = { lookupByRequestKey: false, lookup: async () => ({ status: 'succeeded' as const }) };
+ const lookup = { lookupByRequestKey: false, lookup: async () => ({ status }) };
await ledger.recover(requests[0]!.id, lookup);
- expect(issues.list(job.id)).toHaveLength(2);
+ expect(issues.list(job.id)).toHaveLength(status === 'failed' ? 3 : 2);
expect(issues.list(job.id).every(issue => issue.status === 'open')).toBe(true);
await ledger.recover(requests[1]!.id, lookup);
expect(issues.list(job.id).find(issue => issue.code === 'creator_provider_resolution_required')!.status).toBe('resolved');
expect(issues.get(job.id, failedIssue.id)!.status).toBe('open');
- expect(repository.listProviderRequests(job.id).every(request => request.status === 'succeeded')).toBe(true);
+ expect(repository.listProviderRequests(job.id).every(request => request.status === status)).toBe(true);
} finally { db.close(); }
});
it('blocks fresh image runs and retries until a previous paid request is explicitly resolved', () => {
diff --git a/apps/daemon/test/unit/creator-runtime-advanced.test.ts b/apps/daemon/test/unit/creator-runtime-advanced.test.ts
index 61e9a46a..9646a306 100644
--- a/apps/daemon/test/unit/creator-runtime-advanced.test.ts
+++ b/apps/daemon/test/unit/creator-runtime-advanced.test.ts
@@ -13,6 +13,7 @@ import { createCreatorCommandDispatcher } from '../../src/creator/command-dispat
import { parseDownloadProbe } from '../../src/creator/download/probe-parser.js';
import { CreatorExecutorError, type CreatorExecutor } from '../../src/creator/executor.js';
import { createCreatorIssueService } from '../../src/creator/issues.js';
+import { CreatorProviderRequestLedger } from '../../src/creator/provider-requests.js';
import { createCreatorRepository } from '../../src/creator/repository.js';
import { createCreatorService } from '../../src/creator/service.js';
import { createCreatorStageRunner } from '../../src/creator/stage-runner.js';
@@ -42,6 +43,36 @@ function setup() {
}
describe('creator runtime advanced contracts', () => {
+ it.each(['succeeded', 'failed', 'unknown', 'canceled'] as const)('reports managed provider errors only at final stage failure (%s)', async outcome => {
+ const { db, repository, service, templates } = setup();
+ const published: string[] = [];
+ const issueService = createCreatorIssueService(repository, { onChanged: issue => published.push(issue.code) });
+ const ledger = new CreatorProviderRequestLedger(repository, issueService);
+ const runner = createCreatorStageRunner({ repository, templates, issueService, workRoot: join(tempDir, 'work'),
+ executors: [{ id: 'image', async run({ stageRun, job, workdir }) {
+ const request = ledger.registerBeforeSubmit({ jobId: job.id, stageRunId: stageRun.id,
+ provider: 'opencreator-gateway-images/generations', requestKey: 'first', request: {},
+ gateway: { accountId: 'a', bindingVersion: 'a:1', logicalId: 'first' } });
+ ledger.markSubmitting(request.id);
+ if (outcome === 'unknown') ledger.markUnknownRemoteAcceptance(request.id);
+ else ledger.markFailed(request.id);
+ expect(published).toEqual([]);
+ if (outcome === 'canceled') runner.cancelJob(job.id);
+ if (outcome !== 'succeeded') throw new Error('automatic retries exhausted');
+ const path = join(workdir, 'image.png'); writeFileSync(path, 'image');
+ return { outputs: [{ kind: 'generated_image', status: 'completed', path }] };
+ } }] });
+ try {
+ const job = service.createJob({ projectId: 'p1', templateId: 'image-generation', state: { prompt: 'test' } });
+ expect((await runner.run(job.id, 'generate')).status).toBe(outcome === 'unknown' ? 'failed' : outcome);
+ if (outcome === 'succeeded' || outcome === 'canceled') expect(published).toEqual([]);
+ else {
+ expect(published).toEqual([outcome === 'unknown' ? 'creator_provider_resolution_required' : 'creator_provider_request_failed']);
+ expect(issueService.list(job.id)).toEqual([expect.objectContaining({ occurrenceCount: 1, retryable: outcome !== 'unknown' })]);
+ }
+ } finally { await runner.close(); db.close(); }
+ });
+
it.each(['direct', 'wrapped'])('preserves a bottom-level error code and reason in stage and issue records (%s)', async mode => {
const { db, repository, service, templates } = setup();
const issueService = createCreatorIssueService(repository);
diff --git a/apps/daemon/test/unit/gateway-account-service.test.ts b/apps/daemon/test/unit/gateway-account-service.test.ts
index 613df997..0189f627 100644
--- a/apps/daemon/test/unit/gateway-account-service.test.ts
+++ b/apps/daemon/test/unit/gateway-account-service.test.ts
@@ -3,7 +3,8 @@ import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterEach, expect, it, vi } from 'vitest';
import * as module from '../../src/gateway/account-service.js';
-import { GatewayError, type GatewayBootstrap, type GatewayProbeCredentials } from '../../src/gateway/client.js';
+import { GatewayError, type GatewayBootstrap } from '../../src/gateway/client.js';
+import { ModelProbeError, createModelSelectionProbe } from '../../src/gateway/model-selection-probe.js';
import { createGatewayConfigStore } from '../../src/gateway/config-store.js';
import Fastify from 'fastify';
import { registerGatewayAccountRoutes } from '../../src/api/routes.gateway-account.js';
@@ -14,12 +15,8 @@ import { createRuntimeSource } from '../../src/gateway/runtime-source.js';
import type { AppServerRuntimeManager } from '../../src/codex/app-server-runtime-manager.js';
const roots: string[] = [];
-const platformCredentials = (): GatewayProbeCredentials => ({
- costBearer: 'platform', modelKey: 'platform-probe-key', keyVersion: 'probe-v1',
- baseUrl: 'https://openrouter.ai/api/v1', expiresAt: new Date(Date.now() + 60 * 60_000).toISOString()
-});
afterEach(async () => { await Promise.all(roots.splice(0).map(root => rm(root, { recursive: true, force: true }))); });
-async function setup(activate = vi.fn(async () => undefined), close = vi.fn(async () => undefined), hasPendingTasks = () => false, hasActiveTasks = () => false, modelAccess?: (root: string, readProbeCredentials: () => Promise<GatewayProbeCredentials>) => OfficialModelAccess, deferStartupActivation = false) {
+async function setup(activate = vi.fn(async () => undefined), close = vi.fn(async () => undefined), hasPendingTasks = () => false, hasActiveTasks = () => false, modelAccess?: (root: string) => OfficialModelAccess, deferStartupActivation = false, automaticPolling = false) {
expect(module).toHaveProperty('createGatewayAccountService', expect.any(Function));
const root = await mkdtemp(join(tmpdir(), 'oc-gateway-account-')); roots.push(root);
let attempt = 0;
@@ -32,16 +29,73 @@ async function setup(activate = vi.fn(async () => undefined), close = vi.fn(asyn
async logout() {},
avatar: vi.fn(async () => ({ data: new Uint8Array([1, 2, 3]), contentType: 'image/png' })),
bootstrap: vi.fn(async (access: string): Promise<GatewayBootstrap> => { const id = access.split('-').at(-1)!; return { schemaVersion: 1 as const, account: { id, email: `${id}@example.test`, verified: true }, modelKey: `cloud-${id}`, keyVersion: '1', bindingVersion: `${id}:1`, baseUrl: 'https://gateway.example/v1', models: [{ id: 'gateway-text', modality: 'text' as const, capabilities: ['responses'] }], defaults: { text: 'gateway-text' } }; }),
- async request(path?: string) { return path === '/api/v1/client/probe-credentials' ? platformCredentials() : {}; },
+ async request(_path?: string) { return {}; },
cancelPendingRequests: vi.fn()
};
+ const probe = vi.fn<NonNullable<Parameters<typeof module.createGatewayAccountService>[0]['probeModel']>>(async () => undefined);
const service: module.GatewayAccountService = module.createGatewayAccountService({
- dataDir: root, client, activateRuntime: activate, closeRuntime: close, hasActiveTasks, hasPendingTasks, automaticPolling: false, deferStartupActivation,
- modelAccess: modelAccess?.(root, () => service.probeCredentials())
+ dataDir: root, client, activateRuntime: activate, closeRuntime: close, hasActiveTasks, hasPendingTasks, automaticPolling, deferStartupActivation,
+ probeModel: probe,
+ modelAccess: modelAccess?.(root)
});
- return { service, root, client, activate, close };
+ return { service, root, client, activate, close, probe };
}
+it('saves a compatible model choice without invoking the paid probe', async () => {
+ const f = await setupCachedAccount({ models: [{ id: 'first', modality: 'text', capabilities: ['responses'] }, { id: 'second', modality: 'text', capabilities: ['responses'] }], defaults: { text: 'first' } });
+ try {
+ f.activate.mockClear(); f.probe.mockRejectedValue(new ModelProbeError('model_probe_failed'));
+ await expect(f.service.selectModel('text', 'second')).resolves.toMatchObject({ selectedModels: { text: 'second' } });
+ expect((await createGatewayConfigStore(f.root).readCredentials())?.defaults?.text).toBe('second');
+ expect(f.probe).not.toHaveBeenCalled();
+ expect(f.activate).toHaveBeenCalledOnce();
+ await expect(f.service.selectModel('text', 'missing')).rejects.toMatchObject({ code: 'invalid_model' });
+ expect(f.service.peekState().selectedModels?.text).toBe('second');
+ } finally { await f.service.close(); }
+});
+
+it('checks a task model without changing account defaults', async () => {
+ const f = await setupCachedAccount({ models: [{ id: 'first', modality: 'text', capabilities: ['responses'] }, { id: 'second', modality: 'text', capabilities: ['responses'] }], defaults: { text: 'first' } });
+ try {
+ await expect(f.service.probeModel('text', 'second')).resolves.toMatchObject({ model: 'second', costBearer: 'customer' });
+ expect(f.probe).toHaveBeenCalledWith(expect.objectContaining({ id: 'second' }), expect.objectContaining({ modelKey: f.bootstrap.modelKey }), true, undefined);
+ expect(f.service.peekState().selectedModels?.text).toBe('first');
+ } finally { await f.service.close(); }
+});
+
+it.each([true, false])('retries an explicit 401 probe only when the model key is replaced (%s)', async replaced => {
+ const f = await setupCachedAccount();
+ const error = new ModelProbeError('model_probe_auth_required');
+ f.probe.mockRejectedValueOnce(error);
+ f.client.bootstrap.mockClear().mockResolvedValue(replaced
+ ? { ...f.bootstrap, modelKey: 'replacement-model-key', keyVersion: '2', bindingVersion: '1:2' }
+ : f.bootstrap);
+ try {
+ const result = f.service.probeModel('text', 'gateway-text', { textApi: 'chat/completions' });
+ if (replaced) {
+ await expect(result).resolves.toMatchObject({ model: 'gateway-text', operation: 'chat/completions' });
+ expect(f.probe).toHaveBeenNthCalledWith(2, expect.objectContaining({ id: 'gateway-text' }),
+ expect.objectContaining({ modelKey: 'replacement-model-key', keyVersion: '2' }), true, { textApi: 'chat/completions' });
+ } else await expect(result).rejects.toBe(error);
+ expect(f.probe).toHaveBeenCalledTimes(replaced ? 2 : 1);
+ expect(f.client.bootstrap).toHaveBeenCalledOnce();
+ expect(f.service.peekState().selectedModels?.text).toBe('gateway-text');
+ } finally { await f.service.close(); }
+});
+
+it.each(['model_probe_credits_insufficient', 'model_probe_inconclusive'])('does not retry or refresh model credentials for %s', async code => {
+ const f = await setupCachedAccount();
+ const error = new ModelProbeError(code);
+ f.probe.mockRejectedValueOnce(error);
+ f.client.bootstrap.mockClear();
+ try {
+ await expect(f.service.probeModel('text', 'gateway-text')).rejects.toBe(error);
+ expect(f.probe).toHaveBeenCalledOnce();
+ expect(f.client.bootstrap).not.toHaveBeenCalled();
+ expect(f.service.peekState().selectedModels?.text).toBe('gateway-text');
+ } finally { await f.service.close(); }
+});
+
async function seedSavedAccount(f: Awaited<ReturnType<typeof setup>>) {
const bootstrap = await f.client.bootstrap('access-1');
const store = createGatewayConfigStore(f.root);
@@ -51,6 +105,67 @@ async function seedSavedAccount(f: Awaited<ReturnType<typeof setup>>) {
return bootstrap;
}
+async function setupActivationRetry() {
+ const f = await setup();
+ await seedSavedAccount(f); await f.service.close();
+ f.activate.mockClear(); f.close.mockClear();
+ let busy = false; let pending = false;
+ const service = module.createGatewayAccountService({ dataDir: f.root, client: f.client, activateRuntime: f.activate, closeRuntime: f.close,
+ hasActiveTasks: () => busy, hasPendingTasks: () => pending, deferStartupActivation: true, probeModel: f.probe });
+ f.client.bootstrap.mockRejectedValueOnce(new GatewayError('gateway_unavailable', 503, { path: '/api/v1/client/bootstrap', reason: 'timeout' }));
+ await service.startBackgroundRestore();
+ return { ...f, service, setBusy(value: boolean) { busy = value; }, setPending(value: boolean) { pending = value; } };
+}
+
+it('recovers a transient activation failure on account polling with throttling and no paid probe or key rotation', async () => {
+ const f = await setupActivationRetry();
+ const now = Date.now(); const clock = vi.spyOn(Date, 'now').mockReturnValue(now);
+ try {
+ expect(f.service.peekState()).toMatchObject({ authState: 'signed_in', activationState: 'blocked', activationError: {
+ code: 'gateway_unavailable', stage: 'bootstrap', request: { path: '/api/v1/client/bootstrap', reason: 'timeout' } } });
+ await Promise.all([f.service.readState(), f.service.readState()]);
+ expect(f.client.bootstrap).toHaveBeenCalledOnce();
+ clock.mockReturnValue(now + 31_000);
+ await Promise.all([f.service.readState(), f.service.readState()]);
+ await vi.waitFor(() => expect(f.service.peekState().activationState).toBe('ready'));
+ expect(f.client.bootstrap).toHaveBeenCalledTimes(2);
+ expect(f.client.bootstrap).toHaveBeenLastCalledWith('access-1', { rotate: false, modelUsePolicy: 'cached-key-v1' });
+ expect(f.probe).not.toHaveBeenCalled();
+ expect(f.client.pollDevice).not.toHaveBeenCalled();
+ } finally { clock.mockRestore(); await f.service.close(); }
+});
+
+it('defers automatic recovery while active or remote pending tasks exist', async () => {
+ const f = await setupActivationRetry();
+ const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 31_000);
+ try {
+ f.setBusy(true); await f.service.readState();
+ await vi.waitFor(() => expect(f.service.peekState().activationState).toBe('blocked'));
+ expect(f.client.bootstrap).toHaveBeenCalledOnce();
+ f.setBusy(false); f.setPending(true); await f.service.readState();
+ expect(f.client.bootstrap).toHaveBeenCalledOnce();
+ f.setPending(false); await f.service.readState();
+ await vi.waitFor(() => expect(f.service.peekState().activationState).toBe('ready'));
+ expect(f.client.bootstrap).toHaveBeenCalledTimes(2);
+ } finally { clock.mockRestore(); await f.service.close(); }
+});
+
+it('continues throttling repeated connection failures and stops retries after sign-out', async () => {
+ const f = await setupActivationRetry();
+ const now = Date.now(); const clock = vi.spyOn(Date, 'now').mockReturnValue(now + 31_000);
+ try {
+ f.client.bootstrap.mockRejectedValue(new GatewayError('gateway_unavailable'));
+ await f.service.readState();
+ await vi.waitFor(() => expect(f.client.bootstrap).toHaveBeenCalledTimes(2));
+ await vi.waitFor(() => expect(f.service.peekState().activationState).toBe('blocked'));
+ await f.service.readState();
+ expect(f.client.bootstrap).toHaveBeenCalledTimes(2);
+ await f.service.logout(); clock.mockReturnValue(now + 120_000);
+ expect(await f.service.readState()).toMatchObject({ authState: 'signed_out', activationState: 'inactive' });
+ expect(f.client.bootstrap).toHaveBeenCalledTimes(2);
+ } finally { clock.mockRestore(); await f.service.close(); }
+});
+
async function setupCachedAccount(overrides: Partial<GatewayBootstrap> = {}) {
const f = await setup();
const bootstrap: GatewayBootstrap = { ...await f.client.bootstrap('access-1'), transport: 'openrouter-direct', baseUrl: 'https://openrouter.ai/api/v1', keyRotation: false, modelUsePolicy: 'cached-key-v1', ...overrides };
@@ -60,8 +175,86 @@ async function setupCachedAccount(overrides: Partial<GatewayBootstrap> = {}) {
return { ...f, bootstrap };
}
-it('有效模型凭据下连续一百次调用不访问账号网关,账户令牌过期也不阻塞', async () => {
+it('persists the ChatAnywhere route and rejects changes during active use', async () => {
+ const f = await setupCachedAccount({ schemaVersion: 2, supplier: 'chatanywhere', transport: 'supplier-direct', baseUrl: 'https://api.chatanywhere.tech/v1' });
+ try {
+ f.client.bootstrap.mockResolvedValue({ ...f.bootstrap, baseUrl: 'https://api.chatanywhere.org/v1' });
+ expect(await f.service.setRegion('overseas')).toMatchObject({ supplier: 'chatanywhere', supplierRegion: 'overseas', activationState: 'ready' });
+ expect((await f.service.modelCredentials()).baseUrl).toBe('https://api.chatanywhere.org/v1');
+ expect((await createGatewayConfigStore(f.root).readConfiguration()).region).toBe('overseas');
+ expect(f.client.bootstrap).toHaveBeenLastCalledWith('access-1', { rotate: false, region: 'overseas' });
+ const use = await f.service.beginModelUse();
+ await expect(f.service.setRegion('domestic')).rejects.toMatchObject({ code: 'active_tasks' });
+ await use.release(); await f.service.logout();
+ expect(f.service.peekState().supplier).toBeUndefined();
+ } finally { await f.service.close(); }
+});
+
+it('pauses cached requests during migration and resumes with the new supplier', async () => {
const f = await setupCachedAccount();
+ try {
+ f.client.bootstrap.mockRejectedValueOnce(new GatewayError('supplier_migrating', 409));
+ await expect(f.service.recoverModelCredentials('1')).rejects.toMatchObject({ code: 'supplier_migrating' });
+ await expect(f.service.beginModelUse({ recovery: true })).rejects.toMatchObject({ code: 'supplier_migrating' });
+ expect(f.service.peekState()).toMatchObject({ authState: 'signed_in', activationState: 'blocked', activationError: { code: 'supplier_migrating' } });
+ f.client.bootstrap.mockResolvedValue({ ...f.bootstrap, schemaVersion: 2, supplier: 'chatanywhere', transport: 'supplier-direct', modelKey: 'new-ca-key', keyVersion: 'ca-key-version', baseUrl: 'https://api.chatanywhere.tech/v1' });
+ await f.service.activate();
+ expect(f.service.peekState()).toMatchObject({ supplier: 'chatanywhere', activationState: 'ready' });
+ expect((await f.service.modelCredentials()).modelKey).toBe('new-ca-key');
+ } finally { await f.service.close(); }
+});
+
+it('never repeats a paid model probe on a different supplier after credential recovery', async () => {
+ const f = await setupCachedAccount();
+ try {
+ f.probe.mockRejectedValueOnce(new ModelProbeError('model_probe_auth_required'));
+ f.client.bootstrap.mockResolvedValue({ ...f.bootstrap, schemaVersion: 2, supplier: 'chatanywhere', transport: 'supplier-direct', modelKey: 'new-ca-key', keyVersion: 'ca-key-version', baseUrl: 'https://api.chatanywhere.tech/v1' });
+ await expect(f.service.probeModel('text', 'gateway-text')).rejects.toMatchObject({ code: 'supplier_binding_changed' });
+ expect(f.probe).toHaveBeenCalledOnce();
+ } finally { await f.service.close(); }
+});
+
+it('automatically finishes first-login activation after a supplier migration', async () => {
+ const f = await setup(undefined, undefined, undefined, undefined, undefined, false, true);
+ const bootstrap = { ...await f.client.bootstrap('access-1'), schemaVersion: 2 as const, supplier: 'chatanywhere' as const, transport: 'supplier-direct' as const, keyRotation: false, modelUsePolicy: 'cached-key-v1' as const, baseUrl: 'https://api.chatanywhere.tech/v1' };
+ f.client.bootstrap.mockRejectedValueOnce(new GatewayError('supplier_migrating', 409)).mockResolvedValue(bootstrap);
+ vi.useFakeTimers();
+ try {
+ const grant = await f.service.startAuthorization(); await f.service.pollAuthorization(grant.attemptId);
+ expect(f.service.peekState().activationError?.code).toBe('supplier_migrating');
+ await vi.advanceTimersByTimeAsync(60_000);
+ await vi.waitFor(() => expect(f.service.peekState()).toMatchObject({ activationState: 'ready', supplier: 'chatanywhere', account: { id: '1' } }));
+ expect(f.activate).toHaveBeenCalledOnce();
+ } finally { await f.service.close(); vi.useRealTimers(); }
+});
+
+async function setupCatalogAccount(hasActiveTasks = () => false, deferStartupActivation = false) {
+ let raw!: GatewayBootstrap; let ids: string[] | undefined; let failure: number | undefined;
+ const fetcher = vi.fn<typeof fetch>(async (url, options) => {
+ expect(options?.method ?? 'GET').toBe('GET'); expect(options?.body).toBeUndefined();
+ if (String(url).endsWith('/cdn-cgi/trace')) return new Response('ip=203.0.113.1\nloc=JP\n');
+ expect(String(url)).toContain('/models/user?output_modalities=all');
+ expect(new Headers(options?.headers).get('authorization')).toBe(`Bearer ${raw.modelKey}`);
+ return failure ? Response.json({}, { status: failure }) : Response.json({ data: (ids ?? raw.models.map(model => model.id)).map(id => ({ id })) });
+ });
+ const f = await setup(undefined, undefined, undefined, hasActiveTasks, root => createOfficialModelAccess({
+ dataDir: root, fetcher, readProxy: async () => ''
+ }), deferStartupActivation);
+ raw = { ...await f.client.bootstrap('access-1'), transport: 'openrouter-direct', baseUrl: 'https://openrouter.ai/api/v1',
+ models: ['deepseek/deepseek-v3.2', 'deepseek/deepseek-r1', 'openai/gpt-4.1-mini', 'openai/gpt-6-sol', 'qwen/qwen3-coder', 'anthropic/claude-sonnet-4.6']
+ .map(id => ({ id, modality: 'text', capabilities: ['responses'] })), defaults: { text: 'deepseek/deepseek-v3.2' } };
+ f.client.bootstrap.mockResolvedValue(raw);
+ const request = vi.spyOn(f.client, 'request').mockImplementation(async (path?: string) => {
+ if (path === '/api/v1/client/probe-credentials') throw new Error('Automatic probing must not request credentials');
+ return path === '/api/v1/client/models' ? { models: raw.models } : { account: raw.account };
+ });
+ return { ...f, raw, fetcher, request,
+ setCatalogIDs(value: string[]) { ids = value; failure = undefined; }, setFailure(status: number) { failure = status; },
+ async login() { const grant = await f.service.startAuthorization(); await f.service.pollAuthorization(grant.attemptId); } };
+}
+
+it.each(['openrouter', '88api'] as const)('有效模型凭据下连续一百次调用不访问账号网关,账户令牌过期也不阻塞 (%s)', async supplier => {
+ const f = await setupCachedAccount(supplier === '88api' ? { schemaVersion: 2, supplier: '88api', transport: 'supplier-direct', baseUrl: 'https://api.88api.ai/v1' } : {});
const request = vi.spyOn(f.client, 'request').mockRejectedValue(new GatewayError('gateway_unavailable'));
f.client.bootstrap.mockClear().mockRejectedValue(new GatewayError('gateway_unavailable'));
f.client.refresh.mockRejectedValue(new GatewayError('gateway_unavailable'));
@@ -80,8 +273,8 @@ it('有效模型凭据下连续一百次调用不访问账号网关,账户令
} finally { clock.mockRestore(); await f.service.close(); }
});
-it('稳定密钥账号重启时从本地激活,账号网关离线不影响恢复', async () => {
- const f = await setupCachedAccount();
+it.each(['openrouter', '88api'] as const)('稳定密钥账号重启时从本地激活,账号网关离线不影响恢复 (%s)', async supplier => {
+ const f = await setupCachedAccount(supplier === '88api' ? { schemaVersion: 2, supplier: '88api', transport: 'supplier-direct', baseUrl: 'https://api.88api.ai/v1' } : {});
await f.service.close();
f.client.bootstrap.mockClear().mockRejectedValue(new GatewayError('gateway_unavailable'));
f.client.refresh.mockRejectedValue(new GatewayError('gateway_unavailable'));
@@ -316,7 +509,7 @@ it.each(['refresh', 'bootstrap'] as const)('异步任务从 %s 确认撤销时
} finally { finishWorker(); clock?.mockRestore(); await restored.close(); }
});
-it.each(['profile', 'catalog', 'billing', 'avatar', 'probe'] as const)('按需 %s 接口确认撤销后立即拒绝本地模型请求', async surface => {
+it.each(['profile', 'catalog', 'billing', 'avatar'] as const)('按需 %s 接口确认撤销后立即拒绝本地模型请求', async surface => {
const f = await setupCachedAccount();
const error = new GatewayError('auth_required', 401);
const request = vi.spyOn(f.client, 'request').mockImplementation(async path => {
@@ -340,7 +533,6 @@ it.each(['profile', 'catalog', 'billing', 'avatar', 'probe'] as const)('按需 %
clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 31_000);
await f.service.readState();
} else if (surface === 'billing') await expect(f.service.billing('/api/v1/billing/summary')).rejects.toMatchObject({ code: 'auth_required' });
- else await expect(f.service.probeCredentials()).rejects.toMatchObject({ code: 'auth_required' });
await expect(f.service.beginModelUse()).rejects.toMatchObject({ code: 'auth_required' });
}
expect(request.mock.calls.length || f.client.avatar.mock.calls.length).toBeGreaterThan(0);
@@ -463,34 +655,37 @@ it('returns signed-in state immediately while bootstrap is still preparing model
} finally { release(); await work; await f.service.close(); }
});
-it('keeps platform credentials private and separate from user task credentials', async () => {
- const f = await setup();
- const grant = await f.service.startAuthorization(); await f.service.pollAuthorization(grant.attemptId);
- const request = vi.spyOn(f.client, 'request');
- const [a, b] = await Promise.all([f.service.probeCredentials(), f.service.probeCredentials()]);
- expect(a).toEqual(b);
- expect(request.mock.calls.filter(([path]) => path === '/api/v1/client/probe-credentials')).toHaveLength(1);
- const task = await f.service.beginModelUse();
- expect(task.credentials.modelKey).toBe('cloud-1'); await task.release();
- expect(JSON.stringify(f.service.peekState())).not.toContain(a.modelKey);
- expect(await readFile(join(f.root, 'config/gateway-credentials.json'), 'utf8')).not.toContain(a.modelKey);
- await f.service.logout();
- await expect(f.service.probeCredentials()).rejects.toMatchObject({ code: 'auth_required' });
- await f.service.close();
-});
-
-it('rejects a platform credential that aliases the user key or has expired', async () => {
- const f = await setup();
- const grant = await f.service.startAuthorization(); await f.service.pollAuthorization(grant.attemptId);
- const request = vi.spyOn(f.client, 'request');
- request.mockResolvedValueOnce({ ...platformCredentials(), modelKey: 'cloud-1' });
- await expect(f.service.probeCredentials()).rejects.toMatchObject({ code: 'services_not_ready' });
- request.mockResolvedValueOnce({ ...platformCredentials(), expiresAt: new Date(Date.now() - 1000).toISOString() });
- await expect(f.service.probeCredentials()).rejects.toMatchObject({ code: 'services_not_ready' });
- request.mockRejectedValueOnce(new GatewayError('services_not_ready'));
- await expect(f.service.probeCredentials()).rejects.toMatchObject({ code: 'services_not_ready' });
- expect((await f.service.modelCredentials()).modelKey).toBe('cloud-1');
- await f.service.close();
+it('selects without inference and explicitly tests OpenRouter while the account gateway is offline', async () => {
+ const f = await setupCachedAccount();
+ const request = vi.spyOn(f.client, 'request').mockRejectedValue(new GatewayError('gateway_unavailable'));
+ f.client.bootstrap.mockClear().mockRejectedValue(new GatewayError('gateway_unavailable'));
+ f.client.refresh.mockRejectedValue(new GatewayError('gateway_unavailable'));
+ const fetcher = vi.fn<typeof fetch>(async url => String(url).endsWith('/responses')
+ ? Response.json({ status: 'completed', output: [{ type: 'function_call', name: 'model_probe', arguments: '{"ok":true}' }] })
+ : Response.json({ choices: [{ message: { content: 'OK' } }] }));
+ const probe = createModelSelectionProbe({ dataDir: f.root, fetcher, readProxy: async () => '' });
+ f.probe.mockImplementation(probe.probe);
+ const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 16 * 60_000);
+ try {
+ await f.service.selectModel('text', 'gateway-text');
+ expect(fetcher).not.toHaveBeenCalled();
+ await f.service.probeModel('text', 'gateway-text');
+ expect(fetcher.mock.calls.map(([url]) => url)).toEqual([
+ 'https://openrouter.ai/api/v1/responses'
+ ]);
+ const task = await f.service.beginModelUse();
+ for (const [, options] of fetcher.mock.calls) {
+ expect(new Headers(options?.headers).get('authorization')).toBe(`Bearer ${task.credentials.modelKey}`);
+ }
+ await task.release();
+ expect(request).not.toHaveBeenCalled();
+ expect(f.client.bootstrap).not.toHaveBeenCalled();
+ expect(f.client.refresh).not.toHaveBeenCalled();
+ expect(JSON.stringify(f.service.peekState())).not.toContain(f.bootstrap.modelKey);
+ await f.service.logout();
+ await expect(f.service.probeModel('text', 'gateway-text')).rejects.toMatchObject({ code: 'auth_required' });
+ expect(fetcher).toHaveBeenCalledOnce();
+ } finally { clock.mockRestore(); await probe.close(); await f.service.close(); }
});
it('coalesces simultaneous authorization polls so a grant is consumed only once', async () => {
@@ -534,40 +729,16 @@ it('checks on foreground return without bypassing polling intervals or slow-down
} finally { clock.mockRestore(); await f.service.close(); }
});
-it('admits exact verified models and preserves the raw candidate catalog', async () => {
- let finishProbe!: () => void;
- const waiting = new Promise<void>(resolve => { finishProbe = resolve; });
- const requests: string[] = [];
- const f = await setup(undefined, undefined, undefined, undefined, (root, readProbeCredentials) => createOfficialModelAccess({
- dataDir: root, readProbeCredentials, readProxy: async () => '', fetcher: async (url, options) => {
- if (String(url).endsWith('/cdn-cgi/trace')) return new Response('ip=203.0.113.1\nloc=JP\n');
- if (String(url).includes('/models/user?')) return Response.json({ data: raw.models });
- expect(new Headers(options?.headers).get('authorization')).toBe('Bearer platform-probe-key');
- const model = JSON.parse(String(options?.body)).model; requests.push(model);
- await waiting;
- return model.startsWith('openai/') ? Response.json({ error: { message: 'The request is prohibited due to a violation of provider Terms Of Service.' } }, { status: 403 })
- : Response.json({ status: 'completed', output: [{ type: 'function_call', name: 'oc_access_check', arguments: '{"ready":true}' }] });
- }
- }));
- const raw = { ...await f.client.bootstrap('access-1'), transport: 'openrouter-direct' as const, baseUrl: 'https://openrouter.ai/api/v1', keyRotation: true,
- models: ['deepseek/deepseek-v3.2', 'deepseek/deepseek-r1', 'openai/gpt-4.1-mini', 'openai/gpt-6-sol', 'qwen/qwen3-coder', 'anthropic/claude-sonnet-4.6'].map(id => ({ id, modality: 'text' as const, capabilities: ['responses'] })), defaults: { text: 'deepseek/deepseek-v3.2' } };
- f.client.bootstrap.mockResolvedValue(raw);
- const usage: Array<{ busy: boolean }> = [];
- vi.spyOn(f.client, 'request').mockImplementation(async (path?: string, _access?: string, body?: unknown) => {
- if (path === '/api/v1/client/probe-credentials') return platformCredentials();
- if (path === '/api/v1/client/usage') { usage.push(body as { busy: boolean }); return { keyVersion: raw.keyVersion }; }
- return path === '/api/v1/client/models' ? { models: raw.models } : { account: raw.account };
- });
- const grant = await f.service.startAuthorization(); await f.service.pollAuthorization(grant.attemptId);
- await expect.poll(() => requests.length).toBeGreaterThan(0);
- expect(f.service.peekState().activationState).toBe('blocked');
- await expect(f.service.selectModel('text', 'deepseek/deepseek-r1')).rejects.toMatchObject({ code: 'invalid_model' });
- finishProbe();
- await expect.poll(() => f.service.peekState().models.some(model => model.id === 'qwen/qwen3-coder')).toBe(true);
+it('activates from the customer catalog without inference and preserves the raw candidate catalog', async () => {
+ const f = await setupCatalogAccount();
+ f.setCatalogIDs(f.raw.models.filter(model => !model.id.startsWith('openai/')).map(model => model.id));
+ await f.login();
+ expect(f.service.peekState().activationState).toBe('ready');
await f.service.selectModel('text', 'deepseek/deepseek-r1');
expect(f.service.peekState().models.map(model => model.id)).toEqual(['deepseek/deepseek-v3.2', 'deepseek/deepseek-r1', 'qwen/qwen3-coder']);
expect(f.service.peekState().selectedModels?.text).toBe('deepseek/deepseek-r1');
await expect(f.service.selectModel('text', 'openai/gpt-6-sol')).rejects.toMatchObject({ code: 'invalid_model' });
+ await expect(f.service.selectModel('text', 'anthropic/claude-sonnet-4.6')).rejects.toMatchObject({ code: 'invalid_model' });
expect((await f.service.modelCredentials()).models).toEqual(f.service.peekState().models);
const scope = await f.service.modelCredentials();
const facts = { kind: 'http-rejected' as const, httpStatus: 403, upstreamMessage: 'Model unavailable in this country' };
@@ -578,80 +749,112 @@ it('admits exact verified models and preserves the raw candidate catalog', async
expect((await f.service.readState()).selectedModels?.text).toBe('deepseek/deepseek-v3.2');
await expect(f.service.selectModel('text', 'deepseek/deepseek-r1')).rejects.toMatchObject({ code: 'invalid_model' });
expect((await createGatewayConfigStore(f.root).readCredentials())?.models).toHaveLength(6);
- expect(usage.some(value => value.busy)).toBe(false);
+ expect(f.request.mock.calls.some(([path]) => path === '/api/v1/client/probe-credentials')).toBe(false);
await f.service.close();
- expect(usage.at(-1)?.busy).toBe(false);
});
-it('defers a blocked default replacement until idle and recovers after every family was denied', async () => {
- let active = true; let denyFallback = false; let recover = false;
- let finishProbe!: () => void;
- const waiting = new Promise<void>(resolve => { finishProbe = resolve; });
- const f = await setup(undefined, undefined, undefined, () => active, (root, readProbeCredentials) => createOfficialModelAccess({
- dataDir: root, readProbeCredentials, readProxy: async () => '', fetcher: async (url, options) => {
- if (String(url).endsWith('/cdn-cgi/trace')) return new Response('ip=203.0.113.1\nloc=JP\n');
- if (String(url).includes('/models/user?')) return Response.json({ data: raw.models });
- await waiting;
- const model = JSON.parse(String(options?.body)).model;
- return !recover && (model.startsWith('openai/') || denyFallback)
- ? Response.json({ error: { message: 'Model unavailable in this country' } }, { status: 403 })
- : Response.json({ status: 'completed', output: [{ type: 'function_call', name: 'oc_access_check', arguments: '{"ready":true}' }] });
- }
- }));
- active = false;
- const raw = { ...await f.client.bootstrap('access-1'), transport: 'openrouter-direct' as const, baseUrl: 'https://openrouter.ai/api/v1',
- models: ['openai/gpt-4.1-mini', 'deepseek/deepseek-v3.2'].map(id => ({ id, modality: 'text' as const, capabilities: ['responses'] })), defaults: { text: 'openai/gpt-4.1-mini' } };
- f.client.bootstrap.mockResolvedValue(raw);
- vi.spyOn(f.client, 'request').mockImplementation(async (path?: string) => path === '/api/v1/client/probe-credentials'
- ? platformCredentials() : path === '/api/v1/client/models' ? { models: raw.models } : { account: raw.account });
- const grant = await f.service.startAuthorization(); await f.service.pollAuthorization(grant.attemptId);
- active = true; finishProbe();
- await expect.poll(() => f.service.peekState().selectedModels?.text).toBe('deepseek/deepseek-v3.2');
- expect(f.activate).not.toHaveBeenCalled();
+it('defers runtime replacement until idle and recovers expired exact-model rejections without probes', async () => {
+ let active = false;
+ const f = await setupCatalogAccount(() => active); await f.login();
+ const use = await f.service.beginModelUse(); active = true;
+ const scope = use.credentials;
+ const facts = { kind: 'http-rejected' as const, httpStatus: 403, upstreamMessage: 'Model unavailable in this country' };
+ await f.service.reportModelFailure(scope, 'deepseek/deepseek-v3.2', 'text', facts);
+ await f.service.readState();
+ expect(f.service.peekState().selectedModels?.text).toBe('deepseek/deepseek-r1');
+ expect(use.credentials.defaults.text).toBe('deepseek/deepseek-v3.2');
+ expect(f.activate).toHaveBeenCalledTimes(1);
+ await use.release();
active = false;
- expect(await f.service.readState()).toMatchObject({ activationState: 'ready', selectedModels: { text: 'deepseek/deepseek-v3.2' } });
- expect(f.activate).toHaveBeenLastCalledWith(expect.objectContaining({ defaults: { text: 'deepseek/deepseek-v3.2' } }));
- const start = Date.now(); const clock = vi.spyOn(Date, 'now').mockReturnValue(start + 24 * 60 * 60_000 + 1);
+ expect(await f.service.readState()).toMatchObject({ activationState: 'ready', selectedModels: { text: 'deepseek/deepseek-r1' } });
+ expect(f.activate).toHaveBeenLastCalledWith(expect.objectContaining({ defaults: { text: 'deepseek/deepseek-r1' } }));
+ for (const model of scope.models.slice(1)) await f.service.reportModelFailure(scope, model.id, model.modality, facts);
+ await f.service.readState();
+ expect(f.service.peekState().activationState).toBe('blocked');
+ await expect(f.service.modelCredentials()).rejects.toMatchObject({ code: 'services_not_ready' });
+ const recoveryUse = await f.service.beginModelUse({ recovery: true });
+ expect(recoveryUse.credentials.models).toEqual([]); await recoveryUse.release();
+ const start = Date.now(); const clock = vi.spyOn(Date, 'now').mockReturnValue(start + 60 * 60_000 + 1);
try {
- denyFallback = true;
await f.service.readState();
- await expect.poll(() => f.service.peekState().activationState).toBe('blocked');
- await expect(f.service.modelCredentials()).rejects.toMatchObject({ code: 'services_not_ready' });
- await expect.poll(async () => {
- const cache = JSON.parse(await readFile(join(f.root, 'config/gateway-model-access.json'), 'utf8')) as { models: Record<string, { status: string; nextCheck: number }> };
- return Object.values(cache.models).length === 2 && Object.values(cache.models).every(entry => entry.status === 'blocked' && entry.nextCheck > Date.now());
- }).toBe(true);
- const recoveryUse = await f.service.beginModelUse({ recovery: true });
- expect(recoveryUse.credentials.models).toEqual([]);
- await recoveryUse.release();
- recover = true; clock.mockReturnValue(start + 25 * 60 * 60_000 + 2);
- await f.service.readState();
- await expect.poll(async () => (await f.service.readState()).activationState).toBe('ready');
- expect(f.service.peekState().bindingVersion).toBe(raw.bindingVersion);
+ expect(f.service.peekState().activationState).toBe('ready');
+ expect(f.service.peekState().bindingVersion).toBe(f.raw.bindingVersion);
expect((await f.service.modelCredentials()).defaults.text).toBeTruthy();
- expect(f.activate).toHaveBeenCalledTimes(2);
+ expect(f.activate).toHaveBeenCalledTimes(3);
} finally { clock.mockRestore(); await f.service.close(); }
});
-it('aborts an in-flight availability check on logout without applying a late result', async () => {
+it('hides an exact denied media model after enriching its official voice catalog', async () => {
+ const f = await setupCatalogAccount();
+ f.raw.models.push({ id: 'vendor/speech', modality: 'speech', capabilities: [], voices: ['old'] });
+ f.fetcher.mockImplementation(async url => String(url).endsWith('/cdn-cgi/trace')
+ ? new Response('ip=203.0.113.1\nloc=JP\n')
+ : Response.json({ data: f.raw.models.map(model => ({ id: model.id, ...(model.modality === 'speech' ? { supported_voices: ['native'] } : {}) })) }));
+ try {
+ await f.login();
+ const scope = await f.service.modelCredentials();
+ expect(scope.models.find(model => model.modality === 'speech')).toMatchObject({ voices: ['native'] });
+ await f.service.reportModelFailure(scope, 'vendor/speech', 'speech', { kind: 'http-rejected', httpStatus: 403, upstreamMessage: 'Model unavailable in this country' });
+ expect(f.service.peekState().models.some(model => model.modality === 'speech')).toBe(false);
+ expect(f.service.peekState().activationState).toBe('ready');
+ } finally { await f.service.close(); }
+});
+
+it('keeps sign-in independent of catalog failures and supports a forced refresh after an empty catalog', async () => {
+ const f = await setupCatalogAccount(undefined, true);
+ f.setFailure(503); await f.login();
+ expect(f.service.peekState()).toMatchObject({ authState: 'signed_in', activationState: 'blocked', activationError: { code: 'model_catalog_unavailable' } });
+ f.setCatalogIDs([]);
+ expect(await f.service.readState({ refreshModels: true })).toMatchObject({ authState: 'signed_in', activationState: 'blocked', activationError: { code: 'no_available_models' } });
+ f.setCatalogIDs(f.raw.models.map(model => model.id));
+ expect(await f.service.readState({ refreshModels: true })).toMatchObject({ activationState: 'ready' });
+ expect(f.activate).toHaveBeenCalledOnce();
+ await f.service.close();
+});
+
+it('recovers a rejected cached model key through binding sync without inference or reauthorization', async () => {
+ let raw!: GatewayBootstrap;
+ const f = await setup(undefined, undefined, undefined, undefined, root => createOfficialModelAccess({
+ dataDir: root, readProxy: async () => '', fetcher: async (url, options) => {
+ expect(options?.method ?? 'GET').toBe('GET');
+ if (String(url).endsWith('/cdn-cgi/trace')) return new Response('ip=203.0.113.1\nloc=JP\n');
+ return new Headers(options?.headers).get('authorization') === 'Bearer rejected-key'
+ ? Response.json({}, { status: 401 }) : Response.json({ data: raw.models });
+ }
+ }));
+ raw = { ...await f.client.bootstrap('access-1'), transport: 'openrouter-direct', baseUrl: 'https://openrouter.ai/api/v1',
+ modelKey: 'rejected-key', keyRotation: false, modelUsePolicy: 'cached-key-v1' };
+ f.client.bootstrap.mockResolvedValue(raw);
+ vi.spyOn(f.client, 'request').mockImplementation(async (path?: string) => path === '/api/v1/client/models' ? { models: raw.models } : { account: raw.account });
+ const grant = await f.service.startAuthorization(); await f.service.pollAuthorization(grant.attemptId);
+ expect(f.service.peekState()).toMatchObject({ authState: 'signed_in', activationState: 'blocked' });
+ raw = { ...raw, modelKey: 'replacement-key', keyVersion: '2' }; f.client.bootstrap.mockResolvedValue(raw);
+ expect(await f.service.readState({ refreshModels: true })).toMatchObject({ authState: 'signed_in', activationState: 'ready' });
+ expect(f.client.bootstrap).toHaveBeenLastCalledWith('access-1', { rotate: false });
+ expect((await f.service.modelCredentials()).modelKey).toBe('replacement-key');
+ expect(f.client.pollDevice).toHaveBeenCalledOnce();
+ await f.service.close();
+});
+
+it('aborts an in-flight login catalog request on logout without applying a late result', async () => {
let started = false; let aborted = false;
- const f = await setup(undefined, undefined, undefined, undefined, (root, readProbeCredentials) => createOfficialModelAccess({
- dataDir: root, readProbeCredentials, readProxy: async () => '', fetcher: async (url, options) => {
+ const f = await setup(undefined, undefined, undefined, undefined, root => createOfficialModelAccess({
+ dataDir: root, readProxy: async () => '', fetcher: async (url, options) => {
if (String(url).endsWith('/cdn-cgi/trace')) return new Response('ip=203.0.113.1\nloc=JP\n');
- if (String(url).includes('/models/user?')) return Response.json({ data: raw.models });
started = true;
- return new Promise<Response>(resolve => options!.signal!.addEventListener('abort', () => {
+ return new Promise<Response>((_resolve, reject) => options!.signal!.addEventListener('abort', () => {
aborted = true;
- resolve(Response.json({ status: 'completed', output: [{ type: 'function_call', name: 'oc_access_check', arguments: '{"ready":true}' }] }));
+ reject(new Error('Aborted'));
}, { once: true }));
}
}));
const raw = { ...await f.client.bootstrap('access-1'), transport: 'openrouter-direct' as const,
models: [{ id: 'deepseek/deepseek-v3.2', modality: 'text' as const, capabilities: ['responses'] }], defaults: { text: 'deepseek/deepseek-v3.2' } };
f.client.bootstrap.mockResolvedValue(raw);
- const grant = await f.service.startAuthorization(); await f.service.pollAuthorization(grant.attemptId);
+ const grant = await f.service.startAuthorization(); const login = f.service.pollAuthorization(grant.attemptId);
await expect.poll(() => started).toBe(true);
await f.service.logout();
+ await login;
expect(aborted).toBe(true);
expect(f.service.peekState()).toMatchObject({ authState: 'signed_out', activationState: 'inactive', models: [] });
expect(await createGatewayConfigStore(f.root).readCredentials()).toBeUndefined();
@@ -744,6 +947,50 @@ it('persists official model choices and validates the catalog', async () => {
await f.service.close();
});
+it.each(['text', 'image', 'video', 'speech', 'transcription'] as const)('switches %s despite active, pending and acquired uses while preserving old snapshots', async modality => {
+ const f = await setup(undefined, undefined, () => true, () => true);
+ const raw = await f.client.bootstrap('access-1');
+ raw.models.push(...['first', 'second'].map(id => ({ id: `${modality}/${id}`, modality, capabilities: modality === 'text' ? ['responses'] : [] })));
+ raw.defaults[modality] = `${modality}/first`;
+ f.client.bootstrap.mockResolvedValue(raw);
+ const grant = await f.service.startAuthorization(); await f.service.pollAuthorization(grant.attemptId);
+ const previous = await f.service.beginModelUse();
+ const server = Fastify();
+ try {
+ await registerGatewayAccountRoutes(server, f.service);
+ const response = await server.inject({ method: 'PATCH', url: '/gateway/model', payload: { modality, model: `${modality}/second` } });
+ expect(response.statusCode).toBe(200);
+ expect(response.json().selectedModels[modality]).toBe(`${modality}/second`);
+ expect(previous.credentials.defaults[modality]).toBe(`${modality}/first`);
+ const next = await f.service.beginModelUse();
+ expect(next.credentials.defaults[modality]).toBe(`${modality}/second`);
+ expect((await createGatewayConfigStore(f.root).readCredentials())?.defaults?.[modality]).toBe(`${modality}/second`);
+ expect(f.close).not.toHaveBeenCalled();
+ await next.release();
+ } finally { await previous.release(); await server.close(); await f.service.close(); }
+});
+
+it('keeps the submitted text turn model and uses the new OpenAI model for subsequent turns on the same Runtime', async () => {
+ const first = 'openai/gpt-4.1-mini'; const second = 'openai/gpt-6-sol';
+ const f = await setupCachedAccount({ models: [first, second].map(id => ({ id, modality: 'text', capabilities: ['responses'] })), defaults: { text: first } });
+ const startTurn = vi.fn<AppServerRuntimeManager['startTurn']>();
+ const official = { startTurn } as unknown as AppServerRuntimeManager;
+ const manual = { startTurn: vi.fn() } as unknown as AppServerRuntimeManager;
+ const runtime = createRuntimeSource(manual, f.service.peekState, () => official);
+ const input = { scope: { kind: 'project', id: 'p' }, thread: { id: 'thread-a' } } as Parameters<AppServerRuntimeManager['startTurn']>[0];
+ try {
+ runtime.startTurn(input);
+ const running = startTurn.mock.calls[0]![0];
+ expect(running.model).toBe(first);
+ await running.onThreadStarted?.('official-thread');
+ await f.service.selectModel('text', second);
+ runtime.startTurn(input);
+ expect(running.model).toBe(first);
+ expect(startTurn.mock.calls[1]![0]).toMatchObject({ model: second, codexThreadId: 'official-thread' });
+ expect(manual.startTurn).not.toHaveBeenCalled();
+ } finally { await f.service.close(); }
+});
+
it('refreshes the official catalog when idle, preserving choices and deferring pending tasks', async () => {
let pending = false;
const f = await setup(undefined, undefined, () => pending);
diff --git a/apps/daemon/test/unit/gateway-chatanywhere.test.ts b/apps/daemon/test/unit/gateway-chatanywhere.test.ts
new file mode 100644
index 00000000..11f886d5
--- /dev/null
+++ b/apps/daemon/test/unit/gateway-chatanywhere.test.ts
@@ -0,0 +1,124 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, expect, it, vi } from 'vitest';
+import type { GatewayModel } from '@opencreator/protocol';
+import { createGatewayClient } from '../../src/gateway/client.js';
+import { createDirectTransport } from '../../src/gateway/direct-transport.js';
+import { chatAnywhereTranscription } from '../../src/gateway/chatanywhere-media.js';
+import { createDirectRuntime } from '../../src/gateway/direct-runtime.js';
+
+const roots: string[] = [];
+afterEach(async () => { for (const root of roots.splice(0)) await rm(root, { recursive: true, force: true }); });
+const domestic = 'https://api.chatanywhere.tech/v1';
+const overseas = 'https://api.chatanywhere.org/v1';
+const whisper: GatewayModel = { id: 'whisper-1', modality: 'transcription', capabilities: ['transcription_text', 'subtitle_timestamps'] };
+const image: GatewayModel = { id: 'gpt-image-1', modality: 'image', capabilities: ['generate', 'edit'], imageOptions: { maxImages: 1, maxReferences: 16, aspectRatios: ['3:2'], resolutions: ['1K'] } };
+async function fixture(fetcher: typeof fetch, baseUrl = domestic, recover?: Parameters<typeof createDirectTransport>[2]) {
+ const root = await mkdtemp(join(tmpdir(), 'oc-chatanywhere-')); roots.push(root);
+ return { transport: createDirectTransport(root, fetcher, recover), input: { account: 'a', baseUrl, key: 'private-ca', method: 'POST', contentType: 'application/json', identity: 'one', fingerprint: 'fingerprint', signal: AbortSignal.timeout(5000) } };
+}
+async function multipart(form: FormData) {
+ const request = new Request('http://localhost', { method: 'POST', body: form });
+ return { body: Buffer.from(await request.arrayBuffer()), contentType: request.headers.get('content-type')! };
+}
+async function audio(format = 'verbose_json') {
+ const form = new FormData(); form.set('model', 'whisper-1'); form.set('response_format', format);
+ form.set('timestamp_granularities[]', 'segment'); form.set('file', new Blob(['sample'], { type: 'audio/wav' }), 'sample.wav');
+ return multipart(form);
+}
+
+it.each([domestic, overseas])('accepts only the paired ChatAnywhere base (%s)', async baseUrl => {
+ const bootstrap = { schemaVersion: 2, supplier: 'chatanywhere', transport: 'supplier-direct', keyRotation: false, modelUsePolicy: 'cached-key-v1', account: { id: 'a', email: 'a@test', verified: true }, modelKey: 'private-ca', keyVersion: 'one', bindingVersion: 'a:chatanywhere:one', baseUrl, models: [whisper], defaults: { transcription: 'whisper-1' } };
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json(bootstrap));
+ const client = createGatewayClient('https://gateway.example', fetcher);
+ expect((await client.bootstrap('device', { rotate: false, region: 'overseas' })).baseUrl).toBe(baseUrl);
+ expect(String(fetcher.mock.lastCall?.[0])).toContain('region=overseas');
+ bootstrap.supplier = '88api';
+ await expect(client.bootstrap('device')).rejects.toMatchObject({ code: 'invalid_gateway_response' });
+});
+
+it.each([domestic, overseas])('uses native STT and preserves real subtitle timestamps (%s)', async baseUrl => {
+ const fetcher = vi.fn<typeof fetch>(async (_url, options) => {
+ const form = await new Request('http://localhost', { method: 'POST', headers: options?.headers, body: options?.body }).formData();
+ expect(form.get('model')).toBe('whisper-1'); expect(form.has('timestamp_granularities[]')).toBe(false);
+ expect(form.get('response_format')).toBe('verbose_json'); expect(form.get('file')).toBeInstanceOf(File);
+ return Response.json({ text: 'hello', segments: [{ text: 'hello', start: 0, end: 0.5 }] });
+ });
+ const f = await fixture(fetcher, baseUrl);
+ const response = await f.transport.request({ ...f.input, ...await audio(), model: whisper, resource: 'audio/transcriptions' });
+ expect((await response.json()).segments[0]).toEqual({ text: 'hello', start: 0, end: 0.5 });
+ expect(fetcher.mock.lastCall?.[0]).toBe(`${baseUrl}/audio/transcriptions`);
+});
+
+it('rejects missing timestamps and does not resubmit an ambiguous transcription', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ text: 'hello' }));
+ const f = await fixture(fetcher); const input = { ...f.input, ...await audio(), model: whisper, resource: 'audio/transcriptions' };
+ await expect(f.transport.request(input)).rejects.toMatchObject({ code: 'invalid_gateway_response' });
+ await expect(f.transport.request(input)).rejects.toMatchObject({ code: 'request_outcome_unknown' });
+ expect(fetcher).toHaveBeenCalledOnce();
+});
+
+it('rejects word granularity and unsupported non-JSON transcription before inference', async () => {
+ const value = await audio('srt');
+ await expect(chatAnywhereTranscription(value.body, value.contentType)).rejects.toMatchObject({ code: 'capability_unsupported' });
+ const form = new FormData(); form.set('model', 'whisper-1'); form.set('timestamp_granularities[]', 'word'); form.set('file', new Blob(['sample']), 'a.wav');
+ const words = await multipart(form);
+ await expect(chatAnywhereTranscription(words.body, words.contentType)).rejects.toMatchObject({ code: 'capability_unsupported' });
+});
+
+it('keeps image edits multipart and generation native', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ data: [{ b64_json: 'aW1hZ2U=' }] }));
+ const f = await fixture(fetcher);
+ await f.transport.request({ ...f.input, model: image, resource: 'images/generations', body: { model: image.id, prompt: 'test', aspect_ratio: '3:2', resolution: '1K' } });
+ expect(fetcher.mock.lastCall?.[0]).toBe(`${domestic}/images/generations`);
+ expect(JSON.parse(String(fetcher.mock.lastCall?.[1]?.body))).toMatchObject({ model: image.id, size: '1536x1024' });
+ const form = new FormData(); form.set('model', image.id); form.set('prompt', 'edit'); form.set('image', new Blob(['image'], { type: 'image/png' }), 'a.png');
+ await f.transport.request({ ...f.input, ...await multipart(form), identity: 'edit', model: image, resource: 'images/edits' });
+ expect(fetcher.mock.lastCall?.[0]).toBe(`${domestic}/images/edits`);
+ const options = fetcher.mock.lastCall?.[1];
+ const native = await new Request('http://localhost', { method: 'POST', headers: options?.headers, body: options?.body }).formData();
+ expect(native.get('image')).toBeInstanceOf(File); expect(native.has('input_references')).toBe(false);
+});
+
+it('downloads documented image results without forwarding the supplier key', async () => {
+ const media = 'https://oaidalleapiprodscus.blob.core.windows.net/images/result.png?sig=signed';
+ const fetcher = vi.fn<typeof fetch>(async (url, options) => {
+ if (url === media) { expect(new Headers(options?.headers).has('authorization')).toBe(false); return new Response('image', { headers: { 'Content-Type': 'image/png' } }); }
+ return Response.json({ data: [{ url: media }] });
+ });
+ const f = await fixture(fetcher);
+ const response = await f.transport.request({ ...f.input, model: image, resource: 'images/generations', body: { model: image.id, prompt: 'test' } });
+ expect(await response.json()).toMatchObject({ data: [{ b64_json: 'aW1hZ2U=' }] });
+ expect(fetcher).toHaveBeenCalledTimes(2);
+});
+
+it('rejects video and untrusted image hosts without forwarding credentials', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ data: [{ url: 'https://untrusted.test/image.png' }] }));
+ const f = await fixture(fetcher);
+ await expect(f.transport.request({ ...f.input, resource: 'video/jobs', body: {} })).rejects.toMatchObject({ code: 'capability_unsupported' });
+ expect(fetcher).not.toHaveBeenCalled();
+ await expect(f.transport.request({ ...f.input, resource: 'images/generations', model: image, body: { model: image.id, prompt: 'test' } })).rejects.toMatchObject({ code: 'unsupported_media_origin' });
+ expect(fetcher).toHaveBeenCalledOnce();
+});
+
+it('rejects stale runtime credentials after a supplier change', async () => {
+ const fetcher = vi.fn<typeof fetch>();
+ const release = vi.fn(async () => undefined);
+ const runtime = await createDirectRuntime('old-key', fetcher, async () => ({ key: 'new-key', baseUrl: overseas, release }), undefined, 'https://api.88api.ai/v1');
+ try {
+ const response = await fetch(`${runtime.baseUrl}/responses`, { method: 'POST', headers: { Authorization: `Bearer ${runtime.token}`, 'Content-Type': 'application/json' }, body: JSON.stringify({ model: 'gpt-4.1-mini', input: 'hello' }) });
+ expect(response.status).toBe(409); expect(await response.json()).toMatchObject({ error: { code: 'supplier_binding_changed' } });
+ expect(fetcher).not.toHaveBeenCalled(); expect(release).toHaveBeenCalledOnce();
+ } finally { await runtime.close(); }
+});
+
+it('does not resubmit an old failed receipt to another supplier or route', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ error: { message: 'Insufficient balance' } }, { status: 402 }));
+ const f = await fixture(fetcher);
+ const input = { ...f.input, resource: 'images/generations', model: image, body: { model: image.id, prompt: 'test' } };
+ await expect(f.transport.request(input)).rejects.toMatchObject({ status: 402 });
+ await expect(f.transport.request({ ...input, baseUrl: overseas })).rejects.toMatchObject({ code: 'operation_conflict' });
+ await expect(f.transport.request({ ...input, baseUrl: 'https://api.88api.ai/v1' })).rejects.toMatchObject({ code: 'operation_conflict' });
+ expect(fetcher).toHaveBeenCalledOnce();
+});
diff --git a/apps/daemon/test/unit/gateway-client.test.ts b/apps/daemon/test/unit/gateway-client.test.ts
index d22ab7c2..351dd359 100644
--- a/apps/daemon/test/unit/gateway-client.test.ts
+++ b/apps/daemon/test/unit/gateway-client.test.ts
@@ -1,12 +1,12 @@
import { expect, it, vi } from 'vitest';
-import { accountSchema, createGatewayClient } from '../../src/gateway/client.js';
+import { accountSchema, createGatewayClient, GatewayError } from '../../src/gateway/client.js';
it('协商稳定密钥策略并拒绝仍会自动轮换的响应', async () => {
const value = { schemaVersion: 1, transport: 'openrouter-direct', account: { id: 'a', email: 'a@test', verified: true }, modelKey: 'private', keyVersion: '1', bindingVersion: 'a:1', baseUrl: 'https://openrouter.ai/api/v1', models: [], defaults: {}, modelUsePolicy: 'cached-key-v1', keyRotation: false };
const fetcher = vi.fn<typeof fetch>(async () => Response.json(value));
const client = createGatewayClient('https://gateway.example', fetcher);
expect((await client.bootstrap('device-access', { rotate: false, modelUsePolicy: 'cached-key-v1' })).modelUsePolicy).toBe('cached-key-v1');
- expect(fetcher.mock.calls[0]?.[0]).toBe('https://gateway.example/api/v1/client/bootstrap?rotate=0&modelUsePolicy=cached-key-v1');
+ expect(fetcher.mock.calls[0]?.[0]).toBe('https://gateway.example/api/v1/client/bootstrap?protocolVersion=3&rotate=0&modelUsePolicy=cached-key-v1');
value.keyRotation = true;
await expect(client.bootstrap('device-access')).rejects.toThrow();
});
@@ -57,6 +57,66 @@ it('取消未完成的请求后仍能发起新的请求', async () => {
expect(await client.request('/api/v1/me', 'device-token')).toEqual({ account: { id: 'a' } });
});
+it('uses one request for a prompt credit response and cancels its backup timer', async () => {
+ vi.useFakeTimers();
+ try {
+ const fetcher = vi.fn(async () => Response.json({ balance: { availableUnits: '123' } }));
+ const client = createGatewayClient('https://gateway.example', fetcher);
+ await expect(client.request('/api/v1/billing/summary', 'device-token')).resolves.toEqual({ balance: { availableUnits: '123' } });
+ await vi.advanceTimersByTimeAsync(1000);
+ expect(fetcher).toHaveBeenCalledOnce();
+ } finally { vi.useRealTimers(); }
+});
+
+it('starts a backup for a stalled credit read and cancels the slower connection', async () => {
+ vi.useFakeTimers();
+ try {
+ let firstSignal!: AbortSignal;
+ const fetcher = vi.fn<typeof fetch>().mockImplementationOnce(async (_url, options) => new Promise<Response>((_resolve, reject) => {
+ firstSignal = options!.signal!;
+ firstSignal.addEventListener('abort', () => reject(firstSignal.reason), { once: true });
+ })).mockResolvedValueOnce(Response.json({ balance: { availableUnits: '123' } }));
+ const client = createGatewayClient('https://gateway.example', fetcher);
+ const pending = client.request('/api/v1/billing/summary', 'device-token');
+ await vi.advanceTimersByTimeAsync(799);
+ expect(fetcher).toHaveBeenCalledOnce();
+ await vi.advanceTimersByTimeAsync(1);
+ await expect(pending).resolves.toEqual({ balance: { availableUnits: '123' } });
+ expect(fetcher).toHaveBeenCalledTimes(2);
+ expect(firstSignal.aborted).toBe(true);
+ } finally { vi.useRealTimers(); }
+});
+
+it('keeps the original credit read when a backup fails', async () => {
+ vi.useFakeTimers();
+ try {
+ let finish!: (value: Response) => void;
+ const fetcher = vi.fn<typeof fetch>().mockImplementationOnce(() => new Promise(resolve => { finish = resolve; }))
+ .mockRejectedValueOnce(new Error('backup unavailable'));
+ const client = createGatewayClient('https://gateway.example', fetcher);
+ const pending = client.request('/api/v1/billing/summary', 'device-token');
+ await vi.advanceTimersByTimeAsync(800);
+ finish(Response.json({ balance: { availableUnits: '123' } }));
+ await expect(pending).resolves.toEqual({ balance: { availableUnits: '123' } });
+ } finally { vi.useRealTimers(); }
+});
+
+it.each([undefined, {}])('cancels pending credit work without starting a backup or repeating a POST: %j', async body => {
+ vi.useFakeTimers();
+ try {
+ const fetcher = vi.fn<typeof fetch>(async (_url, options) => new Promise<Response>((_resolve, reject) => {
+ options!.signal!.addEventListener('abort', () => reject(options!.signal!.reason), { once: true });
+ }));
+ const client = createGatewayClient('https://gateway.example', fetcher);
+ const pending = client.request('/api/v1/billing/summary', 'device-token', body);
+ const rejected = expect(pending).rejects.toMatchObject({ code: 'gateway_unavailable' });
+ if (body) await vi.advanceTimersByTimeAsync(1000);
+ client.cancelPendingRequests!(); await rejected;
+ await vi.advanceTimersByTimeAsync(1000);
+ expect(fetcher).toHaveBeenCalledOnce();
+ } finally { vi.useRealTimers(); }
+});
+
it('收到响应头后仍可取消未完成的响应体读取', async () => {
let bodyStarted!: () => void;
const started = new Promise<void>(resolve => { bodyStarted = resolve; });
@@ -74,3 +134,22 @@ it('收到响应头后仍可取消未完成的响应体读取', async () => {
client.cancelPendingRequests!();
await rejected;
});
+
+it.each([
+ [Object.assign(new Error('private-device-token'), { cause: { code: 'ECONNREFUSED' } }), 'network', 'ECONNREFUSED'],
+ [new DOMException('private-device-token', 'TimeoutError'), 'timeout', undefined]
+])('keeps safe connection diagnostics without exposing raw exceptions or query strings', async (error, reason, networkCode) => {
+ const client = createGatewayClient('https://gateway.example', vi.fn(async () => { throw error; }));
+ const failure = await client.request('/api/v1/client/bootstrap?private=device-token', 'private-device-token').catch(error => error);
+ expect(failure).toMatchObject({ code: 'gateway_unavailable', diagnostics: { path: '/api/v1/client/bootstrap', reason } });
+ if (!(failure instanceof GatewayError)) throw new Error('Expected a gateway connection error');
+ expect(failure.diagnostics?.networkCode).toBe(networkCode);
+ expect(JSON.stringify(failure)).not.toMatch(/private|device-token/);
+});
+
+it('keeps the failing endpoint and HTTP status without upstream body secrets', async () => {
+ const client = createGatewayClient('https://gateway.example', vi.fn(async () => Response.json({ error: { code: 'services_not_ready', message: 'private-device-token' } }, { status: 503 })));
+ const failure = await client.request('/api/v1/client/bootstrap', 'private-device-token').catch(error => error);
+ expect(failure).toMatchObject({ code: 'services_not_ready', status: 503, diagnostics: { path: '/api/v1/client/bootstrap', reason: 'http', httpStatus: 503 } });
+ expect(JSON.stringify(failure)).not.toContain('private-device-token');
+});
diff --git a/apps/daemon/test/unit/gateway-direct-audio.test.ts b/apps/daemon/test/unit/gateway-direct-audio.test.ts
index 3737f1bf..e8b17ff5 100644
--- a/apps/daemon/test/unit/gateway-direct-audio.test.ts
+++ b/apps/daemon/test/unit/gateway-direct-audio.test.ts
@@ -53,15 +53,58 @@ it('retains real transcription generation identity and reported cost without cha
it('does not mark a subtitle transcription successful when timestamps are missing', async () => {
const f = await fixture();
f.fetcher.mockImplementation(async () => Response.json({ text: 'Hello' }));
- const input = { ...f.input, resource: 'audio/transcriptions', model: { id: 'asr', modality: 'transcription' as const, capabilities: ['subtitle_timestamps'] }, body: { model: 'asr', input: 'fixture' } };
+ const input = { ...f.input, resource: 'audio/transcriptions', model: { id: 'asr', modality: 'transcription' as const, capabilities: ['subtitle_timestamps'] }, body: { model: 'asr', response_format: 'verbose_json', input_audio: { data: 'YXVkaW8=', format: 'wav' } } };
await expect(f.transport.request(input)).rejects.toMatchObject({ code: 'invalid_gateway_response' });
await expect(createDirectTransport(f.root, f.fetcher).request(input)).rejects.toMatchObject({ code: 'request_outcome_unknown' });
expect(f.fetcher).toHaveBeenCalledOnce();
});
-it('rejects an unverified speech voice before a paid call', async () => {
+it('rejects voices outside the published catalog even without internal verification', async () => {
const f = await fixture();
- const model = { ...f.input.model, voices: ['tested'], verification: { adapterVersion: 2, verifiedAt: '2026-10-14T00:00:00Z', countries: ['JP'] } };
+ const model = { ...f.input.model, voices: ['native'] };
await expect(f.transport.request({ ...f.input, model })).rejects.toMatchObject({ code: 'capability_unsupported' });
expect(f.fetcher).not.toHaveBeenCalled();
});
+
+it.each(['wav', 'mp3'])('uses native audio encoding for %s synthesis and previews without a gateway format flag', async response_format => {
+ const f = await fixture();
+ const response = await f.transport.request({ ...f.input, body: { ...f.input.body, response_format }, model: { ...f.input.model, capabilities: [], voices: ['voice'] } });
+ expect(JSON.parse(String(f.fetcher.mock.calls[0]?.[1]?.body))).not.toHaveProperty('response_format');
+ expect(response.headers.get('content-type')).toBe('audio/wav');
+ expect(Buffer.from(await response.arrayBuffer()).subarray(44)).toEqual(f.pcm);
+});
+
+it('allows ordinary JSON transcription without timings even when the model can generate subtitles', async () => {
+ const f = await fixture();
+ f.fetcher.mockImplementation(async () => Response.json({ text: 'Hello' }));
+ const response = await f.transport.request({ ...f.input, resource: 'audio/transcriptions', model: { id: 'asr', modality: 'transcription', capabilities: ['subtitle_timestamps'] },
+ body: { model: 'asr', response_format: 'json', input_audio: { data: 'YXVkaW8=', format: 'wav' } } });
+ expect(await response.json()).toEqual({ text: 'Hello' });
+});
+
+it.each(['json', 'multipart'])('requires actual timings for a verbose %s transcription independently of catalog flags', async encoding => {
+ const f = await fixture();
+ f.fetcher.mockImplementation(async () => Response.json({ text: 'Hello' }));
+ let body: unknown = { model: 'asr', response_format: 'verbose_json', input_audio: { data: 'YXVkaW8=', format: 'wav' } };
+ let contentType = 'application/json';
+ if (encoding === 'multipart') {
+ const form = new FormData(); form.set('model', 'asr'); form.set('response_format', 'verbose_json');
+ form.set('file', new Blob(['audio'], { type: 'audio/wav' }), 'audio.wav');
+ const request = new Request('http://localhost', { method: 'POST', body: form });
+ body = Buffer.from(await request.arrayBuffer()); contentType = request.headers.get('content-type')!;
+ }
+ const input = { ...f.input, resource: 'audio/transcriptions', model: { id: 'asr', modality: 'transcription' as const, capabilities: [] }, body, contentType };
+ await expect(f.transport.request(input)).rejects.toMatchObject({ code: 'invalid_gateway_response' });
+ await expect(createDirectTransport(f.root, f.fetcher).request(input)).rejects.toMatchObject({ code: 'request_outcome_unknown' });
+ expect(f.fetcher).toHaveBeenCalledOnce();
+});
+
+it.each(['speech', 'transcriptions'])('does not record a successful audio/%s result for an HTTP 200 error body', async operation => {
+ const f = await fixture();
+ f.fetcher.mockImplementation(async () => Response.json({ error: { code: 403, message: 'Model unavailable in this country; private-test-key' } }));
+ const onModelFailure = vi.fn(async () => undefined);
+ const model = { id: 'model', modality: operation === 'speech' ? 'speech' as const : 'transcription' as const, capabilities: [] };
+ await expect(f.transport.request({ ...f.input, resource: `audio/${operation}`, model, onModelFailure })).rejects.toMatchObject({ status: 403 });
+ expect(onModelFailure).toHaveBeenCalledWith('model', model.modality, expect.objectContaining({ upstreamCode: '403' }));
+ expect(f.fetcher).toHaveBeenCalledOnce();
+});
diff --git a/apps/daemon/test/unit/gateway-direct-media.test.ts b/apps/daemon/test/unit/gateway-direct-media.test.ts
index 9afb8658..8967751b 100644
--- a/apps/daemon/test/unit/gateway-direct-media.test.ts
+++ b/apps/daemon/test/unit/gateway-direct-media.test.ts
@@ -42,6 +42,38 @@ it('reports access failures from video polling with the saved exact model identi
expect(f.fetcher.mock.calls.filter(([, options]) => options?.method === 'POST')).toHaveLength(1);
});
+it('records completed image delivery once and does not turn replay into a fresh success', async () => {
+ const f = await fixture(); const onModelSuccess = vi.fn(async () => undefined);
+ const result = await f.transport.request({ ...f.input, onModelSuccess });
+ expect(result.status).toBe(200);
+ expect(onModelSuccess).toHaveBeenCalledExactlyOnceWith(f.model.id, 'image', 'images/generations');
+ await f.transport.request({ ...f.input, onModelSuccess });
+ expect(f.fetcher).toHaveBeenCalledOnce();
+ expect(onModelSuccess).toHaveBeenCalledOnce();
+});
+
+it.each([false, true])('records video success only after nonempty completed delivery (empty=%s)', async empty => {
+ const f = await fixture(); const onModelSuccess = vi.fn(async () => undefined);
+ f.fetcher.mockImplementation(async url => String(url).includes('/content?index=0')
+ ? new Response(empty ? '' : 'video', { headers: { 'Content-Type': 'video/mp4' } })
+ : Response.json({ id: 'remote-video', status: String(url).endsWith('/videos') ? 'pending' : 'completed' }));
+ const model: GatewayModel = { id: 'vendor/video', modality: 'video', capabilities: [], sizes: ['1280x720'], durations: [5] };
+ const input = { ...f.input, resource: 'video/jobs', model, body: { model: model.id, prompt: 'test', size: '1280x720', duration: 5 }, onModelSuccess };
+ const { requestId } = await (await f.transport.request(input)).json();
+ expect(onModelSuccess).not.toHaveBeenCalled();
+ await f.transport.request({ ...input, resource: `requests/${requestId}`, method: 'GET' });
+ expect(onModelSuccess).not.toHaveBeenCalled();
+ const content = await f.transport.request({ ...input, resource: `requests/${requestId}/result`, method: 'GET' });
+ if (empty) {
+ await expect(content.text()).rejects.toMatchObject({ code: 'invalid_gateway_response' });
+ expect(onModelSuccess).not.toHaveBeenCalled();
+ } else {
+ expect(await content.text()).toBe('video');
+ expect(onModelSuccess).toHaveBeenCalledExactlyOnceWith(model.id, 'video', 'video/jobs');
+ }
+ expect(f.fetcher.mock.calls.filter(([, options]) => options?.method === 'POST')).toHaveLength(1);
+});
+
it('omits undeclared output_format and uses declared formats for Klein', async () => {
const f = await fixture();
await f.transport.request(f.input);
@@ -65,7 +97,7 @@ it.each([
it.each(['pending', 'in_progress', 'completed', 'failed', 'cancelled', 'expired'])('honors the documented video submit status %s and uses the authenticated content endpoint', async status => {
const f = await fixture();
- f.fetcher.mockImplementation(async url => String(url).includes('/content?index=0') ? new Response('video') : Response.json({ id: 'remote-video', status, error: 'provider failed: private-test-key', usage: { cost: 0.02 }, polling_url: 'https://untrusted.invalid/job' }));
+ f.fetcher.mockImplementation(async url => String(url).includes('/content?index=0') ? new Response('video', { headers: { 'Content-Type': 'video/mp4' } }) : Response.json({ id: 'remote-video', status, error: 'provider failed: private-test-key', usage: { cost: 0.02 }, polling_url: 'https://untrusted.invalid/job' }));
const model: GatewayModel = { id: 'video', modality: 'video', capabilities: ['image_to_video'], resolutions: ['480p'], aspectRatios: ['16:9'], durations: [1] };
const response = await f.transport.request({ ...f.input, resource: 'video/jobs', model, body: { model: 'video', prompt: 'test', size: '480p@16:9', duration: 1, image: 'data:image/png;base64,aW1hZ2U=' } });
expect(JSON.parse(String(f.fetcher.mock.calls[0]?.[1]?.body))).toEqual({ model: 'video', prompt: 'test', duration: 1, resolution: '480p', aspect_ratio: '16:9', frame_images: [{ type: 'image_url', image_url: { url: 'data:image/png;base64,aW1hZ2U=' }, frame_type: 'first_frame' }] });
diff --git a/apps/daemon/test/unit/gateway-direct-runtime-rotation.test.ts b/apps/daemon/test/unit/gateway-direct-runtime-rotation.test.ts
index 301f89e0..aa5421d8 100644
--- a/apps/daemon/test/unit/gateway-direct-runtime-rotation.test.ts
+++ b/apps/daemon/test/unit/gateway-direct-runtime-rotation.test.ts
@@ -35,6 +35,22 @@ it('does not submit a supplier request when coordination denies admission', asyn
} finally { await runtime.close(); }
});
+it.each(['completed', 'incomplete', 'failed'] as const)('records streamed %s outcomes only on a real Responses completion', async status => {
+ const onModelSuccess = vi.fn(async () => undefined);
+ const onModelFailure = vi.fn(async () => undefined);
+ const event = { type: `response.${status}`, response: { status, ...(status === 'failed' ? { error: { code: 403, message: 'Model unavailable in this country' } } : {}) } };
+ const fetcher = vi.fn<typeof fetch>(async () => new Response(`data: ${JSON.stringify(event)}\n\n`, { headers: { 'Content-Type': 'text/event-stream' } }));
+ const runtime = await createDirectRuntime('user-key', fetcher, async () => ({ key: 'user-key', release: async () => undefined, onModelSuccess, onModelFailure }));
+ try {
+ const result = await fetch(`${runtime.baseUrl}/responses`, { method: 'POST', headers: { Authorization: `Bearer ${runtime.token}`, 'Content-Type': 'application/json' }, body: JSON.stringify({ model: 'vendor/text', input: 'Hello', stream: true }) });
+ await result.text();
+ if (status === 'completed') expect(onModelSuccess).toHaveBeenCalledExactlyOnceWith('vendor/text', 'text', 'responses');
+ else expect(onModelSuccess).not.toHaveBeenCalled();
+ if (status === 'failed') expect(onModelFailure).toHaveBeenCalledOnce();
+ expect(fetcher).toHaveBeenCalledOnce();
+ } finally { await runtime.close(); }
+});
+
it.each(['success', 'rejected', 'unchanged', 'offline'] as const)('Runtime 的认证恢复为 %s 时最多提交两次', async outcome => {
const fetcher = vi.fn<typeof fetch>().mockImplementation(async () => fetcher.mock.calls.length === 1 || outcome === 'rejected' ? Response.json({}, { status: 401 }) : Response.json({ output: [] }));
const release = vi.fn(async () => undefined);
diff --git a/apps/daemon/test/unit/gateway-eighty-eight-adapters.test.ts b/apps/daemon/test/unit/gateway-eighty-eight-adapters.test.ts
new file mode 100644
index 00000000..22aa28bc
--- /dev/null
+++ b/apps/daemon/test/unit/gateway-eighty-eight-adapters.test.ts
@@ -0,0 +1,176 @@
+import { createHash } from 'node:crypto';
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, expect, it, vi } from 'vitest';
+import type { GatewayModel } from '@opencreator/protocol';
+import { createDirectTransport } from '../../src/gateway/direct-transport.js';
+import { eightyEightImageRequest, eightyEightImageResult } from '../../src/gateway/eighty-eight-image.js';
+import { eightyEightVideoRequest } from '../../src/gateway/eighty-eight-video.js';
+import { eightyEightTranscriptionRequest } from '../../src/gateway/eighty-eight-audio.js';
+import { uploadSupplierMedia } from '../../src/gateway/supplier-media.js';
+import { responsesToChat, chatToResponses } from '../../src/gateway/chat-responses.js';
+
+const roots: string[] = [];
+afterEach(async () => { for (const root of roots.splice(0)) await rm(root, { recursive: true, force: true }); });
+const baseUrl = 'https://api.88api.ai/v1';
+async function fixture(fetcher: typeof fetch) {
+ const root = await mkdtemp(join(tmpdir(), 'oc-88-adapters-')); roots.push(root);
+ return { transport: createDirectTransport(root, fetcher), input: { account: 'a', baseUrl, key: 'private-key', method: 'POST', contentType: 'application/json',
+ identity: 'request', fingerprint: 'fingerprint', signal: AbortSignal.timeout(5000) } };
+}
+async function multipart(form: FormData) {
+ const request = new Request('http://localhost', { method: 'POST', body: form });
+ return { body: Buffer.from(await request.arrayBuffer()), contentType: request.headers.get('content-type')! };
+}
+
+it.each(['gemini-3-pro-image', 'gemini-3.1-flash-image', 'gemini-nano-banana-2.1'])('routes %s generation and edits through Chat and normalizes the images', async id => {
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ choices: [{ message: { images: [{ type: 'image_url', image_url: { url: 'data:image/png;base64,aW1hZ2U=' } }] } }] }));
+ const f = await fixture(fetcher);
+ const model: GatewayModel = { id, modality: 'image', capabilities: ['edit'], imageOptions: { maxImages: 1, maxReferences: 16 } };
+ const response = await f.transport.request({ ...f.input, model, resource: 'images/generations', body: { model: id, prompt: 'test', n: 1 } });
+ expect(await response.json()).toMatchObject({ data: [{ b64_json: 'aW1hZ2U=' }] });
+ expect(fetcher.mock.lastCall?.[0]).toBe(`${baseUrl}/chat/completions`);
+ const form = new FormData(); form.set('model', id); form.set('prompt', 'edit'); form.set('image', new Blob(['ref'], { type: 'image/png' }), 'ref.png');
+ await f.transport.request({ ...f.input, ...await multipart(form), model, identity: 'edit', resource: 'images/edits' });
+ expect(JSON.parse(String(fetcher.mock.lastCall?.[1]?.body))).toMatchObject({ model: id, messages: [{ content: [{ type: 'text', text: 'edit' }, { type: 'image_url', image_url: { url: 'data:image/png;base64,cmVm' } }] }] });
+});
+
+it('recognizes structured Gemini image variants and ignores ordinary text links', () => {
+ for (const content of ['![image](data:image/png;base64,aW1hZ2U=)', [{ inlineData: { mimeType: 'image/png', data: 'aW1hZ2U=' } }], [{ type: 'output_image', url: 'data:image/png;base64,aW1hZ2U=' }]]) {
+ expect(eightyEightImageResult({ choices: [{ message: { content } }] })).toMatchObject({ data: [{ b64_json: 'aW1hZ2U=' }] });
+ }
+ expect(eightyEightImageResult({ choices: [{ message: { content: 'See https://assets.88api.ai/readme' } }] })).toMatchObject({ data: [] });
+});
+
+it.each(['midjourney-v8.2', 'midjourney-v8.2-fast', 'midjourney-v8.2-turbo'])('preserves %s prompt controls and all four outputs', async id => {
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ data: Array.from({ length: 4 }, () => ({ b64_json: 'aW1hZ2U=' })) }));
+ const f = await fixture(fetcher);
+ const model: GatewayModel = { id, modality: 'image', capabilities: [], imageOptions: { maxImages: 1, maxReferences: 0, aspectRatios: ['16:9'] } };
+ const result = await f.transport.request({ ...f.input, model, resource: 'images/generations', body: { model: id, prompt: 'test --s 200', aspect_ratio: '16:9' } });
+ expect((await result.json()).data).toHaveLength(4);
+ expect(JSON.parse(String(fetcher.mock.lastCall?.[1]?.body))).toEqual({ model: id, prompt: 'test --s 200 --ar 16:9' });
+ await expect(eightyEightImageRequest('images/generations', { model: id, prompt: 'test --ar 1:1', aspect_ratio: '16:9' }, 'application/json', model)).rejects.toMatchObject({ code: 'capability_unsupported' });
+});
+
+it('uploads multiple local Seedream references and keeps single-file edits multipart', async () => {
+ const form = new FormData(); form.set('model', 'doubao-seedream-5-0-pro'); form.set('prompt', 'edit'); form.set('resolution', '2K');
+ form.append('image[]', new Blob(['one'], { type: 'image/png' }), 'one.png');
+ const singleRequest = await multipart(form);
+ const single = await eightyEightImageRequest('images/edits', singleRequest.body, singleRequest.contentType);
+ expect(single.resource).toBe('images/edits');
+ form.append('image[]', new Blob(['two'], { type: 'image/png' }), 'two.png');
+ const upload = vi.fn(async (bytes: Buffer) => `https://assets.88api.ai/${bytes.toString()}.png`);
+ const request = await multipart(form);
+ const result = await eightyEightImageRequest('images/edits', request.body, request.contentType, undefined, upload);
+ expect(result).toMatchObject({ resource: 'images/generations', body: { model: 'doubao-seedream-5-0-pro', size: '2K', images: ['https://assets.88api.ai/one.png', 'https://assets.88api.ai/two.png'] } });
+ expect(upload).toHaveBeenCalledTimes(2);
+ expect(await eightyEightImageRequest('images/generations', { model: 'doubao-seedream-5-0-pro', prompt: 'test', size: '1024x1024', resolution: '2K' }, 'application/json')).toMatchObject({ body: { size: '2K' } });
+});
+
+it.each(['gpt-image-2', 'gpt-image-2.5-flare', 'gpt-image-2.5-sunburst', 'grok-imagine-image', 'grok-imagine-image-2.0', 'grok-imagine-image-quality'])('adapts %s without changing its supplier ID', async id => {
+ const result = await eightyEightImageRequest('images/generations', { model: id, prompt: 'test' }, 'application/json');
+ expect(result).toMatchObject({ resource: 'images/generations', body: { model: id, response_format: 'b64_json' } });
+});
+
+it('requires a reference for the Grok edit-only model', async () => {
+ const model: GatewayModel = { id: 'grok-imagine-edit', modality: 'image', capabilities: ['edit', 'reference_required'], imageOptions: { maxImages: 1, maxReferences: 1 } };
+ await expect(eightyEightImageRequest('images/generations', { model: model.id, prompt: 'edit' }, 'application/json', model)).rejects.toMatchObject({ code: 'capability_unsupported' });
+ expect(await eightyEightImageRequest('images/edits', { model: model.id, prompt: 'edit', image: 'https://assets.88api.ai/ref.png' }, 'application/json', model)).toMatchObject({ resource: 'images/edits' });
+});
+
+it('uses scoped upload credentials with the documented SHA-256 encoding and reconciles existing objects', async () => {
+ const url = 'https://assets.88api.ai/media/ref.png'; const bytes = Buffer.from('image');
+ const authorize = vi.fn(async () => Response.json({ url, upload_url: url, method: 'PUT', headers: { 'Content-Type': 'image/png', 'X-Media-Upload-Token': 'scoped-token' } }));
+ const fetcher = vi.fn<typeof fetch>(async (_url, options) => options?.method === 'HEAD' ? new Response(null, { headers: { 'content-length': '5', 'content-type': 'image/png' } }) : new Response(null, { status: 409 }));
+ expect(await uploadSupplierMedia(bytes, 'image/png', fetcher, authorize, AbortSignal.timeout(1000))).toBe(url);
+ expect(authorize).toHaveBeenCalledWith({ size: 5, mime_type: 'image/png', sha256: createHash('sha256').update(bytes).digest('base64url') });
+ const headers = new Headers(fetcher.mock.calls[0]?.[1]?.headers);
+ expect(headers.get('authorization')).toBeNull(); expect(headers.get('x-media-upload-token')).toBe('scoped-token');
+ expect(fetcher.mock.calls.map(([, options]) => options?.method)).toEqual(['PUT', 'HEAD']);
+});
+
+const videos = ['gemini-omni-flash', 'gemini-omni-flash-1.1', 'grok-imagine-video', 'grok-imagine-video-1.5', 'kling-3.0-turbo', 'minimax_h3', 'minimax-h3',
+ 'SD2.0', 'SD2.5', 'Seedance-2.0-720p官方版', 'Seedance-2.0-fast-720p官方版', 'seedance-2.0-fast官方版', 'seedance-2.0-mini-480p', 'seedance-2.0-mini-720p',
+ 'seedance-2.0-mini官方版', 'seedance-2.0官方版', 'Seedance-2.5-720p官方版', 'seedance-2.5官方版', 'veo-3.1', 'veo-3.1-fast', 'wan3.0-video', 'wan3.0-video-prime',
+ 'doubao-seedance-2-0-260128', 'doubao-seedance-2-0-fast-260128', 'doubao-seedance-2-0-mini-260615', 'doubao-seedance-2-5-260628',
+ 'doubao-seedance-2.0', 'doubao-seedance-2.0-fast', 'doubao-seedance-2.0-mini', 'doubao-seedance-2.5',
+ 'SD2.0 480P', 'SD2.0 720P', 'SD2.0 1080P', 'SD2.0 4K', 'SD2.5 480P', 'SD2.5 720P', 'SD2.5 1080P'];
+it.each(videos)('preserves the exact video model ID %s and advanced fields', async id => {
+ const result = await eightyEightVideoRequest({ model: id, prompt: 'test', duration: 4, ratio: '16:9', negative_prompt: 'blur', seed: 7 }, undefined, async () => 'unused');
+ expect(result).toMatchObject({ model: id, prompt: 'test', duration: 4, negative_prompt: 'blur', seed: 7 });
+ expect(result[id.startsWith('grok-') ? 'aspect_ratio' : 'ratio']).toBe('16:9');
+});
+
+it('uploads video Data URIs once, uses Wan media fields and retains audio references', async () => {
+ const fetcher = vi.fn<typeof fetch>(async (url, options) => {
+ if (String(url).endsWith('/media/uploads')) return Response.json({ url: 'https://assets.88api.ai/ref.png', upload_url: 'https://assets.88api.ai/ref.png', method: 'PUT', headers: { 'Content-Type': 'image/png', 'X-Media-Upload-Token': 'upload' } });
+ if (options?.method === 'PUT') return new Response(null, { status: 201 });
+ return Response.json({ id: 'task_test', status: 'queued' });
+ });
+ const f = await fixture(fetcher);
+ const body = { model: 'wan3.0-video', prompt: 'test', duration: 2, image: 'data:image/png;base64,aW1hZ2U=' };
+ await f.transport.request({ ...f.input, resource: 'video/jobs', body });
+ expect(JSON.parse(String(fetcher.mock.lastCall?.[1]?.body))).toMatchObject({ media: [{ type: 'first_frame', url: 'https://assets.88api.ai/ref.png' }] });
+ expect(String(fetcher.mock.lastCall?.[1]?.body)).not.toContain('data:');
+ await f.transport.request({ ...f.input, resource: 'video/jobs', body });
+ expect(fetcher).toHaveBeenCalledTimes(3);
+ const audio = await eightyEightVideoRequest({ model: 'wan3.0-video', prompt: 'test', metadata: { referenceAudios: ['https://assets.88api.ai/audio.wav'] } }, undefined, async () => 'unused');
+ expect(audio).toMatchObject({ media: [{ type: 'reference_audio', url: 'https://assets.88api.ai/audio.wav' }] });
+});
+
+it('accepts TTS style and speed and converts documented 24kHz mono PCM to WAV', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => new Response(new Uint8Array([1, 0, 2, 0]), { headers: { 'content-type': 'audio/pcm' } }));
+ const f = await fixture(fetcher);
+ const response = await f.transport.request({ ...f.input, resource: 'audio/speech', body: { model: 'gemini-3.1-tts', input: 'hello', voice: 'Kore', instructions: 'Calm', speed: 1.25 } });
+ const wav = Buffer.from(await response.arrayBuffer());
+ expect(wav.toString('ascii', 0, 4)).toBe('RIFF'); expect(wav.readUInt32LE(24)).toBe(24000); expect(wav.readUInt16LE(22)).toBe(1);
+ expect(JSON.parse(String(fetcher.mock.lastCall?.[1]?.body))).toMatchObject({ instructions: 'Calm', speed: 1.25, response_format: 'wav' });
+ await expect(f.transport.request({ ...f.input, identity: 'long', resource: 'audio/speech', body: { input: 'x'.repeat(7900), instructions: 'x'.repeat(101) } })).rejects.toMatchObject({ code: 'capability_unsupported' });
+});
+
+it.each(['gemini-2.5-stt', 'gemini-3-stt', 'gemini-3.5-stt', 'gemini-3.6-stt'])('sends only documented %s multipart fields', async id => {
+ const form = new FormData(); form.set('model', id); form.set('prompt', 'Names'); form.set('response_format', 'json'); form.set('language', 'zh'); form.set('temperature', '0');
+ form.set('file', new Blob(['audio'], { type: 'audio/wav' }), 'audio.wav');
+ const fetcher = vi.fn<typeof fetch>(async (_url, options) => {
+ const sent = await new Request('http://localhost', { method: 'POST', headers: options?.headers, body: options?.body }).formData();
+ expect([...sent.keys()].sort()).toEqual(['file', 'model', 'prompt']); expect(sent.get('model')).toBe(id);
+ return Response.json({ text: 'hello' });
+ });
+ const f = await fixture(fetcher);
+ expect(await (await f.transport.request({ ...f.input, ...await multipart(form), resource: 'audio/transcriptions' })).json()).toEqual({ text: 'hello' });
+ form.set('response_format', 'verbose_json');
+ const data = await multipart(form);
+ await expect(eightyEightTranscriptionRequest(data.body, data.contentType)).rejects.toMatchObject({ code: 'capability_unsupported' });
+});
+
+it('bridges Responses history, custom tools, images and fragmented Chat tool calls', async () => {
+ const bridge = responsesToChat({ model: 'gemini-3.7-flash', instructions: 'system', tools: [{ type: 'custom', name: 'exec', description: 'shell' }],
+ input: [{ role: 'user', content: [{ type: 'input_text', text: 'test' }, { type: 'input_image', image_url: 'data:image/png;base64,AA==' }] },
+ { type: 'custom_tool_call', name: 'exec', call_id: 'old', input: 'pwd' }, { type: 'custom_tool_call_output', call_id: 'old', output: '/tmp' }], stream: true });
+ expect(bridge.body.messages).toMatchObject([{ role: 'system' }, { role: 'user' }, { role: 'assistant', tool_calls: [{ function: { arguments: '{"input":"pwd"}' } }] }, { role: 'tool', content: '/tmp' }]);
+ const frames = [{ choices: [{ delta: { content: '你好' } }] }, { choices: [{ delta: { tool_calls: [{ index: 0, id: 'call', function: { name: 'exec', arguments: '{"input":' } }] } }] },
+ { choices: [{ delta: { tool_calls: [{ index: 0, function: { arguments: '"ls"}' } }] }, finish_reason: 'tool_calls' }], usage: { prompt_tokens: 2, completion_tokens: 3, total_tokens: 5 } }];
+ const bytes = Buffer.from(frames.map(p => `data: ${JSON.stringify(p)}\r\n\r\n`).join('') + 'data: [DONE]\r\n\r\n');
+ let index = 0;
+ const response = await chatToResponses(new Response(new ReadableStream({ pull(c) { if (index < bytes.length) c.enqueue(bytes.subarray(index, ++index)); else c.close(); } }), { headers: { 'content-type': 'text/event-stream' } }), bridge.tools, 'gemini-3.7-flash');
+ const events = (await response.text()).split('\n\n').filter(Boolean).map(frame => JSON.parse(frame.split('\n').find(l => l.startsWith('data:'))!.slice(5)));
+ expect(events.find(e => e.type === 'response.output_text.delta').delta).toBe('你好');
+ expect(events.at(-1)).toMatchObject({ type: 'response.completed', response: { usage: { total_tokens: 5 }, output: [{ type: 'message' }, { type: 'custom_tool_call', name: 'exec', input: 'ls', call_id: 'call' }] } });
+});
+
+it('rejects truncated Chat streams without reporting success', async () => {
+ const response = await chatToResponses(new Response('data: {"choices":[{"delta":{"content":"partial"}}]}\n\n', { headers: { 'content-type': 'text/event-stream' } }), new Map(), 'gemini');
+ await expect(response.text()).rejects.toMatchObject({ code: 'request_outcome_unknown' });
+});
+
+it('bridges a non-streaming model probe before submitting and replays the Responses result', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ choices: [{ message: { tool_calls: [{ id: 'call_probe', function: { name: 'probe', arguments: '{"ok":true}' } }] }, finish_reason: 'tool_calls' }] }));
+ const f = await fixture(fetcher); const success = vi.fn();
+ const model: GatewayModel = { id: 'gemini-3.7-flash', modality: 'text', capabilities: ['responses', 'responses_via_chat'] };
+ const request = { ...f.input, model, onModelSuccess: success, resource: 'responses', body: { model: model.id, stream: false, input: 'test', tools: [{ type: 'function', name: 'probe', parameters: { type: 'object', properties: { ok: { type: 'boolean' } } } }] } };
+ expect(await (await f.transport.request(request)).json()).toMatchObject({ status: 'completed', output: [{ type: 'function_call', name: 'probe', arguments: '{"ok":true}' }] });
+ await f.transport.request(request);
+ expect(fetcher).toHaveBeenCalledOnce(); expect(fetcher.mock.lastCall?.[0]).toBe(`${baseUrl}/chat/completions`);
+ expect(success).toHaveBeenCalledWith(model.id, 'text', 'responses');
+});
diff --git a/apps/daemon/test/unit/gateway-eighty-eight.test.ts b/apps/daemon/test/unit/gateway-eighty-eight.test.ts
new file mode 100644
index 00000000..697ec2ae
--- /dev/null
+++ b/apps/daemon/test/unit/gateway-eighty-eight.test.ts
@@ -0,0 +1,116 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, expect, it, vi } from 'vitest';
+import type { GatewayModel } from '@opencreator/protocol';
+import { bootstrapSchema, createGatewayClient } from '../../src/gateway/client.js';
+import { createDirectTransport } from '../../src/gateway/direct-transport.js';
+import { createDirectRuntime } from '../../src/gateway/direct-runtime.js';
+import { createOfficialModelAccess } from '../../src/gateway/model-access.js';
+import { downloadSupplierMedia } from '../../src/gateway/supplier-media.js';
+
+const baseUrl = 'https://api.88api.ai/v1';
+const bootstrap = { schemaVersion: 2, supplier: '88api', transport: 'supplier-direct', keyRotation: false, modelUsePolicy: 'cached-key-v1',
+ account: { id: 'account', email: 'a@test', verified: true }, modelKey: 'private-inference-key', keyVersion: 'v1', bindingVersion: 'binding', baseUrl,
+ models: [{ id: 'gpt-5.5', modality: 'text', capabilities: ['responses', 'chat'] }], defaults: { text: 'gpt-5.5' } };
+const roots: string[] = [];
+afterEach(async () => { for (const root of roots.splice(0)) await rm(root, { recursive: true, force: true }); });
+async function fixture(fetcher: typeof fetch) {
+ const root = await mkdtemp(join(tmpdir(), 'oc-88api-')); roots.push(root);
+ const input = { account: 'account', baseUrl, key: 'private-inference-key', resource: 'images/generations', method: 'POST', body: {},
+ contentType: 'application/json', identity: 'request', fingerprint: 'fingerprint', signal: AbortSignal.timeout(5_000) };
+ return { root, transport: createDirectTransport(root, fetcher), input };
+}
+
+it('accepts a v2 stable 88API binding and rejects supplier/host/protocol mismatches', async () => {
+ const fetcher = vi.fn(async () => Response.json(bootstrap));
+ expect(await createGatewayClient('https://gateway.test', fetcher).bootstrap('device')).toMatchObject({ supplier: '88api', baseUrl });
+ for (const patch of [{ baseUrl: 'https://gateway.test/v1' }, { supplier: 'openrouter' }, { schemaVersion: 1 }, { keyRotation: true }]) {
+ expect(bootstrapSchema.safeParse({ ...bootstrap, ...patch }).success).toBe(false);
+ }
+});
+
+it('uses only the supplier account catalog and intersects exact configured profiles without paid inference', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ data: [{ id: 'gpt-5.5' }, { id: 'unconfigured' }] }));
+ const f = await fixture(fetcher);
+ const access = createOfficialModelAccess({ dataDir: f.root, fetcher, readProxy: async () => '' });
+ const prepared = await access.prepare(bootstrapSchema.parse(bootstrap));
+ expect(prepared.models.map(model => model.id)).toEqual(['gpt-5.5']);
+ expect(fetcher).toHaveBeenCalledExactlyOnceWith(`${baseUrl}/models`, expect.objectContaining({ redirect: 'error', headers: { Authorization: 'Bearer private-inference-key' } }));
+ await access.prepare(bootstrapSchema.parse(bootstrap));
+ expect(fetcher).toHaveBeenCalledOnce();
+});
+
+it('streams Responses tools through the local runtime to 88API with an isolated key', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => new Response('data: {"type":"response.completed","response":{"status":"completed"}}\n\n', { headers: { 'content-type': 'text/event-stream' } }));
+ const runtime = await createDirectRuntime('private-inference-key', fetcher, undefined, undefined, baseUrl);
+ try {
+ const response = await fetch(`${runtime.baseUrl}/responses`, { method: 'POST', headers: { Authorization: `Bearer ${runtime.token}`, 'Content-Type': 'application/json' },
+ body: JSON.stringify({ model: 'gpt-5.5', input: 'test', stream: true, store: true, tools: [{ type: 'function', name: 'test' }] }) });
+ expect(await response.text()).toContain('response.completed');
+ expect(fetcher.mock.calls[0]?.[0]).toBe(`${baseUrl}/responses`);
+ const options = fetcher.mock.calls[0]?.[1];
+ expect(options?.headers).toMatchObject({ Authorization: 'Bearer private-inference-key' });
+ expect(options?.redirect).toBe('error');
+ expect(JSON.parse(String(options?.body))).toMatchObject({ store: false, tools: [{ name: 'test' }] });
+ expect(String(options?.body)).not.toContain(runtime.token);
+ } finally { await runtime.close(); }
+});
+
+it('converts GPT image controls to native parameters and replays locally', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ data: [{ b64_json: 'aW1hZ2U=' }] }));
+ const f = await fixture(fetcher);
+ const model: GatewayModel = { id: 'gpt-image-2', modality: 'image', capabilities: ['edit'], imageOptions: { maxImages: 1, maxReferences: 1, aspectRatios: ['3:2'], resolutions: ['1K'], qualities: ['high'] } };
+ const input = { ...f.input, model, body: { model: model.id, prompt: 'test', aspect_ratio: '3:2', resolution: '1K', quality: 'high' } };
+ expect(await (await f.transport.request(input)).json()).toMatchObject({ data: [{ b64_json: 'aW1hZ2U=' }] });
+ expect(fetcher.mock.calls[0]?.[0]).toBe(`${baseUrl}/images/generations`);
+ expect(JSON.parse(String(fetcher.mock.calls[0]?.[1]?.body))).toEqual({ model: model.id, prompt: 'test', n: 1, size: '1536x1024', quality: 'high', response_format: 'b64_json' });
+ await f.transport.request(input);
+ expect(fetcher).toHaveBeenCalledOnce();
+ const form = new FormData(); form.set('model', model.id); form.set('prompt', 'edit'); form.set('aspect_ratio', '3:2'); form.set('image', new Blob(['image'], { type: 'image/png' }), 'reference.png');
+ const request = new Request('http://localhost', { method: 'POST', body: form });
+ await f.transport.request({ ...input, resource: 'images/edits', identity: 'edit', contentType: request.headers.get('content-type')!, body: Buffer.from(await request.arrayBuffer()) });
+ const options = fetcher.mock.lastCall?.[1];
+ const sent = await new Request('http://localhost', { method: 'POST', headers: options?.headers, body: options?.body }).formData();
+ expect(fetcher.mock.lastCall?.[0]).toBe(`${baseUrl}/images/edits`);
+ expect(sent.get('size')).toBe('1536x1024'); expect(sent.has('aspect_ratio')).toBe(false);
+ expect(await (sent.get('image') as File).text()).toBe('image');
+});
+
+it('recovers a queued video after restart and downloads its result without supplier credentials', async () => {
+ const fetcher = vi.fn<typeof fetch>(async (url) => String(url).startsWith('https://assets.88api.ai/')
+ ? new Response('video', { headers: { 'content-type': 'video/mp4' } })
+ : Response.json({ id: 'video-123', status: String(url).endsWith('/videos') ? 'queued' : 'completed', url: 'https://assets.88api.ai/video.mp4' }));
+ const f = await fixture(fetcher);
+ const model: GatewayModel = { id: 'sora-2', modality: 'video', capabilities: ['image_to_video'], durations: [5], sizes: ['1280x720'] };
+ const input = { ...f.input, model, resource: 'video/jobs', body: { model: model.id, prompt: 'test', duration: 5, size: '1280x720', image: 'https://assets.88api.ai/input.png' } };
+ const { requestId } = await (await f.transport.request(input)).json();
+ expect(JSON.parse(String(fetcher.mock.calls[0]?.[1]?.body))).toMatchObject({ images: ['https://assets.88api.ai/input.png'] });
+ const recovered = createDirectTransport(f.root, fetcher);
+ await expect(recovered.request({ ...input, baseUrl: 'https://openrouter.ai/api/v1', resource: `requests/${requestId}`, method: 'GET' })).rejects.toMatchObject({ code: 'operation_conflict' });
+ await recovered.request({ ...input, resource: `requests/${requestId}`, method: 'GET' });
+ const result = await recovered.request({ ...input, resource: `requests/${requestId}/result`, method: 'GET' });
+ expect(await result.text()).toBe('video');
+ expect(fetcher.mock.lastCall?.[1]?.headers).toEqual({});
+ expect(fetcher.mock.calls.filter(([, options]) => options?.method === 'POST')).toHaveLength(1);
+ expect(fetcher.mock.calls.every(([url]) => !String(url).includes('openrouter') && !String(url).includes('/content'))).toBe(true);
+});
+
+it('rejects media redirect escapes and oversized results without forwarding any credentials', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => new Response(null, { status: 302, headers: { location: 'https://untrusted.test/result' } }));
+ await expect(downloadSupplierMedia(fetcher, 'https://assets.88api.ai/image.png', AbortSignal.timeout(1000))).rejects.toMatchObject({ code: 'unsupported_media_origin' });
+ expect(fetcher).toHaveBeenCalledOnce();
+ const result = await downloadSupplierMedia(async () => new Response('too big'), 'https://assets.88api.ai/image.png', AbortSignal.timeout(1000), 2);
+ await expect(result.arrayBuffer()).rejects.toMatchObject({ code: 'invalid_gateway_response' });
+});
+
+it('requests native WAV speech and rejects unsupported audio or image parameters before spending', async () => {
+ const fetcher = vi.fn<typeof fetch>(async () => new Response('wave', { headers: { 'content-type': 'audio/wav' } }));
+ const f = await fixture(fetcher);
+ await f.transport.request({ ...f.input, resource: 'audio/speech', body: { model: 'gemini-3.1-tts', input: 'hello', voice: 'Kore' } });
+ expect(JSON.parse(String(fetcher.mock.lastCall?.[1]?.body))).toMatchObject({ response_format: 'wav', voice: 'Kore' });
+ await expect(f.transport.request({ ...f.input, identity: 'long', resource: 'audio/speech', body: { model: 'gemini-3.1-tts', input: 'x'.repeat(8001) } })).rejects.toMatchObject({ code: 'capability_unsupported' });
+ await expect(f.transport.request({ ...f.input, identity: 'timestamps', resource: 'audio/transcriptions', body: { response_format: 'verbose_json' } })).rejects.toMatchObject({ code: 'capability_unsupported' });
+ await expect(f.transport.request({ ...f.input, identity: 'gemini-image', body: { model: 'gemini-image', prompt: 'test', n: 2 } })).rejects.toMatchObject({ code: 'capability_unsupported' });
+ expect(fetcher).toHaveBeenCalledOnce();
+});
diff --git a/apps/daemon/test/unit/gateway-model-access.test.ts b/apps/daemon/test/unit/gateway-model-access.test.ts
index 8861f17f..834c2d8f 100644
--- a/apps/daemon/test/unit/gateway-model-access.test.ts
+++ b/apps/daemon/test/unit/gateway-model-access.test.ts
@@ -14,243 +14,381 @@ const bootstrap = (models: GatewayModel[]): GatewayBootstrap => ({
modelKey: 'private-model-key', keyVersion: 'key-v1', bindingVersion: 'binding-v1', baseUrl: 'https://openrouter.ai/api/v1',
models, defaults: { text: models.find(model => model.modality === 'text')!.id }
});
-const success = () => Response.json({ status: 'completed', output: [{ type: 'function_call', name: 'oc_access_check', arguments: '{"ready":true}' }] });
-const denied = () => Response.json({ error: { message: 'The request is prohibited due to a violation of provider Terms Of Service.' } }, { status: 403 });
-async function fixture(models: GatewayModel[], reply: (id: string) => Response | Promise<Response> = success) {
+const facts = { kind: 'http-rejected' as const, httpStatus: 403, upstreamMessage: 'Model unavailable in this country' };
+function deferred<T>() { let resolve!: (value: T) => void; const promise = new Promise<T>(done => { resolve = done; }); return { promise, resolve }; }
+async function fixture(models: GatewayModel[]) {
const root = await mkdtemp(join(tmpdir(), 'oc-model-access-')); roots.push(root);
let proxy = 'http://127.0.0.1:7897'; let ip = '203.0.113.1'; let country = 'JP';
let catalogIDs = models.map(model => model.id);
- const calls: string[] = [];
+ let imageProfiles: unknown[] = []; let videoProfiles: unknown[] = [];
+ let catalogReply = (_url: URL): Response | Promise<Response> => Response.json({ data: catalogIDs.map(id => ({ id })) });
const fetcher = vi.fn<typeof fetch>(async (target, options) => {
+ expect(options?.method ?? 'GET').toBe('GET');
+ expect(options?.body).toBeUndefined();
if (String(target).endsWith('/cdn-cgi/trace')) return new Response(`ip=${ip}\nloc=${country}\n`);
- if (String(target).includes('/models/user?')) {
- expect(new Headers(options?.headers).get('authorization')).toBe('Bearer private-model-key');
- return Response.json({ data: catalogIDs.map(id => ({ id })) });
- }
- const body = JSON.parse(String(options?.body)); calls.push(body.model);
- expect(body).toMatchObject({ store: false, stream: false, max_output_tokens: 512 });
- expect(new Headers(options?.headers).get('authorization')).toBe('Bearer platform-probe-key');
- return reply(body.model);
+ const url = new URL(String(target));
+ if (url.pathname === '/api/v1/images/models') return Response.json({ data: imageProfiles });
+ if (url.pathname === '/api/v1/videos/models') return Response.json({ data: videoProfiles });
+ expect(url.origin + url.pathname).toBe('https://openrouter.ai/api/v1/models/user');
+ expect(url.searchParams.get('output_modalities')).toBe('all');
+ expect(new Headers(options?.headers).get('authorization')).toBe('Bearer private-model-key');
+ return catalogReply(url);
});
- const readProbeCredentials = vi.fn(async () => ({
- costBearer: 'platform' as const, modelKey: 'platform-probe-key', keyVersion: 'probe-v1',
- baseUrl: 'https://openrouter.ai/api/v1' as const, expiresAt: new Date(Date.now() + 60 * 60_000).toISOString()
- }));
- const input = { dataDir: root, fetcher, readProxy: async () => proxy, readProbeCredentials };
+ const input = { dataDir: root, fetcher, readProxy: async () => proxy };
const access = createOfficialModelAccess(input); const value = bootstrap(models);
const run = (target = value) => access.refresh(target, new AbortController().signal, async () => undefined);
- return { root, input, access, value, run, calls, fetcher, readProbeCredentials, setIP(value: string) { ip = value; }, setProxy(value: string) { proxy = value; }, setCountry(value: string) { country = value; }, setCatalogIDs(ids: string[]) { catalogIDs = ids; } };
+ const catalogCalls = () => fetcher.mock.calls.filter(([url]) => String(url).includes('/models/user?'));
+ return { root, input, access, value, run, fetcher, catalogCalls,
+ setIP(value: string) { ip = value; }, setProxy(value: string) { proxy = value; }, setCountry(value: string) { country = value; },
+ setImageProfiles(profiles: unknown[]) { imageProfiles = profiles; }, setVideoProfiles(profiles: unknown[]) { videoProfiles = profiles; },
+ setCatalogIDs(ids: string[]) { catalogIDs = ids; }, setCatalogReply(reply: typeof catalogReply) { catalogReply = reply; } };
}
-it('keeps hosted GPT and Gemini separate from open weight models and removes unsupported catalog entries', () => {
- expect(modelAccessGroup(text('openai/gpt-6-sol'))).toBe('openai');
+it('retains unsupported Anthropic, router and batch filtering', () => {
expect(modelAccessGroup(text('~openai/gpt-6-sol'))).toBe('openai');
expect(modelAccessGroup(text('openai/gpt-oss-20b'))).toBe('openai-oss');
expect(modelAccessGroup(text('google/gemma-3-12b-it'))).toBe('google-gemma');
expect(modelAccessGroup(text('google/gemini-2.5-flash'))).toBe('google-gemini');
- expect(officialModelPolicy(['anthropic/claude-sonnet-4.6', '~anthropic/claude-opus-4.6', 'openai/gpt-4.1:batch', 'openrouter/auto', 'deepseek/deepseek-v3.2'].map(text)).map(model => model.id)).toEqual(['deepseek/deepseek-v3.2']);
+ expect(officialModelPolicy(['anthropic/claude-sonnet-4.6', '~anthropic/claude-opus-4.6', 'openai/gpt-4.1:batch', 'openrouter/auto', 'deepseek/deepseek-v3.2'].map(text)).map(model => model.id))
+ .toEqual(['deepseek/deepseek-v3.2']);
});
-it('requires exact media verification in the current country and subtitle-compatible ASR', async () => {
+it('immediately admits every compatible catalog model without paid inference or per-model limits', async () => {
+ const models = [text('deepseek/deepseek-v3.2'), ...Array.from({ length: 20 }, (_, i) => text(`vendor/model-${i}`))];
+ const f = await fixture(models);
+ expect((await f.access.prepare(f.value)).models).toEqual(models);
+ await f.run();
+ expect(f.catalogCalls()).toHaveLength(1);
+ expect(f.fetcher).toHaveBeenCalledTimes(2);
+ const saved = await readFile(join(f.root, 'config/gateway-model-access.json'), 'utf8');
+ expect(saved).not.toMatch(/private-model-key|203\.0\.113|a@test/);
+});
+
+it('excludes Anthropic from fresh and cached catalogs and replaces an unsupported default', async () => {
+ const supported = [text('deepseek/deepseek-v3.2')];
+ const f = await fixture([text('anthropic/claude-sonnet-4.6'), text('~anthropic/claude-opus-4.6'), ...supported]);
+ expect(f.value.defaults.text).toBe('anthropic/claude-sonnet-4.6');
+ expect(await f.access.prepare(f.value)).toMatchObject({ models: supported, defaults: { text: supported[0]!.id } });
+ expect(f.access.filter(f.value)).toMatchObject({ models: supported, defaults: { text: supported[0]!.id } });
+ f.setCatalogReply(() => Response.json({}, { status: 503 }));
+ const restored = createOfficialModelAccess(f.input);
+ expect(await restored.prepare(f.value)).toMatchObject({ models: supported, defaults: { text: supported[0]!.id } });
+});
+
+it('admits all catalog media independently of internal verification and subtitle-specific capabilities', async () => {
const verification = { adapterVersion: 2, verifiedAt: '2026-10-14T00:00:00Z', countries: ['JP'] };
const media: GatewayModel[] = [
- { id: 'openai/image-ok', modality: 'image', capabilities: [], verification },
- { id: 'openai/video-ok', modality: 'video', capabilities: [], verification },
- { id: 'openai/tts-ok', modality: 'speech', capabilities: [], verification },
- { id: 'openai/asr-ok', modality: 'transcription', capabilities: ['subtitle_timestamps'], verification },
- { id: 'openai/asr-json-only', modality: 'transcription', capabilities: [], verification },
- { id: 'openai/image-untested', modality: 'image', capabilities: [] },
- { id: 'openai/image-other-country', modality: 'image', capabilities: [], verification: { ...verification, countries: ['US'] } }
+ { id: 'vendor/image', modality: 'image', capabilities: [], verification },
+ { id: 'vendor/video', modality: 'video', capabilities: [], verification },
+ { id: 'vendor/tts', modality: 'speech', capabilities: [], verification },
+ { id: 'vendor/asr', modality: 'transcription', capabilities: ['subtitle_timestamps'], verification },
+ { id: 'vendor/asr-json-only', modality: 'transcription', capabilities: [], verification },
+ { id: 'vendor/image-untested', modality: 'image', capabilities: [] },
+ { id: 'vendor/image-other-country', modality: 'image', capabilities: [], verification: { ...verification, countries: ['US'] } },
+ { id: 'vendor/image-no-country', modality: 'image', capabilities: [], verification: { ...verification, countries: [] } },
+ { id: 'vendor/image-old-adapter', modality: 'image', capabilities: [], verification: { ...verification, adapterVersion: 1 } },
+ { id: 'vendor/text-without-responses', modality: 'text', capabilities: [] }
];
- const f = await fixture([text('openai/text-denied'), ...media], denied);
+ const f = await fixture([text('vendor/text'), ...media]);
+ const approved = ['vendor/text', ...media.filter(model => model.modality !== 'text').map(model => model.id)];
await f.run();
- expect(f.access.filter(f.value).models.map(model => model.id)).toEqual(media.slice(0, 4).map(model => model.id));
- expect(f.calls).toEqual(['openai/text-denied']);
- expect(f.access.filter(f.value).defaults).not.toHaveProperty('text');
- const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 60_001);
- f.setCountry('US'); await f.run();
- expect(f.access.filter(f.value).models.map(model => model.id)).toEqual(['openai/image-other-country']);
- clock.mockRestore();
+ expect(f.access.filter(f.value).models.map(model => model.id)).toEqual(approved);
+ f.setCountry('US'); vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 60_001); await f.run();
+ expect(f.access.filter(f.value).models.map(model => model.id)).toEqual(approved);
});
-it('intersects verification with the actual customer key catalog and removes stale defaults', async () => {
- const f = await fixture([text('vendor/one'), text('vendor/two')]);
- await f.run();
- f.setCatalogIDs(['vendor/two']);
- vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 60_001);
- await f.run();
+it('refreshes official media capabilities and persists them without verification metadata', async () => {
+ const f = await fixture([text('vendor/text'),
+ { id: 'vendor/image', modality: 'image', capabilities: ['edit'] },
+ { id: 'vendor/video', modality: 'video', capabilities: ['image_to_video'], sizes: ['1280x720'], durations: [5] },
+ { id: 'vendor/speech', modality: 'speech', capabilities: ['default_voice'], voices: ['old'] }
+ ]);
+ f.setCatalogReply(() => Response.json({ data: [
+ { id: 'vendor/text', architecture: { output_modalities: ['text'] } },
+ { id: 'vendor/image', architecture: { output_modalities: ['image'] } },
+ { id: 'vendor/video', architecture: { output_modalities: ['video'] } },
+ { id: 'vendor/speech', architecture: { output_modalities: ['speech'] }, supported_voices: ['native'] }
+ ] }));
+ f.setImageProfiles([{ id: 'vendor/image', supported_parameters: {
+ aspect_ratio: { type: 'enum', values: ['1:1'] }, n: { type: 'range', min: 1, max: 1 }
+ } }]);
+ f.setVideoProfiles([{ id: 'vendor/video', supported_sizes: null, supported_resolutions: ['1080p'],
+ supported_aspect_ratios: ['9:16'], supported_durations: [12], supported_frame_images: [] }]);
+ const models = (await f.access.prepare(f.value)).models;
+ expect(models.find(model => model.modality === 'image')).toMatchObject({ capabilities: [], imageOptions: { maxImages: 1, maxReferences: 0, aspectRatios: ['1:1'] } });
+ expect(models.find(model => model.modality === 'video')).toMatchObject({ capabilities: [], sizes: [], resolutions: ['1080p'], aspectRatios: ['9:16'], durations: [12] });
+ expect(models.find(model => model.modality === 'speech')).toMatchObject({ capabilities: [], voices: ['native'] });
+ expect(JSON.parse(await readFile(join(f.root, 'config/gateway-model-access.json'), 'utf8')).catalogModels).toEqual(models);
+ await f.access.recordFailure(f.access.context(), models.find(model => model.modality === 'image')!, facts);
+ expect(f.access.filter(f.value).models.some(model => model.modality === 'image')).toBe(false);
+});
+
+it('uses existing gateway media parameters when optional official capability discovery fails', async () => {
+ const image: GatewayModel = { id: 'vendor/image', modality: 'image', capabilities: [], imageOptions: { maxImages: 1, maxReferences: 0 } };
+ const f = await fixture([text('vendor/text'), image]);
+ const original = f.fetcher.getMockImplementation()!;
+ f.fetcher.mockImplementation((url, options) => String(url).includes('/images/models')
+ ? Promise.reject(new Error('Unavailable metadata')) : original(url, options));
+ expect((await f.access.prepare(f.value)).models).toEqual(f.value.models);
+ expect(f.access.catalogAvailable()).toBe(true);
+});
+
+it('does not admit a model into a modality its official architecture cannot produce', async () => {
+ const f = await fixture([text('vendor/text'), { id: 'vendor/image', modality: 'image', capabilities: [] }]);
+ f.setCatalogReply(() => Response.json({ data: [{ id: 'vendor/text' }, { id: 'vendor/image', architecture: { output_modalities: ['text'] } }] }));
+ expect((await f.access.prepare(f.value)).models.map(model => model.id)).toEqual(['vendor/text']);
+});
+
+it('intersects both text and media with the customer catalog and chooses visible defaults', async () => {
+ const image: GatewayModel = { id: 'vendor/image', modality: 'image', capabilities: [], verification: { adapterVersion: 2, verifiedAt: '2026-10-14T00:00:00Z', countries: [] } };
+ const f = await fixture([text('vendor/one'), text('vendor/two'), image]);
+ f.setCatalogIDs(['vendor/two', 'other/unadapted']); await f.run();
expect(f.access.filter(f.value)).toMatchObject({ models: [text('vendor/two')], defaults: { text: 'vendor/two' } });
});
-it('quarantines only the exact failed model and ignores stale-network feedback', async () => {
+it('caches complete catalogs for five minutes and supports an immediate explicit refresh', async () => {
const f = await fixture([text('vendor/one'), text('vendor/two')]);
- await f.run();
- const before = f.access.context();
- const facts = { kind: 'http-rejected' as const, httpStatus: 403, upstreamMessage: 'Model unavailable in this country' };
- expect(await f.access.recordFailure(before, f.value.models[0]!, facts)).toBe(true);
- expect(f.access.filter(f.value).models.map(model => model.id)).toEqual(['vendor/two']);
- f.setIP('203.0.113.2'); vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 60_001); await f.run();
- expect(await f.access.recordFailure(before, f.value.models[1]!, facts)).toBe(false);
+ const start = Date.now(); const clock = vi.spyOn(Date, 'now').mockReturnValue(start);
+ await f.run(); f.setCatalogIDs(['vendor/two']);
+ clock.mockReturnValue(start + 60_001); await f.run();
+ expect(f.catalogCalls()).toHaveLength(1);
expect(f.access.filter(f.value).models).toHaveLength(2);
+ f.access.invalidateCatalog(); await f.run();
+ expect(f.catalogCalls()).toHaveLength(2);
+ expect(f.access.filter(f.value).defaults.text).toBe('vendor/two');
+ clock.mockReturnValue(start + 360_002); await f.run();
+ expect(f.catalogCalls()).toHaveLength(3);
});
-it('rejects old family caches and invalidates proof when the exact model profile changes', async () => {
- const f = await fixture([text('vendor/one')]);
- await mkdir(join(f.root, 'config'), { recursive: true });
- await writeFile(join(f.root, 'config/gateway-model-access.json'), JSON.stringify({ version: 1, base: '', network: '', groups: { vendor: { status: 'allowed', representative: 'vendor/one', nextCheck: Date.now() + 3600000 } } }));
- expect((await f.access.prepare(f.value)).models).toEqual([]);
+it('loads every page atomically, deduplicates IDs and never follows arbitrary next URLs', async () => {
+ const f = await fixture([text('vendor/one'), text('vendor/two')]);
+ f.setCatalogReply(url => url.searchParams.get('offset') === '0'
+ ? Response.json({ data: [{ id: 'vendor/one' }], total_count: 2, links: { next: '/api/v1/models?offset=1000' } })
+ : Response.json({ data: [{ id: 'vendor/one' }, { id: 'vendor/two' }], total_count: 2, links: { next: null } }));
+ await f.run(); expect(f.catalogCalls()).toHaveLength(2);
+ expect(f.access.filter(f.value).models).toEqual(f.value.models);
+ const saved = JSON.parse(await readFile(join(f.root, 'config/gateway-model-access.json'), 'utf8'));
+ expect(saved.catalogIDs).toEqual(['vendor/one', 'vendor/two']);
+ f.access.invalidateCatalog();
+ f.setCatalogReply(() => Response.json({ data: [{ id: 'vendor/two' }], links: { next: 'https://untrusted.example/api/v1/models/user?offset=1000' } }));
await f.run();
- const changed = { ...f.value, models: [{ ...f.value.models[0]!, capabilities: ['responses', 'changed-contract'] }] };
- expect(f.access.filter(changed).models).toEqual([]);
- await f.run(changed);
- expect(f.access.filter(changed).models).toHaveLength(1);
+ expect(f.access.filter(f.value).models).toEqual(f.value.models);
+ expect(f.catalogCalls()).toHaveLength(3);
});
-it.each([
- [402, 'Insufficient credits', false], [403, 'Key limit exceeded', false],
- [403, 'Content policy violation', false], [403, 'Forbidden', false],
- [429, 'Rate limit exceeded', false], [503, 'Provider unavailable', false],
- [403, 'Model unavailable in this country', true], [403, 'Permission denied for this model', true],
- [404, 'No endpoints found for this model', true],
- [400, 'The selected model does not support response_format "verbose_json"', true]
-])('classifies HTTP %s %s without conflating access and request failures', (httpStatus, upstreamMessage, expected) => {
- expect(isModelAccessFailure({ kind: 'http-rejected', httpStatus: httpStatus as number, upstreamMessage: upstreamMessage as string })).toBe(expected);
+it.each(['/api/v1/models/user?offset=0', '/api/v1/other?offset=1000'])('rejects invalid pagination %s without publishing a partial first catalog', async next => {
+ const f = await fixture([text('vendor/one')]);
+ f.setCatalogReply(() => Response.json({ data: [{ id: 'vendor/one' }], links: { next } }));
+ await f.run(); expect(f.access.filter(f.value).models).toEqual([]);
+ expect(f.access.catalogAvailable()).toBe(false);
});
-it('recognizes explicit geographic failure from an accepted video job without an HTTP error status', () => {
- expect(isModelAccessFailure({ kind: 'provider-failed', upstreamCode: 'provider_error', upstreamMessage: 'Model unavailable in this country' })).toBe(true);
- expect(isModelAccessFailure({ kind: 'provider-failed', upstreamCode: 'provider_error', upstreamMessage: 'Temporarily unavailable' })).toBe(false);
+it('bounds pagination and rejects catalogs that remain incomplete after ten pages', async () => {
+ const f = await fixture([text('vendor/one')]);
+ f.setCatalogReply(url => Response.json({ data: [{ id: 'vendor/one' }], links: { next: `/api/v1/models/user?offset=${Number(url.searchParams.get('offset')) + 1000}` } }));
+ await f.run(); expect(f.catalogCalls()).toHaveLength(10);
+ expect(f.access.filter(f.value).models).toEqual([]);
});
-it('checks each text model and never infers sibling or media availability from a representative', async () => {
- const image: GatewayModel = { id: 'openai/gpt-image-1', modality: 'image', capabilities: [] };
- const f = await fixture([text('deepseek/deepseek-v3.2'), text('openai/gpt-6-sol'), text('openai/gpt-4.1-mini'), image, text('google/gemini-2.5-flash'), text('google/gemini-2.5-flash-lite'), text('openai/gpt-oss-20b'), text('google/gemma-3-12b-it'), text('anthropic/claude-sonnet-4.6')], id => /gpt-4.1-mini|gemini/.test(id) ? denied() : success());
- expect((await f.access.prepare(f.value)).models).toEqual([]);
- await f.run();
- expect(f.calls).toHaveLength(7);
- expect(f.calls).toContain('openai/gpt-4.1-mini');
- expect(f.calls).toContain('openai/gpt-6-sol');
- expect(f.calls).toContain('google/gemini-2.5-flash-lite');
- expect(f.calls).not.toContain(image.id);
- expect(f.access.filter(f.value).models.map(model => model.id)).toEqual(['deepseek/deepseek-v3.2', 'openai/gpt-6-sol', 'openai/gpt-oss-20b', 'google/gemma-3-12b-it']);
- const saved = await readFile(join(f.root, 'config/gateway-model-access.json'), 'utf8');
- expect(saved).not.toMatch(/private-model-key|203\.0\.113|a@test/);
+it('does not publish a truncated directory when total_count disagrees with its last page', async () => {
+ const f = await fixture([text('vendor/one')]);
+ f.setCatalogReply(() => Response.json({ data: [text('vendor/one')], total_count: 2, links: { next: null } }));
+ await f.run(); expect(f.access.filter(f.value).models).toEqual([]);
});
-it('keeps an unchecked selected model hidden while a verified fallback finishes first', async () => {
- let finishSelected!: () => void;
- const waiting = new Promise<void>(resolve => { finishSelected = resolve; });
- const f = await fixture([text('deepseek/deepseek-v3.2'), text('openai/gpt-4.1-mini')], async id => {
- if (id.startsWith('deepseek/')) await waiting;
- return success();
- });
- const work = f.run();
- await expect.poll(() => f.access.filter(f.value).models.length).toBe(1);
- expect(f.access.filter(f.value).defaults.text).toBe('openai/gpt-4.1-mini');
- finishSelected(); await work;
- expect(f.access.filter(f.value).defaults.text).toBe('deepseek/deepseek-v3.2');
-});
-
-it.each([429, 503, 403])('does not treat an expired success plus HTTP %s as new availability proof', async status => {
- let failure = false;
- const f = await fixture([text('deepseek/deepseek-v3.2'), text('openai/gpt-4.1-mini')], () => failure
- ? Response.json({ error: { message: status === 403 ? 'Key limit exceeded' : 'Temporarily unavailable' } }, { status }) : success());
- const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now());
- await f.run(); failure = true; clock.mockReturnValue(Date.now() + 24 * 60 * 60_000 + 1);
- await f.run();
- expect(f.access.filter(f.value).models).toHaveLength(0);
+it('coalesces concurrent directory requests', async () => {
+ const f = await fixture([text('vendor/one')]); const waiting = deferred<Response>();
+ f.setCatalogReply(() => waiting.promise);
+ const a = f.access.prepare(f.value); const b = f.access.prepare(f.value);
+ await expect.poll(() => f.catalogCalls().length).toBe(1);
+ waiting.resolve(Response.json({ data: f.value.models }));
+ expect((await a).models).toEqual(f.value.models); expect((await b).models).toEqual(f.value.models);
});
-it('hides expired success after a network exception without caching a secret error message', async () => {
- let failed = false;
- const f = await fixture([text('deepseek/deepseek-v3.2'), text('qwen/qwen3-coder')], () => {
- if (failed) throw new Error('private-model-key');
- return success();
- });
- const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now());
- await f.run(); failed = true; clock.mockReturnValue(Date.now() + 24 * 60 * 60_000 + 1); await f.run();
- expect(f.access.filter(f.value).models).toHaveLength(0);
- expect(await readFile(join(f.root, 'config/gateway-model-access.json'), 'utf8')).not.toContain('private-model-key');
+it('uses a successful directory even when exit detection fails', async () => {
+ const f = await fixture([text('vendor/one')]);
+ f.fetcher.mockRejectedValueOnce(new Error('trace unavailable'));
+ await f.run(); expect(f.access.filter(f.value).models).toEqual(f.value.models);
+ expect(f.access.context()).not.toBe('');
});
-it('hides cached results when the current network identity cannot be established', async () => {
- const f = await fixture([text('deepseek/deepseek-v3.2'), text('openai/gpt-4.1-mini')], id => id.startsWith('openai/') ? denied() : success());
- const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now());
- await f.run(); const count = f.calls.length;
- clock.mockReturnValue(Date.now() + 60_001);
- f.fetcher.mockRejectedValueOnce(new Error('trace unavailable'));
+it('retains a fresh catalog on temporary errors but hides expired results and retries with backoff', async () => {
+ const f = await fixture([text('vendor/one')]);
+ const start = Date.now(); const clock = vi.spyOn(Date, 'now').mockReturnValue(start);
await f.run();
- expect(f.calls).toHaveLength(count);
- expect(f.access.filter(f.value).models).toEqual([]);
+ f.setCatalogReply(() => { throw new Error('private-model-key'); }); f.access.invalidateCatalog();
+ await f.run(); expect(f.access.filter(f.value).models).toEqual(f.value.models);
+ const calls = f.catalogCalls().length; await f.run(); expect(f.catalogCalls()).toHaveLength(calls);
+ clock.mockReturnValue(start + 300_001); await f.run(); expect(f.access.filter(f.value).models).toEqual([]);
+ expect(f.access.catalogAvailable()).toBe(false);
+ expect(await readFile(join(f.root, 'config/gateway-model-access.json'), 'utf8')).not.toContain('private-model-key');
+});
+
+it.each([401, 403])('revokes a cached directory immediately on HTTP %s', async status => {
+ const f = await fixture([text('vendor/one')]); await f.run();
+ f.setCatalogReply(() => Response.json({ error: { message: 'Forbidden' } }, { status })); f.access.invalidateCatalog();
+ await f.run(); expect(f.access.filter(f.value).models).toEqual([]);
+ expect(f.access.needsKeyRefresh()).toBe(status === 401);
});
-it('reuses persisted results and retries a blocked family after one hour', async () => {
- const f = await fixture([text('deepseek/deepseek-v3.2'), text('openai/gpt-4.1-mini')], id => id.startsWith('openai/') ? denied() : success());
- const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now());
- await f.run(); const count = f.calls.length;
+it('distinguishes a successful empty directory from a failed directory', async () => {
+ const f = await fixture([text('vendor/one')]); f.setCatalogIDs([]); await f.run();
+ expect(f.access.filter(f.value)).toMatchObject({ models: [], defaults: {} });
+ expect(f.access.catalogAvailable()).toBe(true);
+});
+
+it('reuses an unexpired persisted catalog when a startup refresh is unavailable', async () => {
+ const f = await fixture([text('vendor/one')]); await f.run();
+ f.setCatalogReply(() => Response.json({}, { status: 503 }));
const restored = createOfficialModelAccess(f.input);
- expect((await restored.prepare(f.value)).models.map(model => model.id)).toEqual(['deepseek/deepseek-v3.2']);
- await restored.refresh(f.value, new AbortController().signal, async () => undefined);
- expect(f.calls).toHaveLength(count);
- clock.mockReturnValue(Date.now() + 60 * 60_000 + 1); await f.run();
- expect(f.calls.slice(count)).toEqual(['openai/gpt-4.1-mini']);
+ expect((await restored.prepare(f.value)).models).toEqual(f.value.models);
});
-it('invalidates results for account, key, proxy and exit changes', async () => {
- const f = await fixture([text('deepseek/deepseek-v3.2'), text('openai/gpt-4.1-mini')]);
- const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now());
+it('keeps catalog admission separate from successful inference evidence and expires success after five minutes', async () => {
+ const f = await fixture([text('vendor/one')]);
+ const now = Date.now(); const clock = vi.spyOn(Date, 'now').mockReturnValue(now);
await f.run();
+ expect(f.access.availability(f.value)).toEqual([{ model: 'vendor/one', modality: 'text', status: 'unverified' }]);
+ await f.access.recordSuccess(f.access.context(), f.value.models[0]!, 'responses');
+ expect(f.access.availability(f.value)).toEqual([{ model: 'vendor/one', modality: 'text', status: 'recent_success', operation: 'responses', checkedAt: new Date(now).toISOString() }]);
+ clock.mockReturnValue(now + 300_001); await f.run();
+ expect(f.access.availability(f.value)[0]?.status).toBe('unverified');
+ expect(f.access.filter(f.value).models).toEqual(f.value.models);
+});
+
+it('persists safe operation-specific success and discards it when the key, proxy, or exit changes', async () => {
+ const f = await fixture([text('vendor/one')]); await f.run();
+ await f.access.recordSuccess(f.access.context(), f.value.models[0]!, 'responses');
+ const restored = createOfficialModelAccess(f.input); await restored.prepare(f.value);
+ expect(restored.availability(f.value)[0]).toMatchObject({ status: 'recent_success', operation: 'responses' });
+ expect(await readFile(join(f.root, 'config/gateway-model-access.json'), 'utf8')).not.toMatch(/private-model-key|203\.0\.113/);
+ f.setProxy('http://127.0.0.1:8999'); await f.run();
+ expect(f.access.availability(f.value)[0]?.status).toBe('unverified');
+ await f.access.recordSuccess(f.access.context(), f.value.models[0]!, 'chat/completions');
+ const previous = f.access.context(); f.setIP('203.0.113.2');
+ const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 60_001); await f.run();
+ expect(await f.access.recordSuccess(previous, f.value.models[0]!, 'responses')).toBe(false);
+ expect(f.access.availability(f.value)[0]?.status).toBe('unverified');
+ clock.mockRestore();
+ await f.access.recordSuccess(f.access.context(), f.value.models[0]!, 'responses');
+ // Fixture expects the original bearer; keep only the directory response for this key-change check.
+ f.fetcher.mockImplementation(async target => String(target).endsWith('/trace') ? new Response('ip=203.0.113.2\nloc=JP\n') : Response.json({ data: f.value.models }));
+ const changed = { ...f.value, modelKey: 'replacement-key' };
+ await f.run(changed);
+ expect(f.access.availability(changed)[0]?.status).toBe('unverified');
+});
+
+it('keeps explicit access rejections ahead of a parallel success and leaves transient errors selectable', async () => {
+ const f = await fixture([text('vendor/one'), text('vendor/two')]); await f.run();
+ const context = f.access.context();
+ await f.access.recordSuccess(context, f.value.models[0]!, 'responses');
+ await f.access.recordFailure(context, f.value.models[0]!, facts);
+ expect(await f.access.recordSuccess(context, f.value.models[0]!, 'responses')).toBe(false);
+ expect(f.access.availability(f.value)[0]?.status).toBe('restricted');
+ expect(await f.access.recordFailure(context, f.value.models[1]!, { kind: 'http-rejected', httpStatus: 429, upstreamMessage: 'Rate limit exceeded' })).toBe(false);
+ expect(f.access.availability(f.value)[1]?.status).toBe('unverified');
+ expect(f.access.filter(f.value).models).toEqual([text('vendor/two')]);
+});
+
+it('clears recent success after a transient failure without quarantining the model', async () => {
+ const f = await fixture([text('vendor/one')]); await f.run();
+ await f.access.recordSuccess(f.access.context(), f.value.models[0]!, 'responses');
+ await f.access.recordFailure(f.access.context(), f.value.models[0]!, { kind: 'http-rejected', httpStatus: 503, upstreamMessage: 'Provider temporarily unavailable' });
+ expect(f.access.availability(f.value)[0]?.status).toBe('unverified');
+ expect(f.access.filter(f.value).models).toEqual(f.value.models);
+});
+
+it('quarantines only the exact failed model until a fresh directory clears an expired rejection', async () => {
+ const f = await fixture([text('vendor/one'), text('vendor/two')]);
+ const start = Date.now(); const clock = vi.spyOn(Date, 'now').mockReturnValue(start);
+ await f.run(); const scope = f.access.context();
+ expect(await f.access.recordFailure(scope, f.value.models[0]!, facts)).toBe(true);
+ await f.run(); expect(f.access.filter(f.value).models).toEqual([text('vendor/two')]);
+ clock.mockReturnValue(start + 3_599_999); await f.run();
+ clock.mockReturnValue(start + 3_600_001);
+ f.setCatalogReply(() => Response.json({}, { status: 503 })); await f.run();
+ expect(f.access.filter(f.value).models).toEqual([text('vendor/two')]);
+ f.setCatalogReply(() => Response.json({ data: f.value.models })); clock.mockReturnValue(start + 3_630_002); await f.run();
+ expect(f.access.filter(f.value).models).toEqual(f.value.models);
+});
+
+it('quarantines approved media too without charging a test request', async () => {
+ const image: GatewayModel = { id: 'vendor/image', modality: 'image', capabilities: [], verification: { adapterVersion: 2, verifiedAt: '2026-10-14T00:00:00Z', countries: [] } };
+ const f = await fixture([text('vendor/one'), image]); await f.run();
+ expect(await f.access.recordFailure(f.access.context(), image, facts)).toBe(true);
+ await f.run(); expect(f.access.filter(f.value).models).toEqual([text('vendor/one')]);
+});
+
+it('rejects stale network feedback and invalidates cached results for accounts, keys and proxies', async () => {
+ const f = await fixture([text('vendor/one')]); await f.run(); const previous = f.access.context();
+ f.setIP('203.0.113.2'); vi.spyOn(Date, 'now').mockReturnValue(Date.now() + 60_001); await f.run();
+ expect(await f.access.recordFailure(previous, f.value.models[0]!, facts)).toBe(false);
const key = { ...f.value, keyVersion: 'key-v2' };
- expect((await f.access.prepare(key)).models).toHaveLength(0); await f.run(key);
+ expect(f.access.filter(key).models).toEqual([]); await f.run(key);
const account = { ...key, account: { ...key.account, id: 'account-b' } };
- expect((await f.access.prepare(account)).models).toHaveLength(0); await f.run(account);
- f.setProxy('http://127.0.0.1:8888'); expect((await f.access.prepare(account)).models).toHaveLength(0); await f.run(account);
- f.setIP('203.0.113.2'); clock.mockReturnValue(Date.now() + 60_001); await f.run(account);
- expect(f.calls).toHaveLength(10);
-});
-
-it('does not promote a missing sibling when another exact model succeeds', async () => {
- const f = await fixture([text('deepseek/deepseek-v3.2'), text('openai/gpt-4.1-mini'), text('openai/gpt-6-sol')], id => id === 'openai/gpt-4.1-mini'
- ? Response.json({ error: { message: 'Model is unavailable' } }, { status: 404 }) : success());
- const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.now());
- await f.run(); clock.mockReturnValue(Date.now() + 5 * 60_000 + 1); await f.run();
- expect(f.calls.filter(id => id.startsWith('openai/'))).toEqual(['openai/gpt-4.1-mini', 'openai/gpt-6-sol']);
- expect(f.access.filter(f.value).models).toHaveLength(2);
+ expect(f.access.filter(account).models).toEqual([]); await f.run(account);
+ f.setProxy('http://127.0.0.1:8888'); await f.run(account);
+ expect(f.catalogCalls()).toHaveLength(5);
});
-it('bounds each background pass and stops starting probes after cancellation', async () => {
- const f = await fixture(Array.from({ length: 20 }, (_, i) => text(`vendor-${i}/model`)));
- await f.run(); expect(f.calls).toHaveLength(12);
- const controller = new AbortController(); controller.abort();
- await f.access.refresh(f.value, controller.signal, async () => undefined);
- expect(f.calls).toHaveLength(12);
+it('does not let an old account response overwrite a newer account catalog', async () => {
+ const f = await fixture([text('vendor/one'), text('vendor/two')]); const old = deferred<Response>();
+ f.setCatalogReply(() => old.promise); const first = f.access.prepare(f.value);
+ await expect.poll(() => f.catalogCalls().length).toBe(1);
+ f.setCatalogReply(() => Response.json({ data: [text('vendor/two')] }));
+ const newer = { ...f.value, account: { ...f.value.account, id: 'account-b' } };
+ expect((await f.access.prepare(newer)).models).toEqual([text('vendor/two')]);
+ old.resolve(Response.json({ data: [text('vendor/one')] }));
+ expect((await first).models).toEqual([]);
+ expect(f.access.filter(newer).models).toEqual([text('vendor/two')]);
});
-it('never falls back to the user key when platform credentials are unavailable', async () => {
- const f = await fixture([text('deepseek/deepseek-v3.2')]);
- f.readProbeCredentials.mockRejectedValueOnce(new Error('platform unavailable'));
- await expect(f.run()).rejects.toThrow('platform unavailable');
- expect(f.calls).toEqual([]);
- await f.run();
- expect(f.calls).toHaveLength(1);
+it('reset aborts directory work and prevents a late response from restoring visible models', async () => {
+ const f = await fixture([text('vendor/one')]); const waiting = deferred<Response>();
+ f.setCatalogReply(() => waiting.promise); const work = f.access.prepare(f.value);
+ await expect.poll(() => f.catalogCalls().length).toBe(1);
+ const signal = f.catalogCalls()[0]![1]!.signal!;
+ f.access.reset(); expect(signal.aborted).toBe(true);
+ waiting.resolve(Response.json({ data: f.value.models })); await work;
+ expect(f.access.filter(f.value).models).toEqual([]); expect(f.access.context()).toBe('');
});
-it.each(['user-key', 'expired'] as const)('does not perform inference with %s platform credentials', async failure => {
- const f = await fixture([text('deepseek/deepseek-v3.2')]);
- const credentials = await f.readProbeCredentials();
- f.readProbeCredentials.mockResolvedValue({
- ...credentials, ...(failure === 'user-key'
- ? { modelKey: f.value.modelKey } : { expiresAt: new Date(Date.now() - 1000).toISOString() })
- });
- await f.run();
- expect(f.calls).toEqual([]);
+it('migrates only unexpired exact rejections from version 2, discarding probe admission states', async () => {
+ const f = await fixture([text('vendor/one'), text('vendor/two')]); await f.run();
+ await f.access.recordFailure(f.access.context(), f.value.models[0]!, facts);
+ const path = join(f.root, 'config/gateway-model-access.json'); const saved = JSON.parse(await readFile(path, 'utf8'));
+ await writeFile(path, JSON.stringify({ ...saved, version: 2, models: {
+ 'text:vendor/one': { ...saved.models['text:vendor/one'], status: 'blocked', nextCheck: Date.now() + 3_600_000, validUntil: 0 },
+ 'text:vendor/two': { status: 'unknown', profile: 'old-profile', nextCheck: Date.now() + 3_600_000, validUntil: 0 }
+ } }));
+ const restored = createOfficialModelAccess(f.input);
+ expect((await restored.prepare(f.value)).models).toEqual([text('vendor/two')]);
+ const migrated = JSON.parse(await readFile(path, 'utf8'));
+ expect(migrated.version).toBe(3); expect(Object.keys(migrated.models)).toEqual(['text:vendor/one']);
});
-it('keeps cached access results and avoids requesting credentials when no probe is due', async () => {
- const f = await fixture([text('deepseek/deepseek-v3.2')]);
- await f.run();
- f.readProbeCredentials.mockRejectedValue(new Error('platform unavailable'));
- await f.run();
- expect(f.readProbeCredentials).toHaveBeenCalledOnce();
- expect(f.access.filter(f.value).models).toHaveLength(1);
+it('discards obsolete family caches and ignores a rejection for a changed adapter profile', async () => {
+ const f = await fixture([text('vendor/one')]); await mkdir(join(f.root, 'config'), { recursive: true });
+ await writeFile(join(f.root, 'config/gateway-model-access.json'), JSON.stringify({ version: 1, groups: { vendor: { status: 'blocked' } } }));
+ await f.run(); expect(f.access.filter(f.value).models).toEqual(f.value.models);
+ await f.access.recordFailure(f.access.context(), f.value.models[0]!, facts);
+ const changed = { ...f.value, models: [{ ...f.value.models[0]!, capabilities: ['responses', 'changed-contract'] }] };
+ expect(f.access.filter(changed).models).toEqual(changed.models);
+});
+
+it.each([
+ [402, 'Insufficient credits', false], [403, 'Key limit exceeded', false],
+ [403, 'Content policy violation', false], [403, 'Forbidden', false],
+ [429, 'Rate limit exceeded', false], [503, 'Provider unavailable', false],
+ [403, 'Model unavailable in this country', true], [403, 'Permission denied for this model', true],
+ [404, 'No endpoints found for this model', true],
+ [400, 'The selected model does not support response_format "verbose_json"', false]
+])('classifies HTTP %s %s without conflating access and request failures', (httpStatus, upstreamMessage, expected) => {
+ expect(isModelAccessFailure({ kind: 'http-rejected', httpStatus: httpStatus as number, upstreamMessage: upstreamMessage as string })).toBe(expected);
+});
+
+it('recognizes explicit geographic failures in accepted jobs and HTTP 200 error bodies', () => {
+ expect(isModelAccessFailure({ kind: 'provider-failed', upstreamCode: 'provider_error', upstreamMessage: facts.upstreamMessage })).toBe(true);
+ expect(isModelAccessFailure({ kind: 'provider-failed', httpStatus: 200, upstreamCode: '403', upstreamMessage: facts.upstreamMessage })).toBe(true);
+ expect(isModelAccessFailure({ kind: 'provider-failed', upstreamCode: 'provider_error', upstreamMessage: 'Temporarily unavailable' })).toBe(false);
});
diff --git a/apps/daemon/test/unit/gateway-model-preferences.test.ts b/apps/daemon/test/unit/gateway-model-preferences.test.ts
new file mode 100644
index 00000000..5950a820
--- /dev/null
+++ b/apps/daemon/test/unit/gateway-model-preferences.test.ts
@@ -0,0 +1,29 @@
+import { expect, it } from 'vitest';
+import type { GatewayModel } from '@opencreator/protocol';
+import { migrateModelPreferences, resolveModelPreferences } from '../../src/gateway/model-preferences.js';
+
+const text = (id: string): GatewayModel => ({ id, modality: 'text', capabilities: ['responses', 'chat', 'tools'], status: 'ready' });
+
+it('migrates old automatic defaults and merges duplicate purposes while retaining distinct manual choices', () => {
+ expect(migrateModelPreferences({ text: 'gpt-4o-mini', textProcessing: 'chat-only', subtitle: 'whisper-1', image: 'gpt-image-1' }, { text: 'gpt-6.1-sol' })).toEqual({});
+ expect(migrateModelPreferences({ text: 'gpt-5.4', image: 'my-image', transcription: 'plain-asr', subtitle: 'my-timestamp-asr' }, {}))
+ .toEqual({ text: 'gpt-5.4', image: 'my-image', transcription: 'my-timestamp-asr' });
+});
+
+it('follows new recommendations without overwriting manual selections or hiding temporary outages', () => {
+ const models = [text('gpt-6.1-sol'), text('gpt-6.2-sol')];
+ expect(resolveModelPreferences(models, { text: 'gpt-6.2-sol' }, {})).toMatchObject({ selected: { text: 'gpt-6.2-sol' }, modes: { text: 'recommended' } });
+ expect(resolveModelPreferences(models, { text: 'gpt-6.2-sol' }, { text: 'gpt-6.1-sol' }))
+ .toMatchObject({ selected: { text: 'gpt-6.1-sol' }, recommended: { text: 'gpt-6.2-sol' }, modes: { text: 'manual' } });
+ models[0]!.status = 'temporarily_unavailable';
+ expect(resolveModelPreferences(models, { text: 'gpt-6.2-sol' }, { text: 'gpt-6.1-sol' }).selected.text).toBe('gpt-6.1-sol');
+});
+
+it('removes incompatible selections and falls back to a ready recommended model', () => {
+ const models: GatewayModel[] = [text('gpt-6.1-sol'), { ...text('claude-future'), vendor: 'Anthropic' },
+ { id: 'chat-only', modality: 'text', capabilities: ['chat'] },
+ { id: 'plain-asr', modality: 'transcription', capabilities: ['transcribe'] },
+ { id: 'whisper-1', modality: 'transcription', capabilities: ['subtitle_timestamps'] }];
+ expect(resolveModelPreferences(models, { text: 'gpt-6.1-sol', transcription: 'whisper-1' }, { text: 'claude-future', transcription: 'plain-asr' }))
+ .toMatchObject({ selected: { text: 'gpt-6.1-sol', transcription: 'whisper-1' }, manual: {}, changed: true });
+});
diff --git a/apps/daemon/test/unit/gateway-model-selection-probe.test.ts b/apps/daemon/test/unit/gateway-model-selection-probe.test.ts
new file mode 100644
index 00000000..e448baf4
--- /dev/null
+++ b/apps/daemon/test/unit/gateway-model-selection-probe.test.ts
@@ -0,0 +1,147 @@
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import sharp from 'sharp';
+import { afterEach, expect, it, vi } from 'vitest';
+import type { GatewayModel } from '@opencreator/protocol';
+import { createModelSelectionProbe } from '../../src/gateway/model-selection-probe.js';
+import { modelProbeAudio } from '../../src/gateway/model-probe-audio.js';
+
+const cleanup: Array<() => Promise<void>> = [];
+afterEach(async () => { for (const close of cleanup.splice(0)) await close(); });
+const scope = { accountId: 'customer', modelKey: 'customer-model-key', keyVersion: '1', accessContext: 'exit-a',
+ baseUrl: 'https://openrouter.ai/api/v1', transport: 'openrouter-direct' as const };
+
+async function fixture() {
+ const root = await mkdtemp(join(tmpdir(), 'model-selection-probe-'));
+ const png = await sharp({ create: { width: 1, height: 1, channels: 3, background: 'red' } }).png().toBuffer();
+ const fetcher = vi.fn<typeof fetch>(async (url, options) => {
+ const path = new URL(String(url)).pathname;
+ if (path.endsWith('/responses')) return Response.json({ status: 'completed', output: [{ type: 'function_call', name: 'model_probe', arguments: '{"ok":true}' }] });
+ if (path.endsWith('/chat/completions')) return Response.json({ choices: [{ message: { content: 'OK' }, finish_reason: 'stop' }] });
+ if (path.endsWith('/images')) return Response.json({ data: [{ b64_json: png.toString('base64') }] });
+ if (path.endsWith('/audio/speech')) return new Response(new Uint8Array(modelProbeAudio()), { headers: { 'Content-Type': 'audio/wav' } });
+ if (path.endsWith('/audio/transcriptions')) {
+ const request = new Request('http://localhost', { method: 'POST', headers: options?.headers, body: options?.body });
+ const form = await request.formData();
+ expect(form.get('model')).toBe('test/transcription');
+ expect(Buffer.from(await (form.get('file') as File).arrayBuffer()).subarray(0, 4).toString()).toBe('RIFF');
+ return Response.json({ text: 'Hello.' });
+ }
+ if (path.endsWith('/videos')) return Response.json({ id: 'video-1', status: 'pending' });
+ if (path.endsWith('/videos/video-1')) return Response.json({ id: 'video-1', status: 'completed' });
+ if (path.endsWith('/videos/video-1/content')) return new Response(new Uint8Array([0, 0, 0, 24, 102, 116, 121, 112]), { headers: { 'Content-Type': 'video/mp4' } });
+ throw new Error(`Unexpected probe resource: ${path}`);
+ });
+ let proxy = '';
+ const service = createModelSelectionProbe({ dataDir: root, fetcher, readProxy: async () => proxy, pollMs: 1, timeoutMs: 1000 });
+ cleanup.push(async () => { await service.close(); await rm(root, { recursive: true, force: true }); });
+ return { service, fetcher, setProxy(value: string) { proxy = value; } };
+}
+
+it.each(['text', 'image', 'video', 'speech', 'transcription'] as const)('probes %s directly through OpenRouter with the same inference key', async modality => {
+ const f = await fixture();
+ const model: GatewayModel = { id: `test/${modality}`, modality, capabilities: ['responses'], durations: [4], sizes: ['1280x720'] };
+ await f.service.probe(model, scope);
+ expect(f.fetcher).toHaveBeenCalled();
+ for (const [url, request] of f.fetcher.mock.calls) {
+ expect(String(url)).toMatch(/^https:\/\/openrouter\.ai\/api\/v1\//);
+ expect(new Headers(request?.headers).get('authorization')).toBe(`Bearer ${scope.modelKey}`);
+ }
+});
+
+it.each([
+ { ...scope, modelKey: '' },
+ { ...scope, baseUrl: 'https://gateway.example/untrusted', transport: 'gateway' as const }
+])('refuses invalid or non-direct credentials without calling another transport', async invalidScope => {
+ const f = await fixture();
+ await expect(f.service.probe({ id: 'test/text', modality: 'text', capabilities: ['responses'] }, invalidScope)).rejects.toMatchObject({ code: 'model_probe_unavailable' });
+ expect(f.fetcher).not.toHaveBeenCalled();
+});
+
+it('charges a gateway probe through the authenticated gateway endpoint', async () => {
+ const f = await fixture();
+ await f.service.probe({ id: 'gpt-4o-mini', modality: 'text', capabilities: ['responses'] }, { ...scope, transport: 'gateway', baseUrl: 'https://gateway.example/v1' });
+ expect(f.fetcher).toHaveBeenCalledOnce();
+ expect(f.fetcher.mock.calls[0]?.[0]).toBe('https://gateway.example/v1/responses');
+ const headers = new Headers(f.fetcher.mock.calls[0]?.[1]?.headers);
+ expect(headers.get('authorization')).toBe(`Bearer ${scope.modelKey}`);
+ expect(headers.get('idempotency-key')).toBeTruthy();
+});
+
+it.each([401, 403, 402, 429, 500])('reports OpenRouter %s without retrying inference', async status => {
+ const f = await fixture();
+ f.fetcher.mockResolvedValue(Response.json({ error: { code: status, message: 'Provider denied the request.' } }, { status }));
+ const code = status === 401 ? 'model_probe_auth_required' : status === 402 ? 'model_probe_credits_insufficient' : status === 429 ? 'model_probe_unavailable' : 'model_probe_inconclusive';
+ await expect(f.service.probe({ id: 'test/text', modality: 'text', capabilities: ['responses'] }, scope)).rejects.toMatchObject({ code, status: 503 });
+ expect(f.fetcher).toHaveBeenCalledOnce();
+});
+
+it.each([400, 402, 404, 422, 429, 502])('keeps gateway probe error facts for HTTP %s without retrying inference', async status => {
+ const f = await fixture();
+ f.fetcher.mockResolvedValue(Response.json({ error: { code: 'upstream_rejected', upstreamCode: 'invalid_parameter',
+ message: `Invalid temperature; ${scope.modelKey}`, requestId: 'ocreq_probe' } }, { status }));
+ await expect(f.service.probe({ id: 'test/text', modality: 'text', capabilities: ['responses'] },
+ { ...scope, transport: 'gateway', baseUrl: 'https://gateway.example/v1' })).rejects.toMatchObject({
+ publicFacts: { httpStatus: status, upstreamCode: 'invalid_parameter', requestId: 'ocreq_probe', upstreamMessage: 'Invalid temperature; [redacted]' }
+ });
+ expect(f.fetcher).toHaveBeenCalledOnce();
+});
+
+it('shares simultaneous checks and only reuses success for the same account, key, model, and proxy', async () => {
+ const f = await fixture(); const model: GatewayModel = { id: 'test/text', modality: 'text', capabilities: ['responses'] };
+ await Promise.all([f.service.probe(model, scope), f.service.probe(model, scope)]);
+ expect(f.fetcher).toHaveBeenCalledOnce();
+ await f.service.probe(model, scope); expect(f.fetcher).toHaveBeenCalledOnce();
+ await f.service.probe(model, scope, true); expect(f.fetcher).toHaveBeenCalledTimes(2);
+ f.setProxy('https://other-exit'); await f.service.probe(model, scope); expect(f.fetcher).toHaveBeenCalledTimes(3);
+ await f.service.probe(model, { ...scope, keyVersion: '2' }); expect(f.fetcher).toHaveBeenCalledTimes(4);
+ await f.service.probe(model, { ...scope, modelKey: 'replacement-key' }); expect(f.fetcher).toHaveBeenCalledTimes(5);
+ await f.service.probe(model, { ...scope, accountId: 'other-account' }); expect(f.fetcher).toHaveBeenCalledTimes(6);
+ await f.service.probe(model, { ...scope, accessContext: 'exit-b' }); expect(f.fetcher).toHaveBeenCalledTimes(7);
+});
+
+it('checks only the requested text interface and keeps their cached evidence separate', async () => {
+ const f = await fixture(); const model: GatewayModel = { id: 'test/text', modality: 'text', capabilities: ['responses'] };
+ await f.service.probe(model, scope);
+ await f.service.probe(model, scope, false, { textApi: 'chat/completions' });
+ expect(f.fetcher.mock.calls.map(([url]) => url)).toEqual([
+ 'https://openrouter.ai/api/v1/responses', 'https://openrouter.ai/api/v1/chat/completions'
+ ]);
+ await f.service.probe(model, scope, false, { textApi: 'chat/completions' });
+ expect(f.fetcher).toHaveBeenCalledTimes(2);
+});
+
+it('allows a reasoning model enough output budget to finish a Chat probe', async () => {
+ const f = await fixture();
+ f.fetcher.mockImplementation(async (_url, options) => {
+ const body = JSON.parse(String(options?.body));
+ return Response.json({ choices: [{ message: { content: body.max_tokens >= 256 ? 'OK' : '' },
+ finish_reason: body.max_tokens >= 256 ? 'stop' : 'length' }] });
+ });
+ await expect(f.service.probe({ id: 'deepseek-v4.1-flash', modality: 'text', capabilities: ['responses', 'chat'] },
+ { ...scope, transport: 'gateway', baseUrl: 'https://gateway.example/v1' }, false, { textApi: 'chat/completions' })).resolves.toBeUndefined();
+ expect(f.fetcher).toHaveBeenCalledOnce();
+});
+
+it.each([
+ { status: 403, message: 'Provider Terms Of Service restriction', code: 'model_probe_failed' },
+ { status: 429, message: 'Rate limit exceeded', code: 'model_probe_inconclusive' },
+ { status: 500, message: 'Provider temporarily unavailable', code: 'model_probe_inconclusive' },
+ { status: 403, message: 'Key limit exceeded', code: 'model_probe_inconclusive' }
+])('classifies a failed video ($status, $message) without resubmitting its generation', async ({ status, message, code }) => {
+ const f = await fixture();
+ f.fetcher.mockImplementation(async (url, options) => {
+ if (String(url).endsWith('/videos')) return Response.json({ id: 'video-1', status: 'pending' });
+ expect(options?.method).toBe('GET');
+ return Response.json({ id: 'video-1', status: 'failed', error: { code: status, message } });
+ });
+ await expect(f.service.probe({ id: 'test/video', modality: 'video', capabilities: [], durations: [4], sizes: ['1280x720'] }, scope)).rejects.toMatchObject({ code });
+ expect(f.fetcher.mock.calls.filter(([, options]) => options?.method === 'POST')).toHaveLength(1);
+});
+
+it('does not count an incomplete tool response as a successful text probe', async () => {
+ const f = await fixture(); f.fetcher.mockResolvedValue(Response.json({ status: 'incomplete', output: [] }));
+ await expect(f.service.probe({ id: 'test/text', modality: 'text', capabilities: ['responses'] }, scope)).rejects.toMatchObject({ code: 'model_probe_inconclusive' });
+ expect(f.fetcher).toHaveBeenCalledOnce();
+});
diff --git a/apps/daemon/test/unit/gateway-official-fetch.test.ts b/apps/daemon/test/unit/gateway-official-fetch.test.ts
index b1a73524..06bba27d 100644
--- a/apps/daemon/test/unit/gateway-official-fetch.test.ts
+++ b/apps/daemon/test/unit/gateway-official-fetch.test.ts
@@ -62,6 +62,20 @@ it('uses the direct connection when no proxy is available', async () => {
expect(mocks.request).not.toHaveBeenCalled();
});
+it('reuses proxy connections for repeated account refreshes', async () => {
+ const fetcher = createOfficialFetch({ readProxy: async () => 'http://127.0.0.1:7897', platform: 'linux' });
+ let remote = upstream();
+ const first = await fetcher('https://www.open-creator.ai/api/v1/billing/summary');
+ remote.response.end('{}'); await first.text();
+ const agent = mocks.request.mock.lastCall![1].agent;
+ expect(agent.keepAlive).toBe(true);
+ expect(agent.maxFreeSockets).toBe(2);
+ remote = upstream();
+ const second = await fetcher('https://www.open-creator.ai/api/v1/billing/summary');
+ remote.response.end('{}'); await second.text();
+ expect(mocks.request.mock.lastCall![1].agent).toBe(agent);
+});
+
it('reads shared proxy changes for each request without restarting the transport', async () => {
let proxy = 'http://127.0.0.1:7897';
const fetcher = createOfficialFetch({ readProxy: async () => proxy, platform: 'linux' });
@@ -69,10 +83,18 @@ it('reads shared proxy changes for each request without restarting the transport
const first = await fetcher('https://www.open-creator.ai/api/v1/client/models');
remote.response.end('{}'); await first.text();
expect(mocks.request.mock.lastCall![1].agent.proxy.port).toBe('7897');
+ const firstAgent = mocks.request.mock.lastCall![1].agent;
+ const destroy = vi.spyOn(firstAgent, 'destroy');
proxy = 'http://127.0.0.1:8888'; remote = upstream();
const second = await fetcher('https://openrouter.ai/api/v1/images');
remote.response.end('{}'); await second.text();
expect(mocks.request.mock.lastCall![1].agent.proxy.port).toBe('8888');
+ expect(mocks.request.mock.lastCall![1].agent).not.toBe(firstAgent);
+ expect(destroy).not.toHaveBeenCalled();
+ proxy = 'http://127.0.0.1:7897'; remote = upstream();
+ const third = await fetcher('https://www.open-creator.ai/api/v1/billing/summary');
+ remote.response.end('{}'); await third.text();
+ expect(mocks.request.mock.lastCall![1].agent).toBe(firstAgent);
proxy = ''; const direct = vi.fn(async () => Response.json({})); vi.stubGlobal('fetch', direct);
await fetcher('https://openrouter.ai/api/v1/images'); expect(direct).toHaveBeenCalledOnce();
});
diff --git a/apps/daemon/test/unit/gateway-proxy.test.ts b/apps/daemon/test/unit/gateway-proxy.test.ts
new file mode 100644
index 00000000..99910bfa
--- /dev/null
+++ b/apps/daemon/test/unit/gateway-proxy.test.ts
@@ -0,0 +1,210 @@
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { expect, it, vi } from 'vitest';
+import { createGatewayClient, bootstrapSchema, type GatewayBootstrap } from '../../src/gateway/client.js';
+import { createGatewayAccountService } from '../../src/gateway/account-service.js';
+import { createGatewayConfigStore } from '../../src/gateway/config-store.js';
+import { createDirectRuntime } from '../../src/gateway/direct-runtime.js';
+import Fastify from 'fastify';
+import { createGatewayCreatorSource } from '../../src/gateway/creator-service-source.js';
+import { createDefaultCreatorServicesConfig, gatewayRecommendedModelId } from '@opencreator/protocol';
+
+const bootstrap: GatewayBootstrap = { schemaVersion: 3, transport: 'gateway', supplier: 'chatanywhere', keyRotation: false,
+ account: { id: 'wallet-user', email: '[email protected]', verified: true }, keyVersion: 'gateway-v1', bindingVersion: 'wallet-user:gateway:v1',
+ baseUrl: 'https://gateway.example/v1', models: [{ id: 'gpt-4o-mini', modality: 'text', capabilities: ['responses', 'chat'] }], defaults: { text: 'gpt-4o-mini' } };
+
+it('accepts protocol 3 without supplier keys and pins the gateway origin', async () => {
+ let value = { ...bootstrap };
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json(value));
+ const client = createGatewayClient('https://gateway.example', fetcher);
+ expect(await client.bootstrap('device-access-token')).toEqual(bootstrap);
+ expect(fetcher.mock.calls[0]?.[0]).toContain('protocolVersion=3');
+ expect(bootstrapSchema.safeParse({ ...bootstrap, modelKey: 'supplier-secret' }).success).toBe(false);
+ value = { ...bootstrap, baseUrl: 'https://api.chatanywhere.tech/v1' };
+ await expect(client.bootstrap('device-access-token')).rejects.toMatchObject({ code: 'invalid_gateway_response' });
+});
+
+it('loads a gateway account, clears old supplier credentials and refreshes device authentication', async () => {
+ const root = await mkdtemp(join(tmpdir(), 'oc-proxy-account-'));
+ const store = createGatewayConfigStore(root);
+ await store.writeConfiguration({ source: 'gateway', bindingVersion: 'old-binding' });
+ await store.writeCredentials({ schemaVersion: 2, transport: 'supplier-direct', supplier: 'chatanywhere', modelKey: 'old-supplier-secret',
+ account: bootstrap.account, keyVersion: 'old', bindingVersion: 'old-binding', baseUrl: 'https://api.chatanywhere.tech/v1', models: bootstrap.models, defaults: bootstrap.defaults,
+ accessToken: 'initial-device-access', refreshToken: 'initial-device-refresh', expiresIn: 900, accessExpiresAt: new Date(Date.now() + 900000).toISOString() });
+ const refresh = vi.fn(async () => ({ accessToken: 'renewed-device-access', refreshToken: 'renewed-device-refresh', expiresIn: 900 }));
+ const activation = vi.fn(async (_bootstrap: GatewayBootstrap) => undefined);
+ const client = { origin: 'https://gateway.example', bootstrap: vi.fn(async () => structuredClone(bootstrap)), refresh,
+ startDevice: vi.fn(), pollDevice: vi.fn(), cancelDevice: vi.fn(), logout: vi.fn(), avatar: vi.fn(), request: vi.fn(async () => ({})) };
+ const service = createGatewayAccountService({ dataDir: root, client, activateRuntime: activation, closeRuntime: async () => undefined,
+ hasActiveTasks: () => false, automaticPolling: false, probeModel: async () => undefined });
+ try {
+ await service.initialize();
+ expect(service.peekState()).toMatchObject({ transport: 'gateway', supplier: 'chatanywhere', activationState: 'ready' });
+ const initial = await service.modelCredentials();
+ expect(initial.modelKey).toBe('initial-device-access');
+ expect(activation).toHaveBeenCalledWith(expect.not.objectContaining({ modelKey: expect.anything() }));
+ const disk = await readFile(join(root, 'config', 'gateway-credentials.json'), 'utf8');
+ expect(disk).not.toContain('old-supplier-secret'); expect(JSON.parse(disk)).not.toHaveProperty('modelKey');
+ const recovered = await service.recoverModelCredentials(initial.keyVersion);
+ expect(recovered.modelKey).toBe('renewed-device-access'); expect(recovered.keyVersion).not.toBe(initial.keyVersion);
+ await expect(service.probeModel('text', 'gpt-4o-mini')).resolves.toMatchObject({ costBearer: 'customer' });
+ } finally { await service.close(); await rm(root, { recursive: true, force: true }); }
+});
+
+it('gives Runtime a local token and preserves one request identity across a 401 refresh', async () => {
+ const seen: Array<{ key: string | null; id: string | null }> = [];
+ const fetcher = vi.fn<typeof fetch>(async (url, options) => {
+ expect(url).toBe('https://gateway.example/v1/responses');
+ const h = new Headers(options?.headers); seen.push({ key: h.get('authorization'), id: h.get('idempotency-key') });
+ return seen.length === 1 ? Response.json({}, { status: 401 }) : Response.json({ status: 'completed', output: [] });
+ });
+ const runtime = await createDirectRuntime('initial-device-token', fetcher,
+ async () => ({ key: 'initial-device-token', keyVersion: 'old', baseUrl: bootstrap.baseUrl, models: bootstrap.models, release: async () => undefined }),
+ async () => ({ key: 'renewed-device-token', keyVersion: 'new' }), bootstrap.baseUrl, true);
+ try {
+ expect(runtime.token).not.toContain('device-token');
+ const result = await fetch(`${runtime.baseUrl}/responses`, { method: 'POST', headers: { Authorization: `Bearer ${runtime.token}`, 'Content-Type': 'application/json' }, body: JSON.stringify({ model: 'gpt-4o-mini', input: 'Hello' }) });
+ expect(result.status).toBe(200); await result.text();
+ expect(seen).toHaveLength(2); expect(seen[0]!.id).toBeTruthy(); expect(seen[1]!.id).toBe(seen[0]!.id);
+ expect(seen[1]!.key).toBe('Bearer renewed-device-token');
+ } finally { await runtime.close(); }
+});
+
+it.each([400, 402, 404, 422, 429, 500, 502])('preserves gateway %s and sanitized error facts through the Runtime relay', async status => {
+ const failure = vi.fn(); const recover = vi.fn();
+ const fetcher = vi.fn<typeof fetch>(async () => Response.json({ error: { code: 'upstream_rejected', upstreamCode: 'invalid_parameter',
+ message: 'Invalid temperature; device-access-token https://private.test/path', requestId: 'ocreq_rejected' } }, { status }));
+ const runtime = await createDirectRuntime('device-access-token', fetcher,
+ async () => ({ key: 'device-access-token', keyVersion: 'one', models: bootstrap.models, release: async () => undefined, onModelFailure: failure }),
+ recover, bootstrap.baseUrl, true);
+ try {
+ const result = await fetch(`${runtime.baseUrl}/responses`, { method: 'POST', headers: { Authorization: `Bearer ${runtime.token}`, 'Content-Type': 'application/json' }, body: JSON.stringify({ model: 'gpt-4o-mini', input: 'Hello' }) });
+ expect(result.status).toBe(status);
+ expect(result.headers.get('x-request-id')).toBe('ocreq_rejected');
+ const body = await result.json();
+ expect(body).toMatchObject({ error: { code: 'invalid_parameter', requestId: 'ocreq_rejected', message: expect.stringContaining('Invalid temperature') } });
+ expect(JSON.stringify(body)).not.toMatch(/device-access-token|private\.test/);
+ expect(failure).toHaveBeenCalledWith('gpt-4o-mini', 'text', expect.objectContaining({ httpStatus: status, upstreamCode: 'invalid_parameter' }));
+ expect(fetcher).toHaveBeenCalledOnce(); expect(recover).not.toHaveBeenCalled();
+ } finally { await runtime.close(); }
+});
+
+it('forwards Creator text, image, speech and subtitles through the gateway with native image parameters', async () => {
+ const app = Fastify();
+ const models = [...bootstrap.models,
+ { id: 'gpt-image-1', modality: 'image' as const, capabilities: ['generate', 'edit'], imageOptions: { maxImages: 1, maxReferences: 1, aspectRatios: ['3:2'], resolutions: ['1K'] } },
+ { id: 'tts-1', modality: 'speech' as const, capabilities: ['speech'], voices: ['alloy'] },
+ { id: 'whisper-1', modality: 'transcription' as const, capabilities: ['transcription_text', 'subtitle_timestamps'] }];
+ const credentials = { accountId: bootstrap.account.id, transport: 'gateway' as const, modelKey: 'device-access-token', keyVersion: 'device-v1', bindingVersion: bootstrap.bindingVersion,
+ baseUrl: bootstrap.baseUrl, models, defaults: { text: 'gpt-4o-mini', image: 'gpt-image-1', speech: 'tts-1', transcription: 'whisper-1' } };
+ const fetcher = vi.fn<typeof fetch>(async (url, options) => {
+ expect(String(url)).toMatch(/^https:\/\/gateway\.example\/v1\//);
+ expect(new Headers(options?.headers).get('authorization')).toBe('Bearer device-access-token');
+ expect(new Headers(options?.headers).get('idempotency-key')).toBeTruthy();
+ if (String(url).endsWith('/images/generations')) {
+ expect(JSON.parse(String(options?.body))).toMatchObject({ model: 'gpt-image-1', size: '1536x1024', n: 1 });
+ expect(String(options?.body)).not.toContain('aspect_ratio');
+ expect(new Headers(options?.headers).get('prefer')).toBe('respond-async');
+ return Response.json({ requestId: 'ocreq_gateway_image', state: 'submitting' }, { status: 202 });
+ }
+ if (String(url).endsWith('/audio/transcriptions')) {
+ const form = await new Request('http://localhost', { method: 'POST', headers: options?.headers, body: options?.body }).formData();
+ expect(form.get('model')).toBe('whisper-1'); expect(form.get('response_format')).toBe('verbose_json');
+ return Response.json({ text: 'Hello', segments: [{ start: 0, end: 1, text: 'Hello' }] });
+ }
+ return Response.json({ output: [], text: 'OK' });
+ });
+ const manual = createDefaultCreatorServicesConfig();
+ const source = createGatewayCreatorSource({ account: {
+ peekState: () => ({ source: 'gateway', transport: 'gateway', authState: 'signed_in', activationState: 'ready', account: bootstrap.account, bindingVersion: bootstrap.bindingVersion, models, activationError: null }),
+ modelCredentials: async () => credentials
+ }, manual: { read: async () => manual, write: async value => value, reset: async () => manual }, getLocalOrigin: () => 'http://127.0.0.1:39999', fetcher });
+ try {
+ await source.register(app); const config = await source.store.read();
+ expect(config.llm.apiKey).not.toBe('device-access-token');
+ for (const [operation, payload, extra, status] of [
+ ['responses', { model: 'gpt-4o-mini', input: 'Hello' }, {}, 200],
+ ['images/generations', { model: 'gpt-image-1', prompt: 'Circle', aspect_ratio: '3:2', resolution: '1K' }, { prefer: 'respond-async' }, 202],
+ ['audio/speech', { model: 'tts-1', input: 'Hello', voice: 'alloy' }, {}, 200]
+ ] as const) {
+ const result = await app.inject({ method: 'POST', url: `/internal/krillin-llm/gateway/v1/${operation}`, headers: { Authorization: `Bearer ${config.llm.apiKey}`, ...extra }, payload });
+ expect(result.statusCode).toBe(status);
+ }
+ const form = new FormData(); form.set('model', 'whisper-1'); form.set('response_format', 'verbose_json'); form.set('file', new Blob(['fixture'], { type: 'audio/wav' }), 'sample.wav');
+ const request = new Request('http://localhost', { method: 'POST', body: form });
+ const result = await app.inject({ method: 'POST', url: '/internal/krillin-llm/gateway/v1/audio/transcriptions', headers: { Authorization: `Bearer ${config.llm.apiKey}`, 'Content-Type': request.headers.get('content-type')! }, payload: Buffer.from(await request.arrayBuffer()) });
+ expect(result.statusCode).toBe(200); expect(result.json().segments[0]).toMatchObject({ start: 0, end: 1 });
+ expect(fetcher).toHaveBeenCalledTimes(4);
+ } finally { await source.revoke(); await app.close(); }
+});
+
+it('refreshes a gateway catalog during active work without probes or Runtime replacement, preserving choices across restart', async () => {
+ const root = await mkdtemp(join(tmpdir(), 'oc-catalog-refresh-'));
+ const store = createGatewayConfigStore(root);
+ const text = bootstrap.models[0]!;
+ const chat = { id: 'chat-only', modality: 'text' as const, capabilities: ['chat'] };
+ const catalog = { models: [text, chat], defaults: { text: text.id }, catalogVersion: 'v2', catalogUpdatedAt: new Date().toISOString(), catalogRefreshState: 'ready' };
+ const current = { ...bootstrap, catalogVersion: 'v1' };
+ await store.writeConfiguration({ source: 'gateway', bindingVersion: current.bindingVersion });
+ await store.writeCredentials({ ...current, accessToken: 'device', refreshToken: 'refresh', expiresIn: 900, accessExpiresAt: new Date(Date.now()+900000).toISOString() });
+ const activation = vi.fn(async () => undefined), probe = vi.fn(async () => undefined), closeRuntime = vi.fn(async () => undefined);
+ const request = vi.fn(async () => structuredClone(catalog));
+ const client = { origin: 'https://gateway.example', bootstrap: vi.fn(async () => structuredClone(current)), refresh: vi.fn(), startDevice: vi.fn(), pollDevice: vi.fn(), cancelDevice: vi.fn(), logout: vi.fn(), avatar: vi.fn(), request };
+ const create = () => createGatewayAccountService({ dataDir: root, client, activateRuntime: activation, closeRuntime, hasActiveTasks: () => true, automaticPolling: false, probeModel: probe });
+ let service = create();
+ try {
+ await service.initialize(); activation.mockClear(); closeRuntime.mockClear();
+ expect(await service.readState({ refreshModels: true })).toMatchObject({ catalogVersion: 'v2', selectedModels: { text: text.id }, models: [text] });
+ expect(request).toHaveBeenCalledOnce(); expect(activation).not.toHaveBeenCalled(); expect(closeRuntime).not.toHaveBeenCalled(); expect(probe).not.toHaveBeenCalled();
+ await expect(service.selectModel('text', chat.id)).rejects.toMatchObject({ code: 'invalid_model' });
+ request.mockRejectedValueOnce(new Error('offline'));
+ await expect(service.readState({ refreshModels: true })).rejects.toThrow('offline');
+ expect(service.peekState()).toMatchObject({ catalogError: 'model_catalog_unavailable', selectedModels: { text: text.id }, models: [text] });
+ await service.close(); service = create(); await service.initialize();
+ expect(service.peekState().selectedModels).toEqual({ text: text.id });
+ expect(probe).not.toHaveBeenCalled();
+ } finally { await service.close(); await rm(root, { recursive: true, force: true }); }
+});
+
+it('migrates defaults, follows new recommendations when idle and persists explicit manual preferences', async () => {
+ const root = await mkdtemp(join(tmpdir(), 'oc-model-preferences-'));
+ const store = createGatewayConfigStore(root);
+ const text = (id: string) => ({ id, modality: 'text' as const, capabilities: ['responses', 'chat', 'tools'] });
+ let current: GatewayBootstrap = { ...bootstrap, models: [text('gpt-4o-mini'), text('gpt-6.1-sol')], defaults: { text: 'gpt-6.1-sol' } };
+ await store.writeConfiguration({ source: 'gateway', bindingVersion: bootstrap.bindingVersion, selectedModels: { text: 'gpt-4o-mini', textProcessing: 'gpt-4o-mini' } });
+ await store.writeCredentials({ ...bootstrap, accessToken: 'device', refreshToken: 'refresh', expiresIn: 900, accessExpiresAt: new Date(Date.now() + 900000).toISOString() });
+ let busy = false;
+ const activation = vi.fn(async (_value: GatewayBootstrap) => undefined), probe = vi.fn();
+ const client = { origin: 'https://gateway.example', bootstrap: vi.fn(async () => structuredClone(current)), refresh: vi.fn(), startDevice: vi.fn(), pollDevice: vi.fn(), cancelDevice: vi.fn(), logout: vi.fn(), avatar: vi.fn(),
+ request: vi.fn(async (path: string) => path === '/api/v1/client/models' ? { models: current.models, defaults: current.defaults, catalogVersion: current.defaults.text } : { account: current.account }) };
+ const create = () => createGatewayAccountService({ dataDir: root, client, activateRuntime: activation, closeRuntime: async () => undefined, hasActiveTasks: () => busy, hasPendingTasks: () => true, automaticPolling: false, probeModel: probe });
+ let service = create();
+ try {
+ await service.initialize();
+ expect(service.peekState()).toMatchObject({ selectedModels: { text: 'gpt-6.1-sol' }, modelSelectionModes: { text: 'recommended' } });
+ expect(service.peekState().selectedModels).not.toHaveProperty('textProcessing');
+ current = { ...current, models: [...current.models, text('gpt-6.2-sol')], defaults: { text: 'gpt-6.2-sol' } };
+ busy = true; activation.mockClear();
+ await service.readState({ refreshModels: true });
+ expect(service.peekState().selectedModels?.text).toBe('gpt-6.1-sol');
+ expect(activation).not.toHaveBeenCalled();
+ busy = false;
+ await service.readState();
+ expect(service.peekState().selectedModels?.text).toBe('gpt-6.2-sol');
+ expect(activation).toHaveBeenLastCalledWith(expect.objectContaining({ defaults: { text: 'gpt-6.2-sol' } }));
+ const manual = createDefaultCreatorServicesConfig();
+ const source = createGatewayCreatorSource({ account: service, manual: { read: async () => manual, write: async value => value, reset: async () => manual }, getLocalOrigin: () => 'http://localhost:39999' });
+ expect((await source.store.read()).llm.model).toBe('gpt-6.2-sol');
+ await service.selectModel('text', 'gpt-6.1-sol');
+ current = { ...current, models: [...current.models, text('gpt-6.10-sol')], defaults: { text: 'gpt-6.10-sol' } };
+ await service.readState({ refreshModels: true });
+ expect(service.peekState()).toMatchObject({ selectedModels: { text: 'gpt-6.1-sol' }, recommendedModels: { text: 'gpt-6.10-sol' }, modelSelectionModes: { text: 'manual' } });
+ await service.close(); service = create(); await service.initialize();
+ expect(service.peekState()).toMatchObject({ selectedModels: { text: 'gpt-6.1-sol' }, modelSelectionModes: { text: 'manual' } });
+ await service.selectModel('text', gatewayRecommendedModelId);
+ expect(service.peekState()).toMatchObject({ selectedModels: { text: 'gpt-6.10-sol' }, modelSelectionModes: { text: 'recommended' } });
+ expect((await store.readConfiguration()).manualModels).toEqual({});
+ expect(probe).not.toHaveBeenCalled();
+ } finally { await service.close(); await rm(root, { recursive: true, force: true }); }
+});
diff --git a/apps/daemon/test/unit/gateway-runtime-bindings.test.ts b/apps/daemon/test/unit/gateway-runtime-bindings.test.ts
index 7315b5dd..71b0798b 100644
--- a/apps/daemon/test/unit/gateway-runtime-bindings.test.ts
+++ b/apps/daemon/test/unit/gateway-runtime-bindings.test.ts
@@ -103,6 +103,36 @@ describe('official Runtime bindings', () => {
await runtime.close();
});
+ it('disables unpriced hosted search only for gateway Runtime', async () => {
+ const gateway = setup({ gateway: true });
+ const prepared = await gateway.prepare();
+ expect(readFileSync(join(prepared.codexHome, 'config.toml'), 'utf8')).toContain('web_search = "disabled"');
+ await gateway.close();
+ const direct = setup();
+ const other = await direct.prepare();
+ expect(readFileSync(join(other.codexHome, 'config.toml'), 'utf8')).not.toContain('web_search =');
+ await direct.close();
+ });
+
+ it('updates the default model without replacing credentials or closing live Runtime processes', async () => {
+ const closeRuntime = vi.fn(async () => undefined);
+ const readCredentials = vi.fn(async () => ({ accountId: 'a', modelKey: 'test-cloud-secret', keyVersion: '1' }));
+ const runtime = setup({ closeRuntime, readCredentials });
+ const prepared = await runtime.prepare();
+ await runtime.updateModel('openai/gpt-4.1-mini');
+ expect(await runtime.prepare()).toBe(prepared);
+ expect(readCredentials).toHaveBeenCalledOnce();
+ expect(closeRuntime).not.toHaveBeenCalled();
+ expect(prepared.env.OC_GATEWAY_MODEL_KEY).toBe('test-cloud-secret');
+ const config = readFileSync(join(prepared.codexHome, 'config.toml'), 'utf8');
+ expect(config).toContain('model = "openai/gpt-4.1-mini"');
+ expect(config).toContain('wire_api = "responses"');
+ expect(config).toContain('request_max_retries = 0');
+ expect(config).not.toContain('test-cloud-secret');
+ await runtime.close();
+ await expect(runtime.updateModel('gateway-text')).rejects.toThrow('signed out');
+ });
+
it('does not report logout complete before credential-holding processes exit', async () => {
let exited!: () => void;
const closeRuntime = vi.fn(() => new Promise<void>(resolve => { exited = resolve; }));
diff --git a/apps/daemon/test/unit/gateway-runtime-source.test.ts b/apps/daemon/test/unit/gateway-runtime-source.test.ts
new file mode 100644
index 00000000..46f19408
--- /dev/null
+++ b/apps/daemon/test/unit/gateway-runtime-source.test.ts
@@ -0,0 +1,83 @@
+import { expect, it, vi } from 'vitest';
+import type { GatewayAccountState } from '@opencreator/protocol';
+import type { AppServerRuntimeExecution, AppServerRuntimeManager, AppServerRuntimeTurnInput } from '../../src/codex/app-server-runtime-manager.js';
+import { GatewayError } from '../../src/gateway/client.js';
+import { createRuntimeSource } from '../../src/gateway/runtime-source.js';
+
+function fixture() {
+ const execution: AppServerRuntimeExecution = {
+ started: Promise.resolve({ pid: 1, reused: false, generation: 1 }),
+ result: Promise.resolve({ threadId: 'upstream-thread', turnId: 'turn', turnStatus: 'completed', stderr: '',
+ terminationReason: 'completed', outputTruncation: { stderr: { truncated: false, droppedItems: 0, droppedBytes: 0 }, frames: { truncated: false, droppedItems: 0, droppedBytes: 0 } } }),
+ cancel: vi.fn(), steer: vi.fn(async () => ({ turnId: 'turn' }))
+ };
+ const startTurn = vi.fn(() => execution);
+ const official = { startTurn } as unknown as AppServerRuntimeManager;
+ const manual = { startTurn: vi.fn(() => execution) } as unknown as AppServerRuntimeManager;
+ const state: GatewayAccountState = { source: 'gateway', authState: 'signed_in', activationState: 'ready',
+ account: { id: 'account', email: '[email protected]', verified: true }, bindingVersion: '1', activationError: null,
+ selectedModels: { text: 'vendor/text' }, models: [{ id: 'vendor/text', modality: 'text', capabilities: ['responses'] }] };
+ const input: AppServerRuntimeTurnInput = { scope: { kind: 'project', id: 'project' }, runId: 'run',
+ cwd: '/tmp', sandbox: 'danger-full-access', model: 'vendor/text', profile: 'default', prompt: 'Hello',
+ thread: { id: 'thread', projectId: 'project', title: null, origin: 'opencreator_created', cwd: '/tmp', canonicalCwd: '/tmp',
+ workspaceMode: 'external', profile: 'default', sandbox: 'danger-full-access', status: 'active', purpose: 'conversation',
+ createdAt: new Date(0).toISOString(), updatedAt: new Date(0).toISOString() } };
+ return { execution, startTurn, official, manual, state, input };
+}
+
+it('starts a catalog-compatible turn immediately without an extra inference request', async () => {
+ const f = fixture();
+ const source = createRuntimeSource(f.manual, () => f.state, () => f.official);
+ const execution = source.startTurn(f.input);
+ expect(execution).toBe(f.execution);
+ expect(f.startTurn).toHaveBeenCalledOnce();
+ await expect(execution.started).resolves.toMatchObject({ pid: 1 });
+ await expect(execution.result).resolves.toMatchObject({ turnStatus: 'completed' });
+ expect(f.startTurn).toHaveBeenCalledOnce();
+ await execution.steer!({ message: 'Continue' });
+ execution.cancel();
+ expect(f.execution.steer).toHaveBeenCalledWith({ message: 'Continue' });
+ expect(f.execution.cancel).toHaveBeenCalledOnce();
+});
+
+it('rejects incompatible models before starting a user turn', () => {
+ const f = fixture();
+ f.state.models[0]!.capabilities = [];
+ const source = createRuntimeSource(f.manual, () => f.state, () => f.official);
+ expect(() => source.startTurn(f.input)).toThrow(expect.objectContaining({ code: 'invalid_model' }));
+ expect(f.startTurn).not.toHaveBeenCalled();
+});
+
+it('passes actual inference failures through without submitting a second turn', async () => {
+ const f = fixture();
+ f.execution.result = Promise.reject(new GatewayError('credits_insufficient', 402));
+ const source = createRuntimeSource(f.manual, () => f.state, () => f.official);
+ const execution = source.startTurn(f.input);
+ await expect(execution.result).rejects.toMatchObject({ code: 'credits_insufficient' });
+ expect(f.startTurn).toHaveBeenCalledOnce();
+});
+
+it('keeps manual service turns free of official probes', () => {
+ const f = fixture(); f.state.source = 'manual';
+ const source = createRuntimeSource(f.manual, () => f.state, () => f.official);
+ expect(source.startTurn(f.input)).toBe(f.execution);
+});
+
+it('rejects a missing selected model without silently using another model', () => {
+ const f = fixture();
+ const source = createRuntimeSource(f.manual, () => f.state, () => f.official);
+ expect(() => source.startTurn({ ...f.input, model: 'removed-model' })).toThrow(expect.objectContaining({ code: 'invalid_model' }));
+ expect(f.startTurn).not.toHaveBeenCalled();
+});
+
+it('uses the same selected text model as workflows and never substitutes the first gateway model', () => {
+ const f = fixture(); f.state.transport = 'gateway';
+ f.state.models = [{ id: 'gpt-6.1-sol', modality: 'text', capabilities: ['responses', 'chat'] },
+ { id: 'gpt-6.2-sol', modality: 'text', capabilities: ['responses', 'chat'] }];
+ f.state.selectedModels = { text: 'gpt-6.2-sol' };
+ const source = createRuntimeSource(f.manual, () => f.state, () => f.official);
+ source.startTurn({ ...f.input, model: undefined });
+ expect(f.startTurn).toHaveBeenLastCalledWith(expect.objectContaining({ model: 'gpt-6.2-sol' }));
+ f.state.selectedModels = {};
+ expect(() => source.startTurn({ ...f.input, model: undefined })).toThrow(expect.objectContaining({ code: 'invalid_model' }));
+});
diff --git a/apps/daemon/test/unit/krillin-tts-service.test.ts b/apps/daemon/test/unit/krillin-tts-service.test.ts
index 2b644f0a..2269ad00 100644
--- a/apps/daemon/test/unit/krillin-tts-service.test.ts
+++ b/apps/daemon/test/unit/krillin-tts-service.test.ts
@@ -19,11 +19,11 @@ describe('KrillinTtsService', () => {
await Promise.all(roots.splice(0).map(root => rm(root, { recursive: true, force: true })));
});
- it('rejects personal models and lists voices for the selected official speech model', async () => {
+ it.each([false, true])('validates official speech model, voices and optional style/speed (%s)', async supportsStyle => {
const root = await temporaryRoot();
const executeUtility = vi.fn();
const source = createGatewayCreatorSource({
- account: { peekState: () => ({ source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: 'a:1', models: [], activationError: null }), modelCredentials: async () => ({ accountId: 'a', modelKey: 'secret', keyVersion: '1', bindingVersion: 'a:1', baseUrl: 'https://gateway.example/v1', defaults: { speech: 'official-first' }, models: [{ id: 'official-first', modality: 'speech', capabilities: [], voices: ['first-voice'] }, { id: 'official-second', modality: 'speech', capabilities: [], voices: ['second-voice'] }] }) },
+ account: { peekState: () => ({ source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: 'a:1', models: [], activationError: null }), modelCredentials: async () => ({ accountId: 'a', modelKey: 'secret', keyVersion: '1', bindingVersion: 'a:1', baseUrl: 'https://gateway.example/v1', defaults: { speech: 'official-first' }, models: [{ id: 'official-first', modality: 'speech', capabilities: [], voices: ['first-voice'] }, { id: 'official-second', modality: 'speech', capabilities: supportsStyle ? ['speech_instructions', 'speech_speed'] : [], voices: ['second-voice'] }] }) },
manual: createConfigStore(createDefaultCreatorServicesConfig()), getLocalOrigin: () => 'http://127.0.0.1:39999'
});
const service = createKrillinTtsService({ resourceRoot: join(root, 'runtime'), workRoot: join(root, 'work'), configStore: source.store, executeUtility });
@@ -41,6 +41,11 @@ describe('KrillinTtsService', () => {
await expect(service.synthesize({ text: 'hello', model: 'official-second', voiceId: 'first-voice' })).rejects.toMatchObject({ code: 'VALIDATION_FAILED' });
await expect(source.runForJob('job', 'stage', () => service.synthesize({ text: 'hello', model: 'official-second' }))).rejects.toMatchObject({ code: 'VALIDATION_FAILED' });
expect(fetchMock).toHaveBeenCalledOnce();
+ const styled = service.synthesize({ text: 'hello', model: 'official-second', instructions: 'Calm', speed: 1.1, format: 'mp3' });
+ if (supportsStyle) {
+ await styled;
+ expect(JSON.parse(String(fetchMock.mock.lastCall?.[1]?.body))).toMatchObject({ instructions: 'Calm', speed: 1.1 });
+ } else await expect(styled).rejects.toMatchObject({ code: 'unsupported_capability' });
});
it('lists the bundled Qwen3 voice catalog without calling an outdated Runtime', async () => {
diff --git a/apps/daemon/test/unit/startup.test.ts b/apps/daemon/test/unit/startup.test.ts
index 63e6b75e..3f224176 100644
--- a/apps/daemon/test/unit/startup.test.ts
+++ b/apps/daemon/test/unit/startup.test.ts
@@ -3,11 +3,19 @@ import {
createProductionServerInput,
parseRuntimeChannel,
prepareSchedulerStartup,
+ requiresPaidStartupProbe,
resolveProductionRuntimePaths,
resolveProductionServerEnvironment
} from '../../src/startup.js';
describe('daemon production startup', () => {
+ it('requires explicit paid-test opt-in instead of charging for desktop readiness checks', () => {
+ expect(requiresPaidStartupProbe({ OPENCREATOR_REQUIRE_CODEX_PROBE: '1' })).toBe(false);
+ expect(requiresPaidStartupProbe({ OPENCREATOR_ENABLE_PAID_STARTUP_PROBE: '1' })).toBe(false);
+ expect(requiresPaidStartupProbe({ OPENCREATOR_REQUIRE_CODEX_PROBE: '1', OPENCREATOR_ENABLE_PAID_STARTUP_PROBE: '1' })).toBe(true);
+ expect(requiresPaidStartupProbe({ OPENCREATOR_REQUIRE_CODEX_PROBE: '1', OPENCREATOR_ENABLE_PAID_STARTUP_PROBE: '1', OPENCREATOR_CODEX_PROBE_VERIFIED: '1' })).toBe(false);
+ });
+
it('enables scheduler autostart and built-in agent tools for the production server', () => {
const input = createProductionServerInput({
token: 'runtime-token'
diff --git a/apps/web/e2e/official-video.spec.ts b/apps/web/e2e/official-video.spec.ts
new file mode 100644
index 00000000..bb9c03c7
--- /dev/null
+++ b/apps/web/e2e/official-video.spec.ts
@@ -0,0 +1,32 @@
+import { test, expect } from './fixtures/runtime.js';
+import type { CreatorJob, GatewayAccountState } from '@opencreator/protocol';
+
+test('official video references and integer quote fit the workspace', async ({ page, runtime }, testInfo) => {
+ const model = { id: 'seedance-2.5官方版', modality: 'video' as const, name: 'Seedance 2.5', capabilities: ['generate', 'image_to_video'], status: 'ready' as const,
+ durations: [4, 8, 15, 30], resolutions: ['720p'], aspectRatios: ['16:9', '9:16', '1:1'],
+ price: { version: 'video-v1', videoUnitsPerSecond: { '720p': 200_000_000 } },
+ videoOptions: { profile: 'seedance', maxImages: 30, maxVideos: 10, maxAudios: 10, firstLastFrames: true, framesExclusive: true, generateAudio: false, referenceDuration: 0 } };
+ const state: GatewayAccountState = { source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'video-test', email: '[email protected]', verified: true },
+ bindingVersion: 'video:1', selectedModels: { video: model.id }, models: [model], activationError: null };
+ await page.route('**/gateway/account', route => route.fulfill({ json: state }));
+ await page.route('**/gateway/billing/summary', route => route.fulfill({ json: { balance: { availableUnits: '1000000000', reservedUnits: '0', periodEnd: null, asOf: '2026-10-15T00:00:00Z' }, subscription: null, billingAvailable: false } }));
+ await page.addInitScript(() => localStorage.setItem('opencreator.agent-setup-confirmed.v1', '1'));
+ const { job } = await runtime.api<{ job: CreatorJob }>('POST', '/creator/jobs', {
+ projectId: runtime.projectId, templateId: 'video-generation', state: { officialModels: { video: model.id }, prompt: '海边的一段连续镜头', provider: 'seedance', size: '720p@16:9', duration: 4, currentStep: 1, furthestStep: 1 }
+ });
+ await runtime.openApp(page);
+ await page.goto(`${runtime.origin}/#/workbench?tool=video-generation&jobId=${job.id}`);
+ await expect(page.getByLabel('视频模型')).toBeVisible();
+ await expect(page.getByText(/800 积分/).first()).toBeVisible();
+ await page.screenshot({ path: testInfo.outputPath('official-video-settings.png'), fullPage: true });
+ await page.getByRole('button', { name: '上一步', exact: true }).click();
+ await expect(page.getByLabel('上传参考图片')).toBeAttached();
+ await page.getByRole('button', { name: '首尾帧', exact: true }).click();
+ await expect(page.getByLabel('上传首帧')).toBeAttached();
+ await page.getByRole('button', { name: '参考素材', exact: true }).click();
+ await expect(page.getByLabel('上传参考视频')).toBeAttached();
+ expect(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth)).toBe(true);
+ const overlap = await page.locator('.video-generation-settings-grid label').evaluateAll(elements => elements.some(element => element.scrollWidth > element.clientWidth + 1));
+ expect(overlap).toBe(false);
+ await page.screenshot({ path: testInfo.outputPath('official-video.png'), fullPage: true });
+});
diff --git a/apps/web/src/app/App.test.tsx b/apps/web/src/app/App.test.tsx
index 6154545b..51b88a48 100644
--- a/apps/web/src/app/App.test.tsx
+++ b/apps/web/src/app/App.test.tsx
@@ -185,11 +185,12 @@ describe('App', () => {
}
);
- it.each(['ready', 'blocked', 'loading'] as const)('enters the application after gateway sign-in with %s activation and never asks for provider credentials', async activationState => {
+ it.each([['ready', 'browser'], ['blocked', 'browser'], ['loading', 'browser'], ['blocked', 'desktop']] as const)('enters the application after gateway sign-in with %s activation in %s and never asks for provider credentials', async (activationState, hostKind) => {
window.localStorage.clear();
writeCachedModelCatalog({ models: [{ ...createCodexModelListResponse().models[0]!, id: 'personal-model', model: 'personal-model', displayName: 'Personal cached model', isDefault: true }] });
const user = userEvent.setup();
const hostBridge = createHostBridge();
+ hostBridge.kind = hostKind;
hostBridge.readConnectionConfig = async () => ({ baseUrl: 'http://127.0.0.1:60764', token: 'runtime-token' });
let gateway: GatewayAccountState = { source: 'manual', authState: 'signed_out', activationState: 'inactive', account: null, bindingVersion: null, models: [], activationError: null };
const runtimeFetch = async (input: RequestInfo | URL, init?: RequestInit) => {
@@ -228,6 +229,12 @@ describe('App', () => {
expect(screen.getByText('已登录,模型服务暂不可用。')).toBeInTheDocument();
await user.click(within(screen.getByText('已登录,模型服务暂不可用。').parentElement!).getByRole('button', { name: '账户' }));
await waitFor(() => expect(window.location.hash).toBe('#/account'));
+ await user.click(await screen.findByRole('button', { name: '模型设置' }));
+ expect(await screen.findByRole('heading', { name: 'AI 服务' })).toBeInTheDocument();
+ expect(window.location.hash).toBe('#/settings?tab=ai-services');
+ await user.click(screen.getByRole('button', { name: '返回应用' }));
+ expect(await screen.findByRole('main', { name: '个人中心' })).toBeInTheDocument();
+ expect(window.location.hash).toBe('#/account');
}
if (activationState === 'loading') {
expect(screen.getByText('已登录,正在连接模型服务…')).toBeInTheDocument();
diff --git a/apps/web/src/app/AppController.tsx b/apps/web/src/app/AppController.tsx
index dc50f865..96361a1a 100644
--- a/apps/web/src/app/AppController.tsx
+++ b/apps/web/src/app/AppController.tsx
@@ -4639,6 +4639,7 @@ export function AppController(props: AppControllerProps) {
runtimeDependencies={runtimeDependencies}
creatorServicesService={creatorServicesService}
gatewayState={gatewayAccountState ?? (gatewayAccountService ? null : undefined)}
+ gatewayAccountService={gatewayAccountService}
videoMetadataService={videoMetadataService}
workspace={props.route.view === 'workbench' ? props.route.tool : undefined}
jobId={props.route.view === 'workbench' ? props.route.jobId : undefined}
@@ -4741,7 +4742,11 @@ export function AppController(props: AppControllerProps) {
prepareExternalNavigation={hostBridge.prepareExternalNavigation}
onStateChange={onGatewayStateChange}
openExternal={url => hostBridge.openExternal(url)}
- onOpenModelSettings={() => navigateToRoute({ view: 'settings', tab: 'ai-services' })}
+ onOpenModelSettings={() => {
+ settingsReturnRouteRef.current = props.route;
+ applyRouteFromLocation({ view: 'settings', tab: 'ai-services' });
+ navigateToRoute({ view: 'settings', tab: 'ai-services' });
+ }}
onBack={() => {
applyRouteFromLocation(accountReturnRouteRef.current);
navigateToRoute(accountReturnRouteRef.current);
diff --git a/apps/web/src/components/forms/OfficialModelSelect.tsx b/apps/web/src/components/forms/OfficialModelSelect.tsx
index e3c9056a..99faf57e 100644
--- a/apps/web/src/components/forms/OfficialModelSelect.tsx
+++ b/apps/web/src/components/forms/OfficialModelSelect.tsx
@@ -1,18 +1,35 @@
-import { useEffect, useId, useLayoutEffect, useMemo, useRef, useState, type KeyboardEvent } from 'react';
+import { Fragment, useEffect, useId, useLayoutEffect, useMemo, useRef, useState, type KeyboardEvent } from 'react';
import { createPortal } from 'react-dom';
import { Check, ChevronDown, Search, X } from 'lucide-react';
import Fuse from 'fuse.js';
-import type { GatewayModel } from '@opencreator/protocol';
+import { gatewayModelReady, gatewayRecommendedModelId, type GatewayModel } from '@opencreator/protocol';
import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
+import { formatGatewayCreditAmount } from '../../features/account/billing-display.js';
import './official-model-select.css';
export function officialModelLabel(model: GatewayModel, automatic: string): string {
if (/openrouter/i.test(model.id)) return automatic;
return (model.name || model.id.split('/').pop() || model.id).replace(/OpenRouter\s*:?\s*/gi, '').trim();
}
+export function officialModelPrice(model:GatewayModel,l:(zh:string,en:string)=>string):string {
+ const p=model.price;if(!p)return '';
+ if(model.modality==='video'){
+ const rates=Object.values(p.videoUnitsPerSecond??{});
+ if(!rates.length)return '';
+ const amount=formatGatewayCreditAmount(Math.min(...rates)/1_000_000);
+ return l(`${amount} 积分/秒起`, `From ${amount} credits/second`);
+ }
+ if(p.perRequest)return l(`${formatGatewayCreditAmount(p.perRequest)} 积分/次`,`${formatGatewayCreditAmount(p.perRequest)} credits/request`);
+ const components=[];
+ if(p.perMinute)components.push(l(`${formatGatewayCreditAmount(p.perMinute)} 积分/分钟`,`${formatGatewayCreditAmount(p.perMinute)} credits/min`));
+ if(p.perMillionCharacters)components.push(l(`${formatGatewayCreditAmount(p.perMillionCharacters)} 积分/百万字符`,`${formatGatewayCreditAmount(p.perMillionCharacters)} credits/M characters`));
+ if(components.length)return components.join(' + ');
+ return l(`输入 ${formatGatewayCreditAmount(p.inputPerMillion)} / 输出 ${formatGatewayCreditAmount(p.outputPerMillion)} 积分/百万 token`,`${formatGatewayCreditAmount(p.inputPerMillion)} in / ${formatGatewayCreditAmount(p.outputPerMillion)} out credits/M tokens`);
+}
export default function OfficialModelSelect(props: {
label: string; describedBy?: string; models: GatewayModel[]; value: string;
+ recommendedModel?: GatewayModel; followsRecommendation?: boolean;
disabled?: boolean; onChange(value: string): void;
}) {
const l = useLocalizedCopy();
@@ -25,17 +42,21 @@ export default function OfficialModelSelect(props: {
const [activeIndex, setActiveIndex] = useState(0);
const [position, setPosition] = useState<{ left: number; top: number; width: number; maxHeight: number; above: boolean }>();
const automatic = l('自动选择', 'Automatic');
- const choices = useMemo(() => props.models.map(model => {
+ const selectionValue = props.followsRecommendation && props.recommendedModel ? gatewayRecommendedModelId : props.value;
+ const choices = useMemo(() => [...(props.recommendedModel ? [{ ...props.recommendedModel,
+ id: gatewayRecommendedModelId, vendor: undefined, name: l(`系统推荐 · ${officialModelLabel(props.recommendedModel, automatic)}`, `Recommended · ${officialModelLabel(props.recommendedModel, automatic)}`), recommended: true }] : []), ...props.models].map(model => {
const label = officialModelLabel(model, automatic);
return { model, label, nameSearch: normalizeSearch(label), idSearch: normalizeSearch(model.id) };
- }), [props.models, automatic]);
+ }), [props.models, props.recommendedModel, automatic, l]);
const search = useMemo(() => new Fuse(choices, {
keys: [{ name: 'nameSearch', weight: 0.7 }, { name: 'idSearch', weight: 0.3 }],
threshold: 0.3, ignoreLocation: true,
}), [choices]);
const filtered = useMemo(() => {
if (!query.trim()) {
- return [...choices.filter(choice => choice.model.id === props.value), ...choices.filter(choice => choice.model.id !== props.value)];
+ return [...choices].sort((a,b)=>Number(b.model.id===selectionValue)-Number(a.model.id===selectionValue)
+ || Number(!!b.model.recommended)-Number(!!a.model.recommended)
+ || (a.model.vendor??'').localeCompare(b.model.vendor??''));
}
const terms = query.trim().split(/\s+/).map(normalizeSearch).filter(Boolean);
if (terms.length === 0) return [];
@@ -44,9 +65,9 @@ export default function OfficialModelSelect(props: {
}).map(result => result.item);
const exact = new Set(choices.filter(choice => terms.every(term => choice.nameSearch.includes(term) || choice.idSearch.includes(term))));
return exact.size ? results.filter(choice => exact.has(choice)) : results;
- }, [choices, search, query, props.value]);
- const selected = choices.find(choice => choice.model.id === props.value);
- const selectedLabel = selected?.label ?? (props.models.length === 0 ? l('暂不可用', 'Unavailable') : l('选择模型', 'Select model'));
+ }, [choices, search, query, selectionValue]);
+ const selected = choices.find(choice => choice.model.id === selectionValue);
+ const selectedLabel = selected?.label ?? (props.value || (props.models.length === 0 ? l('暂不可用', 'Unavailable') : l('选择模型', 'Select model')));
const expanded = open && !props.disabled;
const currentIndex = Math.min(activeIndex, filtered.length - 1);
const optionId = (index: number) => `${id}-option-${index}`;
@@ -57,9 +78,10 @@ export default function OfficialModelSelect(props: {
setQuery(''); setActiveIndex(0); setOpen(true);
}
function select(value: string) {
+ if (!(value === gatewayRecommendedModelId && props.recommendedModel) && !props.models.some(model=>model.id===value&&gatewayModelReady(model)))return;
inputRef.current?.focus();
close();
- if (value !== props.value) props.onChange(value);
+ if (value !== selectionValue) props.onChange(value);
}
useEffect(() => { if (props.disabled) close(); }, [props.disabled]);
@@ -158,20 +180,26 @@ export default function OfficialModelSelect(props: {
transform: position.above ? 'translateY(-100%)' : undefined,
}}>
<div className="official-model-menu-count" role="status">
- {query.trim() ? l(`${filtered.length} 个匹配模型`, `${filtered.length} matches`) : l(`${filtered.length} 个模型`, `${filtered.length} models`)}
+ {query.trim() ? l(`${filtered.length} 个匹配项`, `${filtered.length} matches`) : l(`${props.models.length} 个模型`, `${props.models.length} models`)}
</div>
<div id={`${id}-listbox`} className="official-model-options" role="listbox" aria-label={props.label}>
- {filtered.map((choice, index) => <button key={choice.model.id} id={optionId(index)} type="button" role="option" tabIndex={-1}
- aria-label={choice.label} aria-selected={choice.model.id === props.value}
+ {filtered.map((choice, index) => <Fragment key={choice.model.id}>
+ {choice.model.vendor && choice.model.vendor !== filtered[index-1]?.model.vendor ? <div className="official-model-menu-count" role="presentation">{choice.model.vendor}</div> : null}
+ <button id={optionId(index)} type="button" role="option" tabIndex={-1}
+ aria-label={choice.label} aria-selected={choice.model.id === selectionValue}
+ disabled={!gatewayModelReady(choice.model)} aria-disabled={!gatewayModelReady(choice.model)}
className={`official-model-option${index === currentIndex ? ' is-active' : ''}`}
title={choice.label} onMouseDown={event => event.preventDefault()}
onPointerMove={event => { if (event.pointerType === 'mouse') setActiveIndex(index); }}
onClick={() => select(choice.model.id)}>
<span className="official-model-option-text"><span className="official-model-option-name">{choice.label}</span>
- {!/openrouter/i.test(choice.model.id) ? <span className="official-model-option-id">{choice.model.id}</span> : null}
+ {!/openrouter/i.test(choice.model.id) && choice.model.id !== gatewayRecommendedModelId ? <span className="official-model-option-id">{choice.model.vendor ? `${choice.model.vendor} · ` : ''}{choice.model.id}</span> : null}
+ {choice.model.price?<span className="official-model-option-id">{officialModelPrice(choice.model,l)}</span>:null}
+ {choice.model.recommended?<span className="official-model-option-id">{l('推荐','Recommended')}</span>:null}
+ {!gatewayModelReady(choice.model)?<span className="official-model-option-id">{l('暂不可用','Temporarily unavailable')}</span>:null}
</span>
- {choice.model.id === props.value ? <Check size={16} aria-hidden="true" /> : <span className="official-model-check-space" />}
- </button>)}
+ {choice.model.id === selectionValue ? <Check size={16} aria-hidden="true" /> : <span className="official-model-check-space" />}
+ </button></Fragment>)}
{filtered.length === 0 ? <div className="official-model-empty" role="status">{l('未找到匹配模型', 'No matching models')}</div> : null}
</div>
</div>, document.body) : null}
diff --git a/apps/web/src/features/account/PersonalCenterPage.test.tsx b/apps/web/src/features/account/PersonalCenterPage.test.tsx
index 80be6192..d1fd3af1 100644
--- a/apps/web/src/features/account/PersonalCenterPage.test.tsx
+++ b/apps/web/src/features/account/PersonalCenterPage.test.tsx
@@ -99,7 +99,26 @@ it('keeps model availability separate from sign-in and opens model settings', as
render(page(createService(blocked), blocked, vi.fn(), vi.fn(), 'account', settings));
expect(await screen.findByText('已登录', { exact: true })).toBeInTheDocument();
expect(screen.getByText('官方模型服务暂不可用')).toBeInTheDocument();
- expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ expect(screen.getByRole('alert')).toHaveTextContent('官方模型服务连接失败,请重新连接');
await userEvent.setup().click(screen.getByRole('button', { name: '模型设置' }));
expect(settings).toHaveBeenCalledOnce();
});
+
+it('reconnects model services from the personal center without signing in again or affecting credits', async () => {
+ const blocked: GatewayAccountState = { ...signedIn, activationState: 'blocked', activationError: { code: 'gateway_unavailable', message: 'Unavailable', stage: 'bootstrap', request: { path: '/api/v1/client/bootstrap', reason: 'timeout' } } };
+ const service = createService(blocked);
+ vi.mocked(service.activate).mockImplementation(async () => {
+ vi.mocked(service.getState).mockResolvedValue(signedIn);
+ return signedIn;
+ });
+ render(page(service, blocked));
+ expect(await screen.findByText('123')).toBeInTheDocument();
+ expect(screen.getByRole('alert')).toHaveTextContent('网关请求超时');
+ expect(screen.getByRole('alert')).toHaveTextContent('获取模型凭据');
+ await userEvent.setup().click(screen.getByRole('button', { name: '重新连接' }));
+ await waitFor(() => expect(screen.queryByText('官方模型服务暂不可用')).not.toBeInTheDocument());
+ expect(service.activate).toHaveBeenCalledOnce();
+ expect(service.start).not.toHaveBeenCalled();
+ expect(service.selectModel).not.toHaveBeenCalled();
+ expect(screen.getByText('123')).toBeInTheDocument();
+});
diff --git a/apps/web/src/features/account/PersonalCenterPage.tsx b/apps/web/src/features/account/PersonalCenterPage.tsx
index 70e2ade5..325fc6a6 100644
--- a/apps/web/src/features/account/PersonalCenterPage.tsx
+++ b/apps/web/src/features/account/PersonalCenterPage.tsx
@@ -6,6 +6,7 @@ import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
import type { GatewayAccountSettingsService } from '../../services/gateway-account-service.js';
import { GatewayAccountSettingsView } from '../settings/GatewayAccountSettingsView.js';
import { GatewaySubscriptionSettingsView } from '../settings/GatewaySubscriptionSettingsView.js';
+import { OfficialServiceRecovery } from '../settings/OfficialServiceRecovery.js';
import { AccountAvatar } from './AccountAvatar.js';
import './personal-center.css';
@@ -49,9 +50,15 @@ export default function PersonalCenterPage(props: {
/>
</section>
{modelUnavailable ? <div className="personal-center__model-status" role="status">
- <span>{state.activationState === 'loading' ? l('官方模型服务正在连接', 'Connecting to official model services') : l('官方模型服务暂不可用', 'Official model services are unavailable')}</span>
+ <span>{state.activationState === 'loading' ? l('官方模型服务正在连接', 'Connecting to official model services')
+ : state.activationError?.code === 'model_catalog_unavailable' ? l('模型列表暂时无法获取', 'The model list is temporarily unavailable')
+ : state.activationError?.code === 'no_available_models' ? l('当前没有可用的文本模型', 'No compatible text models are available')
+ : l('官方模型服务暂不可用', 'Official model services are unavailable')}</span>
{props.onOpenModelSettings ? <button type="button" onClick={props.onOpenModelSettings}><Settings2 size={15}/>{l('模型设置', 'Model settings')}</button> : null}
</div> : null}
+ {modelUnavailable && props.service ? <OfficialServiceRecovery state={state} service={props.service} onChange={next => {
+ setState(next); props.onStateChange?.(next);
+ }} /> : null}
<GatewaySubscriptionSettingsView
key={`${state?.authState}:${state?.account?.id ?? ''}`}
service={props.service} embedded accountState={state} openExternal={props.openExternal}
diff --git a/apps/web/src/features/account/billing-display.ts b/apps/web/src/features/account/billing-display.ts
index 2c20f37f..3406b381 100644
--- a/apps/web/src/features/account/billing-display.ts
+++ b/apps/web/src/features/account/billing-display.ts
@@ -1,6 +1,19 @@
import type { LocalizeCopy } from '../../i18n/useLocalizedCopy.js';
import type { GatewayBillingAvailability, GatewayRechargeOrder } from '../../services/gateway-account-service.js';
+export function formatGatewayCredits(units: string) {
+ if (!/^\d+$/.test(units)) return '?';
+ const value = BigInt(units);
+ if (value > 0n && value < 1_000_000n) return '<1';
+ return `${(value + 500_000n) / 1_000_000n}`;
+}
+
+export function formatGatewayCreditAmount(amount: number | undefined) {
+ if (amount === undefined || !Number.isFinite(amount)) return '?';
+ if (amount > 0 && amount < 1) return '<1';
+ return `${Math.round(amount)}`;
+}
+
export function billingUnavailableMessage(reason: GatewayBillingAvailability['billingUnavailableReason'], l: LocalizeCopy) {
switch (reason) {
case 'purchases_disabled': return l('当前环境暂未开放充值,仍可查看积分方案。', 'Purchases are not enabled in this environment. Credit plans are available to browse.');
diff --git a/apps/web/src/features/account/credits.test.tsx b/apps/web/src/features/account/credits.test.tsx
index cd5e2016..0760d947 100644
--- a/apps/web/src/features/account/credits.test.tsx
+++ b/apps/web/src/features/account/credits.test.tsx
@@ -22,7 +22,7 @@ function page(value: GatewayAccountSettingsService, openExternal = vi.fn(), stat
it('opens the website through a one-time account handoff without an app checkout', async () => {
const value = service(); const open = vi.fn(); render(page(value, open));
- expect(await screen.findByText('413.937')).toBeInTheDocument();
+ expect(await screen.findByText('414')).toBeInTheDocument();
expect(value.getOrders).not.toHaveBeenCalled();
await userEvent.setup().click(screen.getByRole('button', { name: '充值积分' }));
expect(value.openWebAccount).toHaveBeenCalledWith('recharge', 'zh');
@@ -36,7 +36,7 @@ it('opens the website through a one-time account handoff without an app checkout
it.each([['账单与充值记录', 'account'], ['积分用量估算', 'usage'], ['FAQ', 'faq']])('opens %s at its website destination', async (label, destination) => {
const value = service(); const open = vi.fn(); render(page(value, open));
- expect(await screen.findByText('413.937')).toBeInTheDocument();
+ expect(await screen.findByText('414')).toBeInTheDocument();
await userEvent.setup().click(screen.getByRole('button', { name: label }));
expect(value.openWebAccount).toHaveBeenCalledWith(destination, 'zh');
expect(open).toHaveBeenCalledWith(handoff);
@@ -44,15 +44,44 @@ it.each([['账单与充值记录', 'account'], ['积分用量估算', 'usage'],
it('keeps website recharge available when purchases are disabled globally', async () => {
const value = service(); vi.mocked(value.getSummary).mockResolvedValue({ ...summary, billingAvailable: false });
- render(page(value)); expect(await screen.findByText('413.937')).toBeInTheDocument();
+ render(page(value)); expect(await screen.findByText('414')).toBeInTheDocument();
expect(screen.getByRole('button', { name: '充值积分' })).toBeEnabled();
expect(screen.queryByText(/充值暂不可用/)).not.toBeInTheDocument();
});
+it('shows cached credits immediately while a slow request refreshes the balance', async () => {
+ const value = service(); let finish!: (result: GatewayBillingSummary) => void;
+ value.getCachedSummary = vi.fn(id => id === account.account!.id ? summary : undefined);
+ vi.mocked(value.getSummary).mockImplementationOnce(() => new Promise(resolve => { finish = resolve; }));
+ render(page(value));
+ expect(screen.getByText('414')).toBeInTheDocument();
+ expect(screen.queryByText('正在加载积分')).not.toBeInTheDocument();
+ expect(screen.getByText(/上次更新/)).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: '刷新积分' })).toBeDisabled();
+ await act(async () => finish({ ...summary, balance: { ...summary.balance, availableUnits: '8000000' } }));
+ expect(screen.getByText('8')).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: '刷新积分' })).toBeEnabled();
+ await userEvent.setup().click(screen.getByRole('button', { name: '刷新积分' }));
+ expect(value.getSummary).toHaveBeenCalledTimes(2);
+ expect(await screen.findByText('414')).toBeInTheDocument();
+});
+
+it('keeps cached credits visible after a failed refresh and isolates another account', async () => {
+ const value = service();
+ value.getCachedSummary = vi.fn(id => id === account.account!.id ? summary : undefined);
+ vi.mocked(value.getSummary).mockRejectedValue(new Error('offline'));
+ const view = render(page(value));
+ expect(screen.getByText('414')).toBeInTheDocument();
+ expect(await screen.findByRole('alert')).toHaveTextContent('积分信息加载失败');
+ expect(screen.getByText('414')).toBeInTheDocument();
+ await act(async () => view.rerender(page(value, vi.fn(), { ...account, account: { ...account.account!, id: 'account-b' } })));
+ expect(screen.queryByText('414')).not.toBeInTheDocument();
+});
+
it('falls back to the existing website when an older gateway lacks handoffs', async () => {
const value = service(); const open = vi.fn();
vi.mocked(value.openWebAccount!).mockRejectedValue(new ApiClientError({ status: 404, code: 'GATEWAY_UNAVAILABLE', message: 'Not found' }));
- render(page(value, open)); expect(await screen.findByText('413.937')).toBeInTheDocument();
+ render(page(value, open)); expect(await screen.findByText('414')).toBeInTheDocument();
await userEvent.setup().click(screen.getByRole('button', { name: '充值积分' }));
const url = new URL(open.mock.calls[0]![0]);
expect(url.pathname).toBe('/pricing');
@@ -64,7 +93,7 @@ it('falls back to the existing website when an older gateway lacks handoffs', as
it('rejects a handoff to an unexpected origin and permits retry', async () => {
const value = service(); const open = vi.fn();
vi.mocked(value.openWebAccount!).mockResolvedValueOnce({ url: 'https://evil.test/auth#handoff=' + 'a'.repeat(43) });
- render(page(value, open)); expect(await screen.findByText('413.937')).toBeInTheDocument();
+ render(page(value, open)); expect(await screen.findByText('414')).toBeInTheDocument();
await userEvent.setup().click(screen.getByRole('button', { name: '充值积分' }));
expect(await screen.findByRole('alert')).toHaveTextContent('网页未打开');
expect(open).not.toHaveBeenCalled();
@@ -73,7 +102,7 @@ it('rejects a handoff to an unexpected origin and permits retry', async () => {
});
it('does not claim success when returning without a confirmed order', async () => {
- const value = service(); render(page(value)); expect(await screen.findByText('413.937')).toBeInTheDocument();
+ const value = service(); render(page(value)); expect(await screen.findByText('414')).toBeInTheDocument();
await userEvent.setup().click(screen.getByRole('button', { name: '充值积分' }));
await act(async () => window.dispatchEvent(new Event('focus')));
expect(screen.queryByText(/充值成功/)).not.toBeInTheDocument();
@@ -81,7 +110,7 @@ it('does not claim success when returning without a confirmed order', async () =
});
it('finds a new website order on focus and distinguishes payment from credit completion', async () => {
- const value = service(); render(page(value)); expect(await screen.findByText('413.937')).toBeInTheDocument();
+ const value = service(); render(page(value)); expect(await screen.findByText('414')).toBeInTheDocument();
await userEvent.setup().click(screen.getByRole('button', { name: '充值积分' }));
vi.mocked(value.getOrders).mockResolvedValue({ items: [order] });
vi.mocked(value.getOrder).mockResolvedValue({ order: { ...order, status: 'processing', paymentStatus: 'paid' } });
@@ -92,7 +121,7 @@ it('finds a new website order on focus and distinguishes payment from credit com
vi.mocked(value.getSummary).mockResolvedValue({ ...summary, balance: { ...summary.balance, availableUnits: '2913937000' } });
await act(async () => window.dispatchEvent(new Event('focus')));
expect(await screen.findByText('充值成功,已到账 2500 积分')).toBeInTheDocument();
- expect(screen.getByText('2913.937')).toBeInTheDocument();
+ expect(screen.getByText('2914')).toBeInTheDocument();
expect(sessionStorage.getItem('opencreator:billing-visit:account-a')).toBeNull();
});
@@ -106,7 +135,7 @@ it('verifies the returned order under the signed-in account rather than trusting
it('restores a website visit and ignores orders that already existed', async () => {
sessionStorage.setItem('opencreator:billing-visit:account-a', JSON.stringify({ startedAt: Date.now(), knownOrders: ['old-order'] }));
const value = service(); vi.mocked(value.getOrders).mockResolvedValue({ items: [{ ...order, id: 'old-order' }] });
- render(page(value)); expect(await screen.findByText('413.937')).toBeInTheDocument();
+ render(page(value)); expect(await screen.findByText('414')).toBeInTheDocument();
await waitFor(() => expect(value.getOrders).toHaveBeenCalled());
expect(value.getOrder).not.toHaveBeenCalled();
});
@@ -114,7 +143,7 @@ it('restores a website visit and ignores orders that already existed', async ()
it('ignores a website response from the previous account', async () => {
const value = service(); const open = vi.fn(); let finish!: (value: { url: string }) => void;
vi.mocked(value.openWebAccount!).mockImplementationOnce(() => new Promise(resolve => { finish = resolve; }));
- const view = render(page(value, open)); expect(await screen.findByText('413.937')).toBeInTheDocument();
+ const view = render(page(value, open)); expect(await screen.findByText('414')).toBeInTheDocument();
await userEvent.setup().click(screen.getByRole('button', { name: '充值积分' }));
view.rerender(page(value, open, { ...account, account: { id: 'account-b', email: '[email protected]', verified: true } }));
await act(async () => finish({ url: handoff }));
diff --git a/apps/web/src/features/dashboard/DashboardPage.tsx b/apps/web/src/features/dashboard/DashboardPage.tsx
index 8e4617d7..a8200e36 100644
--- a/apps/web/src/features/dashboard/DashboardPage.tsx
+++ b/apps/web/src/features/dashboard/DashboardPage.tsx
@@ -1,6 +1,7 @@
import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
import type { CreatorJob, CreatorJson, GatewayAccountState, OpenCreatorIssue } from '@opencreator/protocol';
import { OfficialServicesContext } from './official-services.js';
+import type { GatewayAccountSettingsService } from '../../services/gateway-account-service.js';
import { useAppLanguage } from '../../i18n/LanguageProvider.js';
import { createLocalizedCopy } from '../../i18n/localized-copy.js';
import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
@@ -224,6 +225,7 @@ export default function DashboardPage(props: {
skillLaunch?: CreatorSkillLaunch;
creatorServicesService?: CreatorServicesSettingsService | null;
gatewayState?: GatewayAccountState | null;
+ gatewayAccountService?: GatewayAccountSettingsService | null;
videoMetadataService?: VideoMetadataService;
workspace?: CreatorWorkspace;
jobId?: string;
diff --git a/apps/web/src/features/dashboard/ImageGenerationWorkspace.test.tsx b/apps/web/src/features/dashboard/ImageGenerationWorkspace.test.tsx
index 21243236..99fc8e45 100644
--- a/apps/web/src/features/dashboard/ImageGenerationWorkspace.test.tsx
+++ b/apps/web/src/features/dashboard/ImageGenerationWorkspace.test.tsx
@@ -14,19 +14,20 @@ import { CreatorSessionProvider, useOptionalCreatorSession, type CreatorSessionC
import { OfficialServicesContext } from './official-services.js';
describe('ImageGenerationWorkspace', () => {
- it('uses official image metadata without changing the custom quality presets or candidate count', async () => {
+ it('uses official image metadata and constrains candidate count to the selected model', async () => {
const fixture = createFixture();
const state: GatewayAccountState = { source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: 'a@test', verified: true }, bindingVersion: '1', models: [{ id: 'vendor/image', modality: 'image', capabilities: [], imageOptions: { aspectRatios: ['16:9', '9:16'], resolutions: ['1K', '2K'], qualities: ['standard', 'hd'], outputFormats: ['jpeg'], maxImages: 1, maxReferences: 0 } }], activationError: null };
renderWorkspace(fixture, { ...fixture.currentJob(), state: { prompt: 'city', currentStep: 1, furthestStep: 1 } }, { getConfig: vi.fn() }, state);
expect(screen.getByRole('combobox', { name: '图片画幅' })).toHaveValue('16:9');
fireEvent.change(screen.getByRole('combobox', { name: '分辨率' }), { target: { value: '2K' } });
fireEvent.change(screen.getByRole('combobox', { name: '图片质量' }), { target: { value: 'hd' } });
- fireEvent.click(screen.getByRole('radio', { name: '4 张' }));
+ expect(screen.queryByRole('radio', { name: '4 张' })).not.toBeInTheDocument();
+ expect(screen.getByRole('radio', { name: '1 张' })).toHaveAttribute('aria-checked', 'true');
fireEvent.click(screen.getByRole('button', { name: '继续' }));
fireEvent.click(screen.getByRole('button', { name: '开始生成' }));
await waitFor(() => expect(fixture.applyAction).toHaveBeenCalled());
const update = fixture.applyAction.mock.calls.find(([, request]) => request.action === 'update-settings');
- expect(update?.[1].input.patch).toMatchObject({ aspectRatio: '16:9', resolution: '2K', officialQuality: 'hd', candidateCount: 4 });
+ expect(update?.[1].input.patch).toMatchObject({ aspectRatio: '16:9', resolution: '2K', officialQuality: 'hd', candidateCount: 1 });
});
it('allows only official image choices and submits the task choice without changing defaults', async () => {
const fixture = createFixture();
@@ -38,6 +39,7 @@ describe('ImageGenerationWorkspace', () => {
expect(within(screen.getByRole('listbox', { name: '图片模型' })).getAllByRole('option').map(option => option.getAttribute('aria-label'))).toEqual(['first', 'second']);
expect(screen.queryByRole('radio', { name: '本机 Codex 生图' })).not.toBeInTheDocument();
fireEvent.click(screen.getByRole('option', { name: 'second' }));
+ await waitFor(() => expect(model).toHaveValue('second'));
fireEvent.click(screen.getByRole('button', { name: '继续' }));
fireEvent.click(screen.getByRole('button', { name: '开始生成' }));
await waitFor(() => expect(fixture.applyAction).toHaveBeenCalledWith('creator_job_image_ui', expect.objectContaining({ action: 'run-stage', input: { stageId: 'generate' } })));
diff --git a/apps/web/src/features/dashboard/ImageGenerationWorkspace.tsx b/apps/web/src/features/dashboard/ImageGenerationWorkspace.tsx
index 67dd5c4a..4333e285 100644
--- a/apps/web/src/features/dashboard/ImageGenerationWorkspace.tsx
+++ b/apps/web/src/features/dashboard/ImageGenerationWorkspace.tsx
@@ -103,11 +103,13 @@ export default function ImageGenerationWorkspace(props: {
const nextRatio = imageOptions.aspectRatios?.includes(aspectRatio) ? aspectRatio : imageOptions.aspectRatios?.[0] ?? '';
const nextResolution = imageOptions.resolutions?.includes(resolution) ? resolution : imageOptions.resolutions?.[0] ?? '';
const nextQuality = imageOptions.qualities?.includes(officialQuality) ? officialQuality : imageOptions.qualities?.[0] ?? '';
+ const nextCount = Math.min(count, imageOptions.maxImages);
setAspectRatio(nextRatio); setResolution(nextResolution); setOfficialQuality(nextQuality);
- if (nextRatio !== aspectRatio || nextResolution !== resolution || nextQuality !== officialQuality) {
- session?.updateDraft({ aspectRatio: nextRatio, resolution: nextResolution, officialQuality: nextQuality });
+ if (nextCount !== count) setCount(nextCount);
+ if (nextRatio !== aspectRatio || nextResolution !== resolution || nextQuality !== officialQuality || nextCount !== count) {
+ session?.updateDraft({ aspectRatio: nextRatio, resolution: nextResolution, officialQuality: nextQuality, candidateCount: nextCount });
}
- }, [official.model?.id, imageOptions, official.taskRunning, aspectRatio, resolution, officialQuality]);
+ }, [official.model?.id, imageOptions, official.taskRunning, aspectRatio, resolution, officialQuality, count]);
const [referenceFile, setReferenceFile] = useState<File | null>(null);
const [referencePreview, setReferencePreview] = useState('');
const resultVersion = session?.job.state.resultVersion;
@@ -674,7 +676,7 @@ export default function ImageGenerationWorkspace(props: {
<div className="media-generation-control">
<span>{l('生成数量', 'Number of images')}</span>
<div className="creator-tool-segmented" role="radiogroup" aria-label={l('生成数量', 'Number of images')}>
- {(!official.official && provider === 'codex-native' ? [1] : [1, 2, 4]).map(value => (
+ {(!official.official && provider === 'codex-native' ? [1] : [1, 2, 4].filter(value => value <= (imageOptions?.maxImages ?? 4))).map(value => (
<button type="button" role="radio" aria-checked={count === value} aria-selected={count === value} key={value} onClick={() => updateCount(value)}>
{value} {l('张', value === 1 ? 'image' : 'images')}
</button>
diff --git a/apps/web/src/features/dashboard/OfficialVideoReferences.test.tsx b/apps/web/src/features/dashboard/OfficialVideoReferences.test.tsx
new file mode 100644
index 00000000..9ff4352a
--- /dev/null
+++ b/apps/web/src/features/dashboard/OfficialVideoReferences.test.tsx
@@ -0,0 +1,53 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import type { GatewayModel, VideoGenerationReference } from '@opencreator/protocol';
+import { beforeEach, expect, it, vi } from 'vitest';
+import { LanguageProvider } from '../../i18n/LanguageProvider.js';
+import OfficialVideoReferences, { readVideoReferences, videoReferenceIssue } from './OfficialVideoReferences.js';
+
+const mock = vi.hoisted(() => ({ state: {} as Record<string, unknown>, updateDraft: vi.fn(), uploadVideoReference: vi.fn(), captureCreatorFailure: vi.fn() }));
+vi.mock('./creator-session-store.js', () => ({ useOptionalCreatorSession: () => mock }));
+const assetId = `ocasset_${'a'.repeat(48)}`;
+const image: VideoGenerationReference = { role: 'image', assetId, fileName: 'reference.png' };
+const frame: VideoGenerationReference = { ...image, role: 'firstFrame' };
+function model(profile = 'google', firstLastFrames = true): GatewayModel {
+ return { id: 'video-test', modality: 'video', capabilities: ['generate'], videoOptions: { profile, maxImages: 3, maxVideos: 0, maxAudios: 0, firstLastFrames, framesExclusive: false, generateAudio: true, referenceDuration: 8 } };
+}
+beforeEach(() => { vi.clearAllMocks(); mock.state = {}; mock.uploadVideoReference.mockResolvedValue({ assetId, expiresAt: '2030-01-01T00:00:00Z' }); });
+function view(m: GatewayModel, references: VideoGenerationReference[] = []) {
+ const onError = vi.fn(); const onBusyChange = vi.fn();
+ render(<LanguageProvider initialPreference="zh-CN"><OfficialVideoReferences model={m} references={references} disabled={false} onError={onError} onBusyChange={onBusyChange} /></LanguageProvider>);
+ return { onError, onBusyChange };
+}
+
+it('validates mixed modes and model-specific reference limits', () => {
+ expect(videoReferenceIssue(model(), [image, frame])).toBe('mixed');
+ expect(videoReferenceIssue(model('wan'), [image, frame])).toBe('mixed');
+ expect(videoReferenceIssue(model(), [{ ...frame, role: 'lastFrame' }])).toBe('frames');
+ expect(videoReferenceIssue(model(), [frame, frame])).toBe('limits');
+ expect(videoReferenceIssue(model('grok', false), [frame])).toBe('limits');
+ expect(readVideoReferences([image, { ...image, assetId: 'https://private.example/image' }, null])).toEqual([image]);
+});
+
+it('allows recovery after switching to a model without first/last-frame support', () => {
+ mock.state = { videoReferenceMode: 'frames' };
+ view(model('grok', false), [frame]);
+ expect(screen.getByRole('button', { name: '首尾帧' })).toBeDisabled();
+ fireEvent.click(screen.getByRole('button', { name: '参考素材' }));
+ expect(mock.updateDraft).toHaveBeenCalledWith({ videoReferenceMode: 'references', videoReferences: [] }, { semantic: true });
+ expect(screen.getByRole('button', { name: '移除 reference.png' })).toBeEnabled();
+});
+
+it('uploads image bytes through the service and saves only the opaque reference', async () => {
+ const { onBusyChange } = view(model());
+ fireEvent.change(screen.getByLabelText('上传参考图片'), { target: { files: [new File(['png'], 'reference.png', { type: 'image/png' })] } });
+ await waitFor(() => expect(mock.updateDraft).toHaveBeenCalledWith({ videoReferences: [image] }, { semantic: true }));
+ expect(mock.uploadVideoReference).toHaveBeenCalledTimes(1);
+ expect(onBusyChange.mock.calls.map(([value]) => value)).toEqual([true, false]);
+});
+
+it('rejects unsupported formats before uploading', () => {
+ const { onError } = view(model());
+ fireEvent.change(screen.getByLabelText('上传参考图片'), { target: { files: [new File(['text'], 'bad.txt', { type: 'text/plain' })] } });
+ expect(onError).toHaveBeenCalledWith(expect.stringContaining('文件格式不支持'));
+ expect(mock.uploadVideoReference).not.toHaveBeenCalled();
+});
diff --git a/apps/web/src/features/dashboard/OfficialVideoReferences.tsx b/apps/web/src/features/dashboard/OfficialVideoReferences.tsx
new file mode 100644
index 00000000..870b5b50
--- /dev/null
+++ b/apps/web/src/features/dashboard/OfficialVideoReferences.tsx
@@ -0,0 +1,96 @@
+import { LoaderCircle, Plus, X } from 'lucide-react';
+import { useState } from 'react';
+import type { GatewayModel, VideoGenerationReference } from '@opencreator/protocol';
+import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
+import { useOptionalCreatorSession } from './creator-session-store.js';
+
+export function readVideoReferences(value: unknown): VideoGenerationReference[] {
+ if (!Array.isArray(value)) return [];
+ return value.filter((ref): ref is VideoGenerationReference => !!ref && typeof ref === 'object'
+ && ['image','video','audio','firstFrame','lastFrame'].includes(ref.role)
+ && typeof ref.assetId === 'string' && /^ocasset_[a-f0-9]{48}$/.test(ref.assetId) && typeof ref.fileName === 'string');
+}
+
+export function videoReferenceIssue(model: GatewayModel | undefined, refs: VideoGenerationReference[], legacyImage = false): 'limits' | 'frames' | 'mixed' | 'audio' | undefined {
+ const options = model?.videoOptions;
+ if (!options) return refs.length ? 'limits' : undefined;
+ const count = (role: VideoGenerationReference['role']) => refs.filter(ref => ref.role === role).length;
+ const images = count('image') + Number(legacyImage);
+ const frames = count('firstFrame') + count('lastFrame');
+ if (images > options.maxImages || count('video') > options.maxVideos || count('audio') > options.maxAudios || count('firstFrame') > 1 || count('lastFrame') > 1 || frames && !options.firstLastFrames) return 'limits';
+ if (count('lastFrame') && !count('firstFrame')) return 'frames';
+ if (frames && options.framesExclusive && images + count('video') + count('audio') > 0) return 'mixed';
+ if (frames && images && ['google', 'wan'].includes(options.profile)) return 'mixed';
+ if (options.profile === 'kling' && images + frames > options.maxImages || options.profile === 'sd' && images + count('video') + count('audio') > 12) return 'limits';
+ if (options.profile === 'minimax' && count('audio') && !images) return 'audio';
+ if (options.profile === 'omni' && count('video') === 1 && !images) return 'mixed';
+ return undefined;
+}
+
+export default function OfficialVideoReferences(props: {
+ model: GatewayModel; references: VideoGenerationReference[]; disabled: boolean;
+ onBusyChange(busy: boolean): void; onError(message: string): void;
+}) {
+ const l = useLocalizedCopy();
+ const session = useOptionalCreatorSession();
+ const [uploading, setUploading] = useState(false);
+ const options = props.model.videoOptions!;
+ const imageAccept = options.profile === 'google' ? 'image/jpeg,image/png' : 'image/jpeg,image/png,image/webp';
+ const frames = !!options.firstLastFrames && session?.state.videoReferenceMode === 'frames' || props.references.some(ref => ref.role === 'firstFrame' || ref.role === 'lastFrame');
+ const roles: Array<{ role: VideoGenerationReference['role']; label: string; limit: number; accept: string; maxBytes: number }> = frames ? [
+ { role: 'firstFrame', label: l('首帧', 'First frame'), limit: 1, accept: imageAccept, maxBytes: 5 * 1024 * 1024 },
+ { role: 'lastFrame', label: l('尾帧', 'Last frame'), limit: 1, accept: imageAccept, maxBytes: 5 * 1024 * 1024 }
+ ] : [
+ { role: 'image', label: l('参考图片', 'Reference images'), limit: options.maxImages, accept: imageAccept, maxBytes: 5 * 1024 * 1024 },
+ { role: 'video', label: l('参考视频', 'Reference videos'), limit: options.maxVideos, accept: 'video/mp4,video/webm,video/quicktime', maxBytes: 50_000_000 },
+ { role: 'audio', label: l('参考音频', 'Reference audio'), limit: options.maxAudios, accept: 'audio/mpeg,audio/wav,audio/ogg,audio/mp4,audio/flac', maxBytes: 15_000_000 }
+ ];
+ const disabled = props.disabled || uploading;
+
+ async function upload(files: File[], role: typeof roles[number]) {
+ if (!session?.uploadVideoReference || disabled || !files.length) return;
+ const selected = props.references.filter(ref => ref.role === role.role);
+ if (files.length + selected.length > role.limit) { props.onError(l(`最多添加 ${role.limit} 个${role.label}`, `Maximum ${role.limit} files for ${role.label.toLowerCase()}`)); return; }
+ if (files.some(file => !role.accept.split(',').includes(file.type) || file.size < 1 || file.size > role.maxBytes)) {
+ props.onError(l(`文件格式不支持或超过 ${Math.floor(role.maxBytes / 1_000_000)}MB`, `Unsupported file format or file exceeds ${Math.floor(role.maxBytes / 1_000_000)} MB`)); return;
+ }
+ setUploading(true); props.onBusyChange(true); props.onError('');
+ let next = [...props.references];
+ try {
+ for (const file of files) {
+ const receipt = await session.uploadVideoReference(file);
+ next = [...next, { role: role.role, fileName: file.name, assetId: receipt.assetId }];
+ session.updateDraft({ videoReferences: next }, { semantic: true });
+ }
+ } catch (error) {
+ session.captureCreatorFailure('video-generation.upload-reference', error, l('参考素材上传失败,请重试', 'Reference upload failed. Retry.'), 'upload');
+ } finally { setUploading(false); props.onBusyChange(false); }
+ }
+
+ function setMode(nextFrames: boolean) {
+ session?.updateDraft({ videoReferenceMode: nextFrames ? 'frames' : 'references', videoReferences: [] }, { semantic: true });
+ }
+
+ return <div className="official-video-references">
+ {options.firstLastFrames || frames ? <div className="official-video-modes" role="group" aria-label={l('参考模式', 'Reference mode')}>
+ <button type="button" aria-pressed={!frames} disabled={disabled} onClick={() => setMode(false)}>{l('参考素材', 'References')}</button>
+ <button type="button" aria-pressed={frames} disabled={disabled || !options.firstLastFrames} onClick={() => setMode(true)}>{l('首尾帧', 'First and last frames')}</button>
+ </div> : null}
+ <div className="official-video-reference-fields">
+ {roles.filter(role => role.limit > 0 || props.references.some(ref => ref.role === role.role)).map(role => <div className="official-video-reference-field" key={role.role}>
+ <span>{role.label} <small>{props.references.filter(ref => ref.role === role.role).length}/{role.limit}</small></span>
+ <ul>{props.references.filter(ref => ref.role === role.role).map(ref => <li key={ref.assetId}>
+ <span title={ref.fileName}>{ref.fileName}</span>
+ <button type="button" title={l('移除素材', 'Remove reference')} aria-label={l(`移除 ${ref.fileName}`, `Remove ${ref.fileName}`)} disabled={disabled}
+ onClick={() => session?.updateDraft({ videoReferences: props.references.filter(item => item.assetId !== ref.assetId) }, { semantic: true })}><X size={14} /></button>
+ </li>)}</ul>
+ <label className="official-video-reference-add" aria-disabled={disabled || !session?.uploadVideoReference || props.references.filter(ref => ref.role === role.role).length >= role.limit}>
+ <input type="file" accept={role.accept} multiple={role.limit > 1} disabled={disabled || !session?.uploadVideoReference || props.references.filter(ref => ref.role === role.role).length >= role.limit}
+ aria-label={l(`上传${role.label}`, `Upload ${role.label.toLowerCase()}`)} onChange={event => { const files = Array.from(event.target.files ?? []); event.target.value = ''; void upload(files, role); }} />
+ {uploading ? <LoaderCircle size={15} className="smart-dubbing-spinner" /> : <Plus size={15} />}
+ {l('添加', 'Add')}
+ </label>
+ </div>)}
+ </div>
+ </div>;
+}
diff --git a/apps/web/src/features/dashboard/SmartDubbingWorkspace.test.tsx b/apps/web/src/features/dashboard/SmartDubbingWorkspace.test.tsx
new file mode 100644
index 00000000..567db26d
--- /dev/null
+++ b/apps/web/src/features/dashboard/SmartDubbingWorkspace.test.tsx
@@ -0,0 +1,18 @@
+import { cleanup, fireEvent, render, screen } from '@testing-library/react';
+import { afterEach, expect, it, vi } from 'vitest';
+import type { GatewayAccountState } from '@opencreator/protocol';
+import { LanguageProvider } from '../../i18n/LanguageProvider.js';
+import { OfficialServicesContext } from './official-services.js';
+import SmartDubbingWorkspace from './SmartDubbingWorkspace.js';
+
+afterEach(cleanup);
+
+it.each([false, true])('opens speech style and speed only when the selected official model supports them (%s)', supported => {
+ const state: GatewayAccountState = { source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: 'a@test', verified: true },
+ bindingVersion: '1', activationError: null, models: [{ id: 'gemini-3.1-tts', modality: 'speech', voices: ['Kore'], capabilities: supported ? ['speech_instructions', 'speech_speed'] : [] }] };
+ render(<LanguageProvider initialPreference="zh-CN"><OfficialServicesContext.Provider value={state}><SmartDubbingWorkspace onBack={vi.fn()} /></OfficialServicesContext.Provider></LanguageProvider>);
+ fireEvent.change(screen.getByRole('textbox', { name: '配音文案内容' }), { target: { value: 'hello' } });
+ fireEvent.click(screen.getByRole('button', { name: '继续' }));
+ expect(screen.queryByRole('radiogroup', { name: '表达风格' }) !== null).toBe(supported);
+ expect(screen.queryByRole('slider') !== null).toBe(supported);
+});
diff --git a/apps/web/src/features/dashboard/SmartDubbingWorkspace.tsx b/apps/web/src/features/dashboard/SmartDubbingWorkspace.tsx
index cddd3091..c25511cd 100644
--- a/apps/web/src/features/dashboard/SmartDubbingWorkspace.tsx
+++ b/apps/web/src/features/dashboard/SmartDubbingWorkspace.tsx
@@ -66,6 +66,8 @@ export default function SmartDubbingWorkspace(props: {
const l = useLocalizedCopy();
const session = useOptionalCreatorSession();
const official = useOfficialServices('speech');
+ const supportsStyle = !official.official || official.model?.capabilities.includes('speech_instructions') === true;
+ const supportsSpeed = !official.official || official.model?.capabilities.includes('speech_speed') === true;
const restoredResult = session?.job.artifacts.some(artifact => (
artifact.kind === 'dubbed_audio' && artifact.status === 'completed'
)) === true;
@@ -110,7 +112,9 @@ export default function SmartDubbingWorkspace(props: {
useEffect(() => {
if (official.official) {
- setProvider('openai'); setModel(official.model?.id ?? ''); setStyle('natural'); setSpeed(1);
+ setProvider('openai'); setModel(official.model?.id ?? '');
+ if (!supportsStyle) setStyle('natural');
+ if (!supportsSpeed) setSpeed(1);
const voices = official.model?.voices ?? [];
if (!voices.includes(voice)) { setVoice(voices[0] ?? ''); setVoiceName(voices[0] ?? ''); }
return;
@@ -146,7 +150,7 @@ export default function SmartDubbingWorkspace(props: {
);
});
return () => { active = false; };
- }, [props.creatorServicesService, session?.job.id, official.official, official.model?.id]);
+ }, [props.creatorServicesService, session?.job.id, official.official, official.model?.id, supportsStyle, supportsSpeed]);
useEffect(() => {
if (session === null || result === undefined) {
@@ -461,18 +465,17 @@ export default function SmartDubbingWorkspace(props: {
onVoiceResolved={selectedVoice => setVoiceName(selectedVoice.name)}
/>
</div>
- {!official.official ? <><div className="smart-dubbing-control-group">
+ {supportsStyle ? <div className="smart-dubbing-control-group">
<span>{l('表达风格', 'Delivery style')}</span>
<div className="creator-tool-segmented smart-dubbing-style-options" role="radiogroup" aria-label={l('表达风格', 'Delivery style')}>
{styles.map(item => <button type="button" role="radio" aria-checked={style === item.value} aria-selected={style === item.value} key={item.value} onClick={() => updateStyle(item.value)}>{l(item.zh, item.en)}</button>)}
</div>
- </div>
- <label className="smart-dubbing-speed">
+ </div> : null}
+ {supportsSpeed ? <label className="smart-dubbing-speed">
<span><span><Gauge size={15} strokeWidth={1.8} aria-hidden="true" />{l('语速', 'Speaking rate')}</span><output>{speed.toFixed(2)}x</output></span>
<input type="range" min="0.75" max="1.25" step="0.05" value={speed} onChange={event => updateSpeed(Number(event.target.value))} />
<small><span>0.75x</span><span>1.00x</span><span>1.25x</span></small>
- </label>
- </> : null}
+ </label> : null}
<div className="smart-dubbing-control-group">
<span>{l('音频格式', 'Audio format')}</span>
<div className="creator-tool-segmented smart-dubbing-format-options" role="radiogroup" aria-label={l('音频格式', 'Audio format')}>
diff --git a/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx b/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx
index 89a116b2..867d3c77 100644
--- a/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx
+++ b/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx
@@ -30,6 +30,8 @@ import { useLocalizedCopy, type LocalizeCopy } from '../../i18n/useLocalizedCopy
import { publicErrorReason } from '../issues/issue-catalog.js';
import NativeSelect from '../../components/forms/NativeSelect.js';
import { OfficialModelField, useOfficialServices } from './official-services.js';
+import OfficialVideoReferences, { readVideoReferences, videoReferenceIssue } from './OfficialVideoReferences.js';
+import { formatGatewayCreditAmount } from '../account/billing-display.js';
import type { CreatorServicesSettingsService } from '../../services/creator-services-service.js';
import CreatorResultVersionMenu from './CreatorResultVersionMenu.js';
import { CreatorTaskProgressNotice } from './CreatorCollaborationPanel.js';
@@ -132,6 +134,8 @@ export default function VideoGenerationWorkspace(props: {
const [previewFailed, setPreviewFailed] = useState(false);
const [error, setError] = useState('');
const [notice, setNotice] = useState('');
+ const [uploadingVideoReference, setUploadingVideoReference] = useState(false);
+ const videoReferences = readVideoReferences(session?.state.videoReferences);
const [taskControlPending, setTaskControlPending] = useState<'canceling' | 'resuming'>();
const characterCount = useMemo(() => [...prompt.trim()].length, [prompt]);
const selectedProvider = official.official ? { zh: '官方服务', en: 'Official service' } : providers.find(item => item.value === provider) ?? providers[0]!;
@@ -143,8 +147,12 @@ export default function VideoGenerationWorkspace(props: {
const selectedModelLabel = videoModelLabel(activeModel);
const availableSizes = official.official ? gatewayVideoSizes(official.model).map(videoSizeOption) : sizes;
const selectedSize = availableSizes.find(item => item.value === size) ?? videoSizeOption(size);
- const durations = official.official ? official.model?.durations ?? [] : providerDurations[provider];
- const serviceReady = !official.official || (official.ready && availableSizes.length > 0 && durations.length > 0);
+ const referenceDuration = official.model?.videoOptions?.referenceDuration;
+ const hasReferenceImage = !!referenceImageFile || (session?.job.artifacts ?? []).some(artifact => artifact.id === session?.state.referenceImageArtifactId && artifact.kind === 'reference_image') || videoReferences.some(ref => ref.role === 'image');
+ const durations = official.official ? (official.model?.durations ?? []).filter(value => !referenceDuration || !hasReferenceImage || value === referenceDuration) : providerDurations[provider];
+ const serviceReady = !uploadingVideoReference && (!official.official || (official.ready && availableSizes.length > 0 && durations.length > 0));
+ const quotedUnitsPerSecond = official.model?.price?.videoUnitsPerSecond?.[size.split('@')[0]!];
+ const quotedCredits = quotedUnitsPerSecond === undefined ? undefined : quotedUnitsPerSecond * duration / 1_000_000;
const resultVersions = useMemo(
() => createVideoResultVersions(session?.job.artifacts ?? [], session?.state.resultSnapshots),
[session?.job.artifacts, session?.state.resultSnapshots]
@@ -448,6 +456,11 @@ export default function VideoGenerationWorkspace(props: {
openStep(0);
return;
}
+ const referenceIssue = official.official ? videoReferenceIssue(official.model, videoReferences, !!currentReferenceName) : undefined;
+ if (referenceIssue) {
+ setError(referenceIssue === 'frames' ? l('请先添加首帧', 'Add a first frame before a last frame') : referenceIssue === 'mixed' ? l('首尾帧不能与参考素材同时使用', 'First and last frames cannot be combined with reference media') : referenceIssue === 'audio' ? l('参考音频需要搭配参考图片', 'Reference audio requires reference images') : l('参考素材超出当前模型支持范围,请移除多余素材', 'Reference media exceeds the selected model limits. Remove unsupported references.'));
+ openStep(0); return;
+ }
setError('');
setNotice('');
session.updateDraft({
@@ -456,6 +469,7 @@ export default function VideoGenerationWorkspace(props: {
model: activeModel,
size,
duration,
+ ...(official.official ? { videoPriceVersion: official.model?.price?.version ?? null, generateAudio: official.model?.videoOptions?.generateAudio ? session.state.generateAudio ?? true : null } : {}),
...(official.official ? official.draftPatch : {})
}, { semantic: true });
try {
@@ -657,8 +671,8 @@ export default function VideoGenerationWorkspace(props: {
</div>
<small>{characterCount} / {creatorPromptMaxLength}</small>
</div>
- <div className="video-generation-prompt-inputs">
- <div className="video-reference-field">
+ <div className={`video-generation-prompt-inputs${official.model?.videoOptions && !currentReferenceName ? ' has-official-references' : ''}`}>
+ {!official.model?.videoOptions || currentReferenceName ? <div className="video-reference-field">
<span className="video-reference-label">{l('参考图', 'Reference')}</span>
<div className="video-reference-upload-wrap">
<label className="video-reference-upload" title={l('上传 JPG、PNG 或 WebP 图片,最大 5MB', 'Upload a JPG, PNG, or WebP image up to 5 MB')}>
@@ -694,7 +708,7 @@ export default function VideoGenerationWorkspace(props: {
<small className="video-reference-meta" title={currentReferenceName ?? l('支持 JPG、PNG、WebP,最大 5MB', 'JPG, PNG, or WebP, up to 5 MB')}>
{currentReferenceName ?? l('选填', 'Optional')}
</small>
- </div>
+ </div> : null}
<label className="creator-tool-field">
<span>{l('提示词', 'Prompt')}</span>
<textarea
@@ -709,6 +723,7 @@ export default function VideoGenerationWorkspace(props: {
/>
</label>
</div>
+ {official.official && official.model?.videoOptions ? <OfficialVideoReferences model={official.model} references={videoReferences} disabled={generating} onBusyChange={setUploadingVideoReference} onError={setError} /> : null}
<button className="smart-dubbing-sample" type="button" onClick={() => updatePrompt(l(samplePromptZh, samplePromptEn))}>
<WandSparkles size={14} strokeWidth={1.8} />
{l('填入示例提示词', 'Use sample prompt')}
@@ -725,7 +740,7 @@ export default function VideoGenerationWorkspace(props: {
</div>
</div>
<div className={`video-generation-settings-grid${official.official ? ' is-official' : ''}`}>
- {official.official ? <OfficialModelField label={l('视频模型', 'Video model')} service={official} disabled={generating} /> : <>
+ {official.official ? <OfficialModelField label={l('视频模型', 'Video model')} service={official} disabled={generating || uploadingVideoReference} /> : <>
<label className="creator-tool-field">
<span>{l('视频服务', 'Video provider')}</span>
<NativeSelect value={provider} onChange={event => updateProvider(event.target.value as VideoGenerationProvider)}>
@@ -763,6 +778,8 @@ export default function VideoGenerationWorkspace(props: {
</NativeSelect>
</label>
</div>
+ {official.official && official.model?.videoOptions?.generateAudio ? <label className="official-video-audio"><input type="checkbox" checked={session?.state.generateAudio !== false} disabled={generating} onChange={event => session?.updateDraft({ generateAudio: event.target.checked }, { semantic: true })} />{l('生成音频', 'Generate audio')}</label> : null}
+ {quotedCredits !== undefined ? <output className="official-video-quote" aria-label={l('积分报价', 'Credit quote')}>{l(`本次消耗 ${formatGatewayCreditAmount(quotedCredits)} 积分`, `This generation costs ${formatGatewayCreditAmount(quotedCredits)} credits`)}</output> : null}
<div className="media-generation-setting-note">
<Film size={17} strokeWidth={1.7} />
<span>
@@ -912,6 +929,7 @@ export default function VideoGenerationWorkspace(props: {
</div>
<footer className="video-translation-wizard-actions media-generation-actions" aria-label={l('视频生成操作', 'Video generation actions')}>
+ {currentStep === 2 && quotedCredits !== undefined && !generating ? <output className="official-video-quote">{l(`${formatGatewayCreditAmount(quotedCredits)} 积分`, `${formatGatewayCreditAmount(quotedCredits)} credits`)}</output> : null}
<button
className="video-translation-secondary-action"
type="button"
diff --git a/apps/web/src/features/dashboard/creator-session-store.tsx b/apps/web/src/features/dashboard/creator-session-store.tsx
index 7dfe4c2d..a94f2064 100644
--- a/apps/web/src/features/dashboard/creator-session-store.tsx
+++ b/apps/web/src/features/dashboard/creator-session-store.tsx
@@ -68,6 +68,7 @@ export type CreatorSessionContextValue = {
resumeJob(): Promise<void>;
uploadSourceVideo(file: File): Promise<void>;
uploadReferenceImage(file: File): Promise<void>;
+ uploadVideoReference?(file: File): Promise<{ assetId: string; expiresAt: string }>;
uploadArticleImage(file: File): Promise<CreatorArtifact>;
uploadSourceDocument(file: File): Promise<void>;
openArtifact(artifactId: string): Promise<Response>;
@@ -171,6 +172,7 @@ export function CreatorSessionProvider(props: {
| 'openDownloadThumbnail'
| 'openSubtitlePreview'
| 'uploadReferenceImage'
+ | 'uploadVideoReference'
| 'uploadArticleImage'
| 'uploadSourceVideo'
| 'uploadSourceDocument'
@@ -997,6 +999,7 @@ export function CreatorSessionProvider(props: {
cancelJob,
resumeJob,
uploadReferenceImage,
+ uploadVideoReference: props.service.uploadVideoReference,
uploadSourceDocument,
uploadSourceVideo,
uploadArticleImage,
@@ -1013,7 +1016,7 @@ export function CreatorSessionProvider(props: {
steerAgentTurn,
interruptAgentTurn,
respondAgentApproval
- }), [connection, reconnect, agentBusy, agentSession, askPendingIssue, applyAction, applyRemoteSnapshot, approvals, cancelJob, captureCreatorFailure, clearError, confirmedJob, conflictedFields, draft, error, flush, focusIssue, focusedIssue, interruptAgentTurn, issues, items, openArtifact, openDownloadThumbnail, openArtifactJson, preflight, props.service.openSubtitlePreview, repairIssue, respondAgentApproval, resumeJob, runAgentTurn, runPreflight, steerAgentTurn, turns, updateDraft, uploadArticleImage, uploadReferenceImage, uploadSourceDocument, uploadSourceVideo]);
+ }), [connection, reconnect, agentBusy, agentSession, askPendingIssue, applyAction, applyRemoteSnapshot, approvals, cancelJob, captureCreatorFailure, clearError, confirmedJob, conflictedFields, draft, error, flush, focusIssue, focusedIssue, interruptAgentTurn, issues, items, openArtifact, openDownloadThumbnail, openArtifactJson, preflight, props.service.openSubtitlePreview, props.service.uploadVideoReference, repairIssue, respondAgentApproval, resumeJob, runAgentTurn, runPreflight, steerAgentTurn, turns, updateDraft, uploadArticleImage, uploadReferenceImage, uploadSourceDocument, uploadSourceVideo]);
return (
<CreatorSessionContext.Provider value={value}>
diff --git a/apps/web/src/features/dashboard/official-services.css b/apps/web/src/features/dashboard/official-services.css
index 9ec082da..a2de2b4a 100644
--- a/apps/web/src/features/dashboard/official-services.css
+++ b/apps/web/src/features/dashboard/official-services.css
@@ -17,6 +17,28 @@
grid-template-columns: repeat(3, minmax(0, 1fr));
}
+.official-model-error { color: var(--danger, #c43c45); overflow-wrap: anywhere; white-space: pre-line; }
+
+.video-generation-prompt-inputs.has-official-references { grid-template-columns: minmax(0, 1fr); }
+.official-video-references { display: grid; gap: 12px; min-width: 0; padding-top: 12px; border-top: 1px solid var(--border); }
+.official-video-modes { display: flex; flex-wrap: wrap; gap: 4px; }
+.official-video-modes button { padding: 6px 12px; border: 1px solid var(--border); border-radius: 4px; color: var(--text); background: var(--surface-2); font-size: 12px; }
+.official-video-modes button[aria-pressed="true"] { background: var(--text); color: var(--surface); }
+.official-video-reference-fields { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(200px, 100%), 1fr)); gap: 14px; }
+.official-video-reference-field { display: grid; align-content: start; gap: 8px; min-width: 0; font-size: 12px; }
+.official-video-reference-field > span { display: flex; justify-content: space-between; gap: 8px; }
+.official-video-reference-field small { color: var(--text-muted); }
+.official-video-reference-field ul { list-style: none; display: grid; gap: 5px; margin: 0; padding: 0; }
+.official-video-reference-field li { display: flex; align-items: center; gap: 8px; min-width: 0; }
+.official-video-reference-field li span { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.official-video-reference-field li button { display: grid; place-items: center; flex: 0 0 26px; width: 26px; height: 26px; border: 0; background: transparent; color: var(--text-muted); }
+.official-video-reference-add { display: inline-flex; align-items: center; justify-self: start; position: relative; gap: 6px; padding: 6px 10px; border: 1px solid var(--border); border-radius: 4px; cursor: pointer; }
+.official-video-reference-add input { position: absolute; width: 1px; height: 1px; opacity: 0; }
+.official-video-reference-add[aria-disabled="true"] { opacity: .5; cursor: default; }
+.official-video-reference-add:focus-within { outline: 2px solid var(--text-muted); outline-offset: 2px; }
+.official-video-quote { color: var(--text); font-size: 13px; overflow-wrap: anywhere; }
+.official-video-audio { display: inline-flex; align-items: center; gap: 8px; font-size: 13px; }
+
@media (max-width: 760px) {
.video-generation-settings-grid.is-official { grid-template-columns: minmax(0, 1fr); }
}
diff --git a/apps/web/src/features/dashboard/official-services.test.tsx b/apps/web/src/features/dashboard/official-services.test.tsx
new file mode 100644
index 00000000..ee11a947
--- /dev/null
+++ b/apps/web/src/features/dashboard/official-services.test.tsx
@@ -0,0 +1,49 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { useState } from 'react';
+import { beforeEach, expect, it, vi } from 'vitest';
+import type { GatewayAccountState, GatewayModel } from '@opencreator/protocol';
+import { LanguageProvider } from '../../i18n/LanguageProvider.js';
+import { OfficialModelField, OfficialServicesContext, useOfficialServices } from './official-services.js';
+
+const fixture = vi.hoisted(() => ({ state: {} as Record<string, unknown>, updateDraft: vi.fn() }));
+vi.mock('./creator-session-store.js', () => ({ useOptionalCreatorSession: () => {
+ const [state, setState] = useState(fixture.state);
+ return { state, updateDraft(patch: Record<string, unknown>) { fixture.updateDraft(patch); setState(current => ({ ...current, ...patch })); }, job: { id: 'draft', status: 'draft', stages: [] } };
+} }));
+beforeEach(() => { fixture.updateDraft.mockReset(); });
+
+function mount(modality: GatewayModel['modality'], selected = 'vendor/first', transport?: GatewayAccountState['transport']) {
+ fixture.state = { officialModels: { [modality]: selected } };
+ fixture.updateDraft.mockImplementation(patch => { fixture.state = { ...fixture.state, ...patch }; });
+ const state: GatewayAccountState = { source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: 'a@test', verified: true }, bindingVersion: '1', activationError: null,
+ transport, selectedModels: { [modality]: 'vendor/first' }, models: ['first', 'second'].map(name => ({ id: `vendor/${name}`, modality, capabilities: modality === 'transcription' ? ['subtitle_timestamps'] : ['responses','chat'] })) };
+ function Field() {
+ const service = useOfficialServices(modality);
+ return <><OfficialModelField label="Model" service={service} /><button disabled={!service.ready}>Start</button></>;
+ }
+ return render(<LanguageProvider initialPreference="zh-CN"><OfficialServicesContext.Provider value={state}><Field /></OfficialServicesContext.Provider></LanguageProvider>);
+}
+
+it.each(['text', 'image', 'video', 'speech', 'transcription'] as const)('saves a catalog-compatible %s task model without inference', async modality => {
+ mount(modality);
+ fireEvent.click(screen.getByRole('combobox', { name: 'Model' }));
+ fireEvent.click(screen.getByRole('option', { name: 'second' }));
+ await waitFor(() => expect(screen.getByRole('combobox', { name: 'Model' })).toHaveValue('second'));
+ expect(screen.getByRole('button', { name: 'Start' })).toBeEnabled();
+ expect(fixture.updateDraft).toHaveBeenCalledWith({ officialModels: { [modality]: 'vendor/second' } });
+});
+
+it('does not change an existing choice during initial model display', () => {
+ mount('text');
+ expect(fixture.updateDraft).not.toHaveBeenCalled();
+});
+
+it('keeps a removed task choice visible and lets the user replace it without silently changing the draft', async () => {
+ mount('text', 'removed-model', 'gateway');
+ expect(screen.getByRole('combobox', { name: 'Model' })).toHaveValue('removed-model');
+ expect(screen.getByRole('button', { name: 'Start' })).toBeDisabled();
+ expect(fixture.updateDraft).not.toHaveBeenCalled();
+ fireEvent.click(screen.getByRole('combobox', { name: 'Model' }));
+ fireEvent.click(screen.getByRole('option', { name: 'second' }));
+ await waitFor(() => expect(screen.getByRole('button', { name: 'Start' })).toBeEnabled());
+});
diff --git a/apps/web/src/features/dashboard/official-services.tsx b/apps/web/src/features/dashboard/official-services.tsx
index 6a871bcc..52899e08 100644
--- a/apps/web/src/features/dashboard/official-services.tsx
+++ b/apps/web/src/features/dashboard/official-services.tsx
@@ -1,5 +1,5 @@
import { createContext, useContext, useEffect } from 'react';
-import type { CreatorJson, GatewayAccountState, GatewayModel } from '@opencreator/protocol';
+import { gatewayModelReady, gatewayModelSupports, type CreatorJson, type GatewayAccountState, type GatewayModel } from '@opencreator/protocol';
import OfficialModelSelect, { officialModelLabel } from '../../components/forms/OfficialModelSelect.js';
import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
import { useOptionalCreatorSession } from './creator-session-store.js';
@@ -11,38 +11,41 @@ export function useOfficialServices(modality: GatewayModel['modality']) {
const state = useContext(OfficialServicesContext);
const session = useOptionalCreatorSession();
const official = state === null || (state !== undefined && (state.source === 'gateway' || state.authState !== 'signed_out'));
- const models = state?.models.filter(model => model.modality === modality && (modality !== 'text' || model.capabilities.includes('responses'))) ?? [];
+ const models = state?.models.filter(model => model.modality === modality
+ && (state.transport !== 'gateway' || gatewayModelSupports(model, modality))) ?? [];
const choices = session?.state.officialModels;
- const saved = choices && typeof choices === 'object' && !Array.isArray(choices) ? choices[modality] : undefined;
+ const rawSaved = choices && typeof choices === 'object' && !Array.isArray(choices) ? choices[modality] : undefined;
+ const saved = typeof rawSaved === 'string' ? rawSaved : undefined;
const taskRunning = session?.job.status === 'running' || session?.job.stages.some(stage => stage.status === 'queued' || stage.status === 'running');
const taskChoices: Record<string, CreatorJson> = {};
for (const candidate of state?.models ?? []) {
- if (candidate.modality === 'text' && !candidate.capabilities.includes('responses')) continue;
+ if (!gatewayModelReady(candidate))continue;
const taskChoice = choices && typeof choices === 'object' && !Array.isArray(choices) ? choices[candidate.modality] : undefined;
if (!(candidate.modality in taskChoices) || candidate.id === state?.selectedModels?.[candidate.modality] || candidate.id === taskChoice) taskChoices[candidate.modality] = candidate.id;
}
if (choices && typeof choices === 'object' && !Array.isArray(choices)) Object.assign(taskChoices, choices);
const selected = saved ?? state?.selectedModels?.[modality];
- const model = models.find(candidate => candidate.id === selected) ?? models[0];
- const ready = state?.authState === 'signed_in' && state.activationState === 'ready' && model !== undefined;
+ const model = models.find(candidate => candidate.id === selected) ?? (!selected && state?.transport !== 'gateway' ? models[0] : undefined);
+ const selectable = state?.authState === 'signed_in' && state.activationState === 'ready' && models.some(gatewayModelReady);
+ const ready = selectable && model !== undefined && gatewayModelReady(model);
useEffect(() => {
- if (ready && official && !taskRunning && model && saved !== model.id) selectModel(model.id);
+ if (ready && official && !taskRunning && model && saved !== model.id) session?.updateDraft({ officialModels: { ...taskChoices, [modality]: model.id } });
}, [official, ready, saved, model?.id, session?.job.id, taskRunning]);
function selectModel(id: string) {
- if (!ready || taskRunning || !models.some(candidate => candidate.id === id)) return;
+ if (!selectable || taskRunning || !models.some(candidate => candidate.id === id && gatewayModelReady(candidate))) return;
session?.updateDraft({ officialModels: { ...taskChoices, [modality]: id } });
}
const draftPatch: Record<string, CreatorJson> = model ? { officialModels: { ...taskChoices, [modality]: model.id } } : {};
- return { official, ready, models, model, selectModel, draftPatch, taskRunning };
+ return { official, ready, selectable, models, model, selected, selectModel, draftPatch, taskRunning };
}
export function OfficialModelField(props: { label: string; service: ReturnType<typeof useOfficialServices>; disabled?: boolean }) {
const l = useLocalizedCopy();
- const { models, model, ready } = props.service;
+ const { models, model } = props.service;
const label = model ? officialModelLabel(model, l('自动选择', 'Automatic')) : l('暂不可用', 'Unavailable');
return <label className="creator-tool-field">
<span>{props.label}</span>
- {models.length === 1 && ready ? <output className="official-model-value" aria-label={props.label}>{label}</output> :
- <OfficialModelSelect label={props.label} models={models} value={model?.id ?? ''} disabled={!ready || props.disabled || props.service.taskRunning} onChange={props.service.selectModel} />}
+ {models.length === 1 && props.service.ready ? <output className="official-model-value" aria-label={props.label}>{label}</output> :
+ <OfficialModelSelect label={props.label} models={models} value={props.service.selected ?? model?.id ?? ''} disabled={!props.service.selectable || props.disabled || props.service.taskRunning} onChange={props.service.selectModel} />}
</label>;
}
diff --git a/apps/web/src/features/issues/issue-catalog.test.ts b/apps/web/src/features/issues/issue-catalog.test.ts
index a0371cdb..6f77a226 100644
--- a/apps/web/src/features/issues/issue-catalog.test.ts
+++ b/apps/web/src/features/issues/issue-catalog.test.ts
@@ -6,6 +6,16 @@ const raw = '后台原文:操作无法完成';
const issue = normalizePageIssue('runtime', 'creator.prepare', new Error(raw), raw);
describe('localized issue copy', () => {
+ it.each(['zh-CN', 'en-US', 'sv-SE'] as const)('describes uncertain acceptance without reporting a final failure in %s', language => {
+ const pending = { ...issue, code: 'creator_provider_resolution_required', summaryKey: 'issue.provider',
+ source: 'provider' as const, publicFacts: { kind: 'unknown' as const, provider: 'opencreator-gateway-chat/completions' } };
+ const copy = issueConversationText(pending, language);
+ expect(copy.message).not.toMatch(/外部服务失败|Provider failed|错误码|Error code|Felkod|尚未确认更细/);
+ expect(copy.nextStep).toMatch(/重复扣费|duplicate charges|dubbla avgifter/);
+ const recovered = { ...pending, status: 'resolved' as const };
+ expect(issueConversationText(recovered, language).nextStep).toBe('');
+ expect(issueConversationText(recovered, language).message).not.toMatch(/重试|retry|försök igen/);
+ });
it.each(['zh-CN', 'en-US', 'sv-SE'] as const)('explains video platform access failures without model permission guidance in %s', language => {
const next = { ...issue, code: 'download_http_error', publicFacts: {
kind: 'unauthorized' as const, provider: 'yt-dlp', httpStatus: 403,
diff --git a/apps/web/src/features/issues/issue-catalog.ts b/apps/web/src/features/issues/issue-catalog.ts
index c353352c..adbebe71 100644
--- a/apps/web/src/features/issues/issue-catalog.ts
+++ b/apps/web/src/features/issues/issue-catalog.ts
@@ -15,6 +15,7 @@ const catalog: Record<string, { zh: string; en: string }> = {
'issue.permission': { zh: '权限不足', en: 'Permission required' },
'issue.network': { zh: '连接失败', en: 'Connection failed' },
'issue.provider': { zh: '外部服务失败', en: 'Provider failed' },
+ 'issue.provider_pending': { zh: '请求结果待确认', en: 'Request outcome pending' },
'issue.execution': { zh: '操作未完成', en: 'Operation did not complete' },
'issue.output-validation': { zh: '输出未通过检查', en: 'Output validation failed' },
'issue.unknown': { zh: '发生问题', en: 'Something went wrong' },
@@ -26,12 +27,14 @@ export function presentIssue(
issue: OpenCreatorIssue,
language: AppLanguage = 'zh-CN'
): IssuePresentation {
- const entry = catalog[issue.summaryKey] ?? catalog[`issue.${issue.category}`] ?? catalog['issue.unknown']!;
+ const entry = issue.code === 'creator_provider_resolution_required'
+ ? catalog['issue.provider_pending']!
+ : catalog[issue.summaryKey] ?? catalog[`issue.${issue.category}`] ?? catalog['issue.unknown']!;
const resolved = issue.status === 'resolved';
const resolving = issue.status === 'resolving';
const localize = createLocalizedCopy(language);
return {
- title: localize(entry.zh, entry.en),
+ title: recoveredProviderIssue(issue) ? localize('外部服务已恢复', 'Provider recovered') : localize(entry.zh, entry.en),
description: issueDescription(issue, language),
diagnosticLabel: localize(`诊断编号:${issue.diagnosticId}`, `Diagnostic ID: ${issue.diagnosticId}`, `Diagnos-ID: ${issue.diagnosticId}`),
statusLabel: resolved ? localize('已解决', 'Resolved') : resolving ? localize('处理中', 'Resolving') : localize('需要处理', 'Needs attention')
@@ -40,6 +43,12 @@ export function presentIssue(
function issueDescription(issue: OpenCreatorIssue, language: AppLanguage): string {
const localize = createLocalizedCopy(language);
+ if (recoveredProviderIssue(issue)) return localize('请求状态已核对,任务已恢复。', 'The request status was confirmed and the task recovered.', 'Begäransstatusen har bekräftats och uppgiften har återhämtats.');
+ if (issue.code === 'creator_provider_resolution_required') return localize(
+ '尚未确认外部服务的最终结果,请先查询原请求状态。',
+ 'The final provider result is not confirmed yet. Check the original request status first.',
+ 'Leverantörens slutliga resultat är ännu inte bekräftat. Kontrollera först den ursprungliga begäransstatusen.'
+ );
const facts = issuePublicFacts(issue);
const summary = localizedIssueSummary({ ...issue, publicFacts: facts }, localize);
const code = safePublicErrorCode(issue.code) ?? 'UNKNOWN_ERROR';
@@ -49,6 +58,12 @@ function issueDescription(issue: OpenCreatorIssue, language: AppLanguage): strin
return localize(`${summary} 错误码:${code}。${reason}`, `${summary} Error code: ${code}. ${reason}`, `${summary} Felkod: ${code}. ${reason}`);
}
+function recoveredProviderIssue(issue: OpenCreatorIssue): boolean {
+ return issue.status === 'resolved' && issue.source === 'provider'
+ && ['creator_provider_resolution_required', 'creator_provider_request_failed'].includes(issue.code)
+ && issue.publicFacts?.provider?.startsWith('opencreator-gateway-') === true;
+}
+
function issuePublicFacts(issue: OpenCreatorIssue): PublicErrorFacts | undefined {
const historicalReason = issue.source === 'stage' || issue.source === 'preflight'
? safePublicErrorMessage(issue.technicalDetail) : undefined;
@@ -181,9 +196,12 @@ export function issueConversationText(
): { message: string; nextStep: string } {
const detail = presentIssue(issue, language).description;
const localize = createLocalizedCopy(language);
+ if (recoveredProviderIssue(issue)) return { message: detail, nextStep: '' };
const facts = issuePublicFacts(issue);
const transcription = transcriptionIssueCopy(issue.code, localize) ?? transcriptionIssueCopy(facts?.upstreamCode, localize);
- const nextStep = transcription !== undefined ? transcription.nextStep
+ const nextStep = issue.code === 'creator_provider_resolution_required'
+ ? localize('确认原请求结果前请勿重新提交,避免重复扣费。', 'Do not resubmit until the original request outcome is confirmed, to avoid duplicate charges.', 'Skicka inte igen innan resultatet av den ursprungliga begäran har bekräftats, för att undvika dubbla avgifter.')
+ : transcription !== undefined ? transcription.nextStep
: issue.code === 'platform_request_signature_required'
? localize('请使用本地视频文件继续;当前平台要求下载器尚不支持的请求签名,重新连接 Cookie 或修改模型权限无法解决。', 'Use a local video file to continue. The platform requires a request signature that the downloader does not yet support; reconnecting cookies or changing model permissions will not resolve it.', 'Använd en lokal videofil för att fortsätta. Plattformen kräver en begäranssignatur som nedladdaren ännu inte stöder. Att ansluta kakor igen eller ändra modellbehörigheter löser inte problemet.')
: issue.code === 'platform_session_required'
diff --git a/apps/web/src/features/runs/Composer.test.tsx b/apps/web/src/features/runs/Composer.test.tsx
index db41cec5..5f4e0706 100644
--- a/apps/web/src/features/runs/Composer.test.tsx
+++ b/apps/web/src/features/runs/Composer.test.tsx
@@ -86,6 +86,34 @@ describe('Composer', () => {
vi.restoreAllMocks();
});
+ it('commits a catalog model immediately and keeps send available without inference', async () => {
+ const user = userEvent.setup();
+ const onModelConfigChange = vi.fn();
+ const fetcher = vi.spyOn(globalThis, 'fetch');
+ render(<Composer {...defaultProps} models={codexModels} onModelConfigChange={onModelConfigChange} />);
+ await user.type(screen.getByRole('textbox', { name: '输入任务' }), 'Hello');
+ await user.click(screen.getByRole('button', { name: '选择模型 GPT-5.6 Sol' }));
+ await user.click(screen.getByRole('menuitemradio', { name: /GPT-5.5/ }));
+ expect(onModelConfigChange).toHaveBeenCalledWith({ model: 'gpt-5.5', reasoning: null });
+ expect(screen.getByRole('button', { name: '发送' })).toBeEnabled();
+ expect(fetcher).not.toHaveBeenCalled();
+ });
+
+ it('preserves the draft when switching models and closing the menu', async () => {
+ const user = userEvent.setup();
+ const onModelConfigChange = vi.fn();
+ render(<Composer {...defaultProps} models={codexModels} onModelConfigChange={onModelConfigChange} />);
+ await user.type(screen.getByRole('textbox', { name: '输入任务' }), 'Hello');
+ await user.click(screen.getByRole('button', { name: '选择模型 GPT-5.6 Sol' }));
+ await user.click(screen.getByRole('menuitemradio', { name: /GPT-5.5/ }));
+ expect(onModelConfigChange).toHaveBeenCalledWith({ model: 'gpt-5.5', reasoning: null });
+ fireEvent.pointerDown(screen.getByRole('textbox', { name: '输入任务' }));
+ expect(screen.queryByRole('menu', { name: '模型' })).not.toBeInTheDocument();
+ expect(screen.getByRole('textbox', { name: '输入任务' })).toHaveValue('Hello');
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ expect(screen.getByRole('button', { name: '发送' })).toBeEnabled();
+ });
+
it('shows codex-style composer controls', () => {
render(<Composer {...defaultProps} permission="workspace-write" />);
diff --git a/apps/web/src/features/runs/Composer.tsx b/apps/web/src/features/runs/Composer.tsx
index 114838bd..be405080 100644
--- a/apps/web/src/features/runs/Composer.tsx
+++ b/apps/web/src/features/runs/Composer.tsx
@@ -168,7 +168,7 @@ export function Composer(props: {
submissionMode?: RunSubmissionMode
): boolean | void | Promise<boolean | void>;
}) {
- const { t } = useAppLanguage();
+ const { t, language } = useAppLanguage();
const permissionOptions: Array<{
value: ProjectPermission;
label: string;
@@ -1669,18 +1669,10 @@ export function Composer(props: {
aria-checked={resolvedSelectedModel?.model === option.model}
disabled={imageBlocked}
onClick={() => {
- const nextReasoning = isReasoningAvailable(
- option,
- selectedReasoning
- )
- ? selectedReasoning
- : null;
+ const nextReasoning = isReasoningAvailable(option, selectedReasoning) ? selectedReasoning : null;
setSelectedModel(option.model);
setSelectedReasoning(nextReasoning);
- props.onModelConfigChange?.({
- model: option.model,
- reasoning: nextReasoning
- });
+ props.onModelConfigChange?.({ model: option.model, reasoning: nextReasoning });
}}
>
<span className="composer-menu-icon" aria-hidden="true">
diff --git a/apps/web/src/features/settings/GatewayAccountSettingsView.test.tsx b/apps/web/src/features/settings/GatewayAccountSettingsView.test.tsx
index 24a5da6f..84d79994 100644
--- a/apps/web/src/features/settings/GatewayAccountSettingsView.test.tsx
+++ b/apps/web/src/features/settings/GatewayAccountSettingsView.test.tsx
@@ -14,6 +14,31 @@ function service(): GatewayAccountSettingsService {
getSummary: vi.fn(async () => ({ balance: { availableUnits: '123000000', reservedUnits: '0', periodEnd: null, asOf: '2026-10-05T01:00:00Z' }, subscription: null, billingAvailable: true, purchaseMode: 'credits' as const, plansUrl: 'https://www.open-creator.ai/pricing' })),
getPlans: vi.fn(async () => ({ plans: [{ id: 'starter', name: 'Starter', amountUnits: '500', creditUnits: '2500000000', currency: 'usd' }], billingAvailable: true })), getOrders: vi.fn(async () => ({ items: [] })), getOrder: vi.fn(), getCreditGrants: vi.fn(async () => ({ items: [] })), checkout: vi.fn(), portal: vi.fn() };
}
+it('changes the ChatAnywhere region without offering supplier self-selection', async () => {
+ const value = service();
+ const initial = { ...state, supplier: 'chatanywhere' as const, supplierRegion: 'auto' as const };
+ vi.mocked(value.getState).mockResolvedValue(initial);
+ value.setRegion = vi.fn(async region => ({ ...initial, supplierRegion: region }));
+ render(<LanguageProvider initialPreference="zh-CN"><GatewayAccountSettingsView service={value}/></LanguageProvider>);
+ const region = await screen.findByRole('combobox', { name: '连接区域' });
+ await userEvent.setup().selectOptions(region, 'overseas');
+ await waitFor(() => expect(value.setRegion).toHaveBeenCalledWith('overseas'));
+ expect(region).toHaveValue('overseas');
+});
+it('keeps supplier region settings hidden when the server owns the gateway route', async () => {
+ const value = service();
+ vi.mocked(value.getState).mockResolvedValue({ ...state, transport: 'gateway', supplier: 'chatanywhere' });
+ value.setRegion = vi.fn();
+ render(<LanguageProvider initialPreference="zh-CN"><GatewayAccountSettingsView service={value}/></LanguageProvider>);
+ await screen.findByText('已登录,可以开始创作');
+ expect(screen.queryByRole('combobox', { name: '连接区域' })).not.toBeInTheDocument();
+});
+it('shows a supplier migration on the signed-in profile', async () => {
+ const value = service();
+ vi.mocked(value.getState).mockResolvedValue({ ...state, activationState: 'blocked', activationError: { code: 'supplier_migrating', message: 'Switching supplier' } });
+ render(<LanguageProvider initialPreference="zh-CN"><GatewayAccountSettingsView variant="profile" service={value}/></LanguageProvider>);
+ expect(await screen.findByText('正在切换模型供应商,完成后将自动恢复。')).toBeInTheDocument();
+});
it('shows an expired session explicitly and keeps reauthorization available', async () => {
const value = service();
vi.mocked(value.getState).mockResolvedValue({ ...state, authState: 'expired', activationState: 'inactive' });
@@ -116,3 +141,23 @@ it('reconnects a signed-in account without manual provider fields', async () =>
await userEvent.setup().click(screen.getByRole('button', { name: '重新连接' }));
await waitFor(() => expect(changed).toHaveBeenLastCalledWith(state));
});
+
+it('refreshes the user model catalog from the account menu', async () => {
+ const value = service();
+ render(<LanguageProvider initialPreference="zh-CN"><GatewayAccountSettingsView variant="profile" service={value}/></LanguageProvider>);
+ await screen.findByText('已登录', { exact: true });
+ await userEvent.setup().click(screen.getByLabelText('账号菜单'));
+ await userEvent.setup().click(screen.getByRole('button', { name: '刷新模型' }));
+ await waitFor(() => expect(value.getState).toHaveBeenLastCalledWith({ checkAuthorization: false, refreshModels: true }));
+});
+
+it.each([
+ ['model_catalog_unavailable', '模型列表暂时无法获取,请重试。'],
+ ['no_available_models', '当前没有可用的文本模型。']
+])('shows %s separately from sign-in failures', async (code, message) => {
+ const value = service();
+ vi.mocked(value.getState).mockResolvedValue({ ...state, activationState: 'blocked', activationError: { code, message: 'Unavailable' } });
+ render(<LanguageProvider initialPreference="zh-CN"><GatewayAccountSettingsView variant="login" service={value}/></LanguageProvider>);
+ expect(await screen.findByRole('alert')).toHaveTextContent(message);
+ expect(screen.getByRole('button', { name: '重新连接' })).toBeEnabled();
+});
diff --git a/apps/web/src/features/settings/GatewayAccountSettingsView.tsx b/apps/web/src/features/settings/GatewayAccountSettingsView.tsx
index 17bec4e9..faede874 100644
--- a/apps/web/src/features/settings/GatewayAccountSettingsView.tsx
+++ b/apps/web/src/features/settings/GatewayAccountSettingsView.tsx
@@ -6,13 +6,6 @@ import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
import { ApiClientError } from '../../runtime/errors.js';
import './gateway-account-settings.css';
-export function formatGatewayCredits(units: string) {
- if (!/^\d+$/.test(units)) return '?';
- const value = BigInt(units);
- const fraction = (value % 1_000_000n).toString().padStart(6, '0').replace(/0+$/, '');
- return `${value / 1_000_000n}${fraction ? `.${fraction}` : ''}`;
-}
-
export function GatewayAccountSettingsView(props: {
service: GatewayAccountSettingsService | null;
variant?: 'settings' | 'login' | 'profile';
@@ -53,10 +46,10 @@ export function GatewayAccountSettingsView(props: {
setState(next); callback.current?.(next);
if (next.authState !== 'authorizing') { setAuthorization(undefined); setConfirmingAuthorization(false); }
}
- async function refresh(checkAuthorization = false) {
+ async function refresh(checkAuthorization = false, refreshModels = false) {
const request = ++refreshSequence.current;
if (service) {
- const next = await service.getState({ checkAuthorization });
+ const next = await service.getState({ checkAuthorization, ...(refreshModels ? { refreshModels: true } : {}) });
if (alive.current && request === refreshSequence.current) { update(next); setError(''); }
}
}
@@ -113,6 +106,7 @@ export function GatewayAccountSettingsView(props: {
: state.authState === 'authorizing' ? confirmingAuthorization ? l('正在确认登录结果…', 'Confirming sign-in…') : l('请在浏览器中完成登录', 'Complete sign-in in your browser')
: state.authState === 'signing_out' ? l('正在退出登录…', 'Signing out…')
: state.authState === 'expired' ? l('登录已过期,请重新登录', 'Session expired; sign in again')
+ : signedIn && state.activationError?.code === 'supplier_migrating' ? l('正在切换模型供应商,完成后将自动恢复。', 'Switching model supplier. Services will resume automatically.')
: signedIn && profile ? l('已登录', 'Signed in')
: signedIn ? state.activationState === 'ready' && state.source === 'gateway' ? l('已登录,可以开始创作', 'Signed in and ready to create')
: state.activationState === 'loading' ? l('已登录,正在连接模型服务…', 'Signed in; connecting to model service…')
@@ -121,14 +115,24 @@ export function GatewayAccountSettingsView(props: {
return <section className={`gateway-account${compact ? ' gateway-account--login' : profile ? ' gateway-account--profile' : ''}`} aria-label={l('OpenCreator 账户', 'OpenCreator Account')}>
{!compact && !profile ? <div className="gateway-account__heading">
<h2>{l('OpenCreator 账户', 'OpenCreator Account')}</h2>
- <button type="button" className="gateway-account__icon" title={l('刷新账户', 'Refresh account')} aria-label={l('刷新账户', 'Refresh account')} disabled={busy || !service} onClick={() => void action(refresh)}><RefreshCw size={16}/></button>
+ <button type="button" className="gateway-account__icon" title={l('刷新账户', 'Refresh account')} aria-label={l('刷新账户', 'Refresh account')} disabled={busy || !service} onClick={() => void action(() => refresh(false, true))}><RefreshCw size={16}/></button>
</div> : null}
{state?.account && !profile ? <p className="gateway-account__email">{state.account.email}</p> : null}
+ {signedIn && !compact && state.transport !== 'gateway' && state.supplier === 'chatanywhere' && service?.setRegion ? <label>{l('连接区域', 'Connection Region')}<select aria-label={l('连接区域', 'Connection Region')} value={state.supplierRegion ?? 'auto'} disabled={busy} onChange={event => { const next = event.target.value as 'auto' | 'domestic' | 'overseas'; void action(async () => update(await service.setRegion!(next))); }}>
+ <option value="auto">{l('默认(国内线路)', 'Default (Mainland route)')}</option><option value="domestic">{l('国内', 'Mainland China')}</option><option value="overseas">{l('海外', 'Overseas')}</option>
+ </select></label> : null}
{profile ? <div className="gateway-account__identity"><h2>{signedIn ? state.account?.email ?? l('OpenCreator 账户', 'OpenCreator Account') : l('OpenCreator 账户', 'OpenCreator Account')}</h2>{status}</div> : status}
{state?.activationError && (!profile || !signedIn) ? <p role="alert">{state.activationError.code === 'device_expired' ? l('登录授权已过期,请重新登录。', 'Authorization expired. Please sign in again.')
: !signedIn ? l('登录未完成,请重新登录。', 'Sign-in did not complete. Please try again.')
+ : state.activationError.code === 'model_catalog_unavailable' ? l('模型列表暂时无法获取,请重试。', 'The model list is temporarily unavailable. Try again.')
+ : state.activationError.code === 'credits_migration_required' ? l('原有积分需要迁移,请联系管理员。', 'Your existing credits need migration. Contact an administrator.')
+ : state.activationError.code === 'no_available_models' ? l('当前没有可用的文本模型。', 'No compatible text models are available.')
+ : state.activationError.code === 'supplier_migrating' ? l('正在切换模型供应商,完成后将自动恢复。', 'Switching model supplier. Services will resume automatically.')
: state.activationError.code === 'active_tasks' ? l('请等待当前任务结束后再连接官方服务。', 'Wait for the current tasks to finish before connecting official services.') : l('模型服务暂不可用,请重新连接。', 'Model service is unavailable. Please reconnect.')}</p> : null}
- {signedIn && profile ? <details ref={accountMenu} className="gateway-account__menu"><summary title={l('账号菜单', 'Account menu')} aria-label={l('账号菜单', 'Account menu')}><MoreHorizontal size={20}/></summary><div><button type="button" disabled={busy || !service} onClick={() => void action(async () => update(await service!.logout()))}><LogOut size={16}/>{l('退出登录', 'Sign out')}</button></div></details>
+ {signedIn && profile ? <details ref={accountMenu} className="gateway-account__menu"><summary title={l('账号菜单', 'Account menu')} aria-label={l('账号菜单', 'Account menu')}><MoreHorizontal size={20}/></summary><div>
+ <button type="button" disabled={busy || !service} onClick={() => void action(() => refresh(false, true))}><RefreshCw size={16}/>{l('刷新模型', 'Refresh models')}</button>
+ <button type="button" disabled={busy || !service} onClick={() => void action(async () => update(await service!.logout()))}><LogOut size={16}/>{l('退出登录', 'Sign out')}</button>
+ </div></details>
: signedIn ? <div className="gateway-account__actions">
{(profile ? state.source === 'gateway' && state.activationState !== 'ready' : state.activationState !== 'ready' || state.source !== 'gateway') ? <button type="button" disabled={busy || !service || state.activationState === 'loading'} onClick={() => void action(async () => update(await service!.activate()))}><RefreshCw size={16}/>{l('重新连接', 'Reconnect')}</button> : null}
{props.onOpenSubscription ? <button type="button" onClick={props.onOpenSubscription}><CreditCard size={16}/>{l('积分与充值', 'Credits')}</button> : null}
diff --git a/apps/web/src/features/settings/GatewaySubscriptionSettingsView.tsx b/apps/web/src/features/settings/GatewaySubscriptionSettingsView.tsx
index a993f397..031f1dc8 100644
--- a/apps/web/src/features/settings/GatewaySubscriptionSettingsView.tsx
+++ b/apps/web/src/features/settings/GatewaySubscriptionSettingsView.tsx
@@ -6,8 +6,8 @@ import type { GatewayAccountSettingsService, GatewayBillingSummary, GatewayRecha
import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
import { useAppLanguage } from '../../i18n/LanguageProvider.js';
import { ApiClientError } from '../../runtime/errors.js';
-import { formatGatewayCredits, GatewayAccountSettingsView } from './GatewayAccountSettingsView.js';
-import { billingUnavailableMessage, creditPlansURL, rechargeOrderLabel, rechargeOrderStatus } from '../account/billing-display.js';
+import { GatewayAccountSettingsView } from './GatewayAccountSettingsView.js';
+import { billingUnavailableMessage, creditPlansURL, formatGatewayCredits, rechargeOrderLabel, rechargeOrderStatus } from '../account/billing-display.js';
import './gateway-account-settings.css';
import '../account/credits.css';
@@ -39,7 +39,7 @@ export function GatewaySubscriptionSettingsView(props: {
const [state, setState] = useState(props.accountState);
const account = props.embedded ? props.accountState : state;
const accountId = account?.authState === 'signed_in' ? account.account?.id : undefined;
- const [summary, setSummary] = useState<GatewayBillingSummary>();
+ const [summaryResult, setSummaryResult] = useState<{ service: GatewayAccountSettingsService; accountId: string; value: GatewayBillingSummary }>();
const [refreshing, setRefreshing] = useState(false);
const [balanceError, setBalanceError] = useState(false);
const [webError, setWebError] = useState(false);
@@ -53,8 +53,13 @@ export function GatewaySubscriptionSettingsView(props: {
const visit = useRef<PortalVisit>();
const dismissedOrder = useRef<string>();
const service = props.service;
+ const summary = summaryResult?.service === service && summaryResult.accountId === accountId ? summaryResult.value
+ : accountId ? service?.getCachedSummary?.(accountId) : undefined;
const plansURL = creditPlansURL(summary?.plansUrl, language);
+ function setSummary(value?: GatewayBillingSummary) {
+ setSummaryResult(value && service && accountId ? { service, accountId, value } : undefined);
+ }
function saveVisit(value?: PortalVisit) {
visit.current = value;
if (accountId) try {
@@ -168,7 +173,7 @@ export function GatewaySubscriptionSettingsView(props: {
{accountId ? <p className="account-credits__value">{summary ? formatGatewayCredits(summary.balance.availableUnits) : '--'} <small>{l('积分', 'credits')}</small></p>
: <p className="credit-muted">{l('登录后查看积分', 'Sign in to view your credits')}</p>}
{accountId && !summary && refreshing ? <p className="credit-loading" role="status"><LoaderCircle size={14}/>{l('正在加载积分', 'Loading credits')}</p> : null}
- {balanceError && summary ? <p className="credit-muted">{l('上次更新', 'Last updated')} {new Date(summary.balance.asOf).toLocaleString(language)}</p> : null}
+ {summary && (refreshing || balanceError) ? <p className="credit-muted">{l('上次更新', 'Last updated')} {new Date(summary.balance.asOf).toLocaleString(language)}</p> : null}
</div>
<div className="account-credits__actions">
{accountId ? <button type="button" className="credit-icon-button" title={l('刷新积分', 'Refresh credits')} aria-label={l('刷新积分', 'Refresh credits')} disabled={refreshing} onClick={() => void refresh()}><RefreshCw size={17} className={refreshing ? 'is-spinning' : ''}/></button> : null}
diff --git a/apps/web/src/features/settings/OfficialServiceRecovery.tsx b/apps/web/src/features/settings/OfficialServiceRecovery.tsx
new file mode 100644
index 00000000..65ab9c82
--- /dev/null
+++ b/apps/web/src/features/settings/OfficialServiceRecovery.tsx
@@ -0,0 +1,56 @@
+import { useEffect, useRef, useState } from 'react';
+import { LoaderCircle, RefreshCw } from 'lucide-react';
+import type { GatewayAccountState, GatewayActivationStage } from '@opencreator/protocol';
+import type { GatewayAccountSettingsService } from '../../services/gateway-account-service.js';
+import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
+import './official-services-settings.css';
+
+export function OfficialServiceRecovery(props: {
+ state: GatewayAccountState;
+ service: GatewayAccountSettingsService;
+ onChange(state: GatewayAccountState): void;
+}) {
+ const l = useLocalizedCopy();
+ const [pending, setPending] = useState(false);
+ const [error, setError] = useState('');
+ const request = useRef(0);
+ useEffect(() => {
+ setPending(false); setError('');
+ return () => { request.current++; };
+ }, [props.state.account?.id, props.state.authState, props.state.source, props.service]);
+ if (props.state.authState !== 'signed_in' || props.state.source !== 'gateway' || props.state.activationState === 'ready') return null;
+ const failure = props.state.activationError;
+ const stages: Record<GatewayActivationStage, string> = {
+ credentials: l('刷新登录凭据', 'Refreshing sign-in credentials'),
+ usage: l('同步设备状态', 'Syncing device state'),
+ bootstrap: l('获取模型凭据', 'Retrieving model credentials'),
+ catalog: l('获取模型列表', 'Loading the model catalog'),
+ runtime: l('连接本地运行时', 'Connecting the local runtime'),
+ configuration: l('保存服务配置', 'Saving service configuration')
+ };
+ const reason = failure?.request?.reason === 'timeout' ? l('网关请求超时,请检查网络后重试。', 'The gateway request timed out. Check your connection and try again.')
+ : failure?.request?.reason === 'network' ? l('无法连接网关,请检查网络或代理后重试。', 'Could not reach the gateway. Check your network or proxy and try again.')
+ : failure?.request?.reason === 'http' ? l('网关返回错误,请稍后重试。', 'The gateway returned an error. Try again later.')
+ : failure?.request?.reason === 'invalid_response' ? l('网关返回的数据无效,请稍后重试。', 'The gateway returned an invalid response. Try again later.')
+ : failure?.code === 'model_catalog_unavailable' ? l('模型列表暂时无法获取,请重试。', 'The model catalog is temporarily unavailable. Try again.')
+ : failure?.code === 'no_available_models' ? l('当前没有可用的文本模型。', 'No compatible text models are available.')
+ : l('官方模型服务连接失败,请重新连接。', 'Official model services could not connect. Reconnect to try again.');
+ const diagnostic = [failure?.stage ? stages[failure.stage] : '', failure?.code, failure?.request?.path,
+ failure?.request?.httpStatus ? `HTTP ${failure.request.httpStatus}` : '', failure?.request?.networkCode].filter(Boolean).join(' · ');
+ const connecting = pending || props.state.activationState === 'loading';
+ return <div className="official-service-recovery">
+ {failure || error ? <p role="alert">{error || reason}{diagnostic ? <small>{diagnostic}</small> : null}</p> : null}
+ <button type="button" disabled={connecting} onClick={() => {
+ const sequence = ++request.current;
+ setPending(true); setError('');
+ void props.service.activate().then(next => {
+ if (sequence === request.current && next.account?.id === props.state.account?.id) props.onChange(next);
+ }).catch(() => {
+ if (sequence === request.current) setError(l('重新连接失败,请稍后重试。', 'Could not reconnect. Try again later.'));
+ }).finally(() => { if (sequence === request.current) setPending(false); });
+ }}>
+ {connecting ? <LoaderCircle size={15} className="official-services-spinner" aria-hidden="true" /> : <RefreshCw size={15} aria-hidden="true" />}
+ {connecting ? l('正在连接', 'Connecting') : l('重新连接', 'Reconnect')}
+ </button>
+ </div>;
+}
diff --git a/apps/web/src/features/settings/OfficialServicesSettingsView.test.tsx b/apps/web/src/features/settings/OfficialServicesSettingsView.test.tsx
new file mode 100644
index 00000000..656d939e
--- /dev/null
+++ b/apps/web/src/features/settings/OfficialServicesSettingsView.test.tsx
@@ -0,0 +1,73 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import { userEvent } from '@testing-library/user-event';
+import { expect, it, vi } from 'vitest';
+import { gatewayRecommendedModelId, type GatewayAccountState } from '@opencreator/protocol';
+import { LanguageProvider } from '../../i18n/LanguageProvider.js';
+import { createGatewayAccountService } from '../../services/gateway-account-service.js';
+import { OfficialServicesSettingsView } from './OfficialServicesSettingsView.js';
+
+function fixture() {
+ const state: GatewayAccountState = { source: 'gateway', transport: 'gateway', authState: 'signed_in', activationState: 'ready',
+ account: { id: 'a', email: 'a@test', verified: true }, bindingVersion: '1', activationError: null,
+ selectedModels: { text: 'gpt-6.1-sol', image: 'gpt-image-2', transcription: 'whisper-1' },
+ recommendedModels: { text: 'gpt-6.1-sol' }, modelSelectionModes: { text: 'recommended' }, models: [
+ { id: 'gpt-6.1-sol', modality: 'text', capabilities: ['responses', 'chat'], recommended: true, price: { version: 'v1', inputPerMillion: 2, outputPerMillion: 10 } },
+ { id: 'gpt-5.4', modality: 'text', capabilities: ['responses', 'chat'] },
+ { id: 'claude-future', vendor: 'Anthropic', modality: 'text', capabilities: ['responses', 'chat'] },
+ { id: 'chat-only', modality: 'text', capabilities: ['chat'] },
+ { id: 'gpt-image-2', modality: 'image', capabilities: [] },
+ { id: 'plain-asr', modality: 'transcription', capabilities: ['transcribe'] },
+ { id: 'whisper-1', modality: 'transcription', capabilities: ['transcribe', 'subtitle_timestamps'] },
+ ] };
+ const client = { get: vi.fn().mockResolvedValue(state), post: vi.fn(), patch: vi.fn().mockResolvedValue(state) };
+ const service = createGatewayAccountService(client);
+ const changed = vi.fn();
+ const renderState = (next: GatewayAccountState) => <LanguageProvider initialPreference="zh-CN"><OfficialServicesSettingsView state={next} service={service} onChange={changed} /></LanguageProvider>;
+ const view = render(renderState(state));
+ return { state, client, changed, view, renderState, user: userEvent.setup() };
+}
+
+it('shows five modalities with unified text and transcription and no paid test controls', () => {
+ const f = fixture();
+ expect(screen.getAllByRole('combobox')).toHaveLength(5);
+ for (const name of ['文本模型', '图片模型', '视频模型', '语音合成模型', '转录模型']) expect(screen.getByRole('combobox', { name })).toBeInTheDocument();
+ expect(screen.getByRole('combobox', { name: '文本模型' })).toHaveValue('系统推荐 · gpt-6.1-sol');
+ expect(screen.getByRole('combobox', { name: '视频模型' })).toBeDisabled();
+ expect(screen.queryByText('文本处理模型')).not.toBeInTheDocument();
+ expect(screen.queryByText('字幕转录模型')).not.toBeInTheDocument();
+ expect(screen.queryByText('未验证')).not.toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: /测试/ })).not.toBeInTheDocument();
+ expect(f.client.post).not.toHaveBeenCalled();
+});
+
+it('filters unsupported candidates and saves a manual model without inference', async () => {
+ const f = fixture();
+ await f.user.click(screen.getByRole('combobox', { name: '文本模型' }));
+ expect(screen.queryByRole('option', { name: 'claude-future' })).not.toBeInTheDocument();
+ expect(screen.queryByRole('option', { name: 'chat-only' })).not.toBeInTheDocument();
+ await f.user.click(screen.getByRole('option', { name: 'gpt-5.4' }));
+ await waitFor(() => expect(f.changed).toHaveBeenCalled());
+ expect(f.client.patch).toHaveBeenCalledWith('/gateway/model', { modality: 'text', model: 'gpt-5.4' });
+ expect(f.client.post).not.toHaveBeenCalled();
+ await f.user.click(screen.getByRole('combobox', { name: '转录模型' }));
+ expect(screen.queryByRole('option', { name: 'plain-asr' })).not.toBeInTheDocument();
+});
+
+it('lets a manual user return to recommendations and reflects a new recommended version', async () => {
+ const f = fixture();
+ f.view.rerender(f.renderState({ ...f.state, selectedModels: { text: 'gpt-5.4' }, modelSelectionModes: { text: 'manual' } }));
+ await f.user.click(screen.getByRole('combobox', { name: '文本模型' }));
+ await f.user.click(screen.getByRole('option', { name: '系统推荐 · gpt-6.1-sol' }));
+ await waitFor(() => expect(f.client.patch).toHaveBeenCalledWith('/gateway/model', { modality: 'text', model: gatewayRecommendedModelId }));
+ f.view.rerender(f.renderState({ ...f.state, selectedModels: { text: 'gpt-6.2-sol' }, recommendedModels: { text: 'gpt-6.2-sol' },
+ models: [...f.state.models, { id: 'gpt-6.2-sol', modality: 'text', capabilities: ['responses', 'chat'] }] }));
+ expect(screen.getByRole('combobox', { name: '文本模型' })).toHaveValue('系统推荐 · gpt-6.2-sol');
+});
+
+it('refreshes the catalog without inference', async () => {
+ const f = fixture();
+ await f.user.click(screen.getByRole('button', { name: '刷新模型列表' }));
+ await waitFor(() => expect(f.changed).toHaveBeenCalledWith(f.state));
+ expect(f.client.get).toHaveBeenCalledWith('/gateway/account?refreshModels=1');
+ expect(f.client.post).not.toHaveBeenCalled();
+});
diff --git a/apps/web/src/features/settings/OfficialServicesSettingsView.tsx b/apps/web/src/features/settings/OfficialServicesSettingsView.tsx
index 6dfd508b..fc63ee59 100644
--- a/apps/web/src/features/settings/OfficialServicesSettingsView.tsx
+++ b/apps/web/src/features/settings/OfficialServicesSettingsView.tsx
@@ -1,58 +1,93 @@
-import { useState } from 'react';
-import { AudioLines, Image, LoaderCircle, Mic, TextCursorInput, Video, type LucideIcon } from 'lucide-react';
-import type { GatewayAccountState, GatewayModel } from '@opencreator/protocol';
+import { useEffect, useRef, useState } from 'react';
+import { AudioLines, Image, LoaderCircle, Mic, RefreshCw, TextCursorInput, Video, type LucideIcon } from 'lucide-react';
+import { gatewayModelCompatible, gatewayModelSupports, gatewayModelReady, type GatewayAccountState, type GatewayModelPurpose } from '@opencreator/protocol';
import type { GatewayAccountSettingsService } from '../../services/gateway-account-service.js';
import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
-import OfficialModelSelect from '../../components/forms/OfficialModelSelect.js';
+import OfficialModelSelect, { officialModelPrice } from '../../components/forms/OfficialModelSelect.js';
import { ApiClientError } from '../../runtime/errors.js';
import './official-services-settings.css';
export function OfficialServicesSettingsView(props: { state: GatewayAccountState; service: GatewayAccountSettingsService; onChange(state: GatewayAccountState): void }) {
const l = useLocalizedCopy();
- const [pendingModality, setPendingModality] = useState<GatewayModel['modality'] | null>(null);
+ const [pendingModality, setPendingModality] = useState<GatewayModelPurpose | null>(null);
+ const [refreshing, setRefreshing] = useState(false);
const [error, setError] = useState('');
- const modalities: Array<{ id: GatewayModel['modality']; label: string; icon: LucideIcon }> = [
+ const sequence = useRef(0);
+ useEffect(() => {
+ sequence.current++; setPendingModality(null); setRefreshing(false);
+ setError(props.state.authState === 'expired' ? l('登录已过期,请重新登录', 'Session expired; sign in again') : '');
+ return () => { sequence.current++; };
+ }, [props.state.account?.id, props.state.authState, props.state.bindingVersion, l]);
+
+ async function refreshModels() {
+ const request = ++sequence.current; setRefreshing(true); setError('');
+ try { const next = await props.service.getState({ refreshModels: true }); if (sequence.current === request) props.onChange(next); }
+ catch { if (sequence.current === request) setError(l('模型列表刷新失败,保留上次结果', 'Could not refresh models. Previous results are retained.')); }
+ finally { if (sequence.current === request) setRefreshing(false); }
+ }
+
+ async function selectModel(modality: GatewayModelPurpose, id: string) {
+ const request = ++sequence.current; setPendingModality(modality); setError('');
+ try { const next = await props.service.selectModel(modality, id); if (sequence.current === request) props.onChange(next); }
+ catch (cause) {
+ if (sequence.current !== request) return;
+ if (cause instanceof ApiClientError && cause.code === 'GATEWAY_AUTH_REQUIRED') {
+ setError(l('登录已过期,请重新登录', 'Session expired; sign in again'));
+ await props.service.getState().then(next => { if (sequence.current === request) props.onChange(next); }).catch(() => undefined);
+ } else if (cause instanceof ApiClientError && cause.details?.gatewayCode === 'active_tasks') {
+ setError(l('请等待当前任务完成后切换模型', 'Wait for the current task to finish before switching models.'));
+ } else if (cause instanceof ApiClientError && cause.details?.gatewayCode === 'invalid_model') {
+ setError(l('该模型已不可用,请刷新模型列表后重试', 'This model is unavailable. Refresh the model list and try again.'));
+ await props.service.getState().then(next => { if (sequence.current === request) props.onChange(next); }).catch(() => undefined);
+ } else if (cause instanceof ApiClientError && cause.details?.gatewayCode === 'services_not_ready') {
+ setError(l('模型服务暂不可用,请重新连接后重试', 'Model service is unavailable. Reconnect and try again.'));
+ } else {
+ setError(l('模型切换失败,请重试', 'Could not switch models. Try again.'));
+ }
+ } finally { if (sequence.current === request) setPendingModality(null); }
+ }
+
+ const modalities: Array<{ id: GatewayModelPurpose; label: string; icon: LucideIcon }> = [
{ id: 'text', label: l('文本模型', 'Text model'), icon: TextCursorInput },
{ id: 'image', label: l('图片模型', 'Image model'), icon: Image },
{ id: 'video', label: l('视频模型', 'Video model'), icon: Video },
{ id: 'speech', label: l('语音合成模型', 'Speech model'), icon: AudioLines },
- { id: 'transcription', label: l('语音识别模型', 'Transcription model'), icon: Mic }
+ { id: 'transcription', label: l('转录模型', 'Transcription model'), icon: Mic },
];
return <div className="official-services-models">
+ {props.state.transport === 'gateway' ? <div className="official-catalog-toolbar">
+ <a href={l('https://www.open-creator.ai/models?lang=zh', 'https://www.open-creator.ai/models')} target="_blank" rel="noreferrer">{l('模型目录', 'Model catalog')}</a>
+ <button type="button" disabled={refreshing || pendingModality !== null} aria-label={l('刷新模型列表', 'Refresh model list')} title={l('刷新模型列表', 'Refresh model list')} onClick={() => void refreshModels()}>
+ <RefreshCw size={16} className={refreshing ? 'official-services-spinner' : undefined} />
+ </button>
+ </div> : null}
{modalities.map(modality => {
- const models = props.state.models.filter(model => model.modality === modality.id && (modality.id !== 'text' || model.capabilities.includes('responses')));
+ const models = props.state.models.filter(model => gatewayModelSupports(model, modality.id)
+ && (props.state.transport !== 'gateway' || gatewayModelCompatible(model)));
+ const selected = props.state.selectedModels?.[modality.id] ?? '';
+ const selectedModel = models.find(model => model.id === selected);
+ const recommended = models.find(model => model.id === props.state.recommendedModels?.[modality.id] && gatewayModelReady(model));
+ const available = props.state.authState === 'signed_in' && props.state.source === 'gateway' && props.state.activationState === 'ready' && models.some(gatewayModelReady);
const Icon = modality.icon;
- const saving = pendingModality === modality.id;
- return <label className="official-services-model-row" key={modality.id} aria-busy={saving}>
- <span className="official-services-model-label">
- <Icon size={19} strokeWidth={1.7} aria-hidden="true" />
- <span>
- <span className="official-services-model-name">{modality.label}</span>
- <span className="official-services-model-count" id={`official-${modality.id}-count`}>
- {models.length === 0 ? l('暂不可用', 'Unavailable') : l(`${models.length} 个模型`, `${models.length} ${models.length === 1 ? 'model' : 'models'}`)}
- </span>
- </span>
- </span>
+ return <div className="official-services-model-row" key={modality.id} aria-busy={pendingModality === modality.id}>
+ <span className="official-services-model-label"><Icon size={19} strokeWidth={1.7} aria-hidden="true" /><span>
+ <span className="official-services-model-name">{modality.label}</span>
+ <span className="official-services-model-count" id={`official-${modality.id}-count`}>{models.some(gatewayModelReady)
+ ? l(`${models.filter(gatewayModelReady).length} 个可用模型`, `${models.filter(gatewayModelReady).length} available models`)
+ : l('暂不可用', 'Unavailable')}</span>
+ {selectedModel?.price ? <span className="official-model-availability">{officialModelPrice(selectedModel, l)}</span> : null}
+ {selected && (!selectedModel || !gatewayModelReady(selectedModel)) ? <span className="official-model-availability">{l('暂不可用,请选择其他模型', 'Unavailable; select another model')}</span> : null}
+ </span></span>
<span className="official-services-model-select">
- <OfficialModelSelect label={modality.label} describedBy={`official-${modality.id}-count`} models={models} disabled={pendingModality !== null || props.state.authState !== 'signed_in' || props.state.source !== 'gateway' || props.state.activationState !== 'ready' || models.length === 0}
- value={props.state.selectedModels?.[modality.id] ?? models[0]?.id ?? ''}
- onChange={id => {
- setPendingModality(modality.id); setError('');
- void props.service.selectModel(modality.id, id).then(props.onChange)
- .catch(async cause => {
- if (cause instanceof ApiClientError && cause.code === 'GATEWAY_AUTH_REQUIRED') {
- setError(l('登录已过期,请重新登录', 'Session expired; sign in again'));
- await props.service.getState().then(props.onChange).catch(() => undefined);
- } else {
- setError(l('模型切换失败,请等待当前任务结束后重试', 'Could not switch models. Wait for the current task to finish and try again.'));
- }
- })
- .finally(() => setPendingModality(null));
- }} />
- {saving ? <LoaderCircle className="official-services-spinner" size={16} aria-hidden="true" /> : null}
+ <OfficialModelSelect label={modality.label} describedBy={`official-${modality.id}-count`} models={models} value={selected}
+ recommendedModel={recommended} followsRecommendation={props.state.modelSelectionModes?.[modality.id] === 'recommended'}
+ disabled={refreshing || pendingModality !== null || !available} onChange={id => void selectModel(modality.id, id)} />
+ {pendingModality === modality.id ? <span className="official-model-progress" role="status"><LoaderCircle className="official-services-spinner" size={16} aria-hidden="true" />{l('正在保存', 'Saving')}</span> : null}
</span>
- </label>;
+ </div>;
})}
+ {props.state.modelSelectionNotice ? <p role="status">{l('原模型已不可用,已更新为系统推荐模型', 'An unavailable selection was updated to the recommended model.')}</p> : null}
+ {props.state.catalogError ? <p className="official-services-error" role="status">{l('模型列表暂未更新,正在显示上次结果', 'Model update unavailable. Showing previous results.')}</p> : null}
{error ? <p className="official-services-error" role="alert">{error}</p> : null}
</div>;
}
diff --git a/apps/web/src/features/settings/OpenCreatorSettingsView.test.tsx b/apps/web/src/features/settings/OpenCreatorSettingsView.test.tsx
index a259df67..5bbe64a2 100644
--- a/apps/web/src/features/settings/OpenCreatorSettingsView.test.tsx
+++ b/apps/web/src/features/settings/OpenCreatorSettingsView.test.tsx
@@ -22,6 +22,24 @@ const runtimeStatus = {
};
describe('OpenCreatorSettingsView', () => {
+ it('shows connection diagnostics and reconnects official services without a model probe', async () => {
+ const blocked: GatewayAccountState = { source: 'gateway', authState: 'signed_in', activationState: 'blocked', account: { id: 'a', email: 'a@test', verified: true }, bindingVersion: null,
+ models: [{ id: 'vendor/text', modality: 'text', capabilities: ['responses'] }], activationError: { code: 'gateway_unavailable', message: 'Unavailable', stage: 'usage', request: { path: '/api/v1/client/usage', reason: 'http', httpStatus: 503 } } };
+ const ready: GatewayAccountState = { ...blocked, activationState: 'ready', bindingVersion: 'a:1', activationError: null };
+ const client = { get: vi.fn(), post: vi.fn().mockResolvedValue(ready), patch: vi.fn() };
+ const changed = vi.fn();
+ render(<OpenCreatorSettingsView runtimeStatus={runtimeStatus} gatewayAccountService={createGatewayAccountService(client)} gatewayAccountState={blocked} onGatewayStateChange={changed} initialTab="ai-services" onBack={vi.fn()} />);
+ expect(screen.getByRole('alert')).toHaveTextContent('同步设备状态');
+ expect(screen.getByRole('alert')).toHaveTextContent('/api/v1/client/usage');
+ expect(screen.getByRole('alert')).toHaveTextContent('HTTP 503');
+ expect(screen.getByRole('combobox', { name: '文本模型' })).toBeDisabled();
+ await userEvent.setup().click(screen.getByRole('button', { name: '重新连接' }));
+ await waitFor(() => expect(changed).toHaveBeenCalledWith(ready));
+ expect(client.post).toHaveBeenCalledExactlyOnceWith('/gateway/auth/activate', {});
+ expect(client.patch).not.toHaveBeenCalled();
+ expect(screen.getByRole('combobox', { name: '文本模型' })).toBeEnabled();
+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+ });
it('keeps the general proxy editable while signed in without reading custom credentials', async () => {
const state: GatewayAccountState = { source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: 'a@test', verified: true }, bindingVersion: '1', models: [], activationError: null };
const getConfig = vi.fn(); const saveNetwork = vi.fn(async (value: { proxy: string }) => value);
@@ -93,6 +111,23 @@ describe('OpenCreatorSettingsView', () => {
expect(client.get).toHaveBeenCalledWith('/gateway/account');
expect(screen.getByRole('combobox', { name: '文本模型' })).toBeDisabled();
});
+ it.each([
+ ['invalid_model', '该模型已不可用,请刷新模型列表后重试'],
+ ['services_not_ready', '模型服务暂不可用,请重新连接后重试'],
+ ['gateway_unavailable', '模型切换失败,请重试']
+ ])('shows the actual model switch failure for %s without claiming a task is active', async (gatewayCode, message) => {
+ const state: GatewayAccountState = { source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: 'a@test', verified: true }, bindingVersion: 'a:1',
+ models: [{ id: 'vendor/first', modality: 'text', capabilities: ['responses'] }, { id: 'vendor/second', modality: 'text', capabilities: ['responses'] }], selectedModels: { text: 'vendor/first' }, activationError: null };
+ const client = { get: vi.fn().mockResolvedValue(state), post: vi.fn(), patch: vi.fn().mockRejectedValue(new ApiClientError({ status: 400, code: 'GATEWAY_UNAVAILABLE', message: 'Switch failed', details: { gatewayCode } })) };
+ render(<OpenCreatorSettingsView runtimeStatus={runtimeStatus} gatewayAccountService={createGatewayAccountService(client)} gatewayAccountState={state} initialTab="ai-services" onBack={vi.fn()}/>);
+ const user = userEvent.setup();
+ await user.click(screen.getByRole('combobox', { name: '文本模型' }));
+ await user.click(screen.getByRole('option', { name: 'second' }));
+ expect(await screen.findByRole('alert')).toHaveTextContent(message);
+ expect(screen.queryByText(/请等待当前任务结束/)).not.toBeInTheDocument();
+ await waitFor(() => expect(screen.getByRole('combobox', { name: '文本模型' })).toBeEnabled());
+ expect(screen.getByRole('combobox', { name: '文本模型' })).toHaveValue('first');
+ });
it('shows custom settings for guests and directs sign-in to the personal center', async () => {
const gateway: GatewayAccountState = { source: 'manual', authState: 'signed_out', activationState: 'inactive', account: null, bindingVersion: null, models: [], activationError: null };
const service: GatewayAccountSettingsService = { getState: vi.fn(async () => gateway), setSource: vi.fn(), selectModel: vi.fn(), start: vi.fn(), cancel: vi.fn(), logout: vi.fn(), activate: vi.fn(), getBalance: vi.fn(), getSummary: vi.fn(), getPlans: vi.fn(), getOrders: vi.fn(), getOrder: vi.fn(), getCreditGrants: vi.fn(), checkout: vi.fn(), portal: vi.fn() };
diff --git a/apps/web/src/features/settings/OpenCreatorSettingsView.tsx b/apps/web/src/features/settings/OpenCreatorSettingsView.tsx
index 70a7de63..8ff55c94 100644
--- a/apps/web/src/features/settings/OpenCreatorSettingsView.tsx
+++ b/apps/web/src/features/settings/OpenCreatorSettingsView.tsx
@@ -39,6 +39,7 @@ import type { SettingsRouteTab } from '../../app/routes.js';
import type { GatewayAccountSettingsService } from '../../services/gateway-account-service.js';
import type { GatewayAccountState } from '@opencreator/protocol';
import { OfficialServicesSettingsView } from './OfficialServicesSettingsView.js';
+import { OfficialServiceRecovery } from './OfficialServiceRecovery.js';
import { NetworkSettings } from './NetworkSettings.js';
import { PlatformConnectionsSettingsView } from './PlatformConnectionsSettingsView.js';
import type { PlatformConnectionsService } from '../../services/platform-connections-service.js';
@@ -229,6 +230,7 @@ export function OpenCreatorSettingsView(props: OpenCreatorSettingsViewProps) {
</button> : null}
</header>
{modeControls}
+ {props.gatewayAccountService ? <OfficialServiceRecovery state={gatewayState} service={props.gatewayAccountService} onChange={next => { setGatewayState(next); props.onGatewayStateChange?.(next); }} /> : null}
{props.gatewayAccountService ? <OfficialServicesSettingsView state={gatewayState} service={props.gatewayAccountService} onChange={next => { setGatewayState(next); props.onGatewayStateChange?.(next); }} /> : null}
</section> : null}
<Suspense fallback={
diff --git a/apps/web/src/features/settings/official-services-settings.css b/apps/web/src/features/settings/official-services-settings.css
index 837d4008..e01d26c2 100644
--- a/apps/web/src/features/settings/official-services-settings.css
+++ b/apps/web/src/features/settings/official-services-settings.css
@@ -14,6 +14,47 @@
width: min(820px, 100%);
}
+.official-catalog-toolbar { display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 12px 0; color: var(--muted); font-size: 12px; }
+.official-catalog-toolbar button { display: inline-flex; align-items: center; justify-content: center; width: 34px; height: 34px; flex: 0 0 34px; padding: 0; }
+.official-catalog-toolbar a { color: inherit; text-decoration: none; }
+.official-catalog-toolbar a:hover { color: var(--text); }
+
+.official-service-recovery {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ flex-wrap: wrap;
+ gap: 12px;
+ padding: 12px 0;
+ font-size: 12px;
+}
+
+.official-service-recovery p {
+ min-width: 0;
+ flex: 1 1 220px;
+ margin: 0;
+ color: var(--warning);
+ line-height: 1.5;
+ overflow-wrap: anywhere;
+}
+
+.official-service-recovery small {
+ display: block;
+ margin-top: 4px;
+ color: var(--muted);
+ font-size: 11px;
+}
+
+.official-service-recovery button {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ min-height: 32px;
+ flex: 0 0 auto;
+ padding: 6px 10px;
+ font-size: 12px;
+}
+
.ai-services-mode__label {
color: var(--muted);
font-size: 13px;
@@ -152,8 +193,31 @@
min-width: 0;
display: flex;
align-items: center;
+ gap: 8px;
}
+.official-services-model-select > .official-model-select {
+ min-width: 0;
+ flex: 1;
+}
+
+.official-model-progress {
+ position: absolute;
+ left: 12px;
+ right: 48px;
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ font-size: 12px;
+ pointer-events: none;
+}
+
+.official-services-model-row[aria-busy='true'] .official-model-control { visibility: hidden; }
+
+.official-model-availability { color: var(--muted); font-size: 11px; overflow-wrap: anywhere; }
+
+.official-services-notice { margin: 16px 0 0; color: var(--success); font-size: 13px; }
+
.official-services-model-select select {
appearance: none;
width: 100%;
diff --git a/apps/web/src/services/creator-service.ts b/apps/web/src/services/creator-service.ts
index 77b1155d..39571593 100644
--- a/apps/web/src/services/creator-service.ts
+++ b/apps/web/src/services/creator-service.ts
@@ -149,6 +149,10 @@ export function createCreatorService(client: ClientLike) {
CREATOR_REFERENCE_IMAGE_CONTENT_TYPE
) as Promise<CreatorSourceUploadResponse>;
},
+ uploadVideoReference(file: File): Promise<{ assetId: string; expiresAt: string }> {
+ if (!client.postBinary) return Promise.reject(new Error('Video reference upload transport is unavailable'));
+ return client.postBinary(`/video-generation/assets?${new URLSearchParams({ mime: file.type })}`, file, 'application/vnd.opencreator.video-reference') as Promise<{ assetId: string; expiresAt: string }>;
+ },
uploadArticleImage(jobId: string, input: {
file: File;
expectedRevision: number;
diff --git a/apps/web/src/services/gateway-account-service.test.ts b/apps/web/src/services/gateway-account-service.test.ts
index cd3ad33c..48271ecc 100644
--- a/apps/web/src/services/gateway-account-service.test.ts
+++ b/apps/web/src/services/gateway-account-service.test.ts
@@ -1,6 +1,19 @@
import { expect, it, vi } from 'vitest';
import { RuntimeClient } from '../runtime/client.js';
-import { createGatewayAccountService } from './gateway-account-service.js';
+import type { GatewayAccountState } from '@opencreator/protocol';
+import { createGatewayAccountService, type GatewayBillingSummary } from './gateway-account-service.js';
+
+const signedIn: GatewayAccountState = { source: 'gateway', authState: 'signed_in', activationState: 'ready', account: { id: 'a', email: '[email protected]', verified: true }, bindingVersion: null, models: [], activationError: null };
+const signedOut: GatewayAccountState = { ...signedIn, source: 'manual', authState: 'signed_out', account: null };
+const summary: GatewayBillingSummary = { balance: { availableUnits: '123000000', reservedUnits: '0', periodEnd: null, asOf: '2026-10-15T00:00:00Z' }, subscription: null, billingAvailable: true };
+
+it('checks task models through the Daemon without changing global defaults', async () => {
+ const client = new RuntimeClient({ baseUrl: 'http://localhost', fetchImpl: vi.fn(async () => Response.json({ costBearer: 'customer' })) });
+ const post = vi.spyOn(client, 'post'); const patch = vi.spyOn(client, 'patch');
+ await createGatewayAccountService(client).probeModel('video', 'vendor/video');
+ expect(post).toHaveBeenCalledWith('/gateway/model/probe', { modality: 'video', model: 'vendor/video' });
+ expect(patch).not.toHaveBeenCalled();
+});
it('checks browser authorization through the shared Daemon and adds the host return destination', async () => {
const grant = { attemptId: 'attempt-1', authorizationUrl: 'https://gateway.example/device?grant=attempt-1', expiresAt: '2026-10-10T12:00:00Z' };
@@ -20,12 +33,98 @@ it('displays a signed-in account when official activation is blocked', async ()
await expect(createGatewayAccountService(client).getState()).resolves.toEqual(snapshot);
});
+it('forces a model catalog refresh through the shared Daemon', async () => {
+ const client = new RuntimeClient({ baseUrl: 'http://localhost', fetchImpl: vi.fn(async () => Response.json({})) });
+ const read = vi.spyOn(client, 'get'); const post = vi.spyOn(client, 'post');
+ const service = createGatewayAccountService(client);
+ await service.getState({ refreshModels: true });
+ expect(read).toHaveBeenLastCalledWith('/gateway/account?refreshModels=1');
+ await service.getState({ checkAuthorization: true, refreshModels: true });
+ expect(post).toHaveBeenLastCalledWith('/gateway/auth/check', {});
+ expect(read).toHaveBeenCalledTimes(2);
+});
+
it('reads the subscription summary through the shared Daemon', async () => {
const client = new RuntimeClient({ baseUrl: 'http://localhost', fetchImpl: vi.fn(async () => Response.json({})) });
const read = vi.spyOn(client, 'get');
await createGatewayAccountService(client).getSummary();
expect(read).toHaveBeenCalledWith('/gateway/billing/summary');
});
+
+it('preloads credits without blocking account state and shares an in-flight read', async () => {
+ let finish!: (response: Response) => void;
+ const fetcher = vi.fn(async (url: string | URL | Request) => String(url).endsWith('/gateway/account')
+ ? Response.json(signedIn) : new Promise<Response>(resolve => { finish = resolve; }));
+ const service = createGatewayAccountService(new RuntimeClient({ baseUrl: 'http://localhost', fetchImpl: fetcher }));
+ await expect(service.getState()).resolves.toEqual(signedIn);
+ const first = service.getSummary();
+ expect(service.getSummary()).toBe(first);
+ expect(fetcher).toHaveBeenCalledTimes(2);
+ expect(service.getCachedSummary('a')).toBeUndefined();
+ finish(Response.json(summary));
+ await expect(first).resolves.toEqual(summary);
+ expect(service.getCachedSummary('a')).toEqual(summary);
+ expect(service.getCachedSummary('b')).toBeUndefined();
+ await service.getState();
+ expect(fetcher).toHaveBeenCalledTimes(3);
+});
+
+it('refreshes cached credits from the server and retains them when a refresh fails', async () => {
+ const fetcher = vi.fn(async (url: string | URL | Request) => Response.json(String(url).endsWith('/gateway/account') ? signedIn : summary));
+ const service = createGatewayAccountService(new RuntimeClient({ baseUrl: 'http://localhost', fetchImpl: fetcher }));
+ await service.getState(); await service.getSummary();
+ const updated = { ...summary, balance: { ...summary.balance, availableUnits: '8000000' } };
+ fetcher.mockResolvedValueOnce(Response.json(updated));
+ await expect(service.getSummary()).resolves.toEqual(updated);
+ expect(service.getCachedSummary('a')).toEqual(updated);
+ fetcher.mockRejectedValueOnce(new Error('offline'));
+ await expect(service.getSummary()).rejects.toThrow();
+ expect(service.getCachedSummary('a')).toEqual(updated);
+});
+
+it('discards a pending credit preload when the signed-in account changes', async () => {
+ let finish!: (response: Response) => void;
+ const next = { ...signedIn, account: { ...signedIn.account!, id: 'b' } };
+ const fetcher = vi.fn()
+ .mockResolvedValueOnce(Response.json(signedIn))
+ .mockImplementationOnce(() => new Promise<Response>(resolve => { finish = resolve; }))
+ .mockResolvedValueOnce(Response.json(next))
+ .mockResolvedValueOnce(Response.json({ ...summary, balance: { ...summary.balance, availableUnits: '8000000' } }));
+ const service = createGatewayAccountService(new RuntimeClient({ baseUrl: 'http://localhost', fetchImpl: fetcher }));
+ await service.getState(); const previous = service.getSummary();
+ await service.getState(); await service.getSummary();
+ finish(Response.json(summary)); await previous;
+ expect(service.getCachedSummary('a')).toBeUndefined();
+ expect(service.getCachedSummary('b')?.balance.availableUnits).toBe('8000000');
+});
+
+it('clears cached credits on logout and ignores an earlier account response', async () => {
+ let finish!: (response: Response) => void;
+ const fetcher = vi.fn()
+ .mockResolvedValueOnce(Response.json(signedIn))
+ .mockResolvedValueOnce(Response.json(summary))
+ .mockImplementationOnce(() => new Promise<Response>(resolve => { finish = resolve; }))
+ .mockResolvedValueOnce(Response.json(signedOut));
+ const service = createGatewayAccountService(new RuntimeClient({ baseUrl: 'http://localhost', fetchImpl: fetcher }));
+ await service.getState(); await service.getSummary();
+ const pending = service.getState();
+ await service.logout();
+ finish(Response.json(signedIn)); await pending;
+ expect(service.getCachedSummary('a')).toBeUndefined();
+ expect(fetcher).toHaveBeenCalledTimes(4);
+});
+
+it('cannot restore a pending credit response after logout', async () => {
+ let finish!: (response: Response) => void;
+ const fetcher = vi.fn()
+ .mockResolvedValueOnce(Response.json(signedIn))
+ .mockImplementationOnce(() => new Promise<Response>(resolve => { finish = resolve; }))
+ .mockResolvedValueOnce(Response.json(signedOut));
+ const service = createGatewayAccountService(new RuntimeClient({ baseUrl: 'http://localhost', fetchImpl: fetcher }));
+ await service.getState(); const pending = service.getSummary();
+ await service.logout(); finish(Response.json(summary)); await pending;
+ expect(service.getCachedSummary('a')).toBeUndefined();
+});
it('requests a website session with the host billing return address', async () => {
const client = new RuntimeClient({ baseUrl: 'http://localhost', fetchImpl: vi.fn(async () => Response.json({ url: 'https://gateway.example/auth#handoff=code' })) });
const post = vi.spyOn(client, 'post');
diff --git a/apps/web/src/services/gateway-account-service.ts b/apps/web/src/services/gateway-account-service.ts
index e2e6aae9..26cea948 100644
--- a/apps/web/src/services/gateway-account-service.ts
+++ b/apps/web/src/services/gateway-account-service.ts
@@ -1,4 +1,4 @@
-import type { GatewayAccountState, GatewayAuthorization, GatewayBalanceSnapshot, GatewayBalanceState, ServiceSource } from '@opencreator/protocol';
+import type { GatewayAccountState, GatewayAuthorization, GatewayBalanceSnapshot, GatewayBalanceState, GatewayModelProbeOptions, ServiceSource } from '@opencreator/protocol';
import type { RuntimeClient } from '../runtime/client.js';
export type GatewayPlan = { id: string; name: string; currency: string; amountUnits: string; creditUnits: string; wechatAmountUnits?: string };
export type GatewayBillingAvailability = {
@@ -12,7 +12,7 @@ export type GatewayRechargeOrder = {
status: string; paymentStatus: string; creditStatus: string; reviewRequired: boolean;
paymentMode: 'test' | 'live'; createdAt: string; expiresAt?: string; paidAt: string | null; completedAt: string | null;
};
-export type GatewayCreditGrant = { id: string; kind: 'grant'; units: string; createdAt: string; businessKey: string; source: string };
+export type GatewayCreditGrant = { id: string; kind: 'grant' | 'reserve' | 'settle' | 'release' | 'refund' | 'migration'; units: string; createdAt: string; businessKey: string; source?: string; facts?: { model?: string; requestId?: string; releasedUnits?: string; reason?: string } };
export type GatewayBillingSummary = {
balance: GatewayBalanceSnapshot;
subscription: { id: string; status: string; periodStart: string; periodEnd: string; cancelAtPeriodEnd: boolean; nextPlanId: string | null; plan?: GatewayPlan } | null;
@@ -26,6 +26,34 @@ export type GatewayWebDestination = 'recharge' | 'account' | 'usage' | 'faq';
export function createGatewayAccountService(client: Pick<RuntimeClient, 'get' | 'post' | 'patch'> & Partial<Pick<RuntimeClient, 'rawGet'>>, options: { authorizationReturnUrl?: string; billingReturnUrl?: string } = {}) {
const rawGet = client.rawGet?.bind(client);
let avatarCache: { key: string; work: Promise<Blob> } | undefined;
+ let accountId: string | undefined;
+ let accountGeneration = 0;
+ let summaryCache: { accountId: string; value: GatewayBillingSummary } | undefined;
+ let summaryWork: Promise<GatewayBillingSummary> | undefined;
+ function clearSummary(nextAccountId?: string) {
+ accountGeneration++; accountId = nextAccountId;
+ summaryCache = undefined; summaryWork = undefined;
+ }
+ function getSummary(): Promise<GatewayBillingSummary> {
+ if (summaryWork) return summaryWork;
+ const expected = accountGeneration; const owner = accountId;
+ const work = client.get<GatewayBillingSummary>('/gateway/billing/summary').then(value => {
+ if (owner && expected === accountGeneration) summaryCache = { accountId: owner, value };
+ return value;
+ }).finally(() => { if (summaryWork === work) summaryWork = undefined; });
+ summaryWork = work;
+ return work;
+ }
+ function observeState(state: GatewayAccountState, expected = accountGeneration): GatewayAccountState {
+ if (expected !== accountGeneration) return state;
+ const nextAccountId = state.authState === 'signed_in' ? state.account?.id : undefined;
+ if (nextAccountId !== accountId) {
+ clearSummary(nextAccountId);
+ // Warm the account view without delaying sign-in or model preparation.
+ if (nextAccountId) void getSummary().catch(() => undefined);
+ }
+ return state;
+ }
return {
...(rawGet ? { getAvatar(accountId: string, revision: string): Promise<Blob> {
const key = `${accountId}:${revision}`;
@@ -37,8 +65,13 @@ export function createGatewayAccountService(client: Pick<RuntimeClient, 'get' |
avatarCache = { key, work };
return work;
} } : {}),
- getState(options?: { checkAuthorization?: boolean }): Promise<GatewayAccountState> {
- return options?.checkAuthorization ? client.post('/gateway/auth/check', {}) : client.get('/gateway/account');
+ async getState(options?: { checkAuthorization?: boolean; refreshModels?: boolean }): Promise<GatewayAccountState> {
+ const expected = accountGeneration;
+ if (options?.checkAuthorization) {
+ const state = observeState(await client.post<GatewayAccountState>('/gateway/auth/check', {}), expected);
+ if (!options.refreshModels) return state;
+ }
+ return observeState(await client.get<GatewayAccountState>('/gateway/account' + (options?.refreshModels ? '?refreshModels=1' : '')), expected);
},
async start(): Promise<GatewayAuthorization> {
const grant = await client.post<GatewayAuthorization>('/gateway/auth/start', {});
@@ -47,22 +80,30 @@ export function createGatewayAccountService(client: Pick<RuntimeClient, 'get' |
url.searchParams.set('returnTo', options.authorizationReturnUrl);
return { ...grant, authorizationUrl: url.href };
},
- cancel(): Promise<GatewayAccountState> { return client.post('/gateway/auth/cancel', {}); },
- logout(): Promise<GatewayAccountState> { return client.post('/gateway/auth/logout', {}); },
+ async cancel(): Promise<GatewayAccountState> { return observeState(await client.post<GatewayAccountState>('/gateway/auth/cancel', {})); },
+ async logout(): Promise<GatewayAccountState> {
+ clearSummary();
+ return observeState(await client.post<GatewayAccountState>('/gateway/auth/logout', {}));
+ },
activate(): Promise<GatewayAccountState> { return client.post('/gateway/auth/activate', {}); },
setSource(source: ServiceSource): Promise<GatewayAccountState> { return client.patch('/gateway/source', { source }); },
- selectModel(modality: import('@opencreator/protocol').GatewayModel['modality'], model: string): Promise<GatewayAccountState> { return client.patch('/gateway/model', { modality, model }); },
+ setRegion(region: 'auto' | 'domestic' | 'overseas'): Promise<GatewayAccountState> { return client.patch('/gateway/supplier-region', { region }); },
+ selectModel(modality: import('@opencreator/protocol').GatewayModelPurpose, model: string): Promise<GatewayAccountState> { return client.patch('/gateway/model', { modality, model }); },
+ probeModel(modality: import('@opencreator/protocol').GatewayModel['modality'], model: string, options?: GatewayModelProbeOptions): Promise<{ model: string; modality: import('@opencreator/protocol').GatewayModel['modality']; costBearer: 'customer' }> {
+ return client.post('/gateway/model/probe', { modality, model, ...options });
+ },
getBalance(): Promise<GatewayBalanceState> { return client.get('/gateway/billing'); },
- getSummary(): Promise<GatewayBillingSummary> { return client.get('/gateway/billing/summary'); },
+ getSummary,
+ getCachedSummary(owner: string): GatewayBillingSummary | undefined { return summaryCache?.accountId === owner ? summaryCache.value : undefined; },
openWebAccount(destination: GatewayWebDestination, locale: 'zh' | 'en'): Promise<{ url: string }> {
return client.post('/gateway/account/web', { destination, locale, ...(options.billingReturnUrl ? { returnUrl: options.billingReturnUrl } : {}) });
},
getPlans(): Promise<GatewayPlans> { return client.get('/gateway/plans'); },
getOrders(): Promise<{ items: GatewayRechargeOrder[] }> { return client.get('/gateway/billing/orders'); },
getOrder(id: string): Promise<{ order: GatewayRechargeOrder }> { return client.get('/gateway/billing/orders/' + encodeURIComponent(id)); },
- getCreditGrants(cursor?: string): Promise<{ items: GatewayCreditGrant[] }> { return client.get('/gateway/billing/ledger' + (cursor ? '?cursor=' + encodeURIComponent(cursor) : '')); },
+ getCreditGrants(cursor?: string): Promise<{ items: GatewayCreditGrant[]; nextCursor?: string }> { return client.get('/gateway/billing/ledger' + (cursor ? '?cursor=' + encodeURIComponent(cursor) : '')); },
checkout(planId: string, operationId: string, options: { locale?: 'zh' | 'en'; currency?: string } = {}): Promise<{ url: string; orderId: string }> { return client.post('/gateway/billing/checkout', { planId, operationId, ...options }); },
portal(): Promise<{ url: string }> { return client.post('/gateway/billing/portal', {}); }
};
}
-export type GatewayAccountSettingsService = Omit<ReturnType<typeof createGatewayAccountService>, 'openWebAccount'> & Partial<Pick<ReturnType<typeof createGatewayAccountService>, 'openWebAccount'>>;
+export type GatewayAccountSettingsService = Omit<ReturnType<typeof createGatewayAccountService>, 'openWebAccount' | 'probeModel' | 'setRegion' | 'getCachedSummary'> & Partial<Pick<ReturnType<typeof createGatewayAccountService>, 'openWebAccount' | 'probeModel' | 'setRegion' | 'getCachedSummary'>>;
diff --git a/apps/web/src/services/model-probe-error.ts b/apps/web/src/services/model-probe-error.ts
new file mode 100644
index 00000000..9a35ae10
--- /dev/null
+++ b/apps/web/src/services/model-probe-error.ts
@@ -0,0 +1,18 @@
+import { ApiClientError } from '../runtime/errors.js';
+
+export function modelProbeErrorMessage(error: unknown, l: (zh: string, en: string) => string): string | undefined {
+ const code = error instanceof ApiClientError ? error.details?.gatewayCode : undefined;
+ if (typeof code !== 'string' || !code.startsWith('model_probe_')) return undefined;
+ const message = code === 'model_probe_failed'
+ ? l('该模型当前不可用,请选择其他模型', 'This model is currently unavailable. Choose another model.')
+ : code === 'model_probe_auth_required'
+ ? l('模型凭证已失效,请重新连接官方服务', 'Model credentials have expired. Reconnect official services.')
+ : code === 'model_probe_unavailable'
+ ? l('模型检测暂不可用,请稍后重试', 'Model checks are temporarily unavailable. Try again later.')
+ : code === 'model_probe_credits_insufficient'
+ ? l('积分不足或模型额度已用完,请充值后重试', 'Insufficient credits or model quota. Add credits and try again.')
+ : l('暂时无法确认模型可用性,请重试', 'Model availability could not be confirmed. Try again.');
+ const facts = error instanceof ApiClientError ? error.details?.publicFacts : undefined;
+ const reason = facts && typeof facts === 'object' && 'upstreamMessage' in facts ? facts.upstreamMessage : undefined;
+ return typeof reason === 'string' && reason.trim() ? `${message}\n${reason}` : message;
+}
diff --git a/apps/web/src/styles/app.css b/apps/web/src/styles/app.css
index a2a91a42..f54193a2 100644
--- a/apps/web/src/styles/app.css
+++ b/apps/web/src/styles/app.css
@@ -5444,6 +5444,8 @@ a.creator-template-author-avatar:focus-visible {
.composer-model-status-error {
color: var(--danger);
+ white-space: pre-line;
+ overflow-wrap: anywhere;
}
.composer-menu-item {
diff --git a/docs/openrouter-model-availability.md b/docs/openrouter-model-availability.md
new file mode 100644
index 00000000..bb95b6ac
--- /dev/null
+++ b/docs/openrouter-model-availability.md
@@ -0,0 +1,184 @@
+# OpenRouter model availability
+
+OpenCreator follows OpenRouter's account catalog and explicit access responses.
+It does not maintain a country allowlist based on where our adapter tests ran.
+Anthropic text models remain excluded because OpenCreator's current text adapter
+does not support them. This compatibility constraint is independent of regional
+access and still applies when OpenRouter includes them in the account catalog.
+
+## Official regional policy
+
+[OpenRouter's terms](https://openrouter.ai/terms), sections 5.7 and 6.8, describe
+restrictions imposed by individual model providers and the country of the
+originating request. They do not publish a universal model-by-country table.
+The [provider routing guide](https://openrouter.ai/docs/guides/routing/provider-selection)
+links to individual provider terms. A model can also have multiple providers,
+so its vendor prefix is not a complete access policy.
+
+[`GET /api/v1/models/user`](https://openrouter.ai/docs/api/api-reference/models/list-models-filtered-by-user-provider-preferences-privacy-settings-and-guardrails)
+filters account provider preferences, privacy settings, and guardrails. The
+request includes `output_modalities=all` to cover media as well as text.
+This API does not promise to filter every restriction on the user's country.
+Filtering through an EU or US regional hostname concerns data residency, not a
+general list of supported user countries.
+
+## Display policy
+
+- A model must appear in both the gateway's compatible catalog and the actual
+ customer's OpenRouter catalog. Expired or unavailable account metadata hides
+ the models until refreshed.
+- Text models must have Responses support in the gateway's compatible catalog
+ and pass OpenCreator's compatibility policy, which excludes Anthropic models,
+ OpenRouter routing models, and batch variants. Cached catalogs and default
+ model selection apply the same policy.
+ Login, catalog refresh, model selection, chat startup, and Creator preflight
+ validate the catalog and configuration without additional inference. Only
+ user-confirmed connection tests send separate paid requests, as described below.
+ Startup inference also requires explicit test opt-in using
+ `OPENCREATOR_ENABLE_PAID_STARTUP_PROBE=1` together with
+ `OPENCREATOR_REQUIRE_CODEX_PROBE=1`; normal Desktop startup does not enable it.
+- Image, video, speech, and transcription models are admitted without internal
+ `verification` metadata. The customer's directory must include the model and
+ its declared output modality must match. Published voices, image parameters
+ from `/images/models`, and video parameters from `/videos/models` update the
+ gateway's capability metadata. Optional discovery failures retain the existing
+ gateway parameters. Internal adapter test records are release evidence, not
+ a customer model allowlist.
+- Ordinary transcription does not require subtitle timestamps. A subtitle
+ request using `verbose_json` must return actual timestamps; missing timings
+ are rejected without inventing them or resubmitting a paid request. Speech
+ voices are validated against the published catalog regardless of test flags.
+ Speech synthesis and previews use the upstream's default audio encoding;
+ OpenCreator consumes the actual MIME and wraps PCM in WAV using the returned
+ sample-rate and channel metadata. This avoids forcing MP3 on PCM-only models.
+- An explicit model permission, region, or provider terms failure hides the exact
+ model. After one hour, a successful account catalog refresh can restore it.
+ Quota, moderation, unsupported request formats, rate limits, and temporary
+ outages are not evidence of a geographic restriction. Accepted jobs and error
+ bodies inside successful HTTP responses must also be checked for restrictions.
+- Changing the account, key material or version, proxy, or observed network exit
+ invalidates cached catalogs, access failures, and recent success observations.
+ Account/key identities and the network exit are hashed; the customer's key
+ and raw IP address are not persisted in this cache. Exit
+ detection is optional and has a short timeout; failures do not block catalog
+ loading or use of a valid catalog.
+
+## Refresh and recovery
+
+Catalogs are cached for five minutes and updated atomically after every page is
+validated. Login fetches a fresh catalog with the customer's key through the same
+network transport as generation. Concurrent queries share the same request.
+Temporary refresh failures can reuse an unexpired catalog for the same account,
+key version, and network. Expired catalogs hide models until refreshed. HTTP 401
+and 403 catalog responses invalidate even an unexpired cached catalog.
+HTTP 401 also requests a binding refresh through the existing account service to
+recover a replaced model key, with a 30-second retry limit and no inference.
+
+The account menu's Refresh models command and Reconnect force a catalog refresh.
+Automatic retries after errors are limited to once per 30 seconds. Logout and
+account changes cancel in-flight queries, and late results cannot restore the
+previous account's models. Cache version 3 retains only unexpired exact-model
+rejections from version 2; old allowed and unknown probe states are discarded.
+
+An unavailable directory is reported separately from a successful empty or
+incompatible directory. Both leave account sign-in and billing accessible.
+Automatic Runtime recovery waits until idle. Explicit model selection is allowed
+while tasks, model requests, and remote jobs are in progress. It updates the
+default without replacing the same account's Runtime hosts or direct connection:
+existing turns and Creator job snapshots keep their submitted models, and new
+tasks use the updated default. Request snapshots and paid job receipts are
+preserved, with no automatic resubmission after a restriction.
+
+## Selection and actual request observations
+
+Official service settings, the chat composer, and Creator tasks accept models
+that appear in the current account catalog and pass adapter compatibility
+checks. Selecting a model saves the choice immediately without a probe. Chat
+startup and Creator preflight validate the selected model and configuration;
+the task's own inference request is the first paid request.
+
+Catalog membership is not evidence of successful inference. Account snapshots
+expose separate model observations: `unverified`, `recent_success`, and
+`restricted`. A completed task request records success for its specific
+operation, such as Responses or Chat Completions, for five minutes. A success
+on one text interface does not establish support for the other. Reading or
+replaying a cached result does not refresh its success timestamp.
+
+Explicit model permission, region, or provider terms rejections override
+parallel successes and hide only that model. Timeouts, insufficient credits,
+quota limits, rate limits, and temporary service failures clear recent success
+evidence without quarantining the model. Late results from an old account,
+key, network context, or changed model metadata cannot update current evidence.
+Actual requests still handle live provider errors and keep accepted media job
+IDs and receipts; a connection problem does not trigger another submission.
+
+## Explicit connection tests
+
+Each official model row has a connection-test action. It requires confirmation
+that a real request may consume credits, including when a test fails. Text
+tests let the user choose Conversation (Responses) or Text processing (Chat
+Completions), and call only that interface. Cancelling sends no inference.
+Testing a model does not change the default selection.
+
+Every explicit test uses the current account's inference key and calls
+`https://openrouter.ai/api/v1` through the existing direct adapter. There is no
+probe credential request to the account gateway and no separate platform key.
+Valid cached credentials allow a check even when the account gateway is offline
+or the account access token has expired, just as they allow normal inference.
+Model access, proxy routing, and key permissions therefore match generation.
+
+These tests perform real inference and may consume customer credits; their
+result reports `costBearer: customer`. Failure does not guarantee zero cost,
+especially if a remote job was accepted. Probe receipts remain separate from task receipts so they
+cannot be replayed as task outputs. HTTP 401 reports expired model credentials,
+HTTP 402 and key limits report insufficient credits, and uncertain failures
+do not automatically resubmit inference. A confirmed HTTP 401 may refresh the
+binding and retry once only when the actual model key has been replaced.
+
+The earlier implementation depended on
+`POST /api/v1/client/probe-credentials`. On 2026-10-14 that endpoint returned
+HTTP 404, stopping the check before OpenRouter was called. That dependency has
+been removed; probe availability no longer requires a gateway rollout.
+
+- A Conversation test checks a completed Responses tool call. A Text processing
+ test checks a nonempty, completed Chat Completions reply. Each test is one call.
+- Image checks one generated, decodable raster using published parameters.
+- Speech checks a short delivery with audio MIME and nonempty content.
+- Transcription checks a small known spoken WAV and nonempty transcription.
+- Video uses minimum published duration and size, waits for completion, and
+ retrieves nonempty video content. Acceptance alone does not pass.
+
+Concurrent identical connection tests share one in-flight request. A new
+user-confirmed test makes a fresh request. Recent success observations are
+informational and are never a paid prerequisite for selection or task startup.
+
+These checks test a specific small request, not every capability or parameter.
+They use the same model key as subsequent tasks. Future requests remain
+subject to live provider routing, permissions, moderation, and availability;
+failures must still be handled without automatic paid resubmission.
+
+## Live check on 2026-10-14
+
+The same existing customer key returned HTTP 200 and 664 models from the Japan
+proxy exit and the US exit reported by the production server's OpenRouter trace.
+The sorted ID lists were identical. Both queries used `output_modalities=all` and
+submitted no inference requests. This verifies the catalog integration for these
+two exits, not worldwide geographic access.
+
+The initial policy showed 309 text models and hid 135 media candidates because
+the saved gateway catalog lacked internal adapter verification metadata. The
+subsequent repair removes that dependency: media discovery uses OpenRouter's
+catalog and capability APIs and does not require a gateway verification rollout.
+
+The running development account and settings page subsequently showed 309 text,
+49 image, 26 video, 35 speech, and 25 transcription models, with all five model
+selectors enabled. Live platform-funded native-encoding checks passed for
+Kokoro 82M (24 kHz mono WAV) and HeyGen Voice 1 Turbo (44.1 kHz mono WAV). Both
+outputs decoded completely and contained non-silent audio. Voxtral Mini
+Transcribe recognized the known test sentence and returned real segment timings.
+Both independent test keys were disabled afterwards; customer credits were not
+used. Management-key accounting confirmed USD 0.00040728 for four speech calls
+and one transcription call, including the first two speech deliveries before
+the verification script's decoder path was corrected. Image and video
+submission, parameter validation, receipts and replay were
+covered by targeted automated tests, without new paid image or video generations.
diff --git a/docs/operations/2026-10-15-gateway-release-blockers-fixed.md b/docs/operations/2026-10-15-gateway-release-blockers-fixed.md
new file mode 100644
index 00000000..fd7dac7e
--- /dev/null
+++ b/docs/operations/2026-10-15-gateway-release-blockers-fixed.md
@@ -0,0 +1,56 @@
+# 2026-10-15 图片回执修复与旧账户迁移验收
+
+结论:[发布检查](2026-10-15-gateway-release-readiness.md) 中的两个 P1 阻塞已解决。本记录不代表真实支付、全部平台签名和全部发布候选门禁已通过。
+
+## 图片生成
+
+`apps/daemon/src/image-generation/provider.ts` 现在兼容 `ocreq_` 网关编号及原有 `ocdir_` 编号,仍要求编号格式正确且响应体与 `X-Request-ID` 一致。
+
+新增 `creator-gateway-image.test.ts` 集成回归覆盖:
+
+- 两种编号的异步提交、状态轮询、结果下载、Stage、Artifact 和 ResultSnapshot 完整流程。
+- 拒绝编号不一致的回执。
+- 查询确认付费结果后重试,沿用原逻辑编号和幂等键取回结果。
+
+真实恢复任务 `creator_job_IMgYeZNH7IWn4EMFF-gT7` 已完成,图片产物 734366 字节,旧错误均关闭,相关回执全部成功。恢复前后可用余额同为 2395.43691 积分、冻结余额均为 0。正式网关中原图片请求仍只有一条、消费仍为 100 积分,没有新建供应商调用。
+
+## 生产旧账户迁移
+
+新增运维命令位于 `open-creator-gateway/cmd/credits-migrate`,默认仅列出待迁移账户。执行必须显式提供 `-execute`、`-actor` 和 `-reason`,可限制账户和批次。默认账户间隔两秒,只记录不含密钥的 HTTP 状态诊断。
+
+命令复用原有 `MigrateGateway`:锁定账户、持久化迁移标记、撤销并核验旧 Key、读取权威剩余额度、加上尚未同步的已授额度、一次性写入钱包和迁移流水。没有绕过迁移门禁,也没有重新发放历史累计赠送或充值。
+
+本轮先迁移并核对 4 个付费账户,再处理其余账户。首轮 63 个账户在上游核验时失败,未被强行按零余额迁移;之后分批、低频续跑全部成功。重复预览的候选列表为空。
+
+| 核对项目 | 结果 |
+| --- | ---: |
+| 用户总数 | 169 |
+| 新钱包总数 | 169 |
+| 本轮成功迁移旧账户 | 149 |
+| 本轮迁入积分(内部精度) | 9267.8 |
+| 累计完成迁移记录(含原测试账户) | 150 |
+| 旧账户缺钱包 | 0 |
+| 付费账户缺钱包 | 0 |
+| 未完成迁移标记 | 0 |
+| 钱包守恒或负数异常 | 0 |
+| 迁移流水与期初金额不一致 | 0 |
+| 已迁移但旧 Key 未标记停用 | 0 |
+
+操作人记录为 `operator:release-20261015`,原因为 `release-gateway-wallet-migration`。管理流程已在每个账户入账前核验上游停用状态;没有新增或提升普通用户的管理员权限。
+
+生产备份与日志目录为 `/var/backups/open-creator-gateway`,目录权限 0700,文件权限 0600:
+
+- `before-credit-migration-20261015.dump`:迁移前数据库备份,已通过 `pg_restore --list` 验证。
+- `after-credit-migration-20261015.dump`:迁移后数据库备份。
+- `credit-migration-rest-20261015.jsonl`、`credit-migration-retry-20261015.jsonl`:批次日志,逐账户余额仍以数据库只追加账本为准。
+
+## 验证与包
+
+- 图片、网关服务、媒体传输、命令派发和图片执行器定向测试:79 项通过。
+- Daemon 源码及测试 TypeScript 检查通过。
+- 隔离 PostgreSQL 下的迁移测试通过:默认预览无副作用、缺失供应商提前阻断、分批续跑、已完成账户不重复入账、只迁入核实剩余额度、撤销响应丢失后恢复,以及诊断不泄露凭据。
+- 当前修复已重新构建进本机 macOS arm64 Desktop 包。包校验通过;包内图片 provider 与本次 Daemon 构建文件 SHA-256 一致,为 `02955ae2acdedb4d0bfbdcbfad24e9073775f1514a414ad1473eaa76df8144f5`。
+- 新包实际 App 的任务重启恢复、充值回跳、授权回调三项测试全部通过。
+- 本地 Runtime 与正式网关健康检查正常。
+
+本机包仍为版本 3.2.6、未签名,路径为 `apps/desktop/release/mac-arm64/OpenCreator.app`。本轮没有发布版本或创建 Git 提交。
diff --git a/docs/operations/2026-10-15-gateway-release-readiness.md b/docs/operations/2026-10-15-gateway-release-readiness.md
new file mode 100644
index 00000000..9746cc5e
--- /dev/null
+++ b/docs/operations/2026-10-15-gateway-release-readiness.md
@@ -0,0 +1,109 @@
+# 2026-10-15 登录、充值与创作任务发布检查
+
+后续修复:本报告发现的两个 P1 已处理,图片任务已恢复,149 个旧账户已完成生产迁移。详见 [修复与迁移验收](2026-10-15-gateway-release-blockers-fixed.md)。真实支付及其他正式发布门禁仍按原报告执行。
+
+以下保留修复前的检查快照。初次检查结论:当时不能判定为可正式发布,图片任务存在“已扣积分但客户端任务失败”的缺陷,存量用户迁移也尚未完成。
+
+检查范围为当前本地工作区、线上网关及一个已登录测试账户。工作区含大量未提交改动;本次未修改产品代码、迁移生产用户、部署服务或发布版本。真实模型调用仅生成一张图片及一段短视频字幕,合计消耗 100.9947 积分。没有执行真实 Stripe 付款。
+
+## 发布阻塞
+
+### P1:图片异步请求编号协议不一致,已扣积分却没有客户端产物
+
+- 客户端 `apps/daemon/src/image-generation/provider.ts:267` 只接受 `ocdir_` 加 48 位十六进制的异步回执。
+- 正式网关 `open-creator-gateway/internal/modelproxy/service.go:217` 使用 `ocreq_` 加 48 位十六进制。
+- 当前官方图片请求主动携带 `Prefer: respond-async`,因此会进入这个校验分支。
+- 实测任务 `creator_job_IMgYeZNH7IWn4EMFF-gT7`,模型 `gpt-image-2.5-flare`,一张 1024×1024 图片:客户端约三秒后报 `Invalid image generation receipt`,任务失败,产物为空,并留下 `creator_provider_resolution_required`。
+- 对应网关请求 `ocreq_eddce76e924a388b6d87891e0c0fbac78f2533008fb27135` 最终为 `succeeded / settled`,实际扣除 100 积分;客户端回执仍为 `waiting_remote`。
+- 已通过同一请求的只读结果接口取回 PNG,734366 字节,1024×1024,像素非空且内容符合测试提示词。文件位于 `/tmp/opencreator-release-image-20261015.png`。没有重新生成或重复扣费。
+
+发布前应统一异步回执协议,并覆盖完整的 Creator 图片任务:提交、轮询、下载、产物保存、账本终态、异常恢复。验证时优先取回这次已付费结果,避免重新提交。
+
+### P1:149 个存量账户未迁入网关钱包,包含 4 个付费账户
+
+生产只读查询结果:用户 169 个,网关钱包 20 个,已有旧绑定或旧额度记录但没有新钱包的用户 149 个;其中 4 个账户有历史已付款订单。
+
+`open-creator-gateway/internal/credits/service.go:37` 的 `EnsureTx` 对上述用户返回 `409 credits_migration_required`。此门禁会阻断模型初始化、余额获取和新充值下单:
+
+- `internal/server/device.go:21`:登录后 bootstrap 初始化。
+- `internal/credits/service.go:115`、`:131`:查询余额和请求冻结。
+- `internal/billing/service.go:152`:充值下单。
+
+这是保护旧余额的迁移门禁,不能通过删掉检查或重发历史赠送积分绕过。发布前需使用现有迁移流程核对旧供应商剩余额度、撤销旧密钥并迁入新钱包。生产当前没有 `admin` 用户,需同时落实迁移的管理入口。迁移实现位于 `internal/direct/gateway_migration.go`。
+
+## 已核实行为
+
+| 流程 | 检查结果 | 证据与边界 |
+| --- | --- | --- |
+| 已有账号登录态 | 可用 | 当前真实账户可以获取生产 bootstrap、模型列表、余额和订单;桌面授权回调测试通过。首次注册邮件投递未实测。 |
+| 新用户初始积分 | 当前配置为 0 | `gateway_proxy.trial_credits = 0`。钱包创建和赠送幂等由网关测试覆盖;本轮没有新建生产用户。不能对外承诺登录即送积分。 |
+| 充值套餐 | 配置与公开接口一致 | $5/2500、$10/5000、$20/10000 积分;微信对应 HKD39/78/156。Stripe live 已启用。 |
+| 支付入账与防重复 | 数据库测试通过 | 真实隔离 PostgreSQL 测试覆盖 webhook、主动补查和只入账一次;新网关启用后没有实际充值入账记录,尚不能认定真实支付闭环已验收。 |
+| 积分消费 | 核心核算通过 | 请求冻结、按用量结算、失败释放、并发防透支测试通过;线上钱包账实校验无异常。 |
+| 国内与海外配置 | 网关入口一致 | 两个地区 bootstrap 均返回 `https://www.open-creator.ai/v1`,供应商为 ChatAnywhere,客户端没有收到上游密钥。未在实际海外网络出口测试连通性。 |
+| 视频转录与翻译 | 真实调用成功 | `whisper-1` 转录和 `gpt-6.1-sol` 翻译均成功,客户端回执全部终结,无遗留 issue。 |
+| 字幕合成视频 | 本地短片成功 | 输出 H.264/AAC、640×360、2.554 秒 MP4;已解码抽帧检查双语字幕。此项不代表长视频、平台下载或所有字幕对齐场景已覆盖。 |
+| 图片生成 | 上游成功,Creator 流程失败 | 详见 P1,不能认定图片功能通过。 |
+
+### 当前推荐模型与目录
+
+生产 bootstrap 返回就绪模型数量:文本 39、图片 6、语音合成 5、转录 1。
+
+默认模型为:文本 `gpt-6.1-sol`,图片 `gpt-image-2.5-flare`,语音合成 `gpt-4o-mini-tts`,转录 `whisper-1`。
+
+### 真实视频消费核对
+
+测试任务:`creator_job_nE95I1RGSJDqiLSzEnj30`。
+
+使用本机合成语音制作约 2.6 秒视频,上传后执行字幕阶段,再使用同一结果版本执行横版合成。测试脚本最初未传自动串联所需的 `workflow: true`,因此合成阶段单独启动;没有重新转录或翻译。当前 UI 的正常提交会携带该字段,本轮未用真实 UI 完成自动串联验收。
+
+| 请求 | 冻结积分 | 实际消耗 | 最终状态 |
+| --- | ---: | ---: | --- |
+| `whisper-1` | 0.2587 | 0.2587 | succeeded / settled |
+| `gpt-6.1-sol` | 129.92 | 0.736 | succeeded / settled |
+| 合计 | | 0.9947 | 冻结归零 |
+
+字幕及 MP4 产物均存在且非空,最终任务完成,没有未解决 issue。账户余额从 2396.43161 变为 2395.43691 积分,差额与网关账本一致。积分内部保留精度,界面整数显示相关 Web 测试通过。
+
+注意:短片的 Whisper 结果末尾时间超过媒体时长,不能据此宣称字幕时间对齐质量全部通过;本轮确认的是转录、翻译、产物合成和扣积分链路。
+
+## 自动化及包验证
+
+| 验证 | 实际结果 |
+| --- | --- |
+| 网关 `go test ./... -count=1` | 通过,使用本机隔离 PostgreSQL、真实 ffprobe 和本轮编译的网关二进制,包含 acceptance 测试;上游和支付提供方为测试替身。 |
+| Daemon 16 个相关测试文件 | 327 通过、2 失败、1 跳过。 |
+| Web 11 个相关测试文件 | 310 通过。 |
+| Daemon、Web 类型检查 | 通过。 |
+| 官网授权和支付相关 4 个测试文件 | 14 通过。 |
+| KrillinAI 翻译及 OpenAI 相关定向 Go 测试 | 通过。 |
+| Web 账户与 Web/Desktop parity E2E | 2 失败、2 跳过;旧导航文案和小数积分断言未更新,不能算门禁通过。 |
+| macOS arm64 本地 Desktop 打包 | 成功,版本仍为 3.2.6,未签名;内嵌 Web 资源、构建清单、fuses 和隐私声明校验通过。 |
+| 真实打包 App 定向 E2E | 3 通过、1 失败;通过任务重启恢复、充值回跳、授权回调。启动 Probe 测试在旧计数断言处失败,后续代理断言未执行。 |
+
+### 剩余失败的具体位置
+
+- `apps/daemon/test/integration/creator-image-generation.test.ts:42`:本地 Codex 参考图错误断言期待中文“参考图”,当前结果为英文。不是本次官方图像调用的成功证据。
+- `apps/daemon/test/integration/direct-services.test.ts:455`:错误信息隐藏测试失败,响应包含 `OpenRouter private error`;`apps/daemon/src/gateway/direct-runtime.ts:73` 直接使用 `facts.upstreamMessage`。需要明确并落实公开错误信息约束,不能将此项视为已通过。
+- `apps/web/e2e/gateway-account.spec.ts:39`:仍查找旧的“账户”导航及订阅流程。
+- `apps/web/e2e/gateway-web-desktop-parity.spec.ts:36`:仍期待 `413.937`,与整数积分展示要求冲突。
+- `apps/desktop/e2e/desktop.spec.ts:468`:期待启动 Probe 计数 1,实际为 0;当前 `requiresPaidStartupProbe` 需要显式开启双开关才会执行付费探测。需要更新测试以验证当前启动契约,并补跑被前置断言阻断的检查。
+
+## 生产运行快照
+
+- 网关 systemd 服务运行正常,启动时间为 2026-10-15 17:48:29 CST。
+- 本轮检查时的网关二进制 SHA-256:`5e36bdd16883b307a35efe00a04708b99d1458e3dccf44b2aa6a7076c89ce9de`。
+- 上游地址配置为 `https://api.chatanywhere.org/v1`,启用 gateway proxy。
+- 真实冒烟结束后钱包不变量违规数为 0,测试账户冻结余额为 0。
+- 检查前线上已有图片、转录、语音、对话及 Responses 请求成功记录,但这些单接口记录不能替代完整 Creator 任务验收。
+- 线上已有 5 笔历史已付款订单,付款时间为 10 月 11 至 14 日,早于网关积分钱包切换。不能将它们误判为本次新钱包“漏发充值积分”;也不能用它们证明新方案支付入账已验收。
+
+## 发布前剩余事项
+
+1. 修复官方图片异步回执协议和已付费结果恢复,补完整 Creator 图片集成回归。
+2. 完成并核对存量用户迁移,优先覆盖 4 个付费账户。
+3. 补新网关支付到账闭环验收,确认订单、唯一入账流水、余额及客户端回跳一致。真实 live 付款尚未执行。
+4. 处理上述失败的回归检查,重新执行受影响的发布门禁。
+5. 使用目标正式版本完成签名、公证及全部目标平台的发布候选验证。本轮仅验证了本机未签名 macOS arm64 包,未验证 Windows、macOS x64、正式升级包或真实海外网络。
+
+本报告是本轮检查快照,不是发布批准,也不替代 `opencreator-desktop-release-runbook.md` 中的正式候选门禁。
diff --git a/packages/protocol/src/gateway-account.ts b/packages/protocol/src/gateway-account.ts
index 8b26ec0c..264c7196 100644
--- a/packages/protocol/src/gateway-account.ts
+++ b/packages/protocol/src/gateway-account.ts
@@ -1,10 +1,32 @@
export type ServiceSource = 'manual' | 'gateway';
+export const gatewayModelOperations = ['responses', 'chat/completions', 'images/generations', 'images/edits', 'audio/speech', 'audio/transcriptions', 'video/jobs'] as const;
+export type GatewayModelOperation = typeof gatewayModelOperations[number];
+export type GatewayModelProbeOptions = { textApi?: 'responses' | 'chat/completions' };
+export type GatewayModelAvailability = {
+ model: string;
+ modality: GatewayModel['modality'];
+ status: 'unverified' | 'recent_success' | 'restricted';
+ operation?: GatewayModelOperation;
+ checkedAt?: string;
+};
export const gatewayDefaultVoiceId = '__default__';
+export const gatewayRecommendedModelId = '__recommended__';
export type GatewayModel = {
id: string;
name?: string;
modality: 'text' | 'image' | 'video' | 'speech' | 'transcription';
capabilities: string[];
+ vendor?: string;
+ status?: 'ready' | 'temporarily_unavailable' | 'retired';
+ statusReason?: string;
+ recommended?: boolean;
+ price?: { version: string; inputPerMillion?: number; outputPerMillion?: number; perMinute?: number; perMillionCharacters?: number; perRequest?: number; videoUnitsPerSecond?: Record<string, number> };
+ videoOptions?: {
+ profile: string;
+ maxImages: number; maxVideos: number; maxAudios: number;
+ firstLastFrames: boolean; framesExclusive: boolean; generateAudio: boolean;
+ referenceDuration?: number;
+ };
voices?: string[];
sizes?: string[];
durations?: number[];
@@ -20,15 +42,44 @@ export type GatewayModel = {
maxReferences: number;
};
};
+export type GatewayModelPurpose = GatewayModel['modality'];
+export function gatewayModelSupports(model: GatewayModel, purpose: GatewayModelPurpose): boolean {
+ return model.modality === purpose && (purpose !== 'text' || model.capabilities.includes('responses'));
+}
+export function gatewayModelCompatible(model: GatewayModel): boolean {
+ if (model.vendor?.toLowerCase() === 'anthropic' || /^(?:anthropic\/|claude-)/i.test(model.id)) return false;
+ if (model.modality === 'text') return model.capabilities.includes('responses') && model.capabilities.includes('chat');
+ if (model.modality === 'transcription') return model.capabilities.includes('subtitle_timestamps');
+ return true;
+}
+export function gatewayModelReady(model: GatewayModel): boolean { return !model.status || model.status === 'ready'; }
+export type GatewayConnectionDiagnostics = {
+ path: string;
+ reason: 'timeout' | 'network' | 'http' | 'invalid_response';
+ httpStatus?: number;
+ networkCode?: string;
+};
+export type GatewayActivationStage = 'credentials' | 'usage' | 'bootstrap' | 'catalog' | 'runtime' | 'configuration';
export type GatewayAccountState = {
+ transport?: 'gateway' | 'openrouter-direct' | 'supplier-direct';
+ supplier?: 'openrouter' | '88api' | 'chatanywhere';
+ supplierRegion?: 'auto' | 'domestic' | 'overseas';
source: ServiceSource;
authState: 'signed_out' | 'authorizing' | 'signed_in' | 'signing_out' | 'expired' | 'disabled';
activationState: 'inactive' | 'loading' | 'ready' | 'blocked';
account: { id: string; email: string; verified: boolean; avatarUrl?: string } | null;
bindingVersion: string | null;
+ catalogVersion?: string;
+ catalogUpdatedAt?: string;
+ catalogRefreshState?: 'ready' | 'stale' | 'unavailable';
+ catalogError?: string;
models: GatewayModel[];
- selectedModels?: Partial<Record<GatewayModel['modality'], string>>;
- activationError: { code: string; message: string } | null;
+ modelAvailability?: GatewayModelAvailability[];
+ selectedModels?: Partial<Record<GatewayModelPurpose, string>>;
+ recommendedModels?: Partial<Record<GatewayModelPurpose, string>>;
+ modelSelectionModes?: Partial<Record<GatewayModelPurpose, 'recommended' | 'manual'>>;
+ modelSelectionNotice?: 'selection_updated';
+ activationError: { code: string; message: string; stage?: GatewayActivationStage; request?: GatewayConnectionDiagnostics } | null;
};
export function gatewayVideoSizes(model: GatewayModel | undefined): string[] {
diff --git a/packages/protocol/src/media-generation.ts b/packages/protocol/src/media-generation.ts
index 33e7133f..f2cbd80f 100644
--- a/packages/protocol/src/media-generation.ts
+++ b/packages/protocol/src/media-generation.ts
@@ -106,6 +106,15 @@ export type CreateVideoGenerationRequest = {
size: VideoGenerationSize;
duration: VideoGenerationDuration;
referenceImage?: VideoGenerationReferenceImage;
+ references?: VideoGenerationReference[];
+ generateAudio?: boolean;
+ priceVersion?: string;
+};
+
+export type VideoGenerationReference = {
+ role: 'image' | 'video' | 'audio' | 'firstFrame' | 'lastFrame';
+ assetId: string;
+ fileName: string;
};
export type VideoGenerationResult = {
@@ -118,6 +127,7 @@ export type VideoGenerationResult = {
status: VideoGenerationStatus;
progress: number;
progressKnown?: boolean;
+ phase?: 'preparing' | 'queued' | 'generating' | 'downloading' | 'reconciling';
fileName?: string;
mime?: 'video/mp4';
size?: number;
diff --git a/runtime/krillinai/internal/service/audio2subtitle.go b/runtime/krillinai/internal/service/audio2subtitle.go
index 55fa51cc..7937ff61 100644
--- a/runtime/krillinai/internal/service/audio2subtitle.go
+++ b/runtime/krillinai/internal/service/audio2subtitle.go
@@ -17,6 +17,7 @@ import (
"runtime/debug"
"strconv"
"strings"
+ "sync"
"unicode"
"go.uber.org/zap"
@@ -455,9 +456,14 @@ func (s Service) splitTextAndTranslateV2(
sentences = shortSentences
results := make([]*TranslatedItem, len(sentences))
+ var checkpointMu sync.Mutex
completed := 0
- checkpoint := func(count int) error {
- completed += count
+ checkpoint := func(start int, items []*TranslatedItem) error {
+ // Checkpoint serialization reads every result, so publish under one lock.
+ checkpointMu.Lock()
+ defer checkpointMu.Unlock()
+ copy(results[start:], items)
+ completed += len(items)
if basePath != "" {
path := filepath.Join(basePath, fmt.Sprintf(types.SubtitleTaskTranslationDataPersistenceFileNamePattern, id))
if err := util.SaveToDisk(results, path); err != nil {
@@ -470,14 +476,16 @@ func (s Service) splitTextAndTranslateV2(
return nil
}
- for start := 0; start < len(sentences); start += translationBatchSize {
+ err := runTranslationBatches(ctx, (len(sentences)+translationBatchSize-1)/translationBatchSize, func(ctx context.Context, batchIndex int) error {
+ start := batchIndex * translationBatchSize
end := start + translationBatchSize
if end > len(sentences) {
end = len(sentences)
}
- if err := s.translateSentenceRange(ctx, sentences, results, start, end, targetLang, enableModalFilter, checkpoint); err != nil {
- return nil, err
- }
+ return s.translateSentenceRange(ctx, sentences, start, end, targetLang, enableModalFilter, checkpoint)
+ })
+ if err != nil {
+ return nil, err
}
return results, nil
}
@@ -485,12 +493,14 @@ func (s Service) splitTextAndTranslateV2(
func (s Service) translateSentenceRange(
ctx context.Context,
sentences []string,
- results []*TranslatedItem,
start, end int,
targetLang types.StandardLanguageCode,
enableModalFilter bool,
- onCompleted func(int) error,
+ onCompleted func(int, []*TranslatedItem) error,
) error {
+ if err := ctx.Err(); err != nil {
+ return err
+ }
prompt, err := buildTranslationBatchPrompt(sentences, start, end, targetLang, enableModalFilter)
if err == nil {
var response string
@@ -499,13 +509,14 @@ func (s Service) translateSentenceRange(
var translations []string
translations, err = parseTranslationBatch(response, end-start)
if err == nil {
+ items := make([]*TranslatedItem, len(translations))
for offset, translatedText := range translations {
- results[start+offset] = &TranslatedItem{
+ items[offset] = &TranslatedItem{
OriginText: sentences[start+offset],
TranslatedText: translatedText,
}
}
- return onCompleted(end - start)
+ return onCompleted(start, items)
}
}
}
@@ -518,10 +529,10 @@ func (s Service) translateSentenceRange(
zap.Int("end", end),
zap.Error(err))
middle := start + (end-start)/2
- if err := s.translateSentenceRange(ctx, sentences, results, start, middle, targetLang, enableModalFilter, onCompleted); err != nil {
+ if err := s.translateSentenceRange(ctx, sentences, start, middle, targetLang, enableModalFilter, onCompleted); err != nil {
return err
}
- return s.translateSentenceRange(ctx, sentences, results, middle, end, targetLang, enableModalFilter, onCompleted)
+ return s.translateSentenceRange(ctx, sentences, middle, end, targetLang, enableModalFilter, onCompleted)
}
func buildTranslationBatchPrompt(
diff --git a/runtime/krillinai/internal/service/audio2subtitle_test.go b/runtime/krillinai/internal/service/audio2subtitle_test.go
index 89e04fa1..92b4dae8 100644
--- a/runtime/krillinai/internal/service/audio2subtitle_test.go
+++ b/runtime/krillinai/internal/service/audio2subtitle_test.go
@@ -11,7 +11,9 @@ import (
"krillin-ai/pkg/util"
"os"
"path/filepath"
+ "sort"
"strings"
+ "sync"
"testing"
"github.com/BurntSushi/toml"
@@ -302,6 +304,7 @@ func TestOriginCuesFromTranscriptionFallBackToTranscriptText(t *testing.T) {
}
type echoBatchCompleter struct {
+ mu sync.Mutex
batchSizes []int
}
@@ -320,7 +323,9 @@ func (c *echoBatchCompleter) ChatCompletion(prompt string) (string, error) {
if err := json.Unmarshal([]byte(prompt[start+len(marker):]), &input); err != nil {
return "", err
}
+ c.mu.Lock()
c.batchSizes = append(c.batchSizes, len(input.Items))
+ c.mu.Unlock()
output := struct {
Translations []struct {
Index int `json:"index"`
@@ -368,10 +373,11 @@ func TestSplitTextAndTranslateUsesBatchesAndReportsProgress(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- if fmt.Sprint(completer.batchSizes) != "[12 1]" {
- t.Fatalf("batch sizes = %v, want [12 1]", completer.batchSizes)
+ sort.Ints(completer.batchSizes)
+ if fmt.Sprint(completer.batchSizes) != "[1 12]" {
+ t.Fatalf("batch sizes = %v, want [1 12]", completer.batchSizes)
}
- if fmt.Sprint(progress) != "[12 13]" {
+ if len(progress) != 2 || progress[0] <= 0 || progress[0] >= 13 || progress[1] != 13 {
t.Fatalf("progress = %v, want [12 13]", progress)
}
if len(results) != 13 || results[12].TranslatedText == results[12].OriginText {
@@ -407,13 +413,13 @@ func TestTranslateSentenceRangeSplitsFailedBatch(t *testing.T) {
err := service.translateSentenceRange(
context.Background(),
sentences,
- results,
0,
len(sentences),
types.StandardLanguageCode("zh_cn"),
false,
- func(count int) error {
- completed = append(completed, count)
+ func(start int, items []*TranslatedItem) error {
+ copy(results[start:], items)
+ completed = append(completed, len(items))
return nil
},
)
diff --git a/runtime/krillinai/internal/service/stage_exports.go b/runtime/krillinai/internal/service/stage_exports.go
index 264ea1d8..234719da 100644
--- a/runtime/krillinai/internal/service/stage_exports.go
+++ b/runtime/krillinai/internal/service/stage_exports.go
@@ -21,16 +21,14 @@ func (s Service) TranslateSubtitleBlocks(ctx context.Context, blocks []*util.Srt
if s.YouTubeSubtitleSrv == nil || s.YouTubeSubtitleSrv.translator == nil {
return ErrYouTubeSubtitleServiceNotInitialized
}
- for start := 0; start < len(blocks); start += 10 {
- if err := ctx.Err(); err != nil {
- return err
- }
+ return runTranslationBatches(ctx, (len(blocks)+9)/10, func(ctx context.Context, batchIndex int) error {
+ start := batchIndex * 10
batch := blocks[start:min(start+10, len(blocks))]
texts := make([]string, len(batch))
for index, block := range batch {
texts[index] = block.OriginLanguageSentence
}
- translations, err := s.YouTubeSubtitleSrv.translator.batchTranslateTexts(texts, p.OriginLanguage, p.TargetLanguage)
+ translations, err := s.YouTubeSubtitleSrv.translator.batchTranslateTextsContext(ctx, texts, p.OriginLanguage, p.TargetLanguage)
if err != nil {
return err
}
@@ -43,8 +41,8 @@ func (s Service) TranslateSubtitleBlocks(ctx context.Context, blocks []*util.Srt
}
batch[index].TargetLanguageSentence = text
}
- }
- return nil
+ return nil
+ })
}
type DownloadMediaResult struct {
diff --git a/runtime/krillinai/internal/service/translate.go b/runtime/krillinai/internal/service/translate.go
index 94ed98c5..15cfb0f5 100644
--- a/runtime/krillinai/internal/service/translate.go
+++ b/runtime/krillinai/internal/service/translate.go
@@ -1,6 +1,7 @@
package service
import (
+ "context"
"encoding/json"
"fmt"
"krillin-ai/config"
@@ -26,6 +27,10 @@ func NewTranslator() *Translator {
}
func (t *Translator) SplitTextAndTranslate(inputText string, originLang, targetLang types.StandardLanguageCode) ([]*TranslatedItem, error) {
+ return t.splitTextAndTranslate(inputText, originLang, targetLang, translationParallelism())
+}
+
+func (t *Translator) splitTextAndTranslate(inputText string, originLang, targetLang types.StandardLanguageCode, parallelism int) ([]*TranslatedItem, error) {
sentences := util.SplitTextSentences(inputText, config.Conf.App.MaxSentenceLength)
if len(sentences) == 0 {
return []*TranslatedItem{}, nil
@@ -53,7 +58,7 @@ func (t *Translator) SplitTextAndTranslate(inputText string, originLang, targetL
sentences = shortSentences
var (
- signal = make(chan struct{}, config.Conf.App.TranslateParallelNum) // 控制最大并发数
+ signal = make(chan struct{}, parallelism) // 控制最大并发数
wg sync.WaitGroup
results = make([]*TranslatedItem, len(sentences))
// errChan = make(chan error, 1)
@@ -435,7 +440,7 @@ func isSentenceEnding(text string) bool {
}
// BatchTranslateSrtBlocks 批量翻译SRT字幕块(智能分组:按完整句子分组,最多10个块)
-func (t *Translator) BatchTranslateSrtBlocks(blocks []*util.SrtBlock, originLang, targetLang string, taskPtr *types.SubtitleTask) error {
+func (t *Translator) BatchTranslateSrtBlocks(ctx context.Context, blocks []*util.SrtBlock, originLang, targetLang string, taskPtr *types.SubtitleTask) error {
if len(blocks) == 0 {
return nil
}
@@ -579,8 +584,20 @@ func (t *Translator) BatchTranslateSrtBlocks(blocks []*util.SrtBlock, originLang
zap.String("平均每批次", fmt.Sprintf("%.1f个块", float64(totalBlocks)/float64(max(totalBatches, 1)))),
zap.String("分组策略", "3/2/1句子合并策略,最大"+fmt.Sprintf("%d", maxBatchSize)+"个块"))
- // 分批处理
- for batchIdx, batch := range batches {
+ var progressMu sync.Mutex
+ completedBatches := 0
+ reportCompleted := func() {
+ progressMu.Lock()
+ defer progressMu.Unlock()
+ completedBatches++
+ if taskPtr != nil {
+ progress := float64(completedBatches) / float64(totalBatches)
+ taskPtr.SetProgress(40 + uint8(progress*50))
+ }
+ }
+
+ err := runTranslationBatches(ctx, totalBatches, func(ctx context.Context, batchIdx int) error {
+ batch := batches[batchIdx]
currentBatchNum := batchIdx + 1
log.GetLogger().Info("处理批次",
zap.Int("当前批次", currentBatchNum),
@@ -597,12 +614,16 @@ func (t *Translator) BatchTranslateSrtBlocks(blocks []*util.SrtBlock, originLang
}
if len(originTexts) == 0 {
- continue
+ reportCompleted()
+ return nil
}
// 调用批量翻译
- translations, err := t.batchTranslateTexts(originTexts, originLangCode, targetLangCode)
+ translations, err := t.batchTranslateTextsContext(ctx, originTexts, originLangCode, targetLangCode)
if err != nil {
+ if ctx.Err() != nil {
+ return ctx.Err()
+ }
log.GetLogger().Error("批量翻译失败,尝试单独翻译",
zap.Error(err),
zap.Int("当前批次", currentBatchNum),
@@ -619,12 +640,16 @@ func (t *Translator) BatchTranslateSrtBlocks(blocks []*util.SrtBlock, originLang
zap.Int("块索引", block.Index),
zap.String("文本预览", block.OriginLanguageSentence[:min(len(block.OriginLanguageSentence), 50)]))
- translatedText, err := t.translateSingleText(
+ translatedText, err := t.translateSingleTextContext(
+ ctx,
block.OriginLanguageSentence,
originLangCode,
targetLangCode)
if err != nil {
+ if ctx.Err() != nil {
+ return ctx.Err()
+ }
log.GetLogger().Error("单独翻译失败,使用原文",
zap.Error(err),
zap.Int("块索引", block.Index))
@@ -634,12 +659,8 @@ func (t *Translator) BatchTranslateSrtBlocks(blocks []*util.SrtBlock, originLang
}
}
- // 更新任务进度
- if taskPtr != nil {
- progress := float64(currentBatchNum) / float64(totalBatches)
- taskPtr.SetProgress(40 + uint8(progress*50))
- }
- continue
+ reportCompleted()
+ return nil
}
log.GetLogger().Info("批量翻译成功",
@@ -653,12 +674,11 @@ func (t *Translator) BatchTranslateSrtBlocks(blocks []*util.SrtBlock, originLang
}
}
- // 更新任务进度(假设翻译占总进度的50%)
- if taskPtr != nil {
- progress := float64(currentBatchNum) / float64(totalBatches)
- // 假设翻译在40%-90%之间
- taskPtr.SetProgress(40 + uint8(progress*50))
- }
+ reportCompleted()
+ return nil
+ })
+ if err != nil {
+ return err
}
log.GetLogger().Info("智能批量翻译完成",
@@ -670,6 +690,10 @@ func (t *Translator) BatchTranslateSrtBlocks(blocks []*util.SrtBlock, originLang
// batchTranslateTexts 批量翻译多个文本(通过单次LLM调用)
func (t *Translator) batchTranslateTexts(texts []string, originLang, targetLang types.StandardLanguageCode) ([]string, error) {
+ return t.batchTranslateTextsContext(context.Background(), texts, originLang, targetLang)
+}
+
+func (t *Translator) batchTranslateTextsContext(ctx context.Context, texts []string, originLang, targetLang types.StandardLanguageCode) ([]string, error) {
if len(texts) == 0 {
return []string{}, nil
}
@@ -716,17 +740,31 @@ Required JSON format (output ONLY this structure):
var lastErr error
for attempt := 0; attempt < maxAttempts; attempt++ {
+ if err := ctx.Err(); err != nil {
+ return nil, err
+ }
log.GetLogger().Info("调用LLM翻译",
zap.Int("文本数", len(texts)),
zap.Int("尝试次数", attempt+1))
- response, err := t.chatCompleter.ChatCompletion(prompt)
+ response, err := chatCompletionWithContext(ctx, t.chatCompleter, prompt)
if err != nil {
+ if ctx.Err() != nil {
+ return nil, ctx.Err()
+ }
lastErr = err
log.GetLogger().Warn("批量翻译LLM调用失败,重试",
zap.Error(err),
zap.Int("尝试次数", attempt+1))
- time.Sleep(time.Second * time.Duration(attempt+1))
+ if attempt+1 < maxAttempts {
+ timer := time.NewTimer(time.Second * time.Duration(attempt+1))
+ select {
+ case <-ctx.Done():
+ timer.Stop()
+ return nil, ctx.Err()
+ case <-timer.C:
+ }
+ }
continue
}
@@ -792,7 +830,11 @@ Required JSON format (output ONLY this structure):
// translateSingleText 翻译单个文本(用作批量翻译失败时的回退)
func (t *Translator) translateSingleText(text string, originLang, targetLang types.StandardLanguageCode) (string, error) {
- translations, err := t.batchTranslateTexts([]string{text}, originLang, targetLang)
+ return t.translateSingleTextContext(context.Background(), text, originLang, targetLang)
+}
+
+func (t *Translator) translateSingleTextContext(ctx context.Context, text string, originLang, targetLang types.StandardLanguageCode) (string, error) {
+ translations, err := t.batchTranslateTextsContext(ctx, []string{text}, originLang, targetLang)
if err != nil {
return "", fmt.Errorf("单文本翻译失败: %w", err)
}
diff --git a/runtime/krillinai/internal/service/translation_parallel.go b/runtime/krillinai/internal/service/translation_parallel.go
new file mode 100644
index 00000000..27494b3b
--- /dev/null
+++ b/runtime/krillinai/internal/service/translation_parallel.go
@@ -0,0 +1,51 @@
+package service
+
+import (
+ "context"
+ "krillin-ai/config"
+
+ "golang.org/x/sync/errgroup"
+)
+
+func translationParallelism() int {
+ if config.Conf.App.TranslateParallelNum > 0 {
+ return config.Conf.App.TranslateParallelNum
+ }
+ return 3
+}
+
+func runTranslationBatches(ctx context.Context, count int, translate func(context.Context, int) error) error {
+ if err := ctx.Err(); err != nil {
+ return err
+ }
+ if count == 0 {
+ return nil
+ }
+ group, ctx := errgroup.WithContext(ctx)
+ jobs := make(chan int)
+ group.Go(func() error {
+ defer close(jobs)
+ for index := 0; index < count; index++ {
+ select {
+ case jobs <- index:
+ case <-ctx.Done():
+ return ctx.Err()
+ }
+ }
+ return nil
+ })
+ for range min(translationParallelism(), count) {
+ group.Go(func() error {
+ for index := range jobs {
+ if err := ctx.Err(); err != nil {
+ return err
+ }
+ if err := translate(ctx, index); err != nil {
+ return err
+ }
+ }
+ return ctx.Err()
+ })
+ }
+ return group.Wait()
+}
diff --git a/runtime/krillinai/internal/service/translation_parallel_test.go b/runtime/krillinai/internal/service/translation_parallel_test.go
new file mode 100644
index 00000000..c353dbaa
--- /dev/null
+++ b/runtime/krillinai/internal/service/translation_parallel_test.go
@@ -0,0 +1,173 @@
+package service
+
+import (
+ "context"
+ "errors"
+ "fmt"
+ "krillin-ai/config"
+ "krillin-ai/internal/types"
+ "krillin-ai/log"
+ "krillin-ai/pkg/util"
+ "strings"
+ "sync/atomic"
+ "testing"
+ "time"
+
+ "go.uber.org/zap"
+)
+
+type blockingTranslationCompleter struct {
+ entered chan struct{}
+ release chan struct{}
+ active atomic.Int32
+ peak atomic.Int32
+ calls atomic.Int32
+ echo echoBatchCompleter
+}
+
+func (c *blockingTranslationCompleter) ChatCompletion(prompt string) (string, error) {
+ return c.ChatCompletionContext(context.Background(), prompt)
+}
+
+func (c *blockingTranslationCompleter) ChatCompletionContext(ctx context.Context, prompt string) (string, error) {
+ c.calls.Add(1)
+ active := c.active.Add(1)
+ defer c.active.Add(-1)
+ for peak := c.peak.Load(); active > peak; peak = c.peak.Load() {
+ if c.peak.CompareAndSwap(peak, active) {
+ break
+ }
+ }
+ c.entered <- struct{}{}
+ select {
+ case <-ctx.Done():
+ return "", ctx.Err()
+ case <-c.release:
+ }
+ if strings.Contains(prompt, "Input subtitles:\n") {
+ return (subtitleRoutingCompleter{}).ChatCompletion(prompt)
+ }
+ return c.echo.ChatCompletion(prompt)
+}
+
+func TestSubtitleTranslationConcurrencyAndCancellation(t *testing.T) {
+ previousApp, previousLogger := config.Conf.App, log.Logger
+ config.Conf.App.TranslateParallelNum = 3
+ config.Conf.App.MaxSentenceLength = 100
+ config.Conf.App.VttBatchSize = 10
+ log.Logger = zap.NewNop()
+ t.Cleanup(func() { config.Conf.App, log.Logger = previousApp, previousLogger })
+
+ for _, path := range []string{"platform", "imported", "transcribed"} {
+ for _, cancelTask := range []bool{false, true} {
+ t.Run(fmt.Sprintf("%s/cancel=%t", path, cancelTask), func(t *testing.T) {
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ completer := &blockingTranslationCompleter{
+ entered: make(chan struct{}, 40),
+ release: make(chan struct{}),
+ }
+ translator := &Translator{chatCompleter: completer}
+ service := Service{
+ ChatCompleter: completer,
+ YouTubeSubtitleSrv: &YouTubeSubtitleService{translator: translator},
+ }
+ parts := make([]string, 37)
+ blocks := make([]*util.SrtBlock, len(parts))
+ for index := range parts {
+ parts[index] = fmt.Sprintf("Sentence number %d is here.", index+1)
+ blocks[index] = &util.SrtBlock{Index: index + 1, OriginLanguageSentence: parts[index]}
+ }
+ var results []*TranslatedItem
+ var progress []int
+ var platformProgress []uint8
+ task := &types.SubtitleTask{}
+ task.SetProgressReporter(func(percent uint8) { platformProgress = append(platformProgress, percent) })
+ checkpointDir := t.TempDir()
+ done := make(chan error, 1)
+ go func() {
+ switch path {
+ case "platform":
+ done <- translator.BatchTranslateSrtBlocks(ctx, blocks, "en", "zh_cn", task)
+ case "imported":
+ done <- service.TranslateSubtitleBlocks(ctx, blocks, &types.SubtitleTaskStepParam{OriginLanguage: "en", TargetLanguage: "zh_cn"})
+ case "transcribed":
+ var err error
+ results, err = service.splitTextAndTranslateV2(ctx, checkpointDir, strings.Join(parts, " "), "en", "zh_cn", false, 0, func(completed, total int) error {
+ progress = append(progress, completed)
+ return nil
+ })
+ done <- err
+ }
+ }()
+
+ for range 3 {
+ select {
+ case <-completer.entered:
+ case <-ctx.Done():
+ <-done
+ t.Fatal("translation did not start three concurrent requests")
+ }
+ }
+ if cancelTask {
+ cancel()
+ } else {
+ close(completer.release)
+ }
+ err := <-done
+ if cancelTask {
+ if !errors.Is(err, context.Canceled) || completer.calls.Load() != 3 {
+ t.Fatalf("cancel error = %v, calls = %d; want cancellation with no retries or queued requests", err, completer.calls.Load())
+ }
+ } else {
+ if err != nil {
+ t.Fatal(err)
+ }
+ for index, part := range parts {
+ if path == "transcribed" {
+ if len(results) != len(parts) || results[index].OriginText != part || results[index].TranslatedText != "translated: "+part {
+ t.Fatalf("translation order mismatch at %d", index)
+ }
+ } else if blocks[index].TargetLanguageSentence != "测试译文:"+part {
+ t.Fatalf("subtitle order mismatch at %d: %q", index, blocks[index].TargetLanguageSentence)
+ }
+ }
+ if path == "transcribed" {
+ for index, completed := range progress {
+ if index > 0 && completed <= progress[index-1] {
+ t.Fatalf("non-monotonic progress: %v", progress)
+ }
+ }
+ if len(progress) == 0 || progress[len(progress)-1] != len(parts) {
+ t.Fatalf("incomplete progress: %v", progress)
+ }
+ }
+ if path == "platform" {
+ for index, percent := range platformProgress {
+ if index > 0 && percent < platformProgress[index-1] {
+ t.Fatalf("non-monotonic platform progress: %v", platformProgress)
+ }
+ }
+ if task.ProcessPct != 90 {
+ t.Fatalf("platform progress = %d, want 90", task.ProcessPct)
+ }
+ }
+ }
+ if completer.peak.Load() != 3 || completer.active.Load() != 0 {
+ t.Fatalf("peak = %d, active = %d; want peak 3 and no unfinished requests", completer.peak.Load(), completer.active.Load())
+ }
+ })
+ }
+ }
+}
+
+func TestTranslationParallelismUsesConfiguredLimitAndDefault(t *testing.T) {
+ previous := config.Conf.App.TranslateParallelNum
+ t.Cleanup(func() { config.Conf.App.TranslateParallelNum = previous })
+ for _, test := range []struct{ configured, want int }{{3, 3}, {1, 1}, {0, 3}, {-1, 3}} {
+ config.Conf.App.TranslateParallelNum = test.configured
+ if got := translationParallelism(); got != test.want {
+ t.Fatalf("parallelism for %d = %d, want %d", test.configured, got, test.want)
+ }
+ }
+}
diff --git a/runtime/krillinai/internal/service/youtube_subtitle.go b/runtime/krillinai/internal/service/youtube_subtitle.go
index 3b77cac3..f7dfeb22 100644
--- a/runtime/krillinai/internal/service/youtube_subtitle.go
+++ b/runtime/krillinai/internal/service/youtube_subtitle.go
@@ -599,7 +599,7 @@ func (s *YouTubeSubtitleService) processYouTubeSubtitle(ctx context.Context, req
}
// 4. 批量翻译生成目标语言SRT(40%-90%进度)
- err = s.translator.BatchTranslateSrtBlocks(srtBlocks, req.OriginLanguage, req.TargetLanguage, req.TaskPtr)
+ err = s.translator.BatchTranslateSrtBlocks(ctx, srtBlocks, req.OriginLanguage, req.TargetLanguage, req.TaskPtr)
if err != nil {
return "", fmt.Errorf("failed to batch translate: %w", err)
}
@@ -1147,7 +1147,7 @@ func (s *YouTubeSubtitleService) writeVttWordsToSrt(vttWords []VttWord, srtFile
// 创建结果通道和goroutine数量控制
resultCh := make(chan translationResult, len(sentences))
- maxConcurrency := 5 // 限制并发数量,避免请求过多
+ maxConcurrency := translationParallelism()
semaphore := make(chan struct{}, maxConcurrency)
// 启动并发翻译
@@ -1157,7 +1157,8 @@ func (s *YouTubeSubtitleService) writeVttWordsToSrt(vttWords []VttWord, srtFile
semaphore <- struct{}{}
defer func() { <-semaphore }()
- translatedBlocks, err := s.translator.SplitTextAndTranslate(sent.Text, types.StandardLanguageCode(req.OriginLanguage), types.StandardLanguageCode(req.TargetLanguage))
+ // The outer sentence workers already enforce the translation limit.
+ translatedBlocks, err := s.translator.splitTextAndTranslate(sent.Text, types.StandardLanguageCode(req.OriginLanguage), types.StandardLanguageCode(req.TargetLanguage), 1)
if err != nil {
log.GetLogger().Warn("Translation failed, using original text",
zap.Int("index", index),
@@ -3534,7 +3535,7 @@ func (s *YouTubeSubtitleService) ProcessBlockLevelVtt(ctx context.Context, req *
}
// 4. 批量翻译(40%-90%的进度在BatchTranslateSrtBlocks内部更新)
- err = s.translator.BatchTranslateSrtBlocks(srtBlocks, req.OriginLanguage, req.TargetLanguage, req.TaskPtr)
+ err = s.translator.BatchTranslateSrtBlocks(ctx, srtBlocks, req.OriginLanguage, req.TargetLanguage, req.TaskPtr)
if err != nil {
return "", fmt.Errorf("批量翻译失败: %w", err)
}
diff --git a/runtime/krillinai/pkg/openai/openai.go b/runtime/krillinai/pkg/openai/openai.go
index b60e753c..79a8b2cf 100644
--- a/runtime/krillinai/pkg/openai/openai.go
+++ b/runtime/krillinai/pkg/openai/openai.go
@@ -37,7 +37,6 @@ func (c *Client) ChatCompletionContext(ctx context.Context, query string) (strin
Content: query,
},
},
- Temperature: 0.9,
Stream: true,
MaxTokens: 8192,
ResponseFormat: responseFormat,
diff --git a/runtime/krillinai/pkg/openai/openai_test.go b/runtime/krillinai/pkg/openai/openai_test.go
index 948b0618..f2b991ad 100644
--- a/runtime/krillinai/pkg/openai/openai_test.go
+++ b/runtime/krillinai/pkg/openai/openai_test.go
@@ -2,6 +2,7 @@ package openai
import (
"context"
+ "encoding/json"
"errors"
"krillin-ai/config"
"krillin-ai/log"
@@ -13,6 +14,32 @@ import (
"time"
)
+func TestChatCompletionUsesDefaultSampling(t *testing.T) {
+ setTestModel(t)
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ var body map[string]any
+ if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+ t.Error(err)
+ w.WriteHeader(http.StatusBadRequest)
+ return
+ }
+ if _, exists := body["temperature"]; exists {
+ t.Error("translation must use the model's default sampling")
+ w.WriteHeader(http.StatusBadRequest)
+ return
+ }
+ w.Header().Set("Content-Type", "text/event-stream")
+ _, _ = w.Write([]byte("data: {\"choices\":[]}\n\ndata: {\"choices\":[{\"index\":0,\"delta\":{\"content\":\"translated\"}}]}\n\ndata: [DONE]\n\n"))
+ }))
+ defer server.Close()
+
+ client := newClient(server.URL, "test-key", "", time.Second)
+ content, err := client.ChatCompletion("translate")
+ if err != nil || content != "translated" {
+ t.Fatalf("ChatCompletion() = %q, %v; want translated", content, err)
+ }
+}
+
func TestChatCompletionTimesOut(t *testing.T) {
setTestModel(t)
release := make(chan struct{})
@@ -37,6 +64,21 @@ func TestChatCompletionTimesOut(t *testing.T) {
}
}
+func TestChatCompletionReportsStreamErrorAfterKeepAlive(t *testing.T) {
+ setTestModel(t)
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Content-Type", "text/event-stream")
+ _, _ = w.Write([]byte("data: {\"choices\":[]}\n\ndata: {\"error\":{\"type\":\"upstream_error\",\"code\":\"official_service_unavailable\",\"message\":\"Official service request could not be completed\"}}\n\n"))
+ }))
+ defer server.Close()
+
+ client := newClient(server.URL, "test-key", "", time.Second)
+ _, err := client.ChatCompletion("translate")
+ if err == nil || !strings.Contains(err.Error(), "Official service request could not be completed") {
+ t.Fatalf("ChatCompletion() error = %v, want the API error", err)
+ }
+}
+
func TestChatCompletionHonorsParentCancellation(t *testing.T) {
setTestModel(t)
release := make(chan struct{})