@sjawhar/pi-legion-envoy 5.14.0 → 5.15.0

package/dist/envoy.js

@@ -32173,6 +32173,15 @@ function resolveDispatchConfig(env, options = {}) {
   }
   return { enabled: true, url: url2.url, token, error: null };
 }
+function activeDispatchConfig(env, options = {}) {
+  const config2 = resolveDispatchConfig(env, options);
+  if (config2.error !== null)
+    throw new Error(`dispatch config: ${config2.error}`);
+  const { url: url2, token } = config2;
+  if (!config2.enabled || url2 === null || token === null)
+    return null;
+  return { ...config2, url: url2, token };
+}
 
 // ../envoy-client/src/dispatch-execute.ts
 import { resolve as resolvePath } from "path";
@@ -33242,13 +33251,23 @@ async function resolveOwnerArguments(tool, input, cwd, env, exec, serverUrl, pro
   const issue2 = `${repo2}#${legionIssue}`;
   return { args: { ...args, issue: issue2 }, ref, owner: { kind: "issue", issue: issue2 } };
 }
-function artifactByReference(artifacts, artifactReference, owner) {
-  const byIdOrSlug = artifacts.find((candidate) => candidate.id === artifactReference) ?? artifacts.find((candidate) => candidate.slug === artifactReference);
-  if (byIdOrSlug !== undefined)
-    return byIdOrSlug;
+function artifactByReference(artifacts, artifactReference, owner, canonical) {
+  const bySlug = artifacts.find((candidate) => candidate.slug === artifactReference);
+  if (canonical && bySlug !== undefined)
+    return bySlug;
+  const byId = artifacts.find((candidate) => candidate.id === artifactReference);
+  if (byId !== undefined)
+    return byId;
   const byName = artifacts.filter((candidate) => candidate.name === artifactReference);
+  if (bySlug !== undefined) {
+    const named = byName.filter((candidate) => candidate.id !== bySlug.id && candidate.kind === "doc");
+    if (named.length > 0) {
+      throw new Error(documentReferenceProblem(artifactReference, [bySlug, ...named], owner, "id"));
+    }
+    return bySlug;
+  }
   if (byName.length > 1) {
-    throw new Error(documentReferenceProblem(artifactReference, byName, owner, true));
+    throw new Error(documentReferenceProblem(artifactReference, byName, owner, "slug"));
   }
   const [artifact] = byName;
   if (artifact === undefined) {
@@ -33256,43 +33275,45 @@ function artifactByReference(artifacts, artifactReference, owner) {
   }
   return artifact;
 }
-async function resolveArtifact(client, owner, artifactReference) {
+async function resolveArtifact(client, owner, artifactReference, { canonical = false } = {}) {
   if (owner.kind === "project") {
     if (artifactReference === undefined) {
       throw new Error("artifact is required for a project document");
     }
-    try {
-      return {
-        owner,
-        artifact: await client.getProjectArtifact(owner.project, artifactReference)
-      };
-    } catch (error48) {
+    const routed = await client.getProjectArtifact(owner.project, artifactReference).catch((error48) => {
       if (!(error48 instanceof DispatchServiceError) || error48.status !== 404)
         throw error48;
-      const artifacts = await client.listProjectArtifacts(owner.project, true);
-      return {
-        owner,
-        artifact: artifactByReference(artifacts, artifactReference, "project")
-      };
-    }
+      return;
+    });
+    if (canonical && routed !== undefined)
+      return { owner, artifact: routed };
+    const unlinked = await client.listProjectArtifacts(owner.project, true);
+    const artifacts = routed === undefined ? unlinked : [routed, ...unlinked.filter((candidate) => candidate.id !== routed.id)];
+    return {
+      owner,
+      artifact: artifactByReference(artifacts, artifactReference, "project", canonical)
+    };
   }
   const issue2 = await client.getIssue(owner.issue);
   let artifact;
   if (artifactReference === undefined || artifactReference === "spec") {
     artifact = issue2.artifacts.find((candidate) => candidate.primary || candidate.id === issue2.primary_artifact_id);
   } else {
-    artifact = artifactByReference(issue2.artifacts, artifactReference, "issue");
+    artifact = artifactByReference(issue2.artifacts, artifactReference, "issue", canonical);
   }
   if (!artifact) {
     throw new Error(documentReferenceProblem(artifactReference ?? "spec", issue2.artifacts, "issue"));
   }
   return { owner, issue: issue2, artifact };
 }
+async function resolveIssueDocumentId(client, issue2, reference) {
+  return (await resolveArtifact(client, { kind: "issue", issue: issue2 }, reference)).artifact.id;
+}
 var documentHintLimit = 8;
-function documentReferenceProblem(reference, documents, owner, ambiguous = false) {
-  const hints = documents.slice(0, documentHintLimit).map((document) => `${document.slug} (${document.name})`);
+function documentReferenceProblem(reference, documents, owner, use) {
+  const hints = documents.slice(0, documentHintLimit).map((document) => use === "id" ? `${document.id} (${document.slug}, ${document.name})` : `${document.slug} (${document.name})`);
   const list = hints.length === 0 ? "none" : hints.join(", ");
-  return ambiguous ? `"${reference}" names ${documents.length} documents on this ${owner}; use a slug: ${list}` : `document "${reference}" not found by slug; this ${owner}'s documents: ${list}`;
+  return use === undefined ? `document "${reference}" not found by slug; this ${owner}'s documents: ${list}` : `"${reference}" names ${documents.length} documents on this ${owner}; use ${use === "id" ? "the id" : "a slug"}: ${list}`;
 }
 var askHintLimit = 8;
 function askIDInputProblem(asks, scope) {
@@ -33682,6 +33703,10 @@ async function executeDispatchTool(input) {
   const args = parsed.success ? parsed.data : ownerArguments.args;
   const actor = toolActor(await resolveOrigin(env, exec, input.cwd), input);
   const client = dispatchClient();
+  const refDocument = ownerArguments.ref?.kind === "artifact" ? ownerArguments.ref.id : ownerArguments.ref?.artifact;
+  const resolveDocument = (documentOwner2, reference) => resolveArtifact(client, documentOwner2, reference, {
+    canonical: reference !== undefined && reference === refDocument
+  });
   const owner = ownerArguments.owner?.kind === "issue" ? {
     kind: "issue",
     issue: await resolveExistingIssue(client, ownerArguments.owner.issue)
@@ -33972,7 +33997,7 @@ async function executeDispatchTool(input) {
         const issueKey = ref.owner.issue;
         id = await resolveIdPrefix(input.tool, "comment", ref.id, refOwnerName(ref), () => client.getComments(issueKey));
       } else if (ref !== null) {
-        const artifact = (await resolveArtifact(client, ref.owner, ref.artifact)).artifact;
+        const artifact = (await resolveArtifact(client, ref.owner, ref.artifact, { canonical: true })).artifact;
         document = artifact;
         id = await resolveIdPrefix(input.tool, "comment", ref.id, refOwnerName(ref), () => client.getArtifactComments(artifact.id));
       }
@@ -33984,7 +34009,7 @@ async function executeDispatchTool(input) {
       const anchorArgs = asObject(args.anchor);
       const owner2 = documentOwner();
       const artifactReference = optionalString(args, "artifact") ?? (anchorArgs === null ? undefined : optionalString(anchorArgs, "artifact"));
-      const resolved = owner2.kind === "project" || artifactReference === undefined ? owner2.kind === "project" ? await resolveArtifact(client, owner2, artifactReference) : undefined : await resolveArtifact(client, owner2, artifactReference);
+      const resolved = owner2.kind === "project" || artifactReference === undefined ? owner2.kind === "project" ? await resolveDocument(owner2, artifactReference) : undefined : await resolveDocument(owner2, artifactReference);
       const options = args.options;
       const multiple = optionalBoolean(args, "multiple");
       const urgency = askUrgency(args);
@@ -34034,7 +34059,7 @@ ${followsAsk(askOwner)}`,
     case "dispatch_comment": {
       const artifactReference = optionalString(args, "artifact");
       const owner2 = documentOwner();
-      const resolved = owner2.kind === "project" || artifactReference === undefined ? owner2.kind === "project" ? await resolveArtifact(client, owner2, artifactReference) : undefined : await resolveArtifact(client, owner2, artifactReference);
+      const resolved = owner2.kind === "project" || artifactReference === undefined ? owner2.kind === "project" ? await resolveDocument(owner2, artifactReference) : undefined : await resolveDocument(owner2, artifactReference);
       const anchored = resolved ? anchor(resolved.artifact, args) : undefined;
       const replyTo = optionalString(args, "reply_to");
       const replyToAskReference = optionalString(args, "reply_to_ask");
@@ -34087,7 +34112,7 @@ ${followsAsk(askOwner)}`,
       };
     }
     case "dispatch_suggest": {
-      const resolved = await resolveArtifact(client, documentOwner(), stringArg(args, "artifact"));
+      const resolved = await resolveDocument(documentOwner(), stringArg(args, "artifact"));
       const anchored = anchor(resolved.artifact, args);
       if (anchored === undefined)
         throw new Error("quote is required");
@@ -34142,7 +34167,7 @@ ${followsAsk(askOwner)}`,
       };
     }
     case "dispatch_doc_edit": {
-      const resolved = await resolveArtifact(client, documentOwner(), stringArg(args, "artifact"));
+      const resolved = await resolveDocument(documentOwner(), stringArg(args, "artifact"));
       const ops = args.ops;
       const summary = optionalString(args, "summary");
       const { precondition: rawPrecondition } = args;
@@ -34184,7 +34209,7 @@ ${followsAsk(askOwner)}`,
     }
     case "dispatch_doc_read": {
       const artifactReference = optionalString(args, "artifact") ?? (ownerArguments.ref?.kind === "spec" || ownerArguments.ref?.kind === "artifact" ? ownerArguments.ref.id : undefined);
-      const resolved = await resolveArtifact(client, documentOwner(), artifactReference);
+      const resolved = await resolveDocument(documentOwner(), artifactReference);
       const version2 = optionalNumber(args, "version") ?? ownerArguments.ref?.version;
       const documentPromise = client.docRead(resolved.artifact.id, version2);
       const marksPromise = openArtifactMarks(client, resolved);
@@ -34213,7 +34238,7 @@ ${trailer.join(`
     }
     case "dispatch_request_approval": {
       const artifactReference = optionalString(args, "artifact") ?? (ownerArguments.ref?.kind === "spec" || ownerArguments.ref?.kind === "artifact" ? ownerArguments.ref.id : undefined);
-      const resolved = await resolveArtifact(client, documentOwner(), artifactReference);
+      const resolved = await resolveDocument(documentOwner(), artifactReference);
       const result = await client.requestApproval(resolved.artifact.id, { actor });
       if (result.ask === null) {
         return {
@@ -34291,7 +34316,7 @@ ${trailer.join(`
     case "dispatch_read": {
       if (ownerArguments.ref?.kind === "ask") {
         const ref = ownerArguments.ref;
-        const id = await resolveIdPrefix(input.tool, "ask", ref.id, refOwnerName(ref), async () => ref.owner.kind === "issue" ? client.listIssueAsks(ref.owner.issue) : client.getArtifactAsks((await resolveArtifact(client, ref.owner, ref.artifact)).artifact.id, "all"));
+        const id = await resolveIdPrefix(input.tool, "ask", ref.id, refOwnerName(ref), async () => ref.owner.kind === "issue" ? client.listIssueAsks(ref.owner.issue) : client.getArtifactAsks((await resolveDocument(ref.owner, ref.artifact)).artifact.id, "all"));
         const askRead = await client.getAsk(id);
         const askRef = refTarget(ref, "ask", id);
         return {
@@ -34301,7 +34326,7 @@ ${trailer.join(`
       }
       if (ownerArguments.ref?.kind === "comment") {
         const ref = ownerArguments.ref;
-        const id = await resolveIdPrefix(input.tool, "comment", ref.id, refOwnerName(ref), async () => ref.owner.kind === "issue" ? client.getComments(ref.owner.issue) : client.getArtifactComments((await resolveArtifact(client, ref.owner, ref.artifact)).artifact.id));
+        const id = await resolveIdPrefix(input.tool, "comment", ref.id, refOwnerName(ref), async () => ref.owner.kind === "issue" ? client.getComments(ref.owner.issue) : client.getArtifactComments((await resolveDocument(ref.owner, ref.artifact)).artifact.id));
         const comment = await client.getComment(id);
         const commentRef = refTarget(ref, "comment", id);
         return {
@@ -34321,7 +34346,7 @@ ${trailer.join(`
         };
       }
       if (documentOwner().kind === "project") {
-        const resolved = await resolveArtifact(client, documentOwner(), stringArg(args, "artifact"));
+        const resolved = await resolveDocument(documentOwner(), stringArg(args, "artifact"));
         const documentRef = dispatchDocumentRef(resolved.artifact.project, resolved.artifact.slug);
         return {
           text: [
@@ -35403,16 +35428,8 @@ function envoyExtension(pi) {
   logger.debug("extension instance loaded", { extension: import.meta.url });
   const defaults = envoyDefaultsFromEnvironment(process.env);
   const dispatchConfig = resolveDispatchConfig(process.env, { cwd: process.cwd() });
-  const activeDispatchConfig = () => {
-    const fresh = resolveDispatchConfig(process.env, { cwd: process.cwd() });
-    if (fresh.error !== null)
-      throw new Error(`dispatch config: ${fresh.error}`);
-    if (!fresh.enabled || fresh.url === null || fresh.token === null)
-      return null;
-    return fresh;
-  };
   const currentDispatchConfig = () => {
-    const config2 = activeDispatchConfig();
+    const config2 = activeDispatchConfig(process.env, { cwd: process.cwd() });
     if (config2 === null) {
       throw new Error("Dispatch is no longer configured (dispatch.serverUrl/token missing)");
     }
@@ -35476,7 +35493,7 @@ function envoyExtension(pi) {
     });
   };
   const queryOpenAsks = async (requestedSessionID, since) => {
-    const config2 = activeDispatchConfig();
+    const config2 = activeDispatchConfig(process.env, { cwd: process.cwd() });
     if (config2 === null)
       return null;
     const snapshot = await new DispatchClient(config2.url, config2.token, fetch, AbortSignal.timeout(OPEN_ASKS_TIMEOUT_MS)).openAsks(requestedSessionID, since);