pi-repoprompt-mcp 0.7.1 → 0.7.2

package/README.md

@@ -164,6 +164,7 @@ Create `~/.pi/agent/extensions/repoprompt-mcp.json`:
 
   "confirmDeletes": true,
   "confirmEdits": false,
+  "toolCallTimeoutMs": 5400000,
 
   "readcacheReadFile": true,
   "autoSelectReadSlices": true,
@@ -185,6 +186,7 @@ Options:
 | `command` | auto-detect | MCP server command |
 | `args` | `[]` | MCP server args |
 | `env` | unset | Extra environment variables for the MCP server |
+| `toolCallTimeoutMs` | `5400000` | MCP tool call timeout in milliseconds for RepoPrompt tools like `context_builder` and `oracle_send` (90 minutes by default) |
 | `autoBindOnStart` | `true` | Auto-detect and bind on session start, then reconcile the branch-safe tab for the chosen window |
 | `persistBinding` | `true` | Persist window and tab bindings in Pi session history for branch-safe replay |
 | `confirmDeletes` | `true` | Block delete operations unless `allowDelete: true` |

package/extensions/repoprompt-mcp/src/client.ts

@@ -2,6 +2,7 @@
 
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { DEFAULT_TOOL_CALL_TIMEOUT_MS } from "./types.js";
 import type {
   RpConnection,
   RpToolMeta,
@@ -18,10 +19,6 @@ const CLIENT_INFO = {
 const DEFAULT_CONNECT_TIMEOUT_MS = 6_000;
 const DEFAULT_LIST_TOOLS_TIMEOUT_MS = 10_000;
 
-// Keep parity with the rp-cli integration default (15 minutes). Some RepoPrompt tools
-// (notably context_builder and chat_send) can legitimately take longer than 10s
-const DEFAULT_TOOL_CALL_TIMEOUT_MS = 15 * 60 * 1000;
-
 async function withTimeout<T>(promise: Promise<T>, timeoutMs: number, message: string): Promise<T> {
   let timeoutId: ReturnType<typeof setTimeout> | undefined;
 
@@ -51,6 +48,7 @@ export class RpClient {
   private _status: ConnectionStatus = "disconnected";
   private _tools: RpToolMeta[] = [];
   private _error: string | undefined;
+  private toolCallTimeoutMs = DEFAULT_TOOL_CALL_TIMEOUT_MS;
 
   get status(): ConnectionStatus {
     return this._status;
@@ -68,13 +66,18 @@ export class RpClient {
     return this._status === "connected" && this.client !== null;
   }
 
+  setToolCallTimeoutMs(timeoutMs: number): void {
+    this.toolCallTimeoutMs = timeoutMs;
+  }
+
   /**
    * Connect to the RepoPrompt MCP server
    */
   async connect(
     command: string,
     args: string[],
-    env?: Record<string, string>
+    env?: Record<string, string>,
+    toolCallTimeoutMs = DEFAULT_TOOL_CALL_TIMEOUT_MS
   ): Promise<void> {
     if (this._status === "connecting") {
       throw new Error("Connection already in progress");
@@ -85,6 +88,7 @@ export class RpClient {
 
     this._status = "connecting";
     this._error = undefined;
+    this.toolCallTimeoutMs = toolCallTimeoutMs;
 
     try {
       // Create transport
@@ -156,12 +160,14 @@ export class RpClient {
   async callTool(
     name: string,
     args?: Record<string, unknown>,
-    timeoutMs = DEFAULT_TOOL_CALL_TIMEOUT_MS
+    timeoutMs?: number
   ): Promise<McpToolResult> {
     if (!this.client) {
       throw new Error("Not connected to RepoPrompt MCP server");
     }
 
+    const resolvedTimeoutMs = timeoutMs ?? this.toolCallTimeoutMs;
+
     let result;
     try {
       result = await this.client.callTool(
@@ -170,7 +176,7 @@ export class RpClient {
           arguments: args ?? {},
         },
         undefined,
-        { timeout: timeoutMs }
+        { timeout: resolvedTimeoutMs }
       );
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);

package/extensions/repoprompt-mcp/src/config.ts

@@ -4,7 +4,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import * as os from "node:os";
 import { execFileSync } from "node:child_process";
-import { DIFF_VIEW_MODES, type DiffViewMode, type RpConfig } from "./types.js";
+import { DEFAULT_TOOL_CALL_TIMEOUT_MS, DIFF_VIEW_MODES, type DiffViewMode, type RpConfig } from "./types.js";
 
 // Default configuration
 const DEFAULT_CONFIG: RpConfig = {
@@ -12,6 +12,7 @@ const DEFAULT_CONFIG: RpConfig = {
   persistBinding: true,
   confirmDeletes: true,
   confirmEdits: false,
+  toolCallTimeoutMs: DEFAULT_TOOL_CALL_TIMEOUT_MS,
   collapsedMaxLines: 3,
   diffViewMode: "auto",
   diffSplitMinWidth: 120,
@@ -197,6 +198,12 @@ export function loadConfig(overrides?: Partial<RpConfig>): RpConfig {
     config = { ...config, ...overrides };
   }
 
+  config.toolCallTimeoutMs = clampNumber(
+    config.toolCallTimeoutMs,
+    1_000,
+    24 * 60 * 60 * 1000,
+    DEFAULT_TOOL_CALL_TIMEOUT_MS
+  );
   config.diffViewMode = toDiffViewMode(config.diffViewMode);
   config.diffSplitMinWidth = clampNumber(config.diffSplitMinWidth, 70, 240, DEFAULT_CONFIG.diffSplitMinWidth ?? 120);
 

package/extensions/repoprompt-mcp/src/index.ts

@@ -569,6 +569,9 @@ export default function repopromptMcp(pi: ExtensionAPI) {
   pi.on("before_agent_start", async () => {
     // Reload config so display knobs (collapsedMaxLines etc.) apply without requiring /reload
     config = loadConfig();
+    if (config.toolCallTimeoutMs !== undefined) {
+      getRpClient().setToolCallTimeoutMs(config.toolCallTimeoutMs);
+    }
   });
 
   // Replay-aware read_file caching state (optional; guarded by config.readcacheReadFile)
@@ -2008,15 +2011,19 @@ Mode priority: call > describe > search > windows > bind > status`,
       await initPromise;
     }
 
+    // Reload config so connection/runtime knobs apply without requiring /reload
+    config = loadConfig();
+
     const client = getRpClient();
+    if (config.toolCallTimeoutMs !== undefined) {
+      client.setToolCallTimeoutMs(config.toolCallTimeoutMs);
+    }
     if (client.isConnected) {
       return;
     }
 
     // Lazy reconnect: allow the user to install/configure RepoPrompt after Pi starts
     // and have `rp(...)` work without requiring a restart.
-    config = loadConfig();
-
     const server = getServerCommand(config);
     if (!server) {
       throw new Error(
@@ -2024,7 +2031,7 @@ Mode priority: call > describe > search > windows > bind > status`,
       );
     }
 
-    await client.connect(server.command, server.args, config.env);
+    await client.connect(server.command, server.args, config.env, config.toolCallTimeoutMs);
 
     if (ctx) {
       try {
@@ -3151,7 +3158,7 @@ async function initializeExtension(
 
   // Connect to RepoPrompt
   const client = getRpClient();
-  await client.connect(server.command, server.args, config.env);
+  await client.connect(server.command, server.args, config.env, config.toolCallTimeoutMs);
 
   // Notify connection
   if (ctx.hasUI) {

package/extensions/repoprompt-mcp/src/types.ts

@@ -95,25 +95,28 @@ export interface RpConnection {
 export const DIFF_VIEW_MODES = ["auto", "split", "unified"] as const;
 export type DiffViewMode = (typeof DIFF_VIEW_MODES)[number];
 
+export const DEFAULT_TOOL_CALL_TIMEOUT_MS = 90 * 60 * 1000;
+
 export interface RpConfig {
   // Server connection
   command?: string;
   args?: string[];
   env?: Record<string, string>;
-  
+  toolCallTimeoutMs?: number;      // MCP tool call timeout in ms (default: 5_400_000 / 90 minutes)
+
   // Logging
   suppressHostDisconnectedLog?: boolean;  // Filter known-noisy shutdown log line (default: true)
-  
+
   // Behavior
   autoBindOnStart?: boolean;       // Auto-detect and bind to matching window (default: true)
   persistBinding?: boolean;        // Remember binding across session (default: true)
-  
+
   // Safety
   confirmDeletes?: boolean;        // Require confirmation for deletes (default: true)
   confirmEdits?: boolean;          // Require confirmation for edit-like operations (default: false)
-  
+
   // Display
-  collapsedMaxLines?: number;      // Max lines in collapsed view (default: 15)
+  collapsedMaxLines?: number;      // Max lines in collapsed view (default: 3)
   diffViewMode?: DiffViewMode;     // Diff layout mode: auto, split, unified (default: auto)
   diffSplitMinWidth?: number;      // Minimum width before auto mode uses split diff layout (default: 120)
 
@@ -124,12 +127,12 @@ export interface RpConfig {
   // (tracks read slices/full files so chat_send/"Oracle" has context without manual selection)
   autoSelectReadSlices?: boolean;  // When true, read_file calls add slices/full selection (default: true)
 
-    // App launch
-    autoLaunchApp?: boolean;         // Auto-launch RepoPrompt.app on connection failure (default: false)
-    appPath?: string;                // Explicit path to RepoPrompt.app (inferred from command if omitted)
+  // App launch
+  autoLaunchApp?: boolean;         // Auto-launch RepoPrompt.app on connection failure (default: false)
+  appPath?: string;                // Explicit path to Repo Prompt.app (inferred from command if omitted)
 
-    // /rp oracle behavior
-    oracleDefaultMode?: "chat" | "plan" | "edit" | "review"; // Default mode when /rp oracle omits --mode (default: "chat")
+  // /rp oracle behavior
+  oracleDefaultMode?: "chat" | "plan" | "edit" | "review"; // Default mode when /rp oracle omits --mode (default: "chat")
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-repoprompt-mcp",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "A token-efficient RepoPrompt integration for Pi with automated and branch-safe workspace management",
   "keywords": ["pi-package", "pi", "pi-coding-agent", "repoprompt", "mcp"],
   "license": "MIT",