@docyrus/docyrus 0.0.31 → 0.0.33

package/agent-loader.js

@@ -1132,9 +1132,9 @@ ${J2}${i.trimStart()}`), r2 = 3 + (0, import_node_util.stripVTControlCharacters)
 });
 
 // src/agent/loader.ts
-var import_node_fs = require("node:fs");
+var import_node_fs2 = require("node:fs");
 var import_node_url = require("node:url");
-var import_node_path3 = require("node:path");
+var import_node_path4 = require("node:path");
 var import_picocolors4 = __toESM(require_picocolors());
 
 // src/agent/envStore.ts
@@ -1235,9 +1235,29 @@ var AgentEnvStore = class {
   }
 };
 
+// src/agent/packagedExtensions.ts
+var import_node_fs = require("node:fs");
+var import_node_path2 = require("node:path");
+var SERVER_ONLY_PACKAGED_EXTENSION_NAMES = /* @__PURE__ */ new Set(["docyrus-web-browser"]);
+function isPackagedExtensionEntry(entryName, isDirectory) {
+  return isDirectory || entryName.endsWith(".ts") || entryName.endsWith(".js");
+}
+function getPackagedExtensionName(entryName) {
+  return entryName.replace(/\.(ts|js)$/u, "");
+}
+function resolvePackagedExtensionPaths(resourceRoot, runtime = "terminal") {
+  const extensionsRoot = (0, import_node_path2.join)(resourceRoot, "extensions");
+  if (!(0, import_node_fs.existsSync)(extensionsRoot)) {
+    return [];
+  }
+  return (0, import_node_fs.readdirSync)(extensionsRoot, {
+    withFileTypes: true
+  }).filter((entry) => isPackagedExtensionEntry(entry.name, entry.isDirectory())).filter((entry) => runtime === "server" || !SERVER_ONLY_PACKAGED_EXTENSION_NAMES.has(getPackagedExtensionName(entry.name))).map((entry) => (0, import_node_path2.join)(extensionsRoot, entry.name)).sort((left, right) => left.localeCompare(right));
+}
+
 // src/agent/modelsConfig.ts
 var import_promises2 = require("node:fs/promises");
-var import_node_path2 = require("node:path");
+var import_node_path3 = require("node:path");
 function createDefaultState2() {
   return {
     providers: {}
@@ -1261,7 +1281,7 @@ async function readModelsConfig(filePath) {
   }
 }
 async function writeModelsConfig(filePath, state) {
-  const directory = (0, import_node_path2.dirname)(filePath);
+  const directory = (0, import_node_path3.dirname)(filePath);
   await (0, import_promises2.mkdir)(directory, {
     recursive: true,
     mode: 448
@@ -1316,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";
@@ -1345,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",
@@ -1371,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()
@@ -1395,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
   }));
@@ -1659,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" }
         },
         {
@@ -1688,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":
@@ -1763,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) {
@@ -1854,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
   });
@@ -1896,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;
     }
@@ -1929,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) {
@@ -1954,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;
     }
@@ -2017,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;
     }
@@ -2032,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}`);
     }
   }
