@getpaseo/server 0.1.78 → 0.1.80

package/dist/server/server/agent/mcp-server.js

@@ -18,7 +18,7 @@ import { ScheduleRunSchema, ScheduleSummarySchema, StoredScheduleSchema, } from
 import { getAgentProviderDefinition } from "./provider-manifest.js";
 import { resolveAndValidateCreateAgentMode } from "./create-agent-mode.js";
 import { resolveSnapshotCwd } from "./provider-snapshot-manager.js";
-import { AgentModelSchema, AgentProviderEnum, AgentStatusEnum, ProviderSummarySchema, parseDurationString, resolveRequiredProviderModel, sanitizePermissionRequest, serializeSnapshotWithMetadata, toScheduleSummary, waitForAgentWithTimeout, } from "./mcp-shared.js";
+import { AgentModelSchema, AgentProviderEnum, AgentStatusEnum, ProviderModeSchema, ProviderSummarySchema, parseDurationString, resolveRequiredProviderModel, sanitizePermissionRequest, serializeSnapshotWithMetadata, toScheduleSummary, waitForAgentWithTimeout, } from "./mcp-shared.js";
 import { sendPromptToAgent, setupFinishNotification, startAgentRun } from "./agent-prompt.js";
 import { toWorktreeRequestError } from "../worktree-errors.js";
 import { join } from "node:path";
@@ -53,6 +53,45 @@ function mapModeAcrossProviders(sourceMode, sourceProvider, targetProvider) {
     }
     return sourceMode;
 }
