@1mcp/agent 0.30.2 → 0.31.0-beta1

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

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

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

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

@@ -0,0 +1,49 @@
+import type { CallToolResult, Tool } from '@modelcontextprotocol/sdk/types.js';
+export type RunOutputFormat = 'json' | 'text' | 'toon' | 'compact';
+export interface ParsedToolReference {
+    serverName: string;
+    toolName: string;
+    qualifiedName: string;
+}
+export interface ResolveToolArgumentsOptions {
+    explicitArgs?: string;
+    stdinText?: string;
+    tool?: Tool;
+}
+export interface ResolveToolArgumentsResult {
+    arguments: Record<string, unknown>;
+    usedStdin: boolean;
+}
+interface JsonRpcSuccessEnvelope {
+    jsonrpc: '2.0';
+    id: number;
+    result: CallToolResult;
+}
+interface JsonRpcErrorEnvelope {
+    jsonrpc: '2.0';
+    id: number;
+    error: {
+        code: number;
+        message: string;
+        data?: unknown;
+    };
+}
+export declare class RunCommandInputError extends Error {
+}
+export interface ValidateToolArgsFailure {
+    valid: false;
+    errorMessage: string;
+    schema: Record<string, unknown>;
+}
+export declare function validateToolArgs(args: Record<string, unknown>, inputSchema: Record<string, unknown>, toolDisplayName: string): {
+    valid: true;
+} | ValidateToolArgsFailure;
+export declare function parseToolReference(toolRef: string): ParsedToolReference;
+export declare function findToolByQualifiedName(tools: Tool[], qualifiedName: string): Tool | undefined;
+export declare function resolveToolArguments(options: ResolveToolArgumentsOptions): ResolveToolArgumentsResult;
+export declare function formatToolCallOutput(response: JsonRpcSuccessEnvelope | JsonRpcErrorEnvelope, format: RunOutputFormat, maxChars: number): string;
+export declare function truncateText(text: string, maxChars: number): string;
+export declare function parseExplicitArgs(value: string): Record<string, unknown>;
+export declare function parseJsonObject(text: string): Record<string, unknown> | null;
+export {};
+//# sourceMappingURL=runUtils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"runUtils.d.ts","sourceRoot":"","sources":["../../../src/commands/run/runUtils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAO/E,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;AAEnE,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,2BAA2B;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,IAAI,CAAC;CACb;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;CACpB;AAwBD,UAAU,sBAAsB;IAC9B,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,UAAU,oBAAoB;IAC5B,OAAO,EAAE,KAAK,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,OAAO,CAAC;KAChB,CAAC;CACH;AAED,qBAAa,oBAAqB,SAAQ,KAAK;CAAG;AAElD,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,eAAe,EAAE,MAAM,GACtB;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG,uBAAuB,CAY3C;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,CAmBvE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAE9F;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,0BAA0B,CA8CrG;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,sBAAsB,GAAG,oBAAoB,EACvD,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,MAAM,GACf,MAAM,CAwBR;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAmBnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAexE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAO5E"}

package/build/commands/run/runUtils.js

