@sjawhar/opencode-legion-envoy 0.6.0 → 0.6.1

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@sjawhar/opencode-legion-envoy",
-  "version": "0.6.0",
+  "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/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/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 shim wrapper in `bin/`; shared forwarding/token code lives in `@legion/envoy-client`. `tool.execute.after` auto-subscribes dispatch callers to new thread topics. |
-
-## 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,7 +0,0 @@
-#!/usr/bin/env bun
-// envoy-plugin local MCP shim entry point. The forwarding logic is shared
-// with the other Envoy adapters in @legion/envoy-client; OpenCode spawns
-// this wrapper via the `mcp.envoy` entry injected by src/dispatch-mcp.ts.
-import { runDispatchMcpShim } from "@legion/envoy-client/dispatch-mcp-shim";
-
-runDispatchMcpShim();

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

package/src/__tests__/dispatch-mcp.test.ts

@@ -1,116 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import { buildDispatchMcpEntry, injectEnvoyMcp } from "../dispatch-mcp";
-
-describe("buildDispatchMcpEntry", () => {
-  it("returns null when dispatch is undefined", () => {
-    const result = buildDispatchMcpEntry({ dispatch: undefined });
-    expect(result).toBeNull();
-  });
-
-  it("returns null when dispatch.enabled is false", () => {
-    const result = buildDispatchMcpEntry({
-      dispatch: { enabled: false, serverUrl: "http://example:8766" },
-    });
-    expect(result).toBeNull();
-  });
-
-  it("builds a local MCP entry pointing at the shim with serverUrl in env", () => {
-    const result = buildDispatchMcpEntry({
-      dispatch: {
-        enabled: true,
-        serverUrl: "http://sami-agents-mx:8766",
-      },
-      shimPath: "/path/to/shim.ts",
-      runtime: "bun",
-    });
-    expect(result).toEqual({
-      type: "local",
-      command: ["bun", "/path/to/shim.ts"],
-      environment: {
-        DISPATCH_MCP_URL: "http://sami-agents-mx:8766/mcp",
-      },
-      enabled: true,
-    });
-  });
-
-  it("falls back to localhost:8766 when serverUrl is omitted", () => {
-    const result = buildDispatchMcpEntry({
-      dispatch: { enabled: true },
-      shimPath: "/shim.ts",
-    });
-    expect(result?.environment.DISPATCH_MCP_URL).toBe("http://localhost:8766/mcp");
-  });
-
-  it("strips trailing slashes from serverUrl before appending /mcp", () => {
-    const result = buildDispatchMcpEntry({
-      dispatch: { enabled: true, serverUrl: "http://example:8766//" },
-      shimPath: "/shim.ts",
-    });
-    expect(result?.environment.DISPATCH_MCP_URL).toBe("http://example:8766/mcp");
-  });
-
-  it("uses bun as the default runtime", () => {
-    const result = buildDispatchMcpEntry({
-      dispatch: { enabled: true },
-      shimPath: "/shim.ts",
-    });
-    expect(result?.command[0]).toBe("bun");
-  });
-
-  it("uses the provided runtime override", () => {
-    const result = buildDispatchMcpEntry({
-      dispatch: { enabled: true },
-      shimPath: "/shim.ts",
-      runtime: "node",
-    });
-    expect(result?.command[0]).toBe("node");
-  });
-
-  it("default shim path resolves to bin/dispatch-mcp-shim.ts in the package root", () => {
-    const result = buildDispatchMcpEntry({
-      dispatch: { enabled: true },
-    });
-    expect(result?.command[1]).toContain("bin/dispatch-mcp-shim.ts");
-  });
-});
-
-describe("injectEnvoyMcp", () => {
-  const entry = {
-    type: "local" as const,
-    command: ["bun", "/shim.ts"],
-    environment: { DISPATCH_MCP_URL: "http://test:8766/mcp" },
-    enabled: true as const,
-  };
-
-  it("adds the entry to a cfg that has no mcp block yet", () => {
-    const cfg: { mcp?: Record<string, unknown> } = {};
-    const result = injectEnvoyMcp(cfg, entry);
-    expect(result.warning).toBeUndefined();
-    expect(cfg.mcp?.envoy).toEqual(entry);
-  });
-
-  it("is idempotent on its own re-write — second call does not warn", () => {
-    const cfg: { mcp?: Record<string, unknown> } = {};
-    injectEnvoyMcp(cfg, entry);
-    const second = injectEnvoyMcp(cfg, entry);
-    // No warning when the existing entry already equals what we'd inject.
-    // This is the common case after InstanceState invalidation re-runs the
-    // config hook against a Config-service cfg that still has our prior
-    // mutation — silent no-op, not a TUI stderr alarm.
-    expect(second.warning).toBeUndefined();
-    expect(cfg.mcp?.envoy).toEqual(entry);
-  });
-
-  it("warns and preserves the existing entry when it differs from ours", () => {
-    const userOverride = {
-      type: "local" as const,
-      command: ["node", "/custom-shim.js"],
-      environment: { DISPATCH_MCP_URL: "http://other:9999/mcp" },
-      enabled: true as const,
-    };
-    const cfg: { mcp?: Record<string, unknown> } = { mcp: { envoy: userOverride } };
-    const result = injectEnvoyMcp(cfg, entry);
-    expect(result.warning).toContain("already present");
-    expect(cfg.mcp?.envoy).toEqual(userOverride);
-  });
-});

