@1mcp/agent 0.30.3 → 0.31.0-beta1

package/build/commands/instructions/instructionsUtils.js

@@ -0,0 +1,74 @@
+import chalk from 'chalk';
+function formatStatus(status) {
+    if (!status)
+        return undefined;
+    return status === 'connected'
+        ? chalk.green(status)
+        : status === 'disconnected'
+            ? chalk.red(status)
+            : chalk.yellow(status);
+}
+function formatMetadataLines(item) {
+    const lines = [`server: ${chalk.bold(item.server)}`];
+    if (item.type) {
+        lines.push(`type: ${chalk.dim(item.type)}`);
+    }
+    const status = formatStatus(item.status);
+    if (status) {
+        lines.push(`status: ${status}`);
+    }
+    if (item.available !== undefined) {
+        lines.push(`available: ${item.available ? 'yes' : 'no'}`);
+    }
+    lines.push(`tools: ${item.toolCount}`);
+    lines.push(`instructions: ${item.hasInstructions ? 'yes' : 'no'}`);
+    return lines;
+}
+export function formatInstructionsOutput(output) {
+    const sections = [
+        chalk.bold.cyan('1MCP CLI Instructions'),
+        chalk.bold('=== PLAYBOOK ==='),
+        [
+            '1. Start here before selecting tools.',
+            '2. Review the available servers below and choose the server that matches the task.',
+            "3. Run `1mcp inspect <server>` to list that server's tools.",
+            '4. Run `1mcp inspect <server>/<tool>` to inspect the tool schema and arguments.',
+            "5. Run `1mcp run <server>/<tool> --args '<json>'` only after inspecting the tool.",
+            '6. Use `--preset`, `--tags`, or `--tag-filter` to narrow the server set when needed.',
+            '7. If authentication is required, run `1mcp auth login --url <server-url> --token <token>` and retry.',
+        ].join('\n'),
+    ];
+    const serverLines = [chalk.bold('=== SERVER SUMMARY ===')];
+    for (const server of output.servers) {
+        serverLines.push('');
+        serverLines.push(`<server_summary name="${server.server}">`);
+        for (const line of formatMetadataLines(server)) {
+            serverLines.push(`\t${line}`);
+        }
+        serverLines.push(`</server_summary>`);
+    }
+    sections.push(serverLines.join('\n'));
+    const detailSections = [chalk.bold('=== SERVER DETAILS ===')];
+    for (const detail of output.details) {
+        const lines = [`<server_detail name="${detail.server}">`];
+        for (const line of formatMetadataLines(detail)) {
+            lines.push(`\t${line}`);
+        }
+        if (detail.instructions?.trim()) {
+            lines.push(`\t<server_instructions name="${detail.server}">`);
+            lines.push(detail.instructions);
+            lines.push('\t</server_instructions>');
+        }
+        else if (detail.note) {
+            lines.push(`\t<note>${chalk.dim(detail.note)}</note>`);
+        }
+        else {
+            lines.push(`\t<note>${chalk.dim('(none provided)')}</note>`);
+        }
+        lines.push(`</server_detail>`);
+        detailSections.push(lines.join('\n'));
+    }
+    sections.push(detailSections.join('\n\n'));
+    return sections.join('\n\n');
+}
+//# sourceMappingURL=instructionsUtils.js.map

package/build/commands/instructions/instructionsUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"instructionsUtils.js","sourceRoot":"","sources":["../../../src/commands/instructions/instructionsUtils.ts"],"names":[],"mappings":"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"}

package/build/commands/proxy/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/commands/proxy/proxy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAqFvE"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/commands/proxy/proxy.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA6EvE"}

package/build/commands/proxy/proxy.js

@@ -1,66 +1,62 @@
-import { loadProjectConfig, normalizeTags } from '../../config/projectConfigLoader.js';
+import { buildCliContext, generateStreamableSessionId } from '../../commands/shared/cliContext.js';
+import { resolveServeTarget } from '../../commands/shared/serveTargetResolver.js';
+import { MCP_SERVER_VERSION } from '../../constants/mcp.js';
 import logger from '../../logger/logger.js';
 import { StdioProxyTransport } from '../../transport/stdioProxyTransport.js';
