@sjawhar/pi-legion-envoy 1.34.0 → 1.35.1

package/dist/envoy.js

@@ -30348,7 +30348,7 @@ var LegionDaemonApi = {
         queue: array(nonEmptyString)
       }),
       gates: record(string2(), stateGate),
-      controllerLocator: stateLocator.optional(),
+      controllerLocator: stateTreeLocator.optional(),
       roles: record(string2(), stateRole),
       controllerPendingNotices: number2().int().nonnegative(),
       pendingStatusWrites: array(nonEmptyString),
@@ -30356,7 +30356,11 @@ var LegionDaemonApi = {
     })
   },
   ControllerReady: {
-    request: strictObject({ secret: nonEmptyString, sessionId: nonEmptyString }),
+    request: strictObject({
+      secret: nonEmptyString,
+      sessionId: nonEmptyString,
+      ompSessionFile: nonEmptyString.optional()
+    }),
     response: object({})
   },
   ProcessStarted: {
@@ -30476,17 +30480,23 @@ var LegionDaemonApi = {
     response: object({})
   },
   Grant: {
-    request: strictObject({
-      tree: nonEmptyString,
-      issue: nonEmptyString,
-      sessionId: nonEmptyString,
-      secret: nonEmptyString
-    }),
+    request: union([
+      strictObject({
+        sessionId: nonEmptyString,
+        secret: nonEmptyString,
+        tree: nonEmptyString,
+        issue: nonEmptyString
+      }),
+      strictObject({ sessionId: nonEmptyString, secret: nonEmptyString })
+    ]),
     response: object({ grantId: nonEmptyString, expiresAt: nonEmptyString })
   },
   GitHubToken: {
-    request: strictObject({ grantId: nonEmptyString }),
+    request: strictObject({ grantId: nonEmptyString, merge: literal(true).optional() }),
     response: object({ token: nonEmptyString, appLogin: string2().endsWith("[bot]") })
+  },
+  GitCredential: {
+    request: strictObject({ grantId: nonEmptyString })
   }
 };
 // ../contracts/src/repo.ts
@@ -33253,6 +33263,31 @@ function messageMetadata(input) {
 import { logger } from "@oh-my-pi/pi-utils";
 var import_nats = __toESM(require_mod4(), 1);
 
+// 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];
+  if (bridge)
+    return bridge;
+  const createdBridge = {
+    instances: [],
+    regained: undefined
+  };
+  store[LEGION_ROLE_CLAIM_BRIDGE] = createdBridge;
+  return createdBridge;
+}
+async function claimEnvoyRole(sessionID, role, context) {
+  const bridge = legionRoleClaimBridge();
+  const instance = bridge.instances.findLast((candidate) => candidate.sessionID() === sessionID) ?? bridge.instances.at(-1);
+  if (instance === undefined)
+    throw new Error("Envoy has no bound instance for a role claim");
+  await instance.claim(sessionID, role, context);
+}
+function onEnvoyRoleRegained(listener) {
+  legionRoleClaimBridge().regained = listener;
+}
+
 // src/tool-result.ts
 function toolSuccess(text, details = {}) {
   return { content: [{ type: "text", text }], details };
@@ -33334,25 +33369,6 @@ function isRoleClaimEntry(entry) {
     return false;
   return entry.data.role === null || typeof entry.data.role === "string";
 }
-var LEGION_ROLE_CLAIM_BRIDGE = Symbol.for("legion.pi-envoy.role-claim-bridge");
-function legionRoleClaimBridge() {
-  const store = globalThis;
-  let bridge = store[LEGION_ROLE_CLAIM_BRIDGE];
-  if (bridge === undefined) {
-    const ready = Promise.withResolvers();
-    bridge = { ready };
-    store[LEGION_ROLE_CLAIM_BRIDGE] = bridge;
-  }
-  return bridge;
-}
-async function claimEnvoyRole(sessionID, role, context) {
-  const bridge = legionRoleClaimBridge();
-  const claim = bridge.claim ?? await bridge.ready.promise;
-  await claim(sessionID, role, context);
-}
-function onEnvoyRoleRegained(listener) {
-  legionRoleClaimBridge().regained = listener;
-}
 function resolveSkillsDirectory() {
   const moduleDirectory = dirname(fileURLToPath(import.meta.url));
   const candidates = [
@@ -33450,7 +33466,9 @@ function envoyExtension(pi) {
   };
   const deliver = async (subject, raw, reply) => {
     const rendered = renderInbound(raw, sessionID, subject);
-    if (reply !== "" && subject === agentSubject(sessionID)) {
+    const directSubject = agentSubject(sessionID);
+    const envelopeTopic = rendered.envelope?.topic;
+    if (reply !== "" && subject === directSubject && envelopeTopic !== undefined && envelopeTopic !== directSubject) {
       try {
         (await ensureConnection()).publish(reply);
       } catch (error) {
@@ -33788,8 +33806,11 @@ function envoyExtension(pi) {
     await registerSession();
     await setEnvoyRole(role);
   };
-  bridge.claim = claim;
-  bridge.ready.resolve(claim);
+  const claimInstance = {
+    claim,
+    sessionID: () => activeSessionContext?.sessionManager.getSessionId() ?? sessionID
+  };
+  bridge.instances.push(claimInstance);
   pi.on("session_start", async (_event, context) => {
     const previousSessionID = sessionID;
     restoreLocalSessionState(context);
@@ -33858,6 +33879,9 @@ function envoyExtension(pi) {
   pi.on("session_tree", (_event, context) => rebind(undefined, context));
   pi.on("session_shutdown", async () => {
     shuttingDown = true;
+    const bound = bridge.instances.indexOf(claimInstance);
+    if (bound !== -1)
+      bridge.instances.splice(bound, 1);
     const deadline = Promise.withResolvers();
     const timer = setTimeout(deadline.resolve, 1000);
     try {
@@ -34126,7 +34150,5 @@ function topicsFor(parameters, fallback = []) {
   return expandSubscriptionTopics(value);
 }
 export {
-  claimEnvoyRole,
-  envoyExtension as default,
-  onEnvoyRoleRegained
+  envoyExtension as default
 };