@rzx/ohs 1.2.0 → 1.2.7

package/dist/index.js

@@ -451789,6 +451789,27 @@ function catalogModelContextWindow(catalog, providerName, modelId) {
 function catalogModelOutputLimit(catalog, providerName, modelId) {
   return positiveLimit(catalogModelEntry(catalog, providerName, modelId)?.limit?.output);
 }
+function modelIdKey(value) {
+  return value.replace(/-/g, "").toLowerCase();
+}
+function findCatalogModelById(catalog, modelId) {
+  const target = modelIdKey(modelId.trim());
+  if (!target)
+    return;
+  for (const provider of Object.values(catalog)) {
+    if (!provider?.models)
+      continue;
+    for (const [key, model] of Object.entries(provider.models)) {
+      if (model.status === "deprecated" || model.status === "alpha")
+        continue;
+      const id = typeof model.id === "string" && model.id.trim() ? model.id.trim() : key;
+      if (modelIdKey(id) === target || modelIdKey(key) === target) {
+        return model;
+      }
+    }
+  }
+  return;
+}
 function catalogModelReasoningEfforts(catalog, providerName, modelId) {
   if (!providerName)
     return;
@@ -451807,6 +451828,30 @@ var init_catalog_provider_mapping = __esm(() => {
   };
 });
 
+// ../../packages/server/src/application/default-services/model-limit-resolution.ts
+function resolveModelLimit(kind, input) {
+  const provider = input.provider?.trim();
+  const model = input.model?.trim();
+  if (!provider || !model)
+    return;
+  const custom = customModelEntry(input.customProviders, provider, model);
+  const declared = positiveLimit(kind === "context" ? custom?.contextWindow : custom?.maxOutputTokens);
+  if (declared !== undefined)
+    return declared;
+  const fromCatalogProvider = kind === "context" ? catalogModelContextWindow(input.catalog, provider, model) : catalogModelOutputLimit(input.catalog, provider, model);
+  if (fromCatalogProvider !== undefined)
+    return fromCatalogProvider;
+  if (!custom)
+    return;
+  return positiveLimit(findCatalogModelById(input.catalog, model)?.limit?.[kind]);
+}
+function customModelEntry(customProviders, provider, model) {
+  return customProviders?.find((item) => item.id === provider)?.models.find((item) => item.id === model);
+}
+var init_model_limit_resolution = __esm(() => {
+  init_catalog_provider_mapping();
+});
+
 // ../../packages/server/src/application/attachments/routing/attachment-capabilities.ts
 function supportsNativeImageInput(context, catalog) {
   const request = context.requestConfiguration;
@@ -451889,15 +451934,20 @@ function createDefaultModelService(ref) {
       const current = ref ? await readCurrentSettings(ref) : undefined;
       for (const provider of current?.customProviders ?? []) {
         const catalogModels = provider.source === "models.dev" ? indexCatalogModels(catalog, provider.id) : undefined;
+        const limitInput = (providerId, modelId) => ({
+          catalog,
+          customProviders: current?.customProviders,
+          provider: providerId,
+          model: modelId
+        });
         result.push({
           name: provider.id,
           displayName: provider.displayName,
           models: provider.models.map((model) => {
             const catalogModel = catalogModels?.get(model.id);
-            if (catalogModel) {
-              return toModelInfo(provider.id, provider.displayName, model.id, catalogModel);
-            }
-            return {
+            const contextWindow = resolveModelLimit("context", limitInput(provider.id, model.id));
+            const outputLimit = resolveModelLimit("output", limitInput(provider.id, model.id));
+            const base = catalogModel ? toModelInfo(provider.id, provider.displayName, model.id, catalogModel) : {
               id: model.id,
               label: model.displayName,
               provider: provider.displayName,
@@ -451907,6 +451957,11 @@ function createDefaultModelService(ref) {
                 image: normalizeInputSupport(model.imageInputSupport)
               }
             };
+            return {
+              ...base,
+              ...contextWindow !== undefined ? { contextWindow } : {},
+              ...outputLimit !== undefined ? { outputLimit } : {}
+            };
           })
         });
       }
@@ -451974,6 +452029,7 @@ var init_model_service = __esm(() => {
   init_src10();
   init_shared();
   init_catalog_provider_mapping();
+  init_model_limit_resolution();
   init_attachment_capabilities();
 });
 
@@ -458453,6 +458509,14 @@ function normalizeProviderHeaders(headers) {
     throw error;
   }
 }
+function normalizeModelLimit(value, label) {
+  if (value === undefined || value === null)
+    return;
+  if (typeof value !== "number" || !Number.isSafeInteger(value) || value <= 0) {
+    throw new ProviderMutationError(400, `${label}必须是大于 0 的整数。`);
+  }
+  return value;
+}
 function normalizeCustomProvider(input) {
   const id = typeof input.id === "string" ? input.id.trim().toLowerCase() : "";
   if (!id || !/^[a-z0-9][a-z0-9_-]*$/.test(id)) {
@@ -458475,11 +458539,17 @@ function normalizeCustomProvider(input) {
   if (!Array.isArray(input.models) || input.models.length === 0) {
     throw new ProviderMutationError(400, "请至少添加一个模型。");
   }
-  const models = input.models.map((model) => ({
-    id: model.id?.trim(),
-    displayName: model.displayName?.trim() || model.id?.trim(),
-    ...model.imageInputSupport ? { imageInputSupport: model.imageInputSupport } : {}
-  }));
+  const models = input.models.map((model) => {
+    const contextWindow = normalizeModelLimit(model.contextWindow, "上下文窗口");
+    const maxOutputTokens = normalizeModelLimit(model.maxOutputTokens, "最大输出");
+    return {
+      id: model.id?.trim(),
+      displayName: model.displayName?.trim() || model.id?.trim(),
+      ...model.imageInputSupport ? { imageInputSupport: model.imageInputSupport } : {},
+      ...contextWindow !== undefined ? { contextWindow } : {},
+      ...maxOutputTokens !== undefined ? { maxOutputTokens } : {}
+    };
+  });
   if (models.some((model) => !model.id)) {
     throw new ProviderMutationError(400, "模型 ID 不能为空。");
   }
@@ -588515,6 +588585,7 @@ class DaemonApplication {
       const imageGenerationTool = createDaemonImageGenerationTool({
         attachments: this.attachments
       });
+      const readLimitSettings = () => options.getSettings?.() ?? options.settings;
       const loadAgent = createDaemonAgentLoader({
         executionSurface: options.executionSurface,
         settings: options.settings,
@@ -588536,12 +588607,22 @@ class DaemonApplication {
         resolveModelContextWindow: async ({ provider, model }) => {
           if (!provider)
             return;
-          return catalogModelContextWindow(await this.modelCatalog.load(), provider, model);
+          return resolveModelLimit("context", {
+            catalog: await this.modelCatalog.load(),
+            customProviders: readLimitSettings()?.customProviders,
+            provider,
+            model
+          });
         },
         resolveModelOutputLimit: async ({ provider, model }) => {
           if (!provider)
             return;
-          return catalogModelOutputLimit(await this.modelCatalog.load(), provider, model);
+          return resolveModelLimit("output", {
+            catalog: await this.modelCatalog.load(),
+            customProviders: readLimitSettings()?.customProviders,
+            provider,
+            model
+          });
         },
         createAgent: options.createAgent,
         mcpRuntimeRegistry: this.mcpRuntimes,
@@ -589193,6 +589274,7 @@ var init_daemon_application = __esm(() => {
   init_src8();
   init_daemon_attachment_services();
   init_catalog_provider_mapping();
+  init_model_limit_resolution();
   init_request_selection_validation();
   init_daemon_agent();
   init_mcp_oauth_application_service();
@@ -598373,4 +598455,4 @@ program.command("doctor").description("Check environment and dependencies").acti
 });
 program.parse();
 
-//# debugId=18B7D67E419A5F4164756E2164756E21
+//# debugId=68E293090668038D64756E2164756E21