@arii/boomtick-mcp 0.6.1 → 0.6.2

package/src/mcp/definitions.ts

@@ -2,9 +2,12 @@ import { Tool, Prompt, Resource, ResourceTemplate } from "@modelcontextprotocol/
 import {
   HealthCheckInputJsonSchema,
   SearchPRsInputJsonSchema,
+  SearchPRsResponseJsonSchema,
   GetPrDiffInputJsonSchema,
+  PrDiffResponseJsonSchema,
   CheckoutBranchInputJsonSchema,
   GetMergeConflictFilesInputJsonSchema,
+  GetMergeConflictFilesResponseJsonSchema,
   GetChangedFilesInputJsonSchema,
   GetPackageScriptsInputJsonSchema,
   ReadCiLogsInputJsonSchema,
@@ -12,6 +15,7 @@ import {
   CreateBranchInputJsonSchema,
   CreateRepairBranchInputJsonSchema,
   RunTestsInputJsonSchema,
+  RunTestsResponseJsonSchema,
   CommitPatchInputJsonSchema,
   OpenReplacementPrInputJsonSchema,
   CreatePullRequestInputJsonSchema,
@@ -19,8 +23,10 @@ import {
   GetPrInputJsonSchema,
   IssueViewInputJsonSchema,
   IssueUpdateInputJsonSchema,
+  IssueUpdateResponseJsonSchema,
   IssueCommentInputJsonSchema,
   CreateIssueInputJsonSchema,
+  CreateIssueResponseJsonSchema,
   GetCommandSchemaInputJsonSchema,
   ReadAgentContextInputJsonSchema as ReadAgentContextSchema,
   CreateJulesSessionInputJsonSchema,
@@ -78,6 +84,12 @@ export const MCP_RESOURCES: Resource[] = [
     mimeType: "application/json",
     description: "List of changed files in the repository.",
   },
+  {
+    uri: "mcp://ci/latest-run",
+    name: "Latest CI Run",
+    mimeType: "application/json",
+    description: "Recent CI exit statuses, workflow runs, and annotations.",
+  },
   {
     uri: "repo://package-json",
     name: "package.json",
@@ -130,7 +142,7 @@ const BASE_MCP_TOOLS: Tool[] = [
     name: "github.search_open_prs",
     description: "Search for open pull requests in the repository.",
     inputSchema: SearchPRsInputJsonSchema as any,
-    outputSchema: DEFAULT_OUTPUT_SCHEMA as any,
+    outputSchema: SearchPRsResponseJsonSchema as any,
   },
   {
     name: "repo.read_agent_context",
@@ -142,7 +154,7 @@ const BASE_MCP_TOOLS: Tool[] = [
     name: "github.get_pr_diff",
     description: "Get the diff and changed files for a pull request.",
     inputSchema: GetPrDiffInputJsonSchema as any,
-    outputSchema: DEFAULT_OUTPUT_SCHEMA as any,
+    outputSchema: PrDiffResponseJsonSchema as any,
   },
   {
     name: "github.checkout_branch",
@@ -154,7 +166,7 @@ const BASE_MCP_TOOLS: Tool[] = [
     name: "github.get_merge_conflict_files",
     description: "Detect files that conflict when a PR is merged with the base branch.",
     inputSchema: GetMergeConflictFilesInputJsonSchema as any,
-    outputSchema: DEFAULT_OUTPUT_SCHEMA as any,
+    outputSchema: GetMergeConflictFilesResponseJsonSchema as any,
   },
   {
     name: "repo.get_changed_files",
@@ -198,11 +210,27 @@ const BASE_MCP_TOOLS: Tool[] = [
     inputSchema: CreateRepairBranchInputJsonSchema as any,
     outputSchema: DEFAULT_OUTPUT_SCHEMA as any,
   },
+  {
+    name: "repo.check_jules_status",
+    description: "Check or poll the status of a Jules remediation session and verify its branch or PR status.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        sessionId: { type: "string", description: "The unique ID or task ID of the Jules session." },
+        commitSha: { type: "string", description: "Commit SHA for idempotency key verification." },
+        failureLog: { type: "string", description: "Failure log content for idempotency key calculation." },
+        poll: { type: "boolean", description: "Whether to poll until session completion or timeout." },
+        timeoutMs: { type: "integer", description: "Timeout in milliseconds when polling." },
+        intervalMs: { type: "integer", description: "Polling interval in milliseconds." },
+      },
+    } as any,
+    outputSchema: DEFAULT_OUTPUT_SCHEMA as any,
+  },
   {
     name: "repo.run_tests",
     description: "Run repository tests and checks.",
     inputSchema: RunTestsInputJsonSchema as any,
-    outputSchema: DEFAULT_OUTPUT_SCHEMA as any,
+    outputSchema: RunTestsResponseJsonSchema as any,
   },
   {
     name: "repo.commit_patch",
@@ -262,7 +290,7 @@ const BASE_MCP_TOOLS: Tool[] = [
     name: "github.issue_update",
     description: "Update a GitHub issue's body, labels, and/or state.",
     inputSchema: IssueUpdateInputJsonSchema as any,
-    outputSchema: DEFAULT_OUTPUT_SCHEMA as any,
+    outputSchema: IssueUpdateResponseJsonSchema as any,
   },
   {
     name: "github.issue_comment",
@@ -274,7 +302,7 @@ const BASE_MCP_TOOLS: Tool[] = [
     name: "github.create_issue",
     description: "Create a new GitHub issue.",
     inputSchema: CreateIssueInputJsonSchema as any,
-    outputSchema: DEFAULT_OUTPUT_SCHEMA as any,
+    outputSchema: CreateIssueResponseJsonSchema as any,
   },
   {
     name: "jules.create_session",

package/src/mcp/http.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect, beforeEach, afterEach } from "vitest";
-import http from "node:http";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { createMcpHttpServer } from "./http.js";
+import { BoomtickMCPServer } from "./server.js";
 
 describe("createMcpHttpServer", () => {
   let mcpServer: Server;
@@ -18,19 +18,48 @@ describe("createMcpHttpServer", () => {
     }
   });
 
-  it("should respond with OAuth protected resource metadata on /.well-known/oauth-protected-resource", async () => {
+  it("should respond with RFC 9728 OAuth protected resource metadata on /.well-known/oauth-protected-resource", async () => {
     httpServerObj = createMcpHttpServer({ port: 0, mcpServer });
     port = await httpServerObj.listen(0);
 
     const res = await fetch(`http://localhost:${port}/.well-known/oauth-protected-resource`);
     expect(res.status).toBe(200);
+    expect(res.headers.get("content-type")).toContain("application/json");
+
     const body = await res.json();
     expect(body.resource).toBe("mcp://boomtick-mcp");
-    expect(body.authorization_servers).toBeDefined();
+    expect(body.authorization_servers).toEqual(["https://auth.boomtick.dev"]);
     expect(body.scopes_supported).toEqual(["mcp:read", "mcp:write"]);
+    expect(body.bearer_methods_supported).toEqual(["header"]);
+    expect(body.resource_documentation).toBe("https://github.com/arii/boomtick");
+  });
+
+  it("should handle HEAD requests for /.well-known/oauth-protected-resource", async () => {
+    httpServerObj = createMcpHttpServer({ port: 0, mcpServer });
+    port = await httpServerObj.listen(0);
+
+    const res = await fetch(`http://localhost:${port}/.well-known/oauth-protected-resource`, {
+      method: "HEAD",
+    });
+    expect(res.status).toBe(200);
+    const text = await res.text();
+    expect(text).toBe("");
+  });
+
+  it("should handle OPTIONS preflight CORS requests", async () => {
+    httpServerObj = createMcpHttpServer({ port: 0, mcpServer });
+    port = await httpServerObj.listen(0);
+
+    const res = await fetch(`http://localhost:${port}/sse`, {
+      method: "OPTIONS",
+    });
+    expect(res.status).toBe(204);
+    expect(res.headers.get("access-control-allow-origin")).toBe("*");
+    expect(res.headers.get("access-control-allow-methods")).toContain("GET");
+    expect(res.headers.get("access-control-allow-headers")).toContain("Authorization");
   });
 
-  it("should reject requests when Bearer token is missing or invalid", async () => {
+  it("should reject protected requests when Bearer token is missing or invalid", async () => {
     httpServerObj = createMcpHttpServer({ port: 0, bearerToken: "secret123", mcpServer });
     port = await httpServerObj.listen(0);
 
@@ -38,6 +67,7 @@ describe("createMcpHttpServer", () => {
     const res1 = await fetch(`http://localhost:${port}/sse`);
     expect(res1.status).toBe(401);
     expect(res1.headers.get("www-authenticate")).toContain('Bearer realm="boomtick-mcp"');
+    expect(res1.headers.get("www-authenticate")).toContain('error="invalid_token"');
 
     // Request with wrong token
     const res2 = await fetch(`http://localhost:${port}/sse`, {
@@ -45,7 +75,7 @@ describe("createMcpHttpServer", () => {
     });
     expect(res2.status).toBe(401);
 
-    // Request with valid token
+    // Public resource metadata accessible with or without token
     const res3 = await fetch(`http://localhost:${port}/.well-known/oauth-protected-resource`, {
       headers: { Authorization: "Bearer secret123" },
     });
@@ -69,4 +99,34 @@ describe("createMcpHttpServer", () => {
     const body = await res.json();
     expect(body.error).toContain("Server misconfiguration");
   });
+
+  it("should return 400 for message requests without session or invalid session", async () => {
+    httpServerObj = createMcpHttpServer({ port: 0, bearerToken: "secret123", mcpServer });
+    port = await httpServerObj.listen(0);
+
+    const res = await fetch(`http://localhost:${port}/messages?sessionId=invalid_session`, {
+      method: "POST",
+      headers: {
+        Authorization: "Bearer secret123",
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({ jsonrpc: "2.0", method: "ping", id: 1 }),
+    });
+
+    expect(res.status).toBe(400);
+    const body = await res.json();
+    expect(body.error).toContain("Session not found or expired");
+  });
+
+  it("should allow BoomtickMCPServer to start HTTP server via run() when transport is http", async () => {
+    process.env.MCP_TRANSPORT = "http";
+    process.env.PORT = "0";
+    process.env.BOOMTICK_MCP_BEARER_TOKEN = "test-token";
+
+    const boomtickServer = new BoomtickMCPServer();
+    await boomtickServer.run();
+
+    // Verify instance initialized properly
+    expect(boomtickServer).toBeInstanceOf(BoomtickMCPServer);
+  });
 });

package/src/mcp/http.ts

@@ -21,7 +21,7 @@ export function createMcpHttpServer(options: HttpServerOptions) {
   const server = http.createServer(async (req, res) => {
     // CORS Headers
     res.setHeader("Access-Control-Allow-Origin", "*");
-    res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
+    res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS, HEAD");
     res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
 
     if (req.method === "OPTIONS") {
@@ -32,22 +32,28 @@ export function createMcpHttpServer(options: HttpServerOptions) {
 
     const url = new URL(req.url || "/", `http://${req.headers.host || "localhost"}`);
 
-    // Endpoint 1: OAuth Protected Resource metadata
-    if (url.pathname === "/.well-known/oauth-protected-resource" && req.method === "GET") {
+    // Endpoint 1: RFC 9728 OAuth Protected Resource Metadata Discovery
+    if (url.pathname === "/.well-known/oauth-protected-resource" && (req.method === "GET" || req.method === "HEAD")) {
+      const metadata = {
+        resource: process.env.MCP_RESOURCE_URI || process.env.BOOMTICK_RESOURCE_URI || "mcp://boomtick-mcp",
+        authorization_servers: [
+          process.env.MCP_OAUTH_AUTH_SERVER || "https://auth.boomtick.dev",
+        ],
+        scopes_supported: ["mcp:read", "mcp:write"],
+        bearer_methods_supported: ["header"],
+        resource_documentation: process.env.MCP_RESOURCE_DOCS || "https://github.com/arii/boomtick",
+      };
+
       res.writeHead(200, { "Content-Type": "application/json" });
-      res.end(
-        JSON.stringify({
-          resource: "mcp://boomtick-mcp",
-          "authorization_servers": [
-            process.env.MCP_OAUTH_AUTH_SERVER || "https://auth.boomtick.dev",
-          ],
-          scopes_supported: ["mcp:read", "mcp:write"],
-        })
-      );
+      if (req.method === "HEAD") {
+        res.end();
+      } else {
+        res.end(JSON.stringify(metadata, null, 2));
+      }
       return;
     }
 
-    // Bearer Token Validation for SSE & Messages endpoints
+    // Bearer Token / OAuth 2.1 Validation for Protected Routes (/sse & /messages)
     if (url.pathname === "/sse" || url.pathname === "/messages") {
       if (!bearerToken) {
         res.writeHead(500, { "Content-Type": "application/json" });
@@ -67,7 +73,7 @@ export function createMcpHttpServer(options: HttpServerOptions) {
       if (!isMatch) {
         res.writeHead(401, {
           "Content-Type": "application/json",
-          "WWW-Authenticate": 'Bearer realm="boomtick-mcp", error="invalid_token"',
+          "WWW-Authenticate": 'Bearer realm="boomtick-mcp", error="invalid_token", error_description="Invalid or missing Bearer token"',
         });
         res.end(JSON.stringify({ error: "unauthorized", message: "Invalid or missing Bearer token" }));
         return;

package/src/mcp/server.test.ts

@@ -100,12 +100,16 @@ describe("BoomtickMCPServer", () => {
   });
 
   describe("ListResources", () => {
-    it("should return resources list", async () => {
+    it("should return resources list containing workspace resources", async () => {
       const handler = requestHandlers.get("resources/list");
       expect(handler).toBeDefined();
       const result = await handler!({ method: "resources/list" });
       expect(result.resources).toBeDefined();
       expect(Array.isArray(result.resources)).toBe(true);
+      const uris = result.resources.map((r: any) => r.uri);
+      expect(uris).toContain("mcp://workspace/agent-contract");
+      expect(uris).toContain("mcp://git/changed-files");
+      expect(uris).toContain("mcp://ci/latest-run");
     });
 
     it("should return resource templates list", async () => {
@@ -188,6 +192,35 @@ describe("BoomtickMCPServer", () => {
       expect(JSON.parse(result.contents[0].text)).toEqual({ status: "success" });
     });
 
+    it("should handle mcp://git/changed-files", async () => {
+      const handler = requestHandlers.get("resources/read");
+      const changedFilesModule = await import("../tools/repo.get_changed_files.js");
+      vi.spyOn(changedFilesModule, "getChangedFilesHandler").mockResolvedValue({ files: ["src/index.ts"] } as any);
+
+      const result = await handler!({
+        method: "resources/read",
+        params: { uri: "mcp://git/changed-files" },
+      });
+
+      expect(result.contents[0].uri).toBe("mcp://git/changed-files");
+      expect(result.contents[0].mimeType).toBe("application/json");
+      expect(JSON.parse(result.contents[0].text)).toEqual({ files: ["src/index.ts"] });
+    });
+
+    it("should handle mcp://ci/latest-run", async () => {
+      const handler = requestHandlers.get("resources/read");
+      vi.spyOn(workflowRunsModule, "getWorkflowRunsHandler").mockResolvedValue({ workflowRuns: [{ id: 1, status: "completed", conclusion: "success" }] } as any);
+
+      const result = await handler!({
+        method: "resources/read",
+        params: { uri: "mcp://ci/latest-run" },
+      });
+
+      expect(result.contents[0].uri).toBe("mcp://ci/latest-run");
+      expect(result.contents[0].mimeType).toBe("application/json");
+      expect(JSON.parse(result.contents[0].text)).toEqual({ workflowRuns: [{ id: 1, status: "completed", conclusion: "success" }] });
+    });
+
     it("should throw when resource is unknown", async () => {
       const handler = requestHandlers.get("resources/read");
 

package/src/mcp/server.ts

@@ -28,6 +28,7 @@ import { getWorkflowRunsHandler, GetWorkflowRunsInputSchema } from "../tools/rep
 import { createRepairBranchHandler, CreateRepairBranchInputSchema } from "../tools/repo.create_repair_branch.js";
 import { createBranchHandler, CreateBranchInputSchema } from "../tools/repo.create_branch.js";
 import { runTestsHandler, RunTestsInputSchema } from "../tools/repo.run_tests.js";
+import { checkJulesStatusHandler, CheckJulesStatusInputSchema } from "../tools/repo.check_jules_status.js";
 import { commitPatchHandler, CommitPatchInputSchema } from "../tools/repo.commit_patch.js";
 import { openReplacementPrHandler, OpenReplacementPrInputSchema } from "../tools/github.open_replacement_pr.js";
 import { commentTriageSummaryHandler, CommentTriageSummaryInputSchema } from "../tools/github.comment_triage_summary.js";
@@ -150,6 +151,16 @@ export class BoomtickMCPServer {
           contents: [{ uri, mimeType: "application/json", text: JSON.stringify(changedFiles, null, 2) }],
         };
       }
+      if (
+        uri === "mcp://ci/latest-run" ||
+        uri === "repo://ci/latest-run" ||
+        uri === "repo://ci-latest-run"
+      ) {
+        const workflowRuns = await getWorkflowRunsHandler(GetWorkflowRunsInputSchema.parse({}));
+        return {
+          contents: [{ uri, mimeType: "application/json", text: JSON.stringify(workflowRuns, null, 2) }],
+        };
+      }
       if (uri === "repo://package-json" || uri === "mcp://workspace/package-json") {
         const content = await fs.readFile(path.join(config.repoPath, "package.json"), "utf-8");
         return {
@@ -234,6 +245,9 @@ export class BoomtickMCPServer {
           case "repo.create.repair.branch":
           case "repo.create_repair_branch":
             return createSuccessResult(await createRepairBranchHandler(CreateRepairBranchInputSchema.parse(normArgs)));
+          case "repo.check.jules.status":
+          case "repo.check_jules_status":
+            return createSuccessResult(await checkJulesStatusHandler(CheckJulesStatusInputSchema.parse(normArgs)));
           case "repo.run.tests":
           case "repo.run_tests":
             return createSuccessResult(await runTestsHandler(RunTestsInputSchema.parse(normArgs)));
@@ -383,24 +397,35 @@ export class BoomtickMCPServer {
     }
   }
 
-  async startHttp(port = parseInt(process.env.PORT || process.env.HTTP_PORT || "3000", 10), bearerToken?: string) {
-    this.prepareEnvironmentAndPreflight();
-    const mcpHttp = createMcpHttpServer({ port, bearerToken, mcpServer: this.server });
-    return await mcpHttp.listen(port);
-  }
-
   async run() {
     this.prepareEnvironmentAndPreflight();
 
+    const args = process.argv.slice(2);
+    let port = parseInt(process.env.PORT || process.env.HTTP_PORT || "3000", 10);
+    let bearerToken = process.env.BOOMTICK_MCP_BEARER_TOKEN || process.env.MCP_BEARER_TOKEN || process.env.AUTH_TOKEN;
+
+    for (let i = 0; i < args.length; i++) {
+      if (args[i] === "--port" && i + 1 < args.length) {
+        port = parseInt(args[i + 1], 10);
+        i++;
+      } else if (args[i].startsWith("--port=")) {
+        port = parseInt(args[i].split("=")[1], 10);
+      } else if (args[i] === "--bearer-token" && i + 1 < args.length) {
+        bearerToken = args[i + 1];
+        i++;
+      } else if (args[i].startsWith("--bearer-token=")) {
+        bearerToken = args[i].split("=")[1];
+      }
+    }
+
     const isHttp =
       process.env.MCP_TRANSPORT === "http" ||
-      process.argv.includes("--http") ||
-      (process.env.PORT !== undefined && !process.argv.includes("--stdio")) ||
-      (process.env.HTTP_PORT !== undefined && !process.argv.includes("--stdio"));
+      args.includes("--http") ||
+      (process.env.PORT !== undefined && !args.includes("--stdio")) ||
+      (process.env.HTTP_PORT !== undefined && !args.includes("--stdio"));
 
     if (isHttp) {
-      const port = parseInt(process.env.PORT || process.env.HTTP_PORT || "3000", 10);
-      const mcpHttp = createMcpHttpServer({ port, mcpServer: this.server });
+      const mcpHttp = createMcpHttpServer({ port, bearerToken, mcpServer: this.server });
       await mcpHttp.listen(port);
       return;
     }

package/src/tools/contract.ts

@@ -1645,6 +1645,53 @@ export const GetMergeConflictFilesInputJsonSchema = {
   "type": "object"
 } as const;
 
+export const GetMergeConflictFilesResponseSchema = z.object({ "hasConflicts": z.boolean(), "conflictedFiles": z.array(z.string()).optional(), "prNumber": z.union([z.number().int(), z.null()]).default(null), "baseBranch": z.string(), "headRef": z.string() });
+
+export type GetMergeConflictFilesResponse = z.infer<typeof GetMergeConflictFilesResponseSchema>;
+
+export const GetMergeConflictFilesResponseJsonSchema = {
+  "properties": {
+    "hasConflicts": {
+      "title": "Hasconflicts",
+      "type": "boolean"
+    },
+    "conflictedFiles": {
+      "items": {
+        "type": "string"
+      },
+      "title": "Conflictedfiles",
+      "type": "array"
+    },
+    "prNumber": {
+      "anyOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "title": "Prnumber"
+    },
+    "baseBranch": {
+      "title": "Basebranch",
+      "type": "string"
+    },
+    "headRef": {
+      "title": "Headref",
+      "type": "string"
+    }
+  },
+  "required": [
+    "hasConflicts",
+    "baseBranch",
+    "headRef"
+  ],
+  "title": "GetMergeConflictFilesResponse",
+  "type": "object"
+} as const;
+
 export const GetPackageScriptsInputSchema = z.object({ "filter": z.union([z.string(), z.null()]).describe("Optional glob pattern to filter script names.").default(null) });
 
 export type GetPackageScriptsInput = z.infer<typeof GetPackageScriptsInputSchema>;
@@ -3291,6 +3338,44 @@ export const RunTestsInputJsonSchema = {
   "type": "object"
 } as const;
 
+export const RunTestsResponseSchema = z.object({ "passed": z.boolean(), "exitCode": z.number().int(), "failedTests": z.array(z.string()).optional(), "results": z.array(z.record(z.string(), z.any())).optional() });
+
+export type RunTestsResponse = z.infer<typeof RunTestsResponseSchema>;
+
+export const RunTestsResponseJsonSchema = {
+  "properties": {
+    "passed": {
+      "title": "Passed",
+      "type": "boolean"
+    },
+    "exitCode": {
+      "title": "Exitcode",
+      "type": "integer"
+    },
+    "failedTests": {
+      "items": {
+        "type": "string"
+      },
+      "title": "Failedtests",
+      "type": "array"
+    },
+    "results": {
+      "items": {
+        "additionalProperties": true,
+        "type": "object"
+      },
+      "title": "Results",
+      "type": "array"
+    }
+  },
+  "required": [
+    "passed",
+    "exitCode"
+  ],
+  "title": "RunTestsResponse",
+  "type": "object"
+} as const;
+
 export const SearchDdgsInputSchema = z.object({ "query": z.string().describe("The search query."), "maxResults": z.union([z.number().int(), z.null()]).describe("Maximum number of results to return.").default(null) });
 
 export type SearchDdgsInput = z.infer<typeof SearchDdgsInputSchema>;

package/src/tools/github.comment_triage_summary.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { runCommand } from "../lib/shell.js";
+import { runTDCli } from "./jules/cli.js";
 
 export const CommentTriageSummaryInputSchema = z.object({
   prNumber: z.number(),
@@ -7,21 +7,12 @@ export const CommentTriageSummaryInputSchema = z.object({
 });
 
 export async function commentTriageSummaryHandler(args: z.infer<typeof CommentTriageSummaryInputSchema>) {
-  const result = await runCommand("td", [
+  const output = await runTDCli([
     "gh",
     "post-comment",
     "--pr", args.prNumber.toString(),
     "--body", args.body
-  ]);
-
-  if (result.exitCode !== 0) {
-    throw new Error(`Failed to comment on PR: ${result.stderr}`);
-  }
-
-  const output = JSON.parse(result.stdout);
-  if (output.status === "error") {
-    throw new Error(`Failed to comment on PR: ${output.message}`);
-  }
+  ], "comment on PR");
 
   return {
     success: true,

package/src/tools/github.get_merge_conflict_files.ts

@@ -12,10 +12,13 @@ export async function getMergeConflictFilesHandler(args: z.infer<typeof GetMerge
   const headRef = args.headRef || "HEAD";
   const conflictFiles = await getMergeConflictFiles(baseBranch, headRef);
 
+  const hasConflicts = conflictFiles.length > 0;
+
   return {
-    prNumber: args.prNumber,
+    hasConflicts,
+    conflictedFiles: conflictFiles,
+    prNumber: args.prNumber ?? null,
     baseBranch,
     headRef,
-    conflictFiles,
   };
 }

package/src/tools/github.get_pr_diff.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { runCommand } from "../lib/shell.js";
 import { resolveRepo } from "../lib/git.js";
+import { runTDCli } from "./jules/cli.js";
 
 export const GetPrDiffInputSchema = z.object({
   prNumber: z.number().describe("The number of the pull request to get the diff for."),
@@ -11,20 +11,10 @@ export async function getPrDiffHandler(args: z.infer<typeof GetPrDiffInputSchema
   const params = GetPrDiffInputSchema.parse(args);
   const targetRepo = resolveRepo(params.repo);
 
-  const result = await runCommand("td", [
+  const output = await runTDCli([
     "gh", "pr-diff", params.prNumber.toString(), "--repo", targetRepo
-  ]);
+  ], "get PR diff");
 
-  if (result.exitCode !== 0) {
-    throw new Error(`Failed to get PR diff: ${result.stderr}`);
-  }
-
-  const output = JSON.parse(result.stdout);
-  if (output.status === "error") {
-    throw new Error(`Failed to get PR diff: ${output.message}`);
-  }
-
-  // Every TypeScript tool file must be a pure routing shim
   return {
     prNumber: output.prNumber,
     files: output.files,

package/src/tools/jules/cancel-session.ts

@@ -1,22 +1,13 @@
 import { z } from "zod";
 import { JulesSession } from "../types.js";
-import { runCommand } from "../../lib/shell.js";
+import { runTDCli } from "./cli.js";
 
 export const CancelJulesSessionInputSchema = z.object({
   sessionId: z.string(),
 });
 
 export async function cancelJulesSessionHandler(input: z.infer<typeof CancelJulesSessionInputSchema>): Promise<JulesSession> {
-  const result = await runCommand("td", ["agent", "cancel", input.sessionId]);
-
-  if (result.exitCode !== 0) {
-    throw new Error(`Failed to cancel session: ${result.stderr}`);
-  }
-
-  const output = JSON.parse(result.stdout);
-  if (output.status === "error") {
-    throw new Error(`Failed to cancel session: ${output.message}`);
-  }
+  await runTDCli(["agent", "cancel", input.sessionId], "cancel session");
 
   return {
     id: input.sessionId.replace("sessions/", ""),

package/src/tools/jules/cli.ts

@@ -0,0 +1,42 @@
+import { runCommand } from "../../lib/shell.js";
+
+export interface TDCliResponse {
+  status?: string;
+  message?: string;
+  [key: string]: any;
+}
+
+function tryParseJson(text: string): TDCliResponse | null {
+  try {
+    return JSON.parse(text) as TDCliResponse;
+  } catch {
+    return null;
+  }
+}
+
+export async function runTDCli(args: string[], actionName?: string): Promise<TDCliResponse> {
+  const result = await runCommand("td", args);
+  const stdout = result.stdout.trim();
+  const output = stdout.startsWith("{") ? tryParseJson(stdout) : null;
+
+  if (output?.status === "error") {
+    const errorMsg = output.message ?? "Unknown error";
+    if (actionName) {
+      throw new Error(`Failed to ${actionName}: ${errorMsg}`);
+    }
+    throw new Error(`td returned error: ${errorMsg}`);
+  }
+
+  if (result.exitCode !== 0) {
+    if (actionName) {
+      throw new Error(`Failed to ${actionName}: ${result.stderr || stdout}`);
+    }
+    throw new Error(`td command failed (${args.join(" ")}): ${result.stderr || stdout}`);
+  }
+
+  if (!output) {
+    throw new Error(`td returned non-JSON output with exit code 0: ${stdout}`);
+  }
+
+  return output;
+}