@sjawhar/opencode-legion-envoy 0.5.2 → 0.6.1

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@sjawhar/opencode-legion-envoy",
-  "version": "0.5.2",
+  "version": "0.6.1",
   "type": "module",
-  "main": "src/server.ts",
+  "main": "dist/src/server.js",
   "exports": {
+    ".": {
+      "import": "./dist/src/server.js"
+    },
     "./server": {
-      "import": "./src/server.ts"
+      "import": "./dist/src/server.js"
     },
     "./tui": {
       "import": "./src/tui.tsx"
@@ -15,15 +18,19 @@
     "type": "git",
     "url": "https://github.com/sjawhar/legion"
   },
-  "types": "src/server.ts",
+  "files": [
+    "dist",
+    "src",
+    "!src/**/__tests__"
+  ],
   "scripts": {
+    "build": "bun build src/server.ts bin/dispatch-mcp-shim.ts --outdir dist --target bun --format esm --external '@opencode-ai/*'",
+    "prepack": "bun run build",
     "typecheck": "bunx tsc --noEmit",
     "test": "bun test",
     "lint": "bunx biome check src/"
   },
   "dependencies": {
-    "@legion/contracts": "workspace:*",
-    "@legion/envoy-client": "workspace:*",
     "@opencode-ai/plugin": "~1.14.46"
   },
   "peerDependencies": {
@@ -32,6 +39,8 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.14",
+    "@legion/contracts": "0.10.0",
+    "@legion/envoy-client": "0.1.0",
     "@types/bun": "latest",
     "solid-js": "^1.9.0",
     "typescript": "^5.3.0"

package/src/config/index.ts

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { messageFor } from "@legion/envoy-client/errors";
 import { logger } from "../log";
 import { type EnvoyConfig, EnvoyConfigSchema } from "./schema";
 
@@ -23,7 +24,7 @@ function readConfigFile(filePath: string): EnvoyConfig | null {
     }
     return parsed.data as EnvoyConfig;
   } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
+    const message = messageFor(error);
     logger.warn(`[envoy-plugin] Failed to load config at ${filePath}: ${message}`);
     return null;
   }

package/src/dispatch-mcp.ts

@@ -1,3 +1,4 @@
+import { existsSync } from "node:fs";
 import path from "node:path";
 import type { DispatchConfig } from "./config";
 
