@docyrus/docyrus 0.0.32 → 0.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docyrus/docyrus",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "private": false,
   "description": "Docyrus API CLI",
   "main": "./main.js",

package/server-loader.js

@@ -3515,7 +3515,7 @@ function createCustomOpenAiProviderConfig(params) {
 function createAzureProviderConfig(params) {
   const providerConfig = {
     baseUrl: params.baseUrl,
-    apiKey: "env:AZURE_OPENAI_API_KEY"
+    apiKey: "AZURE_OPENAI_API_KEY"
   };
   if (params.useCustomModel) {
     providerConfig.api = "azure-openai-responses";
@@ -3544,6 +3544,22 @@ function trimOrUndefined(value) {
   const trimmed = value?.trim();
   return trimmed && trimmed.length > 0 ? trimmed : void 0;
 }
+function normalizeAzureBaseUrl(baseUrl) {
+  const trimmed = baseUrl.trim().replace(/\/+$/, "");
+  try {
+    const url = new URL(trimmed);
+    url.search = "";
+    url.hash = "";
+    if (url.pathname.endsWith("/openai/v1")) {
+      url.pathname = url.pathname.slice(0, -3);
+    } else if (url.pathname.endsWith("/openai/responses")) {
+      url.pathname = url.pathname.slice(0, -10);
+    }
+    return url.toString().replace(/\/+$/, "");
+  } catch {
+    return trimmed.replace(/\/openai\/v1$/i, "/openai").replace(/\/openai\/responses$/i, "/openai");
+  }
+}
 async function saveGenericApiKey(params) {
   params.authStorage.set(params.providerId, {
     type: "api_key",
@@ -3570,6 +3586,7 @@ async function saveCustomOpenAiConfig(params) {
 async function saveAzureConfig(params) {
   const modelId = params.modelId.trim();
   const useCustomModel = params.useCustomModel ?? false;
+  const normalizedBaseUrl = normalizeAzureBaseUrl(params.baseUrl);
   params.authStorage.set("azure-openai-responses", {
     type: "api_key",
     key: params.apiKey.trim()
@@ -3594,7 +3611,7 @@ async function saveAzureConfig(params) {
   }
   await params.envStore.setMany(envValues);
   await upsertModelsProvider(params.modelsJsonPath, "azure-openai-responses", createAzureProviderConfig({
-    baseUrl: params.baseUrl.trim(),
+    baseUrl: normalizedBaseUrl,
     modelId,
     useCustomModel
   }));
@@ -3841,7 +3858,7 @@ function getProviderFormFields(params) {
           title: "Azure OpenAI base URL",
           required: true,
           component: "text",
-          placeholder: "https://my-resource.openai.azure.com/openai/v1",
+          placeholder: "https://my-resource.openai.azure.com/openai",
           dependsOn: { field: "configMode", equals: "base-url" }
         },
         {
@@ -3870,8 +3887,8 @@ function getProviderFormFields(params) {
           name: "apiVersion",
           title: "API version",
           component: "text",
-          defaultValue: "2025-03-01-preview",
-          placeholder: "2025-03-01-preview"
+          defaultValue: "2025-04-01-preview",
+          placeholder: "2025-04-01-preview"
         }
       ];
     case "amazon-bedrock":
@@ -4063,7 +4080,7 @@ async function applyProviderLogin(params) {
       return { providerId: provider.id, preferredModelId: params.input.modelId };
     }
     case "azure-openai-responses": {
-      const baseUrl = params.input.baseUrl ?? (params.input.resourceName ? `https://${params.input.resourceName}.openai.azure.com/openai/v1` : void 0);
+      const baseUrl = params.input.baseUrl ?? (params.input.resourceName ? `https://${params.input.resourceName}.openai.azure.com/openai` : void 0);
       if (!baseUrl) {
         throw new Error("Azure login requires either baseUrl or resourceName.");
       }
@@ -4103,9 +4120,14 @@ async function applyProviderLogin(params) {
   }
 }
 async function refreshSessionAfterCredentialChange(params) {
+  await params.envStore?.hydrateProcessEnv(process.env);
   params.modelRegistry.refresh();
   const availableModels = params.modelRegistry.getAvailable();
   const preferredModel = params.preferredProviderId && params.preferredModelId ? availableModels.find((model) => model.provider === params.preferredProviderId && model.id === params.preferredModelId) : params.preferredProviderId ? availableModels.find((model) => model.provider === params.preferredProviderId) : void 0;
+  if (preferredModel) {
+    await params.session.setModel(preferredModel);
+    return;
+  }
   const currentModel = params.session.model;
   const currentModelStillAvailable = currentModel ? availableModels.some((model) => model.provider === currentModel.provider && model.id === currentModel.id) : false;
   if (currentModel && !currentModelStillAvailable) {
@@ -5436,6 +5458,7 @@ async function createAgentServer(params) {
       await refreshSessionAfterCredentialChange({
         session: activeSession,
         modelRegistry,
+        envStore: authRuntime.envStore,
         preferredProviderId: result.providerId,
         preferredModelId: result.preferredModelId
       });
@@ -5467,6 +5490,7 @@ async function createAgentServer(params) {
         await refreshSessionAfterCredentialChange({
           session: activeSession,
           modelRegistry,
+          envStore: authRuntime.envStore,
           preferredProviderId: providerId
         });
       }
@@ -5498,7 +5522,8 @@ async function createAgentServer(params) {
       modelRegistry.refresh();
       await refreshSessionAfterCredentialChange({
         session: activeSession,
-        modelRegistry
+        modelRegistry,
+        envStore: authRuntime.envStore
       });
       return c.json({
         ok: true,