@duckmind/dm-darwin-x64 0.66.5 → 0.66.6

package/extensions/dm-web-access/github-issue-pr.js

@@ -451,25 +451,44 @@ function milestoneTitle(value) {
     return "none";
   return stringValue(value.title) || "none";
 }
-function truncateText(text, limit, label, appendix) {
+function truncateText(text, limit, label, appendix, tool) {
   if (text.length <= limit)
     return text;
-  appendix.push(`## Full ${label}
+  const lastSpace = text.slice(0, limit + 1).search(/\s\S*$/);
+  const cut = lastSpace > limit * 0.8 ? lastSpace : limit;
+  appendix.push(`## ${label} (continued)
 
-${text}`);
-  return `${text.slice(0, limit)}
+${text.slice(cut)}`);
+  return `${text.slice(0, cut)}
 
-[${label} truncated; use get_search_content findText or offset for the full text]`;
+[${label} truncated; ${tool ? `the rest is stored under "${label} (continued)": use ${tool} findText or offset` : "use the gh escalation commands below for the rest"}]`;
 }
-function appendLimitedSection(lines, title, items, max, marker) {
+function storeOmitted(appendix, section, items) {
+  if (items.length > 0)
+    appendix.push(`## ${section} (continued)
+
+${items.join(`
+`)}`);
+}
+function omissionMarker(section, noun, shown, fetched, atLeast, tool, gh) {
+  const stored = fetched > shown && tool ? `${fetched - shown} more stored under "${section} (continued)": use ${tool} findText or offset` : "";
+  if (atLeast !== null)
+    return `[${shown} ${noun} shown from at least ${atLeast}; ${stored ? `${stored}; for the rest ` : ""}use ${gh}]`;
+  if (fetched <= shown)
+    return null;
+  return `[${shown} of ${fetched} ${noun} shown; ${stored ? `${stored}, or ${gh}` : `use ${gh}`}]`;
+}
+function appendLimitedSection(lines, title, items, max, marker, appendix, tool) {
   lines.push(`## ${title}`);
   if (items.length === 0) {
     lines.push("none", "");
     return;
   }
   lines.push(...items.slice(0, max));
-  if (items.length > max)
-    lines.push(`[${max} of ${items.length} ${marker} shown; use get_search_content offset or the gh command below for more]`);
+  storeOmitted(appendix, title, items.slice(max));
+  const omitted = omissionMarker(title, marker, Math.min(max, items.length), items.length, null, tool, "the gh command below");
+  if (omitted)
+    lines.push(omitted);
   lines.push("");
 }
 function objectArray(value) {
@@ -486,29 +505,23 @@ function anchorMatches(anchor, comment) {
   const id = commentId(comment);
   return anchor === `issuecomment-${id}` || anchor === `discussion_r${id}`;
 }
-function renderComments(comments, anchor, appendix) {
+function renderComments(comments, anchor, appendix, tool) {
   const forced = anchor ? comments.find((comment) => anchorMatches(anchor, comment)) : undefined;
   const selected = comments.slice(0, MAX_INLINE_COMMENTS);
   if (forced && !selected.includes(forced))
     selected.push(forced);
-  const lines = selected.map((comment) => {
+  const render = (comment, inline) => {
     const body = stringValue(comment.body);
-    const label = `comment ${commentId(comment) || selected.indexOf(comment) + 1}`;
+    const label = `comment ${commentId(comment) || comments.indexOf(comment) + 1}`;
+    const text = inline ? truncateText(body, COMMENT_INLINE_CHARS, label, appendix, tool) : body;
     return `- ${authorLogin(comment.author ?? comment.user)} at ${stringValue(comment.createdAt) || stringValue(comment.created_at)}${forced === comment ? " [anchored]" : ""}:
-  ${truncateText(body, COMMENT_INLINE_CHARS, label, appendix).replace(/\n/g, `
+  ${text.replace(/\n/g, `
   `)}`;
-  });
+  };
+  const lines = selected.map((comment) => render(comment, true));
+  storeOmitted(appendix, "Conversation comments", comments.filter((comment) => !selected.includes(comment)).map((comment) => render(comment, false)));
   return lines;
 }
-function renderCommentMarker(comments, renderedCount, total) {
-  const knownTotal = numberValue(total);
-  if (knownTotal !== null && knownTotal > comments.length) {
-    return `[${renderedCount} comments shown from at least ${knownTotal}; use get_search_content findText or offset, or gh issue view -c]`;
-  }
-  if (comments.length > renderedCount)
-    return `[${renderedCount} of ${comments.length} comments shown; use get_search_content findText or offset, or gh issue view -c]`;
-  return null;
-}
 function commentCountText(view) {
   const comments = objectArray(view.comments).length;
   const total = numberValue(view.commentsCount);
@@ -526,7 +539,7 @@ function reviewThreadCountText(comments, total, bounded, unavailable) {
     return `at least ${knownTotal}`;
   return String(comments.length || knownTotal || 0);
 }
-function renderChecks(value) {
+function renderChecks(value, appendix, tool) {
   const checks = objectArray(value);
   if (checks.length === 0)
     return ["No check rollup data available."];
@@ -536,20 +549,22 @@ function renderChecks(value) {
     return `- ${name}: ${state}`;
   });
   const failing = rows.filter((row) => !/(success|neutral|skipped|completed)$/i.test(row));
-  return [`Rollup: ${failing.length === 0 ? "no failing checks in shown data" : `${failing.length} non-passing checks in shown data`}`, ...rows.slice(0, MAX_INLINE_CHECKS), ...rows.length > MAX_INLINE_CHECKS ? [`[${MAX_INLINE_CHECKS} of ${rows.length} checks shown]`] : []];
+  storeOmitted(appendix, "Checks", rows.slice(MAX_INLINE_CHECKS));
+  const omitted = omissionMarker("Checks", "checks", Math.min(MAX_INLINE_CHECKS, rows.length), rows.length, null, tool, "the gh command below");
+  return [`Rollup: ${failing.length === 0 ? "no failing checks in shown data" : `${failing.length} non-passing checks in shown data`}`, ...rows.slice(0, MAX_INLINE_CHECKS), ...omitted ? [omitted] : []];
 }
-function renderReviewVerdicts(value, appendix) {
+function renderReviewVerdicts(value, appendix, tool) {
   const latest = new Map;
   for (const review of objectArray(value))
     latest.set(authorLogin(review.author ?? review.user), review);
   return [...latest.entries()].map(([author, review]) => {
     const state = stringValue(review.state) || "COMMENTED";
-    const body = truncateText(stringValue(review.body), 300, `review by ${author}`, appendix);
+    const body = truncateText(stringValue(review.body), 300, `review by ${author}`, appendix, tool);
     return `- ${author}: ${state}${body ? ` — ${body.replace(/\n/g, " ")}` : ""}`;
   });
 }
-function renderReviewVerdictsOrUnavailable(view, appendix) {
-  const rendered = renderReviewVerdicts(view.reviews, appendix);
+function renderReviewVerdictsOrUnavailable(view, appendix, tool) {
+  const rendered = renderReviewVerdicts(view.reviews, appendix, tool);
   if (rendered.length > 0)
     return rendered;
   return view.reviewsUnavailable === true ? ["Unavailable in this GitHub fetch path; use gh for review verdicts."] : [];
@@ -562,25 +577,17 @@ function renderFiles(value) {
     return `- ${path} (+${additions}/−${deletions})`;
   });
 }
-function appendFilesSection(lines, view) {
+function appendFilesSection(lines, view, appendix, tool) {
   lines.push("## Files");
   const files = renderFiles(view.files);
-  if (files.length === 0) {
-    const total = numberValue(view.changedFiles);
-    if (total !== null && total > 0) {
-      lines.push(`[0 files shown from at least ${total}; use get_search_content offset or the gh command below for more]`, "");
-      return;
-    }
-    lines.push("none", "");
-    return;
-  }
-  lines.push(...files.slice(0, MAX_INLINE_FILES));
   const total = numberValue(view.changedFiles);
-  if (total !== null && total > files.length) {
-    lines.push(`[${Math.min(files.length, MAX_INLINE_FILES)} files shown from at least ${total}; use get_search_content offset or the gh command below for more]`);
-  } else if (files.length > MAX_INLINE_FILES) {
-    lines.push(`[${MAX_INLINE_FILES} of ${files.length} files shown; use get_search_content offset or the gh command below for more]`);
-  }
+  const omitted = omissionMarker("Files", "files", Math.min(files.length, MAX_INLINE_FILES), files.length, total !== null && total > files.length ? total : null, tool, "the gh command below");
+  if (files.length === 0 && !omitted)
+    lines.push("none");
+  lines.push(...files.slice(0, MAX_INLINE_FILES));
+  storeOmitted(appendix, "Files", files.slice(MAX_INLINE_FILES));
+  if (omitted)
+    lines.push(omitted);
   lines.push("");
 }
 function renderCommits(value) {
@@ -606,34 +613,35 @@ function renderLinkedOrUnavailable(view, field, kind) {
     return linked;
   return view.linkedReferencesUnavailable === true ? ["Unavailable in this GitHub fetch path; use gh for linked references."] : [];
 }
-function renderReviewThreads(comments, anchor, appendix, total, bounded, unavailable) {
+function renderReviewThreads(comments, anchor, appendix, tool, total, bounded, unavailable) {
   if (unavailable)
     return ["Unavailable in this GitHub fetch path; use gh for review thread comments."];
   const forced = anchor ? comments.find((comment) => anchorMatches(anchor, comment)) : undefined;
   const selected = comments.slice(0, MAX_INLINE_REVIEW_THREADS);
   if (forced && !selected.includes(forced))
     selected.push(forced);
-  const lines = selected.map((comment) => {
+  const render = (comment, inline) => {
     const path = stringValue(comment.path) || "unknown path";
     const line = numberValue(comment.line) ?? numberValue(comment.original_line) ?? numberValue(comment.position) ?? "?";
-    const body = truncateText(stringValue(comment.body), COMMENT_INLINE_CHARS, `review thread comment ${commentId(comment) || selected.indexOf(comment) + 1}`, appendix);
+    const text = stringValue(comment.body);
+    const body = inline ? truncateText(text, COMMENT_INLINE_CHARS, `review thread comment ${commentId(comment) || comments.indexOf(comment) + 1}`, appendix, tool) : text;
     return `- ${path}:${line} — ${authorLogin(comment.user ?? comment.author)}${forced === comment ? " [anchored]" : ""} (resolution state unknown):
   ${body.replace(/\n/g, `
   `)}`;
-  });
+  };
+  const lines = selected.map((comment) => render(comment, true));
+  storeOmitted(appendix, "Review thread comments", comments.filter((comment) => !selected.includes(comment)).map((comment) => render(comment, false)));
   const knownTotal = numberValue(total);
-  if (bounded) {
-    lines.push(`[${selected.length} review thread comments shown from at least ${comments.length}; use get_search_content offset, or gh api repos/<owner>/<repo>/pulls/<number>/comments]`);
-  } else if (knownTotal !== null && knownTotal > comments.length) {
-    lines.push(`[${selected.length} review thread comments shown from at least ${knownTotal}; use get_search_content offset, or gh api repos/<owner>/<repo>/pulls/<number>/comments]`);
-  } else if (comments.length > selected.length) {
-    lines.push(`[${selected.length} of ${comments.length} review thread comments shown; use get_search_content offset, or gh api repos/<owner>/<repo>/pulls/<number>/comments]`);
-  }
+  const atLeast = bounded ? comments.length : knownTotal !== null && knownTotal > comments.length ? knownTotal : null;
+  const omitted = omissionMarker("Review thread comments", "review thread comments", selected.length, comments.length, atLeast, tool, "gh api repos/<owner>/<repo>/pulls/<number>/comments");
+  if (omitted)
+    lines.push(omitted);
   return lines;
 }
 export function renderGitHubPrIssue(data) {
   const { view } = data;
   const appendix = [];
+  const tool = data.retrievalTool === undefined ? "get_search_content" : data.retrievalTool;
   const title = stringValue(view.title) || `${data.owner}/${data.repo}#${data.number}`;
   const number = numberValue(view.number) ?? data.number;
   const stateParts = [stringValue(view.state) || "unknown"];
@@ -665,20 +673,22 @@ export function renderGitHubPrIssue(data) {
     lines.push(`- requested anchor: #${data.anchor}`);
   lines.push("");
   lines.push("## Body");
-  lines.push(truncateText(stringValue(view.body) || "(empty)", BODY_INLINE_CHARS, "body", appendix), "");
+  lines.push(truncateText(stringValue(view.body) || "(empty)", BODY_INLINE_CHARS, "body", appendix, tool), "");
   if (data.kind === "pull") {
     lines.push("## Checks");
-    lines.push(...renderChecks(view.statusCheckRollup), "");
-    appendLimitedSection(lines, "Review verdicts", renderReviewVerdictsOrUnavailable(view, appendix), MAX_INLINE_REVIEWS, "review verdicts");
-    appendLimitedSection(lines, "Linked references", renderLinkedOrUnavailable(view, "closingIssuesReferences", "closing"), 20, "linked references");
-    appendFilesSection(lines, view);
-    appendLimitedSection(lines, "Commits", renderCommitsOrUnavailable(view), MAX_INLINE_COMMITS, "commits");
+    lines.push(...renderChecks(view.statusCheckRollup, appendix, tool), "");
+    appendLimitedSection(lines, "Review verdicts", renderReviewVerdictsOrUnavailable(view, appendix, tool), MAX_INLINE_REVIEWS, "review verdicts", appendix, tool);
+    appendLimitedSection(lines, "Linked references", renderLinkedOrUnavailable(view, "closingIssuesReferences", "closing"), 20, "linked references", appendix, tool);
+    appendFilesSection(lines, view, appendix, tool);
+    appendLimitedSection(lines, "Commits", renderCommitsOrUnavailable(view), MAX_INLINE_COMMITS, "commits", appendix, tool);
   } else {
-    appendLimitedSection(lines, "Closed by pull requests", renderLinkedOrUnavailable(view, "closedByPullRequestsReferences", "closedBy"), 20, "pull requests");
+    appendLimitedSection(lines, "Closed by pull requests", renderLinkedOrUnavailable(view, "closedByPullRequestsReferences", "closedBy"), 20, "pull requests", appendix, tool);
   }
   lines.push("## Conversation comments");
-  const commentLines = renderComments(objectArray(view.comments), data.anchor, appendix);
-  const commentMarker = renderCommentMarker(objectArray(view.comments), commentLines.length, view.commentsCount);
+  const comments = objectArray(view.comments);
+  const commentLines = renderComments(comments, data.anchor, appendix, tool);
+  const knownCommentTotal = numberValue(view.commentsCount);
+  const commentMarker = omissionMarker("Conversation comments", "comments", commentLines.length, comments.length, knownCommentTotal !== null && knownCommentTotal > comments.length ? knownCommentTotal : null, tool, "gh issue view -c");
   if (commentMarker)
     commentLines.push(commentMarker);
   if (view.anchorUnavailable === true && data.anchor?.startsWith("issuecomment-"))
@@ -686,7 +696,7 @@ export function renderGitHubPrIssue(data) {
   lines.push(...commentLines.length > 0 ? commentLines : ["none"], "");
   if (data.kind === "pull") {
     lines.push("## Review thread comments");
-    const threadLines = renderReviewThreads(data.reviewThreads, data.anchor, appendix, view.reviewCommentsCount, data.reviewThreadsBounded, data.reviewThreadsUnavailable);
+    const threadLines = renderReviewThreads(data.reviewThreads, data.anchor, appendix, tool, view.reviewCommentsCount, data.reviewThreadsBounded, data.reviewThreadsUnavailable);
     if (view.anchorUnavailable === true && data.anchor?.startsWith("discussion_r"))
       threadLines.push("[anchored review thread comment unavailable for this pull request]");
     lines.push(...threadLines.length > 0 ? threadLines : ["none"], "");
@@ -694,14 +704,18 @@ export function renderGitHubPrIssue(data) {
   if (data.fallbackNotes.length > 0) {
     lines.push("## Availability notes", ...data.fallbackNotes.map((note) => `- ${note}`), "");
   }
-  if (appendix.length > 0)
-    lines.push("## Appendix", ...appendix, "");
   const viewCommand = data.kind === "pull" ? `gh pr view ${data.number} --repo ${data.owner}/${data.repo}` : `gh issue view ${data.number} --repo ${data.owner}/${data.repo} -c`;
+  const diffCommand = data.kind === "pull" ? `gh pr diff ${data.number} --repo ${data.owner}/${data.repo}` : "";
   lines.push("## Escalation commands");
   lines.push(`- Full view: \`${viewCommand}\``);
-  if (data.kind === "pull")
-    lines.push(`- Complete diff: \`gh pr diff ${data.number} --repo ${data.owner}/${data.repo}\``);
-  lines.push("- Stored full document: use `get_search_content` with `offset` or `findText`.");
+  if (diffCommand)
+    lines.push(`- Complete diff: \`${diffCommand}\``);
+  if (tool)
+    lines.push(`- Stored full document: use \`${tool}\` with \`offset\` or \`findText\`.`);
+  if (appendix.length > 0)
+    lines.push("", "## Appendix", "", appendix.join(`
+
+`));
   const content = lines.join(`
 `);
   return {
@@ -709,7 +723,7 @@ export function renderGitHubPrIssue(data) {
     title: `${data.owner}/${data.repo} ${data.kind} #${data.number}: ${title}`,
     content: content.length > MAX_DOC_CHARS ? `${content.slice(0, MAX_DOC_CHARS)}
 
-[GitHub document truncated at ${MAX_DOC_CHARS} chars; use the gh escalation commands for complete data]` : content,
+[GitHub document truncated at ${MAX_DOC_CHARS} chars; use \`${viewCommand}\`${diffCommand ? ` or \`${diffCommand}\`` : ""} for complete data]` : content,
     error: null
   };
 }
@@ -721,6 +735,7 @@ export async function extractGitHubIssuePr(url, signal, options) {
     return null;
   if (signal?.aborted)
     return { url, title: "", content: "", error: "Aborted" };
+  const retrievalTool = options?.toolNames ? options.toolNames.getSearchContent ?? null : undefined;
   const ghAvailable = await checkGhAvailable(signal);
   if (signal?.aborted)
     return { url, title: "", content: "", error: "Aborted" };
@@ -736,7 +751,7 @@ export async function extractGitHubIssuePr(url, signal, options) {
       if (threads.anchorUnavailable)
         viewed.view.anchorUnavailable = true;
       const notes = [...viewed.notes, ...threads.note ? [threads.note] : []];
-      return renderGitHubPrIssue({ url, owner: info.owner, repo: info.repo, kind: info.kind, number: info.number, anchor: info.anchor, view: viewed.view, reviewThreads: threads.comments, reviewThreadsBounded: threads.bounded, reviewThreadsUnavailable: threads.unavailable, fallbackNotes: notes });
+      return renderGitHubPrIssue({ url, owner: info.owner, repo: info.repo, kind: info.kind, number: info.number, anchor: info.anchor, view: viewed.view, reviewThreads: threads.comments, reviewThreadsBounded: threads.bounded, reviewThreadsUnavailable: threads.unavailable, fallbackNotes: notes, retrievalTool });
     }
   } else {
     showGhHint();
@@ -745,6 +760,6 @@ export async function extractGitHubIssuePr(url, signal, options) {
   if (!fallback)
     return null;
   if ("data" in fallback)
-    return renderGitHubPrIssue(fallback.data);
+    return renderGitHubPrIssue({ ...fallback.data, retrievalTool });
   return fallback;
 }