@phi-code-admin/phi-code 0.85.0 → 0.87.0

package/extensions/phi/mcp/config.ts

@@ -18,104 +18,104 @@ import { McpError } from "./errors.js";
 // ─── Zod Schemas ──────────────────────────────────────────────────────────────
 
 const AuthConfigSchema = z.object({
-  /** Auth type. Currently only "oauth" is supported. Default: "oauth". */
-  type: z.enum(["oauth"]).default("oauth"),
-  /**
-   * Callback URL for the OAuth redirect.
-   * Default: auto-detected local callback server.
-   */
-  redirectUrl: z.string().optional(),
-  /**
-   * Optional scope to request during authorization.
-   */
-  scope: z.string().optional(),
-  /**
-   * Pre-registered client_id (skip dynamic client registration).
-   */
-  clientId: z.string().optional(),
-  /**
-   * Pre-registered client_secret.
-   */
-  clientSecret: z.string().optional(),
+	/** Auth type. Currently only "oauth" is supported. Default: "oauth". */
+	type: z.enum(["oauth"]).default("oauth"),
+	/**
+	 * Callback URL for the OAuth redirect.
+	 * Default: auto-detected local callback server.
+	 */
+	redirectUrl: z.string().optional(),
+	/**
+	 * Optional scope to request during authorization.
+	 */
+	scope: z.string().optional(),
+	/**
+	 * Pre-registered client_id (skip dynamic client registration).
+	 */
+	clientId: z.string().optional(),
+	/**
+	 * Pre-registered client_secret.
+	 */
+	clientSecret: z.string().optional(),
 });
 
 const ServerConfigSchema = z
