@sjawhar/pi-legion-envoy 1.33.0 → 1.35.0

package/dist/envoy.js

@@ -29649,6 +29649,7 @@ function date4(params) {
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/classic/external.js
 config(en_default());
 // ../contracts/src/dispatch-api.ts
+var DELIVERY_CAPABILITIES = ["aside", "btw", "steer"];
 function searchOwnerOf(result) {
   return result.owner ?? { kind: "issue", key: result.issue.key };
 }
@@ -29731,6 +29732,8 @@ var CommentEventPayloadSchema = object({
   ask_id: string2().nullish(),
   ask_question: string2().optional(),
   ask_state: _enum2(["open", "answered", "resolved"]).optional(),
+  ask_waiting_on: _enum2(["human", "agent"]).optional(),
+  turn: _enum2(["human", "agent"]).nullish(),
   anchor: object({ block_id: string2().nullable().optional(), quote: string2().optional() }).nullish(),
   suggestion: object({ replace_with: string2().optional() }).nullish(),
   author: object({ kind: string2(), id: string2() }).optional(),
@@ -29757,7 +29760,7 @@ var DispatchTargetedMessagePayloadSchema = MessageEventPayloadSchema.extend({
 var MessageDeliveryEventPayloadSchema = object({
   message_id: string2().optional(),
   attempt: number2().int().positive().optional(),
-  delivery: _enum2(["btw", "aside", "steer"]).optional(),
+  delivery: _enum2(DELIVERY_CAPABILITIES).optional(),
   session_id: string2().optional(),
   target: string2().optional(),
   title: string2().optional(),
@@ -29848,6 +29851,16 @@ function documentOwnerValidation(requireArtifact, alwaysRequireArtifact = false)
     message: alwaysRequireArtifact ? "Exactly one of issue and project is required; artifact or ref must name the document." : "Exactly one of issue and project is required; with project, artifact names the document."
   };
 }
+var commentValidation = (() => {
+  const owner = documentOwnerValidation(true);
+  return {
+    check: (value) => {
+      const input = value;
+      return owner.check(value) && (input.turn === undefined || typeof input.reply_to_ask === "string");
+    },
+    message: `${owner.message} turn requires reply_to_ask.`
+  };
+})();
 var SPEC_SECTIONS = [
   "Summary",
   "Decisions needed",
@@ -29943,9 +29956,10 @@ var dispatchToolSpecs = [
       occurrence: z.number({ int: true, min: 0 }).describe("Optional zero-based occurrence of quote.").optional(),
       body: z.string({ max: 2000 }).describe("Review comment, at most 2,000 characters."),
       reply_to: z.string().describe("Full id of a comment to reply to; replying to any comment in a thread continues that " + "thread (an ask's clarification thread included).").optional(),
-      reply_to_ask: z.string().describe("Optional ask id to reply to, threading this comment under that question. Mutually " + "exclusive with reply_to.").optional()
+      reply_to_ask: z.string().describe("Optional ask id to reply to, threading this comment under that question. Mutually " + "exclusive with reply_to.").optional(),
+      turn: z.enum(["agent", "human"]).describe("Only with reply_to_ask: who holds the turn after this reply. agent: a progress note - " + "you keep the turn and the ask stays 'Waiting on agents' for the human; human (default): " + "you need the human to act - the ask returns to 'Waiting on you'.").optional()
     }),
-    validation: documentOwnerValidation(true)
+    validation: commentValidation
   },
   {
     name: "dispatch_suggest",
@@ -30334,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),
@@ -30342,7 +30356,11 @@ var LegionDaemonApi = {
     })
   },
   ControllerReady: {
-    request: strictObject({ secret: nonEmptyString, sessionId: nonEmptyString }),
+    request: strictObject({
+      secret: nonEmptyString,
+      sessionId: nonEmptyString,
+      ompSessionFile: nonEmptyString.optional()
+    }),
     response: object({})
   },
   ProcessStarted: {
@@ -30462,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
@@ -31103,7 +31127,7 @@ var TolerantInboundEnvelopeSchema = object({
 }).passthrough();
 var DispatchDeliveryRequestSchema = object({
   attempt: number2().int().positive(),
-  mode: _enum2(["btw", "aside", "steer"])
+  mode: _enum2(DELIVERY_CAPABILITIES)
 });
 var DispatchTargetedFrameSchema = object({
   event: DispatchEventSchema,
@@ -32595,21 +32619,34 @@ async function executeDispatchTool(input) {
       if (replyTo !== undefined && replyToAsk !== undefined) {
         throw new Error("reply_to and reply_to_ask cannot both be set");
       }
+      const requestedTurn = optionalString(args, "turn");
+      if (requestedTurn !== undefined && replyToAsk === undefined) {
+        throw new Error("turn requires reply_to_ask");
+      }
+      if (requestedTurn !== undefined && requestedTurn !== "agent" && requestedTurn !== "human") {
+        throw new Error("turn must be agent or human");
+      }
       const commentInput = {
         body: stringArg(args, "body"),
         ...anchored === undefined ? {} : { anchor: anchored },
         ...replyTo === undefined ? {} : { reply_to: replyTo },
         ...replyToAsk === undefined ? {} : { ask_id: replyToAsk },
+        ...requestedTurn === undefined ? {} : { turn: requestedTurn },
         actor
       };
       const comment = resolved?.owner.kind === "project" ? await client.artifactComment(resolved.artifact.id, commentInput) : await client.comment(issue(), commentInput);
+      const askState = comment.turn === null ? "" : ` (ask now waiting on ${comment.turn})`;
       return {
-        text: `Posted comment ${comment.id}`,
+        text: `Posted comment ${comment.id}${askState}`,
         details: resolved === undefined ? {
           issue: comment.issue_key,
           topic: dispatchIssueSubject(issue(), ">"),
-          comment: comment.id
-        } : writeResultDetails(resolved, { comment: comment.id })
+          comment: comment.id,
+          ...comment.turn === null ? {} : { ask_waiting_on: comment.turn }
+        } : writeResultDetails(resolved, {
+          comment: comment.id,
+          ...comment.turn === null ? {} : { ask_waiting_on: comment.turn }
+        })
       };
     }
     case "dispatch_suggest": {
@@ -33226,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 };
@@ -33290,6 +33352,8 @@ async function copySessionID(copyToClipboard, sessionID) {
 // extensions/envoy.ts
 var codec2 = import_nats.StringCodec();
 var NATS_RETRY_INTERVAL_MS = 15000;
+var ALL_CAPABILITIES = DELIVERY_CAPABILITIES;
+var CAPABILITIES_WITHOUT_BTW = DELIVERY_CAPABILITIES.filter((capability) => capability !== "btw");
 var ROLE_CLAIM_ENTRY = "envoy-role-claim";
 var OPEN_ASKS_TIMEOUT_MS = 3000;
 function isRoleClaimEntry(entry) {
@@ -33305,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 = [
@@ -33548,7 +33593,7 @@ function envoyExtension(pi) {
     topics: [...new Set([agentSubject(sessionID), ...subscriptions.keys()])],
     port: 0,
     title: activeSessionContext?.sessionManager.getSessionName?.() ?? "",
-    capabilities: typeof pi.askEphemeral === "function" ? ["aside", "btw"] : ["aside"],
+    capabilities: typeof pi.askEphemeral === "function" ? ALL_CAPABILITIES : CAPABILITIES_WITHOUT_BTW,
     driving: false,
     selfSubscribed: true
   });
@@ -33759,8 +33804,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);
@@ -33829,6 +33877,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 {
@@ -34097,7 +34148,5 @@ function topicsFor(parameters, fallback = []) {
   return expandSubscriptionTopics(value);
 }
 export {
-  claimEnvoyRole,
-  envoyExtension as default,
-  onEnvoyRoleRegained
+  envoyExtension as default
 };