@apify/mcpc 0.2.0-beta.1 → 0.2.0-beta.2

package/CHANGELOG.md

@@ -7,8 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- New `mcpc grep <pattern>` command to search tools, resources, prompts, and server instructions across all active sessions, with support for regex (`-E`), type filters (`--tools`, `--resources`, `--prompts`, `--instructions`), single-session search (`mcpc @session grep`), and capability-aware querying (skips unsupported list operations)
+- Recovery hints for crashed and expired sessions in `mcpc` session list output
+
 ### Fixed
 
+- Fixed `mcpc help <command>` showing truncated usage line (e.g. `Usage: resources-read <uri>`) — now correctly shows `Usage: mcpc <@session> resources-read <uri>`
 - Fixed auth loss when reconnecting an unauthorized session via `mcpc connect` — the `unauthorized` status was not cleared, causing all subsequent operations to fail with "Authentication required by server" even after successful reconnection
 - HTTP proxy support (`HTTP_PROXY`/`HTTPS_PROXY` env vars) now works for MCP server connections, OAuth token refresh, and x402 payment signing — previously the MCP SDK transport and OAuth calls bypassed the global proxy dispatcher
 

package/README.md

@@ -129,13 +129,15 @@ Commands:
   login <server>               Interactively login to a server using OAuth and save profile
   logout <server>              Delete an authentication profile for a server
   clean [resources...]         Clean up mcpc data (sessions, profiles, logs, all)
+  grep <pattern>               Search tools and instructions across all active sessions
   x402 [subcommand] [args...]  Configure an x402 payment wallet (EXPERIMENTAL)
   help [command] [subcommand]  Show help for a specific command
 
 MCP session commands (after connecting):
-  <@session>                   Show MCP server info and capabilities
-  <@session> tools-list        List MCP tools
-  <@session> tools-get <name>
+  <@session>                   Show MCP server info, capabilities, and tools
+  <@session> grep <pattern>    Search tools, resources, or prompts
+  <@session> tools-list        List all server tools
+  <@session> tools-get <name>  Get tool details and schema
   <@session> tools-call <name> [arg:=val ... | <json> | <stdin]
   <@session> prompts-list
   <@session> prompts-get <name> [arg:=val ... | <json> | <stdin]
@@ -265,6 +267,49 @@ mcpc @apify shell
 Shell commands: `help`, `exit`/`quit`/Ctrl+D, Ctrl+C to cancel.
 Arrow keys navigate history (saved to `~/.mcpc/history`).
 
