@sjawhar/pi-legion-envoy 6.0.2 → 6.0.4

package/dist/envoy.js

@@ -35463,7 +35463,7 @@ function sourceSession(sessionID) {
 }
 
 // extensions/envoy.ts
-import { logger } from "@oh-my-pi/pi-utils";
+import { logger as logger2 } from "@oh-my-pi/pi-utils";
 var import_nats2 = __toESM(require_mod4(), 1);
 
 // src/agent-stream.ts
@@ -35941,33 +35941,56 @@ function sideTurn(pi, context) {
 import fs from "fs";
 import path3 from "path";
 import * as host from "@oh-my-pi/pi-coding-agent";
+import { logger } from "@oh-my-pi/pi-utils";
 var LEGION_BOOTSTRAPPED_SESSION = Symbol.for("legion.pi-envoy.bootstrapped-session");
 var bootstrappedSessionStore = globalThis;
 function recordBootstrappedSession(sessionFile) {
   bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION] = sessionFile;
 }
 async function isSubagentSession(context) {
-  await context.sessionManager.ensureOnDisk();
+  const registered = registeredSubagent(context);
+  if (registered !== undefined)
+    return { subagent: registered, settled: true };
+  try {
+    await context.sessionManager.ensureOnDisk();
+  } catch (error48) {
+    const subagent = transcriptSaysSubagent(context);
+    logger.warn("subagent check: publishing the transcript failed; answered from the transcript on disk, and the next call asks again", { sessionFile: context.sessionManager.getSessionFile(), subagent, error: messageFor(error48) });
+    return { subagent, settled: false };
+  }
+  return { subagent: transcriptSaysSubagent(context), settled: true };
+}
+function transcriptSaysSubagent(context) {
   const sessionFile = context.sessionManager.getSessionFile();
-  if (sessionFile !== undefined && fs.existsSync(sessionFile)) {
-    return fs.existsSync(`${path3.dirname(sessionFile)}.jsonl`);
+  if (sessionFile !== undefined) {
+    if (fs.existsSync(`${path3.dirname(sessionFile)}.jsonl`))
+      return true;
+    if (fs.existsSync(sessionFile))
+      return false;
   }
   const bootstrapped = bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION];
   return bootstrapped !== undefined && bootstrapped !== sessionFile;
 }
