@sjawhar/pi-legion-envoy 1.59.0 → 1.59.1

package/dist/envoy.js

@@ -34632,6 +34632,40 @@ function onEnvoyRoleRegained(listener) {
   legionRoleClaimBridge().regained = listener;
 }
 
+// src/subagent-session.ts
+import fs from "fs";
+import path2 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;
+function recordBootstrappedSession(sessionFile) {
+  bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION] = sessionFile;
+}
+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`);
+  }
+  const bootstrapped = bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION];
+  return bootstrapped !== undefined && bootstrapped !== sessionFile;
+}
+function isRegisteredSubagent(context) {
+  const registry = host.AgentRegistry?.global();
+  if (registry === undefined)
+    return false;
+  const sessionID = context.sessionManager.getSessionId();
+  const sessionFile = context.sessionManager.getSessionFile();
+  return registry.list().some((ref) => ref.kind !== "main" && (ref.session === null ? sessionFile !== undefined && ref.sessionFile === sessionFile : ref.session.sessionManager.getSessionId() === sessionID));
+}
+function subagentSessionCheck() {
+  let subagentSession;
+  return (context) => {
+    subagentSession ??= isSubagentSession(context);
+    return subagentSession;
+  };
+}
+
 // src/tool-result.ts
 function toolSuccess(text, details = {}) {
   return { content: [{ type: "text", text }], details };
@@ -35133,7 +35167,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);
   pi.on("session_start", async (_event, context) => {
+    if (await isSubagent(context))
+      return;
     const previousSessionID = sessionID;
     restoreLocalSessionState(context);
     if (dispatchConfig.error !== null) {
@@ -35169,6 +35207,8 @@ function envoyExtension(pi) {
     }
   });
   const rebind = async (reason, context) => {
+    if (await isSubagent(context))
+      return;
     const previousID = sessionID;
     restoreLocalSessionState(context);
     if (defaults.natsUrls.length === 0)

package/dist/legion.js

@@ -16113,8 +16113,7 @@ var require_mod4 = __commonJS(function(exports) {
 
 // extensions/legion.ts
 import { randomUUID as randomUUID3 } from "crypto";
-import fs from "fs";
-import path3 from "path";
+import path4 from "path";
 
 // ../envoy-client/src/defaults.ts
 var DEFAULT_ENVOY_URL = "http://127.0.0.1:9020";
@@ -16145,7 +16144,7 @@ import { logger } from "@oh-my-pi/pi-utils";
 // package.json
 var package_default = {
   name: "@sjawhar/pi-legion-envoy",
-  version: "1.59.0",
+  version: "1.59.1",
   type: "module",
   omp: {
     extensions: [
@@ -30702,6 +30701,40 @@ function createLegionTool(deps) {
   };
 }
 
+// src/subagent-session.ts
+import fs from "fs";
+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;
+function recordBootstrappedSession(sessionFile) {
+  bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION] = sessionFile;
+}
+async function isSubagentSession(context) {
+  await context.sessionManager.ensureOnDisk();
+  const sessionFile = context.sessionManager.getSessionFile();
+  if (sessionFile !== undefined && fs.existsSync(sessionFile)) {
+    return fs.existsSync(`${path3.dirname(sessionFile)}.jsonl`);
+  }
+  const bootstrapped = bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION];
+  return bootstrapped !== undefined && bootstrapped !== sessionFile;
+}
+function isRegisteredSubagent(context) {
+  const registry = host.AgentRegistry?.global();
+  if (registry === undefined)
+    return false;
+  const sessionID = context.sessionManager.getSessionId();
+  const sessionFile = context.sessionManager.getSessionFile();
+  return registry.list().some((ref) => ref.kind !== "main" && (ref.session === null ? sessionFile !== undefined && ref.sessionFile === sessionFile : ref.session.sessionManager.getSessionId() === sessionID));
+}
+function subagentSessionCheck() {
+  let subagentSession;
+  return (context) => {
+    subagentSession ??= isSubagentSession(context);
+    return subagentSession;
+  };
+}
+
 // extensions/legion.ts
 var exitProcess = (code) => process.exit(code);
 function setLegionBootstrapExitForTests(hook) {
@@ -30767,29 +30800,11 @@ async function persistedTranscript(context) {
   if (!sessionFile?.endsWith(".jsonl")) {
     throw new Error("Legion session must have a persisted transcript");
   }
-  const agentId = path3.basename(sessionFile, ".jsonl");
+  const agentId = path4.basename(sessionFile, ".jsonl");
   if (!agentId)
     throw new Error("Legion session transcript has no agent id");
   return { sessionFile, agentId };
 }
-var LEGION_BOOTSTRAPPED_SESSION = Symbol.for("legion.pi-envoy.bootstrapped-session");
-var bootstrappedSessionStore = globalThis;
-function recordBootstrappedSession(sessionFile) {
-  bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION] = sessionFile;
-}
-function resetLegionBootstrappedSessionForTests() {
-  delete bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION];
-}
-async function isSubagentSession(context) {
-  await context.sessionManager.ensureOnDisk();
-  const sessionFile = context.sessionManager.getSessionFile();
-  if (sessionFile === undefined)
-    return false;
-  const bootstrapped = bootstrappedSessionStore[LEGION_BOOTSTRAPPED_SESSION];
-  if (bootstrapped !== undefined && bootstrapped !== sessionFile)
-    return true;
-  return fs.existsSync(`${path3.dirname(sessionFile)}.jsonl`);
-}
 function isSingleLegionCommand(command) {
   if (typeof command !== "string")
     return false;
@@ -30937,11 +30952,7 @@ function legionExtension(pi) {
   const controlCodec = import_nats.StringCodec();
   let capability;
   let bootstrap;
-  let subagentSession;
-  const checkSubagentSession = (context) => {
-    subagentSession ??= isSubagentSession(context);
-    return subagentSession;
-  };
+  const checkSubagentSession = subagentSessionCheck();
   let phaseWorkerPane;
   let daemonClient;
   const roleDaemon = () => {
@@ -31305,6 +31316,5 @@ function legionExtension(pi) {
 }
 export {
   legionExtension as default,
-  resetLegionBootstrappedSessionForTests,
   setLegionBootstrapExitForTests
 };

package/package.json

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