+### Grep (search across sessions)
+
+`mcpc grep` searches tools, resources, and prompts across all active sessions or within a single session:
+
+```bash
+# Search tools in all active sessions (default: tools only)
+mcpc grep "search"
+
+# Search within a single session
+mcpc @apify grep "actor"
+
+# Search resources or prompts instead of tools
+mcpc grep "config" --resources
+mcpc grep "greeting" --prompts
+
+# Combine type flags
+mcpc grep "data" --tools --resources --prompts
+
+# Regex search
+mcpc grep "search|find" -E
+
+# Case-sensitive search (default is case-insensitive)
+mcpc grep "Search" --case-sensitive
+
+# Limit results
+mcpc grep "e" -m 5
+
+# JSON output for scripting
+mcpc grep "actor" --json
+```
+
+By default, `grep` searches only tools. Use `--resources` or `--prompts` to search those types
+(combine with `--tools` to include tools too). Sessions that are crashed or unavailable are shown
+with their status rather than silently skipped.
+
+The `grep` command is useful for **dynamic tool discovery**, 
+also called [Advanced tool use](https://www.anthropic.com/engineering/advanced-tool-use) by Anthropic
+or [Dynamic context discovery](https://cursor.com/blog/dynamic-context-discovery) by Cursor.
+Rather than loading all tools into context, the AI agent can use `grep` to discover the right tool
+for the job,and only load the matching tools into the context to reduce token usage and improve accuracy.
+
+<!-- TODO: explain this more, show diagram -->
+
 ### JSON mode
 
 By default, `mcpc` prints output in Markdown-ish text format with colors, making it easy to read by both humans and AIs.

package/dist/cli/commands/grep.d.ts

@@ -0,0 +1,13 @@
+import type { CommandOptions } from '../../lib/types.js';
+export interface GrepOptions extends CommandOptions {
+    tools?: boolean | undefined;
+    resources?: boolean | undefined;
+    prompts?: boolean | undefined;
+    instructions?: boolean | undefined;
+    regex?: boolean | undefined;
+    caseSensitive?: boolean | undefined;
+    maxResults?: number | undefined;
+}
+export declare function grepSession(session: string, pattern: string, options: GrepOptions): Promise<number>;
+export declare function grepAllSessions(pattern: string, options: GrepOptions): Promise<number>;
+//# sourceMappingURL=grep.d.ts.map

package/dist/cli/commands/grep.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/grep.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAA0B,cAAc,EAAe,MAAM,oBAAoB,CAAC;AAgB9F,MAAM,WAAW,WAAY,SAAQ,cAAc;IACjD,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAChC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACnC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAoVD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,CA+CjB;AAyBD,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAmL5F"}

package/dist/cli/commands/grep.js

@@ -0,0 +1,373 @@
+import chalk from 'chalk';
+import { ClientError } from '../../lib/errors.js';
+import { isProcessAlive } from '../../lib/utils.js';
+import { consolidateSessions } from '../../lib/sessions.js';
+import { withSessionClient } from '../../lib/session-client.js';
+import { withMcpClient } from '../helpers.js';
+import { formatJson, formatToolParamsInline, formatToolAnnotations, grayBacktick, inBackticks, } from '../output.js';
+import { getBridgeStatus, formatBridgeStatus } from './sessions.js';
+function buildMatcher(pattern, options) {
+    if (options.regex) {
+        let re;
+        try {
+            re = new RegExp(pattern, options.caseSensitive ? '' : 'i');
+        }
+        catch (err) {
+            throw new ClientError(`Invalid regex pattern: ${pattern}\n${err instanceof Error ? err.message : String(err)}`);
+        }
+        return (text) => re.test(text);
+    }
+    if (options.caseSensitive) {
+        return (text) => text.includes(pattern);
+    }
+    const lowerPattern = pattern.toLowerCase();
+    return (text) => text.toLowerCase().includes(lowerPattern);
+}
+function getSearchTypes(options) {
+    const anyFilter = options.tools || options.resources || options.prompts || options.instructions;
+    return {
+        searchTools: anyFilter ? !!options.tools : true,
+        searchResources: !!options.resources,
+        searchPrompts: !!options.prompts,
+        searchInstructions: anyFilter ? !!options.instructions : true,
+    };
+}
+function buildToolSearchText(tool, sessionName) {
+    return `${sessionName}/${tool.name} ${JSON.stringify(tool, null, 2)}`;
+}
+function buildResourceSearchText(resource, sessionName) {
+    return `${sessionName}/${resource.uri} ${JSON.stringify(resource, null, 2)}`;
+}
+function buildPromptSearchText(prompt, sessionName) {
+    return `${sessionName}/${prompt.name} ${JSON.stringify(prompt, null, 2)}`;
+}
+function buildInstructionsSearchText(instructions, sessionName) {
+    return `${sessionName} ${instructions}`;
+}
+async function searchClient(client, matcher, options, sessionName = '') {
+    const { searchTools, searchResources, searchPrompts, searchInstructions } = getSearchTypes(options);
+    const serverDetails = await client.getServerDetails();
+    const capabilities = serverDetails.capabilities;
+    const canListTools = searchTools && !!capabilities?.tools;
+    const canListResources = searchResources && !!capabilities?.resources;
+    const canListPrompts = searchPrompts && !!capabilities?.prompts;
+    const [toolsResult, resourcesResult, promptsResult] = await Promise.all([
+        canListTools ? client.listAllTools() : null,
+        canListResources ? fetchAllResources(client) : null,
+        canListPrompts ? fetchAllPrompts(client) : null,
+    ]);
+    const matchedTools = (toolsResult?.tools ?? []).filter((t) => matcher(buildToolSearchText(t, sessionName)));
+    const matchedResources = (resourcesResult ?? []).filter((r) => matcher(buildResourceSearchText(r, sessionName)));
+    const matchedPrompts = (promptsResult ?? []).filter((p) => matcher(buildPromptSearchText(p, sessionName)));
+    const instructionsText = searchInstructions ? serverDetails.instructions : undefined;
+    const matchedInstructions = !!instructionsText && matcher(buildInstructionsSearchText(instructionsText, sessionName));
+    return {
+        tools: matchedTools,
+        resources: matchedResources,
+        prompts: matchedPrompts,
+        instructions: matchedInstructions,
+    };
+}
+async function fetchAllResources(client) {
+    const all = [];
+    let cursor;
+    do {
+        const result = await client.listResources(cursor);
+        all.push(...result.resources);
+        cursor = result.nextCursor;
+    } while (cursor);
+    return all;
+}
+async function fetchAllPrompts(client) {
+    const all = [];
+    let cursor;
+    do {
+        const result = await client.listPrompts(cursor);
+        all.push(...result.prompts);
+        cursor = result.nextCursor;
+    } while (cursor);
+    return all;
+}
+function countMatches(result) {
+    return (result.tools.length +
+        result.resources.length +
+        result.prompts.length +
+        (result.instructions ? 1 : 0));
+}
+function countMatchesByType(result) {
+    return {
+        tools: result.tools.length,
+        resources: result.resources.length,
+        prompts: result.prompts.length,
+    };
+}
+function sumMatchesByType(results) {
+    return results.reduce((acc, r) => ({
+        tools: acc.tools + r.tools.length,
+        resources: acc.resources + r.resources.length,
+        prompts: acc.prompts + r.prompts.length,
+    }), { tools: 0, resources: 0, prompts: 0 });
+}
+function truncateResult(result, limit) {
+    const total = countMatches(result);
+    if (total <= limit)
+        return { result, truncated: 0 };
+    let remaining = limit;
+    const instructions = result.instructions && remaining > 0 ? true : false;
+    if (instructions)
+        remaining--;
+    const tools = result.tools.slice(0, remaining);
+    remaining -= tools.length;
+    const resources = result.resources.slice(0, remaining);
+    remaining -= resources.length;
+    const prompts = result.prompts.slice(0, remaining);
+    return {
+        result: { tools, resources, prompts, instructions },
+        truncated: total - limit,
+    };
+}
+function formatToolLine(tool) {
+    const bullet = chalk.dim('*');
+    const params = formatToolParamsInline(tool.inputSchema);
+    const parts = [];
+    const annotationsStr = formatToolAnnotations(tool.annotations);
+    if (annotationsStr)
+        parts.push(annotationsStr);
+    const toolAny = tool;
+    const execution = toolAny.execution;
+    const taskSupport = execution?.taskSupport;
+    if (taskSupport)
+        parts.push(`task:${taskSupport}`);
+    const suffix = parts.length > 0 ? ` ${chalk.gray(`[${parts.join(', ')}]`)}` : '';
+    return `${bullet} ${grayBacktick()}${chalk.cyan(tool.name)}${params}${grayBacktick()}${suffix}`;
+}
+function formatResourceLine(resource) {
+    const bullet = chalk.dim('*');
+    return `${bullet} ${inBackticks(resource.uri)}`;
+}
+function formatPromptLine(prompt) {
+    const bullet = chalk.dim('*');
+    return `${bullet} ${inBackticks(prompt.name)}`;
+}
+function formatResultSection(label, items, formatLine, indent) {
+    if (items.length === 0)
+        return [];
+    const lines = [];
+    lines.push(`${indent}${chalk.bold(`${label} (${items.length}):`)}`);
+    for (const item of items) {
+        lines.push(`${indent}  ${formatLine(item)}`);
+    }
+    return lines;
+}
+function formatGrepResultHuman(result, indent = '') {
+    const lines = [];
+    if (result.instructions) {
+        lines.push(`${indent}${chalk.bold('Instructions')}`);
+    }
+    lines.push(...formatResultSection('Tools', result.tools, formatToolLine, indent));
+    lines.push(...formatResultSection('Resources', result.resources, formatResourceLine, indent));
+    lines.push(...formatResultSection('Prompts', result.prompts, formatPromptLine, indent));
+    return lines;
+}
+export async function grepSession(session, pattern, options) {
+    const matcher = buildMatcher(pattern, options);
+    const sessionRef = session.startsWith('@') ? session : `@${session}`;
+    return await withMcpClient(session, options, async (client) => {
+        const fullResult = await searchClient(client, matcher, options, sessionRef);
+        const total = countMatches(fullResult);
+        const { result, truncated } = options.maxResults != null
+            ? truncateResult(fullResult, options.maxResults)
+            : { result: fullResult, truncated: 0 };
+        if (options.outputMode === 'json') {
+            const matchCounts = countMatchesByType(fullResult);
+            const jsonOutput = {
+                sessions: [
+                    {
+                        name: sessionRef,
+                        status: 'live',
+                        instructions: result.instructions,
+                        tools: result.tools,
+                        resources: result.resources,
+                        prompts: result.prompts,
+                    },
+                ],
+                totalMatches: {
+                    ...matchCounts,
+                    ...(truncated > 0 ? { truncated } : {}),
+                },
+            };
+            console.log(formatJson(jsonOutput));
+        }
+        else {
+            if (total === 0) {
+                console.log('No matches found.');
+            }
+            else {
+                const lines = formatGrepResultHuman(result);
+                lines.push('');
+                const suffix = truncated > 0 ? ` (showing ${countMatches(result)})` : '';
+                lines.push(chalk.dim(`${total} ${total === 1 ? 'match' : 'matches'}${suffix}.`));
+                console.log(lines.join('\n'));
+            }
+        }
+        return total > 0 ? 0 : 1;
+    });
+}
+function formatSkippedSession(skipped) {
+    const { dot, text } = formatBridgeStatus(skipped.status);
+    return `${chalk.cyan(skipped.name)} ${dot} ${text}`;
+}
+function isSessionQueryable(session) {
+    return !!session.pid && isProcessAlive(session.pid);
+}
+export async function grepAllSessions(pattern, options) {
+    const matcher = buildMatcher(pattern, options);
+    const { sessions } = await consolidateSessions(false);
+    const allSessionEntries = Object.values(sessions);
+    if (allSessionEntries.length === 0) {
+        if (options.outputMode === 'json') {
+            console.log(formatJson({ sessions: [], totalMatches: { tools: 0, resources: 0, prompts: 0 } }));
+        }
+        else {
+            console.log(chalk.bold('No active sessions.'));
+            console.log(chalk.dim('  \u21B3 run: mcpc connect mcp.example.com @test'));
+        }
+        return 1;
+    }
+    const toSessionRef = (name) => (name.startsWith('@') ? name : `@${name}`);
+    const queryableSessions = [];
+    const skippedSessions = [];
+    for (const session of allSessionEntries) {
+        if (isSessionQueryable(session)) {
+            queryableSessions.push(session);
+        }
+        else {
+            const status = getBridgeStatus(session);
+            skippedSessions.push({
+                name: toSessionRef(session.name),
+                status,
+            });
+        }
+    }
+    const settled = await Promise.allSettled(queryableSessions.map(async (session) => {
+        const sessionName = toSessionRef(session.name);
+        const result = await withSessionClient(sessionName, async (client) => {
+            return searchClient(client, matcher, options, sessionName);
+        });
+        return {
+            name: sessionName,
+            ...result,
+        };
+    }));
+    const results = [];
+    const resultsWithMatches = [];
+    const errors = [];
+    for (const [i, outcome] of settled.entries()) {
+        if (outcome.status === 'fulfilled') {
+            results.push(outcome.value);
+            if (countMatches(outcome.value) > 0) {
+                resultsWithMatches.push(outcome.value);
+            }
+        }
+        else {
+            const reason = outcome.reason;
+            errors.push({
+                name: toSessionRef(queryableSessions[i].name),
+                error: reason instanceof Error ? reason.message : String(reason),
+            });
+        }
+    }
+    const totalMatches = sumMatchesByType(results);
+    const totalMatchCount = results.reduce((sum, r) => sum + countMatches(r), 0);
+    let displayResultsWithMatches = resultsWithMatches;
+    let totalTruncated = 0;
+    if (options.maxResults != null) {
+        let remaining = options.maxResults;
+        displayResultsWithMatches = [];
+        for (const r of resultsWithMatches) {
+            if (remaining <= 0) {
+                totalTruncated += countMatches(r);
+                continue;
+            }
+            const { result: truncR, truncated } = truncateResult(r, remaining);
+            remaining -= countMatches(truncR);
+            totalTruncated += truncated;
+            displayResultsWithMatches.push({ ...r, ...truncR });
+        }
+    }
+    if (options.outputMode === 'json') {
+        const truncatedResultsByName = new Map(displayResultsWithMatches.map((r) => [r.name, r]));
+        const sessionEntries = [
+            ...results.map((r) => {
+                if (options.maxResults == null) {
+                    return {
+                        name: r.name,
+                        status: 'live',
+                        instructions: r.instructions,
+                        tools: r.tools,
+                        resources: r.resources,
+                        prompts: r.prompts,
+                    };
+                }
+                const display = truncatedResultsByName.get(r.name);
+                return {
+                    name: r.name,
+                    status: 'live',
+                    instructions: display?.instructions ?? false,
+                    tools: display?.tools ?? [],
+                    resources: display?.resources ?? [],
+                    prompts: display?.prompts ?? [],
+                };
+            }),
+            ...errors.map((e) => ({
+                name: e.name,
+                status: 'error',
+                error: e.error,
+            })),
+            ...skippedSessions.map((s) => ({
+                name: s.name,
+                status: s.status,
+            })),
+        ];
+        const jsonOutput = {
+            sessions: sessionEntries,
+            totalMatches: {
+                ...totalMatches,
+                ...(totalTruncated > 0 ? { truncated: totalTruncated } : {}),
+            },
+        };
+        console.log(formatJson(jsonOutput));
+    }
+    else {
+        const lines = [];
+        for (const skipped of skippedSessions) {
+            lines.push(formatSkippedSession(skipped));
+        }
+        for (const r of displayResultsWithMatches) {
+            lines.push(chalk.cyan(r.name));
+            lines.push(...formatGrepResultHuman(r, '  '));
+            lines.push('');
+        }
+        for (const err of errors) {
+            lines.push(chalk.yellow(`Warning: ${err.name} \u2014 ${err.error}`));
+        }
+        if (totalMatchCount === 0 && skippedSessions.length === 0) {
+            console.log('No matches found.');
+        }
+        else {
+            if (totalMatchCount > 0) {
+                const sessionCount = resultsWithMatches.length;
+                const showing = totalMatchCount - totalTruncated;
+                const suffix = totalTruncated > 0 ? ` (showing ${showing})` : '';
+                lines.push(chalk.dim(`${totalMatchCount} ${totalMatchCount === 1 ? 'match' : 'matches'} across ${sessionCount} ${sessionCount === 1 ? 'session' : 'sessions'}${suffix}.`));
+            }
+            else if (lines.length > 0) {
+                lines.push('');
+                lines.push('No matches found.');
+            }
+            console.log(lines.join('\n'));
+        }
+    }
+    return totalMatchCount > 0 ? 0 : 1;
+}
+//# sourceMappingURL=grep.js.map

package/dist/cli/commands/grep.js.map

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

package/dist/cli/commands/sessions.d.ts

@@ -12,6 +12,17 @@ export declare function connectSession(target: string, name: string, options: {
     x402?: boolean;
     insecure?: boolean;
 }): Promise<void>;
+export type DisplayStatus = 'live' | 'disconnected' | 'crashed' | 'unauthorized' | 'expired';
+export declare function getBridgeStatus(session: {
+    status?: string;
+    pid?: number;
+    lastSeenAt?: string;
+}): DisplayStatus;
+export declare function formatBridgeStatus(status: DisplayStatus): {
+    dot: string;
+    text: string;
+};
+export declare function formatTimeAgo(isoDate: string | undefined): string;
 export declare function listSessionsAndAuthProfiles(options: {
     outputMode: OutputMode;
 }): Promise<void>;

package/dist/cli/commands/sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,UAAU,EAMX,MAAM,oBAAoB,CAAC;AA+D5B,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GACA,OAAO,CAAC,IAAI,CAAC,CAiOf;AA8ED,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmFhB;AAKD,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAClC,OAAO,CAAC,IAAI,CAAC,CA4Cf;AAKD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GACA,OAAO,CAAC,IAAI,CAAC,CAyCf;AAKD,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GACrD,OAAO,CAAC,IAAI,CAAC,CA8Gf;AAKD,wBAAsB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjG;AAKD,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7D"}
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,UAAU,EAMX,MAAM,oBAAoB,CAAC;AA+D5B,wBAAsB,cAAc,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GACA,OAAO,CAAC,IAAI,CAAC,CAiOf;AAID,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,cAAc,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAAC;AAK7F,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,aAAa,CAkBhB;AAKD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,aAAa,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAavF;AAKD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAkBjE;AAMD,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuFhB;AAKD,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAClC,OAAO,CAAC,IAAI,CAAC,CA4Cf;AAKD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GACA,OAAO,CAAC,IAAI,CAAC,CAyCf;AAKD,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GACrD,OAAO,CAAC,IAAI,CAAC,CA8Gf;AAKD,wBAAsB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjG;AAKD,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7D"}

package/dist/cli/commands/sessions.js

@@ -195,7 +195,7 @@ export async function connectSession(target, name, options) {
         logger.debug(`showServerDetails failed for new session ${name}: ${detailsError.message}`);
     }
 }
-function getBridgeStatus(session) {
+export function getBridgeStatus(session) {
     if (session.status === 'unauthorized') {
         return 'unauthorized';
     }
@@ -213,7 +213,7 @@ function getBridgeStatus(session) {
     }
     return 'live';
 }
-function formatBridgeStatus(status) {
+export function formatBridgeStatus(status) {
     switch (status) {
         case 'live':
             return { dot: chalk.green('●'), text: chalk.green('live') };
@@ -227,7 +227,7 @@ function formatBridgeStatus(status) {
             return { dot: chalk.red('○'), text: chalk.red('expired') };
     }
 }
-function formatTimeAgo(isoDate) {
+export function formatTimeAgo(isoDate) {
     if (!isoDate)
         return '';
     const date = new Date(isoDate);
@@ -291,6 +291,12 @@ export async function listSessionsAndAuthProfiles(options) {
                     const target = getServerHost(session.server.url || session.server.command || '');
                     console.log(chalk.dim(`    ↳ run: mcpc login ${target} && mcpc ${session.name} restart`));
                 }
+                else if (status === 'crashed') {
+                    console.log(chalk.dim(`    ↳ run: mcpc ${session.name}`));
+                }
+                else if (status === 'expired') {
+                    console.log(chalk.dim(`    ↳ run: mcpc ${session.name} restart`));
+                }
             }
         }
         console.log('');
@@ -299,7 +305,7 @@ export async function listSessionsAndAuthProfiles(options) {
             console.log(chalk.dim('  ↳ run: mcpc login mcp.example.com'));
         }
         else {
-            console.log(chalk.bold('Available OAuth profiles:'));
+            console.log(chalk.bold('Saved OAuth profiles:'));
             for (const profile of profiles) {
                 const hostStr = getServerHost(profile.serverUrl);
                 const nameStr = chalk.magenta(profile.name);