@uniqbit/mate-core 0.17.0-canary.8 → 0.17.1

package/src/tools/setup/providers/opencode.ts

@@ -25,6 +25,7 @@ import { mergeDir, pruneEmptyAncestors } from "../utils";
 import {
   getOpenCodePluginReferences,
   isRecord,
+  normalizeOpenCodeConfig,
   readOpenCodeConfig,
   setOpenCodePluginReferences,
   toOpenCodeMcpEntry,
@@ -34,6 +35,8 @@ import {
 } from "./opencode-format";
 import { getSetupProvidersRoot, getSetupRootTemplates } from "./utils";
 
+const COMPANION_GITIGNORE_ENTRIES = [".opencode/service.json"];
+
 // Copied Mate plugin source files from earlier releases. Plugin code is
 // package-owned now; these exact filenames are removed during sync and
 // teardown while every other companion-local plugin is preserved.
@@ -111,6 +114,11 @@ function isLegacyMatePluginConfigEntry(entry: unknown): boolean {
   return typeof entry === "string" && LEGACY_PLUGIN_CONFIG_ENTRY_PATTERN.test(entry);
 }
 
+/** Current package references and legacy copied-file references alike. */
+function isMatePluginEntry(entry: unknown): boolean {
+  return isMateOpenCodePluginReference(entry) || isLegacyMatePluginConfigEntry(entry);
+}
+
 /**
  * Replace any Mate plugin entry (stale package pins and legacy copied-file
  * references) with the current pinned package reference while preserving
@@ -118,16 +126,16 @@ function isLegacyMatePluginConfigEntry(entry: unknown): boolean {
  */
 function ensureMatePluginReference(config: OpenCodeConfig, pluginReference: string): void {
   const preserved = getOpenCodePluginReferences(config).filter(
-    (entry) => !isMateOpenCodePluginReference(entry) && !isLegacyMatePluginConfigEntry(entry),
+    (entry) => !isMatePluginEntry(entry),
   );
   setOpenCodePluginReferences(config, [...preserved, pluginReference]);
 }
 
 function stripMatePluginReference(config: OpenCodeConfig): void {
-  if (!Array.isArray(config.plugin)) return;
+  if (!Array.isArray(config.plugin) && !Array.isArray(config.plugins)) return;
 
   const preserved = getOpenCodePluginReferences(config).filter(
-    (entry) => !isMateOpenCodePluginReference(entry) && !isLegacyMatePluginConfigEntry(entry),
+    (entry) => !isMatePluginEntry(entry),
   );
   setOpenCodePluginReferences(config, preserved);
 }
@@ -137,11 +145,15 @@ async function syncOpenCodeConfigFile(
   destPath: string,
   pluginReference: string,
 ): Promise<void> {
-  const defaults = JSON.parse(await fs.readFile(srcPath, "utf8")) as Record<string, unknown>;
+  const defaults = normalizeOpenCodeConfig(
+    JSON.parse(await fs.readFile(srcPath, "utf8")) as Record<string, unknown>,
+  );
 
   let existing: Record<string, unknown> = {};
   try {
-    existing = JSON.parse(await fs.readFile(destPath, "utf8")) as Record<string, unknown>;
+    existing = normalizeOpenCodeConfig(
+      JSON.parse(await fs.readFile(destPath, "utf8")) as Record<string, unknown>,
+    );
   } catch (error) {
     const code = (error as NodeJS.ErrnoException).code;
     if (code !== "ENOENT") {
@@ -154,6 +166,38 @@ async function syncOpenCodeConfigFile(
   await writeOpenCodeConfig(destPath, existing);
 }
 
+/**
+ * V2 loads TUI components exposed by server plugins declared in opencode.json;
+ * project-local tui.json is no longer a config destination. Strip only Mate's
+ * old duplicate reference and leave unrelated legacy contents for OpenCode's
+ * own TUI-config migration.
+ */
+async function removeMatePluginFromLegacyTuiConfig(configDir: string): Promise<void> {
+  const configPath = path.join(configDir, "tui.json");
+  let config: Record<string, unknown>;
+  try {
+    const parsed = JSON.parse(await fs.readFile(configPath, "utf8")) as unknown;
+    if (!isRecord(parsed)) return;
+    config = parsed;
+  } catch {
+    return;
+  }
+
+  for (const key of ["plugin", "plugins"]) {
+    if (!Array.isArray(config[key])) continue;
+    const kept = (config[key] as unknown[]).filter((entry) => !isMatePluginEntry(entry));
+    if (kept.length > 0) config[key] = kept;
+    else delete config[key];
+  }
+  if (config.$schema === "https://opencode.ai/tui.json") delete config.$schema;
+
+  if (Object.keys(config).length === 0) {
+    await fs.unlink(configPath).catch(() => {});
+    return;
+  }
+  await writeOpenCodeConfig(configPath, config);
+}
+
 function normalizeForComparison(value: unknown): unknown {
   if (Array.isArray(value)) {
     return value.map(normalizeForComparison);
@@ -284,11 +328,7 @@ async function syncOpenCodeRuntimeFiles(
     path.join(dest, "opencode.json"),
     pluginReference,
   );
-  await syncOpenCodeConfigFile(
-    path.join(src, "tui.json"),
-    path.join(dest, "tui.json"),
-    pluginReference,
-  );
+  await removeMatePluginFromLegacyTuiConfig(dest);
   await removeLegacyRuntimeFiles(dest);
   await removeLegacyTuiDependencies(dest);
 
@@ -331,7 +371,7 @@ async function teardownOpenCode(companionPath: string, activeProviders: string[]
     path.join(src, "opencode.json"),
     path.join(dest, "opencode.json"),
   );
-  await teardownOpenCodeConfigFile(path.join(src, "tui.json"), path.join(dest, "tui.json"));
+  await removeMatePluginFromLegacyTuiConfig(dest);
   await removeLegacyRuntimeFiles(dest);
   await removeLegacyTuiDependencies(dest);
   await pruneEmptyAncestors(path.join(dest, "plugins"), companionPath);
@@ -405,10 +445,10 @@ export async function removeOpenCodeForeignPluginReferences(
   }
   try {
     const parsed = JSON.parse(raw) as Record<string, unknown>;
-    if (Array.isArray(parsed.plugin)) {
+    if (Array.isArray(parsed.plugin) || Array.isArray(parsed.plugins)) {
       setOpenCodePluginReferences(
         parsed,
-        parsed.plugin.filter((entry) => !isForeign(entry)),
+        getOpenCodePluginReferences(parsed).filter((entry) => !isForeign(entry)),
       );
     }
     if (Object.keys(parsed).length === 0) {
@@ -428,7 +468,7 @@ export async function removeOpenCodeForeignPluginReferences(
 // skill trees.
 // ---------------------------------------------------------------------------
 
-const OPENCODE_CONTRIBUTION_CONFIG_FILES = ["opencode.json", "tui.json"];
+const OPENCODE_CONTRIBUTION_CONFIG_FILES = ["opencode.json"];
 
 export async function reconcileOpenCodeContributions(
   ctx: SetupContext,
@@ -517,7 +557,7 @@ async function reconcileOpenCodeMcpContributions(
   }
 }
 
-/** The Mate-managed `mcp` map of one pass, as a value. */
+/** The Mate-managed V2 `mcp.servers` map of one pass, as a value. */
 export function renderManagedOpenCodeMcpServers(
   contributions: CapabilityContributionInput[] = [],
 ): Record<string, unknown> {
@@ -532,14 +572,17 @@ export function renderManagedOpenCodeMcpServers(
 }
 
 /**
- * The Mate-managed `permission.external_directory` map, as a value. Rendered
- * once for both destinations a session can reach it through — the projected
+ * The Mate-managed V2 `external_directory` rules. Rendered once for both
+ * destinations a session can reach them through — the projected
  * document and the launch environment — so the two cannot drift.
  */
 export function renderCompanionExternalDirectoryPermissions(
   companionPath: string,
-): Record<string, string> {
-  return { [companionPath]: "allow", [`${companionPath}/**`]: "allow" };
+): Array<{ action: string; resource: string; effect: string }> {
+  return [
+    { action: "external_directory", resource: companionPath, effect: "allow" },
+    { action: "external_directory", resource: `${companionPath}/**`, effect: "allow" },
+  ];
 }
 
 /**
@@ -575,6 +618,7 @@ export function createOpenCodePlugin(): ProviderPlugin {
     description: "Install the OpenCode plugin workspace.",
     defaultSelected: false,
     isEnabled: (config) => (config.allowedAgents ?? []).includes("opencode"),
+    gitignoreEntries: () => COMPANION_GITIGNORE_ENTRIES,
     hosting: {
       mcp: {
         async register(ctx: SetupContext, descriptor) {
@@ -610,5 +654,3 @@ export function createOpenCodePlugin(): ProviderPlugin {
     },
   };
 }
-
-export { OPENCODE_PLUGIN_PACKAGE_NAME };

package/src/tools/setup/runtime-documents.ts

@@ -1,6 +1,5 @@
 import {
   CLAUDE_LOCAL_CONFIG_DOCUMENT,
-  CLAUDE_MCP_DOCUMENT,
   CLAUDE_SETTINGS_DOCUMENT,
   OPENCODE_CONFIG_DOCUMENT,
 } from "../../lib/orchestrator/projection-runtime-documents";
@@ -32,12 +31,7 @@ import { projectionRepoRoot } from "./surface-target";
  * differs from the companion target.
  */
 
-export {
-  CLAUDE_LOCAL_CONFIG_DOCUMENT,
-  CLAUDE_MCP_DOCUMENT,
-  CLAUDE_SETTINGS_DOCUMENT,
-  OPENCODE_CONFIG_DOCUMENT,
-};
+export { CLAUDE_LOCAL_CONFIG_DOCUMENT };
 
 function nonEmpty(region: ManagedRegion): boolean {
   if (region.kind === "list") return region.values.length > 0;
@@ -157,15 +151,19 @@ export function renderDocumentsForTarget(
     documents.push(
       ...document(OPENCODE_CONFIG_DOCUMENT, [
         {
-          at: ["plugin"],
+          at: ["plugins"],
           kind: "list",
           values: [getOpenCodePluginPackageReference()],
         },
-        { at: ["mcp"], kind: "map", entries: renderManagedOpenCodeMcpServers(inputs) },
         {
-          at: ["permission", "external_directory"],
+          at: ["mcp", "servers"],
           kind: "map",
-          entries: renderCompanionExternalDirectoryPermissions(ctx.companionPath),
+          entries: renderManagedOpenCodeMcpServers(inputs),
+        },
+        {
+          at: ["permissions"],
+          kind: "list",
+          values: renderCompanionExternalDirectoryPermissions(ctx.companionPath),
         },
       ]),
     );

package/src/tools/setup.ts

@@ -5,7 +5,6 @@ import { FRAMEWORK_NAME } from "../framework";
 import { ConfigStore, mergeWithDefaults } from "../lib/orchestrator/config-store";
 import { GlobalConfigStore } from "../lib/orchestrator/global-config-store";
 import {
-  BUILTIN_SETUP_COMPATIBILITIES,
   dedupeCapabilities,
   getSetupSelectionsFromConfig,
 } from "../lib/orchestrator/setup-compatibilities";
@@ -194,6 +193,3 @@ export function createUvPluginForTest(deps: PackageManagerSetupDeps) {
 }
 
 export default setup;
-
-// Re-export BUILTIN_SETUP_COMPATIBILITIES passthrough for setup-selector UI compatibility.
-export { BUILTIN_SETUP_COMPATIBILITIES };

package/src/cli/commands/studio/views/pairings.tsx

@@ -1,38 +0,0 @@
-/** @jsxImportSource hono/jsx */
-
-import type { StudioInventoryCompanion } from "../inventory";
-
-interface PairingsProps {
-  companion: StudioInventoryCompanion | null;
-}
-
-/**
- * Context, never a selection: everything Studio serves is companion-scoped, so
- * a Working Repository is listed and never chosen.
- */
-export function Pairings({ companion }: PairingsProps) {
-  const pairings = companion?.pairings ?? [];
-
-  return (
-    <div className="sidebar-pairings">
-      <span className="sidebar-label">Working repositories</span>
-      {pairings.length === 0 ? (
-        <p className="empty">no linked working repository</p>
-      ) : (
-        <ul className="plain pairings">
-          {pairings.map((pairing) => (
-            <li key={pairing.repositoryPath} data-repository={pairing.repositoryPath}>
-              <span className="mono">{pairing.repositoryId}</span>
-              {pairing.ambiguous ? <span className="chip">also paired elsewhere</span> : null}
-              {pairing.health === "ready" ? null : (
-                <span className="chip chip-invalid">{pairing.health}</span>
-              )}
-              <br />
-              <span className="muted">{pairing.repositoryPath}</span>
-            </li>
-          ))}
-        </ul>
-      )}
-    </div>
-  );
-}

package/src/templates/providers/opencode/tui.json

@@ -1,3 +0,0 @@
-{
-  "$schema": "https://opencode.ai/tui.json"
-}