@sjawhar/opencode-legion-envoy 0.6.1 → 0.7.0

package/dist/bin/dispatch-mcp-shim.js

@@ -13834,12 +13834,6 @@ function isJsonRpcRequest(value) {
   return value.id === null || typeof value.id === "string" || typeof value.id === "number";
 }
 function dispatchShimGate(env, options = {}) {
-  if (env.LEGION_TREE !== undefined || env.LEGION_CONTROLLER === "1") {
-    return {
-      serve: false,
-      reason: "Legion sessions use envoy_dispatch via the daemon; not serving the raw dispatch tool"
-    };
-  }
   const remoteUrl = resolveDispatchMcpUrl(env, options);
   if (remoteUrl === null) {
     return {

package/dist/src/server.js

@@ -13754,21 +13754,6 @@ var LegionDaemonApi = {
     request: architectCapability.extend({ issue: nonEmptyString, comment: exports_external.string().optional() }),
     response: exports_external.object({})
   },
-  DispatchThread: {
-    request: exports_external.strictObject({
-      tree: nonEmptyString,
-      issue: nonEmptyString,
-      role: legionRole,
-      sessionId: nonEmptyString,
-      secret: nonEmptyString,
-      parent: nonEmptyString,
-      subject: nonEmptyString,
-      body: nonEmptyString,
-      ask: exports_external.unknown().optional(),
-      urgency: exports_external.enum(["low", "med", "high", "blocking"]).optional()
-    }),
-    response: exports_external.object({ thread: exports_external.number().int(), url: nonEmptyString })
-  },
   SpawnToken: {
     request: architectCapability.extend({ issue: nonEmptyString, role: legionRole }),
     response: exports_external.object({ spawnToken: nonEmptyString })
@@ -13858,6 +13843,29 @@ function normalizeEnvoyUrl(value) {
   return value.replace(/\/+$/, "");
 }
 
+// ../envoy-client/src/dispatch-subscribe.ts
+var ISSUE_URL_RE = /https?:\/\/github\.com\/([^/\s"]+)\/([^/\s"]+)\/issues\/(\d+)/i;
+var DISPATCH_TOOL_RE = /(^|[-._])dispatch$/i;
+function isDispatchTool(tool) {
+  return DISPATCH_TOOL_RE.test(tool);
+}
+function dispatchThreadTopic(owner, repo, thread) {
+  return `notifications.github.${owner}.${repo}.issue.${thread}.>`;
+}
+function dispatchSubscriptionTopic(tool, output) {
+  if (!isDispatchTool(tool))
+    return null;
+  const match = ISSUE_URL_RE.exec(output);
+  if (!match)
+    return null;
+  const owner = match[1];
+  const repo = match[2];
+  const thread = Number(match[3]);
+  if (!Number.isInteger(thread) || thread <= 0)
+    return null;
+  return dispatchThreadTopic(owner, repo, thread);
+}
+
 // ../envoy-client/src/machine.ts
 import { hostname as hostname3 } from "os";
 function machineID() {
@@ -14182,29 +14190,6 @@ function injectEnvoyMcp(cfg, entry) {
   return {};
 }
 
-// src/dispatch-subscribe.ts
-var ISSUE_URL_RE = /https?:\/\/github\.com\/([^/\s"]+)\/([^/\s"]+)\/issues\/(\d+)/i;
-var DISPATCH_TOOL_RE = /(^|[-._])dispatch$/i;
-function isDispatchTool(tool2) {
-  return DISPATCH_TOOL_RE.test(tool2);
-}
-function dispatchThreadTopic(owner, repo, thread) {
-  return `notifications.github.${owner}.${repo}.issue.${thread}.>`;
-}
-function dispatchSubscriptionTopic(tool2, output) {
-  if (!isDispatchTool(tool2))
-    return null;
-  const match = ISSUE_URL_RE.exec(output);
-  if (!match)
-    return null;
-  const owner = match[1];
-  const repo = match[2];
-  const thread = Number(match[3]);
-  if (!Number.isInteger(thread) || thread <= 0)
-    return null;
-  return dispatchThreadTopic(owner, repo, thread);
-}
-
 // src/port.ts
 import { execFile } from "child_process";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjawhar/opencode-legion-envoy",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "type": "module",
   "main": "dist/src/server.js",
   "exports": {

package/src/server.ts

@@ -1,12 +1,12 @@
 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";
 

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);
-}