@arii/boomtick-mcp 0.4.1 → 0.4.2

package/src/lib/param_utils.test.ts

@@ -0,0 +1,49 @@
+import { describe, it, expect } from "vitest";
+import { normalizeArguments } from "./param_utils.js";
+
+describe("param_utils.normalizeArguments", () => {
+  it("should convert snake_case keys to camelCase", () => {
+    const input = {
+      pr_number: 123,
+      issue_number: 456,
+      worktree_path: "/tmp/worktree",
+      base_branch: "main",
+    };
+    const output = normalizeArguments(input);
+    expect(output).toEqual({
+      prNumber: 123,
+      issueNumber: 456,
+      worktreePath: "/tmp/worktree",
+      baseBranch: "main",
+    });
+  });
+
+  it("should coerce numeric strings for prNumber and issueNumber", () => {
+    const input = {
+      pr_number: "789",
+      issue_number: "101",
+    };
+    const output = normalizeArguments(input);
+    expect(output).toEqual({
+      prNumber: 789,
+      issueNumber: 101,
+    });
+  });
+
+  it("should synchronize branch and branchName", () => {
+    expect(normalizeArguments({ branch: "feat-x" })).toEqual({
+      branch: "feat-x",
+      branchName: "feat-x",
+    });
+
+    expect(normalizeArguments({ branch_name: "feat-y" })).toEqual({
+      branchName: "feat-y",
+      branch: "feat-y",
+    });
+  });
+
+  it("should handle null or empty arguments safely", () => {
+    expect(normalizeArguments(null)).toEqual({});
+    expect(normalizeArguments(undefined)).toEqual({});
+  });
+});

package/src/lib/param_utils.ts

@@ -0,0 +1,42 @@
+export function normalizeArguments(args: Record<string, unknown> | null | undefined): Record<string, unknown> {
+  if (!args || typeof args !== "object") {
+    return {};
+  }
+
+  const result: Record<string, unknown> = {};
+
+  for (const [key, value] of Object.entries(args)) {
+    // Convert snake_case to camelCase
+    const camelKey = key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+
+    // Normalize value recursively if it's an object/array
+    let normalizedValue = value;
+    if (Array.isArray(value)) {
+      normalizedValue = value.map((item) =>
+        item && typeof item === "object" ? normalizeArguments(item as Record<string, unknown>) : item
+      );
+    } else if (value && typeof value === "object" && !(value instanceof RegExp)) {
+      normalizedValue = normalizeArguments(value as Record<string, unknown>);
+    }
+
+    // Coerce numeric string to integer for prNumber / issueNumber if applicable
+    if ((camelKey === "prNumber" || camelKey === "issueNumber") && typeof normalizedValue === "string") {
+      const parsedNum = parseInt(normalizedValue, 10);
+      if (!isNaN(parsedNum)) {
+        normalizedValue = parsedNum;
+      }
+    }
+
+    result[camelKey] = normalizedValue;
+  }
+
+  // Parameter aliases harmonization
+  // branch vs branchName harmonization
+  if (result.branch !== undefined && result.branchName === undefined) {
+    result.branchName = result.branch;
+  } else if (result.branchName !== undefined && result.branch === undefined) {
+    result.branch = result.branchName;
+  }
+
+  return result;
+}

package/src/mcp/definitions.ts

@@ -99,7 +99,7 @@ export const MCP_RESOURCES: Resource[] = [
   },
 ];
 
