@sjawhar/pi-legion-envoy 5.4.1 → 5.4.2

package/dist/envoy.js

@@ -34509,7 +34509,7 @@ var envoyToolSpecs = [
   },
   {
     name: "envoy_whoami",
-    description: "Returns this session's Envoy identity: session ID, machine ID, port, and directory.",
+    description: "Returns this session's Envoy identity: session ID, machine ID, port, and directory. session_id is the address a reply reaches. Where a host runs a task subagent inside its parent's process, such a subagent registers no Envoy session of its own, so its session_id is the parent session that spawned it and the result says so.",
     arguments: () => ({}),
     operation: EnvoyToolOperation.whoami,
     requiresSubscriptionCapability: false
@@ -34706,7 +34706,7 @@ function createEnvoyClient(config2) {
       const idempotencyKey = input.idempotencyKey ?? crypto.randomUUID();
       const response = EnvelopeResponseSchema.parse(JSON.parse(await post("/v1/messages/send", {
         source: input.source ?? "agent",
-        ...input.sourceSessionID === undefined ? {} : { source_session: input.sourceSessionID },
+        ...sourceSession(input.sourceSessionID),
         target_session: input.targetSessionID,
         message: input.message,
         idempotency_key: idempotencyKey,
@@ -34722,7 +34722,7 @@ function createEnvoyClient(config2) {
       const idempotencyKey = input.idempotencyKey ?? crypto.randomUUID();
       const response = EnvelopeResponseSchema.parse(JSON.parse(await post("/v1/messages/publish", {
         source: input.source ?? "agent",
-        ...input.sourceSessionID === undefined ? {} : { source_session: input.sourceSessionID },
+        ...sourceSession(input.sourceSessionID),
         topic: input.topic,
         message: input.message,
         ...input.payload === undefined ? {} : { payload: input.payload },
@@ -34785,11 +34785,56 @@ function messageMetadata(input) {
     ...input.expiresAt === undefined ? {} : { expires_at: input.expiresAt }
   };
 }
+function sourceSession(sessionID) {
+  return sessionID === undefined || sessionID === "" ? {} : { source_session: sessionID };
+}
 
 // extensions/envoy.ts
 import { logger } from "@oh-my-pi/pi-utils";
 var import_nats = __toESM(require_mod4(), 1);
 
+// src/envoy-session.ts
+import path2 from "path";
+var ENVOY_SESSIONS = Symbol.for("legion.pi-envoy.envoy-session");
+var store = globalThis;
+function recordedSessions() {
+  const existing = store[ENVOY_SESSIONS];
+  if (existing !== undefined)
+    return existing;
+  const created = new Map;
+  store[ENVOY_SESSIONS] = created;
+  return created;
+}
+function recordEnvoySession(entry) {
+  const sessions = recordedSessions();
+  const key = entry.sessionFile ?? (entry.sessionID === "" ? undefined : `session:${entry.sessionID}`);
+  if (entry.previousKey !== undefined && entry.previousKey !== key) {
+    sessions.delete(entry.previousKey);
+  }
+  if (key === undefined)
+    return;
+  sessions.set(key, entry.sessionID);
+  return key;
+}
+function resolveEnvoySession(sessionFile) {
+  const sessions = recordedSessions();
+  for (let candidate = sessionFile;candidate !== undefined; ) {
+    const directory = path2.dirname(candidate);
+    const parent = `${directory}.jsonl`;
+    if (parent === candidate)
+      break;
+    const recorded = sessions.get(parent);
+    if (recorded !== undefined)
+      return recorded;
+    if (path2.dirname(directory) === directory)
+      break;
+    candidate = parent;
+  }
+  if (sessions.size !== 1)
+    return "";
+  return [...sessions.values()][0] ?? "";
+}
+
 // src/legion/phase-stall.ts
 var PHASE_STALL_ENTRY = "legion-phase-stall";
 var LOCAL_ENVOY_NOTICE = { localNotice: true };
@@ -34851,8 +34896,8 @@ function restorePhaseStall(branch) {
 // src/legion/role-claim-bridge.ts
 var LEGION_ROLE_CLAIM_BRIDGE = Symbol.for("legion.pi-envoy.role-claim-bridge");
 function legionRoleClaimBridge() {
-  const store = globalThis;
-  const bridge = store[LEGION_ROLE_CLAIM_BRIDGE];
+  const store2 = globalThis;
+  const bridge = store2[LEGION_ROLE_CLAIM_BRIDGE];
   if (bridge)
     return bridge;
   const createdBridge = {
@@ -34860,7 +34905,7 @@ function legionRoleClaimBridge() {
     managedSessions: new Set,
     regained: undefined
   };
-  store[LEGION_ROLE_CLAIM_BRIDGE] = createdBridge;
+  store2[LEGION_ROLE_CLAIM_BRIDGE] = createdBridge;
   return createdBridge;
 }
 async function claimEnvoyRole(sessionID, role, context) {
@@ -34884,7 +34929,7 @@ function onEnvoyRoleRegained(listener) {
 
 // src/subagent-session.ts
 import fs from "fs";
-import path2 from "path";
+import path3 from "path";
 import * as host from "@oh-my-pi/pi-coding-agent";
 var LEGION_BOOTSTRAPPED_SESSION = Symbol.for("legion.pi-envoy.bootstrapped-session");
 var bootstrappedSessionStore = globalThis;
@@ -34895,7 +34940,7 @@ async function isSubagentSession(context) {
   await context.sessionManager.ensureOnDisk();
   const sessionFile = context.sessionManager.getSessionFile();
   if (sessionFile !== undefined && fs.existsSync(sessionFile)) {
-    return fs.existsSync(`${path2.dirname(sessionFile)}.jsonl`);
+    return fs.existsSync(`${path3.dirname(sessionFile)}.jsonl`);
   }
   const bootstrapped = bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION];
   return bootstrapped !== undefined && bootstrapped !== sessionFile;
@@ -34954,11 +34999,11 @@ function registerEnvoyMessageRenderer(pi) {
 
 // extensions/envoy-whoami-command.ts
 import { copyToClipboard } from "@oh-my-pi/pi-coding-agent";
-function registerEnvoyWhoamiCommand(api2, cachedSessionID) {
+function registerEnvoyWhoamiCommand(api2, replyAddress) {
   api2.registerCommand("whoami", {
     description: "Copy session ID",
     handler: async (_args, context) => {
-      const sessionID = context.sessionManager.getSessionId() || cachedSessionID();
+      const sessionID = await replyAddress(context, context.sessionManager.getSessionId());
       if (sessionID === "") {
         context.ui.notify("No active session", "warning");
         return;
@@ -35056,6 +35101,7 @@ function envoyExtension(pi) {
   let connection;
   let sessionDirectory = "";
   let sessionID = "";
+  let recordedSessionKey;
   let heartbeatRegistered = false;
   let claimedRoleTopic;
   let activeSessionContext;
@@ -35122,6 +35168,11 @@ function envoyExtension(pi) {
   const restoreLocalSessionState = (context) => {
     sessionDirectory = context.cwd;
     sessionID = context.sessionManager.getSessionId();
+    recordedSessionKey = recordEnvoySession({
+      previousKey: recordedSessionKey,
+      sessionFile: context.sessionManager.getSessionFile(),
+      sessionID
+    });
     activeSessionContext = context;
     const branch = context.sessionManager.getBranch?.() ?? [];
     if (askAwareness.session_id !== sessionID) {
@@ -35509,6 +35560,13 @@ function envoyExtension(pi) {
   bridge.instances.push(claimInstance);
   const isSubagentTranscript = subagentSessionCheck();
   const isSubagent = async (context) => await isSubagentTranscript(context) || isRegisteredSubagent(context);
+  const replyAddress = async (context, liveSessionID = "") => {
+    if (sessionID !== "")
+      return liveSessionID || sessionID;
+    if (!await isSubagent(context))
+      return liveSessionID;
+    return resolveEnvoySession(context.sessionManager.getSessionFile());
+  };
   pi.on("session_start", async (_event, context) => {
     if (await isSubagent(context))
       return;
@@ -35585,6 +35643,11 @@ function envoyExtension(pi) {
     const bound = bridge.instances.indexOf(claimInstance);
     if (bound !== -1)
       bridge.instances.splice(bound, 1);
+    recordedSessionKey = recordEnvoySession({
+      previousKey: recordedSessionKey,
+      sessionFile: undefined,
+      sessionID: ""
+    });
     const deadline = Promise.withResolvers();
     const timer = setTimeout(deadline.resolve, 1000);
     try {
@@ -35616,7 +35679,7 @@ function envoyExtension(pi) {
       description: spec.description,
       parameters: schemaFor(pi, spec.operation),
       lenientArgValidation: true,
-      execute: async (_id, parameters) => execute(spec.operation, parameters)
+      execute: async (_id, parameters, _signal, _onUpdate, context) => execute(spec.operation, parameters, context)
     });
   }
   if (dispatchConfig.enabled) {
@@ -35648,7 +35711,7 @@ function envoyExtension(pi) {
       });
     }
   }
-  registerEnvoyWhoamiCommand(pi, () => sessionID);
+  registerEnvoyWhoamiCommand(pi, replyAddress);
   pi.on("before_agent_start", async (event, context) => {
     const id = context.sessionManager.getSessionId();
     if (id === "" || event.prompt.trim() === "" || !context.hasUI || askEphemeral === undefined || legionManaged(id)) {
@@ -35796,7 +35859,7 @@ function envoyExtension(pi) {
     }
     announceFollow(event.details);
   });
-  async function execute(operation, rawParameters) {
+  async function execute(operation, rawParameters, context) {
     try {
       const parameters = parseEnvoyToolArguments(operation, rawParameters);
       switch (operation) {
@@ -35849,7 +35912,7 @@ Warnings: ${warnings.join("; ")}`, {
         case EnvoyToolOperation.send: {
           const targetSessionID = stringFor(parameters, "session_id");
           const result = await client.send({
-            sourceSessionID: sessionID,
+            sourceSessionID: await replyAddress(context),
             targetSessionID,
             message: stringFor(parameters, "message"),
             ...toMessageMetadata(parameters)
@@ -35862,16 +35925,21 @@ Warnings: ${warnings.join("; ")}`, {
         }
         case EnvoyToolOperation.publish: {
           const topic = stringFor(parameters, "topic");
+          const source = await replyAddress(context);
           const result = await client.publish({
-            sourceSessionID: sessionID,
+            sourceSessionID: source,
             topic,
             message: stringFor(parameters, "message"),
             ...toMessageMetadata(parameters)
           });
-          return toolSuccess(result.holder === undefined ? `published ${result.envelope.event_id}` : `published ${result.envelope.event_id}; holder ${result.holder}`, {
+          const undelivered = source !== "" && result.holder === source && await isSubagent(context);
+          const published = result.holder === undefined ? `published ${result.envelope.event_id}` : `published ${result.envelope.event_id}; holder ${result.holder}`;
+          return toolSuccess(undelivered ? `${published}
+Not delivered: that holder is the session this subagent sends as, and the listener drops a message whose source session is its recipient, so the agent that spawned you did not receive it. Reach it over hub instead.` : published, {
             event_id: result.envelope.event_id,
             topic,
-            ...result.holder === undefined ? {} : { holder: result.holder }
+            ...result.holder === undefined ? {} : { holder: result.holder },
+            ...undelivered ? { undelivered_echo: true } : {}
           });
         }
         case EnvoyToolOperation.setRole: {
@@ -35884,9 +35952,21 @@ Warnings: ${warnings.join("; ")}`, {
           return toolSuccess(JSON.stringify(role, null, 2), role);
         }
         case EnvoyToolOperation.whoami: {
-          return toolSuccess(JSON.stringify({ session_id: sessionID, machine_id: machineID(), dir: sessionDirectory }, null, 2), {
-            sessionID,
-            topics: [...subscriptions.keys()]
+          const inSubagent = await isSubagent(context);
+          const address = await replyAddress(context);
+          const subagent = inSubagent ? {
+            session_id: context.sessionManager.getSessionId(),
+            note: address === "" ? "This session is a task subagent and registers no Envoy session of its own, and this process records no top-level session its transcript traces back to, so it has no reply address at all: say who you are in the message body, and reach the agent that spawned you over hub." : "This session is a task subagent and registers no Envoy session of its own; a reply to session_id reaches the agent that spawned it, which relays over hub. Your own envoy_publish never reaches that agent \u2014 use hub for that hop."
+          } : undefined;
+          return toolSuccess(JSON.stringify({
+            session_id: address,
+            machine_id: machineID(),
+            dir: sessionDirectory || context.cwd,
+            ...subagent === undefined ? {} : { subagent }
+          }, null, 2), {
+            sessionID: address,
+            topics: [...subscriptions.keys()],
+            ...subagent === undefined ? {} : { subagent }
           });
         }
         case EnvoyToolOperation.listSessions: {

package/dist/legion.js

@@ -16142,7 +16142,7 @@ import { logger } from "@oh-my-pi/pi-utils";
 // package.json
 var package_default = {
   name: "@sjawhar/pi-legion-envoy",
-  version: "5.4.1",
+  version: "5.4.2",
   type: "module",
   omp: {
     extensions: [

package/dist/skills/envoy/SKILL.md

@@ -106,6 +106,25 @@ envoy_send(
 )
 ```
 
+### Your own address, and a subagent's
+
+`envoy_whoami`'s `session_id` is the address a reply to you reaches. Inside a `task` subagent it
+is the session that spawned you: a subagent registers no Envoy session of its own, so a peer
+answering it reaches that session, which relays to you over hub. The `subagent` field in that
+output carries your own host session id — it is not an address, so never hand it to a peer.
+
+`session_id` is empty when nothing can be reached: a process that took no Envoy identity, or a
+subagent whose spawning session this process can no longer place (it forked away, and other
+top-level sessions are running). Then your messages carry no sender either, so say who you are
+in the message body. An empty address is deliberate — being handed an unrelated live session
+would send your peers to an agent that never spawned you.
+
+Your own `envoy_publish` never reaches the agent that spawned you. The listener delivers nothing
+to the session a message names as its source, and inside a subagent that source is your parent,
+so a publish to a role it holds — or to any topic it subscribes to — is accepted and delivered to
+nobody. Use hub for that one hop. `envoy_send` to any other session, including a reply, is
+unaffected.
+
 ### Delivery capabilities
 
 Each session row from `envoy_sessions` carries `capabilities`, the targeted-delivery modes that

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjawhar/pi-legion-envoy",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "type": "module",
   "omp": {
     "extensions": [