@inkeep/agents-work-apps 0.46.0 → 0.46.1

package/dist/github/mcp/index.js

@@ -1,6 +1,6 @@
 import runDbClient_default from "../../db/runDbClient.js";
 import { githubMcpAuth } from "./auth.js";
-import { commitFileChanges, commitNewFile, fetchPrFileDiffs, fetchPrFiles, fetchPrInfo, formatFileDiff, generatePrMarkdown, getGitHubClientFromRepo, visualizeUpdateOperations } from "./utils.js";
+import { commitFileChanges, commitNewFile, fetchComments, fetchPrFileDiffs, fetchPrFiles, fetchPrInfo, formatFileDiff, generatePrMarkdown, getGitHubClientFromRepo, visualizeUpdateOperations } from "./utils.js";
 import { getMcpToolRepositoryAccessWithDetails } from "@inkeep/agents-core";
 import { Hono } from "hono";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -78,6 +78,23 @@ const getServer = async (toolId) => {
 				text: `Found ${files.length} files matching "${query}" in ${repoFullName}:\n\n${files.map((file) => `• ${file.name} (${file.path})\n  URL: ${file.url}\n  Score: ${file.score}`).join("\n\n")}`
 			}] };
 		} catch (error) {
+			if (error instanceof Error && "status" in error) {
+				const apiError = error;
+				if (apiError.status === 403 || apiError.status === 429) {
+					const retryAfter = apiError.response?.headers?.["retry-after"];
+					const resetHeader = apiError.response?.headers?.["x-ratelimit-reset"];
+					let waitMessage = "";
+					if (retryAfter) waitMessage = ` Try again in ${retryAfter} seconds.`;
+					else if (resetHeader) waitMessage = ` Rate limit resets at ${(/* @__PURE__ */ new Date(Number(resetHeader) * 1e3)).toISOString()}.`;
+					return {
+						content: [{
+							type: "text",
+							text: `GitHub Search API rate limit exceeded.${waitMessage} The search API is limited to 30 requests per minute. Please wait before retrying.`
+						}],
+						isError: true
+					};
+				}
+			}
 			return {
 				content: [{
 					type: "text",
@@ -158,9 +175,14 @@ const getServer = async (toolId) => {
 					isError: true
 				};
 			}
+			const [pr, fileDiffs, comments] = await Promise.all([
+				fetchPrInfo(githubClient, owner, repo, pull_request_number),
+				fetchPrFileDiffs(githubClient, owner, repo, pull_request_number),
+				fetchComments(githubClient, owner, repo, pull_request_number)
+			]);
 			return { content: [{
 				type: "text",
-				text: generatePrMarkdown(await fetchPrInfo(githubClient, owner, repo, pull_request_number), await fetchPrFileDiffs(githubClient, owner, repo, pull_request_number), owner, repo)
+				text: generatePrMarkdown(pr, fileDiffs, comments, owner, repo)
 			}] };
 		} catch (error) {
 			if (error instanceof Error && "status" in error) {
@@ -643,13 +665,35 @@ const getServer = async (toolId) => {
 	});
 	return server;
 };
+const SERVER_CACHE_TTL_MS = 300 * 1e3;
+const SERVER_CACHE_MAX_SIZE = 100;
+const serverCache = /* @__PURE__ */ new Map();
+const getCachedServer = async (toolId) => {
+	const cached = serverCache.get(toolId);
+	if (cached && cached.expiresAt > Date.now()) {
+		serverCache.delete(toolId);
+		serverCache.set(toolId, cached);
+		return cached.server;
+	}
+	serverCache.delete(toolId);
+	const server = await getServer(toolId);
+	serverCache.set(toolId, {
+		server,
+		expiresAt: Date.now() + SERVER_CACHE_TTL_MS
+	});
+	if (serverCache.size > SERVER_CACHE_MAX_SIZE) {
+		const firstKey = serverCache.keys().next().value;
+		if (firstKey !== void 0) serverCache.delete(firstKey);
+	}
+	return server;
+};
 const app = new Hono();
 app.use("/", githubMcpAuth());
 app.post("/", async (c) => {
 	if (!process.env.GITHUB_APP_ID || !process.env.GITHUB_APP_PRIVATE_KEY) return c.json({ error: "GITHUB_APP_ID and GITHUB_APP_PRIVATE_KEY must be set" }, 500);
 	const toolId = c.get("toolId");
 	const body = await c.req.json();
-	const server = await getServer(toolId);
+	const server = await getCachedServer(toolId);
 	const transport = new StreamableHTTPServerTransport({ sessionIdGenerator: void 0 });
 	server.connect(transport);
 	const { req, res } = toReqRes(c.req.raw);

package/dist/github/mcp/schemas.d.ts

@@ -65,13 +65,21 @@ declare const CommentSchema: z.ZodObject<{
     url: z.ZodURL;
   }, z.core.$strip>;
   createdAt: z.ZodString;
-  updatedAt: z.ZodString;
+  updatedAt: z.ZodOptional<z.ZodString>;
   type: z.ZodEnum<{
     issue: "issue";
     review: "review";
+    review_summary: "review_summary";
   }>;
   path: z.ZodOptional<z.ZodString>;
   line: z.ZodOptional<z.ZodNumber>;
+  state: z.ZodOptional<z.ZodEnum<{
+    APPROVED: "APPROVED";
+    CHANGES_REQUESTED: "CHANGES_REQUESTED";
+    COMMENTED: "COMMENTED";
+    DISMISSED: "DISMISSED";
+    PENDING: "PENDING";
+  }>>;
 }, z.core.$strip>;
 declare const GitHubEventSchema: z.ZodObject<{
   type: z.ZodString;

package/dist/github/mcp/schemas.js

@@ -55,10 +55,21 @@ const CommentSchema = z.object({
 	body: z.string(),
 	author: GitHubUserSchema,
 	createdAt: z.string(),
-	updatedAt: z.string(),
-	type: z.enum(["issue", "review"]),
+	updatedAt: z.string().optional(),
+	type: z.enum([
+		"issue",
+		"review",
+		"review_summary"
+	]),
 	path: z.string().optional(),
-	line: z.number().optional()
+	line: z.number().optional(),
+	state: z.enum([
+		"APPROVED",
+		"CHANGES_REQUESTED",
+		"COMMENTED",
+		"DISMISSED",
+		"PENDING"
+	]).optional()
 });
 const GitHubEventSchema = z.object({
 	type: z.string(),

package/dist/github/mcp/utils.d.ts

@@ -1,4 +1,4 @@
-import { ChangedFile, PullRequest } from "./schemas.js";
+import { ChangedFile, Comment, PullRequest } from "./schemas.js";
 import { Octokit } from "@octokit/rest";
 
 //#region src/github/mcp/utils.d.ts
@@ -152,10 +152,14 @@ declare function fetchPrFiles(octokit: Octokit, owner: string, repo: string, prN
  * Get file-based diffs with all commit messages that impacted each file.
  */
 declare function fetchPrFileDiffs(octokit: Octokit, owner: string, repo: string, prNumber: number): Promise<ChangedFile[]>;
+/**
+ * Fetch all PR comments (both issue comments and review comments)
+ */
+declare function fetchComments(octokit: Octokit, owner: string, repo: string, prNumber: number): Promise<Comment[]>;
 /**
  * Generate a markdown representation of a pull request with file diffs
  */
-declare function generatePrMarkdown(pr: PullRequest, fileDiffs: ChangedFile[], owner: string, repo: string): string;
+declare function generatePrMarkdown(pr: PullRequest, fileDiffs: ChangedFile[], comments: Comment[], owner: string, repo: string): string;
 interface LLMUpdateOperation {
   operation: 'replace_lines' | 'insert_after' | 'insert_before' | 'delete_lines';
   lineStart: number;
@@ -225,4 +229,4 @@ declare function commitNewFile({
 }): Promise<string>;
 declare function formatFileDiff(pullRequestNumber: number, files: ChangedFile[], includeContents?: boolean): Promise<string>;
 //#endregion
-export { CommitData, LLMUpdateOperation, PullCommit, applyOperation, applyOperations, commitFileChanges, commitNewFile, fetchCommitDetails, fetchPrCommits, fetchPrFileDiffs, fetchPrFiles, fetchPrInfo, formatFileDiff, generatePrMarkdown, getFilePathsInRepo, getGitHubClientFromInstallationId, getGitHubClientFromRepo, validateLineNumbers, visualizeUpdateOperations };
+export { CommitData, LLMUpdateOperation, PullCommit, applyOperation, applyOperations, commitFileChanges, commitNewFile, fetchComments, fetchCommitDetails, fetchPrCommits, fetchPrFileDiffs, fetchPrFiles, fetchPrInfo, formatFileDiff, generatePrMarkdown, getFilePathsInRepo, getGitHubClientFromInstallationId, getGitHubClientFromRepo, validateLineNumbers, visualizeUpdateOperations };

package/dist/github/mcp/utils.js

@@ -127,8 +127,8 @@ async function fetchPrFiles(octokit, owner, repo, prNumber, pathFilters = [], in
 		includeContents,
 		includePatch
 	}, `Fetching PR #${prNumber} changed files`);
-	const files = [];
 	const headSha = (await fetchPrInfo(octokit, owner, repo, prNumber)).head.sha;
+	const collectedFiles = [];
 	for await (const response of octokit.paginate.iterator(octokit.rest.pulls.listFiles, {
 		owner,
 		repo,
@@ -136,7 +136,7 @@ async function fetchPrFiles(octokit, owner, repo, prNumber, pathFilters = [], in
 		per_page: 100
 	})) for (const file of response.data) {
 		if (pathFilters.length > 0 && !pathFilters.some((filter) => minimatch(file.filename, filter))) continue;
-		const changedFile = {
+		collectedFiles.push({
 			commit_messages: [],
 			path: file.filename,
 			status: file.status,
@@ -144,25 +144,33 @@ async function fetchPrFiles(octokit, owner, repo, prNumber, pathFilters = [], in
 			deletions: file.deletions,
 			patch: includePatch ? file.patch : void 0,
 			previousPath: file.previous_filename
-		};
-		if (includeContents && file.status !== "removed") try {
-			const { data: content } = await octokit.rest.repos.getContent({
-				owner,
-				repo,
-				path: file.filename,
-				ref: headSha
-			});
-			if ("content" in content && content.encoding === "base64") changedFile.contents = Buffer.from(content.content, "base64").toString("utf-8");
-		} catch (error) {
-			logger.warn({
-				owner,
-				repo,
-				prNumber,
-				headSha,
-				file
-			}, `Failed to fetch contents for ${file.filename}: ${error}`);
+		});
+	}
+	if (includeContents) {
+		const BATCH_SIZE = 10;
+		const filesToFetch = collectedFiles.filter((f) => f.status !== "removed");
+		for (let i = 0; i < filesToFetch.length; i += BATCH_SIZE) {
+			const batch = filesToFetch.slice(i, i + BATCH_SIZE);
+			await Promise.all(batch.map(async (changedFile) => {
+				try {
+					const { data: content } = await octokit.rest.repos.getContent({
+						owner,
+						repo,
+						path: changedFile.path,
+						ref: headSha
+					});
+					if ("content" in content && content.encoding === "base64") changedFile.contents = Buffer.from(content.content, "base64").toString("utf-8");
+				} catch (error) {
+					logger.warn({
+						owner,
+						repo,
+						prNumber,
+						headSha,
+						file: changedFile.path
+					}, `Failed to fetch contents for ${changedFile.path}: ${error}`);
+				}
+			}));
 		}
-		files.push(changedFile);
 	}
 	logger.info({
 		owner,
@@ -171,47 +179,51 @@ async function fetchPrFiles(octokit, owner, repo, prNumber, pathFilters = [], in
 		headSha,
 		pathFilters,
 		includeContents,
-		files
-	}, `Found ${files.length} changed files${pathFilters.length > 0 ? ` matching "${pathFilters.join(", ")}"` : ""}`);
-	return files;
+		fileCount: collectedFiles.length
+	}, `Found ${collectedFiles.length} changed files${pathFilters.length > 0 ? ` matching "${pathFilters.join(", ")}"` : ""}`);
+	return collectedFiles;
 }
 /**
 * Get file-based diffs with all commit messages that impacted each file.
 */
 async function fetchPrFileDiffs(octokit, owner, repo, prNumber) {
 	try {
-		const commits = await fetchPrCommits(octokit, owner, repo, prNumber);
-		const prFiles = await fetchPrFiles(octokit, owner, repo, prNumber);
+		const [commits, prFiles] = await Promise.all([fetchPrCommits(octokit, owner, repo, prNumber), fetchPrFiles(octokit, owner, repo, prNumber)]);
+		const BATCH_SIZE = 10;
+		const commitDetailsList = [];
+		for (let i = 0; i < commits.length; i += BATCH_SIZE) {
+			const batch = commits.slice(i, i + BATCH_SIZE);
+			const batchResults = await Promise.all(batch.map(async (commit) => {
+				const commitDetails = await fetchCommitDetails(octokit, owner, repo, commit.sha);
+				return {
+					sha: commit.sha,
+					message: commit.commit.message,
+					files: commitDetails.files
+				};
+			}));
+			commitDetailsList.push(...batchResults);
+		}
 		const fileToCommits = {};
-		for (const commit of commits) {
-			const commitSha = commit.sha;
-			const commitDetails = await fetchCommitDetails(octokit, owner, repo, commitSha);
-			const commitMessage = commit.commit.message;
-			for (const fileInfo of commitDetails.files || []) {
-				const filename = fileInfo.filename;
-				if (!fileToCommits[filename]) fileToCommits[filename] = [];
-				fileToCommits[filename].push({
-					commit_sha: commitSha,
-					commit_message: commitMessage,
-					file_info: fileInfo
-				});
-			}
+		for (const { sha, message, files } of commitDetailsList) for (const fileInfo of files || []) {
+			const filename = fileInfo.filename;
+			if (!fileToCommits[filename]) fileToCommits[filename] = [];
+			fileToCommits[filename].push({
+				commit_sha: sha,
+				commit_message: message,
+				file_info: fileInfo
+			});
 		}
 		const fileDiffs = [];
 		for (const prFile of prFiles) {
 			const filename = prFile.path;
 			if (filename in fileToCommits) {
-				const commitMessages = fileToCommits[filename].map((commitData) => commitData.commit_message);
-				const diff = prFile.patch;
-				const additions = prFile.additions || 0;
-				const deletions = prFile.deletions || 0;
 				const githubFileDiff = {
-					commit_messages: commitMessages,
+					commit_messages: fileToCommits[filename].map((commitData) => commitData.commit_message),
 					path: filename,
 					status: prFile.status,
-					additions,
-					deletions,
-					patch: diff
+					additions: prFile.additions || 0,
+					deletions: prFile.deletions || 0,
+					patch: prFile.patch
 				};
 				fileDiffs.push(githubFileDiff);
 			}
@@ -222,34 +234,133 @@ async function fetchPrFileDiffs(octokit, owner, repo, prNumber) {
 	}
 }
 /**
+* Fetch all PR comments (both issue comments and review comments)
+*/
+async function fetchComments(octokit, owner, repo, prNumber) {
+	const [issueComments, reviewComments, reviewSummaries] = await Promise.all([
+		(async () => {
+			const results = [];
+			for await (const response of octokit.paginate.iterator(octokit.rest.issues.listComments, {
+				owner,
+				repo,
+				issue_number: prNumber,
+				per_page: 100
+			})) for (const comment of response.data) {
+				if (!comment.user) continue;
+				results.push({
+					id: comment.id,
+					body: comment.body || "",
+					author: mapUser(comment.user),
+					createdAt: comment.created_at,
+					updatedAt: comment.updated_at,
+					type: "issue"
+				});
+			}
+			return results;
+		})(),
+		(async () => {
+			const results = [];
+			for await (const response of octokit.paginate.iterator(octokit.rest.pulls.listReviewComments, {
+				owner,
+				repo,
+				pull_number: prNumber,
+				per_page: 100
+			})) for (const comment of response.data) results.push({
+				id: comment.id,
+				body: comment.body,
+				author: mapUser(comment.user),
+				createdAt: comment.created_at,
+				updatedAt: comment.updated_at,
+				type: "review",
+				path: comment.path,
+				line: comment.line || comment.original_line
+			});
+			return results;
+		})(),
+		(async () => {
+			const results = [];
+			for await (const response of octokit.paginate.iterator(octokit.rest.pulls.listReviews, {
+				owner,
+				repo,
+				pull_number: prNumber,
+				per_page: 100
+			})) for (const review of response.data) if (review.body && review.user) results.push({
+				id: review.id,
+				body: review.body,
+				author: mapUser(review.user),
+				createdAt: review.submitted_at ?? (/* @__PURE__ */ new Date()).toISOString(),
+				type: "review_summary",
+				state: review.state
+			});
+			return results;
+		})()
+	]);
+	return [
+		...issueComments,
+		...reviewComments,
+		...reviewSummaries
+	].filter((c) => {
+		const login = c.author.login;
+		if (login.endsWith("[bot]") && login !== "inkeep[bot]") return false;
+		return true;
+	});
+}
+/**
 * Generate a markdown representation of a pull request with file diffs
 */
-function generatePrMarkdown(pr, fileDiffs, owner, repo) {
+function generatePrMarkdown(pr, fileDiffs, comments, owner, repo) {
 	let markdown = `# Pull Request #${pr.number}: ${pr.title}\n\n`;
-	markdown += `**Repository:** ${owner}/${repo}\n`;
-	markdown += `**State:** ${pr.state}\n`;
-	markdown += `**Author:** ${pr.author.login}\n`;
-	markdown += `**Created:** ${new Date(pr.createdAt).toLocaleDateString()}\n`;
-	markdown += `**Updated:** ${new Date(pr.updatedAt).toLocaleDateString()}\n\n`;
-	markdown += "## Branches\n";
-	markdown += `- **From:** \`${pr.head.ref}\`\n`;
-	markdown += `- **To:** \`${pr.base.ref}\` (${owner}/${repo})\n\n`;
-	markdown += `**URL:** ${pr.url}\n\n`;
-	if (pr.body) markdown += `## Description\n${pr.body}\n\n`;
-	else markdown += "## Description\n_No description provided._\n\n";
-	if (fileDiffs.length > 0) {
-		markdown += "## Files Changed\n";
-		for (const fileDiff of fileDiffs) {
-			markdown += `### ${fileDiff.path}\n`;
-			markdown += `- **Additions:** +${fileDiff.additions}\n`;
-			markdown += `- **Deletions:** -${fileDiff.deletions}\n`;
-			if (fileDiff.commit_messages.length > 0) {
-				markdown += "- **Related commits:**\n";
-				const uniqueMessages = [...new Set(fileDiff.commit_messages)];
-				for (const message of uniqueMessages) markdown += `  - ${message.split("\n")[0]}\n`;
-			}
+	markdown += "<metadata>\n";
+	markdown += `Repository: ${owner}/${repo}\n`;
+	markdown += `State: ${pr.state}\n`;
+	markdown += `Author: ${pr.author.login}\n`;
+	markdown += `Created: ${new Date(pr.createdAt).toLocaleDateString()}\n`;
+	markdown += `Updated: ${new Date(pr.updatedAt).toLocaleDateString()}\n`;
+	markdown += `Branch: ${pr.head.ref} → ${pr.base.ref}\n`;
+	markdown += `URL: ${pr.url}\n`;
+	markdown += "</metadata>\n\n";
+	if (pr.body) markdown += `<description>\n${pr.body}\n</description>\n\n`;
+	markdown += "<files>\n";
+	if (fileDiffs.length > 0) for (const fileDiff of fileDiffs) {
+		markdown += `${fileDiff.path} (+${fileDiff.additions}/-${fileDiff.deletions})\n`;
+		if (fileDiff.commit_messages.length > 0) {
+			const uniqueMessages = [...new Set(fileDiff.commit_messages)];
+			for (const message of uniqueMessages) markdown += `  - ${message.split("\n")[0]}\n`;
+		}
+	}
+	markdown += "</files>\n\n";
+	if (comments.length > 0) {
+		markdown += "<comments>\n";
+		const reviewSummaries = comments.filter((c) => c.type === "review_summary");
+		const issueComments = comments.filter((c) => c.type === "issue");
+		const reviewComments = comments.filter((c) => c.type === "review");
+		for (const review of reviewSummaries) {
+			markdown += `[${review.state}] @${review.author.login} (${new Date(review.createdAt).toLocaleDateString()})\n`;
+			if (review.body) markdown += `${review.body}\n`;
 			markdown += "\n";
 		}
+		for (const comment of issueComments) {
+			markdown += `@${comment.author.login} (${new Date(comment.createdAt).toLocaleDateString()})\n`;
+			markdown += `${comment.body}\n\n`;
+		}
+		if (reviewComments.length > 0) {
+			const commentsByFile = /* @__PURE__ */ new Map();
+			for (const comment of reviewComments) {
+				const path = comment.path || "unknown";
+				const existing = commentsByFile.get(path) || [];
+				existing.push(comment);
+				commentsByFile.set(path, existing);
+			}
+			for (const [path, fileComments] of commentsByFile) {
+				markdown += `${path}:\n`;
+				for (const comment of fileComments) {
+					const lineInfo = comment.line ? ` line ${comment.line}` : "";
+					markdown += `  @${comment.author.login}${lineInfo} (${new Date(comment.createdAt).toLocaleDateString()})\n`;
+					markdown += `  ${comment.body}\n\n`;
+				}
+			}
+		}
+		markdown += "</comments>\n";
 	}
 	return markdown;
 }
@@ -461,4 +572,4 @@ async function formatFileDiff(pullRequestNumber, files, includeContents = false)
 }
 
 //#endregion
-export { applyOperation, applyOperations, commitFileChanges, commitNewFile, fetchCommitDetails, fetchPrCommits, fetchPrFileDiffs, fetchPrFiles, fetchPrInfo, formatFileDiff, generatePrMarkdown, getFilePathsInRepo, getGitHubClientFromInstallationId, getGitHubClientFromRepo, validateLineNumbers, visualizeUpdateOperations };
+export { applyOperation, applyOperations, commitFileChanges, commitNewFile, fetchComments, fetchCommitDetails, fetchPrCommits, fetchPrFileDiffs, fetchPrFiles, fetchPrInfo, formatFileDiff, generatePrMarkdown, getFilePathsInRepo, getGitHubClientFromInstallationId, getGitHubClientFromRepo, validateLineNumbers, visualizeUpdateOperations };

package/dist/github/routes/tokenExchange.d.ts

@@ -1,7 +1,7 @@
 import { Hono } from "hono";
-import * as hono_types6 from "hono/types";
+import * as hono_types8 from "hono/types";
 
 //#region src/github/routes/tokenExchange.d.ts
-declare const app: Hono<hono_types6.BlankEnv, hono_types6.BlankSchema, "/">;
+declare const app: Hono<hono_types8.BlankEnv, hono_types8.BlankSchema, "/">;
 //#endregion
 export { app as default };

package/dist/github/routes/webhooks.d.ts

@@ -1,5 +1,5 @@
 import { Hono } from "hono";
-import * as hono_types8 from "hono/types";
+import * as hono_types6 from "hono/types";
 
 //#region src/github/routes/webhooks.d.ts
 interface WebhookVerificationResult {
@@ -7,6 +7,6 @@ interface WebhookVerificationResult {
   error?: string;
 }
 declare function verifyWebhookSignature(payload: string, signature: string | undefined, secret: string): WebhookVerificationResult;
-declare const app: Hono<hono_types8.BlankEnv, hono_types8.BlankSchema, "/">;
+declare const app: Hono<hono_types6.BlankEnv, hono_types6.BlankSchema, "/">;
 //#endregion
 export { WebhookVerificationResult, app as default, verifyWebhookSignature };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkeep/agents-work-apps",
-  "version": "0.46.0",
+  "version": "0.46.1",
   "description": "First party integrations for Inkeep Agents",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE.md",
@@ -24,7 +24,7 @@
     "hono": "^4.11.7",
     "jose": "^6.1.0",
     "minimatch": "^10.1.1",
-    "@inkeep/agents-core": "0.46.0"
+    "@inkeep/agents-core": "0.46.1"
   },
   "peerDependencies": {
     "@hono/zod-openapi": "^1.1.5",