@@ -2091,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)}`);
@@ -2307,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) {
@@ -2323,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:",
@@ -2342,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;
@@ -2591,31 +2634,22 @@ function readLoaderRequest() {
 }
 async function loadPiExports() {
   const piPackageDir = readRequiredEnv("PI_PACKAGE_DIR");
-  const moduleUrl = (0, import_node_url.pathToFileURL)((0, import_node_path3.join)(piPackageDir, "dist", "index.js")).href;
+  const moduleUrl = (0, import_node_url.pathToFileURL)((0, import_node_path4.join)(piPackageDir, "dist", "index.js")).href;
   return await import(moduleUrl);
 }
 function resolvePackagedPiResourceRoot() {
   const candidates = [
-    (0, import_node_path3.resolve)(process.cwd(), "apps/api-cli/resources/pi-agent"),
-    (0, import_node_path3.resolve)(__dirname, "../resources/pi-agent"),
-    (0, import_node_path3.resolve)(__dirname, "resources/pi-agent"),
-    (0, import_node_path3.resolve)(process.cwd(), "dist/apps/api-cli/resources/pi-agent")
+    (0, import_node_path4.resolve)(process.cwd(), "apps/api-cli/resources/pi-agent"),
+    (0, import_node_path4.resolve)(__dirname, "../resources/pi-agent"),
+    (0, import_node_path4.resolve)(__dirname, "resources/pi-agent"),
+    (0, import_node_path4.resolve)(process.cwd(), "dist/apps/api-cli/resources/pi-agent")
   ];
-  const resolved = candidates.find((candidate) => (0, import_node_fs.existsSync)(candidate));
+  const resolved = candidates.find((candidate) => (0, import_node_fs2.existsSync)(candidate));
   if (!resolved) {
     throw new Error(`Unable to locate pi agent resources. Checked: ${candidates.join(", ")}`);
   }
   return resolved;
 }
-function resolvePackagedExtensionPaths(resourceRoot) {
-  const extensionsRoot = (0, import_node_path3.join)(resourceRoot, "extensions");
-  if (!(0, import_node_fs.existsSync)(extensionsRoot)) {
-    return [];
-  }
-  return (0, import_node_fs.readdirSync)(extensionsRoot, {
-    withFileTypes: true
-  }).filter((entry) => entry.isDirectory() || entry.isFile() && (entry.name.endsWith(".ts") || entry.name.endsWith(".js"))).map((entry) => (0, import_node_path3.join)(extensionsRoot, entry.name)).sort((left, right) => left.localeCompare(right));
-}
 function setProcessArgValue(flag, value) {
   const existingIndex = process.argv.indexOf(flag);
   if (existingIndex >= 0) {
@@ -2752,17 +2786,17 @@ async function main() {
   const agentDir = readRequiredEnv("PI_CODING_AGENT_DIR");
   const version = process.env.DOCYRUS_PI_VERSION || "dev";
   const resourceRoot = resolvePackagedPiResourceRoot();
-  const packagedExtensionPaths = resolvePackagedExtensionPaths(resourceRoot);
-  const mcpConfigPath = (0, import_node_path3.join)(agentDir, "mcp.json");
+  const packagedExtensionPaths = resolvePackagedExtensionPaths(resourceRoot, "terminal");
+  const mcpConfigPath = (0, import_node_path4.join)(agentDir, "mcp.json");
   const hasPackagedMcpAdapter = packagedExtensionPaths.some((extensionPath) => extensionPath.includes("pi-mcp-adapter"));
-  const envStore = new AgentEnvStore((0, import_node_path3.join)(agentDir, "env.json"));
+  const envStore = new AgentEnvStore((0, import_node_path4.join)(agentDir, "env.json"));
   await envStore.hydrateProcessEnv(process.env);
   if (hasPackagedMcpAdapter) {
     setProcessArgValue("--mcp-config", mcpConfigPath);
   }
-  const authStorage = pi.AuthStorage.create((0, import_node_path3.join)(agentDir, "auth.json"));
+  const authStorage = pi.AuthStorage.create((0, import_node_path4.join)(agentDir, "auth.json"));
   const settingsManager = pi.SettingsManager.create(cwd, agentDir);
-  const modelsJsonPath = (0, import_node_path3.join)(agentDir, "models.json");
+  const modelsJsonPath = (0, import_node_path4.join)(agentDir, "models.json");
   const initialModelRegistry = new pi.ModelRegistry(authStorage, modelsJsonPath);
   const isPrintMode = Boolean(request.print) || !process.stdin.isTTY;
   const isInteractive = process.stdin.isTTY && !isPrintMode;
@@ -2826,7 +2860,7 @@ async function main() {
     agentDir,
     settingsManager,
     additionalExtensionPaths: packagedExtensionPaths,
-    systemPrompt: (0, import_node_path3.join)(
+    systemPrompt: (0, import_node_path4.join)(
       resourceRoot,
       "prompts",
       request.profile === "agent" ? "agent-system.md" : "coder-system.md"