-import { discoverServerWithPidFile, validateServer1mcpUrl } from '../../utils/validation/urlDetection.js';
 /**
  * Proxy command - Start STDIO proxy to running 1MCP HTTP server
  */
 export async function proxyCommand(options) {
     try {
-        // Load project configuration from .1mcprc (if exists)
-        const projectConfig = await loadProjectConfig();
-        // Merge configuration with priority: CLI options > .1mcprc > defaults
-        const preset = options.preset || projectConfig?.preset;
-        const filter = options.filter || projectConfig?.filter;
-        const tags = options.tags || normalizeTags(projectConfig?.tags);
+        const { cwd, projectConfig, projectRoot, mergedOptions, discoveredUrl, source } = await resolveServeTarget(options);
         // Auto-discover server URL
         logger.info('🔍 Discovering running 1MCP server...');
-        const { url: serverUrl, source } = await discoverServerWithPidFile(options['config-dir'], options.url);
         // Log discovery source
         switch (source) {
             case 'user':
-                logger.info(`📍 Using user-provided URL: ${serverUrl}`);
+                logger.info(`📍 Using user-provided URL: ${discoveredUrl}`);
                 break;
             case 'pidfile':
-                logger.info(`✅ Found server via PID file: ${serverUrl}`);
+                logger.info(`✅ Found server via PID file: ${discoveredUrl}`);
                 break;
             case 'portscan':
-                logger.info(`✅ Found server via port scan: ${serverUrl}`);
+                logger.info(`✅ Found server via port scan: ${discoveredUrl}`);
                 break;
         }
-        // Validate server connectivity
-        const validation = await validateServer1mcpUrl(serverUrl);
-        if (!validation.valid) {
-            logger.error(`❌ Cannot connect to 1MCP server: ${validation.error}`);
-            process.exit(1);
-        }
         // Apply priority logic: preset > filter > tags (only one will be used)
         let finalPreset;
         let finalFilter;
         let finalTags;
-        if (preset) {
-            finalPreset = preset;
-            logger.info(`📦 Using preset: ${preset}`);
+        if (mergedOptions.preset) {
+            finalPreset = mergedOptions.preset;
+            logger.info(`📦 Using preset: ${mergedOptions.preset}`);
         }
-        else if (filter) {
-            finalFilter = filter;
-            logger.info(`🔍 Using filter: ${filter}`);
+        else if (mergedOptions.filter) {
+            finalFilter = mergedOptions.filter;
+            logger.info(`🔍 Using filter: ${mergedOptions.filter}`);
         }
-        else if (tags && tags.length > 0) {
-            finalTags = tags;
-            logger.info(`🏷️  Using tags: ${tags.join(', ')}`);
+        else if (mergedOptions.tags && mergedOptions.tags.length > 0) {
+            finalTags = mergedOptions.tags;
+            logger.info(`🏷️  Using tags: ${mergedOptions.tags.join(', ')}`);
         }
         // Create and start proxy transport
         logger.info('📡 Starting STDIO proxy...');
         const proxyTransport = new StdioProxyTransport({
-            serverUrl,
+            serverUrl: discoveredUrl,
             preset: finalPreset,
             filter: finalFilter,
             tags: finalTags,
-            projectConfig: projectConfig || undefined, // Pass project config for context enrichment
+            context: buildCliContext({
+                cwd,
+                projectConfig,
+                projectRoot,
+                transportType: 'stdio-proxy',
+                version: MCP_SERVER_VERSION,
+                sessionId: generateStreamableSessionId(),
+            }),
         });
         await proxyTransport.start();
-        logger.info(`📡 STDIO proxy running, forwarding to ${serverUrl}`);
+        logger.info(`📡 STDIO proxy running, forwarding to ${discoveredUrl}`);
         // Set up graceful shutdown
         const shutdown = async () => {
             logger.info('Shutting down STDIO proxy...');

package/build/commands/proxy/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/commands/proxy/proxy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/commands/proxy/proxy.ts"],"names":[],"mappings":"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"}

package/build/commands/run/index.d.ts

@@ -0,0 +1,3 @@
+import type { Argv } from 'yargs';
+export declare function setupRunCommand(yargs: Argv): Argv;
+//# sourceMappingURL=index.d.ts.map

package/build/commands/run/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/run/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAElC,wBAAgB,eAAe,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,CAkEjD"}

package/build/commands/run/index.js

@@ -0,0 +1,62 @@
+import { runCliCommand } from '../../commands/shared/commandRunner.js';
+import { globalOptions } from '../../globalOptions.js';
+export function setupRunCommand(yargs) {
+    return yargs.command('run <tool>', 'Run an MCP tool against a running 1MCP serve instance', (commandYargs) => commandYargs
+        .options(globalOptions || {})
+        .positional('tool', {
+        describe: 'Tool reference in the format <server>/<tool>',
+        type: 'string',
+    })
+        .option('url', {
+        alias: 'u',
+        describe: 'Override auto-detected 1MCP server URL',
+        type: 'string',
+    })
+        .option('preset', {
+        alias: 'p',
+        describe: 'Use a preset when calling the running 1MCP server',
+        type: 'string',
+    })
+        .option('tag-filter', {
+        alias: 'f',
+        describe: 'Apply an advanced tag filter expression',
+        type: 'string',
+    })
+        .option('tags', {
+        describe: 'Apply simple comma-separated tags',
+        type: 'array',
+        string: true,
+    })
+        .option('args', {
+        describe: 'Tool arguments as a JSON object',
+        type: 'string',
+    })
+        .option('format', {
+        describe: 'Output format',
+        type: 'string',
+        choices: ['toon', 'json', 'text', 'compact'],
+    })
+        .option('raw', {
+        describe: 'Alias for --format json',
+        type: 'boolean',
+        default: false,
+    })
+        .option('max-chars', {
+        describe: 'Maximum characters for compact output',
+        type: 'number',
+        default: 2000,
+    })
+        .example([
+        ['$0 run filesystem/read_file --args \'{"path":"./foo.txt"}\'', 'Call a tool with explicit JSON arguments'],
+        ['$0 run summarizer/summarize < README.md', 'Pipe raw stdin into the first required string argument'],
+        [
+            '$0 run --preset development validator/validate --args \'{"path":"./schema.json"}\'',
+            'Call through a preset',
+        ],
+    ])
+        .epilogue('This command requires a running `1mcp serve` instance. For pipe-friendly usage, stdout is reserved for tool output and errors are sent to stderr.'), async (argv) => {
+        const { runCommand } = await import('./run.js');
+        await runCliCommand(argv, runCommand);
+    });
+}
+//# sourceMappingURL=index.js.map

package/build/commands/run/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/run/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,MAAM,UAAU,eAAe,CAAC,KAAW;IACzC,OAAO,KAAK,CAAC,OAAO,CAClB,YAAY,EACZ,uDAAuD,EACvD,CAAC,YAAY,EAAE,EAAE,CACf,YAAY;SACT,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;SAC5B,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,8CAA8C;QACxD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,wCAAwC;QAClD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,mDAAmD;QAC7D,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,YAAY,EAAE;QACpB,KAAK,EAAE,GAAG;QACV,QAAQ,EAAE,yCAAyC;QACnD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,mCAAmC;QAC7C,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;KACb,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,iCAAiC;QAC3C,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QAChB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC;KAC7C,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,QAAQ,EAAE,yBAAyB;QACnC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,MAAM,CAAC,WAAW,EAAE;QACnB,QAAQ,EAAE,uCAAuC;QACjD,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,IAAI;KACd,CAAC;SACD,OAAO,CAAC;QACP,CAAC,6DAA6D,EAAE,0CAA0C,CAAC;QAC3G,CAAC,yCAAyC,EAAE,wDAAwD,CAAC;QACrG;YACE,oFAAoF;YACpF,uBAAuB;SACxB;KACF,CAAC;SACD,QAAQ,CACP,mJAAmJ,CACpJ,EACL,KAAK,EAAE,IAAI,EAAE,EAAE;QACb,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAChD,MAAM,aAAa,CAAC,IAAwC,EAAE,UAAU,CAAC,CAAC;IAC5E,CAAC,CACF,CAAC;AACJ,CAAC"}

package/build/commands/run/run.d.ts

@@ -0,0 +1,35 @@
+import { type CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import { type RunOutputFormat } from '../../commands/run/runUtils.js';
+import { type JsonRpcResponse } from '../../commands/shared/serveClient.js';
+import type { GlobalOptions } from '../../globalOptions.js';
+import type { ContextData } from '../../types/context.js';
+export interface RunCommandOptions extends GlobalOptions {
+    url?: string;
+    preset?: string;
+    filter?: string;
+    tags?: string[];
+    'tag-filter'?: string;
+    format?: RunOutputFormat;
+    raw?: boolean;
+    'max-chars'?: number;
+    args?: string;
+    tool: string;
+}
+export { buildServerUrl, deleteCliSessionCache, getCliSessionCachePath, getCliSessionContextHash, readCliSessionCache, SESSION_CACHE_TTL_MS, writeCliSessionCache, } from '../../commands/shared/serveClient.js';
+export declare function runCommand(options: RunCommandOptions): Promise<void>;
+export declare function invokeTool(options: {
+    serverUrl: URL;
+    sessionId?: string;
+    bearerToken?: string;
+    displayToolName: string;
+    qualifiedToolName: string;
+    explicitArgs?: string;
+    stdinText?: string;
+    resolveTool: boolean;
+    initializeContext?: ContextData;
+}): Promise<{
+    rawResponse: JsonRpcResponse<CallToolResult>;
+    sessionId?: string;
+    retryWithFreshSession: boolean;
+}>;
+//# sourceMappingURL=run.d.ts.map

package/build/commands/run/run.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/commands/run/run.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,cAAc,EAAa,MAAM,oCAAoC,CAAC;AAGpF,OAAO,EAQL,KAAK,eAAe,EAErB,MAAM,+BAA+B,CAAC;AAIvC,OAAO,EAKL,KAAK,eAAe,EAIrB,MAAM,qCAAqC,CAAC;AAG7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAYD,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,qCAAqC,CAAC;AAE7C,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsM1E;AA+CD,wBAAsB,UAAU,CAAC,OAAO,EAAE;IACxC,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,WAAW,CAAC;CACjC,GAAG,OAAO,CAAC;IACV,WAAW,EAAE,eAAe,CAAC,cAAc,CAAC,CAAC;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,EAAE,OAAO,CAAC;CAChC,CAAC,CA+HD"}

package/build/commands/run/run.js

@@ -0,0 +1,340 @@
+import { StreamableHTTPError } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { extractInspectToolInfo } from '../../commands/inspect/inspectUtils.js';
+import { findToolByQualifiedName, formatToolCallOutput, parseExplicitArgs, parseJsonObject, parseToolReference, resolveToolArguments, RunCommandInputError, validateToolArgs, } from '../../commands/run/runUtils.js';
+import { ApiClient } from '../../commands/shared/apiClient.js';
+import { loadAuthProfile, normalizeServerUrl } from '../../commands/shared/authProfileStore.js';
+import { buildCliContext } from '../../commands/shared/cliContext.js';
+import { deleteCliSessionCache, getCliSessionCachePath, getCliSessionContextHash, readCliSessionCache, StreamableServeClient, writeCliSessionCache, } from '../../commands/shared/serveClient.js';
+import { resolveServeTarget } from '../../commands/shared/serveTargetResolver.js';
+import { API_INSPECT_ENDPOINT, API_TOOL_INVOCATIONS_ENDPOINT } from '../../constants/api.js';
+import { stripMcpSuffix } from '../../utils/urlUtils.js';
+export { buildServerUrl, deleteCliSessionCache, getCliSessionCachePath, getCliSessionContextHash, readCliSessionCache, SESSION_CACHE_TTL_MS, writeCliSessionCache, } from '../../commands/shared/serveClient.js';
+export async function runCommand(options) {
+    const toolReference = parseToolReference(options.tool);
+    const format = options.raw ? 'json' : options.format || 'toon';
+    const maxChars = options['max-chars'] ?? 2000;
+    const [{ cwd, projectConfig, projectRoot, discoveredUrl, serverPid, serverUrl }, stdinText] = await Promise.all([
+        resolveServeTarget(options),
+        readStdin(),
+    ]);
+    const runContext = buildCliContext({
+        cwd,
+        projectConfig,
+        projectRoot,
+        transportType: 'run',
+        version: 'run',
+    });
+    const contextHash = getCliSessionContextHash(runContext);
+    const cachePath = getCliSessionCachePath({
+        cachePathTemplate: options['cli-session-cache-path'],
+        serverPid,
+        serverUrl: serverUrl.toString(),
+    });
+    const cachedSession = await readCliSessionCache(cachePath, serverUrl.toString(), contextHash);
+    const baseUrl = stripMcpSuffix(discoveredUrl);
+    const authProfile = await loadAuthProfile(options['config-dir'], normalizeServerUrl(baseUrl));
+    const apiClient = new ApiClient({
+        baseUrl,
+        bearerToken: authProfile?.token,
+        sessionId: cachedSession?.sessionId,
+        context: runContext,
+    });
+    let cachedRestEndpointSupport = cachedSession?.hasRestEndpoint;
+    // REST-first path: skip MCP handshake when we know the server supports it,
+    // or probe once on first run. Fall back to MCP on missing/unsupported/upstream errors.
+    const canTryRest = cachedSession?.hasRestEndpoint !== false;
+    const needsSchemaForStdin = options.args === undefined && stdinText !== undefined;
+    const needsSchemaForValidation = options.args !== undefined;
+    if (canTryRest) {
+        const restArgs = options.args !== undefined
+            ? parseExplicitArgs(options.args)
+            : stdinText !== undefined
+                ? parseJsonObject(stdinText)
+                : {};
+        const toolInfo = (needsSchemaForStdin && restArgs === null) || needsSchemaForValidation
+            ? await fetchToolInfoFromApi(apiClient, toolReference, options.tool)
+            : null;
+        if (restArgs !== null || toolInfo) {
+            const resolvedArguments = restArgs !== null
+                ? restArgs
+                : resolveToolArguments({
+                    stdinText,
+                    tool: toTool(toolInfo),
+                }).arguments;
+            if (toolInfo) {
+                const validation = validateToolArgs(resolvedArguments, toolInfo.inputSchema, options.tool);
+                if (!validation.valid) {
+                    process.stderr.write(`${validation.errorMessage}\n`);
+                    process.exitCode = 1;
+                    return;
+                }
+            }
+            // Forward filter params (preset/tags/filter) as query params so server-side
+            // filtering applies on the REST path, same as the MCP path.
+            const restEndpoint = serverUrl.search
+                ? `${API_TOOL_INVOCATIONS_ENDPOINT}${serverUrl.search}`
+                : API_TOOL_INVOCATIONS_ENDPOINT;
+            const apiResponse = await apiClient.post(restEndpoint, {
+                tool: options.tool,
+                args: resolvedArguments,
+                _meta: {
+                    context: runContext,
+                },
+            });
+            const shouldFallbackToMcp = shouldFallbackToMcpForRest(apiResponse.status, apiResponse.error);
+            const shouldPersistRestDisabled = shouldPersistRestSupportDisabled(apiResponse.status, apiResponse.error);
+            if (!shouldFallbackToMcp) {
+                await writeCliSessionCache(cachePath, {
+                    sessionId: apiResponse.sessionId ?? cachedSession?.sessionId ?? 'rest',
+                    serverUrl: serverUrl.toString(),
+                    contextHash,
+                    savedAt: Date.now(),
+                    hasRestEndpoint: true,
+                });
+                cachedRestEndpointSupport = true;
+                let rawResponse;
+                if (apiResponse.ok && apiResponse.data) {
+                    rawResponse = { jsonrpc: '2.0', id: 0, result: apiResponse.data.result };
+                }
+                else {
+                    rawResponse = {
+                        jsonrpc: '2.0',
+                        id: 0,
+                        error: { code: -32000, message: apiResponse.error ?? `HTTP ${apiResponse.status}` },
+                    };
+                }
+                const output = formatToolCallOutput(rawResponse, format, maxChars);
+                if ('error' in rawResponse) {
+                    process.stderr.write(`${output}\n`);
+                    process.exitCode = 1;
+                    return;
+                }
+                if (rawResponse.result.isError) {
+                    process.stderr.write(`${output}\n`);
+                    process.exitCode = 2;
+                    return;
+                }
+                if (output.length > 0) {
+                    process.stdout.write(`${output}\n`);
+                }
+                return;
+            }
+            if (shouldPersistRestDisabled) {
+                await writeCliSessionCache(cachePath, {
+                    sessionId: cachedSession?.sessionId ?? 'mcp',
+                    serverUrl: serverUrl.toString(),
+                    contextHash,
+                    savedAt: Date.now(),
+                    hasRestEndpoint: false,
+                });
+                cachedRestEndpointSupport = false;
+            }
+        }
+    }
+    let response = await invokeTool({
+        serverUrl,
+        sessionId: cachedSession?.sessionId,
+        bearerToken: authProfile?.token,
+        displayToolName: options.tool,
+        qualifiedToolName: toolReference.qualifiedName,
+        explicitArgs: options.args,
+        stdinText,
+        resolveTool: options.args === undefined,
+        initializeContext: runContext,
+    });
+    if (response.retryWithFreshSession) {
+        await deleteCliSessionCache(cachePath);
+        response = await invokeTool({
+            serverUrl,
+            bearerToken: authProfile?.token,
+            displayToolName: options.tool,
+            qualifiedToolName: toolReference.qualifiedName,
+            explicitArgs: options.args,
+            stdinText,
+            resolveTool: options.args === undefined,
+            initializeContext: runContext,
+        });
+    }
+    if (response.sessionId) {
+        await writeCliSessionCache(cachePath, {
+            sessionId: response.sessionId,
+            serverUrl: serverUrl.toString(),
+            contextHash,
+            savedAt: Date.now(),
+            hasRestEndpoint: cachedRestEndpointSupport,
+        });
+    }
+    const output = formatToolCallOutput(response.rawResponse, format, maxChars);
+    if ('error' in response.rawResponse) {
+        process.stderr.write(`${output}\n`);
+        process.exitCode = 1;
+        return;
+    }
+    if (response.rawResponse.result.isError) {
+        process.stderr.write(`${output}\n`);
+        process.exitCode = 2;
+        return;
+    }
+    if (output.length > 0) {
+        process.stdout.write(`${output}\n`);
+    }
+}
+function isEndpointNotFoundResponse(status, error) {
+    return status === 404 && /^HTTP 404\b/u.test(error ?? '');
+}
+function shouldFallbackToMcpForRest(status, error) {
+    return status === 405 || status === 503 || status === 0 || isEndpointNotFoundResponse(status, error);
+}
+function shouldPersistRestSupportDisabled(status, error) {
+    return status === 405 || isEndpointNotFoundResponse(status, error);
+}
+async function fetchToolInfoFromApi(apiClient, toolReference, displayToolName) {
+    const apiResponse = await apiClient.get(API_INSPECT_ENDPOINT, {
+        target: displayToolName,
+    });
+    if (!apiResponse.ok || !apiResponse.data || apiResponse.data.kind !== 'tool') {
+        return null;
+    }
+    return extractInspectToolInfo({
+        name: apiResponse.data.qualifiedName,
+        description: apiResponse.data.description,
+        inputSchema: apiResponse.data.inputSchema,
+        outputSchema: apiResponse.data.outputSchema,
+    }, toolReference);
+}
+function toTool(toolInfo) {
+    return {
+        name: toolInfo.qualifiedName,
+        description: toolInfo.description,
+        inputSchema: toolInfo.inputSchema,
+        outputSchema: toolInfo.outputSchema,
+    };
+}
+export async function invokeTool(options) {
+    const client = new StreamableServeClient(options.serverUrl, options.sessionId, options.bearerToken);
+    await client.start();
+    try {
+        let tool;
+        if (!options.sessionId) {
+            const initializeResponse = await client.initialize(options.initializeContext);
+            if ('error' in initializeResponse) {
+                return {
+                    rawResponse: initializeResponse,
+                    sessionId: client.sessionId,
+                    retryWithFreshSession: false,
+                };
+            }
+        }
+        if (options.sessionId && !options.resolveTool) {
+            const toolsResponse = await client.listTools();
+            if ('error' in toolsResponse) {
+                return {
+                    rawResponse: toolsResponse,
+                    sessionId: client.sessionId,
+                    retryWithFreshSession: false,
+                };
+            }
+            tool = findToolByQualifiedName(toolsResponse.result.tools, options.qualifiedToolName);
+            if (!tool) {
+                return {
+                    rawResponse: {
+                        jsonrpc: '2.0',
+                        id: 0,
+                        error: {
+                            code: -32004,
+                            message: 'Cached session missing requested tool.',
+                        },
+                    },
+                    retryWithFreshSession: true,
+                };
+            }
+        }
+        if (options.resolveTool) {
+            const toolsResponse = await client.listTools();
+            if ('error' in toolsResponse) {
+                return {
+                    rawResponse: toolsResponse,
+                    sessionId: client.sessionId,
+                    retryWithFreshSession: false,
+                };
+            }
+            tool = findToolByQualifiedName(toolsResponse.result.tools, options.qualifiedToolName);
+            if (!tool) {
+                if (options.sessionId) {
+                    return {
+                        rawResponse: {
+                            jsonrpc: '2.0',
+                            id: 0,
+                            error: {
+                                code: -32004,
+                                message: 'Cached session missing requested tool.',
+                            },
+                        },
+                        retryWithFreshSession: true,
+                    };
+                }
+                throw new RunCommandInputError(`Unknown tool: ${options.displayToolName}`);
+            }
+        }
+        const resolvedArguments = resolveToolArguments({
+            explicitArgs: options.explicitArgs,
+            stdinText: options.stdinText,
+            tool,
+        });
+        if (tool) {
+            const validation = validateToolArgs(resolvedArguments.arguments, tool.inputSchema, options.displayToolName);
+            if (!validation.valid) {
+                return {
+                    rawResponse: {
+                        jsonrpc: '2.0',
+                        id: 0,
+                        error: { code: -32602, message: validation.errorMessage },
+                    },
+                    sessionId: client.sessionId,
+                    retryWithFreshSession: false,
+                };
+            }
+        }
+        const response = await client.callTool(options.qualifiedToolName, resolvedArguments.arguments);
+        return {
+            rawResponse: response,
+            sessionId: client.sessionId,
+            retryWithFreshSession: false,
+        };
+    }
+    catch (error) {
+        if (error instanceof StreamableHTTPError && error.code === 404 && options.sessionId) {
+            return {
+                rawResponse: {
+                    jsonrpc: '2.0',
+                    id: 0,
+                    error: {
+                        code: -32004,
+                        message: 'Cached session expired.',
+                    },
+                },
+                retryWithFreshSession: true,
+            };
+        }
+        throw error;
+    }
+    finally {
+        try {
+            await client.close();
+        }
+        catch {
+            // Best-effort cleanup for CLI run sessions.
+        }
+    }
+}
+async function readStdin() {
+    if (process.stdin.isTTY) {
+        return undefined;
+    }
+    const chunks = [];
+    for await (const chunk of process.stdin) {
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk)));
+    }
+    return Buffer.concat(chunks).toString('utf8');
+}
+//# sourceMappingURL=run.js.map