@uniqbit/mate-opencode-plugin 0.15.5-canary.4 → 0.16.0-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniqbit/mate-opencode-plugin",
-  "version": "0.15.5-canary.4",
+  "version": "0.16.0-canary.0",
   "description": "OpenCode plugin integration for Mate.",
   "license": "MIT",
   "files": [
@@ -28,7 +28,7 @@
     "@opentui/core": "^0.4.5",
     "@opentui/keymap": "^0.4.5",
     "@opentui/solid": "^0.4.5",
-    "@uniqbit/mate-core": "0.15.5-canary.4"
+    "@uniqbit/mate-core": "0.16.0-canary.0"
   },
   "devDependencies": {
     "@types/bun": "^1.3.14",

package/src/add-dir.ts

@@ -1,24 +1,45 @@
 import path from "node:path";
 
 import type { Config, Hooks, Plugin } from "@opencode-ai/plugin";
+import { readCompanionRuntimeContext } from "@uniqbit/mate-core/runtime";
 
 // OpenCode accepts a per-path rule map for external_directory at runtime even
 // though the published Config type narrows it to a single rule value.
 type ExternalDirectoryRules = Record<string, "allow" | "ask" | "deny" | undefined>;
 type ConfigHook = NonNullable<Hooks["config"]>;
+type SkillConfig = { skills?: { paths?: string[] } };
 
 function companionPathRules(companionPath: string): string[] {
   return [companionPath, `${companionPath}/**`];
 }
 
+function companionSkillPaths(companionPath: string): string[] {
+  return [
+    path.join(companionPath, ".agents", "skills"),
+    path.join(companionPath, ".opencode", "skills"),
+  ];
+}
+
 function externalDirectoryRules(config: Config): ExternalDirectoryRules {
   const permission = (config.permission ??= {}) as { external_directory?: unknown };
   permission.external_directory ??= {};
   return permission.external_directory as ExternalDirectoryRules;
 }
 
+function skillPaths(config: Config): string[] {
+  const skillConfig = config as Config & SkillConfig;
+  skillConfig.skills ??= {};
+  skillConfig.skills.paths ??= [];
+  return skillConfig.skills.paths;
+}
+
+/**
+ * Resolves through the composed reader — launch environment first, Projection
+ * Root second — so a wrapped Working Repository allow-lists its companion in a
+ * session Mate did not start. No variable name is spelled here.
+ */
 export const AddDirPlugin: Plugin = async () => {
-  const companionPath = process.env.MATE_ARTIFACT_PATH?.trim();
+  const companionPath = readCompanionRuntimeContext().companionPath.trim();
   if (!companionPath) {
     return {};
   }
@@ -34,6 +55,13 @@ export const AddDirPlugin: Plugin = async () => {
           externalDirectory[rule] = "allow";
         }
       }
+
+      const paths = skillPaths(cfg);
+      for (const skillPath of companionSkillPaths(resolvedCompanionPath)) {
+        if (!paths.includes(skillPath)) {
+          paths.push(skillPath);
+        }
+      }
     }) satisfies ConfigHook,
   };
 };

package/src/companion.ts

@@ -2,9 +2,17 @@ import path from "node:path";
 
 import type { Plugin } from "@opencode-ai/plugin";
 import { tool } from "@opencode-ai/plugin";
-import { MATE_ENV, parseGuidanceContent, type MateGuidanceFile } from "@uniqbit/mate-core/runtime";
-
-import { readContext, type CompanionContext } from "@uniqbit/mate-core/opencode";
+import {
+  COMPANION_POLICY_MARKER,
+  MATE_ENV,
+  type MateGuidanceFile,
+} from "@uniqbit/mate-core/runtime";
+
+import {
+  readContext,
+  resolveOpenCodeGuidance,
+  type CompanionContext,
+} from "@uniqbit/mate-core/opencode";
 
 function prependPathEntry(pathValue: string | undefined, entry: string): string {
   const entries = (pathValue ?? "").split(path.delimiter).filter(Boolean);
@@ -16,22 +24,19 @@ function buildStartupError(details: string[]): Error {
     [
       "Mate OpenCode companion plugin is incomplete and cannot start.",
       ...details.map((detail) => `- ${detail}`),
-      "Launch through `mate opencode` so the CLI injects the companion guidance.",
+      "Launch through `mate opencode`, or run `mate wrap` so the guidance resolves from the Projection Root.",
     ].join("\n"),
   );
 }
 
-function loadGuidance(): MateGuidanceFile {
-  const raw = process.env[MATE_ENV.guidanceJson];
-  if (!raw || !raw.trim()) {
-    throw buildStartupError([`missing ${MATE_ENV.guidanceJson} in the launch environment`]);
-  }
-
-  const { guidance, errors } = parseGuidanceContent(raw);
-  if (errors.length > 0) {
-    throw buildStartupError(errors);
-  }
-
+/**
+ * Env first, projection second. A session Mate launched carries the payload;
+ * an Unmanaged Session in a wrapped repository builds the same payload from the
+ * companion the projection names, with the Capability names read live.
+ */
+function loadGuidance(): MateGuidanceFile | null {
+  const { guidance, errors } = resolveOpenCodeGuidance();
+  if (errors.length > 0) throw buildStartupError(errors);
   return guidance;
 }
 
@@ -59,12 +64,13 @@ function buildSystemPrompt(context: CompanionContext, guidance: MateGuidanceFile
 }
 
 export const CompanionPlugin: Plugin = async () => {
-  const context = readContext(process.env.MATE_ARTIFACT_PATH ?? "");
+  const context = readContext();
   if (!context.companionPath || !context.repositoryPath) {
     return {};
   }
 
   const guidance = loadGuidance();
+  if (!guidance) return {};
 
   const wrapperBinPath = process.env.MATE_WRAPPER_BIN_PATH ?? "$MATE_WRAPPER_BIN_PATH";
 
@@ -96,6 +102,12 @@ export const CompanionPlugin: Plugin = async () => {
       }),
     },
     "experimental.chat.system.transform": async (_input: any, output: { system: string[] }) => {
+      // A wrapped repository lists this plugin in its own project config, so a
+      // managed launch — whose OPENCODE_CONFIG_DIR names the companion, which
+      // lists it too — loads it twice. The marker is what makes the second load
+      // inert instead of appending the companion block a second time.
+      if (output.system.some((part) => part.includes(COMPANION_POLICY_MARKER))) return;
+
       // Collapse the whole system prompt into a single entry. opencode expands
       // each `system[]` element into its own `role:"system"` wire message, and
       // some self-hosted chat templates (e.g. Qwen served via vLLM) reject any
@@ -113,6 +125,7 @@ export const CompanionPlugin: Plugin = async () => {
       }
     },
     "experimental.session.compacting": async (_input: any, output: { context: string[] }) => {
+      if (output.context.some((part) => part.includes(COMPANION_POLICY_MARKER))) return;
       output.context.push(buildSystemPrompt(context, guidance).join("\n"));
     },
     "shell.env": async (_input: any, output: { env: Record<string, string> }) => {