+function addModelVisibleStructuredContent(result) {
+    if (result.structuredContent === undefined || result.content.length > 0) {
+        return result;
+    }
+    return {
+        ...result,
+        content: [
+            {
+                type: "text",
+                text: formatStructuredContentForModel(result.structuredContent),
+            },
+        ],
+    };
+}
+function formatStructuredContentForModel(structuredContent) {
+    if (!structuredContent ||
+        typeof structuredContent !== "object" ||
+        Array.isArray(structuredContent)) {
+        return JSON.stringify(structuredContent, null, 2);
+    }
+    const record = structuredContent;
+    const summary = [];
+    for (const [key, value] of Object.entries(record)) {
+        if (!Array.isArray(value)) {
+            continue;
+        }
+        summary.push(`${key}_count=${value.length}`);
+        const ids = value
+            .map((item) => item && typeof item === "object" && !Array.isArray(item)
+            ? item.id
+            : null)
+            .filter((id) => typeof id === "string" && id.length > 0);
+        if (ids.length === value.length && ids.length > 0) {
+            summary.push(`${key}_ids=${ids.join(",")}`);
+        }
+    }
+    const json = JSON.stringify(structuredContent, null, 2);
+    return summary.length > 0 ? `${summary.join("\n")}\n\n${json}` : json;
+}
 function parseTimestamp(value) {
     if (!value) {
         return 0;
@@ -264,6 +303,8 @@ export async function createAgentMcpServer(options) {
         name: "agent-mcp",
         version: "2.0.0",
     });
+    const registerRawTool = server.registerTool.bind(server);
+    const registerTool = (name, config, handler) => registerRawTool(name, config, (async (args, extra) => addModelVisibleStructuredContent(await handler(args, extra))));
     const resolveCallerAgent = () => {
         if (!callerAgentId) {
             return null;
@@ -379,6 +420,53 @@ export async function createAgentMcpServer(options) {
             return false;
         }
     }, { message: "provider must be provider/model, for example codex/gpt-5.4" });
+    const ProviderOrProviderModelInputSchema = AgentProviderEnum.trim()
+        .min(1, "provider is required")
+        .refine((value) => {
+        if (!value.includes("/")) {
+            return true;
+        }
+        try {
+            resolveRequiredProviderModel(value);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }, { message: "provider must be provider or provider/model, for example codex/gpt-5.4" });
+    const CreateAgentSettingsInputSchema = z
+        .object({
+        modeId: z.string().optional().describe("Session mode to configure before the first run."),
+        thinkingOptionId: z.string().optional().describe("Thinking option ID."),
+        features: z
+            .record(z.unknown())
+            .optional()
+            .describe("Provider-specific feature values, for example { fast_mode: true } for Codex."),
+    })
+        .strict();
+    const UpdateAgentSettingsInputSchema = z
+        .object({
+        modeId: z.string().optional().describe("Session mode ID."),
+        model: z.string().nullable().optional().describe("Model ID. Pass null to clear."),
+        thinkingOptionId: z
+            .string()
+            .nullable()
+            .optional()
+            .describe("Thinking option ID. Pass null to clear."),
+        features: z
+            .record(z.unknown())
+            .optional()
+            .describe("Provider-specific feature values, for example { fast_mode: true } for Codex."),
+    })
+        .strict();
+    const InspectProviderSettingsInputSchema = z
+        .object({
+        modeId: z.string().optional().describe("Draft session mode ID."),
+        model: z.string().optional().describe("Draft model ID."),
+        thinkingOptionId: z.string().optional().describe("Draft thinking option ID."),
+        features: z.record(z.unknown()).optional().describe("Draft provider feature values."),
+    })
+        .strict();
     const agentToAgentInputSchema = {
         cwd: z
             .string()
@@ -391,21 +479,13 @@ export async function createAgentMcpServer(options) {
             .max(60, "Title must be 60 characters or fewer")
             .describe("Short descriptive title (<= 60 chars) summarizing the agent's focus."),
         provider: ProviderModelInputSchema.describe("Required provider/model pair, for example codex/gpt-5.4."),
-        thinking: z.string().optional().describe("Thinking option ID"),
-        features: z
-            .record(z.unknown())
-            .optional()
-            .describe("Provider-specific feature values, for example { fast_mode: true } for Codex."),
         labels: z.record(z.string(), z.string()).optional().describe("Labels to set on the agent"),
+        settings: CreateAgentSettingsInputSchema.optional().describe("Initial runtime settings for the new agent."),
         initialPrompt: z
             .string()
             .trim()
             .min(1, "initialPrompt is required")
             .describe("Required first task to run immediately after creation."),
-        mode: z
-            .string()
-            .optional()
-            .describe("Optional session mode for the new agent. Required when the new agent uses a different provider than the caller agent."),
         background: z
             .boolean()
             .optional()
@@ -428,21 +508,13 @@ export async function createAgentMcpServer(options) {
             .max(60, "Title must be 60 characters or fewer")
             .describe("Short descriptive title (<= 60 chars) summarizing the agent's focus."),
         provider: ProviderModelInputSchema.describe("Required provider/model pair, for example codex/gpt-5.4."),
-        thinking: z.string().optional().describe("Thinking option ID"),
-        features: z
-            .record(z.unknown())
-            .optional()
-            .describe("Provider-specific feature values, for example { fast_mode: true } for Codex."),
         labels: z.record(z.string(), z.string()).optional().describe("Labels to set on the agent"),
+        settings: CreateAgentSettingsInputSchema.optional().describe("Initial runtime settings for the new agent."),
         initialPrompt: z
             .string()
             .trim()
             .min(1, "initialPrompt is required")
             .describe("Required first task to run immediately after creation."),
-        mode: z
-            .string()
-            .optional()
-            .describe("Optional session mode to configure before the first run."),
         worktreeName: z
             .string()
             .optional()
@@ -476,16 +548,16 @@ export async function createAgentMcpServer(options) {
     const createAgentInputSchema = callerAgentId ? agentToAgentInputSchema : topLevelInputSchema;
     const agentToAgentCreateAgentArgsSchema = z.object(agentToAgentInputSchema).strict();
     const topLevelCreateAgentArgsSchema = z.object(topLevelInputSchema).strict();
-    const listProviderFeaturesInputSchema = {
-        provider: AgentProviderEnum,
-        cwd: z.string().describe("Working directory used to resolve provider feature availability."),
-        modeId: z.string().optional(),
-        model: z.string().optional(),
-        thinkingOptionId: z.string().optional(),
-        featureValues: z.record(z.unknown()).optional(),
+    const inspectProviderInputSchema = {
+        provider: ProviderOrProviderModelInputSchema.describe("Provider ID, optionally with a model ID (for example codex or codex/gpt-5.4)."),
+        cwd: z
+            .string()
+            .optional()
+            .describe("Working directory used to resolve provider feature availability."),
+        settings: InspectProviderSettingsInputSchema.optional().describe("Draft provider settings used to compute available features."),
     };
     if (options.voiceOnly || options.enableVoiceTools || callerContext?.enableVoiceTools) {
-        server.registerTool("speak", {
+        registerTool("speak", {
             title: "Speak",
             description: "Speak text to the user via daemon-managed voice output. Blocks until playback completes.",
             inputSchema: {
@@ -554,6 +626,7 @@ export async function createAgentMcpServer(options) {
             throw new Error(`Parent agent ${parentAgentId} not found`);
         }
         const provider = resolvedProviderModel.provider;
+        const settings = callerArgs.settings;
         const resolvedCwd = resolveChildAgentCwd({
             parentCwd: parentAgent.cwd,
             requestedCwd: callerArgs.cwd,
@@ -561,7 +634,7 @@ export async function createAgentMcpServer(options) {
             allowCustomCwd: callerContext?.allowCustomCwd ?? true,
         });
         const resolvedMode = resolveAndValidateCreateAgentMode({
-            requestedMode: callerArgs.mode,
+            requestedMode: settings?.modeId,
             targetProvider: provider,
             parent: {
                 provider: parentAgent.provider,
@@ -577,8 +650,8 @@ export async function createAgentMcpServer(options) {
             background: callerArgs.background ?? false,
             normalizedTitle: callerArgs.title.trim(),
             model: resolvedProviderModel.model,
-            thinking: callerArgs.thinking,
-            features: callerArgs.features,
+            thinkingOptionId: settings?.thinkingOptionId,
+            features: settings?.features,
             labels: callerArgs.labels,
             notifyOnFinish: callerArgs.notifyOnFinish ?? false,
             resolvedCwd,
@@ -589,9 +662,9 @@ export async function createAgentMcpServer(options) {
     const resolveTopLevelCreateAgentArgs = async (args) => {
         const topLevelArgs = topLevelCreateAgentArgsSchema.parse(args);
         const resolvedProviderModel = resolveRequiredProviderModel(topLevelArgs.provider);
-        const { cwd, mode, worktreeName, baseBranch, refName, action, githubPrNumber } = topLevelArgs;
+        const { cwd, settings, worktreeName, baseBranch, refName, action, githubPrNumber } = topLevelArgs;
         const resolvedMode = resolveAndValidateCreateAgentMode({
-            requestedMode: mode,
+            requestedMode: settings?.modeId,
             targetProvider: resolvedProviderModel.provider,
             parent: null,
             availableModes: getAvailableModeIds(resolvedProviderModel.provider),
@@ -644,8 +717,8 @@ export async function createAgentMcpServer(options) {
             background: topLevelArgs.background ?? false,
             normalizedTitle: topLevelArgs.title.trim(),
             model: resolvedProviderModel.model,
-            thinking: topLevelArgs.thinking,
-            features: topLevelArgs.features,
+            thinkingOptionId: settings?.thinkingOptionId,
+            features: settings?.features,
             labels: topLevelArgs.labels,
             notifyOnFinish: topLevelArgs.notifyOnFinish ?? false,
             resolvedCwd,
@@ -653,7 +726,7 @@ export async function createAgentMcpServer(options) {
             setupContinuation,
         };
     };
-    server.registerTool("create_agent", {
+    registerTool("create_agent", {
         title: "Create agent",
         description: "Create an agent tied to a working directory. Requires provider/model, for example codex/gpt-5.4. Do not guess; call list_providers and list_models first if uncertain. Optionally run an initial prompt immediately or create a git worktree for the agent.",
         inputSchema: createAgentInputSchema,
@@ -675,7 +748,7 @@ export async function createAgentMcpServer(options) {
         const resolved = callerAgentId
             ? resolveCallerCreateAgentArgs(args, callerAgentId)
             : await resolveTopLevelCreateAgentArgs(args);
-        const { provider, initialPrompt, background, normalizedTitle, model, thinking, features, labels, notifyOnFinish, resolvedCwd, resolvedMode, setupContinuation, } = resolved;
+        const { provider, initialPrompt, background, normalizedTitle, model, thinkingOptionId, features, labels, notifyOnFinish, resolvedCwd, resolvedMode, setupContinuation, } = resolved;
         const childAgentDefaultLabels = callerContext?.childAgentDefaultLabels;
         const mergedLabels = {
             ...(callerAgentId ? { [PARENT_AGENT_ID_LABEL]: callerAgentId } : {}),
@@ -688,7 +761,7 @@ export async function createAgentMcpServer(options) {
             modeId: resolvedMode,
             title: normalizedTitle ?? undefined,
             model,
-            thinkingOptionId: thinking,
+            thinkingOptionId,
             featureValues: features,
         }, undefined, Object.keys(mergedLabels).length > 0 ? { labels: mergedLabels } : undefined);
         setupContinuation?.startAfterAgentCreate({
@@ -766,25 +839,7 @@ export async function createAgentMcpServer(options) {
         };
         return response;
     });
-    server.registerTool("set_agent_feature", {
-        title: "Set agent feature",
-        description: "Set a provider-specific feature on an existing agent, such as Codex fast_mode.",
-        inputSchema: {
-            agentId: z.string(),
-            featureId: z.string().trim().min(1),
-            value: z.unknown(),
-        },
-        outputSchema: {
-            success: z.boolean(),
-        },
-    }, async ({ agentId, featureId, value }) => {
-        await agentManager.setAgentFeature(agentId, featureId, value);
-        return {
-            content: [],
-            structuredContent: ensureValidJson({ success: true }),
-        };
-    });
-    server.registerTool("wait_for_agent", {
+    registerTool("wait_for_agent", {
         title: "Wait for agent",
         description: "Block until the agent requests permission or the current run completes. Returns the pending permission (if any) and recent activity summary.",
         inputSchema: {
@@ -851,7 +906,7 @@ export async function createAgentMcpServer(options) {
             cleanup();
         }
     });
-    server.registerTool("send_agent_prompt", {
+    registerTool("send_agent_prompt", {
         title: "Send agent prompt",
         description: "Send a task to a running agent. Returns immediately after the agent begins processing.",
         inputSchema: {
@@ -934,7 +989,7 @@ export async function createAgentMcpServer(options) {
         };
         return response;
     });
-    server.registerTool("get_agent_status", {
+    registerTool("get_agent_status", {
         title: "Get agent status",
         description: "Return the latest snapshot for an agent, including lifecycle state, capabilities, and pending permissions.",
         inputSchema: {
@@ -969,7 +1024,7 @@ export async function createAgentMcpServer(options) {
             }),
         };
     });
-    server.registerTool("list_agents", {
+    registerTool("list_agents", {
         title: "List agents",
         description: "List recent agents as compact metadata.",
         inputSchema: {
@@ -1015,7 +1070,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ agents }),
         };
     });
-    server.registerTool("cancel_agent", {
+    registerTool("cancel_agent", {
         title: "Cancel agent run",
         description: "Abort the agent's current run but keep the agent alive for future tasks.",
         inputSchema: {
@@ -1034,7 +1089,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success }),
         };
     });
-    server.registerTool("archive_agent", {
+    registerTool("archive_agent", {
         title: "Archive agent",
         description: "Archive an agent (soft-delete). The agent is interrupted if running and removed from the active list.",
         inputSchema: {
@@ -1051,7 +1106,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true }),
         };
     });
-    server.registerTool("kill_agent", {
+    registerTool("kill_agent", {
         title: "Kill agent",
         description: "Terminate an agent session permanently.",
         inputSchema: {
@@ -1068,18 +1123,33 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true }),
         };
     });
-    server.registerTool("update_agent", {
+    registerTool("update_agent", {
         title: "Update agent",
-        description: "Update an agent name and/or labels.",
+        description: "Update an agent name, labels, and/or runtime settings.",
         inputSchema: {
             agentId: z.string(),
             name: z.string().optional(),
             labels: z.record(z.string(), z.string()).optional().describe("Labels to set on the agent"),
+            settings: UpdateAgentSettingsInputSchema.optional().describe("Runtime settings to apply to the agent."),
         },
         outputSchema: {
             success: z.boolean(),
         },
-    }, async ({ agentId, name, labels }) => {
+    }, async ({ agentId, name, labels, settings }) => {
+        if (settings?.modeId !== undefined) {
+            await agentManager.setAgentMode(agentId, settings.modeId);
+        }
+        if (settings?.model !== undefined) {
+            await agentManager.setAgentModel(agentId, settings.model);
+        }
+        if (settings?.thinkingOptionId !== undefined) {
+            await agentManager.setAgentThinkingOption(agentId, settings.thinkingOptionId);
+        }
+        if (settings?.features) {
+            for (const [featureId, value] of Object.entries(settings.features)) {
+                await agentManager.setAgentFeature(agentId, featureId, value);
+            }
+        }
         const trimmedName = name?.trim();
         if (trimmedName) {
             const record = await agentStorage.get(agentId);
@@ -1101,7 +1171,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true }),
         };
     });
-    server.registerTool("list_terminals", {
+    registerTool("list_terminals", {
         title: "List terminals",
         description: "List terminals for a working directory or across all working directories.",
         inputSchema: {
@@ -1134,7 +1204,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ terminals }),
         };
     });
-    server.registerTool("create_terminal", {
+    registerTool("create_terminal", {
         title: "Create terminal",
         description: "Create a terminal session for a working directory.",
         inputSchema: {
@@ -1162,7 +1232,7 @@ export async function createAgentMcpServer(options) {
             }),
         };
     });
-    server.registerTool("kill_terminal", {
+    registerTool("kill_terminal", {
         title: "Kill terminal",
         description: "Kill an existing terminal session.",
         inputSchema: {
@@ -1185,7 +1255,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true }),
         };
     });
-    server.registerTool("capture_terminal", {
+    registerTool("capture_terminal", {
         title: "Capture terminal",
         description: "Capture plain-text terminal output lines from a terminal session.",
         inputSchema: {
@@ -1221,7 +1291,7 @@ export async function createAgentMcpServer(options) {
             }),
         };
     });
-    server.registerTool("send_terminal_keys", {
+    registerTool("send_terminal_keys", {
         title: "Send terminal keys",
         description: "Send literal text or special key tokens to a terminal session.",
         inputSchema: {
@@ -1249,7 +1319,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true }),
         };
     });
-    server.registerTool("create_schedule", {
+    registerTool("create_schedule", {
         title: "Create schedule",
         description: "Create a recurring schedule that runs on an agent or a new agent.",
         inputSchema: {
@@ -1314,7 +1384,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson(toScheduleSummary(schedule)),
         };
     });
-    server.registerTool("list_schedules", {
+    registerTool("list_schedules", {
         title: "List schedules",
         description: "List all schedules managed by the daemon.",
         inputSchema: {},
@@ -1331,7 +1401,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ schedules }),
         };
     });
-    server.registerTool("inspect_schedule", {
+    registerTool("inspect_schedule", {
         title: "Inspect schedule",
         description: "Inspect a schedule and its run history.",
         inputSchema: {
@@ -1348,7 +1418,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson(schedule),
         };
     });
-    server.registerTool("pause_schedule", {
+    registerTool("pause_schedule", {
         title: "Pause schedule",
         description: "Pause an active schedule.",
         inputSchema: {
@@ -1367,7 +1437,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true }),
         };
     });
-    server.registerTool("resume_schedule", {
+    registerTool("resume_schedule", {
         title: "Resume schedule",
         description: "Resume a paused schedule.",
         inputSchema: {
@@ -1386,7 +1456,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true }),
         };
     });
-    server.registerTool("delete_schedule", {
+    registerTool("delete_schedule", {
         title: "Delete schedule",
         description: "Delete a schedule permanently.",
         inputSchema: {
@@ -1405,7 +1475,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true }),
         };
     });
-    server.registerTool("update_schedule", {
+    registerTool("update_schedule", {
         title: "Update schedule",
         description: "Update an existing schedule. Only provided fields are changed; omitted fields remain unchanged.",
         inputSchema: {
@@ -1459,7 +1529,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson(schedule),
         };
     });
-    server.registerTool("schedule_logs", {
+    registerTool("schedule_logs", {
         title: "Schedule logs",
         description: "Get the run history (logs) for a schedule.",
         inputSchema: {
@@ -1478,7 +1548,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ runs }),
         };
     });
-    server.registerTool("list_providers", {
+    registerTool("list_providers", {
         title: "List providers",
         description: "List configured agent providers, availability, and their modes.",
         inputSchema: {},
@@ -1492,7 +1562,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ providers }),
         };
     });
-    server.registerTool("list_models", {
+    registerTool("list_models", {
         title: "List models",
         description: "List models for an agent provider.",
         inputSchema: {
@@ -1522,32 +1592,65 @@ export async function createAgentMcpServer(options) {
             }),
         };
     });
-    server.registerTool("list_provider_features", {
-        title: "List provider features",
-        description: "List provider-specific features available for a draft agent configuration, such as Codex fast_mode.",
-        inputSchema: listProviderFeaturesInputSchema,
+    registerTool("inspect_provider", {
+        title: "Inspect provider",
+        description: "Inspect compact provider capabilities for orchestration, including modes and draft feature settings. Use list_models for the full model list.",
+        inputSchema: inspectProviderInputSchema,
         outputSchema: {
             provider: AgentProviderEnum,
+            label: z.string().nullable().optional(),
+            description: z.string().nullable().optional(),
+            enabled: z.boolean(),
+            status: z.string(),
+            modes: z.array(ProviderModeSchema).nullish(),
+            selectedModel: z.string().nullable(),
             features: z.array(AgentFeatureSchema),
         },
-    }, async ({ provider, cwd, modeId, model, thinkingOptionId, featureValues }) => {
-        const features = await agentManager.listDraftFeatures({
+    }, async ({ provider, cwd, settings }) => {
+        const resolvedProviderModel = resolveScheduleProviderAndModel({
             provider,
-            cwd: expandUserPath(cwd),
-            ...(modeId ? { modeId } : {}),
-            ...(model ? { model } : {}),
-            ...(thinkingOptionId ? { thinkingOptionId } : {}),
-            ...(featureValues ? { featureValues } : {}),
+            defaultProvider: provider,
+        });
+        const providerId = resolvedProviderModel.provider;
+        if (!providerRegistry) {
+            throw new Error("Provider registry is not configured");
+        }
+        const definition = providerRegistry[providerId];
+        if (!definition) {
+            throw new Error(`Provider ${providerId} is not configured`);
+        }
+        const summary = await resolveProviderSummary(definition, childLogger);
+        if (!definition.enabled) {
+            throw new Error(`Provider '${providerId}' is disabled`);
+        }
+        if (summary.status !== "available") {
+            throw new Error(summary.error ?? `Provider '${providerId}' is unavailable`);
+        }
+        const resolvedCwd = resolveScopedCwd(cwd, { required: true });
+        const selectedModel = settings?.model ?? resolvedProviderModel.model;
+        const features = await agentManager.listDraftFeatures({
+            provider: providerId,
+            cwd: resolvedCwd,
+            ...(settings?.modeId ? { modeId: settings.modeId } : {}),
+            ...(selectedModel ? { model: selectedModel } : {}),
+            ...(settings?.thinkingOptionId ? { thinkingOptionId: settings.thinkingOptionId } : {}),
+            ...(settings?.features ? { featureValues: settings.features } : {}),
         });
         return {
             content: [],
             structuredContent: ensureValidJson({
-                provider,
+                provider: providerId,
+                label: summary.label,
+                description: summary.description,
+                enabled: summary.enabled,
+                status: summary.status,
+                modes: summary.modes,
+                selectedModel: selectedModel ?? null,
                 features,
             }),
         };
     });
-    server.registerTool("list_worktrees", {
+    registerTool("list_worktrees", {
         title: "List worktrees",
         description: "List Paseo-managed git worktrees for a repository.",
         inputSchema: {
@@ -1572,7 +1675,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ worktrees }),
         };
     });
-    server.registerTool("create_worktree", {
+    registerTool("create_worktree", {
         title: "Create worktree",
         description: "Create a Paseo-managed git worktree. Branch off a new branch, check out an existing branch, or check out a GitHub PR.",
         inputSchema: {
@@ -1630,7 +1733,7 @@ export async function createAgentMcpServer(options) {
             }),
         };
     });
-    server.registerTool("archive_worktree", {
+    registerTool("archive_worktree", {
         title: "Archive worktree",
         description: "Delete a Paseo-managed git worktree.",
         inputSchema: {
@@ -1706,7 +1809,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true }),
         };
     });
-    server.registerTool("get_agent_activity", {
+    registerTool("get_agent_activity", {
         title: "Get agent activity",
         description: "Return recent agent timeline entries as a curated summary.",
         inputSchema: {
@@ -1752,7 +1855,7 @@ export async function createAgentMcpServer(options) {
             }),
         };
     });
-    server.registerTool("set_agent_mode", {
+    registerTool("set_agent_mode", {
         title: "Set agent session mode",
         description: "Switch the agent's session mode (plan, bypassPermissions, read-only, auto, etc.).",
         inputSchema: {
@@ -1770,7 +1873,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ success: true, newMode: modeId }),
         };
     });
-    server.registerTool("list_pending_permissions", {
+    registerTool("list_pending_permissions", {
         title: "List pending permissions",
         description: "Return all pending permission requests across all agents with the normalized payloads.",
         inputSchema: {},
@@ -1795,7 +1898,7 @@ export async function createAgentMcpServer(options) {
             structuredContent: ensureValidJson({ permissions }),
         };
     });
-    server.registerTool("respond_to_permission", {
+    registerTool("respond_to_permission", {
         title: "Respond to permission",
         description: "Approve or deny a pending permission request with an AgentManager-compatible response payload.",
         inputSchema: {