poe-code 3.0.454 → 4.0.0

package/dist/providers/opencode.js

@@ -3859,11 +3859,11 @@ function mergeLayers(layers) {
   }
   return mergeObjectLayers(layers, []);
 }
-function mergeObjectLayers(layers, path47) {
+function mergeObjectLayers(layers, path48) {
   const data = {};
   const sources = {};
   for (const key of collectKeys(layers)) {
-    const resolved = resolveKey(layers, key, path47);
+    const resolved = resolveKey(layers, key, path48);
     if (resolved === void 0) {
       continue;
     }
@@ -3883,7 +3883,7 @@ function collectKeys(layers) {
   }
   return [...keys];
 }
-function resolveKey(layers, key, path47) {
+function resolveKey(layers, key, path48) {
   let winningSource;
   let winningValue;
   const objectLayers = [];
@@ -3916,9 +3916,9 @@ function resolveKey(layers, key, path47) {
   if (winningValue === null) {
     return void 0;
   }
-  const fullPath = buildPath(path47, key);
+  const fullPath = buildPath(path48, key);
   if (isPlainObject(winningValue)) {
-    const merged = mergeObjectLayers(objectLayers, [...path47, key]);
+    const merged = mergeObjectLayers(objectLayers, [...path48, key]);
     return {
       value: merged.data,
       sources: {
@@ -3946,8 +3946,8 @@ function isWinningCandidate(key, value) {
 function getOwnEntry2(record, key) {
   return Object.prototype.hasOwnProperty.call(record, key) ? record[key] : void 0;
 }
-function buildPath(path47, key) {
-  return [...path47, key].map(escapePathSegment).join(".");
+function buildPath(path48, key) {
+  return [...path48, key].map(escapePathSegment).join(".");
 }
 function escapePathSegment(segment) {
   return segment.replaceAll("\\", "\\\\").replaceAll(".", "\\.");
@@ -5850,22 +5850,22 @@ function prune2(obj, shape) {
   }
   return { changed, result };
 }
-function modifyAtPath(content, path47, value) {
+function modifyAtPath(content, path48, value) {
   const indent = detectIndent(content);
   const formattingOptions = {
     tabSize: indent === "	" ? 1 : indent.length,
     insertSpaces: indent !== "	",
     eol: "\n"
   };
-  const edits = jsonc.modify(content, path47, value, { formattingOptions });
+  const edits = jsonc.modify(content, path48, value, { formattingOptions });
   let result = jsonc.applyEdits(content, edits);
   if (!result.endsWith("\n")) {
     result += "\n";
   }
   return result;
 }
-function removeAtPath(content, path47) {
-  return modifyAtPath(content, path47, void 0);
+function removeAtPath(content, path48) {
+  return modifyAtPath(content, path48, void 0);
 }
 function serializeUpdate(content, current, next) {
   let result = content || "{}";
@@ -5875,15 +5875,15 @@ function serializeUpdate(content, current, next) {
   }
   return result;
 }
-function applyObjectUpdate(content, path47, current, next) {
+function applyObjectUpdate(content, path48, current, next) {
   let result = content;
   for (const key of Object.keys(current)) {
     if (!hasConfigEntry(next, key)) {
-      result = removeAtPath(result, [...path47, key]);
+      result = removeAtPath(result, [...path48, key]);
     }
   }
   for (const [key, nextValue] of Object.entries(next)) {
-    const nextPath = [...path47, key];
+    const nextPath = [...path48, key];
     const hasCurrent = hasConfigEntry(current, key);
     const currentValue = hasCurrent ? current[key] : void 0;
     if (hasCurrent && isConfigObject(currentValue) && isConfigObject(nextValue)) {
@@ -6083,16 +6083,16 @@ function getConfigFormat(pathOrFormat) {
   }
   return formatRegistry[formatName];
 }
-function detectFormat2(path47) {
-  const ext = getExtension(path47);
+function detectFormat2(path48) {
+  const ext = getExtension(path48);
   return extensionMap[ext];
 }
-function getExtension(path47) {
-  const lastDot = path47.lastIndexOf(".");
+function getExtension(path48) {
+  const lastDot = path48.lastIndexOf(".");
   if (lastDot === -1) {
     return "";
   }
-  return path47.slice(lastDot).toLowerCase();
+  return path48.slice(lastDot).toLowerCase();
 }
 
 // packages/config-mutations/src/execution/path-utils.ts
@@ -7309,7 +7309,7 @@ function mergeScope(scope, baseScope, overrideScope) {
   }
   return merged;
 }
-function mergeRuntimeScope(baseScope, overrideScope, path47 = []) {
+function mergeRuntimeScope(baseScope, overrideScope, path48 = []) {
   const merged = {};
   const keys = /* @__PURE__ */ new Set([...Object.keys(baseScope), ...Object.keys(overrideScope)]);
   for (const key of keys) {
@@ -7322,7 +7322,7 @@ function mergeRuntimeScope(baseScope, overrideScope, path47 = []) {
       continue;
     }
     if (isRecord5(baseValue) && isRecord5(overrideValue)) {
-      setOwnEntry(merged, key, mergeRuntimeScope(baseValue, overrideValue, [...path47, key]));
+      setOwnEntry(merged, key, mergeRuntimeScope(baseValue, overrideValue, [...path48, key]));
       continue;
     }
     setOwnEntry(merged, key, overrideValue);
@@ -12052,21 +12052,21 @@ async function* adaptClaude(lines) {
         if (blockType !== "tool_result") continue;
         const kind = toolKindsById.get(item.tool_use_id);
         toolKindsById.delete(item.tool_use_id);
-        let path47;
+        let path48;
         if (typeof item.content === "string") {
-          path47 = item.content;
+          path48 = item.content;
         } else {
           try {
-            path47 = JSON.stringify(item.content);
+            path48 = JSON.stringify(item.content);
           } catch {
-            path47 = String(item.content);
+            path48 = String(item.content);
           }
         }
         yield {
           event: "tool_complete",
           id: item.tool_use_id,
           kind,
-          path: path47
+          path: path48
         };
       }
     }
@@ -12162,10 +12162,10 @@ async function* adaptCodex(lines) {
         const kindFromStart = toolKindById.get(item.id);
         const kind = kindFromStart ?? (itemType === "command_execution" ? "exec" : itemType === "file_edit" ? "edit" : "other");
         const titleFromEvent = isNonEmptyString(item.path) ? item.path : itemType === "mcp_tool_call" ? `${isNonEmptyString(item.server) ? item.server : "unknown"}.${isNonEmptyString(item.tool) ? item.tool : "unknown"}` : void 0;
-        const path47 = titleFromEvent ?? toolTitleById.get(item.id) ?? "";
+        const path48 = titleFromEvent ?? toolTitleById.get(item.id) ?? "";
         toolTitleById.delete(item.id);
         toolKindById.delete(item.id);
-        yield { event: "tool_complete", id: item.id, kind, path: path47 };
+        yield { event: "tool_complete", id: item.id, kind, path: path48 };
       }
     }
   }
@@ -12514,14 +12514,14 @@ function toolInfo(event) {
   const [toolName = "tool", rawTool = {}] = Object.entries(toolCall)[0] ?? [];
   const tool = asObject2(rawTool) ?? {};
   const args = asObject2(tool.args) ?? asObject2(tool.arguments) ?? tool;
-  const path47 = typeof args.path === "string" ? args.path : "";
+  const path48 = typeof args.path === "string" ? args.path : "";
   const kinds = {
     editToolCall: "edit",
     readToolCall: "read",
     shellToolCall: "exec",
     bashToolCall: "exec"
   };
-  return { kind: kinds[toolName] ?? "other", title: path47 || toolName, path: path47 };
+  return { kind: kinds[toolName] ?? "other", title: path48 || toolName, path: path48 };
 }
 async function* adaptCursor(lines) {
   for await (const rawLine of lines) {
@@ -13735,6 +13735,107 @@ function createInstallRunner(definition) {
   };
 }
 
+// src/cli/isolated-env.ts
+import path47 from "node:path";
+async function resolveIsolatedEnvDetails(env, isolated, providerName, activeProvider) {
+  if (!providerName) {
+    throw new Error("resolveIsolatedEnvDetails requires providerName.");
+  }
+  const baseDir = resolveIsolatedBaseDir(env, providerName);
+  const requiresConfig = isolated.requiresConfig !== false;
+  if (requiresConfig && !isolated.configProbe) {
+    throw new Error(
+      `resolveIsolatedEnvDetails requires configProbe when requiresConfig is true (provider "${providerName}").`
+    );
+  }
+  return {
+    agentBinary: isolated.agentBinary,
+    env: await resolveIsolatedEnvVars(env, baseDir, isolated.env, activeProvider),
+    configProbePath: isolated.configProbe ? resolveIsolatedEnvPath(env, baseDir, isolated.configProbe) : void 0
+  };
+}
+function resolveIsolatedBaseDir(env, providerName) {
+  return env.resolveHomePath(".poe-code", providerName);
+}
+async function resolveIsolatedEnvVars(env, baseDir, vars, activeProvider) {
+  const out = /* @__PURE__ */ Object.create(null);
+  for (const [key, value] of Object.entries(vars)) {
+    out[key] = await resolveIsolatedEnvValue(env, baseDir, value, activeProvider);
+  }
+  return out;
+}
+async function resolveIsolatedEnvValue(env, baseDir, value, activeProvider) {
+  if (typeof value === "string") {
+    return expandHomeShortcut(env, value);
+  }
+  if (isEnvVarReference(value)) {
+    const resolved = env.getVariable(value.name);
+    if (typeof resolved !== "string" || resolved.trim().length === 0) {
+      throw new Error(
+        `Missing required environment variable "${value.name}" for isolated wrapper.`
+      );
+    }
+    return resolved;
+  }
+  if (isProviderCredentialReference(value)) {
+    if (!activeProvider) {
+      throw new Error('Cannot resolve "providerCredential": no active provider on context.');
+    }
+    return `${value.prefix ?? ""}${activeProvider.credential}`;
+  }
+  if (isProviderBaseUrlReference(value)) {
+    if (!activeProvider) {
+      throw new Error('Cannot resolve "providerBaseUrl": no active provider on context.');
+    }
+    return activeProvider.baseUrl;
+  }
+  if (isAgentBaseUrlReference(value)) {
+    if (!activeProvider) {
+      throw new Error('Cannot resolve "agentBaseUrl": no active provider on context.');
+    }
+    return activeProvider.agentBaseUrl;
+  }
+  if (value.kind === "isolatedDir" || value.kind === "isolatedFile") {
+    return resolveIsolatedEnvPath(env, baseDir, value);
+  }
+  throw new Error("Unsupported isolated environment value.");
+}
+function resolveIsolatedEnvPath(env, baseDir, value) {
+  switch (value.kind) {
+    case "isolatedDir":
+      return value.relativePath ? path47.join(baseDir, value.relativePath) : baseDir;
+    case "isolatedFile":
+      return path47.join(baseDir, value.relativePath);
+  }
+}
+function isEnvVarReference(value) {
+  return typeof value === "object" && value.kind === "envVar";
+}
+function isProviderCredentialReference(value) {
+  return typeof value === "object" && value.kind === "providerCredential";
+}
+function isProviderBaseUrlReference(value) {
+  return typeof value === "object" && value.kind === "providerBaseUrl";
+}
+function isAgentBaseUrlReference(value) {
+  return typeof value === "object" && value.kind === "agentBaseUrl";
+}
+function expandHomeShortcut(env, input) {
+  if (!input.startsWith("~")) {
+    return input;
+  }
+  if (input === "~") {
+    return env.homeDir;
+  }
+  if (input.startsWith("~/") || input.startsWith(`~${path47.sep}`)) {
+    return path47.join(env.homeDir, input.slice(2));
+  }
+  if (input.startsWith("~./") || input.startsWith(`~.${path47.sep}`)) {
+    return path47.join(env.homeDir, `.${input.slice(3)}`);
+  }
+  return input;
+}
+
 // src/providers/opencode.ts
 function providerModel(model) {
   const value = model ?? DEFAULT_FRONTIER_MODEL;
@@ -13784,6 +13885,17 @@ async function ensureHealthWorkspace(context) {
   }
   return dir;
 }
+var openCodeIsolatedEnv = {
+  agentBinary: openCodeAgent.binaryName,
+  configProbe: {
+    kind: "isolatedFile",
+    relativePath: ".config/opencode/config.json"
+  },
+  env: {
+    XDG_CONFIG_HOME: { kind: "isolatedDir", relativePath: ".config" },
+    XDG_DATA_HOME: { kind: "isolatedDir", relativePath: ".local/share" }
+  }
+};
 var openCodeService = createProvider({
   ...openCodeAgent,
   configurationLabel: "OpenCode CLI",
@@ -13799,17 +13911,7 @@ var openCodeService = createProvider({
       }))
     }
   },
-  isolatedEnv: {
-    agentBinary: openCodeAgent.binaryName,
-    configProbe: {
-      kind: "isolatedFile",
-      relativePath: ".config/opencode/config.json"
-    },
-    env: {
-      XDG_CONFIG_HOME: { kind: "isolatedDir", relativePath: ".config" },
-      XDG_DATA_HOME: { kind: "isolatedDir", relativePath: ".local/share" }
-    }
-  },
+  isolatedEnv: openCodeIsolatedEnv,
   manifest: {
     configure: [
       fileMutation.ensureDirectory({ path: "~/.config/opencode" }),
@@ -13897,7 +13999,7 @@ var openCodeService = createProvider({
       })
     );
   },
-  spawn(context, options) {
+  async spawn(context, options) {
     const opts = options ?? {};
     const args = [
       ...getModelArgs(opts.model),
@@ -13905,12 +14007,22 @@ var openCodeService = createProvider({
       opts.prompt,
       ...opts.args ?? []
     ];
-    if (!opts.cwd && !opts.mcpServers) {
-      return context.command.runCommand("poe-code", ["wrap", "opencode", ...args]);
-    }
-    return context.command.runCommand("poe-code", ["wrap", "opencode", ...args], {
+    const activeProvider = context.activeProvider;
+    const details = await resolveIsolatedEnvDetails(
+      context.env,
+      openCodeIsolatedEnv,
+      openCodeAgent.id,
+      activeProvider
+    );
+    const mcpEnv = opts.mcpServers ? serializeOpenCodeMcpEnv(opts.mcpServers) : void 0;
+    return context.command.runCommand("opencode", args, {
       cwd: opts.cwd,
-      env: opts.mcpServers ? serializeOpenCodeMcpEnv(opts.mcpServers) : void 0
+      env: {
+        ...activeProvider?.extraEnv ?? {},
+        ...details?.env ?? {},
+        ...mcpEnv ?? {},
+        ...opts.env ?? {}
+      }
     });
   }
 });