@sjawhar/pi-legion-envoy 0.6.0 → 0.7.0

package/dist/envoy.js

@@ -20829,11 +20829,25 @@ function superRefine(fn) {
 }
 // ../../node_modules/.bun/zod@4.3.6/node_modules/zod/v4/classic/external.js
 config(en_default());
+// ../contracts/src/dispatch-question.ts
+var DispatchQuestionOptionSchema = strictObject({
+  label: string2().min(1),
+  description: string2().optional()
+});
+var DispatchQuestionSchema = strictObject({
+  askId: string2().optional(),
+  question: string2().min(1),
+  header: string2().optional(),
+  options: array(DispatchQuestionOptionSchema).optional(),
+  multiple: boolean2().optional(),
+  custom: boolean2().optional()
+});
+var DispatchQuestionInputSchema = DispatchQuestionSchema.omit({ askId: true });
 // ../contracts/src/envelope.ts
 var isSubject = (value) => typeof value === "string" && value.length > 0;
 var EnvelopeSchema = object({
   event_id: string2().min(1),
-  source: _enum(["agent", "envoy", "github", "slack", "whatsapp", "ghostwispr"]),
+  source: _enum(["agent", "human", "envoy", "github", "slack", "whatsapp", "ghostwispr"]),
   source_event_id: string2().min(1),
   source_session: string2().optional(),
   topic: custom(isSubject, { message: "topic must be a non-empty subject" }),
@@ -21143,25 +21157,13 @@ var DISPATCH_ARGUMENTS = {
   repo: "owner/name. Opening a thread only; defaults to the working directory's GitHub repo.",
   parent: "<n> | owner/name#<n>[#<commentId>]. Opening a thread only: link the thread as a sub-issue of an existing issue and append a breadcrumb to the comment."
 };
-
 class DispatchArgumentError extends Error {
   name = "DispatchArgumentError";
 }
-var QuestionOptionSchema = strictObject({
-  label: string2().min(1),
-  description: string2().optional()
-});
-var DispatchQuestionSchema = strictObject({
-  question: string2().min(1),
-  header: string2().optional(),
-  options: array(QuestionOptionSchema).optional(),
-  multiple: boolean2().optional(),
-  custom: boolean2().optional()
-});
 var prose = {
   context: string2(),
   question: string2(),
-  ask: array(DispatchQuestionSchema).optional()
+  ask: array(DispatchQuestionInputSchema).optional()
 };
 var OpenThreadCallSchema = strictObject({
   subject: string2(),
@@ -21176,7 +21178,7 @@ var dispatchToolShape = {
   thread: string2().describe(DISPATCH_ARGUMENTS.thread).optional(),
   context: string2().describe(DISPATCH_ARGUMENTS.context),
   question: string2().describe(DISPATCH_ARGUMENTS.question),
-  ask: array(DispatchQuestionSchema).describe(DISPATCH_ARGUMENTS.ask).optional(),
+  ask: array(DispatchQuestionInputSchema).describe(DISPATCH_ARGUMENTS.ask).optional(),
   urgency: _enum(DISPATCH_URGENCIES).describe(DISPATCH_ARGUMENTS.urgency).optional(),
   repo: string2().describe(DISPATCH_ARGUMENTS.repo).optional(),
   parent: string2().describe(DISPATCH_ARGUMENTS.parent).optional()
@@ -21284,7 +21286,7 @@ async function resolveOrigin(env, exec, cwd) {
     cwd,
     machine: machineID()
   };
-  const pane = env["TMUX_PANE"];
+  const pane = env.TMUX_PANE;
   if (pane) {
     const output = await tryExec(exec, "tmux", ["display-message", "-p", "-t", pane, "#S:#I.#P #{pane_id}"], cwd);
     const [target, paneId] = output?.trim().split(" ") ?? [];
@@ -21478,10 +21480,10 @@ function readEnvoyFile(filePath) {
   return { kind: "valid", settings: parsed.data.dispatch ?? null };
 }
 function resolveDispatchConfig(env, options = {}) {
-  const explicit = env["DISPATCH_MCP_URL"];
+  const explicit = env.DISPATCH_MCP_URL;
   if (explicit)
     return { url: explicit, error: null };
-  const home = options.home ?? env["HOME"] ?? homedir();
+  const home = options.home ?? env.HOME ?? homedir();
   const cwd = options.cwd ?? process.cwd();
   const userFile = readEnvoyFile(path.join(home, ".config", "opencode", "envoy.json"));
   const repoFile = readEnvoyFile(path.join(cwd, ".opencode", "envoy.json"));
@@ -21521,6 +21523,26 @@ function dispatchSubscriptionTopic(tool, output) {
   return dispatchThreadTopic(owner, repo, thread);
 }
 
+// ../envoy-client/src/delivery.ts
+function senderLabel(envelope) {
+  return envelope.source_session ?? envelope.source;
+}
+function replyWith(envelope) {
+  if (envelope.source !== "agent" || envelope.source_session === undefined)
+    return;
+  return `envoy_send(session_id="${envelope.source_session}", message="...")`;
+}
+function isOwnDispatchEcho(envelope, sessionID) {
+  if (envelope.source !== "github" || envelope.payload === undefined)
+    return false;
+  try {
+    const payload = JSON.parse(envelope.payload);
+    return typeof payload === "object" && payload !== null && "dispatch_session" in payload && payload.dispatch_session === sessionID;
+  } catch {
+    return false;
+  }
+}
+
 // ../envoy-client/src/tool-contract.ts
 var EnvoyToolOperation = {
   subscribe: "subscribe",
@@ -21663,18 +21685,23 @@ function createEnvoyClient(config) {
     },
     getInterest: async (sessionID) => InterestWireSchema.parse(JSON.parse(await request(`/v1/interests/${sessionID}`, {}))),
     send: async (input) => toEnvelope(await post("/v1/messages/send", {
-      source_session: input.sourceSessionID,
+      source: input.source ?? "agent",
+      ...input.sourceSessionID === undefined ? {} : { source_session: input.sourceSessionID },
       target_session: input.targetSessionID,
       message: input.message,
       ...input.idempotencyKey === undefined ? {} : { idempotency_key: input.idempotencyKey }
     })),
     publish: async (input) => toEnvelope(await post("/v1/messages/publish", {
-      source_session: input.sourceSessionID,
+      source: input.source ?? "agent",
+      ...input.sourceSessionID === undefined ? {} : { source_session: input.sourceSessionID },
       topic: input.topic,
       message: input.message,
       ...input.payload === undefined ? {} : { payload: input.payload },
       ...input.idempotencyKey === undefined ? {} : { idempotency_key: input.idempotencyKey }
     })),
+    unregisterSession: async (sessionID) => {
+      await request(`/v1/sessions/${encodeURIComponent(sessionID)}`, { method: "DELETE" });
+    },
     setRole: async (input) => InterestWireSchema.parse(JSON.parse(await post("/v1/roles/set", { session_id: input.sessionID, role: input.role }))),
     listSessions: async () => SessionWireSchema.array().parse(JSON.parse(await request("/v1/sessions", {})))
   };
@@ -22312,6 +22339,7 @@ function envoyExtension(pi) {
   const deliver = async (subject, raw, reply) => {
     let content = "";
     let duplicate = false;
+    let dispatchEcho = false;
     try {
       const envelope = EnvelopeSchema.parse(JSON.parse(raw));
       duplicate = dedupeKeys.has(envelope.dedupe_key);
@@ -22322,6 +22350,7 @@ function envoyExtension(pi) {
           if (!oldest.done)
             dedupeKeys.delete(oldest.value);
         }
+        dispatchEcho = isOwnDispatchEcho(envelope, sessionID);
         let message;
         if (envelope.payload !== undefined) {
           try {
@@ -22330,26 +22359,26 @@ function envoyExtension(pi) {
             message = envelope.payload;
           }
         }
-        const echo = envelope.source_session !== undefined && envelope.source_session === sessionID;
-        content = encode2({
-          envoy: {
-            topic: envelope.topic,
-            from: envelope.source,
-            ...echo ? {
-              echo: `your own message, sent by this session (${sessionID}) \u2014 not an incoming reply`
-            } : envelope.source_session === undefined ? {} : {
-              reply_to: envelope.source_session,
-              reply_with: `envoy_send(session_id="${envelope.source_session}", message="...")`
-            },
-            summary: envelope.payload_summary,
-            ...message === undefined ? {} : { message }
-          }
-        });
+        if (!dispatchEcho) {
+          const reply = replyWith(envelope);
+          const echo = envelope.source_session !== undefined && envelope.source_session === sessionID;
+          content = encode2({
+            envoy: {
+              topic: envelope.topic,
+              from: senderLabel(envelope),
+              ...echo ? {
+                echo: `your own message, sent by this session (${sessionID}) \u2014 not an incoming reply`
+              } : reply === undefined ? {} : { reply_with: reply },
+              summary: envelope.payload_summary,
+              ...message === undefined ? {} : { message }
+            }
+          });
+        }
       }
     } catch {
       content = encode2({ envoy: { topic: subject, message: raw } });
     }
-    if (!duplicate) {
+    if (!duplicate && !dispatchEcho) {
       pi.sendMessage({ customType: "envoy-message", content, display: true }, { deliverAs: "steer", triggerTurn: true });
     }
     if (reply !== "" && subject === agentSubject(sessionID)) {
@@ -22420,17 +22449,16 @@ function envoyExtension(pi) {
       selfSubscribed: true
     });
   };
-  const registrationRequired = () => process.env.ENVOY_REGISTER_SESSION === "1" || claimedRoleTopic !== undefined;
   const ensureHeartbeat = (context) => {
     if (heartbeatRegistered)
       return;
     let heartbeatOutageNotified = false;
     let healing = false;
     context.setInterval(() => {
-      if (!registrationRequired())
-        return;
       const liveSessionID = context.sessionManager.getSessionId();
-      const drifted = liveSessionID !== "" && liveSessionID !== sessionID;
+      if (liveSessionID === "")
+        return;
+      const drifted = liveSessionID !== sessionID;
       if (healing)
         return;
       healing = true;
@@ -22464,6 +22492,12 @@ function envoyExtension(pi) {
     sessionDirectory = context.cwd;
     sessionID = context.sessionManager.getSessionId();
     activeSessionContext = context;
+    if (sessionID === "") {
+      if (previousTopic !== undefined)
+        closeIntentionally(previousTopic);
+      ensureHeartbeat(context);
+      return;
+    }
     const currentTopic = agentSubject(sessionID);
     if (previousTopic !== undefined && previousTopic !== currentTopic) {
       closeIntentionally(previousTopic);
@@ -22473,10 +22507,8 @@ function envoyExtension(pi) {
     if ((context.sessionManager.getBranch?.() ?? []).length > 0) {
       await recoverRegisteredInterests();
     }
-    if (registrationRequired()) {
-      await registerSession();
-      ensureHeartbeat(context);
-    }
+    await registerSession();
+    ensureHeartbeat(context);
   };
   const setEnvoyRole = async (role) => {
     const topic = ROLE_TOPIC_PREFIX + role;
@@ -22566,11 +22598,23 @@ function envoyExtension(pi) {
   pi.on("session_tree", (_event, context) => rebind(undefined, context));
   pi.on("session_shutdown", async () => {
     shuttingDown = true;
+    const deadline = Promise.withResolvers();
+    const timer = setTimeout(deadline.resolve, 1000);
     try {
-      const drain = connection?.drain();
-      if (drain)
-        await Promise.race([drain, new Promise((resolve) => setTimeout(resolve, 1000))]);
-    } catch {} finally {
+      const deregistration = sessionID === "" ? Promise.resolve() : client.unregisterSession(sessionID).catch(() => {
+        return;
+      });
+      const draining = connection?.drain().catch(() => {
+        return;
+      }) ?? Promise.resolve();
+      await Promise.race([
+        Promise.allSettled([deregistration, draining]).then(() => {
+          return;
+        }),
+        deadline.promise
+      ]);
+    } finally {
+      clearTimeout(timer);
       connection = undefined;
       activeSessionContext = undefined;
       subscriptions.clear();

package/package.json

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