package/src/__tests__/dispatch-subscribe.test.ts

@@ -1,66 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import {
-  dispatchSubscriptionTopic,
-  dispatchThreadTopic,
-  isDispatchTool,
-} from "../dispatch-subscribe";
-
-describe("isDispatchTool", () => {
-  it("matches the MCP-exposed name and common separators", () => {
-    expect(isDispatchTool("envoy_dispatch")).toBe(true);
-    expect(isDispatchTool("dispatch")).toBe(true);
-    expect(isDispatchTool("envoy.dispatch")).toBe(true);
-    expect(isDispatchTool("mcp__envoy__dispatch")).toBe(true);
-  });
-
-  it("does not match unrelated tools", () => {
-    expect(isDispatchTool("envoy_subscribe")).toBe(false);
-    expect(isDispatchTool("bash")).toBe(false);
-    expect(isDispatchTool("dispatcher")).toBe(false);
-    expect(isDispatchTool("dispatch_thread")).toBe(false);
-  });
-});
-
-describe("dispatchThreadTopic", () => {
-  it("builds the wildcard thread topic", () => {
-    expect(dispatchThreadTopic("sjawhar", "legion", 123)).toBe(
-      "notifications.github.sjawhar.legion.issue.123.>"
-    );
-  });
-});
-
-describe("dispatchSubscriptionTopic", () => {
-  it("derives the topic from a dispatch tool result JSON", () => {
-    const output = JSON.stringify({
-      thread: 742,
-      url: "https://github.com/sjawhar/legion/issues/742",
-    });
-    expect(dispatchSubscriptionTopic("envoy_dispatch", output)).toBe(
-      "notifications.github.sjawhar.legion.issue.742.>"
-    );
-  });
-
-  it("derives owner/repo/number purely from the issue URL", () => {
-    // Even if a stale/incorrect JSON `thread` were present, the URL is canonical.
-    const output = '{"thread":1,"url":"https://github.com/acme/Widgets/issues/55"}';
-    expect(dispatchSubscriptionTopic("envoy_dispatch", output)).toBe(
-      "notifications.github.acme.Widgets.issue.55.>"
-    );
-  });
-
-  it("returns null for non-dispatch tools even with a github URL present", () => {
-    const output = '{"url":"https://github.com/sjawhar/legion/issues/9"}';
-    expect(dispatchSubscriptionTopic("envoy_subscribe", output)).toBeNull();
-  });
-
-  it("returns null when the output has no github issue URL", () => {
-    expect(dispatchSubscriptionTopic("envoy_dispatch", "created thread 5")).toBeNull();
-    expect(dispatchSubscriptionTopic("envoy_dispatch", "")).toBeNull();
-    expect(dispatchSubscriptionTopic("envoy_dispatch", "not json at all")).toBeNull();
-  });
-
-  it("ignores pull-request URLs (only issue threads carry dispatch replies)", () => {
-    const output = '{"url":"https://github.com/sjawhar/legion/pull/100"}';
-    expect(dispatchSubscriptionTopic("envoy_dispatch", output)).toBeNull();
-  });
-});