@zswarm/core 0.1.5 → 0.1.6

package/README.md

@@ -27,7 +27,10 @@ const result = await dispatchZswarm({ op: "list" });
 ```
 
 `dispatchZswarm` builds a Zellij client unless you pass one. The result is
-`{ ok, data }` or `{ ok: false, error }`.
+`{ ok, data }` or `{ ok: false, error }`, with routing `context` once the
+invocation's destination is known.
+
+Spawn lifecycle, body files, guarded keys, status tabs and routing context: [crew operations](../../docs/crew-operations.md).
 
 Ops, env, and the event bus: the [zswarm README](../../README.md).
 

package/dist/exec.d.ts

@@ -39,9 +39,20 @@ export declare function quoteRemoteArg(arg: string, shell: RemoteShell): string;
  * The string `ssh host <this>` runs. Tests assert this rather than spawning ssh.
  */
 export declare function buildSshRemoteCommand(target: SshTarget, args: string[], tmp: string | undefined, timeoutMs: number, socketDir?: string): string;
+/** Outcome of `ZSWARM_TMP=auto` discovery for session diagnostics. */
+export type IpcDiscoveryState = {
+    requested: string | null;
+    /** `none` = no tmp routing; `resolved`/`failed` only after an auto attempt. */
+    status: "none" | "skipped" | "resolved" | "failed" | "cancelled" | "expired";
+    tmp?: string;
+    socketDir?: string;
+};
+export type SshExecFn = ExecFn & {
+    ipcState: IpcDiscoveryState;
+};
 /**
  * Run the remote zellij over ssh. The whole invocation is quoted into a single
  * command string, because the remote login shell re-parses it.
  */
-export declare function createSshExec(target: SshTarget, env: NodeJS.ProcessEnv): ExecFn;
+export declare function createSshExec(target: SshTarget, env: NodeJS.ProcessEnv): SshExecFn;
 export declare function createExec(binPath: string, env: NodeJS.ProcessEnv): ExecFn;

package/dist/exec.js

@@ -35,7 +35,7 @@ export function buildSshRemoteCommand(target, args, tmp, timeoutMs, socketDir) {
     }
     return withTmp;
 }
-async function discoverRemoteIpc(runner, target, timeoutMs) {
+async function discoverRemoteIpc(runner, target, remaining, signal) {
     const shell = inferRemoteShell({
         explicit: target.remoteShell,
         remoteBin: target.remoteBin,
@@ -47,8 +47,14 @@ async function discoverRemoteIpc(runner, target, timeoutMs) {
         ? [windowsDiscoverRemote(), unixDiscoverRemote()]
         : [unixDiscoverRemote(), windowsDiscoverRemote()];
     for (const probe of probes) {
+        if (signal?.aborted)
+            return undefined;
+        const left = remaining();
+        if (left <= 0)
+            return undefined;
         const result = await runner([...target.options, target.host, probe], {
-            timeoutMs,
+            timeoutMs: left,
+            signal,
         });
         const dirs = pickIpcDirs(parseZellijServerPaths(result.stdout));
         if (dirs)
@@ -63,25 +69,96 @@ async function discoverRemoteIpc(runner, target, timeoutMs) {
 export function createSshExec(target, env) {
     const runner = createExec(target.ssh, env);
     let cached;
-    async function resolveIpc(timeoutMs) {
+    let autoAttempted = false;
+    const requestedTmp = target.tmp?.trim() || null;
+    const ipcState = {
+        requested: requestedTmp,
+        status: !requestedTmp
+            ? "none"
+            : requestedTmp.toLowerCase() === "auto"
+                ? "none"
+                : "skipped",
+        ...(requestedTmp && requestedTmp.toLowerCase() !== "auto"
+            ? { tmp: requestedTmp, socketDir: "" }
+            : {}),
+    };
+    async function resolveIpc(remaining, signal) {
         const requested = target.tmp?.trim();
-        if (!requested)
+        if (!requested) {
+            ipcState.requested = null;
+            ipcState.status = "none";
             return undefined;
+        }
+        ipcState.requested = requested;
         if (requested.toLowerCase() !== "auto") {
+            ipcState.status = "skipped";
+            ipcState.tmp = requested;
+            ipcState.socketDir = "";
             return { tmp: requested, socketDir: "" };
         }
-        if (cached)
+        if (cached) {
+            ipcState.status = "resolved";
+            ipcState.tmp = cached.tmp;
+            ipcState.socketDir = cached.socketDir;
             return cached;
-        const dirs = await discoverRemoteIpc(runner, target, timeoutMs);
-        if (dirs)
+        }
+        // Do not re-probe after a failed/expired/cancelled attempt on this exec.
+        if (autoAttempted)
+            return undefined;
+        if (signal?.aborted) {
+            ipcState.status = "cancelled";
+            return undefined;
+        }
+        if (remaining() <= 0) {
+            ipcState.status = "expired";
+            return undefined;
+        }
+        autoAttempted = true;
+        const dirs = await discoverRemoteIpc(runner, target, remaining, signal);
+        if (signal?.aborted) {
+            ipcState.status = "cancelled";
+            return undefined;
+        }
+        if (dirs) {
             cached = dirs;
-        return dirs;
+            ipcState.status = "resolved";
+            ipcState.tmp = dirs.tmp;
+            ipcState.socketDir = dirs.socketDir;
+            return dirs;
+        }
+        ipcState.status = remaining() <= 0 ? "expired" : "failed";
+        return undefined;
     }
-    return async (args, options) => {
-        const ipc = await resolveIpc(options.timeoutMs);
-        const remote = buildSshRemoteCommand(target, args, ipc?.tmp, options.timeoutMs, ipc?.socketDir);
-        return runner([...target.options, target.host, remote], options);
+    const exec = async (args, options) => {
+        const deadline = Date.now() + options.timeoutMs;
+        const remaining = () => Math.max(0, deadline - Date.now());
+        const ipc = await resolveIpc(remaining, options.signal);
+        if (options.signal?.aborted) {
+            return {
+                code: -1,
+                stdout: "",
+                stderr: `${target.ssh} cancelled`,
+            };
+        }
+        const left = remaining();
+        // Do not launch the target command after the caller's budget is gone —
+        // especially after two discovery probes ate the whole timeout.
+        if (left <= 0) {
+            return {
+                code: -1,
+                stdout: "",
+                stderr: `${target.ssh} timed out after ${options.timeoutMs}ms`,
+            };
+        }
+        // auto discovery failed: still run, but callers read ipcState for reachability.
+        const remote = buildSshRemoteCommand(target, args, ipc?.tmp, left, ipc?.socketDir);
+        return runner([...target.options, target.host, remote], {
+            ...options,
+            timeoutMs: left,
+        });
     };
+    exec.ipcState = ipcState;
+    return exec;
 }
 /** Read stdout until the answer is in hand, then stop caring about the child. */
 function runUntil(binPath, args, env, options) {

package/dist/harness.js

@@ -29,15 +29,20 @@ const GENERIC_WAITING = [
     /press enter to continue/i,
 ];
 /**
- * Per-harness approval UI observed in this live session. Only gemini and
- * opencode showed full-screen prompts worth naming; codex, cursor, and pi
- * show only the generic shapes so far, and unknown panes get the generic set
- * and nothing else. Mislabelling a working pane as waiting makes a dispatcher
- * type into it, so unobserved prompts stay undetected.
+ * Named approval questions complement structural menu detection in status.
+ * Keep patterns anchored: quoting a prompt in ordinary output is not a menu.
  */
 const WAITING = {
-    codex: GENERIC_WAITING,
-    cursor: GENERIC_WAITING,
+    codex: [
+        ...GENERIC_WAITING,
+        /^(?:[›❯>]\s*)?Would you like to run the following command\?/i,
+        /^(?:[›❯>]\s*)?Do you want to (?:run|allow|approve) (?:this|the) (?:command|operation|action)\?/i,
+    ],
+    cursor: [
+        ...GENERIC_WAITING,
+        /^(?:[›❯>]\s*)?(?:Run this command|Allow this command|Do you want to run this command)\?/i,
+        /^(?:[›❯>]\s*)?(?:Allow|Approve) (?:this|the) (?:tool|command|operation)(?: call)?\?/i,
+    ],
     opencode: [...GENERIC_WAITING, /Permission required/i, /Allow once/i],
     gemini: [
         ...GENERIC_WAITING,

package/dist/index.d.ts

@@ -1,25 +1,26 @@
 export { ZellijError } from "./errors.js";
 export { createExec, NOT_FOUND_EXIT, type ExecFn, type ExecOptions, type ExecResult, } from "./exec.js";
 export { createGitClient, defaultWorktreeRoot, normalizeRepoPath, parseWorktreeList, worktreeDirName, type GitClient, type GitClientOptions, type Worktree, } from "./git.js";
-export { expandHomePath, resolveZellijBinary, sanitizeZellijEnv, type ZellijExecFn, type ZellijExecResult, } from "./zellij/binary.js";
+export { expandHomePath, looksLikeZswarmBinary, isZellijVersionOutput, resolveZellijBinary, resetZellijIdentityCache, sanitizeZellijEnv, validateSshDestination, validateSshMode, type ZellijExecFn, type ZellijExecResult, } from "./zellij/binary.js";
 export { normalizePaneId, parsePaneList, resolvePane, type ZellijPane, } from "./zellij/panes.js";
-export { parseSessionList, resolveSelfPaneId, type ZellijSessionResolve, } from "./zellij/session.js";
+export { liveSessionNames, parseSessionList, resolveSelfPaneId, type ZellijSession, type ZellijSessionResolve, } from "./zellij/session.js";
 export { buildClosePaneArgs, buildDumpArgs, buildLaunchPluginArgs, buildListPanesArgs, buildNewPaneArgs, buildNewTabArgs, buildPasteArgs, buildPipeArgs, buildSendEnterArgs, buildSendKeysArgs, buildWriteCharsArgs, scrollbackPayload, waitPayload, type LaunchPluginInput, type NewPaneInput, type NewTabInput, type PaneDirection, type PipeInput, type ScrollbackRequest, type WaitRequest, } from "./zellij/args.js";
 export { busPluginUrl, busToPanes, isBusPluginPane, nextConfigKey, parseBusReply, parseScrollbackReply, resolveBusPlugin, scrollbackToScreen, BUS_PIPE_NAME, DEFAULT_BUS_KEY, DEFAULT_BUS_TIMEOUT_MS, type BusMarker, type BusPane, type BusScrollback, type BusScrollbackPane, type BusSnapshot, } from "./zellij/bus.js";
 export { busSnapshot, closeBusPluginPanes, planBus, resetBusCache, type BusPlan, } from "./ops/bus.js";
-export { createZellijClient, type ZellijClient, type ZellijClientOptions, } from "./zellij/client.js";
+export { createZellijClient, type ZellijClient, type ZellijClientOptions, type ZellijTransport, } from "./zellij/client.js";
 export { createStateStore, defaultStateDir, type LogEntry, type SignalChannel, type StateStore, type StateStoreOptions, } from "./state.js";
-export { dispatchZswarm } from "./ops/dispatch.js";
+export { dispatchZswarm, resolveInvocationEnv } from "./ops/dispatch.js";
 export { assertOpAllowed, assertPaneAllowed, isWriteOp, loadPolicy, type Policy, } from "./policy.js";
-export { buildSshRemoteCommand, createSshExec, quoteRemoteArg, shellQuote, type SshTarget, } from "./exec.js";
+export { buildSshRemoteCommand, createSshExec, quoteRemoteArg, shellQuote, type IpcDiscoveryState, type SshExecFn, type SshTarget, } from "./exec.js";
 export { resolveSshTarget } from "./zellij/binary.js";
 export { applyIpcTmpEnv, cmdQuote, concreteTmp, encodePowerShellCommand, inferRemoteShell, parseZellijServerPaths, pickIpcDirs, pickIpcTmp, socketDirFromServerPath, tmpFromServerPath, unixDiscoverRemote, windowsDiscoverRemote, windowsInteractiveRemote, wrapWithTmpEnv, } from "./zellij/ipc.js";
 export { callServe, DEFAULT_SERVE_LISTEN, installServeLogon, isLoopbackHost, parseListenAddress, redactServeSecret, SERVE_CALL_TIMEOUT_CAP_MS, SERVE_MAX_REQUEST_BYTES, SERVE_TASK_NAME, serveCallTimeout, serveChildEnv, serveLogonCommand, startServe, uninstallServeLogon, } from "./ops/serve.js";
 export { parseTabList, resolveTab, type ZellijTab } from "./zellij/tabs.js";
 export { selectTargets } from "./ops/broadcast.js";
 export { diffScreens, cursorKey } from "./ops/tail.js";
-export { classify, lastLine, type PeerState } from "./ops/status.js";
+export { classify, lastLine, mapPool, peerStatus, DEFAULT_STATUS_TIMEOUT_MS, STATUS_DUMP_CONCURRENCY, type PeerState, } from "./ops/status.js";
 export { normalizeScreen, truncateDumpText, DEFAULT_DUMP_MAX_CHARS, DEFAULT_WAIT_MAX_CHARS, } from "./ops/util.js";
+export type { RoutingContext } from "./ops/routing.js";
 export type { DispatchDeps, OpsResult } from "./ops/types.js";
 export { normalizeKey, normalizeKeys, tokenizeCommand } from "./keys.js";
 export { cliUsage, mcpInputSchema, parseCliArgv, MCP_TOOL_DESCRIPTION, OP_NAMES, PARAMS, TARGET_OPS, type OpName, type ParamSpec, type ParamType, } from "./schema.js";

package/dist/index.js

@@ -1,15 +1,15 @@
 export { ZellijError } from "./errors.js";
 export { createExec, NOT_FOUND_EXIT, } from "./exec.js";
 export { createGitClient, defaultWorktreeRoot, normalizeRepoPath, parseWorktreeList, worktreeDirName, } from "./git.js";
-export { expandHomePath, resolveZellijBinary, sanitizeZellijEnv, } from "./zellij/binary.js";
+export { expandHomePath, looksLikeZswarmBinary, isZellijVersionOutput, resolveZellijBinary, resetZellijIdentityCache, sanitizeZellijEnv, validateSshDestination, validateSshMode, } from "./zellij/binary.js";
 export { normalizePaneId, parsePaneList, resolvePane, } from "./zellij/panes.js";
-export { parseSessionList, resolveSelfPaneId, } from "./zellij/session.js";
+export { liveSessionNames, parseSessionList, resolveSelfPaneId, } from "./zellij/session.js";
 export { buildClosePaneArgs, buildDumpArgs, buildLaunchPluginArgs, buildListPanesArgs, buildNewPaneArgs, buildNewTabArgs, buildPasteArgs, buildPipeArgs, buildSendEnterArgs, buildSendKeysArgs, buildWriteCharsArgs, scrollbackPayload, waitPayload, } from "./zellij/args.js";
 export { busPluginUrl, busToPanes, isBusPluginPane, nextConfigKey, parseBusReply, parseScrollbackReply, resolveBusPlugin, scrollbackToScreen, BUS_PIPE_NAME, DEFAULT_BUS_KEY, DEFAULT_BUS_TIMEOUT_MS, } from "./zellij/bus.js";
 export { busSnapshot, closeBusPluginPanes, planBus, resetBusCache, } from "./ops/bus.js";
 export { createZellijClient, } from "./zellij/client.js";
 export { createStateStore, defaultStateDir, } from "./state.js";
-export { dispatchZswarm } from "./ops/dispatch.js";
+export { dispatchZswarm, resolveInvocationEnv } from "./ops/dispatch.js";
 export { assertOpAllowed, assertPaneAllowed, isWriteOp, loadPolicy, } from "./policy.js";
 export { buildSshRemoteCommand, createSshExec, quoteRemoteArg, shellQuote, } from "./exec.js";
 export { resolveSshTarget } from "./zellij/binary.js";
@@ -18,7 +18,7 @@ export { callServe, DEFAULT_SERVE_LISTEN, installServeLogon, isLoopbackHost, par
 export { parseTabList, resolveTab } from "./zellij/tabs.js";
 export { selectTargets } from "./ops/broadcast.js";
 export { diffScreens, cursorKey } from "./ops/tail.js";
-export { classify, lastLine } from "./ops/status.js";
+export { classify, lastLine, mapPool, peerStatus, DEFAULT_STATUS_TIMEOUT_MS, STATUS_DUMP_CONCURRENCY, } from "./ops/status.js";
 export { normalizeScreen, truncateDumpText, DEFAULT_DUMP_MAX_CHARS, DEFAULT_WAIT_MAX_CHARS, } from "./ops/util.js";
 export { normalizeKey, normalizeKeys, tokenizeCommand } from "./keys.js";
 export { cliUsage, mcpInputSchema, parseCliArgv, MCP_TOOL_DESCRIPTION, OP_NAMES, PARAMS, TARGET_OPS, } from "./schema.js";

package/dist/ops/bus.d.ts

@@ -26,7 +26,10 @@ export declare function planBus(client: ZellijClient, state: StateStore, env?: N
  * --plugin` loads a new copy for each key — that is how a dead bus became
  * dozens of WASM panes. One remembered key, then polling.
  */
