@zswarm/cli 0.1.6 → 0.1.8

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { ZellijError, cliUsage, dispatchZswarm, parseCliArgv, serveChildEnv, startServe, } from "@zswarm/core";
+import { ZellijError, cliUsage, createServeTunnelManager, dispatchZswarm, parseCliArgv, serveChildEnv, startServe, } from "@zswarm/core";
 import { readBodyFile } from "./input.js";
 import { routingNotice } from "./output.js";
 const argv = process.argv.slice(2);
@@ -29,7 +29,11 @@ catch (err) {
 if (args.op === "serve" && args.install !== true && args.clear !== true) {
     const listen = typeof args.listen === "string" ? args.listen : undefined;
     try {
-        const { label } = await startServe(listen, (request) => dispatchZswarm(request, undefined, { env: serveChildEnv(process.env) }), { token: process.env.ZSWARM_SERVE_TOKEN });
+        const { label } = await startServe(listen, (request) => dispatchZswarm(request, undefined, { env: serveChildEnv(process.env) }), {
+            token: process.env.ZSWARM_SERVE_TOKEN,
+            launchId: process.env.ZSWARM_SERVE_LAUNCH_ID,
+            env: process.env,
+        });
         process.stdout.write(`${JSON.stringify({ ok: true, data: { listening: label } }, null, 2)}\n`);
     }
     catch (err) {
@@ -39,8 +43,29 @@ if (args.op === "serve" && args.install !== true && args.clear !== true) {
     }
 }
 else {
-    const result = await dispatchZswarm(args);
-    process.stderr.write(routingNotice(result, process.stderr.isTTY === true));
-    process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-    process.exit(result.ok ? 0 : 1);
+    const serveTunnels = createServeTunnelManager({ persistIdle: false });
+    const ac = new AbortController();
+    const onStop = () => {
+        if (!ac.signal.aborted)
+            ac.abort();
+        void serveTunnels.closeAll();
+    };
+    process.once("SIGINT", onStop);
+    process.once("SIGTERM", onStop);
+    let exitCode = 1;
+    try {
+        const result = await dispatchZswarm(args, undefined, {
+            signal: ac.signal,
+            serveTunnels,
+        });
+        process.stderr.write(routingNotice(result, process.stderr.isTTY === true));
+        process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+        exitCode = result.ok ? 0 : 1;
+    }
+    finally {
+        process.off("SIGINT", onStop);
+        process.off("SIGTERM", onStop);
+        await serveTunnels.closeAll();
+    }
+    process.exit(exitCode);
 }

package/dist/output.js

@@ -5,7 +5,10 @@ export function routingNotice(result, interactive) {
         return "";
     // Prevent terminal control characters or newlines in host/session labels.
     const label = (s) => JSON.stringify(s);
+    const data = result.ok && result.data && typeof result.data === "object" ? result.data : null;
+    const polling = data?.polling;
     return `zswarm: ${route.transport} ${label(route.host)}` +
         (route.session ? ` session=${label(route.session)}` : "") +
-        ` (via ${route.origin.transport}; session ${route.origin.session})\n`;
+        ` (via ${route.origin.transport}; session ${route.origin.session})\n` +
+        (polling?.recommendation ? `zswarm: ${label(polling.recommendation)}\n` : "");
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@zswarm/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "description": "zSwarm CLI — list, send, dump Zellij panes",
   "bin": {
     "zswarm": "./dist/cli.js"
   },
   "dependencies": {
-    "@zswarm/core": "0.1.6"
+    "@zswarm/core": "0.1.8"
   },
   "devDependencies": {
     "@types/node": "22.14.1",