@uniqbit/mate-core 0.15.4-canary.8 → 0.15.4-canary.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniqbit/mate-core",
-  "version": "0.15.4-canary.8",
+  "version": "0.15.4-canary.9",
   "description": "Core framework and plugin APIs for Mate.",
   "license": "MIT",
   "files": [

package/src/lib/context-mode-package.ts

@@ -37,7 +37,9 @@ export function isContextModeNodeVersionSupported(version: string): boolean {
 }
 
 export function validateContextModeNodeRuntime(): void {
-  const result = spawnSync("node", ["--version"], { encoding: "utf8" });
+  // env passed explicitly: bun's spawnSync otherwise ignores in-process PATH
+  // changes when resolving the executable.
+  const result = spawnSync("node", ["--version"], { encoding: "utf8", env: process.env });
   const version = result.stdout?.trim() ?? "";
   if (result.status !== 0 || !isContextModeNodeVersionSupported(version)) {
     throw new Error(
@@ -83,7 +85,7 @@ export async function installContextModePackage(companionPath: string): Promise<
   const result = spawnSync(
     "npm",
     ["install", "--no-audit", "--no-fund", "--silent", "--registry", PUBLIC_NPM_REGISTRY],
-    { cwd: installDir, encoding: "utf8" },
+    { cwd: installDir, encoding: "utf8", env: process.env },
   );
   if (result.error || result.status !== 0) {
     throw new Error(

package/src/lib/orchestrator/adapters/opencode.ts

@@ -9,61 +9,15 @@ import {
   getOpenCodePluginPackageReference,
   isMateOpenCodePluginReference,
 } from "../../opencode-plugin-package";
+import {
+  getOpenCodePluginReferences,
+  mergeOpenCodeConfigContent,
+  readOpenCodeConfig,
+} from "../../../tools/setup/providers/opencode-format";
 import { buildOpenCodeGuidance } from "../opencode-guidance";
 import { LaunchPreflightError } from "../types";
 import { type AdapterContext, LaunchAdapter } from "./base";
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-function mergeConfig(target: Record<string, unknown>, source: Record<string, unknown>): void {
-  for (const [key, sourceValue] of Object.entries(source)) {
-    const targetValue = target[key];
-    if (isRecord(targetValue) && isRecord(sourceValue)) {
-      mergeConfig(targetValue, sourceValue);
-      continue;
-    }
-
-    target[key] = sourceValue;
-  }
-}
-
-function mergeOpenCodeConfigContent(
-  overlay: Record<string, unknown>,
-  env: NodeJS.ProcessEnv = process.env,
-  options: { appendSkillPaths?: string[] } = {},
-): string {
-  let config: Record<string, unknown> = {};
-  const existing = env.OPENCODE_CONFIG_CONTENT;
-
-  if (existing) {
-    try {
-      const parsed = JSON.parse(existing) as unknown;
-      if (isRecord(parsed)) {
-        config = parsed;
-      }
-    } catch {
-      // Ignore invalid inherited config content rather than breaking launch.
-    }
-  }
-
-  mergeConfig(config, overlay);
-
-  if (options.appendSkillPaths && options.appendSkillPaths.length > 0) {
-    const skills = isRecord(config.skills) ? config.skills : {};
-    const paths = Array.isArray(skills.paths) ? skills.paths : [];
-    const existingPaths = new Set(paths);
-    skills.paths = [
-      ...paths,
-      ...options.appendSkillPaths.filter((skillPath) => !existingPaths.has(skillPath)),
-    ];
-    config.skills = skills;
-  }
-
-  return JSON.stringify(config);
-}
-
 export class OpenCodeAdapter extends LaunchAdapter {
   readonly toolName = "opencode";
   readonly interactive = true;
@@ -190,18 +144,14 @@ export class OpenCodeAdapter extends LaunchAdapter {
   ): Promise<string[]> {
     const configPath = path.join(context.companionPath, configFile);
 
-    let config: unknown;
-    try {
-      config = JSON.parse(await fs.readFile(configPath, "utf8"));
-    } catch {
-      return [`Unreadable OpenCode configuration: ${configPath}`];
-    }
-    if (!isRecord(config)) {
+    const { present, config } = await readOpenCodeConfig(configPath);
+    if (!present) {
       return [`Unreadable OpenCode configuration: ${configPath}`];
     }
 
-    const plugins = Array.isArray(config.plugin) ? (config.plugin as unknown[]) : [];
-    const mateReferences = plugins.filter(isMateOpenCodePluginReference) as string[];
+    const mateReferences = getOpenCodePluginReferences(config).filter(
+      isMateOpenCodePluginReference,
+    ) as string[];
 
     if (mateReferences.includes(expectedPluginReference)) {
       return [];