-export declare function busSnapshot(client: ZellijClient, state: StateStore, session: string, clock: Clock, env?: NodeJS.ProcessEnv, payload?: string): Promise<{
+export declare function busSnapshot(client: ZellijClient, state: StateStore, session: string, clock: Clock, env?: NodeJS.ProcessEnv, payload?: string, opts?: {
+    deadlineAt?: number;
+    signal?: AbortSignal;
+}): Promise<{
     snapshot: BusSnapshot;
     configKey: string;
 } | null>;
@@ -41,7 +44,7 @@ export declare function busSnapshot(client: ZellijClient, state: StateStore, ses
  * `dump-screen` returns them ragged. `normalizeScreen` erases exactly that
  * difference, and every caller here already normalizes before comparing.
  */
-export declare function busScreens(client: ZellijClient, state: StateStore, session: string, paneIds: string[], clock: Clock, env?: NodeJS.ProcessEnv): Promise<Map<string, string> | null>;
+export declare function busScreens(client: ZellijClient, state: StateStore, session: string, paneIds: string[], clock: Clock, env?: NodeJS.ProcessEnv, timeoutMs?: number): Promise<Map<string, string> | null>;
 /**
  * Hand the whole wait to the plugin, which holds the pipe until it resolves.
  * One process covers a minute-long wait instead of one per poll, and the plugin
@@ -56,7 +59,7 @@ export declare function busWait(client: ZellijClient, state: StateStore, session
  * `status` answers by sampling twice, without the gap between samples — but
  * relative to the previous call rather than a fixed window.
  */
-export declare function busChanged(client: ZellijClient, state: StateStore, session: string, paneIds: string[], env?: NodeJS.ProcessEnv): Promise<BusChanged | null>;
+export declare function busChanged(client: ZellijClient, state: StateStore, session: string, paneIds: string[], env?: NodeJS.ProcessEnv, timeoutMs?: number): Promise<BusChanged | null>;
 /** Close every zswarm-bus plugin pane in this session. Best-effort per pane. */
 export declare function closeBusPluginPanes(client: ZellijClient, session: string, pluginPath: string | null): Promise<string[]>;
 /** Report on the bus, install it, or forget it. */

package/dist/ops/bus.js

@@ -1,8 +1,9 @@
 import { existsSync } from "node:fs";
 import { ZellijError } from "../errors.js";
 import { loadPolicy } from "../policy.js";
-import { DEFAULT_BUS_KEY, busPluginUrl, isBusPluginPane, parseBusReply, parseChangedReply, parseScrollbackReply, parseWaitReply, resolveBusPlugin, scrollbackToScreen, } from "../zellij/bus.js";
-import { isTrue } from "./util.js";
+import { DEFAULT_BUS_KEY, DEFAULT_BUS_TIMEOUT_MS, busPluginUrl, isBusPluginPane, parseBusReply, parseChangedReply, parseScrollbackReply, parseWaitReply, resolveBusPlugin, scrollbackToScreen, } from "../zellij/bus.js";
+import { DEFAULT_TIMEOUT_MS } from "../zellij/binary.js";
+import { isTrue, throwIfAborted } from "./util.js";
 /**
  * Whether to ask the event-bus plugin, and what to do when it does not answer.
  *
@@ -70,8 +71,10 @@ export function planBus(client, state, env = process.env, session = "") {
         return { ...base, enabled: true, reason: "installed" };
     return { ...base, reason: 'not installed; run zswarm({op:"bus", install:true})' };
 }
-async function askOnce(client, session, url, configKey, payload) {
-    const result = await client.pipePlugin({ session, url, configKey, payload });
+async function askOnce(client, session, url, configKey, payload, timeoutMs) {
+    const result = await client.pipePlugin({
+        session, url, configKey, payload, timeoutMs,
+    });
     return parseBusReply(result.stdout);
 }
 /**
@@ -80,14 +83,25 @@ async function askOnce(client, session, url, configKey, payload) {
  * blind (ready:false, paneUpdates:0) until something moves. Renaming a pane
  * to the title it already has is an invisible change that forces the push.
  */
-async function nudgeManifest(client, session, env) {
+async function nudgeManifest(client, session, env, remaining) {
     if (loadPolicy(env).readOnly)
         return;
-    const panes = await client.listPanes(session);
+    const listBudget = Math.min(DEFAULT_TIMEOUT_MS, remaining());
+    if (listBudget <= 0)
+        return;
+    const panes = await client.listPanes(session, listBudget);
     const pane = panes.find((p) => !p.isPlugin && !p.exited && p.title.trim());
     if (!pane)
         return;
-    await client.renamePane({ session, paneId: pane.id, name: pane.title });
+    const renameBudget = Math.min(DEFAULT_TIMEOUT_MS, remaining());
+    if (renameBudget <= 0)
+        return;
+    await client.renamePane({
+        session,
+        paneId: pane.id,
+        name: pane.title,
+        timeoutMs: renameBudget,
+    });
 }
 /**
  * One pipe, one answer — or null, and the caller polls instead.
@@ -99,30 +113,47 @@ async function nudgeManifest(client, session, env) {
  * --plugin` loads a new copy for each key — that is how a dead bus became
  * dozens of WASM panes. One remembered key, then polling.
  */
-export async function busSnapshot(client, state, session, clock, env = process.env, payload = "status") {
+export async function busSnapshot(client, state, session, clock, env = process.env, payload = "status", opts = {}) {
+    const remaining = () => {
+        throwIfAborted(opts.signal);
+        return opts.deadlineAt === undefined
+            ? Infinity
+            : Math.max(0, opts.deadlineAt - clock.now());
+    };
+    if (remaining() <= 0)
+        return null;
     const plan = planBus(client, state, env, session);
     const pluginPath = plan.plugin;
-    if (!plan.enabled || !plan.url || !pluginPath)
+    const url = plan.url;
+    if (!plan.enabled || !url || !pluginPath)
         return null;
     const configKey = answeredWith.get(session) ?? plan.configKey;
-    let snapshot = await askOnce(client, session, plan.url, configKey, payload);
-    if (snapshot && !snapshot.ready) {
-        await clock.sleep(COLD_RETRY_MS);
-        snapshot =
-            (await askOnce(client, session, plan.url, configKey, payload)) ??
-                snapshot;
+    const ask = async () => {
+        const budget = Math.min(DEFAULT_BUS_TIMEOUT_MS, remaining());
+        if (budget <= 0)
+            return null;
+        const snapshot = await askOnce(client, session, url, configKey, payload, budget);
+        throwIfAborted(opts.signal);
+        return snapshot;
+    };
+    let snapshot = await ask();
+    if (snapshot && !snapshot.ready && remaining() > 0) {
+        await clock.sleep(Math.min(COLD_RETRY_MS, remaining()));
+        snapshot = (await ask()) ?? snapshot;
     }
-    if (snapshot && !snapshot.ready) {
+    if (snapshot && !snapshot.ready && remaining() > 0) {
         try {
-            await nudgeManifest(client, session, env);
-            snapshot =
-                (await askOnce(client, session, plan.url, configKey, payload)) ??
-                    snapshot;
+            await nudgeManifest(client, session, env, remaining);
+            snapshot = (await ask()) ?? snapshot;
         }
         catch {
+            throwIfAborted(opts.signal);
             // A failed nudge must not fail the op — the caller polls instead.
         }
     }
+    // An expired request says nothing about bus health or an empty cold manifest.
+    if (remaining() <= 0 && !snapshot?.ready)
+        return null;
     if (snapshot) {
         answeredWith.set(session, configKey);
         return { snapshot, configKey };
@@ -141,7 +172,7 @@ export async function busSnapshot(client, state, session, clock, env = process.e
  * `dump-screen` returns them ragged. `normalizeScreen` erases exactly that
  * difference, and every caller here already normalizes before comparing.
  */
-export async function busScreens(client, state, session, paneIds, clock, env = process.env) {
+export async function busScreens(client, state, session, paneIds, clock, env = process.env, timeoutMs) {
     if (paneIds.length < 2)
         return null;
     const plan = planBus(client, state, env, session);
@@ -153,6 +184,7 @@ export async function busScreens(client, state, session, paneIds, clock, env = p
         url: plan.url,
         configKey,
         panes: paneIds,
+        timeoutMs,
     });
     const parsed = parseScrollbackReply(reply.stdout);
     if (!parsed || !parsed.ready)
@@ -194,7 +226,7 @@ export async function busWait(client, state, session, request, env = process.env
  * `status` answers by sampling twice, without the gap between samples — but
  * relative to the previous call rather than a fixed window.
  */
-export async function busChanged(client, state, session, paneIds, env = process.env) {
+export async function busChanged(client, state, session, paneIds, env = process.env, timeoutMs) {
     if (paneIds.length === 0)
         return null;
     const plan = planBus(client, state, env, session);
@@ -206,6 +238,7 @@ export async function busChanged(client, state, session, paneIds, env = process.
         url: plan.url,
         configKey,
         panes: paneIds,
+        timeoutMs,
     });
     const parsed = parseChangedReply(reply.stdout);
     if (!parsed || !parsed.ready)

package/dist/ops/dispatch.d.ts

@@ -1,4 +1,10 @@
 import { type ZellijClient } from "../zellij/client.js";
 import type { DispatchDeps, OpsResult } from "./types.js";
-/** Shared MCP/CLI dispatch for zswarm ops. */
+/**
+ * Per-invocation routing from `--local` / `--ssh`. `--local` clears both SSH
+ * and serve (and remote IPC). `--ssh` sets the destination for this call and
+ * clears serve so the flag wins over a sticky ZSWARM_SERVE.
+ */
+export declare function resolveInvocationEnv(args: Record<string, unknown>, base: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
+/** Shared MCP/CLI dispatch, with invocation routing on successes and failures. */
 export declare function dispatchZswarm(args: Record<string, unknown>, injected?: ZellijClient, deps?: DispatchDeps): Promise<OpsResult>;