@zswarm/core 0.4.0 → 0.4.1

package/dist/ops/delivery.d.ts

@@ -21,8 +21,9 @@ export type SenderOrigin = {
 };
 /**
  * Clean one origin part for the `[zswarm from=…]` header: non-strings and
- * blanks become null, header-breaking characters become spaces, runs of
- * whitespace collapse, and the result is capped at 64 chars.
+ * blanks become null, header-breaking characters and whitespace runs become a
+ * single `_` (a value never holds a space, so `key=value` pairs stay
+ * splittable), and the result is capped at 64 chars.
  */
 export declare function sanitizeOriginPart(raw: unknown): string | null;
 /** The origin of the caller's own process, read from its environment. */
@@ -33,7 +34,10 @@ export declare function resolveSenderOrigin(env: NodeJS.ProcessEnv): SenderOrigi
  * client) keeps every part null but still records that serve carried it.
  */
 export declare function originFromServeRequest(raw: unknown): SenderOrigin;
-/** " @ session/pane on host via serve" (or the parts that are known). */
+/**
+ * " src=session/pane host=host via=serve" (only the parts that are known).
+ * `from=` stays the bare label, so a reader can split the header on spaces.
+ */
 export declare function originSuffix(origin: SenderOrigin | null | undefined): string;
 export type DeliveryResult = {
     to: string;

package/dist/ops/delivery.js

@@ -6,18 +6,19 @@ import { isTrue, numberArg, optionalString } from "./util.js";
 const ORIGIN_PART_MAX = 64;
 /**
  * Clean one origin part for the `[zswarm from=…]` header: non-strings and
- * blanks become null, header-breaking characters become spaces, runs of
- * whitespace collapse, and the result is capped at 64 chars.
+ * blanks become null, header-breaking characters and whitespace runs become a
+ * single `_` (a value never holds a space, so `key=value` pairs stay
+ * splittable), and the result is capped at 64 chars.
  */
 export function sanitizeOriginPart(raw) {
     if (typeof raw !== "string")
         return null;
-    const cleaned = raw.replace(/[\r\n[\]]+/g, " ").replace(/\s+/g, " ").trim();
+    const cleaned = raw.replace(/[\r\n[\]\s]+/g, " ").trim().replace(/ /g, "_");
     if (!cleaned)
         return null;
     return cleaned.length <= ORIGIN_PART_MAX
         ? cleaned
-        : cleaned.slice(0, ORIGIN_PART_MAX).trimEnd();
+        : cleaned.slice(0, ORIGIN_PART_MAX).replace(/_+$/, "");
 }
 /** The origin of the caller's own process, read from its environment. */
 export function resolveSenderOrigin(env) {
@@ -50,15 +51,18 @@ export function originFromServeRequest(raw) {
         via: "serve",
     };
 }
-/** " @ session/pane on host via serve" (or the parts that are known). */
+/**
+ * " src=session/pane host=host via=serve" (only the parts that are known).
+ * `from=` stays the bare label, so a reader can split the header on spaces.
+ */
 export function originSuffix(origin) {
     if (!origin)
         return "";
     const { session, pane, host, via } = origin;
-    const loc = session && pane ? `${session}/${pane}` : (pane ?? session ?? null);
-    return ((loc ? " @ " + loc : "") +
-        (host ? " on " + host : "") +
-        (via === "serve" ? " via serve" : ""));
+    const src = session && pane ? `${session}/${pane}` : (pane ?? session ?? null);
+    return ((src ? " src=" + src : "") +
+        (host ? " host=" + host : "") +
+        (via === "serve" ? " via=serve" : ""));
 }
 /**
  * An args-supplied origin, cleaned again (a direct caller may skip dispatch),

package/dist/schema.js

@@ -281,7 +281,7 @@ export const PARAMS = [
         type: "string",
         flags: ["--from", "-f"],
         ops: ["send", "broadcast"],
-        description: "send: sender label in the [zswarm from=…] prefix (default: ZSWARM_FROM, else the sending pane's title, else swarm). zswarm appends the sender's session/pane, host (ZSWARM_HOST) and `via serve`",
+        description: "send: sender label in the [zswarm from=…] prefix (default: ZSWARM_FROM, else the sending pane's title, else swarm). zswarm appends src=<session>/<pane>, host=<host> (ZSWARM_HOST) and via=serve",
     },
     {
         name: "raw",

package/package.json

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