@@ -0,0 +1,195 @@
+import { encode } from '@toon-format/toon';
+import { MCP_URI_SEPARATOR } from '../../constants.js';
+import { CustomJsonSchemaValidator } from '../../core/validation/CustomJsonSchemaValidator.js';
+import { buildUri } from '../../utils/core/parsing.js';
+import { isPlainObject } from '../../utils/typeGuards.js';
+export class RunCommandInputError extends Error {
+}
+export function validateToolArgs(args, inputSchema, toolDisplayName) {
+    const validator = new CustomJsonSchemaValidator();
+    const validate = validator.getValidator(inputSchema);
+    const result = validate(args);
+    if (result.valid) {
+        return { valid: true };
+    }
+    return {
+        valid: false,
+        errorMessage: `Validation failed for ${toolDisplayName}:\n  ${result.errorMessage ?? 'Invalid arguments'}\n\nExpected schema:\n${JSON.stringify(inputSchema, null, 2)}`,
+        schema: inputSchema,
+    };
+}
+export function parseToolReference(toolRef) {
+    const parts = toolRef.split('/');
+    if (parts.length !== 2) {
+        throw new RunCommandInputError('Tool reference must be in the format <server>/<tool>.');
+    }
+    const [serverPart, toolPart] = parts;
+    const serverName = serverPart.trim();
+    const toolName = toolPart.trim();
+    if (!serverName || !toolName) {
+        throw new RunCommandInputError('Tool reference must be in the format <server>/<tool>.');
+    }
+    return {
+        serverName,
+        toolName,
+        qualifiedName: buildUri(serverName, toolName, MCP_URI_SEPARATOR),
+    };
+}
+export function findToolByQualifiedName(tools, qualifiedName) {
+    return tools.find((tool) => tool.name === qualifiedName);
+}
+export function resolveToolArguments(options) {
+    if (options.explicitArgs !== undefined) {
+        return {
+            arguments: parseExplicitArgs(options.explicitArgs),
+            usedStdin: false,
+        };
+    }
+    const stdinText = options.stdinText;
+    if (stdinText === undefined) {
+        return {
+            arguments: {},
+            usedStdin: false,
+        };
+    }
+    const stdinObject = parseJsonObject(stdinText);
+    if (stdinObject) {
+        return {
+            arguments: stdinObject,
+            usedStdin: true,
+        };
+    }
+    if (!options.tool) {
+        throw new RunCommandInputError('Tool schema is required to map raw stdin. Use --args instead.');
+    }
+    const targetProperty = getFirstRequiredStringProperty(options.tool);
+    if (!targetProperty) {
+        throw new RunCommandInputError(`Tool ${options.tool.name.replace(MCP_URI_SEPARATOR, '/')} has no string arguments. Cannot map stdin. Use --args instead.`);
+    }
+    const remainingRequired = getRequiredProperties(options.tool).filter((property) => property !== targetProperty);
+    if (remainingRequired.length > 0) {
+        throw new RunCommandInputError(`Missing required argument: ${remainingRequired[0]}. Use --args or named flags.`);
+    }
+    return {
+        arguments: {
+            [targetProperty]: stdinText,
+        },
+        usedStdin: true,
+    };
+}
+export function formatToolCallOutput(response, format, maxChars) {
+    if (format === 'json') {
+        if ('error' in response) {
+            return JSON.stringify(response, null, 2);
+        }
+        const data = response.result.structuredContent ?? response.result.content;
+        return JSON.stringify(data, null, 2);
+    }
+    if ('error' in response) {
+        return response.error.message;
+    }
+    if (format === 'toon') {
+        const data = response.result.structuredContent ?? response.result.content;
+        return encode(data);
+    }
+    const textOutput = extractTextOutput(response.result);
+    if (format === 'text') {
+        return textOutput;
+    }
+    return truncateText(textOutput, maxChars);
+}
+export function truncateText(text, maxChars) {
+    if (maxChars < 0) {
+        throw new RunCommandInputError('--max-chars must be zero or greater.');
+    }
+    if (maxChars === 0) {
+        return text;
+    }
+    if (text.length <= maxChars) {
+        return text;
+    }
+    const suffix = '... [truncated]';
+    if (maxChars <= suffix.length) {
+        return suffix.slice(0, maxChars);
+    }
+    return `${text.slice(0, maxChars - suffix.length)}${suffix}`;
+}
+export function parseExplicitArgs(value) {
+    try {
+        const parsed = JSON.parse(value);
+        if (!isPlainObject(parsed)) {
+            throw new RunCommandInputError('--args must be a JSON object.');
+        }
+        return parsed;
+    }
+    catch (error) {
+        if (error instanceof RunCommandInputError) {
+            throw error;
+        }
+        throw new RunCommandInputError(`Invalid JSON passed to --args: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+export function parseJsonObject(text) {
+    try {
+        const parsed = JSON.parse(text);
+        return isPlainObject(parsed) ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+function getFirstRequiredStringProperty(tool) {
+    const schema = getToolSchema(tool);
+    const requiredProperties = getRequiredProperties(tool);
+    for (const propertyName of requiredProperties) {
+        const property = schema.properties?.[propertyName];
+        if (isSchemaString(property)) {
+            return propertyName;
+        }
+    }
+    return undefined;
+}
+function getRequiredProperties(tool) {
+    const schema = getToolSchema(tool);
+    if (!Array.isArray(schema.required)) {
+        return [];
+    }
+    return schema.required.filter((value) => typeof value === 'string' && value.length > 0);
+}
+function getToolSchema(tool) {
+    const schema = tool.inputSchema;
+    if (!schema || typeof schema !== 'object') {
+        return {};
+    }
+    return schema;
+}
+function isSchemaString(value) {
+    return typeof value === 'object' && value !== null && 'type' in value && value.type === 'string';
+}
+function extractTextOutput(result) {
+    const output = [];
+    for (const block of result.content) {
+        if (isTextContentBlock(block)) {
+            output.push(block.text);
+            continue;
+        }
+        if (isImageContentBlock(block)) {
+            output.push(`[image: ${block.mimeType || 'unknown'}]`);
+            continue;
+        }
+        if (isResourceContentBlock(block)) {
+            output.push(`[resource: ${block.resource?.uri || 'unknown'}]`);
+        }
+    }
+    return output.join('\n');
+}
+function isTextContentBlock(value) {
+    return typeof value === 'object' && value !== null && 'type' in value && value.type === 'text' && 'text' in value;
+}
+function isImageContentBlock(value) {
+    return typeof value === 'object' && value !== null && 'type' in value && value.type === 'image';
+}
+function isResourceContentBlock(value) {
+    return typeof value === 'object' && value !== null && 'type' in value && value.type === 'resource';
+}
+//# sourceMappingURL=runUtils.js.map

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

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

package/build/commands/shared/apiClient.d.ts

@@ -0,0 +1,27 @@
+import type { ContextData } from '../../types/context.js';
+export interface ApiClientOptions {
+    baseUrl: string;
+    bearerToken?: string;
+    timeout?: number;
+    sessionId?: string;
+    context?: ContextData;
+}
+export interface ApiResponse<T> {
+    ok: boolean;
+    status: number;
+    data?: T;
+    error?: string;
+    sessionId?: string;
+}
+export declare class ApiClient {
+    private readonly baseUrl;
+    private readonly bearerToken?;
+    private readonly timeout;
+    private readonly sessionId?;
+    private readonly context?;
+    constructor(options: ApiClientOptions);
+    get<T>(path: string, query?: Record<string, string>): Promise<ApiResponse<T>>;
+    post<T>(path: string, body: unknown): Promise<ApiResponse<T>>;
+    private request;
+}
+//# sourceMappingURL=apiClient.d.ts.map

package/build/commands/shared/apiClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apiClient.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/apiClient.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAc;gBAE3B,OAAO,EAAE,gBAAgB;IAQ/B,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAe7E,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAKrD,OAAO;CAkEtB"}