@zswarm/cli 0.1.9 → 0.2.1

package/dist/cli.js

@@ -1,8 +1,28 @@
 #!/usr/bin/env node
-import { ZellijError, cliUsage, createServeTunnelManager, dispatchZswarm, parseCliArgv, serveChildEnv, startServe, } from "@zswarm/core";
+import { HOST_COMMANDS, ZellijError, cliUsage, createServeTunnelManager, dispatchZswarm, parseCliArgv, runHostCommand, SERVE_AWAIT_SESSION_ENV, SERVE_CORE_VERSION, serveTokenFromEnv, serveChildEnv, startServe, } from "@zswarm/core";
 import { readBodyFile } from "./input.js";
 import { routingNotice } from "./output.js";
+/** Wait until `session` is a live Zellij session (a crew service creates it). */
+async function awaitLiveSession(session, ms) {
+    const deadline = Date.now() + ms;
+    for (;;) {
+        const res = await dispatchZswarm({ op: "sessions" }).catch(() => undefined);
+        const sessions = res?.ok ? (res.data.sessions ?? []) : [];
+        if (sessions.some((s) => s.name === session))
+            return;
+        if (Date.now() >= deadline)
+            throw new Error(`session ${session} did not come up within ${ms} ms`);
+        await new Promise((r) => setTimeout(r, 1_000));
+    }
+}
 const argv = process.argv.slice(2);
+if (argv[0] === "--version" || argv[0] === "-V") {
+    process.stdout.write(`${SERVE_CORE_VERSION}\n`);
+    process.exit(0);
+}
+if (argv.length > 0 && HOST_COMMANDS.includes(argv[0])) {
+    process.exit(await runHostCommand(argv));
+}
 if (argv.length === 0 || argv[0] === "-h" || argv[0] === "--help") {
     process.stderr.write(cliUsage());
     process.exit(argv.length === 0 ? 2 : 0);
@@ -29,8 +49,15 @@ catch (err) {
 if (args.op === "serve" && args.install !== true && args.clear !== true) {
     const listen = typeof args.listen === "string" ? args.listen : undefined;
     try {
+        // A service-run serve (serve --install on Linux/macOS) reads its token
+        // from a mode-600 file and waits for its session before listening.
+        const token = serveTokenFromEnv(process.env);
+        const awaitMs = Number(process.env[SERVE_AWAIT_SESSION_ENV] ?? 0);
+        if (awaitMs > 0 && typeof args.session === "string") {
+            await awaitLiveSession(args.session, awaitMs);
+        }
         const { label } = await startServe(listen, (request) => dispatchZswarm(request, undefined, { env: serveChildEnv(process.env) }), {
-            token: process.env.ZSWARM_SERVE_TOKEN,
+            token,
             launchId: process.env.ZSWARM_SERVE_LAUNCH_ID,
             env: process.env,
         });

package/package.json

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