pi-codemcp 1.1.1 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-codemcp",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Typed, sandboxed Code Mode access to configured MCP servers for Pi",
   "type": "module",
   "packageManager": "bun@1.3.10",

package/sidecar/mcp_config.py

@@ -235,6 +235,7 @@ def normalize_mcp_config(
                     mcp_url=url,
                     client_name=oauth_client_name,
                     token_storage=oauth_storage,
+                    additional_client_metadata={"token_endpoint_auth_method": "none"},
                 )
                 auth_kind = "oauth"
             elif isinstance(raw_auth, str):

package/src/mcp-client.ts

@@ -8,7 +8,7 @@ import {
   unlinkSync,
 } from "node:fs";
 import { createRequire } from "node:module";
-import { dirname, join, resolve } from "node:path";
+import { delimiter, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
@@ -38,12 +38,38 @@ const LONG_RUNNING_TOOLS = new Set<SidecarToolName>([
   "execute_chain",
   "revalidate_chain",
 ]);
+const OAUTH_CAPABLE_TOOLS = new Set<SidecarToolName>([
+  "search",
+  "inspect",
+  "discover",
+  ...LONG_RUNNING_TOOLS,
+]);
+const DEFAULT_TOOL_TIMEOUT_MS = 30_000;
+const OAUTH_CALLBACK_TIMEOUT_SECONDS = 300;
+const TOOL_TIMEOUT_GRACE_MS = 5_000;
+
+export function sidecarToolTimeoutMs(
+  name: SidecarToolName,
+  executionTimeoutSeconds: number,
+): number {
+  if (OAUTH_CAPABLE_TOOLS.has(name)) {
+    return (
+      Math.max(executionTimeoutSeconds, OAUTH_CALLBACK_TIMEOUT_SECONDS) * 1_000 +
+      TOOL_TIMEOUT_GRACE_MS
+    );
+  }
+  if (LONG_RUNNING_TOOLS.has(name)) {
+    return executionTimeoutSeconds * 1_000 + TOOL_TIMEOUT_GRACE_MS;
+  }
+  return DEFAULT_TOOL_TIMEOUT_MS;
+}
 
 export interface SidecarClientOptions {
   packageRoot?: string;
   agentDir?: string;
   environment?: Record<string, string>;
   projectChainsPath?: string;
+  workingDirectory?: string;
 }
 
 export class SidecarClient {
@@ -51,6 +77,7 @@ export class SidecarClient {
   private readonly packageVersion: string;
   private readonly agentDir: string;
   private readonly environment: Record<string, string>;
+  private readonly workingDirectory: string;
   private client: Client | undefined;
   private transport: StdioClientTransport | undefined;
   private startPromise: Promise<void> | undefined;
@@ -64,10 +91,11 @@ export class SidecarClient {
     );
     this.packageVersion = readPackageVersion(this.packageRoot);
     this.agentDir = resolve(options.agentDir ?? getAgentDir());
+    this.workingDirectory = resolve(options.workingDirectory ?? process.cwd());
     this.projectChainsDirectory = options.projectChainsPath
       ? resolve(options.projectChainsPath)
       : undefined;
-    this.environment = {
+    const environment: Record<string, string> = {
       ...definedProcessEnvironment(),
       ...(options.environment ?? {}),
       PI_CODEMCP_AGENT_DIR: this.agentDir,
@@ -76,6 +104,12 @@ export class SidecarClient {
         : { PI_CODEMCP_PROJECT_CHAINS_DIR: this.projectChainsDirectory }),
       UV_PROJECT_ENVIRONMENT: join(this.agentDir, "pi-codemcp", "runtime", "venv"),
     };
+    this.environment = {
+      ...environment,
+      PYTHONPATH: environment.PYTHONPATH
+        ? `${this.packageRoot}${delimiter}${environment.PYTHONPATH}`
+        : this.packageRoot,
+    };
     if (this.projectChainsDirectory === undefined) {
       delete this.environment.PI_CODEMCP_PROJECT_CHAINS_DIR;
     }
@@ -120,9 +154,11 @@ export class SidecarClient {
     await this.ensureStarted(signal);
     const client = this.client;
     if (!client) throw new Error("Sidecar client failed to initialize");
-    const timeout = LONG_RUNNING_TOOLS.has(name)
-      ? loadCodeMcpSettings(this.settingsPath).executionTimeoutSeconds * 1_000 + 5_000
-      : 30_000;
+    const needsExecutionTimeout = LONG_RUNNING_TOOLS.has(name) || OAUTH_CAPABLE_TOOLS.has(name);
+    const executionTimeoutSeconds = needsExecutionTimeout
+      ? loadCodeMcpSettings(this.settingsPath).executionTimeoutSeconds
+      : 0;
+    const timeout = sidecarToolTimeoutMs(name, executionTimeoutSeconds);
     const result = await client.callTool({ name, arguments: args }, undefined, {
       timeout,
       ...(signal === undefined ? {} : { signal }),
@@ -183,7 +219,7 @@ export class SidecarClient {
         "run",
         ...(isTruthy(process.env.PI_OFFLINE) ? ["--offline"] : []),
         "--project",
-        "sidecar",
+        join(this.packageRoot, "sidecar"),
         "--frozen",
         "--no-dev",
         "-m",
@@ -191,7 +227,7 @@ export class SidecarClient {
         "serve",
         "--stdio",
       ],
-      cwd: this.packageRoot,
+      cwd: this.workingDirectory,
       env: this.environment,
       stderr: "pipe",
     });