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

package/package.json

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

package/src/cli/commands/install.ts

@@ -56,10 +56,14 @@ export async function runInstallCommand(argv: string[], cwd = process.cwd()): Pr
     process.exitCode = 1;
     return false;
   }
-  // Companion-declared plugins install first and hydrate into the registry
-  // before the plan is built, so one run goes install → load → plan and their
-  // own install requirements are part of the plan.
-  if (context.kind === "companion" && context.companionPath && context.config.plugins?.length) {
+  // Root-declared plugins (companion or hub) install first and hydrate into
+  // the registry before the plan is built, so one run goes install → load →
+  // plan and their own install requirements are part of the plan.
+  if (
+    (context.kind === "companion" || context.kind === "hub") &&
+    context.companionPath &&
+    context.config.plugins?.length
+  ) {
     reportPluginInstallResults(
       await installDeclaredPlugins(context.companionPath, context.config.plugins),
     );

package/src/cli/commands/plugin/install.ts

@@ -37,7 +37,7 @@ export interface PluginInstallCommandDeps {
 
 /**
  * @command mate plugin install <package>[@version]
- * @description Declares `<package>` in the companion's `framework.yaml`
+ * @description Declares `<package>` in the companion's (or hub's) `framework.yaml`
  * `plugins:` list (adding it, or updating its version if already declared)
  * and installs it immediately into the shared workspace, the same way
  * `mate install` would on its next run.
@@ -62,9 +62,9 @@ export async function runPluginInstallCommand(
     process.exitCode = 1;
     return false;
   }
-  if (context.kind !== "companion" || !context.companionPath) {
+  if ((context.kind !== "companion" && context.kind !== "hub") || !context.companionPath) {
     process.stderr.write(
-      `${FRAMEWORK_NAME}: \`plugin install\` requires a companion context; run it from inside a linked working repository.\n`,
+      `${FRAMEWORK_NAME}: \`plugin install\` requires a companion or hub context; run it from inside a linked working repository or a hub root.\n`,
     );
     process.exitCode = 1;
     return false;

package/src/cli/main.ts

@@ -30,6 +30,8 @@ export interface GateNeeds {
   updateGuard?: boolean;
   /** Block the command when the current directory resolves to a hub root. */
   notHubRoot?: boolean;
+  /** Block the command when the current directory resolves to a companion root. */
+  notCompanionRoot?: boolean;
   /** Require an unambiguous companion (selection wizard on ambiguity) before dispatch. */
   companion?: boolean;
   /** Require a complete installation (install preflight) before dispatch. */
@@ -91,12 +93,22 @@ export async function main(argv = process.argv, deps: MainDeps = mainDeps): Prom
       await showUpdateBannerIfAvailable(updateStore);
     }
 
-    if (needs.notHubRoot && (await deps.resolveRootContext()).kind === "hub") {
-      console.error(
-        `${FRAMEWORK_NAME}: this directory resolves to a companion hub root; companion commands are not available here. Use \`${FRAMEWORK_NAME} hub ...\` to manage the hub.`,
-      );
-      process.exitCode = 1;
-      return false;
+    if (needs.notHubRoot || needs.notCompanionRoot) {
+      const kind = (await deps.resolveRootContext()).kind;
+      if (needs.notHubRoot && kind === "hub") {
+        console.error(
+          `${FRAMEWORK_NAME}: this directory resolves to a companion hub root; companion commands are not available here. Use \`${FRAMEWORK_NAME} hub ...\` to manage the hub.`,
+        );
+        process.exitCode = 1;
+        return false;
+      }
+      if (needs.notCompanionRoot && kind === "companion") {
+        console.error(
+          `${FRAMEWORK_NAME}: this directory resolves to a companion root; hub commands are not available here. Run them from a hub root.`,
+        );
+        process.exitCode = 1;
+        return false;
+      }
     }
 
     if (needs.companion && !(await deps.ensureUnambiguousCompanion())) {
@@ -126,9 +138,10 @@ export async function main(argv = process.argv, deps: MainDeps = mainDeps): Prom
       return;
     case "plugin":
       // Declares into framework.yaml and installs on the spot, so it needs
-      // the same gating as `install` — an unambiguous companion, but must
-      // stay runnable when installation is otherwise incomplete.
-      if (!(await gate({ updateGuard: true }))) return;
+      // the same gating as `install` — an unambiguous companion (hubs pass
+      // trivially), but must stay runnable when installation is otherwise
+      // incomplete.
+      if (!(await gate({ companion: true }))) return;
       await runPluginCommand(subcommand, rest);
       return;
     case "artifact":
@@ -144,9 +157,10 @@ export async function main(argv = process.argv, deps: MainDeps = mainDeps): Prom
           if (!(await gate({ notHubRoot: true }))) return;
           break;
         // Hub commands establish and operate on a local hub root directly;
-        // they must not require a linked working repository or installation.
+        // they must not require a linked working repository or installation —
+        // but companions are never hubs.
         case "hub":
-          if (!(await gate({ updateGuard: true }))) return;
+          if (!(await gate({ updateGuard: true, notCompanionRoot: true }))) return;
           break;
         // open/tui consume a companion context.
         case "open":
@@ -160,7 +174,8 @@ export async function main(argv = process.argv, deps: MainDeps = mainDeps): Prom
       await runCompanionCommand(subcommand, rest);
       return;
     case "hub":
-      if (!(await gate({ updateGuard: true }))) return;
+      // Hubs are never companions: hub commands are blocked in companion roots.
+      if (!(await gate({ updateGuard: true, notCompanionRoot: true }))) return;
       await runHubCommand(subcommand ? [subcommand, ...rest] : []);
       return;
     case "claude":

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 [];