@zswarm/core 0.6.0 → 0.7.0

package/dist/host/cli.js

@@ -1,6 +1,6 @@
 import { readFileSync } from "node:fs";
 import { ZellijError } from "../errors.js";
-import { createStateStore } from "../state.js";
+import { createStateStore, defaultStateDir } from "../state.js";
 import { crewCheck, crewClient, crewDown, crewStart, crewStatus, crewUp } from "./crew.js";
 import { hostDoctor, hostInstall, hostInstallArgs, hostScriptPath } from "./host.js";
 import { listLeases } from "./lease.js";
@@ -151,6 +151,10 @@ async function relay(argv) {
         if (flags["--json"] === true)
             return json(() => ({ leases }));
         process.stdout.write(`${leaseTable(leases)}\n`);
+        if (leases.length === 0) {
+            // A tool that runs zswarm with its own ZSWARM_STATE_DIR keeps its leases there.
+            process.stderr.write(`no live leases in ${defaultStateDir()}; set ZSWARM_STATE_DIR to read another state directory\n`);
+        }
         return 0;
     }
     const cancelId = str(flags["--cancel"]);

package/dist/host/relay.d.ts

@@ -46,6 +46,9 @@ export type RelayConfig = {
     to: string;
     done: string;
     replyTo: string;
+    /** The reply pane's unique title when `replyTo` was a pane id: delivery tries
+     * the name first, because ids shift when panes are restarted or renumbered. */
+    replyToName?: string;
     replySession?: string;
     from: string;
     /** The target harness (`--harness`); sent with the body and the reply. */
@@ -112,6 +115,10 @@ export declare function fillMessage(template: string, fields: Record<string, str
  * the verdict and keeps waiting — the done line is the real proof of delivery.
  */
 export declare function softSendVerdict(res: OpsResult): boolean;
+/** The unique title of the reply pane when `replyTo` is a pane id (`terminal_14`, `14`),
+ * else undefined: an untitled pane (default shell title) or a title shared by two panes
+ * keeps delivery by id. */
+export declare function replyPaneName(cfg: Pick<RelayConfig, "replyTo" | "replySession">, env: NodeJS.ProcessEnv, call: NonNullable<RelayDeps["call"]>): Promise<string | undefined>;
 /** Paste `body` into the reply pane, retrying with backoff; false leaves it in undelivered/. */
 export declare function deliverMessage(cfg: RelayConfig, body: string, dir: string, deps?: RelayDeps): Promise<boolean>;
 /** The waiting loop; returns the final status and the message it delivered or left behind. */

package/dist/host/relay.js

@@ -111,6 +111,28 @@ export function softSendVerdict(res) {
     const submitted = res.data?.submitted;
     return submitted !== true;
 }
+/** The unique title of the reply pane when `replyTo` is a pane id (`terminal_14`, `14`),
+ * else undefined: an untitled pane (default shell title) or a title shared by two panes
+ * keeps delivery by id. */
+export async function replyPaneName(cfg, env, call) {
+    const ref = cfg.replyTo.trim();
+    if (!/^(terminal_)?\d+$/i.test(ref))
+        return undefined;
+    const args = { op: "list" };
+    if (cfg.replySession)
+        args.session = cfg.replySession;
+    const res = await call(args, localEnv(env)).catch(() => null);
+    if (!res?.ok)
+        return undefined;
+    const panes = (res.data.panes ?? [])
+        .filter((p) => !p.isPlugin);
+    const id = `terminal_${ref.replace(/^terminal_/i, "")}`;
+    const title = panes.find((p) => p.id === id)?.title?.trim();
+    if (!title || /^(Pane #\d+|-?(zsh|bash|fish|sh|pwsh|powershell))$/i.test(title))
+        return undefined;
+    const same = panes.filter((p) => (p.title ?? "").trim().toLowerCase() === title.toLowerCase());
+    return same.length === 1 ? title : undefined;
+}
 /** Paste `body` into the reply pane, retrying with backoff; false leaves it in undelivered/. */
 export async function deliverMessage(cfg, body, dir, deps = {}) {
     const env = deps.env ?? process.env;
@@ -125,13 +147,20 @@ export async function deliverMessage(cfg, body, dir, deps = {}) {
         await sleep(delay * 1000);
         // Generous Zellij budgets: this runs exactly when the machine is busiest.
         const args = {
-            op: "send", to: cfg.replyTo, body, from: cfg.from, fresh: true, settleMs: 800, observeMs: 30_000, timeoutMs: 60_000,
+            op: "send", to: cfg.replyToName ?? cfg.replyTo, body, from: cfg.from, fresh: true, settleMs: 800, observeMs: 30_000,
+            timeoutMs: 60_000,
         };
         if (cfg.replySession)
             args.session = cfg.replySession;
         if (cfg.harness)
             args.harness = cfg.harness;
-        const res = await call(args, localEnv(env)).catch((err) => ({ ok: false, error: { code: "failed", message: String(err) } }));
+        const send = (a) => call(a, localEnv(env)).catch((err) => ({ ok: false, error: { code: "failed", message: String(err) } }));
+        let res = await send(args);
+        if (!res.ok && cfg.replyToName && (res.error.code === "peer_not_found" || res.error.code === "peer_ambiguous")) {
+            // The named pane is gone or now ambiguous: the id it had at start is the last resort.
+            log(`message attempt ${i + 1}: pane "${cfg.replyToName}" ${res.error.code}; trying ${cfg.replyTo}`);
+            res = await send({ ...args, to: cfg.replyTo });
+        }
         if (res.ok) {
             const submitted = String(res.data?.submitted ?? "unknown");
             recordDelivery(dir, submitted, now());
@@ -430,6 +459,7 @@ export async function startRelay(input) {
     };
     // Read the body before the relay directory (and its token copy) exists.
     const body = input.bodyFile ? readFileSync(input.bodyFile, "utf8") : undefined;
+    cfg.replyToName = await replyPaneName(cfg, env, input.deps?.call ?? ((args, e) => dispatchZswarm(args, undefined, { env: e })));
     const dir = prepareRelay(cfg, { check: input.check, message: input.message }, env);
     const store = input.store ?? createStateStore({ env });
     const leaseTarget = { serve, session: cfg.session, pane: cfg.to };

package/dist/index.d.ts

@@ -39,6 +39,6 @@ export { findPython, runSlot, slotScriptPath } from "./host/slot.js";
 export { installServeService, serveServiceName, serveServiceSpec, serveTokenFromEnv, serveTokenPath, uninstallServeService, SERVE_AWAIT_SESSION_ENV, SERVE_TOKEN_FILE_ENV, type ServeServiceInput, } from "./host/serve-service.js";
 export { accountArgv, installServices, launchdLabel, launchdPlist, removeServices, serviceAccount, serviceStates, systemdUnitName, systemdUnits, writeAccountFile, type Runner, type ServiceAccount, type ServiceHost, type ServiceKind, type ServiceSpec, type ServiceState, } from "./host/services.js";
 export { crewCheck, crewClient, crewDir, crewDown, crewServiceSpecs, crewStart, crewStatus, crewUp, firstLayoutPane, layoutPaneNames, parseEnvFile, type CrewDeps, type CrewUpInput, } from "./host/crew.js";
-export { cancelAllTo, cancelRelay, deliverMessage, doneLines, fillMessage, freshDoneLine, launchRelay, listRelays, prepareRelay, pruneRelays, relayLoop, relaysDir, runRelayDir, scrubRelayToken, startRelay, waitForRelay, type RelayAdminDeps, type RelayCancelResult, type RelayConfig, type RelayDeps, type RelayJob, type RelayJobRunner, type RelayRow, type RelayStartInput, type RelayStatus, } from "./host/relay.js";
+export { cancelAllTo, cancelRelay, deliverMessage, doneLines, fillMessage, freshDoneLine, launchRelay, listRelays, prepareRelay, pruneRelays, relayLoop, relaysDir, replyPaneName, runRelayDir, scrubRelayToken, startRelay, waitForRelay, type RelayAdminDeps, type RelayCancelResult, type RelayConfig, type RelayDeps, type RelayJob, type RelayJobRunner, type RelayRow, type RelayStartInput, type RelayStatus, } from "./host/relay.js";
 export { hostChecks, hostDoctor, hostInstall, hostInstallArgs, hostScriptPath, parseHostReport, type HostCheck, type HostDoctorInput, type HostInstallInput, type SshRunner, } from "./host/host.js";
 export { isSelfPane } from "./ops/guards.js";

package/dist/index.js

@@ -37,6 +37,6 @@ export { findPython, runSlot, slotScriptPath } from "./host/slot.js";
 export { installServeService, serveServiceName, serveServiceSpec, serveTokenFromEnv, serveTokenPath, uninstallServeService, SERVE_AWAIT_SESSION_ENV, SERVE_TOKEN_FILE_ENV, } from "./host/serve-service.js";
 export { accountArgv, installServices, launchdLabel, launchdPlist, removeServices, serviceAccount, serviceStates, systemdUnitName, systemdUnits, writeAccountFile, } from "./host/services.js";
 export { crewCheck, crewClient, crewDir, crewDown, crewServiceSpecs, crewStart, crewStatus, crewUp, firstLayoutPane, layoutPaneNames, parseEnvFile, } from "./host/crew.js";
-export { cancelAllTo, cancelRelay, deliverMessage, doneLines, fillMessage, freshDoneLine, launchRelay, listRelays, prepareRelay, pruneRelays, relayLoop, relaysDir, runRelayDir, scrubRelayToken, startRelay, waitForRelay, } from "./host/relay.js";
+export { cancelAllTo, cancelRelay, deliverMessage, doneLines, fillMessage, freshDoneLine, launchRelay, listRelays, prepareRelay, pruneRelays, relayLoop, relaysDir, replyPaneName, runRelayDir, scrubRelayToken, startRelay, waitForRelay, } from "./host/relay.js";
 export { hostChecks, hostDoctor, hostInstall, hostInstallArgs, hostScriptPath, parseHostReport, } from "./host/host.js";
 export { isSelfPane } from "./ops/guards.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zswarm/core",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "type": "module",
   "description": "zSwarm Zellij client and shared ops dispatch",
   "exports": {