-  .object({
-    /** Executable to spawn (e.g. "npx", "node", "uvx"). Required for stdio. */
-    command: z.string().optional(),
-    /** Arguments passed to command. */
-    args: z.array(z.string()).default([]),
-    /**
-     * Extra environment variables passed to the child process as literals.
-     * These merge with process.env; project env overrides parent env.
-     * No ${VAR} interpolation — set vars in your shell environment instead.
-     */
-    env: z.record(z.string()).optional(),
-    /** Transport protocol. Default: "stdio". */
-    transport: z.enum(["stdio", "streamable-http", "sse"]).default("stdio"),
-    /**
-     * URL for streamable-http or sse transports.
-     * Must be a valid URL (e.g. "https://my-mcp-server.example.com/mcp").
-     */
-    url: z.string().url().optional(),
-    /**
-     * Static HTTP headers to include with every request (streamable-http / sse only).
-     * Useful for API-key-based auth (e.g. { "Authorization": "Bearer <key>" }).
-     * For OAuth2, use the "auth" field instead.
-     */
-    headers: z.record(z.string()).optional(),
-    /**
-     * OAuth2 configuration for servers that require authorization.
-     * When set, the transport will use the SDK's OAuth flow (discovery,
-     * dynamic client registration, PKCE, token refresh).
-     * Only applies to streamable-http and sse transports.
-     */
-    auth: AuthConfigSchema.optional(),
-    /**
-     * "eager" — start at session_start.
-     * "lazy"  — start manually via /mcp:start command.
-     */
-    lifecycle: z.enum(["eager", "lazy"]).default("lazy"),
-    /** Per-request timeout in ms. Overrides global setting. Default: 30000. */
-    requestTimeoutMs: z.number().positive().optional(),
-    /**
-     * Opt-in heartbeat interval (ping) in ms.
-     * Only useful for long-lived connections where you want proactive liveness checks.
-     * Default: disabled.
-     */
-    healthCheckIntervalMs: z.number().positive().optional(),
-  })
-  .refine(
-    (cfg) => {
-      if (cfg.transport === "stdio") return cfg.command !== undefined;
-      return cfg.url !== undefined;
-    },
-    (cfg) => ({
-      message:
-        cfg.transport === "stdio"
-          ? `"command" is required for stdio transport`
-          : `"url" is required for ${cfg.transport} transport`,
-    }),
-  );
+	.object({
+		/** Executable to spawn (e.g. "npx", "node", "uvx"). Required for stdio. */
+		command: z.string().optional(),
+		/** Arguments passed to command. */
+		args: z.array(z.string()).default([]),
+		/**
+		 * Extra environment variables passed to the child process as literals.
+		 * These merge with process.env; project env overrides parent env.
+		 * No ${VAR} interpolation — set vars in your shell environment instead.
+		 */
+		env: z.record(z.string()).optional(),
+		/** Transport protocol. Default: "stdio". */
+		transport: z.enum(["stdio", "streamable-http", "sse"]).default("stdio"),
+		/**
+		 * URL for streamable-http or sse transports.
+		 * Must be a valid URL (e.g. "https://my-mcp-server.example.com/mcp").
+		 */
+		url: z.string().url().optional(),
+		/**
+		 * Static HTTP headers to include with every request (streamable-http / sse only).
+		 * Useful for API-key-based auth (e.g. { "Authorization": "Bearer <key>" }).
+		 * For OAuth2, use the "auth" field instead.
+		 */
+		headers: z.record(z.string()).optional(),
+		/**
+		 * OAuth2 configuration for servers that require authorization.
+		 * When set, the transport will use the SDK's OAuth flow (discovery,
+		 * dynamic client registration, PKCE, token refresh).
+		 * Only applies to streamable-http and sse transports.
+		 */
+		auth: AuthConfigSchema.optional(),
+		/**
+		 * "eager" — start at session_start.
+		 * "lazy"  — start manually via /mcp:start command.
+		 */
+		lifecycle: z.enum(["eager", "lazy"]).default("lazy"),
+		/** Per-request timeout in ms. Overrides global setting. Default: 30000. */
+		requestTimeoutMs: z.number().positive().optional(),
+		/**
+		 * Opt-in heartbeat interval (ping) in ms.
+		 * Only useful for long-lived connections where you want proactive liveness checks.
+		 * Default: disabled.
+		 */
+		healthCheckIntervalMs: z.number().positive().optional(),
+	})
+	.refine(
+		(cfg) => {
+			if (cfg.transport === "stdio") return cfg.command !== undefined;
+			return cfg.url !== undefined;
+		},
+		(cfg) => ({
+			message:
+				cfg.transport === "stdio"
+					? `"command" is required for stdio transport`
+					: `"url" is required for ${cfg.transport} transport`,
+		}),
+	);
 
 const SettingsSchema = z.object({
-  /**
-   * Prefix used in Pi tool names: <prefix>_<server>_<tool>.
-   * Must match [a-zA-Z0-9_]. Default: "mcp".
-   */
-  toolPrefix: z
-    .string()
-    .regex(/^[a-zA-Z0-9_]+$/, "toolPrefix must match [a-zA-Z0-9_]")
-    .default("mcp"),
-  /** Default per-request timeout in ms for all servers. Default: 30000. */
-  requestTimeoutMs: z.number().positive().default(30000),
-  /** Maximum retry attempts when a server fails to connect. Default: 5. */
-  maxRetries: z.number().int().min(0).max(10).default(5),
+	/**
+	 * Prefix used in Pi tool names: <prefix>_<server>_<tool>.
+	 * Must match [a-zA-Z0-9_]. Default: "mcp".
+	 */
+	toolPrefix: z
+		.string()
+		.regex(/^[a-zA-Z0-9_]+$/, "toolPrefix must match [a-zA-Z0-9_]")
+		.default("mcp"),
+	/** Default per-request timeout in ms for all servers. Default: 30000. */
+	requestTimeoutMs: z.number().positive().default(30000),
+	/** Maximum retry attempts when a server fails to connect. Default: 5. */
+	maxRetries: z.number().int().min(0).max(10).default(5),
 });
 
 const McpConfigSchema = z.object({
-  settings: SettingsSchema.default({}),
-  mcpServers: z.record(ServerConfigSchema).default({}),
+	settings: SettingsSchema.default({}),
+	mcpServers: z.record(ServerConfigSchema).default({}),
 });
 
 // ─── Public Types ─────────────────────────────────────────────────────────────
@@ -128,41 +128,32 @@ export type McpConfig = z.output<typeof McpConfigSchema>;
 // ─── Loader ───────────────────────────────────────────────────────────────────
 
 async function readJsonFile(path: string): Promise<unknown | null> {
-  try {
-    const text = await readFile(path, "utf8");
-    return JSON.parse(text) as unknown;
-  } catch (err) {
-    // ENOENT → file doesn't exist, silently skip
-    if ((err as NodeJS.ErrnoException).code === "ENOENT") return null;
-    throw err;
-  }
+	try {
+		const text = await readFile(path, "utf8");
+		return JSON.parse(text) as unknown;
+	} catch (err) {
+		// ENOENT → file doesn't exist, silently skip
+		if ((err as NodeJS.ErrnoException).code === "ENOENT") return null;
+		throw err;
+	}
 }
 
 function parseConfig(raw: unknown, sourcePath: string): McpConfig {
-  const result = McpConfigSchema.safeParse(raw);
-  if (!result.success) {
-    const issues = result.error.issues
-      .map((i) => `  ${i.path.join(".")}: ${i.message}`)
-      .join("\n");
-    throw new McpError(
-      `Invalid mcp.json at ${sourcePath}:\n${issues}`,
-      "<config>",
-      "config",
-    );
-  }
-  return result.data;
+	const result = McpConfigSchema.safeParse(raw);
+	if (!result.success) {
+		const issues = result.error.issues.map((i) => `  ${i.path.join(".")}: ${i.message}`).join("\n");
+		throw new McpError(`Invalid mcp.json at ${sourcePath}:\n${issues}`, "<config>", "config");
+	}
+	return result.data;
 }
 
