@docyrus/docyrus 0.0.32 → 0.0.33

package/agent-loader.js

@@ -1336,7 +1336,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";
@@ -1365,6 +1365,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",
@@ -1391,6 +1407,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()
@@ -1415,7 +1432,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
   }));
@@ -1679,7 +1696,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" }
         },
         {
@@ -1708,8 +1725,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":
@@ -1783,9 +1800,14 @@ function getProviderFormFields(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) {
@@ -1874,11 +1896,12 @@ async function showInput(mode, title, placeholder) {
     });
   });
 }
-async function refreshAfterCredentialChange(mode, preferredProviderId, preferredModelId) {
+async function refreshAfterCredentialChange(mode, envStore, preferredProviderId, preferredModelId) {
   const modeAny = modeAsAny(mode);
   await refreshSessionAfterCredentialChange({
     session: modeAny.session,
     modelRegistry: modeAny.session.modelRegistry,
+    envStore,
     preferredProviderId,
     preferredModelId
   });
@@ -1916,7 +1939,7 @@ async function runApiKeyProviderFlow(mode, dependencies, provider) {
         apiKey,
         modelId
       });
-      await refreshAfterCredentialChange(mode, "custom-openai", modelId);
+      await refreshAfterCredentialChange(mode, dependencies.envStore, "custom-openai", modelId);
       modeAny.showStatus(`Configured ${provider.label}`);
       return;
     }
@@ -1949,7 +1972,7 @@ async function runApiKeyProviderFlow(mode, dependencies, provider) {
       } else {
         const resourceName = await showInput(mode, resourceNameField?.title || "Azure resource name", resourceNameField?.placeholder);
         if (resourceName) {
-          baseUrl = `https://${resourceName}.openai.azure.com/openai/v1`;
+          baseUrl = `https://${resourceName}.openai.azure.com/openai`;
         }
       }
       if (!baseUrl) {
@@ -1974,7 +1997,7 @@ async function runApiKeyProviderFlow(mode, dependencies, provider) {
         apiVersion,
         useCustomModel: !builtInModelIds.has(modelId)
       });
-      await refreshAfterCredentialChange(mode, "azure-openai-responses", modelId);
+      await refreshAfterCredentialChange(mode, dependencies.envStore, "azure-openai-responses", modelId);
       modeAny.showStatus(`Configured ${provider.label}`);
       return;
     }
@@ -2037,7 +2060,7 @@ async function runApiKeyProviderFlow(mode, dependencies, provider) {
         secretAccessKey,
         sessionToken
       });
-      await refreshAfterCredentialChange(mode, "amazon-bedrock", modelId);
+      await refreshAfterCredentialChange(mode, dependencies.envStore, "amazon-bedrock", modelId);
       modeAny.showStatus(`Configured ${provider.label}`);
       return;
     }
@@ -2052,7 +2075,7 @@ async function runApiKeyProviderFlow(mode, dependencies, provider) {
         providerId: provider.id,
         apiKey
       });
-      await refreshAfterCredentialChange(mode, provider.id);
+      await refreshAfterCredentialChange(mode, dependencies.envStore, provider.id);
       modeAny.showStatus(`Configured ${provider.label}`);
     }
   }
@@ -2111,7 +2134,7 @@ async function handleInteractiveLogout(mode, dependencies) {
       ...dependencies,
       providerId
     });
-    await refreshAfterCredentialChange(mode);
+    await refreshAfterCredentialChange(mode, dependencies.envStore);
     modeAny.showStatus(`Removed ${getProviderLabel(providerId)}`);
   } catch (error) {
     modeAny.showError(`Failed to remove ${getProviderLabel(providerId)}: ${error instanceof Error ? error.message : String(error)}`);
@@ -2327,7 +2350,7 @@ async function runAzureFlow(clack, pico, dependencies) {
   if (configMode === "base-url") {
     const baseUrlInput = await clack.text({
       message: "Azure OpenAI base URL:",
-      placeholder: "https://my-resource.openai.azure.com/openai/v1",
+      placeholder: "https://my-resource.openai.azure.com/openai",
       validate: (value) => value?.trim() ? void 0 : "Base URL is required"
     });
     if (clack.isCancel(baseUrlInput) || !baseUrlInput) {
@@ -2343,7 +2366,7 @@ async function runAzureFlow(clack, pico, dependencies) {
     if (clack.isCancel(resourceName) || !resourceName) {
       return false;
     }
-    baseUrl = `https://${String(resourceName).trim()}.openai.azure.com/openai/v1`;
+    baseUrl = `https://${String(resourceName).trim()}.openai.azure.com/openai`;
   }
   const modelId = await clack.text({
     message: "Model ID to use:",
@@ -2362,7 +2385,7 @@ async function runAzureFlow(clack, pico, dependencies) {
   }
   const apiVersion = await clack.text({
     message: `API version ${pico.dim("(leave blank to use pi's default)")}:`,
-    placeholder: "2025-03-01-preview"
+    placeholder: "2025-04-01-preview"
   });
   if (clack.isCancel(apiVersion)) {
     return false;