@docyrus/docyrus 0.0.20 → 0.0.21

package/agent-loader.js

@@ -2378,6 +2378,27 @@ function resolvePackagedPiResourceRoot() {
   }
   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) {
+    if (existingIndex + 1 < process.argv.length) {
+      process.argv[existingIndex + 1] = value;
+      return;
+    }
+    process.argv.push(value);
+    return;
+  }
+  process.argv.push(flag, value);
+}
 async function readPipedStdin() {
   if (process.stdin.isTTY) {
     return void 0;
@@ -2502,8 +2523,14 @@ 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 hasPackagedMcpAdapter = packagedExtensionPaths.some((extensionPath) => extensionPath.includes("pi-mcp-adapter"));
   const envStore = new AgentEnvStore((0, import_node_path3.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 settingsManager = pi.SettingsManager.create(cwd, agentDir);
   const modelsJsonPath = (0, import_node_path3.join)(agentDir, "models.json");
@@ -2566,6 +2593,7 @@ async function main() {
     cwd,
     agentDir,
     settingsManager,
+    additionalExtensionPaths: packagedExtensionPaths,
     systemPrompt: (0, import_node_path3.join)(
       resourceRoot,
       "prompts",
@@ -2573,7 +2601,7 @@ async function main() {
     )
   });
   await resourceLoader.reload();
-  const { session, modelFallbackMessage } = await pi.createAgentSession({
+  const { session, modelFallbackMessage, extensionsResult } = await pi.createAgentSession({
     cwd,
     agentDir,
     authStorage,
@@ -2585,6 +2613,9 @@ async function main() {
     model: requestedModel,
     thinkingLevel: request.thinking
   });
+  if (hasPackagedMcpAdapter) {
+    extensionsResult.runtime.flagValues.set("mcp-config", mcpConfigPath);
+  }
   if (usedClack) {
     cleanupOnboardingStdinState();
   }