@sjawhar/opencode-legion-envoy 9.7.0 → 9.8.0

package/dist/dispatch.js

@@ -14663,7 +14663,7 @@ var dispatchToolSpecs = [
   {
     name: "dispatch_doc_read",
     example: { issue: "DSP-1" },
-    description: "Read a live document or a named document version, or the text of an uploaded file at its latest or named version. " + "Do not use it for issue status, asks, or events; " + "use dispatch read instead. Supply ref, issue, or project plus artifact; issue plus an omitted artifact reads the primary document. " + "A live read returns its document token for an optional dispatch doc-edit precondition. With blocks it lists the live document's blocks instead of its markdown, in document order: each block's id, type, token, anchored comments and asks, and opening words, and under a table each row by the index delete_row takes and each cell by its row and the column delete_column takes; block ids, block tokens and those indexes are what dispatch doc-edit takes. " + "A picture (an uploaded PNG, JPEG, GIF or WebP of at most 3,750,000 bytes, 5 MB once base64-encoded) comes back as an image you see, with its name, type, size and version, every time you ask, including one a read already showed this session; " + "any other file that is not UTF-8 text is described, with the route that serves its bytes. " + OWNER_REFERENCE,
+    description: "Read a live document or a named document version, or the text of an uploaded file at its latest or named version. " + "Do not use it for issue status, asks, or events; " + "use dispatch read instead. Supply ref, issue, or project plus artifact; issue plus an omitted artifact reads the primary document. " + "A live read returns its document token for an optional dispatch doc-edit precondition. With blocks it lists the live document's blocks instead of its markdown, in document order: each block's id, type, token, anchored comments and asks, and opening words, and under a table each row by the index delete_row takes and each cell by its row and the column delete_column takes; block ids, block tokens and those indexes are what dispatch doc-edit takes. " + "After the markdown it prints every open thread anchored on the document in full: an open ask with its id and question and each reply's author, time and text, and a comment thread with its root's id, author, quote and text and each reply's author, time and text, in order; a resolved thread, and an ask that is answered or resolved, is not printed. " + "A picture (an uploaded PNG, JPEG, GIF or WebP of at most 3,750,000 bytes, 5 MB once base64-encoded) comes back as an image you see, with its name, type, size and version, every time you ask, including one a read already showed this session; " + "any other file that is not UTF-8 text is described, with the route that serves its bytes. " + OWNER_REFERENCE,
     arguments: (z) => ({
       issue: z.string().describe(ISSUE_REFERENCE).optional(),
       project: z.string().describe("Project key owning the document.").optional(),
@@ -15933,8 +15933,8 @@ class DispatchClient {
   async resolveComment(id, actor) {
     return this.#json("POST", ["api", "v1", "comments", id, "resolve"], { actor });
   }
-  async getComments(issue, artifact) {
-    return this.#json("GET", ["api", "v1", "issues", await this.#resolveIssue(issue), "comments"], undefined, artifact ? { artifact } : undefined);
+  async getComments(issue) {
+    return this.#json("GET", ["api", "v1", "issues", await this.#resolveIssue(issue), "comments"]);
   }
   async getIssueReferences(issue) {
     return this.#json("GET", [
@@ -18040,22 +18040,64 @@ function messageSummary({ message, replies }, graph) {
   ].join(`
 `);
 }
-async function openArtifactMarks(client, resolved) {
+async function openAnchoredThreads(client, resolved) {
   const asksPromise = resolved.owner.kind === "project" ? client.getArtifactAsks(resolved.artifact.id) : Promise.resolve(resolved.issue?.open_asks ?? []);
-  const commentsPromise = resolved.owner.kind === "project" ? client.getArtifactComments(resolved.artifact.id) : client.getComments(resolved.issue?.key ?? "", resolved.artifact.id);
+  const commentsPromise = resolved.owner.kind === "project" ? client.getArtifactComments(resolved.artifact.id) : client.getComments(resolved.issue?.key ?? "");
   const commentsResultPromise = commentsPromise.then((value) => ({ status: "fulfilled", value }), (reason) => ({ status: "rejected", reason }));
-  const asks = await asksPromise;
-  const marks = asks.filter((ask) => ask.state === "open" && ask.anchor?.artifact_id === resolved.artifact.id).map((ask) => `ask ${ask.id}`);
+  const asks = (await asksPromise).filter((ask) => ask.state === "open" && ask.anchor?.artifact_id === resolved.artifact.id);
   const commentsResult = await commentsResultPromise;
-  if (commentsResult.status === "rejected") {
-    if (dispatchAnswered(commentsResult.reason, 404))
-      return marks;
+  if (commentsResult.status === "rejected" && !dispatchAnswered(commentsResult.reason, 404)) {
     throw commentsResult.reason;
   }
-  return [
-    ...marks,
-    ...commentsResult.value.filter((comment) => !comment.resolved && comment.anchor?.artifact_id === resolved.artifact.id).map((comment) => `comment ${comment.id}`)
-  ];
+  const comments = commentsResult.status === "fulfilled" ? commentsResult.value : [];
+  const askReplies = new Map(asks.map((ask) => [ask.id, []]));
+  for (const comment of comments) {
+    if (comment.ask_id)
+      askReplies.get(comment.ask_id)?.push(comment);
+  }
+  const askThreads = asks.map((ask) => [
+    `ask ${ask.id} \xB7 ${actorText(ask.author)} \xB7 ${ask.created_at}`,
+    ...anchorLines(ask),
+    `Question: ${ask.question}`,
+    ...threadReplyLines(askReplies.get(ask.id) ?? [])
+  ].join(`
+`));
+  const byId = new Map(comments.map((comment) => [comment.id, comment]));
+  const roots = comments.filter((comment) => comment.reply_to === null && !comment.ask_id && !comment.resolved && comment.anchor?.artifact_id === resolved.artifact.id);
+  const replies = new Map(roots.map((root) => [root.id, []]));
+  for (const comment of comments) {
+    const root = comment.reply_to === null ? undefined : threadRootId(comment, byId);
+    if (root !== undefined)
+      replies.get(root)?.push(comment);
+  }
+  const commentThreads = roots.map((root) => [
+    `comment ${root.id} \xB7 ${actorText(root.author)} \xB7 ${root.created_at}`,
+    ...anchorLines(root),
+    `Body: ${root.body}`,
+    ...threadReplyLines(replies.get(root.id) ?? [])
+  ].join(`
+`));
+  return [...askThreads, ...commentThreads];
+}
+function threadReplyLines(replies) {
+  return replies.flatMap((reply) => [
+    `reply ${reply.id} \xB7 ${actorText(reply.author)} \xB7 ${reply.created_at}`,
+    `Body: ${reply.body}`
+  ]);
+}
+function threadRootId(comment, byId) {
+  const seen = new Set;
+  let current = comment;
+  while (current.reply_to !== null) {
+    if (seen.has(current.id))
+      return;
+    seen.add(current.id);
+    const parent = byId.get(current.reply_to);
+    if (parent === undefined)
+      return;
+    current = parent;
+  }
+  return current.id;
 }
 async function blockAsks(client, resolved, state) {
   const asks = await (resolved.issue === undefined ? client.getArtifactAsks(resolved.artifact.id, state) : client.listIssueAsks(resolved.issue.key, state));
@@ -19020,24 +19062,27 @@ Document token: ${listed.token}`,
         } : { issue: resolved.issue?.key }, version, resolved.owner.kind === "project" ? resolved.owner.project : resolved.owner.issue, shown);
       }
       const documentPromise = client.docRead(resolved.artifact.id, version);
-      const marksPromise = openArtifactMarks(client, resolved);
-      const marksResultPromise = marksPromise.then((value) => ({ status: "fulfilled", value }), (reason) => ({ status: "rejected", reason }));
+      const threadsPromise = openAnchoredThreads(client, resolved);
+      const threadsResultPromise = threadsPromise.then((value) => ({ status: "fulfilled", value }), (reason) => ({ status: "rejected", reason }));
       const document = await documentPromise;
-      const marksResult = await marksResultPromise;
-      if (marksResult.status === "rejected")
-        throw marksResult.reason;
-      const marks = marksResult.value;
+      const threadsResult = await threadsResultPromise;
+      if (threadsResult.status === "rejected")
+        throw threadsResult.reason;
+      const threads = threadsResult.value;
       const approval = approvalLine(resolved.artifact);
       const trailer = [
         ..."token" in document && document.token !== undefined ? [`Document token: ${document.token}`] : [],
-        ...marks.length === 0 ? [] : [`Open anchored asks/comments: ${marks.join(", ")}`],
         ...approval === undefined ? [] : [approval]
       ];
       return {
-        text: trailer.length === 0 ? document.markdown : `${document.markdown}
+        text: [
+          document.markdown,
+          ...trailer.length === 0 ? [] : [trailer.join(`
+`)],
+          ...threads.length === 0 ? [] : ["Open anchored threads:", ...threads]
+        ].join(`
 
-${trailer.join(`
-`)}`,
+`),
         details: resolved.owner.kind === "project" ? {
           project: resolved.artifact.project,
           document: `${resolved.artifact.project}/${resolved.artifact.slug}`
@@ -20191,7 +20236,9 @@ var SessionWireSchema = object({
   roles: array(string2()).optional(),
   capabilities: array(string2()).optional(),
   self_subscribed: boolean2(),
-  last_seen: number2().int().optional()
+  last_seen: number2().int().optional(),
+  plugin: string2().optional(),
+  plugin_version: string2().optional()
 });
 var RoleWireSchema = object({
   role: string2(),
@@ -20327,7 +20374,9 @@ function createEnvoyClient(config) {
       ...input.capabilities === undefined ? {} : { capabilities: input.capabilities },
       driving: input.driving,
       ...input.selfSubscribed === undefined ? {} : { self_subscribed: input.selfSubscribed },
-      host: machineID()
+      host: machineID(),
+      plugin: input.plugin.name,
+      plugin_version: input.plugin.version
     }))),
     unsubscribe: async (input) => {
       await post("/v1/interests/unsubscribe", {

package/dist/src/server.js

@@ -14192,7 +14192,7 @@ var dispatchToolSpecs = [
   {
     name: "dispatch_doc_read",
     example: { issue: "DSP-1" },
-    description: "Read a live document or a named document version, or the text of an uploaded file at its latest or named version. " + "Do not use it for issue status, asks, or events; " + "use dispatch read instead. Supply ref, issue, or project plus artifact; issue plus an omitted artifact reads the primary document. " + "A live read returns its document token for an optional dispatch doc-edit precondition. With blocks it lists the live document's blocks instead of its markdown, in document order: each block's id, type, token, anchored comments and asks, and opening words, and under a table each row by the index delete_row takes and each cell by its row and the column delete_column takes; block ids, block tokens and those indexes are what dispatch doc-edit takes. " + "A picture (an uploaded PNG, JPEG, GIF or WebP of at most 3,750,000 bytes, 5 MB once base64-encoded) comes back as an image you see, with its name, type, size and version, every time you ask, including one a read already showed this session; " + "any other file that is not UTF-8 text is described, with the route that serves its bytes. " + OWNER_REFERENCE,
+    description: "Read a live document or a named document version, or the text of an uploaded file at its latest or named version. " + "Do not use it for issue status, asks, or events; " + "use dispatch read instead. Supply ref, issue, or project plus artifact; issue plus an omitted artifact reads the primary document. " + "A live read returns its document token for an optional dispatch doc-edit precondition. With blocks it lists the live document's blocks instead of its markdown, in document order: each block's id, type, token, anchored comments and asks, and opening words, and under a table each row by the index delete_row takes and each cell by its row and the column delete_column takes; block ids, block tokens and those indexes are what dispatch doc-edit takes. " + "After the markdown it prints every open thread anchored on the document in full: an open ask with its id and question and each reply's author, time and text, and a comment thread with its root's id, author, quote and text and each reply's author, time and text, in order; a resolved thread, and an ask that is answered or resolved, is not printed. " + "A picture (an uploaded PNG, JPEG, GIF or WebP of at most 3,750,000 bytes, 5 MB once base64-encoded) comes back as an image you see, with its name, type, size and version, every time you ask, including one a read already showed this session; " + "any other file that is not UTF-8 text is described, with the route that serves its bytes. " + OWNER_REFERENCE,
     arguments: (z) => ({
       issue: z.string().describe(ISSUE_REFERENCE).optional(),
       project: z.string().describe("Project key owning the document.").optional(),
@@ -15342,7 +15342,9 @@ var SessionWireSchema = object({
   roles: array(string2()).optional(),
   capabilities: array(string2()).optional(),
   self_subscribed: boolean2(),
-  last_seen: number2().int().optional()
+  last_seen: number2().int().optional(),
+  plugin: string2().optional(),
+  plugin_version: string2().optional()
 });
 var RoleWireSchema = object({
   role: string2(),
@@ -15478,7 +15480,9 @@ function createEnvoyClient(config) {
       ...input.capabilities === undefined ? {} : { capabilities: input.capabilities },
       driving: input.driving,
       ...input.selfSubscribed === undefined ? {} : { self_subscribed: input.selfSubscribed },
-      host: machineID()
+      host: machineID(),
+      plugin: input.plugin.name,
+      plugin_version: input.plugin.version
     }))),
     unsubscribe: async (input) => {
       await post("/v1/interests/unsubscribe", {
@@ -15581,6 +15585,8 @@ function sourceSession(sessionID) {
 
 // src/server.ts
 import { tool } from "@opencode-ai/plugin/tool";
+// package.json
+var version2 = "9.8.0";
 
 // src/log.ts
 import { appendFile, mkdir } from "fs/promises";
@@ -15671,6 +15677,7 @@ var skillsDirectory = [
   path3.resolve(moduleDirectory, "../../../skills")
 ].find((dir) => existsSync2(dir));
 var PACKAGE_NAME = "@sjawhar/opencode-legion-envoy";
+var PLUGIN = { name: PACKAGE_NAME, version: version2 };
 function packageRoot(from) {
   for (let directory = from;; directory = path3.dirname(directory)) {
     if (manifestName(path3.join(directory, "package.json")) === PACKAGE_NAME)
@@ -15716,7 +15723,8 @@ function envoyTools(client, port, title) {
           topics: args.topics,
           port: port() ?? 0,
           title: title() ?? "",
-          driving: true
+          driving: true,
+          plugin: PLUGIN
         }));
       }
     }),
@@ -15879,7 +15887,8 @@ var server_default = async (input) => {
     topics: [agentSubject(sessionID)],
     port,
     title: title ?? "",
-    driving
+    driving,
+    plugin: PLUGIN
   }).catch(() => {});
   let stopEnvoy = () => {};
   if (envoyOn !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjawhar/opencode-legion-envoy",
-  "version": "9.7.0",
+  "version": "9.8.0",
   "license": "Apache-2.0",
   "type": "module",
   "main": "dist/src/server.js",

package/skills/legion-controller/SKILL.md

@@ -12,7 +12,7 @@ except a clear defect a role reports ([Issues handed to Legion](#issues-handed-t
 
 ## Rules
 
-- Handle no wake until the extension's startup claim of `legion-<project>-controller` succeeded, because without it the daemon does not know you as its controller.
+- Handle no wake until the extension has registered this session with the daemon as the project's controller, at session startup or, in a controller an operator started, from its first command once Oh My Pi has started, because without that registration the daemon does not know you as its controller.
 - Answer a person's direct message first, in the conversation. A plain user turn that is neither the start message nor a task sent with `legion claims deliver` is a person writing from Dispatch's Agents page.
 - A direct Dispatch message that decides scope, priority or an owner is a ruling: after you answer it, run the weekly-plan reconciliation (`skill://legion-controller/references/backlog-stewardship.md`), because the plan must record the rule.
 - Handle one wake per turn, then end the turn. Never poll or wait for an event, because the daemon wakes you again (`tick` at least every `controller_wake_interval_seconds`).

package/skills/legion-controller/references/session.md

@@ -83,8 +83,8 @@ environment, then run:
 It checks `LEGION_PROJECT` against the daemon, registers the session, claims the Envoy role, and
 moves the daemon's recorded controller session id to this session; the `legion` tool's controller
 operations then work there. Never pass the secret as a command argument or copy it into a
-transcript, because others read transcripts. Do not set `LEGION_CONTROLLER=1`, because a session
-carrying that marker claims at startup as the launched controller. Run `/legion-claim-controller`
+transcript, because others read transcripts. Do not set `LEGION_CONTROLLER=1`: that marker makes
+the session the launched controller, which needs a start message. Run `/legion-claim-controller`
 once per session; do not run it again after an Envoy listener restart, because the heartbeat
 re-claims the role.
 

package/src/server.ts

@@ -12,6 +12,7 @@ import {
 } from "@legion/envoy-client/tool-contract";
 import { createEnvoyClient, type EnvoyClient } from "@legion/envoy-client/transport";
 import { type ToolDefinition, tool } from "@opencode-ai/plugin/tool";
+import { version } from "../package.json" with { type: "json" };
 import { logger } from "./log";
 import { resolvePort } from "./port";
 
@@ -29,6 +30,9 @@ const skillsDirectory = [
 
 const PACKAGE_NAME = "@sjawhar/opencode-legion-envoy";
 
+/** The plugin every registration names: this package and the version its manifest carries. */
+const PLUGIN = { name: PACKAGE_NAME, version };
+
 /** The package root: the nearest directory above `from` whose package.json names this package.
  *  The packed server.js sits in dist/src/, the repo's server.ts in src/. A manifest on the way up
  *  that is missing, unreadable or not JSON is passed over. */
@@ -93,6 +97,7 @@ function envoyTools(
             port: port() ?? 0,
             title: title() ?? "",
             driving: true,
+            plugin: PLUGIN,
           })
         );
       },
@@ -307,6 +312,7 @@ export default async (input: { serverUrl: URL }) => {
         port,
         title: title ?? "",
         driving,
+        plugin: PLUGIN,
       })
       .catch(() => {});