-function mergeConfigs(
-  globalCfg: McpConfig,
-  projectCfg: McpConfig,
-): McpConfig {
-  return {
-    // Shallow spread: project settings override global settings per key
-    settings: { ...globalCfg.settings, ...projectCfg.settings },
-    // Per-server override: project server entry completely replaces global entry with same name
-    mcpServers: { ...globalCfg.mcpServers, ...projectCfg.mcpServers },
-  };
+function mergeConfigs(globalCfg: McpConfig, projectCfg: McpConfig): McpConfig {
+	return {
+		// Shallow spread: project settings override global settings per key
+		settings: { ...globalCfg.settings, ...projectCfg.settings },
+		// Per-server override: project server entry completely replaces global entry with same name
+		mcpServers: { ...globalCfg.mcpServers, ...projectCfg.mcpServers },
+	};
 }
 
 /**
@@ -171,25 +162,20 @@ function mergeConfigs(
  * Returns a fully validated, merged config.
  */
 export async function loadConfig(cwd: string): Promise<McpConfig> {
-  const globalPath = join(getAgentDir(), "mcp.json");
-  const projectPath = join(cwd, ".phi", "mcp.json");
+	const globalPath = join(getAgentDir(), "mcp.json");
+	const projectPath = join(cwd, ".phi", "mcp.json");
 
-  const [globalRaw, projectRaw] = await Promise.all([
-    readJsonFile(globalPath),
-    readJsonFile(projectPath),
-  ]);
+	const [globalRaw, projectRaw] = await Promise.all([readJsonFile(globalPath), readJsonFile(projectPath)]);
 
-  // If neither file exists, return an empty valid config
-  if (globalRaw === null && projectRaw === null) {
-    return McpConfigSchema.parse({});
-  }
+	// If neither file exists, return an empty valid config
+	if (globalRaw === null && projectRaw === null) {
+		return McpConfigSchema.parse({});
+	}
 
-  const globalCfg = globalRaw !== null
-    ? parseConfig(globalRaw, globalPath)
-    : McpConfigSchema.parse({});
+	const globalCfg = globalRaw !== null ? parseConfig(globalRaw, globalPath) : McpConfigSchema.parse({});
 
-  if (projectRaw === null) return globalCfg;
+	if (projectRaw === null) return globalCfg;
 
-  const projectCfg = parseConfig(projectRaw, projectPath);
-  return mergeConfigs(globalCfg, projectCfg);
+	const projectCfg = parseConfig(projectRaw, projectPath);
+	return mergeConfigs(globalCfg, projectCfg);
 }

package/extensions/phi/mcp/errors.ts

@@ -5,31 +5,26 @@
  */
 
 export type McpErrorCode =
-  | "config"      // Configuration loading or validation failed
-  | "connection"  // Transport/connection failed
-  | "protocol"    // JSON-RPC protocol violation (server error response, timeout, etc.)
-  | "tool";       // Tool execution error (isError: true from server)
+	| "config" // Configuration loading or validation failed
+	| "connection" // Transport/connection failed
+	| "protocol" // JSON-RPC protocol violation (server error response, timeout, etc.)
+	| "tool"; // Tool execution error (isError: true from server)
 
 export class McpError extends Error {
-  public readonly server: string;
-  public readonly code: McpErrorCode;
-  public readonly cause: unknown;
+	public readonly server: string;
+	public readonly code: McpErrorCode;
+	public readonly cause: unknown;
 
-  constructor(
-    message: string,
-    server: string,
-    code: McpErrorCode,
-    cause?: unknown,
-  ) {
-    super(message);
-    this.name = "McpError";
-    this.server = server;
-    this.code = code;
-    this.cause = cause;
-  }
+	constructor(message: string, server: string, code: McpErrorCode, cause?: unknown) {
+		super(message);
+		this.name = "McpError";
+		this.server = server;
+		this.code = code;
+		this.cause = cause;
+	}
 
-  /** Short user-facing message suitable for ctx.ui.notify() */
-  get userMessage(): string {
-    return `[${this.server}] ${this.message}`;
-  }
+	/** Short user-facing message suitable for ctx.ui.notify() */
+	get userMessage(): string {
+		return `[${this.server}] ${this.message}`;
+	}
 }