@@ -38,10 +39,20 @@ export interface BuildDispatchMcpEntryOptions {
 const DEFAULT_SERVER_URL = "http://localhost:8766";
 
 function defaultShimPath(): string {
-  // import.meta.dir resolves to this file's directory in Bun, e.g.
-  // /home/ubuntu/legion/default/packages/envoy-plugin/src — go up one
-  // level to the package root, then into bin/.
-  return path.join(import.meta.dir, "..", "bin", "dispatch-mcp-shim.ts");
+  // Source layout: this module runs from src/ and the shim wrapper lives at
+  // ../bin/dispatch-mcp-shim.ts. Packed layout: this module is bundled to
+  // dist/src/server.js and the self-contained shim bundle lives at
+  // dist/bin/dispatch-mcp-shim.js — same ../bin relationship, built artifact.
+  const packageRoot = path.join(import.meta.dir, "..");
+  const candidates = [
+    path.join(packageRoot, "bin", "dispatch-mcp-shim.js"),
+    path.join(packageRoot, "bin", "dispatch-mcp-shim.ts"),
+  ];
+  const found = candidates.find((candidate) => existsSync(candidate));
+  if (!found) {
+    throw new Error(`dispatch MCP shim not found; tried: ${candidates.join(", ")}`);
+  }
+  return found;
 }
 
 /**

package/src/dispatch-subscribe.ts

@@ -1,4 +1,4 @@
-// Auto-subscription wiring for the envoy_dispatch MCP tool (Dispatch AC#4).
+// 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

package/src/port.ts

@@ -1,4 +1,5 @@
 import { execFile } from "node:child_process";
+import { portFromSsOutput } from "./ss";
 
 type ExecFn = (
   command: string,
@@ -33,17 +34,9 @@ export async function resolvePort(
   // Fallback: find listening port via ss(8) by PID
   try {
     const output = await exec("ss", ["-tlnp"], { encoding: "utf-8" });
-    for (const line of output.split("\n")) {
-      if (!line.includes(`pid=${process.pid}`)) continue;
-      const parts = line.trim().split(/\s+/);
-      const local = parts[3];
-      const match = local?.match(/:(\d+)$/);
-      if (!match) continue;
-      const port = Number.parseInt(match[1], 10);
-      if (Number.isFinite(port) && port > 0) return port;
-    }
+    const port = portFromSsOutput(output, process.pid);
+    if (port !== null) return port;
   } catch {}
 
   return null;
 }
-// trigger publish

package/src/server.ts

@@ -1,5 +1,6 @@
 import { agentSubject } from "@legion/contracts";
 import { envoyDefaultsFromEnvironment } from "@legion/envoy-client/defaults";
+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";
@@ -41,7 +42,10 @@ export default async (input: { serverUrl: URL }) => {
     if (!port && !portWarningLogged) {
       portWarningLogged = true;
       logger.error(
-        `[envoy-plugin] Could not resolve serve port: serverUrl=${input.serverUrl.href}, pid=${process.pid}`
+        [
+          `[envoy-plugin] Could not resolve serve port: serverUrl=${input.serverUrl.href},`,
+          `pid=${process.pid}`,
+        ].join(" ")
       );
     }
     if (port) {
@@ -218,10 +222,10 @@ export default async (input: { serverUrl: URL }) => {
       input: { tool: string; sessionID: string; callID: string; args: unknown },
       output: { title: string; output: string; metadata: unknown }
     ) => {
-      // Dispatch AC#4: when this session opens a Dispatch thread via the
-      // envoy_dispatch MCP tool, auto-subscribe it to the thread's GitHub topic
-      // so the human's reply is delivered back through Envoy. Best-effort — a
-      // subscribe failure must never surface to the model or fail the tool call.
+      // When this session opens a Dispatch thread via the envoy_dispatch MCP
+      // tool, auto-subscribe it to the thread's GitHub topic so the human's
+      // reply is delivered back through Envoy. Best-effort — a subscribe
+      // failure must never surface to the model or fail the tool call.
       const topic = dispatchSubscriptionTopic(input.tool, output.output);
       if (!topic) return;
       try {
@@ -234,9 +238,8 @@ export default async (input: { serverUrl: URL }) => {
           driving: true,
         });
       } catch (err) {
-        logger.warn(
-          `[envoy-plugin] dispatch auto-subscribe failed: ${err instanceof Error ? err.message : String(err)}`
-        );
+        const message = err instanceof Error ? err.message : String(err);
+        logger.warn(`[envoy-plugin] dispatch auto-subscribe failed: ${message}`);
       }
     },
     // Cleanup hook (used by tests; production relies on process 'exit').
@@ -325,7 +328,7 @@ export default async (input: { serverUrl: URL }) => {
           return JSON.stringify(
             {
               session_id: sessionID,
-              machine_id: process.env.HOSTNAME || "unknown",
+              machine_id: machineID(),
               port,
               dir: ctx.directory,
             },

package/src/ss.ts

@@ -0,0 +1,19 @@
+/**
+ * Parse the listening TCP port for `pid` from `ss -tlnp` output.
+ *
+ * Shared by the server-side and TUI-side port resolvers, which differ only in
+ * how they discover the pid and whether they exec ss(8) sync or async.
+ */
+export function portFromSsOutput(output: string, pid: number): number | null {
+  const pidPattern = new RegExp(`\\bpid=${pid}\\b`);
+  for (const line of output.split("\n")) {
+    if (!pidPattern.test(line)) continue;
+    const parts = line.trim().split(/\s+/);
+    const local = parts[3];
+    const match = local?.match(/:(\d+)$/);
+    if (!match) continue;
+    const port = Number.parseInt(match[1], 10);
+    if (Number.isFinite(port) && port > 0) return port;
+  }
+  return null;
+}

package/src/tui-port.ts

@@ -1,4 +1,5 @@
 import { execFileSync } from "node:child_process";
+import { portFromSsOutput } from "./ss";
 
 type ExecSyncFn = (command: string, args: string[], options: { encoding: string }) => string;
 
@@ -36,19 +37,10 @@ export function resolveCurrentProcessPort(exec: ExecSyncFn = defaultExecSync): n
 
 function resolveProcessPort(pid: number, exec: ExecSyncFn = defaultExecSync): number | null {
   try {
-    const output = exec("ss", ["-tlnp"], { encoding: "utf-8" });
-    for (const line of output.split("\n")) {
-      if (!line.includes(`pid=${pid}`)) continue;
-      const parts = line.trim().split(/\s+/);
-      const local = parts[3];
-      const match = local?.match(/:(\d+)$/);
-      if (!match) continue;
-      const port = Number.parseInt(match[1], 10);
-      if (Number.isFinite(port) && port > 0) return port;
-    }
-  } catch {}
-
-  return null;
+    return portFromSsOutput(exec("ss", ["-tlnp"], { encoding: "utf-8" }), pid);
+  } catch {
+    return null;
+  }
 }
 
 export function resolveSessionProcessPort(

package/AGENTS.md

@@ -1,34 +0,0 @@
-# Envoy Plugin Package
-
-OpenCode plugin package for Legion's Envoy subsystem.
-
-## Overview
-
-This plugin exposes the Envoy tools and maintains the live session registry metadata Envoy needs for hot delivery.
-
-It is the user-facing bridge between OpenCode sessions and Envoy transport.
-
-## Where to look
-
-| Task                | Location               | Notes                                                              |
-| ------------------- | ---------------------- | ------------------------------------------------------------------ |
-| Tool definitions    | `src/server.ts`        | `envoy_subscribe`, `envoy_unsubscribe`, `envoy_list`, `envoy_send`, `envoy_publish`, `envoy_role_set`, `envoy_whoami`, `envoy_sessions` |
-| Packaging metadata  | `package.json`         | npm identity, `exports` map, scripts                               |
-| TUI: `/whoami` + sidebar | `src/tui.tsx`     | slash command + session-id/port sidebar; loaded via the `./tui` export. Ships as `.tsx` source (no build/`dist`) — Bun transpiles it natively at load, so `@opentui/core` + `@opentui/solid` MUST be `peerDependencies` (not `devDependencies`) so the `@jsxImportSource @opentui/solid` runtime resolves in the consumer's install tree |
-| Host rollout helper | `scripts/sync-host.sh` | sync packed release tarball + shim to remote host                  |
-| Dispatch MCP + auto-subscribe | `src/dispatch-mcp.ts`, `src/dispatch-subscribe.ts` | injects the dispatch MCP server (shim); `tool.execute.after` auto-subscribes the caller to the new thread's topic so answers route back (Dispatch AC#4) |
-
-## Critical conventions
-
-- Tool descriptions must be self-describing enough that agents can infer correct topic formats.
-- Slack examples must use real `team_id` values, not workspace slugs.
-- This package owns the session-registry/port-backfill behavior now; do not split that back into a second plugin casually.
-- Keep the plugin source-of-truth here even if a dotfiles shim is still used for rollout convenience.
-
-## Topic reminders
-
-- Agent: `notifications.agent.<session_id>`
-- GitHub: `notifications.github.<owner>.<repo>.<kind>`
-- Slack: `notifications.slack.<team_id>.<channel_id>.<message|mention>`
-
-If you are unsure what a session is subscribed to, use `envoy_list()`.

package/bin/dispatch-mcp-shim.ts

@@ -1,75 +0,0 @@
-#!/usr/bin/env bun
-// envoy-plugin local MCP shim.
-//
-// Spawned by OpenCode as a `type: "local"` MCP transport. Reads JSON-RPC
-// messages from stdin (newline-delimited), forwards each to the remote
-// dispatch server's Streamable HTTP /mcp endpoint with a fresh GitHub
-// bearer minted via the user's `gh` shim, and writes responses to stdout.
-//
-// Token rotation is invisible to OpenCode — the shim handles 50-minute
-// refresh cycles + immediate retry on 401. This avoids the "MCP dies
-// after 1 hour" failure mode of static-header configurations.
-
-import * as readline from "node:readline";
-import {
-  createBridge,
-  defaultGhTokenGetter,
-  type JsonRpcRequest,
-} from "../src/dispatch-mcp-bridge";
-
-const remoteUrl = process.env.DISPATCH_MCP_URL;
-if (!remoteUrl) {
-  process.stderr.write("envoy-dispatch shim: DISPATCH_MCP_URL is required\n");
-  process.exit(1);
-}
-
-const bridge = createBridge({
-  remoteUrl,
-  getToken: defaultGhTokenGetter,
-});
-
-const rl = readline.createInterface({ input: process.stdin });
-
-let inflight = 0;
-let closed = false;
-
-// Serialize incoming requests. MCP requires the initialize handshake to
-// complete before any tool calls are processed; running rl.on("line")
-// callbacks in parallel would race tools/call against initialize and hit
-// `invalid during session initialization` from the server. Even after
-// init, sequencing keeps the wire ordering deterministic, which is what
-// OpenCode expects for stdio MCP transports.
-let chain: Promise<void> = Promise.resolve();
-
-function maybeExit(): void {
-  if (closed && inflight === 0) process.exit(0);
-}
-
-rl.on("line", (line) => {
-  const trimmed = line.trim();
-  if (!trimmed) return;
-  inflight++;
-  chain = chain.then(async () => {
-    try {
-      const request = JSON.parse(trimmed) as JsonRpcRequest;
-      const response = await bridge.handle(request);
-      if (response !== null) {
-        process.stdout.write(`${JSON.stringify(response)}\n`);
-      }
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
-      process.stderr.write(`envoy-dispatch shim: ${msg}\n`);
-    } finally {
-      inflight--;
-      maybeExit();
-    }
-  });
-});
-
-rl.on("close", () => {
-  closed = true;
-  maybeExit();
-});
-
-process.on("SIGTERM", () => process.exit(0));
-process.on("SIGINT", () => process.exit(0));

package/scripts/sync-host.sh

@@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-host="${1:?usage: sync-host.sh user@host}"
-
-PLUGIN_DIR="legion/default/packages/envoy-plugin"
-PLUGIN_REF="file://{env:HOME}/${PLUGIN_DIR}"
-REPO="sjawhar/legion"
-
-# Find latest envoy release tag
-tag=$(gh release list --repo "$REPO" --limit 10 --json tagName \
-  --jq '[.[] | select(.tagName | startswith("legion-envoy-"))][0].tagName')
-if [ -z "$tag" ]; then
-  echo "ERROR: No legion-envoy release found" >&2
-  exit 1
-fi
-echo "Using release: $tag"
-
-# Download plugin tarball
-tmpdir=$(mktemp -d)
-trap 'rm -rf "$tmpdir"' EXIT
-
-gh release download "$tag" \
-  --repo "$REPO" \
-  --pattern '*.tgz' \
-  --dir "$tmpdir" \
-  --clobber
-
-tgz=$(find "$tmpdir" -name '*.tgz' -print -quit)
-if [ -z "$tgz" ]; then
-  echo "ERROR: No .tgz found in release $tag" >&2
-  exit 1
-fi
-echo "Downloaded: $(basename "$tgz")"
-
-# Install on remote: extract tarball (strip package/ prefix from npm pack output)
-ssh "$host" "rm -rf ~/${PLUGIN_DIR} && mkdir -p ~/${PLUGIN_DIR}"
-scp -q "$tgz" "$host:/tmp/envoy-plugin.tgz"
-ssh "$host" "tar xzf /tmp/envoy-plugin.tgz --strip-components=1 -C ~/${PLUGIN_DIR} && rm /tmp/envoy-plugin.tgz"
-echo "Installed plugin to ~/${PLUGIN_DIR}"
-
-# Update opencode.json: replace npm package reference with file:// path
-# Resolves symlinks so we don't clobber dotfiles symlink structure
-ssh "$host" "
-  CONFIG=\$(readlink -f \$HOME/.config/opencode/opencode.json 2>/dev/null || echo \$HOME/.config/opencode/opencode.json)
-  if [ -f \"\$CONFIG\" ]; then
-    jq --arg ref '$PLUGIN_REF' \\
-      '(.plugin // []) |= [.[] | if (test(\"opencode-legion-envoy\") and (test(\"^file://\") | not)) then \$ref else . end]' \\
-      \"\$CONFIG\" > /tmp/opencode.json.tmp && mv /tmp/opencode.json.tmp \"\$CONFIG\"
-    echo \"Updated opencode.json: \$CONFIG\"
-  else
-    echo \"WARNING: opencode.json not found at \$CONFIG — add plugin manually: $PLUGIN_REF\"
-  fi
-"
-
-# Update tui.json: ensure file:// ref is present in the TUI plugin list.
-# tui.json is a separate config file from opencode.json; opencode loads TUI
-# plugins (slash commands, sidebar slots) only from here.
-ssh "$host" "
-  TUI_CONFIG=\$(readlink -f \$HOME/.config/opencode/tui.json 2>/dev/null || echo \$HOME/.config/opencode/tui.json)
-  if [ -f \"\$TUI_CONFIG\" ]; then
-    jq --arg ref '$PLUGIN_REF' \\
-      '(.plugin // []) |= ((map(if (test(\"opencode-legion-envoy\") and (test(\"^file://\") | not)) then \$ref else . end)) | if any(. == \$ref) then . else . + [\$ref] end)' \\
-      \"\$TUI_CONFIG\" > /tmp/tui.json.tmp && mv /tmp/tui.json.tmp \"\$TUI_CONFIG\"
-    echo \"Updated tui.json: \$TUI_CONFIG\"
-  else
-    mkdir -p \$(dirname \"\$TUI_CONFIG\")
-    jq -n --arg ref '$PLUGIN_REF' '{\"\\\$schema\":\"https://opencode.ai/tui.json\",\"plugin\":[\$ref]}' > \"\$TUI_CONFIG\"
-    echo \"Created tui.json: \$TUI_CONFIG\"
-  fi
-"
-
-echo "Done: $host envoy-plugin synced from release $tag"

package/src/__tests__/clipboard.test.ts

@@ -1,56 +0,0 @@
-import { describe, expect, it, mock } from "bun:test";
-import { copyNative, copyToClipboard } from "../clipboard";
-
-describe("copyToClipboard", () => {
-  it("copies via the renderer OSC 52 writer and does not fall back when it succeeds", () => {
-    const copyToClipboardOSC52 = mock((_text: string) => true);
-    const ok = copyToClipboard("ses_abc", { copyToClipboardOSC52 });
-    expect(ok).toBe(true);
-    expect(copyToClipboardOSC52).toHaveBeenCalledWith("ses_abc");
-  });
-});
-
-describe("copyNative", () => {
-  it("uses wl-copy on Linux/Wayland when available", () => {
-    const run = mock((_cmd: string, _args: string[], _text: string) => true);
-    const ok = copyNative("ses_abc", {
-      os: "linux",
-      env: { WAYLAND_DISPLAY: "wayland-0" },
-      which: (cmd) => cmd === "wl-copy",
-      run,
-    });
-    expect(ok).toBe(true);
-    expect(run).toHaveBeenCalledWith("wl-copy", [], "ses_abc");
-  });
-
-  it("falls back to xclip on Linux/X11", () => {
-    const run = mock((_cmd: string, _args: string[], _text: string) => true);
-    const ok = copyNative("ses_abc", {
-      os: "linux",
-      env: {},
-      which: (cmd) => cmd === "xclip",
-      run,
-    });
-    expect(ok).toBe(true);
-    expect(run).toHaveBeenCalledWith("xclip", ["-selection", "clipboard"], "ses_abc");
-  });
-
-  it("falls back to xsel when xclip is missing", () => {
-    const run = mock((_cmd: string, _args: string[], _text: string) => true);
-    copyNative("x", { os: "linux", env: {}, which: (cmd) => cmd === "xsel", run });
-    expect(run).toHaveBeenCalledWith("xsel", ["--clipboard", "--input"], "x");
-  });
-
-  it("uses osascript on macOS with escaped quotes", () => {
-    const run = mock((_cmd: string, _args: string[], _text: string) => true);
-    copyNative('a"b\\c', { os: "darwin", which: () => true, run });
-    expect(run).toHaveBeenCalledWith("osascript", ["-e", 'set the clipboard to "a\\"b\\\\c"'], "");
-  });
-
-  it("returns false on Linux when no clipboard tool is installed", () => {
-    const run = mock(() => true);
-    const ok = copyNative("x", { os: "linux", env: {}, which: () => false, run });
-    expect(ok).toBe(false);
-    expect(run).not.toHaveBeenCalled();
-  });
-});