-function isRegisteredSubagent(context) {
+function registeredSubagent(context) {
   const registry2 = host.AgentRegistry?.global();
   if (registry2 === undefined)
-    return false;
+    return;
   const sessionID = context.sessionManager.getSessionId();
   const sessionFile = context.sessionManager.getSessionFile();
-  return registry2.list().some((ref) => ref.kind !== "main" && (ref.session === null ? sessionFile !== undefined && ref.sessionFile === sessionFile : ref.session.sessionManager.getSessionId() === sessionID));
+  const own = registry2.list().filter((ref) => ref.session === null ? sessionFile !== undefined && ref.sessionFile === sessionFile : ref.session.sessionManager.getSessionId() === sessionID);
+  if (own.length === 0)
+    return;
+  return own.some((ref) => ref.kind !== "main");
 }
 function subagentSessionCheck() {
-  let subagentSession;
-  return (context) => {
-    subagentSession ??= isSubagentSession(context);
-    return subagentSession;
+  let settled;
+  return async (context) => {
+    if (settled !== undefined)
+      return settled;
+    const answer = await isSubagentSession(context);
+    if (answer.settled)
+      settled = answer.subagent;
+    return answer.subagent;
   };
 }
 
@@ -36127,7 +36150,7 @@ function resolveSkillsDirectory() {
 var SKILLS_DIRECTORY = resolveSkillsDirectory();
 var DISPATCH_FIRST_CONTEXT = readDispatchFirstContext(dispatchFirstSkillFile(SKILLS_DIRECTORY));
 function envoyExtension(pi) {
-  logger.debug("extension instance loaded", { extension: import.meta.url });
+  logger2.debug("extension instance loaded", { extension: import.meta.url });
   const defaults = envoyDefaultsFromEnvironment(process.env);
   const dispatchConfig = resolveDispatchConfig(process.env, { cwd: process.cwd() });
   const currentDispatchConfig = () => {
@@ -36190,7 +36213,7 @@ function envoyExtension(pi) {
     if (selfCheckWarningSessionIDs.has(failedSessionID))
       return;
     selfCheckWarningSessionIDs.add(failedSessionID);
-    logger.warn("envoy: run-end waiting self-check failed; no reminder was sent", {
+    logger2.warn("envoy: run-end waiting self-check failed; no reminder was sent", {
       sessionID: failedSessionID,
       error: messageFor(error48)
     });
@@ -36258,7 +36281,7 @@ function envoyExtension(pi) {
     const { delivery } = rendered;
     const key = handledAttemptKey(delivery.id, delivery.attempt);
     if (handledDispatchAttempts.has(key)) {
-      logger.warn("envoy: a frame names a Dispatch attempt this session already delivered; it arrives as a card", { attempt: delivery.attempt, messageID: delivery.id });
+      logger2.warn("envoy: a frame names a Dispatch attempt this session already delivered; it arrives as a card", { attempt: delivery.attempt, messageID: delivery.id });
       return;
     }
     handledDispatchAttempts.add(key);
@@ -36272,11 +36295,11 @@ function envoyExtension(pi) {
       });
       const turn = turnFromAccept(accepted);
       if (turn === undefined) {
-        logger.warn("envoy: Dispatch accepted a direct message without the stored body and mode to inject; it arrives as a card", { attempt: delivery.attempt, messageID: delivery.id });
+        logger2.warn("envoy: Dispatch accepted a direct message without the stored body and mode to inject; it arrives as a card", { attempt: delivery.attempt, messageID: delivery.id });
       }
       return turn;
     } catch (error48) {
-      logger.warn("envoy: Dispatch did not accept a direct message as this session's turn; it arrives as a card", { attempt: delivery.attempt, messageID: delivery.id, error: messageFor(error48) });
+      logger2.warn("envoy: Dispatch did not accept a direct message as this session's turn; it arrives as a card", { attempt: delivery.attempt, messageID: delivery.id, error: messageFor(error48) });
       return;
     }
   };
@@ -36435,7 +36458,7 @@ function envoyExtension(pi) {
             continue;
           connection?.publish(reply, codec2.encode(answer));
         } catch (error48) {
-          logger.warn("envoy: agent stream control message failed", {
+          logger2.warn("envoy: agent stream control message failed", {
             error: messageFor(error48),
             sessionID: session
           });
@@ -36548,7 +36571,7 @@ function envoyExtension(pi) {
       }
       if (!result.claimed) {
         endRole();
-        logger.warn("envoy: role re-assertion refused; held by another live session", {
+        logger2.warn("envoy: role re-assertion refused; held by another live session", {
           role,
           sessionID: id,
           holder: result.holder
@@ -36556,7 +36579,7 @@ function envoyExtension(pi) {
         context.ui.notify(`envoy: role ${role} is now held by session ${result.holder}; this session no longer holds it`, "warning");
         return;
       }
-      logger.warn("envoy: role re-asserted after the listener lost the claim", {
+      logger2.warn("envoy: role re-asserted after the listener lost the claim", {
         role,
         sessionID: id,
         previousHolder: holder ?? null
@@ -36567,7 +36590,7 @@ function envoyExtension(pi) {
     if (regained === undefined)
       return;
     Promise.resolve().then(() => regained(role, reason)).catch((error48) => {
-      logger.warn("envoy: role regain hook failed", { role, reason, error: messageFor(error48) });
+      logger2.warn("envoy: role regain hook failed", { role, reason, error: messageFor(error48) });
     });
   };
   const ensureHeartbeat = (context) => {
@@ -36624,7 +36647,7 @@ function envoyExtension(pi) {
       previousSessionID: options.previousSessionID
     });
     if (!result.claimed) {
-      logger.warn("envoy: role held by another live session; not reclaimed", {
+      logger2.warn("envoy: role held by another live session; not reclaimed", {
         role,
         sessionID,
         holder: result.holder
@@ -36679,7 +36702,7 @@ function envoyExtension(pi) {
       return;
     const continued = carryPreviousSessionRole && previousSessionID !== "" && previousSessionID !== sessionID ? previousSessionID : undefined;
     await setEnvoyRole(role, { soft: true, previousSessionID: continued }).catch((error48) => {
-      logger.warn("envoy: role reclaim failed", { role, sessionID, error: messageFor(error48) });
+      logger2.warn("envoy: role reclaim failed", { role, sessionID, error: messageFor(error48) });
     });
   };
   let sessionEstablishment = Promise.resolve();
@@ -36755,12 +36778,11 @@ function envoyExtension(pi) {
     sessionID: () => activeSessionContext?.sessionManager.getSessionId() ?? sessionID
   };
   bridge.instances.push(claimInstance);
-  const isSubagentTranscript = subagentSessionCheck();
-  const isSubagent = async (context) => await isSubagentTranscript(context) || isRegisteredSubagent(context);
-  const replyAddress = async (context, liveSessionID = "") => {
+  const isSubagent = subagentSessionCheck();
+  const replyAddress = async (context, liveSessionID = "", subagent) => {
     if (sessionID !== "")
       return liveSessionID || sessionID;
-    if (!await isSubagent(context))
+    if (!(subagent ?? await isSubagent(context)))
       return liveSessionID;
     return resolveEnvoySession(context.sessionManager.getSessionFile());
   };
@@ -37125,14 +37147,15 @@ Warnings: ${warnings.join("; ")}`, {
         }
         case EnvoyToolOperation.publish: {
           const topic = stringFor(parameters, "topic");
-          const source = await replyAddress(context);
+          const inSubagent = await isSubagent(context);
+          const source = await replyAddress(context, "", inSubagent);
           const result = await client.publish({
             sourceSessionID: source,
             topic,
             message: stringFor(parameters, "message"),
             ...toMessageMetadata(parameters)
           });
-          const undelivered = source !== "" && result.holder === source && await isSubagent(context);
+          const undelivered = source !== "" && result.holder === source && inSubagent;
           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, {
@@ -37153,7 +37176,7 @@ Not delivered: that holder is the session this subagent sends as, and the listen
         }
         case EnvoyToolOperation.whoami: {
           const inSubagent = await isSubagent(context);
-          const address = await replyAddress(context);
+          const address = await replyAddress(context, "", inSubagent);
           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."

package/dist/legion.js

@@ -17744,7 +17744,7 @@ function asObject(value) {
 }
 
 // extensions/legion.ts
-import { logger } from "@oh-my-pi/pi-utils";
+import { logger as logger2 } from "@oh-my-pi/pi-utils";
 
 // src/dispatch-user-turn.ts
 function isUserTurnCandidate(rendered) {
@@ -17843,7 +17843,7 @@ function endInjectedUserTurns(sessionID) {
 // package.json
 var package_default = {
   name: "@sjawhar/pi-legion-envoy",
-  version: "6.0.2",
+  version: "6.0.4",
   type: "module",
   omp: {
     extensions: [
@@ -17891,33 +17891,56 @@ var package_default = {
 import fs from "fs";
 import path2 from "path";
 import * as host from "@oh-my-pi/pi-coding-agent";
+import { logger } from "@oh-my-pi/pi-utils";
 var LEGION_BOOTSTRAPPED_SESSION = Symbol.for("legion.pi-envoy.bootstrapped-session");
 var bootstrappedSessionStore = globalThis;
 function recordBootstrappedSession(sessionFile) {
   bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION] = sessionFile;
 }
 async function isSubagentSession(context) {
-  await context.sessionManager.ensureOnDisk();
+  const registered = registeredSubagent(context);
+  if (registered !== undefined)
+    return { subagent: registered, settled: true };
+  try {
+    await context.sessionManager.ensureOnDisk();
+  } catch (error48) {
+    const subagent = transcriptSaysSubagent(context);
+    logger.warn("subagent check: publishing the transcript failed; answered from the transcript on disk, and the next call asks again", { sessionFile: context.sessionManager.getSessionFile(), subagent, error: messageFor(error48) });
+    return { subagent, settled: false };
+  }
+  return { subagent: transcriptSaysSubagent(context), settled: true };
+}
+function transcriptSaysSubagent(context) {
   const sessionFile = context.sessionManager.getSessionFile();
-  if (sessionFile !== undefined && fs.existsSync(sessionFile)) {
-    return fs.existsSync(`${path2.dirname(sessionFile)}.jsonl`);
+  if (sessionFile !== undefined) {
+    if (fs.existsSync(`${path2.dirname(sessionFile)}.jsonl`))
+      return true;
+    if (fs.existsSync(sessionFile))
+      return false;
   }
   const bootstrapped = bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION];
   return bootstrapped !== undefined && bootstrapped !== sessionFile;
 }
-function isRegisteredSubagent(context) {
+function registeredSubagent(context) {
   const registry2 = host.AgentRegistry?.global();
   if (registry2 === undefined)
-    return false;
+    return;
   const sessionID = context.sessionManager.getSessionId();
   const sessionFile = context.sessionManager.getSessionFile();
-  return registry2.list().some((ref) => ref.kind !== "main" && (ref.session === null ? sessionFile !== undefined && ref.sessionFile === sessionFile : ref.session.sessionManager.getSessionId() === sessionID));
+  const own = registry2.list().filter((ref) => ref.session === null ? sessionFile !== undefined && ref.sessionFile === sessionFile : ref.session.sessionManager.getSessionId() === sessionID);
+  if (own.length === 0)
+    return;
+  return own.some((ref) => ref.kind !== "main");
 }
 function subagentSessionCheck() {
-  let subagentSession;
-  return (context) => {
-    subagentSession ??= isSubagentSession(context);
-    return subagentSession;
+  let settled;
+  return async (context) => {
+    if (settled !== undefined)
+      return settled;
+    const answer = await isSubagentSession(context);
+    if (answer.settled)
+      settled = answer.subagent;
+    return answer.subagent;
   };
 }
 
@@ -18504,7 +18527,7 @@ function createClaimSession(deps) {
 
 // src/legion/controller-session.ts
 function createControllerSession(deps) {
-  const { daemon, persistedTranscript, checkSubagentSession } = deps;
+  const { daemon, persistedTranscript } = deps;
   let controllerSessionID;
   let controllerCapability;
   let mintControllerGrant;
@@ -18555,8 +18578,6 @@ function createControllerSession(deps) {
     }
   };
   const reclaimAfterSessionChange = async (context) => {
-    if (await checkSubagentSession(context))
-      return;
     if (classifySession(process.env).kind !== "controller")
       return;
     if (context.sessionManager.getSessionId() === controllerSessionID && context.sessionManager.getSessionFile() === controllerTranscript) {
@@ -19225,7 +19246,7 @@ function isToolDeviceInvocation(toolCall) {
 }
 function legionExtension(pi) {
   const instance = randomUUID2().slice(0, 8);
-  logger.debug("extension instance loaded", { extension: import.meta.url, instance });
+  logger2.debug("extension instance loaded", { extension: import.meta.url, instance });
   globalThis[LEGION_LOADED_MARKER] = import.meta.url;
   const checkSubagentSession = subagentSessionCheck();
   let paneRules;
@@ -19254,8 +19275,7 @@ function legionExtension(pi) {
   });
   const controllerSession = createControllerSession({
     daemon: roleDaemon,
-    persistedTranscript,
-    checkSubagentSession
+    persistedTranscript
   });
   const titleSession = async (context) => {
     const title = legionSessionTitle(classifySession(process.env), process.env.LEGION_PROJECT);
@@ -19279,16 +19299,17 @@ function legionExtension(pi) {
     await activateLegionTool();
   });
   const afterSessionChange = async (context) => {
-    if (classifySession(process.env).kind === "controller" && !await checkSubagentSession(context)) {
+    if (await checkSubagentSession(context))
+      return;
+    if (classifySession(process.env).kind === "controller")
       await titleSession(context);
-    }
     await controllerSession.reclaimAfterSessionChange(context);
   };
   pi.on("session_switch", (_event, context) => afterSessionChange(context));
   pi.on("session_branch", (_event, context) => afterSessionChange(context));
   pi.on("session_tree", (_event, context) => afterSessionChange(context));
   pi.on("tool_call", async (toolCall, context) => {
-    logger.debug("legion tool_call hook", {
+    logger2.debug("legion tool_call hook", {
       instance,
       toolCallId: toolCall.toolCallId,
       toolName: toolCall.toolName

package/package.json

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