viber-channel 0.8.9 → 0.8.10

package/lib/cli_bow_out.ts

@@ -0,0 +1,46 @@
+/**
+ * Bow-out decision: should this process yield the channel to the PLUGIN copy? (#365, #495)
+ *
+ * WHY THE GUARD EXISTS (#365 / #280 step-29). In an AGENT session (a vibe-master
+ * terminal) the channel must be the PLUGIN copy — only it can inject inbound
+ * messages. The manually-registered viber-dev-channel MCP loads in the same
+ * session with the same env; rather than race it for the channel lock, it bows
+ * out deterministically. Normal sessions (no VIBER_CHANNEL_AGENT_SESSION) are
+ * unaffected.
+ *
+ * WHY IT ONLY CONCERNS THE MCP SERVER MODE (#495). A CLI subcommand
+ * (`enroll-runner`, `run-runner`, `connect`, `--help`) serves no tool and takes
+ * no channel lock, so it cannot conflict with the plugin copy. Evaluating this
+ * guard before the subcommand dispatch made every subcommand exit 0 without
+ * doing anything inside an agent session — silent, and falsely successful. The
+ * call site therefore sits AFTER the dispatch block; see viber-channel.ts.
+ *
+ * The dev-backend exclusion is DERIVED from the environment (single source of
+ * truth, isDevBackend) rather than trusting VIBER_CHANNEL_AGENT_SESSION not to
+ * leak from the parent shell: on the dev backend there is NO plugin to yield to
+ * (it is disabled in this repo, #365), so yielding would mean no channel at all
+ * (`-32000`, no registration).
+ */
+import { isDevBackend } from "./auth.ts";
+
+/**
+ * Pure function of the environment — takes the env explicitly so it is testable
+ * without mutating `process.env`.
+ *
+ * `VIBER_BASE_URL` is defaulted to `""` HERE, deliberately: `isDevBackend()`
+ * falls back to `process.env` when its argument is `undefined`, which would let
+ * the real environment of a test runner decide the outcome.
+ */
+export function shouldBowOutToPlugin(
+  env: Record<string, string | undefined>,
+): boolean {
+  return (
+    !isDevBackend(env.VIBER_BASE_URL ?? "") &&
+    env.VIBER_CHANNEL_AGENT_SESSION === "1" &&
+    env.VIBER_CHANNEL_PLUGIN !== "1"
+  );
+}
+
+/** The stderr line emitted when the process bows out. Shared with the tests. */
+export const BOW_OUT_MESSAGE =
+  "[viber-channel] agent session: yielding to the plugin channel copy (manual MCP registration exits)\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "viber-channel",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "description": "Voice + text MCP channel between a Claude Code session and the Viber UI (https://viber.dgypx.dev). Push transcripts to Claude; send_message tool delivers text back to the UI.",
   "type": "module",
   "bin": {

package/viber-channel.ts

@@ -61,6 +61,7 @@ import { buildChannelInstructions, IDENTITY_BUDGET } from "./lib/channel_instruc
 import { CLAUDE_TOOL_DEFS } from "./lib/claude_tool_defs.ts";
 import { warnIfStale } from "./lib/version_check.ts";
 import { capabilitiesText } from "./lib/capabilities.ts";
+import { BOW_OUT_MESSAGE, shouldBowOutToPlugin } from "./lib/cli_bow_out.ts";
 
 // ---- CLI subcommand dispatch (must happen before lock acquire + loadAuth) ----
 //
@@ -68,32 +69,6 @@ import { capabilitiesText } from "./lib/capabilities.ts";
 // exits — it does not start the MCP server. Any other invocation (no args, or
 // the unknown subcommand) falls through to the MCP server below.
 {
-  // #280 step-29: in an AGENT session (vibe-master terminal), the channel must
-  // be the PLUGIN copy (`--channels plugin:viber-channel@…` — only it can
-  // inject inbound messages). The manually-registered viber-dev-channel MCP
-  // loads in the same session with the same env; instead of racing it for the
-  // channel lock, it bows out deterministically here. Normal sessions
-  // (no VIBER_CHANNEL_AGENT_SESSION) are unaffected.
-  //
-  // BUT the yield is a STAGING/PROD-only behavior: the plugin channel only runs
-  // there (it is disabled in the Viber dev repo, #365). On the DEV backend there
-  // is NO plugin to yield to, so yielding = no channel at all (`-32000`, no
-  // registration). Derive this from the environment (single source of truth,
-  // isDevBackend) instead of relying on VIBER_CHANNEL_AGENT_SESSION not leaking
-  // from the parent shell into the spawned dev terminal (the real bug: that var
-  // leaked and terminal.ts never cleared it, so the dev channel silently bowed
-  // out). Default (non-dev) behavior is unchanged.
-  if (
-    !isDevBackend() &&
-    process.env.VIBER_CHANNEL_AGENT_SESSION === "1" &&
-    process.env.VIBER_CHANNEL_PLUGIN !== "1"
-  ) {
-    process.stderr.write(
-      "[viber-channel] agent session: yielding to the plugin channel copy (manual MCP registration exits)\n",
-    );
-    process.exit(0);
-  }
-
   const sub = process.argv[2];
   if (sub === "--help" || sub === "-h") {
     process.stdout.write(
@@ -165,6 +140,23 @@ import { capabilitiesText } from "./lib/capabilities.ts";
   }
 }
 
+// ---- Bow-out guard (#365) — MCP SERVER MODE ONLY ----
+//
+// THIS ORDER IS SIGNIFICANT (#495): the guard must stay AFTER the dispatch block
+// above. Every branch of that block ends in `process.exit` on every path (catch
+// included), so reaching this line means "no subcommand was handled" — i.e. this
+// is an MCP server launch, the only mode where yielding to the plugin copy makes
+// sense. Evaluating it earlier (as it was) made `enroll-runner`, `run-runner` and
+// `connect` exit 0 without doing anything inside an agent session: silent, and
+// falsely successful. Do NOT hoist this back up. Rationale: lib/cli_bow_out.ts.
+//
+// It also sits BEFORE warnIfStale() so the yielding process makes no network
+// call on its way out.
+if (shouldBowOutToPlugin(process.env)) {
+  process.stderr.write(BOW_OUT_MESSAGE);
+  process.exit(0);
+}
+
 // Server path (fell through the dispatch block): warn if this install is behind
 // npm latest, but fire-and-forget so it never delays mcp.connect — the nudge
 // lands on stderr shortly after startup (#330).
@@ -363,9 +355,10 @@ process.stdin.on("end", () => {
 
 // ---- Auth from .viber/auth.json ----
 
+// isDevBackend is no longer imported here: its only use in this file was the
+// bow-out condition, now owned by lib/cli_bow_out.ts (#495).
 import {
   authFilePath,
-  isDevBackend,
   loadAuth,
   persistInstanceCredentials,
 } from "./lib/auth.ts";