-export const MCP_TOOLS: Tool[] = [
+const BASE_MCP_TOOLS: Tool[] = [
   {
     name: "boomtick.health",
     description: "Check the health and configuration of the MCP server.",
@@ -276,3 +276,14 @@ export const MCP_TOOLS: Tool[] = [
     inputSchema: SearchDdgsInputJsonSchema as any,
   },
 ];
+
+export const MCP_TOOLS: Tool[] = BASE_MCP_TOOLS.flatMap((tool) => {
+  const underscoreName = tool.name.replace(/\./g, "_");
+  if (underscoreName !== tool.name) {
+    return [
+      { ...tool, name: underscoreName },
+      tool,
+    ];
+  }
+  return [tool];
+});

package/src/mcp/schemas.test.ts

@@ -0,0 +1,34 @@
+import { describe, it, expect } from "vitest";
+import * as fs from "fs";
+import * as path from "path";
+import { execSync } from "child_process";
+
+describe("MCP tool schemas export", () => {
+  it("should generate valid schema files with non-null parameters object", () => {
+    const schemasDir = path.resolve(process.cwd(), ".mcp/schemas");
+    if (!fs.existsSync(schemasDir)) {
+      execSync("npx tsx scripts/sync-mcp-schemas.ts", { cwd: process.cwd() });
+    }
+    expect(fs.existsSync(schemasDir)).toBe(true);
+
+    const files = fs.readdirSync(schemasDir).filter((f) => f.endsWith(".json"));
+    expect(files.length).toBeGreaterThan(0);
+
+    for (const file of files) {
+      const filePath = path.join(schemasDir, file);
+      const content = JSON.parse(fs.readFileSync(filePath, "utf-8"));
+
+      expect(content).toHaveProperty("name");
+      expect(typeof content.name).toBe("string");
+
+      expect(content).toHaveProperty("description");
+      expect(typeof content.description).toBe("string");
+
+      expect(content).toHaveProperty("parameters");
+      expect(content.parameters).not.toBeNull();
+      expect(typeof content.parameters).toBe("object");
+      expect(content.parameters.type).toBe("object");
+      expect(content.parameters.properties).toBeDefined();
+    }
+  });
+});

package/src/mcp/server.ts

@@ -11,6 +11,7 @@ import {
 import { config } from "../config.js";
 import { createSuccessResult, createErrorResult } from "../lib/result.js";
 import { MCP_TOOLS, MCP_PROMPTS, MCP_RESOURCES } from "./definitions.js";
+import { normalizeArguments } from "../lib/param_utils.js";
 import { healthHandler, HealthCheckInputSchema } from "./tools.js";
 import { searchOpenPrsHandler, SearchOpenPrsInputSchema } from "../tools/github.search_open_prs.js";
 import { getPrDiffHandler, GetPrDiffInputSchema } from "../tools/github.get_pr_diff.js";
@@ -182,80 +183,114 @@ export class BoomtickMCPServer {
 
     this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
       try {
-        switch (request.params.name) {
+        const normalizedToolName = request.params.name.replace(/_/g, ".");
+        const normArgs = normalizeArguments(request.params.arguments as Record<string, unknown>);
+
+        switch (normalizedToolName) {
           case "boomtick.health":
-            return createSuccessResult(await healthHandler(HealthCheckInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await healthHandler(HealthCheckInputSchema.parse(normArgs)));
+          case "github.search.open.prs":
           case "github.search_open_prs":
-            return createSuccessResult(await searchOpenPrsHandler(SearchOpenPrsInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await searchOpenPrsHandler(SearchOpenPrsInputSchema.parse(normArgs)));
+          case "repo.read.agent.context":
           case "repo.read_agent_context":
-            return createSuccessResult(await readAgentContextHandler(ReadAgentContextInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await readAgentContextHandler(ReadAgentContextInputSchema.parse(normArgs)));
+          case "github.get.pr.diff":
           case "github.get_pr_diff":
-            return createSuccessResult(await getPrDiffHandler(GetPrDiffInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await getPrDiffHandler(GetPrDiffInputSchema.parse(normArgs)));
+          case "github.get.merge.conflict.files":
           case "github.get_merge_conflict_files":
-            return createSuccessResult(await getMergeConflictFilesHandler(GetMergeConflictFilesInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await getMergeConflictFilesHandler(GetMergeConflictFilesInputSchema.parse(normArgs)));
+          case "github.checkout.branch":
           case "github.checkout_branch":
-            return createSuccessResult(await checkoutBranchHandler(CheckoutBranchInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await checkoutBranchHandler(CheckoutBranchInputSchema.parse(normArgs)));
+          case "repo.get.changed.files":
           case "repo.get_changed_files":
-            return createSuccessResult(await getChangedFilesHandler(GetChangedFilesInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await getChangedFilesHandler(GetChangedFilesInputSchema.parse(normArgs)));
+          case "repo.get.command.schema":
           case "repo.get_command_schema":
-            return createSuccessResult(await getCommandSchemaHandler(GetCommandSchemaInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await getCommandSchemaHandler(GetCommandSchemaInputSchema.parse(normArgs)));
+          case "repo.get.package.scripts":
           case "repo.get_package_scripts":
-            return createSuccessResult(await getPackageScriptsHandler(GetPackageScriptsInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await getPackageScriptsHandler(GetPackageScriptsInputSchema.parse(normArgs)));
+          case "repo.get.route.map":
           case "repo.get_route_map":
-            return createSuccessResult(await getRouteMapHandler(GetRouteMapInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await getRouteMapHandler(GetRouteMapInputSchema.parse(normArgs)));
+          case "repo.read.ci.logs":
           case "repo.read_ci_logs":
-            return createSuccessResult(await readCiLogsHandler(ReadCiLogsInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await readCiLogsHandler(ReadCiLogsInputSchema.parse(normArgs)));
           case "repo.logs":
-            return createSuccessResult(await repoLogsHandler(RepoLogsInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await repoLogsHandler(RepoLogsInputSchema.parse(normArgs)));
+          case "repo.create.branch":
           case "repo.create_branch":
-            return createSuccessResult(await createBranchHandler(CreateBranchInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await createBranchHandler(CreateBranchInputSchema.parse(normArgs)));
+          case "repo.create.repair.branch":
           case "repo.create_repair_branch":
-            return createSuccessResult(await createRepairBranchHandler(CreateRepairBranchInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await createRepairBranchHandler(CreateRepairBranchInputSchema.parse(normArgs)));
+          case "repo.run.tests":
           case "repo.run_tests":
-            return createSuccessResult(await runTestsHandler(RunTestsInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await runTestsHandler(RunTestsInputSchema.parse(normArgs)));
+          case "repo.run.lighthouse":
           case "repo.run_lighthouse":
-            return createSuccessResult(await runLighthouseHandler(RunLighthouseInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await runLighthouseHandler(RunLighthouseInputSchema.parse(normArgs)));
+          case "repo.run.playwright":
           case "repo.run_playwright":
-            return createSuccessResult(await runPlaywrightHandler(RunPlaywrightInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await runPlaywrightHandler(RunPlaywrightInputSchema.parse(normArgs)));
+          case "repo.commit.patch":
           case "repo.commit_patch":
-            return createSuccessResult(await commitPatchHandler(CommitPatchInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await commitPatchHandler(CommitPatchInputSchema.parse(normArgs)));
+          case "github.open.replacement.pr":
           case "github.open_replacement_pr":
-            return createSuccessResult(await openReplacementPrHandler(OpenReplacementPrInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await openReplacementPrHandler(OpenReplacementPrInputSchema.parse(normArgs)));
+          case "github.comment.triage.summary":
           case "github.comment_triage_summary":
-            return createSuccessResult(await commentTriageSummaryHandler(CommentTriageSummaryInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await commentTriageSummaryHandler(CommentTriageSummaryInputSchema.parse(normArgs)));
+          case "github.create.pull.request":
           case "github.create_pull_request":
-            return createSuccessResult(await createPullRequestHandler(CreatePullRequestInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await createPullRequestHandler(CreatePullRequestInputSchema.parse(normArgs)));
+          case "github.get.pr":
           case "github.get_pr":
-            return createSuccessResult(await getPrHandler(GetPrInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await getPrHandler(GetPrInputSchema.parse(normArgs)));
+          case "github.issue.view":
           case "github.issue_view":
-            return createSuccessResult(await issueViewHandler(IssueViewInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await issueViewHandler(IssueViewInputSchema.parse(normArgs)));
+          case "github.issue.update":
           case "github.issue_update":
-            return createSuccessResult(await issueUpdateHandler(IssueUpdateInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await issueUpdateHandler(IssueUpdateInputSchema.parse(normArgs)));
+          case "github.issue.comment":
           case "github.issue_comment":
-            return createSuccessResult(await issueCommentHandler(IssueCommentInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await issueCommentHandler(IssueCommentInputSchema.parse(normArgs)));
+          case "github.create.issue":
           case "github.create_issue":
-            return createSuccessResult(await createIssueHandler(CreateIssueInputSchema.parse(request.params.arguments)));
-
-
+            return createSuccessResult(await createIssueHandler(CreateIssueInputSchema.parse(normArgs)));
 
+          case "jules.create.session":
           case "jules.create_session":
-            return createSuccessResult(await createJulesSessionHandler(CreateJulesSessionInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await createJulesSessionHandler(CreateJulesSessionInputSchema.parse(normArgs)));
+          case "jules.get.session":
           case "jules.get_session":
-            return createSuccessResult(await getJulesSessionHandler(GetJulesSessionInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await getJulesSessionHandler(GetJulesSessionInputSchema.parse(normArgs)));
+          case "jules.send.message":
           case "jules.send_message":
-            return createSuccessResult(await sendJulesMessageHandler(SendJulesMessageInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await sendJulesMessageHandler(SendJulesMessageInputSchema.parse(normArgs)));
+          case "jules.get.messages":
           case "jules.get_messages":
-            return createSuccessResult(await getJulesMessagesHandler(GetJulesMessagesInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await getJulesMessagesHandler(GetJulesMessagesInputSchema.parse(normArgs)));
+          case "jules.list.sessions":
           case "jules.list_sessions":
-            return createSuccessResult(await listJulesSessionsHandler(ListJulesSessionsInputSchema.parse(request.params.arguments || {})));
+            return createSuccessResult(await listJulesSessionsHandler(ListJulesSessionsInputSchema.parse(normArgs)));
+          case "jules.cancel.session":
           case "jules.cancel_session":
-            return createSuccessResult(await cancelJulesSessionHandler(CancelJulesSessionInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await cancelJulesSessionHandler(CancelJulesSessionInputSchema.parse(normArgs)));
+          case "jules.get.pr":
           case "jules.get_pr":
-            return createSuccessResult(await getJulesPullRequestHandler(GetJulesPullRequestInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await getJulesPullRequestHandler(GetJulesPullRequestInputSchema.parse(normArgs)));
+          case "jules.trigger.feedback":
           case "jules.trigger_feedback":
-            return createSuccessResult(await triggerJulesFeedbackHandler(TriggerJulesFeedbackInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await triggerJulesFeedbackHandler(TriggerJulesFeedbackInputSchema.parse(normArgs)));
+          case "agent.search.ddgs":
           case "agent.search_ddgs":
-            return createSuccessResult(await ddgsSearchHandler(DdgsSearchInputSchema.parse(request.params.arguments)));
+            return createSuccessResult(await ddgsSearchHandler(DdgsSearchInputSchema.parse(normArgs)));
           default:
             return createErrorResult(`Tool not found: ${request.params.name}`);
         }

package/src/tools/contract.ts

@@ -1228,7 +1228,7 @@ export const CreateBranchInputJsonSchema = {
   "type": "object"
 } as const;
 
-export const CreateIssueInputSchema = z.object({ "title": z.string().min(1), "body": z.union([z.string().min(1), z.null()]).default(null), "file": z.union([z.string().min(1), z.null()]).default(null), "repo": z.union([z.string(), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
+export const CreateIssueInputSchema = z.object({ "title": z.string().min(1), "body": z.union([z.string().min(1), z.null()]).default(null), "file": z.union([z.string().min(1), z.null()]).default(null), "repo": z.union([z.string().regex(new RegExp("^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$")), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
 
 export type CreateIssueInput = z.infer<typeof CreateIssueInputSchema>;
 
@@ -1268,6 +1268,7 @@ export const CreateIssueInputJsonSchema = {
     "repo": {
       "anyOf": [
         {
+          "pattern": "^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$",
           "type": "string"
         },
         {
@@ -1410,7 +1411,7 @@ export const CreateJulesSessionInputJsonSchema = {
   "type": "object"
 } as const;
 
-export const CreatePullRequestInputSchema = z.object({ "title": z.string().describe("PR Title."), "body": z.string().describe("Description of changes."), "head": z.string().describe("The branch containing changes to merge."), "base": z.string().describe("The target branch to merge into.").default("main"), "draft": z.boolean().describe("Whether to create the PR as a draft.").default(false), "repo": z.union([z.string(), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
+export const CreatePullRequestInputSchema = z.object({ "title": z.string().describe("PR Title."), "body": z.string().describe("Description of changes."), "head": z.string().describe("The branch containing changes to merge."), "base": z.string().describe("The target branch to merge into.").default("main"), "draft": z.boolean().describe("Whether to create the PR as a draft.").default(false), "repo": z.union([z.string().regex(new RegExp("^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$")), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
 
 export type CreatePullRequestInput = z.infer<typeof CreatePullRequestInputSchema>;
 
@@ -1446,6 +1447,7 @@ export const CreatePullRequestInputJsonSchema = {
     "repo": {
       "anyOf": [
         {
+          "pattern": "^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$",
           "type": "string"
         },
         {
@@ -1595,7 +1597,7 @@ export const GetPackageScriptsInputJsonSchema = {
   "type": "object"
 } as const;
 
-export const GetPrDiffInputSchema = z.object({ "prNumber": z.number().int().describe("The number of the pull request to get the diff for.") });
+export const GetPrDiffInputSchema = z.object({ "prNumber": z.number().int().describe("The number of the pull request to get the diff for."), "repo": z.union([z.string().regex(new RegExp("^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$")), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
 
 export type GetPrDiffInput = z.infer<typeof GetPrDiffInputSchema>;
 
@@ -1605,6 +1607,20 @@ export const GetPrDiffInputJsonSchema = {
       "description": "The number of the pull request to get the diff for.",
       "title": "Prnumber",
       "type": "integer"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "pattern": "^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "The target repository override (e.g. org/repo).",
+      "title": "Repo"
     }
   },
   "required": [
@@ -1614,7 +1630,7 @@ export const GetPrDiffInputJsonSchema = {
   "type": "object"
 } as const;
 
-export const GetPrInputSchema = z.object({ "prNumber": z.number().int().describe("The number of the PR to view.") });
+export const GetPrInputSchema = z.object({ "prNumber": z.number().int().describe("The number of the PR to view."), "repo": z.union([z.string().regex(new RegExp("^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$")), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
 
 export type GetPrInput = z.infer<typeof GetPrInputSchema>;
 
@@ -1624,6 +1640,20 @@ export const GetPrInputJsonSchema = {
       "description": "The number of the PR to view.",
       "title": "Prnumber",
       "type": "integer"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "pattern": "^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "The target repository override (e.g. org/repo).",
+      "title": "Repo"
     }
   },
   "required": [
@@ -1674,7 +1704,7 @@ export const HealthCheckInputJsonSchema = {
   "type": "object"
 } as const;
 
-export const IssueCommentInputSchema = z.object({ "issueNumber": z.number().int().describe("The number of the issue to comment on."), "body": z.string().describe("The content of the comment.") });
+export const IssueCommentInputSchema = z.object({ "issueNumber": z.number().int().describe("The number of the issue to comment on."), "body": z.string().describe("The content of the comment."), "repo": z.union([z.string().regex(new RegExp("^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$")), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
 
 export type IssueCommentInput = z.infer<typeof IssueCommentInputSchema>;
 
@@ -1689,6 +1719,20 @@ export const IssueCommentInputJsonSchema = {
       "description": "The content of the comment.",
       "title": "Body",
       "type": "string"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "pattern": "^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "The target repository override (e.g. org/repo).",
+      "title": "Repo"
     }
   },
   "required": [
@@ -1732,7 +1776,7 @@ export const IssueSummaryJsonSchema = {
   "type": "object"
 } as const;
 
-export const IssueUpdateInputSchema = z.object({ "issueNumber": z.number().int().describe("The number of the issue to update."), "body": z.union([z.string(), z.null()]).describe("The new body content for the issue.").default(null), "file": z.union([z.string(), z.null()]).describe("Path to file containing new issue body.").default(null), "labels": z.union([z.array(z.string()), z.null()]).describe("Comma-separated list of labels to set.").default(null), "addLabels": z.union([z.array(z.string()), z.null()]).describe("Comma-separated list of labels to add.").default(null), "removeLabels": z.union([z.array(z.string()), z.null()]).describe("Comma-separated list of labels to remove.").default(null), "state": z.union([z.enum(["open","closed"]), z.null()]).describe("The state to set the issue to.").default(null) });
+export const IssueUpdateInputSchema = z.object({ "issueNumber": z.number().int().describe("The number of the issue to update."), "body": z.union([z.string(), z.null()]).describe("The new body content for the issue.").default(null), "file": z.union([z.string(), z.null()]).describe("Path to file containing new issue body.").default(null), "labels": z.union([z.array(z.string()), z.null()]).describe("Comma-separated list of labels to set.").default(null), "addLabels": z.union([z.array(z.string()), z.null()]).describe("Comma-separated list of labels to add.").default(null), "removeLabels": z.union([z.array(z.string()), z.null()]).describe("Comma-separated list of labels to remove.").default(null), "state": z.union([z.enum(["open","closed"]), z.null()]).describe("The state to set the issue to.").default(null), "repo": z.union([z.string().regex(new RegExp("^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$")), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
 
 export type IssueUpdateInput = z.infer<typeof IssueUpdateInputSchema>;
 
@@ -1833,6 +1877,20 @@ export const IssueUpdateInputJsonSchema = {
       "default": null,
       "description": "The state to set the issue to.",
       "title": "State"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "pattern": "^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "The target repository override (e.g. org/repo).",
+      "title": "Repo"
     }
   },
   "required": [
@@ -1921,7 +1979,7 @@ export const IssueUpdateResponseJsonSchema = {
   "type": "object"
 } as const;
 
-export const IssueViewInputSchema = z.object({ "issueNumber": z.number().int().describe("The number of the issue to view.") });
+export const IssueViewInputSchema = z.object({ "issueNumber": z.number().int().describe("The number of the issue to view."), "repo": z.union([z.string().regex(new RegExp("^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$")), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
 
 export type IssueViewInput = z.infer<typeof IssueViewInputSchema>;
 
@@ -1931,6 +1989,20 @@ export const IssueViewInputJsonSchema = {
       "description": "The number of the issue to view.",
       "title": "Issuenumber",
       "type": "integer"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "pattern": "^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "The target repository override (e.g. org/repo).",
+      "title": "Repo"
     }
   },
   "required": [
@@ -2998,7 +3070,7 @@ export const SearchDdgsInputJsonSchema = {
   "type": "object"
 } as const;
 
-export const SearchPRsInputSchema = z.object({ "state": z.enum(["open","closed","all"]).describe("The state of the PRs to search for.").default("open"), "limit": z.number().int().gte(1).lte(100).describe("The maximum number of PRs to return (default: 100, range: 1-100).").default(100), "includeDrafts": z.boolean().describe("Whether to include draft PRs in the results.").default(true), "labels": z.union([z.array(z.string()), z.null()]).describe("Filter PRs by labels.").default(null) });
+export const SearchPRsInputSchema = z.object({ "state": z.enum(["open","closed","all"]).describe("The state of the PRs to search for.").default("open"), "limit": z.number().int().gte(1).lte(100).describe("The maximum number of PRs to return (default: 100, range: 1-100).").default(100), "includeDrafts": z.boolean().describe("Whether to include draft PRs in the results.").default(true), "labels": z.union([z.array(z.string()), z.null()]).describe("Filter PRs by labels.").default(null), "repo": z.union([z.string().regex(new RegExp("^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$")), z.null()]).describe("The target repository override (e.g. org/repo).").default(null) });
 
 export type SearchPRsInput = z.infer<typeof SearchPRsInputSchema>;
 
@@ -3044,6 +3116,20 @@ export const SearchPRsInputJsonSchema = {
       "default": null,
       "description": "Filter PRs by labels.",
       "title": "Labels"
+    },
+    "repo": {
+      "anyOf": [
+        {
+          "pattern": "^[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+$",
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "The target repository override (e.g. org/repo).",
+      "title": "Repo"
     }
   },
   "title": "SearchPRsInput",

package/src/tools/github.create_issue.test.ts

@@ -27,6 +27,16 @@ describe("github.create_issue", () => {
     });
 
     const result = await createIssueHandler({ title: "Test Issue", body: "Test Body", file: null, repo: null });
+    expect(shell.runCommand).toHaveBeenCalledWith("td-cli", [
+      "gh",
+      "create-issue",
+      "--title",
+      "Test Issue",
+      "--body",
+      "Test Body",
+      "--repo",
+      expect.any(String)
+    ]);
     expect(result.status).toBe("success");
     expect(result.issue?.number).toBe(123);
     expect(result.issue?.title).toBe("Test Issue");

package/src/tools/github.create_issue.ts

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { runCommand } from "../lib/shell.js";
+import { resolveRepo } from "../lib/git.js";
 import { sanitizeError } from "../lib/error_utils.js";
 import { CreateIssueInputSchema, CreateIssueResponseSchema } from "./contract.js";
 
@@ -7,11 +8,12 @@ export { CreateIssueInputSchema };
 
 export async function createIssueHandler(args: z.input<typeof CreateIssueInputSchema>) {
   const params = CreateIssueInputSchema.parse(args);
+  const targetRepo = resolveRepo(params.repo);
 
   const cmdArgs = ["gh", "create-issue", "--title", params.title];
   if (params.body) cmdArgs.push("--body", params.body);
   if (params.file) cmdArgs.push("--file", params.file);
-  if (params.repo) cmdArgs.push("--repo", params.repo);
+  cmdArgs.push("--repo", targetRepo);
 
   const result = await runCommand("td-cli", cmdArgs);
 

package/src/tools/github.create_pull_request.ts

@@ -1,11 +1,13 @@
 import { z } from "zod";
 import { runCommand } from "../lib/shell.js";
+import { resolveRepo } from "../lib/git.js";
 import { CreatePullRequestInputSchema } from "./contract.js";
 
 export { CreatePullRequestInputSchema };
 
 export async function createPullRequestHandler(args: z.input<typeof CreatePullRequestInputSchema>) {
   const params = CreatePullRequestInputSchema.parse(args);
+  const targetRepo = resolveRepo(params.repo);
 
   const tdArgs = [
     "gh",
@@ -13,17 +15,14 @@ export async function createPullRequestHandler(args: z.input<typeof CreatePullRe
     "--title", params.title,
     "--body", params.body,
     "--head", params.head,
-    "--base", params.base
+    "--base", params.base,
+    "--repo", targetRepo
   ];
 
   if (params.draft) {
     tdArgs.push("--draft");
   }
 
-  if (params.repo) {
-    tdArgs.push("--repo", params.repo);
-  }
-
   const result = await runCommand("td-cli", tdArgs);
 
   if (result.exitCode !== 0) {

package/src/tools/github.get_pr.ts

@@ -1,15 +1,18 @@
 import { z } from "zod";
 import { runCommand } from "../lib/shell.js";
+import { resolveRepo } from "../lib/git.js";
 import { sanitizeError } from "../lib/error_utils.js";
 
 export const GetPrInputSchema = z.object({
   prNumber: z.number().describe("The number of the PR to view."),
+  repo: z.string().optional().describe("The target repository override (e.g. org/repo)."),
 });
 
 export async function getPrHandler(args: z.infer<typeof GetPrInputSchema>) {
   const params = GetPrInputSchema.parse(args);
+  const targetRepo = resolveRepo(params.repo);
 
-  const result = await runCommand("td-cli", ["gh", "view", params.prNumber.toString()]);
+  const result = await runCommand("td-cli", ["gh", "view", params.prNumber.toString(), "--repo", targetRepo]);
 
   if (result.exitCode !== 0) {
     throw new Error(`Failed to get PR details: ${sanitizeError(result.stderr)}`);

package/src/tools/github.get_pr_diff.ts

@@ -1,13 +1,18 @@
 import { z } from "zod";
 import { runCommand } from "../lib/shell.js";
+import { resolveRepo } from "../lib/git.js";
 
 export const GetPrDiffInputSchema = z.object({
-  prNumber: z.number(),
+  prNumber: z.number().describe("The number of the pull request to get the diff for."),
+  repo: z.string().optional().describe("The target repository override (e.g. org/repo)."),
 });
 
 export async function getPrDiffHandler(args: z.infer<typeof GetPrDiffInputSchema>) {
+  const params = GetPrDiffInputSchema.parse(args);
+  const targetRepo = resolveRepo(params.repo);
+
   const result = await runCommand("td-cli", [
-    "gh", "pr-diff", args.prNumber.toString()
+    "gh", "pr-diff", params.prNumber.toString(), "--repo", targetRepo
   ]);
 
   if (result.exitCode !== 0) {