@sjawhar/opencode-legion-envoy 0.6.1 → 0.8.0

package/src/server.ts

@@ -1,15 +1,30 @@
+import { existsSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { agentSubject } from "@legion/contracts";
 import { envoyDefaultsFromEnvironment } from "@legion/envoy-client/defaults";
+import { dispatchSubscriptionTopic } from "@legion/envoy-client/dispatch-subscribe";
 import { machineID } from "@legion/envoy-client/machine";
 import { envoyToolSpecs } from "@legion/envoy-client/tool-contract";
 import { createEnvoyClient } from "@legion/envoy-client/transport";
 import { tool } from "@opencode-ai/plugin/tool";
 import { loadEnvoyConfig } from "./config";
 import { buildDispatchMcpEntry, injectEnvoyMcp } from "./dispatch-mcp";
-import { dispatchSubscriptionTopic } from "./dispatch-subscribe";
 import { logger } from "./log";
 import { resolvePort } from "./port";
 
+const moduleDirectory = path.dirname(fileURLToPath(import.meta.url));
+// Legion skills ship inside this package so OpenCode carries them without a
+// vendor checkout. OpenCode discovers skills only from fixed directories and
+// `config.skills.paths` — never from plugin package dirs — so the config hook
+// below must inject this path itself.
+//   Published tarball: dist/src/server.js → <pkg>/skills (staged at prepack).
+//   Repo checkout:     src/server.ts      → <repo>/skills.
+const skillsDirectory = [
+  path.resolve(moduleDirectory, "../../skills"),
+  path.resolve(moduleDirectory, "../../../skills"),
+].find((dir) => existsSync(dir));
+
 const [
   subscribeSpec,
   unsubscribeSpec,
@@ -139,7 +154,20 @@ export default async (input: { serverUrl: URL }) => {
   });
 
   return {
-    config: (cfg: { mcp?: Record<string, unknown> } & Record<string, unknown>) => {
+    config: (
+      cfg: { mcp?: Record<string, unknown>; skills?: { paths?: string[] } } & Record<
+        string,
+        unknown
+      >
+    ) => {
+      // Serve the bundled legion skills to every session on this serve.
+      if (skillsDirectory) {
+        cfg.skills ??= {};
+        cfg.skills.paths ??= [];
+        if (!cfg.skills.paths.includes(skillsDirectory)) {
+          cfg.skills.paths.push(skillsDirectory);
+        }
+      }
       // Inject the envoy MCP entry into the OpenCode config when
       // dispatch is enabled. Centralizing this in the plugin (instead of
       // each user's opencode.json) means:

package/src/dispatch-subscribe.ts

@@ -1,52 +0,0 @@
-// Auto-subscription wiring for the envoy_dispatch MCP tool.
-//
-// When an agent opens a Dispatch thread via the envoy_dispatch MCP tool, the
-// human answers by commenting on the resulting GitHub sub-issue. For the agent
-// to RECEIVE that answer, its session must be subscribed to the thread's Envoy
-// topic (notifications.github.<owner>.<repo>.issue.<thread>.>). The dispatch
-// tool is served by the Go dispatch server and has no OpenCode session context,
-// so we close the loop in the plugin (which does know the session id) from the
-// tool.execute.after hook.
-//
-// This module is the pure, testable core: it turns a completed tool execution
-// into the topic the calling session should subscribe to, or null when the
-// execution isn't a successful envoy_dispatch call.
-
-// Matches a GitHub issue URL anywhere in the tool output and captures
-// owner / repo / number. The dispatch tool returns {"thread":N,"url":"…"} as
-// its text content, so the URL is always present on success.
-const ISSUE_URL_RE = /https?:\/\/github\.com\/([^/\s"]+)\/([^/\s"]+)\/issues\/(\d+)/i;
-
-// The tool is registered on the Go MCP server as "dispatch" and exposed to
-// OpenCode under the "envoy" MCP server (so commonly "envoy_dispatch"). Accept
-// any separator a client might use while still excluding unrelated tools.
-const DISPATCH_TOOL_RE = /(^|[-._])dispatch$/i;
-
-export function isDispatchTool(tool: string): boolean {
-  return DISPATCH_TOOL_RE.test(tool);
-}
-
-/** Build the Envoy topic carrying every event on a dispatch thread issue. */
-export function dispatchThreadTopic(owner: string, repo: string, thread: number): string {
-  return `notifications.github.${owner}.${repo}.issue.${thread}.>`;
-}
-
-/**
- * Given a completed tool execution (name + textual output), return the Envoy
- * topic the calling session should subscribe to so it receives replies on the
- * dispatch thread — or null when this isn't a successful envoy_dispatch call.
- *
- * Parsing the GitHub issue URL out of the output (rather than trusting a JSON
- * field) keeps this robust to however OpenCode surfaces the MCP result: owner,
- * repo, and thread number all come from the canonical issue URL.
- */
-export function dispatchSubscriptionTopic(tool: string, output: string): string | null {
-  if (!isDispatchTool(tool)) return null;
-  const match = ISSUE_URL_RE.exec(output);
-  if (!match) return null;
-  const owner = match[1] as string;
-  const repo = match[2] as string;
-  const thread = Number(match[3]);
-  if (!Number.isInteger(thread) || thread <= 0) return null;
-  return dispatchThreadTopic(owner, repo, thread);
-}