@zswarm/core 0.1.6 → 0.1.7

package/dist/exec.d.ts

@@ -1,4 +1,4 @@
-import { type RemoteShell } from "./zellij/ipc.js";
+import { type IpcDirs, type RemoteShell } from "./zellij/ipc.js";
 export type ExecResult = {
     code: number;
     stdout: string;
@@ -49,10 +49,44 @@ export type IpcDiscoveryState = {
 };
 export type SshExecFn = ExecFn & {
     ipcState: IpcDiscoveryState;
+    /**
+     * Resolve `ZSWARM_TMP=auto` once under this caller's budget before parallel
+     * identity/capability probes. Independent of other callers' in-flight work.
+     */
+    prepareIpc: (timeoutMs: number, signal?: AbortSignal) => Promise<IpcDirs | undefined>;
 };
+/** Positive `auto` IPC hits only; failures/cancels never enter this map. */
+export declare const DEFAULT_IPC_DISCOVERY_TTL_MS = 15000;
+export declare const DEFAULT_IPC_DISCOVERY_CACHE_LIMIT = 512;
+/** Fully scoped key so hosts / SSH bins / remote shells / users never collide. */
+export declare function ipcDiscoveryCacheKey(target: SshTarget, env?: NodeJS.ProcessEnv): string;
+/**
+ * Probe list for `ZSWARM_TMP=auto`. Known Windows (cmd / interactive / .exe)
+ * skips the Unix `ps` fallback; explicit `sh` skips PowerShell. Unknown
+ * `zellij` still tries both — a Windows host with remoteBin=zellij looks Unix.
+ */
+export declare function ipcDiscoveryProbes(target: SshTarget): string[];
+export declare function resetIpcDiscoveryCache(): void;
+/** Test helper: shrink the positive-hit TTL without exposing the map. */
+export declare function setIpcDiscoveryTtlMs(ttlMs: number): void;
+export declare function peekIpcDiscoveryCache(key: string): IpcDirs | undefined;
+/**
+ * Canonical SSH + resolved IPC namespace. Listing caches should hash this
+ * (or `ipcState.tmp` / `socketDir` after a refreshed read) so a warmed
+ * socket context matches across `createSshExec` instances.
+ */
+export declare function sshIpcContextKey(target: SshTarget, env?: NodeJS.ProcessEnv, ipc?: {
+    tmp?: string;
+    socketDir?: string;
+} | null): string;
+/** Test helper: shrink the positive-hit map so eviction is observable. */
+export declare function setIpcDiscoveryCacheLimit(limit: number): void;
+export declare function ipcDiscoveryCacheSize(): number;
 /**
  * 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): SshExecFn;
+export declare function createSshExec(target: SshTarget, env: NodeJS.ProcessEnv, options?: {
+    pinIpc?: boolean;
+}): SshExecFn;
 export declare function createExec(binPath: string, env: NodeJS.ProcessEnv): ExecFn;

package/dist/exec.js

@@ -35,17 +35,104 @@ export function buildSshRemoteCommand(target, args, tmp, timeoutMs, socketDir) {
     }
     return withTmp;
 }
-async function discoverRemoteIpc(runner, target, remaining, signal) {
+/** Positive `auto` IPC hits only; failures/cancels never enter this map. */
+export const DEFAULT_IPC_DISCOVERY_TTL_MS = 15_000;
+export const DEFAULT_IPC_DISCOVERY_CACHE_LIMIT = 512;
+const ipcDiscoveryCache = new Map();
+let ipcDiscoveryTtlMs = DEFAULT_IPC_DISCOVERY_TTL_MS;
+let ipcDiscoveryCacheLimit = DEFAULT_IPC_DISCOVERY_CACHE_LIMIT;
+const IPC_USER_ENV = [
+    "USER",
+    "USERNAME",
+    "LOGNAME",
+    "HOME",
+    "USERPROFILE",
+    "USERDOMAIN",
+    "SSH_AUTH_SOCK",
+    "PATH",
+    "Path",
+    "XDG_CONFIG_HOME",
+];
+/** Fully scoped key so hosts / SSH bins / remote shells / users never collide. */
+export function ipcDiscoveryCacheKey(target, env = {}) {
+    const requested = target.tmp?.trim() ?? "";
+    const user = IPC_USER_ENV.map((name) => env[name] ?? "");
+    return JSON.stringify([
+        target.ssh,
+        target.host,
+        target.options,
+        target.remoteBin,
+        target.remoteShell ?? "",
+        target.mode ?? "ssh",
+        requested.toLowerCase() === "auto" ? "auto" : requested,
+        user,
+    ]);
+}
+/**
+ * Probe list for `ZSWARM_TMP=auto`. Known Windows (cmd / interactive / .exe)
+ * skips the Unix `ps` fallback; explicit `sh` skips PowerShell. Unknown
+ * `zellij` still tries both — a Windows host with remoteBin=zellij looks Unix.
+ */
+export function ipcDiscoveryProbes(target) {
     const shell = inferRemoteShell({
         explicit: target.remoteShell,
         remoteBin: target.remoteBin,
         mode: target.mode,
     });
-    // `auto` has no tmp yet, so a Windows host with remoteBin=zellij still looks
-    // like Unix. Try both listings; pickIpcDirs ignores lines without --server.
-    const probes = shell === "cmd"
-        ? [windowsDiscoverRemote(), unixDiscoverRemote()]
-        : [unixDiscoverRemote(), windowsDiscoverRemote()];
+    const windows = windowsDiscoverRemote();
+    const unix = unixDiscoverRemote();
+    if (shell === "cmd")
+        return [windows];
+    if (target.remoteShell === "sh")
+        return [unix];
+    return [unix, windows];
+}
+export function resetIpcDiscoveryCache() {
+    ipcDiscoveryCache.clear();
+    ipcDiscoveryTtlMs = DEFAULT_IPC_DISCOVERY_TTL_MS;
+    ipcDiscoveryCacheLimit = DEFAULT_IPC_DISCOVERY_CACHE_LIMIT;
+}
+/** Test helper: shrink the positive-hit TTL without exposing the map. */
+export function setIpcDiscoveryTtlMs(ttlMs) {
+    ipcDiscoveryTtlMs = Math.max(0, ttlMs);
+}
+export function peekIpcDiscoveryCache(key) {
+    const entry = ipcDiscoveryCache.get(key);
+    if (!entry)
+        return undefined;
+    if (entry.expiresAt <= Date.now()) {
+        ipcDiscoveryCache.delete(key);
+        return undefined;
+    }
+    return { tmp: entry.dirs.tmp, socketDir: entry.dirs.socketDir };
+}
+/**
+ * Canonical SSH + resolved IPC namespace. Listing caches should hash this
+ * (or `ipcState.tmp` / `socketDir` after a refreshed read) so a warmed
+ * socket context matches across `createSshExec` instances.
+ */
+export function sshIpcContextKey(target, env = {}, ipc) {
+    return JSON.stringify([ipcDiscoveryCacheKey(target, env), ipc?.tmp ?? "", ipc?.socketDir ?? ""]);
+}
+/** Test helper: shrink the positive-hit map so eviction is observable. */
+export function setIpcDiscoveryCacheLimit(limit) {
+    ipcDiscoveryCacheLimit = Math.max(1, limit);
+}
+export function ipcDiscoveryCacheSize() {
+    return ipcDiscoveryCache.size;
+}
+function storeIpcDiscovery(key, dirs) {
+    ipcDiscoveryCache.delete(key);
+    ipcDiscoveryCache.set(key, {
+        dirs: { ...dirs },
+        expiresAt: Date.now() + ipcDiscoveryTtlMs,
+    });
+    while (ipcDiscoveryCache.size > ipcDiscoveryCacheLimit) {
+        ipcDiscoveryCache.delete(ipcDiscoveryCache.keys().next().value);
+    }
+}
+async function discoverRemoteIpc(runner, target, remaining, signal) {
+    const probes = ipcDiscoveryProbes(target);
     for (const probe of probes) {
         if (signal?.aborted)
             return undefined;
@@ -56,6 +143,10 @@ async function discoverRemoteIpc(runner, target, remaining, signal) {
             timeoutMs: left,
             signal,
         });
+        if (result.code !== 0)
+            continue;
+        if (remaining() <= 0)
+            return undefined;
         const dirs = pickIpcDirs(parseZellijServerPaths(result.stdout));
         if (dirs)
             return dirs;
@@ -66,22 +157,63 @@ async function discoverRemoteIpc(runner, target, remaining, signal) {
  * 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 function createSshExec(target, env) {
+export function createSshExec(target, env, options = {}) {
     const runner = createExec(target.ssh, env);
-    let cached;
-    let autoAttempted = false;
-    const requestedTmp = target.tmp?.trim() || null;
+    const cacheKey = ipcDiscoveryCacheKey(target, env);
+    let autoFailed = false;
+    let pinnedIpc;
     const ipcState = {
-        requested: requestedTmp,
-        status: !requestedTmp
-            ? "none"
-            : requestedTmp.toLowerCase() === "auto"
-                ? "none"
-                : "skipped",
-        ...(requestedTmp && requestedTmp.toLowerCase() !== "auto"
-            ? { tmp: requestedTmp, socketDir: "" }
-            : {}),
+        requested: null,
+        status: "none",
     };
+    function adopt(dirs) {
+        if (options.pinIpc) {
+            pinnedIpc ??= { ...dirs };
+            dirs = pinnedIpc;
+        }
+        autoFailed = false;
+        ipcState.status = "resolved";
+        ipcState.tmp = dirs.tmp;
+        ipcState.socketDir = dirs.socketDir;
+        return { ...dirs };
+    }
+    /** Seed from a positive hit; unpinned execs drop resolved dirs after TTL. */
+    function refreshIpcView() {
+        const requested = target.tmp?.trim() || null;
+        ipcState.requested = requested;
+        if (!requested) {
+            ipcState.status = "none";
+            delete ipcState.tmp;
+            delete ipcState.socketDir;
+            return ipcState;
+        }
+        if (requested.toLowerCase() !== "auto") {
+            ipcState.status = "skipped";
+            ipcState.tmp = requested;
+            ipcState.socketDir = "";
+            return ipcState;
+        }
+        // A high-level client pins its namespace so pane lookup and the following
+        // write cannot switch sockets when another caller refreshes discovery.
+        if (pinnedIpc)
+            return ipcState;
+        // Diagnostics describe this exec's last attempt, not a sibling's later
+        // success. A subsequent actual invocation may adopt a positive cache hit.
+        if (autoFailed)
+            return ipcState;
+        const cached = peekIpcDiscoveryCache(cacheKey);
+        if (cached) {
+            adopt(cached);
+            return ipcState;
+        }
+        if (ipcState.status === "resolved") {
+            ipcState.status = "none";
+            delete ipcState.tmp;
+            delete ipcState.socketDir;
+        }
+        return ipcState;
+    }
+    refreshIpcView();
     async function resolveIpc(remaining, signal) {
         const requested = target.tmp?.trim();
         if (!requested) {
@@ -96,40 +228,50 @@ export function createSshExec(target, env) {
             ipcState.socketDir = "";
             return { tmp: requested, socketDir: "" };
         }
-        if (cached) {
-            ipcState.status = "resolved";
-            ipcState.tmp = cached.tmp;
-            ipcState.socketDir = cached.socketDir;
-            return cached;
-        }
+        if (pinnedIpc)
+            return adopt(pinnedIpc);
+        const cached = peekIpcDiscoveryCache(cacheKey);
+        if (cached)
+            return adopt(cached);
         // Do not re-probe after a failed/expired/cancelled attempt on this exec.
-        if (autoAttempted)
+        // A later createSshExec with the same key still probes — failures are not
+        // stored, and in-flight work is never shared across callers' budgets.
+        if (autoFailed)
             return undefined;
         if (signal?.aborted) {
+            autoFailed = true;
             ipcState.status = "cancelled";
             return undefined;
         }
         if (remaining() <= 0) {
+            autoFailed = true;
             ipcState.status = "expired";
             return undefined;
         }
-        autoAttempted = true;
         const dirs = await discoverRemoteIpc(runner, target, remaining, signal);
+        // Another probe on this client may have pinned a namespace while we were
+        // waiting. Its first positive result wins, even if this probe failed.
+        if (pinnedIpc)
+            return adopt(pinnedIpc);
         if (signal?.aborted) {
+            autoFailed = true;
             ipcState.status = "cancelled";
             return undefined;
         }
         if (dirs) {
-            cached = dirs;
-            ipcState.status = "resolved";
-            ipcState.tmp = dirs.tmp;
-            ipcState.socketDir = dirs.socketDir;
-            return dirs;
+            if (remaining() <= 0) {
+                autoFailed = true;
+                ipcState.status = "expired";
+                return undefined;
+            }
+            storeIpcDiscovery(cacheKey, dirs);
+            return adopt(dirs);
         }
+        autoFailed = true;
         ipcState.status = remaining() <= 0 ? "expired" : "failed";
         return undefined;
     }
-    const exec = async (args, 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);
@@ -156,8 +298,18 @@ export function createSshExec(target, env) {
             ...options,
             timeoutMs: left,
         });
+    });
+    Object.defineProperty(exec, "ipcState", {
+        enumerable: true,
+        configurable: true,
+        get() {
+            return { ...refreshIpcView() };
+        },
+    });
+    exec.prepareIpc = (timeoutMs, signal) => {
+        const deadline = Date.now() + timeoutMs;
+        return resolveIpc(() => Math.max(0, deadline - Date.now()), signal);
     };
-    exec.ipcState = ipcState;
     return exec;
 }
 /** Read stdout until the answer is in hand, then stop caring about the child. */

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { ZellijError } from "./errors.js";
+export { ListingCache } from "./zellij/cache.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, looksLikeZswarmBinary, isZellijVersionOutput, resolveZellijBinary, resetZellijIdentityCache, sanitizeZellijEnv, validateSshDestination, validateSshMode, type ZellijExecFn, type ZellijExecResult, } from "./zellij/binary.js";

package/dist/index.js

@@ -1,4 +1,5 @@
 export { ZellijError } from "./errors.js";
+export { ListingCache } from "./zellij/cache.js";
 export { createExec, NOT_FOUND_EXIT, } from "./exec.js";
 export { createGitClient, defaultWorktreeRoot, normalizeRepoPath, parseWorktreeList, worktreeDirName, } from "./git.js";
 export { expandHomePath, looksLikeZswarmBinary, isZellijVersionOutput, resolveZellijBinary, resetZellijIdentityCache, sanitizeZellijEnv, validateSshDestination, validateSshMode, } from "./zellij/binary.js";

package/dist/ops/broadcast.js

@@ -70,7 +70,7 @@ export async function broadcast(client, state, args, clock, policy, env = proces
     if (!body.trim())
         throw new ZellijError("missing_body", "body required");
     const { session } = await client.resolveSession(typeof args.session === "string" ? args.session : undefined);
-    const panes = await client.listPanes(session);
+    const panes = await client.listPanes(session, undefined, { fresh: true });
     const labeled = withSenderLabel(args, {
         env,
         selfTitle: selfPaneTitle(client, panes),

package/dist/ops/bus.js

@@ -19,15 +19,18 @@ const COLD_RETRY_MS = 200;
  * copies.
  */
 const INSTALL_IN_FLIGHT_MS = 10_000;
-/** Set once a pipe has failed, so one dead plugin costs one timeout, not many. */
-let processDisabled = null;
+/** Back off failed pipes briefly, isolated to their transport/session/plugin. */
+const busFailures = new Map();
 /** The key that actually answered, per session, for the life of this process. */
 const answeredWith = new Map();
 /** Tests share a module instance; this drops what a previous case cached. */
 export function resetBusCache() {
-    processDisabled = null;
+    busFailures.clear();
     answeredWith.clear();
 }
+function busScope(client, session, plan) {
+    return JSON.stringify([client.contextKey(), session, plan.url, plan.configKey]);
+}
 function affirmative(raw) {
     const v = (raw ?? "").trim().toLowerCase();
     return v === "1" || v === "true" || v === "yes" || v === "on";
@@ -62,8 +65,12 @@ export function planBus(client, state, env = process.env, session = "") {
             reason: "no plugin wasm found; run pnpm build:plugin or set ZSWARM_BUS_PLUGIN",
         };
     }
-    if (processDisabled)
-        return { ...base, reason: processDisabled };
+    const scope = busScope(client, session, base);
+    const failed = busFailures.get(scope);
+    if (failed && Date.now() < failed.until)
+        return { ...base, reason: failed.reason };
+    if (failed)
+        busFailures.delete(scope);
     if (affirmative(env.ZSWARM_BUS)) {
         return { ...base, enabled: true, reason: "ZSWARM_BUS=1" };
     }
@@ -89,7 +96,7 @@ async function nudgeManifest(client, session, env, remaining) {
     const listBudget = Math.min(DEFAULT_TIMEOUT_MS, remaining());
     if (listBudget <= 0)
         return;
-    const panes = await client.listPanes(session, listBudget);
+    const panes = await client.listPanes(session, listBudget, { fresh: true });
     const pane = panes.find((p) => !p.isPlugin && !p.exited && p.title.trim());
     if (!pane)
         return;
@@ -127,7 +134,8 @@ export async function busSnapshot(client, state, session, clock, env = process.e
     const url = plan.url;
     if (!plan.enabled || !url || !pluginPath)
         return null;
-    const configKey = answeredWith.get(session) ?? plan.configKey;
+    const scope = busScope(client, session, plan);
+    const configKey = answeredWith.get(scope) ?? plan.configKey;
     const ask = async () => {
         const budget = Math.min(DEFAULT_BUS_TIMEOUT_MS, remaining());
         if (budget <= 0)
@@ -155,10 +163,18 @@ export async function busSnapshot(client, state, session, clock, env = process.e
     if (remaining() <= 0 && !snapshot?.ready)
         return null;
     if (snapshot) {
-        answeredWith.set(session, configKey);
+        answeredWith.set(scope, configKey);
+        if (answeredWith.size > 256)
+            answeredWith.delete(answeredWith.keys().next().value);
+        if (snapshot.ready)
+            client.observeManifest(session, JSON.stringify([
+                scope, snapshot.paneUpdates, snapshot.tabUpdates, snapshot.panes, snapshot.tabs, snapshot.tabIds,
+            ]));
         return { snapshot, configKey };
     }
-    processDisabled = "plugin did not answer; using zellij polling for this run";
+    busFailures.set(scope, { reason: "plugin did not answer; using zellij polling for 5s", until: Date.now() + 5000 });
+    if (busFailures.size > 256)
+        busFailures.delete(busFailures.keys().next().value);
     return null;
 }
 /**
@@ -178,7 +194,7 @@ export async function busScreens(client, state, session, paneIds, clock, env = p
     const plan = planBus(client, state, env, session);
     if (!plan.enabled || !plan.url)
         return null;
-    const configKey = answeredWith.get(session) ?? plan.configKey;
+    const configKey = answeredWith.get(busScope(client, session, plan)) ?? plan.configKey;
     const reply = await client.scrollbackPlugin({
         session,
         url: plan.url,
@@ -209,7 +225,7 @@ export async function busWait(client, state, session, request, env = process.env
     const plan = planBus(client, state, env, session);
     if (!plan.enabled || !plan.url)
         return null;
-    const configKey = answeredWith.get(session) ?? plan.configKey;
+    const configKey = answeredWith.get(busScope(client, session, plan)) ?? plan.configKey;
     const reply = await client.waitPlugin({
         session,
         url: plan.url,
@@ -232,7 +248,7 @@ export async function busChanged(client, state, session, paneIds, env = process.
     const plan = planBus(client, state, env, session);
     if (!plan.enabled || !plan.url)
         return null;
-    const configKey = answeredWith.get(session) ?? plan.configKey;
+    const configKey = answeredWith.get(busScope(client, session, plan)) ?? plan.configKey;
     const reply = await client.changedPlugin({
         session,
         url: plan.url,
@@ -243,7 +259,8 @@ export async function busChanged(client, state, session, paneIds, env = process.
     const parsed = parseChangedReply(reply.stdout);
     if (!parsed || !parsed.ready)
         return null;
-    return parsed.panes.length === paneIds.length ? parsed : null;
+    const received = new Set([...parsed.panes.map((pane) => pane.id), ...parsed.missing]);
+    return paneIds.every((id) => received.has(id)) ? parsed : null;
 }
 function installedReply(session, plugin, configKey, ready, panes, extra = {}) {
     return {
@@ -261,7 +278,7 @@ function installedReply(session, plugin, configKey, ready, panes, extra = {}) {
     };
 }
 async function listBusPluginPanes(client, session, pluginPath) {
-    const panes = await client.listPanes(session);
+    const panes = await client.listPanes(session, undefined, { fresh: true });
     return panes.filter((pane) => isBusPluginPane(pane, pluginPath));
 }
 /** Close every zswarm-bus plugin pane in this session. Best-effort per pane. */

package/dist/ops/dispatch.js

@@ -6,7 +6,7 @@ import { assertOpAllowed, assertPaneAllowed, loadPolicy, } from "../policy.js";
 import { createStateStore } from "../state.js";
 import { busToPanes } from "../zellij/bus.js";
 import { broadcast } from "./broadcast.js";
-import { busChanged, busOp, busScreens, busSnapshot, busWait } from "./bus.js";
+import { busChanged, busOp, busScreens, busSnapshot, busWait, planBus } from "./bus.js";
 import { dumpLayoutOp, focusTarget, listTabsOp, renameTarget, stackTargets, } from "./panes.js";
 import { peerCheckpoint, peerDiff } from "./review.js";
 import { attachKnownSender, deliverTo, withSenderLabel, selfPaneTitle } from "./delivery.js";
@@ -31,12 +31,18 @@ import { callServe, installServeLogon, serveCallTimeout, uninstallServeLogon, }
 export function resolveInvocationEnv(args, base) {
     const local = isTrue(args.local);
     const sshDest = typeof args.ssh === "string" && args.ssh.trim() ? args.ssh.trim() : null;
-    if (local && sshDest) {
-        throw new ZellijError("usage", "pass --local or --ssh, not both");
+    const serveAddress = optionalString(args.serveAddress);
+    if (Number(local) + Number(Boolean(sshDest)) + Number(Boolean(serveAddress)) > 1) {
+        throw new ZellijError("usage", "choose only one of --local, --ssh, or --serve");
     }
-    if (!local && !sshDest)
+    if (!local && !sshDest && !serveAddress)
         return base;
     const env = { ...base };
+    if (serveAddress) {
+        env.ZSWARM_SERVE = serveAddress;
+        delete env.ZSWARM_SSH;
+        return env;
+    }
     if (local) {
         delete env.ZSWARM_SSH;
         delete env.ZSWARM_SSH_OPTS;
@@ -107,9 +113,10 @@ async function resolveTarget(client, args, state, clock, env, policy, op, signal
     }
     const until = Math.min(budget.deadline, clock.now() + observeMs);
     let pane;
+    let fresh = isTrue(args.fresh) || Boolean(op);
     for (;;) {
         const left = observeMs === 0 ? budget.require() : Math.min(budget.require(), Math.max(1, until - clock.now()));
-        panes ??= await client.listPanes(session, left);
+        panes ??= await client.listPanes(session, left, { fresh });
         throwIfAborted(signal);
         try {
             pane = client.resolvePane(panes, to);
@@ -122,6 +129,7 @@ async function resolveTarget(client, args, state, clock, env, policy, op, signal
             if (clock.now() >= until)
                 throw err;
             panes = null;
+            fresh = true;
         }
     }
     if (policy && op)
@@ -181,9 +189,11 @@ async function dispatchOperation(args, injected, deps, context, env) {
         // An injected client is a unit-test (or in-process) Zellij; do not skip it
         // just because the host env has ZSWARM_SERVE set.
         if (!injected && env.ZSWARM_SERVE?.trim()) {
-            return await callServe(env.ZSWARM_SERVE.trim(), attachKnownSender(args, env), serveCallTimeout(args), env.ZSWARM_SERVE_TOKEN);
+            const request = { ...attachKnownSender(args, env) };
+            delete request.serveAddress; // Routing is consumed here, never forwarded back into a tunnel.
+            return await callServe(env.ZSWARM_SERVE.trim(), request, serveCallTimeout(args), env.ZSWARM_SERVE_TOKEN);
         }
-        const baseClient = injected ?? createZellijClient({ env, signal });
+        const baseClient = injected ?? createZellijClient({ env, signal, cache: isTrue(args.fresh) ? false : undefined });
         const client = {
             ...baseClient,
             get transport() { return baseClient.transport; },
@@ -224,9 +234,10 @@ async function dispatchOperation(args, injected, deps, context, env) {
                 const { session } = await client.resolveSession(typeof args.session === "string" ? args.session : undefined);
                 // The plugin's manifest carries no cwd or floating flag, so anything
                 // verbose has to go the polling route.
-                const bus = verbose
+                const observedBus = verbose
                     ? null
                     : await busSnapshot(client, state(), session, clock, env);
+                const bus = observedBus?.snapshot.ready ? observedBus : null;
                 const view = bus ? paneViewBus : verbose ? paneViewFull : paneViewSlim;
                 const panes = (bus ? busToPanes(bus.snapshot) : await client.listPanes(session))
                     .filter((p) => !p.isPlugin)
@@ -391,24 +402,39 @@ async function dispatchOperation(args, injected, deps, context, env) {
                 throwIfAborted(signal);
                 const { session } = await client.resolveSession(typeof args.session === "string" ? args.session : undefined, setupBudget());
                 throwIfAborted(signal);
-                // Verbose reports cwd and command, which the plugin manifest lacks.
-                const bus = verbose || remaining() <= 0
-                    ? null
-                    : await busSnapshot(client, state(), session, clock, env, "status", {
-                        deadlineAt,
-                        signal,
-                    });
+                // Once the session is known, verbose metadata and the bus manifest
+                // are independent reads. Both consume this operation's remaining time.
+                const readBus = () => remaining() <= 0 ? Promise.resolve(null)
+                    : busSnapshot(client, state(), session, clock, env, "status", { deadlineAt, signal });
+                let observedBus;
+                let detailedPanes;
+                if (verbose) {
+                    const reads = await Promise.allSettled([
+                        readBus(), client.listPanes(session, setupBudget(), { fresh: true }),
+                    ]);
+                    throwIfAborted(signal);
+                    if (reads[1].status === "rejected")
+                        throw reads[1].reason;
+                    if (reads[0].status === "rejected")
+                        throw reads[0].reason;
+                    observedBus = reads[0].value;
+                    detailedPanes = reads[1].value;
+                }
+                else {
+                    observedBus = await readBus();
+                }
+                const bus = observedBus?.snapshot.ready ? observedBus : null;
                 throwIfAborted(signal);
                 // Always hand peerStatus the resolved session (and panes) so it does
                 // not spend the overall budget resolving again.
-                const panes = bus
+                const panes = detailedPanes ?? (bus
                     ? busToPanes(bus.snapshot)
-                    : await client.listPanes(session, setupBudget());
+                    : await client.listPanes(session, setupBudget()));
                 throwIfAborted(signal);
                 let supplied = {
                     session,
                     panes,
-                    source: bus ? "plugin" : "zellij",
+                    source: bus && !verbose ? "plugin" : "zellij",
                 };
                 if (bus) {
                     supplied = {
@@ -433,13 +459,24 @@ async function dispatchOperation(args, injected, deps, context, env) {
                     catch {
                         // Command-shaped `to` needs the polled list; re-fetch without bus.
                         const polled = await client.listPanes(session, setupBudget());
-                        supplied = { session, panes: polled, source: "zellij" };
+                        supplied = { ...supplied, session, panes: polled, source: "zellij" };
                     }
                 }
-                return await peerStatus(client, args, clock, supplied, {
+                const result = await peerStatus(client, args, clock, supplied, {
                     deadlineAt,
                     signal,
                 });
+                if (result.ok && result.data && typeof result.data === "object") {
+                    const data = result.data;
+                    data.polling = {
+                        busAvailable: Boolean(bus),
+                        ...(bus ? {} : { reason: planBus(client, state(), env, session).reason }),
+                        ...(client.remote ? {
+                            recommendation: "For frequent status calls, run zswarm serve beside Zellij and use --serve 127.0.0.1:9419 through an SSH tunnel; direct SSH cannot use the local event bus.",
+                        } : {}),
+                    };
+                }
+                return result;
             }
             case "bus":
                 return await busOp(client, state(), args, clock, env, policy);