@apify/mcpc 0.2.3 → 0.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +58 -2
- package/README.md +87 -35
- package/dist/bridge/index.js +63 -5
- package/dist/bridge/index.js.map +1 -1
- package/dist/cli/commands/auth.d.ts +1 -0
- package/dist/cli/commands/auth.d.ts.map +1 -1
- package/dist/cli/commands/auth.js +7 -0
- package/dist/cli/commands/auth.js.map +1 -1
- package/dist/cli/commands/clean.d.ts.map +1 -1
- package/dist/cli/commands/clean.js +13 -2
- package/dist/cli/commands/clean.js.map +1 -1
- package/dist/cli/commands/grep.d.ts +4 -0
- package/dist/cli/commands/grep.d.ts.map +1 -1
- package/dist/cli/commands/grep.js +121 -11
- package/dist/cli/commands/grep.js.map +1 -1
- package/dist/cli/commands/prompts.d.ts.map +1 -1
- package/dist/cli/commands/prompts.js +7 -26
- package/dist/cli/commands/prompts.js.map +1 -1
- package/dist/cli/commands/resources.d.ts.map +1 -1
- package/dist/cli/commands/resources.js +9 -3
- package/dist/cli/commands/resources.js.map +1 -1
- package/dist/cli/commands/sessions.d.ts +26 -2
- package/dist/cli/commands/sessions.d.ts.map +1 -1
- package/dist/cli/commands/sessions.js +191 -16
- package/dist/cli/commands/sessions.js.map +1 -1
- package/dist/cli/commands/tasks.d.ts +1 -0
- package/dist/cli/commands/tasks.d.ts.map +1 -1
- package/dist/cli/commands/tasks.js +11 -0
- package/dist/cli/commands/tasks.js.map +1 -1
- package/dist/cli/commands/tools.d.ts +6 -1
- package/dist/cli/commands/tools.d.ts.map +1 -1
- package/dist/cli/commands/tools.js +43 -15
- package/dist/cli/commands/tools.js.map +1 -1
- package/dist/cli/commands/x402.d.ts.map +1 -1
- package/dist/cli/commands/x402.js +6 -2
- package/dist/cli/commands/x402.js.map +1 -1
- package/dist/cli/index.js +308 -91
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/output.d.ts +5 -0
- package/dist/cli/output.d.ts.map +1 -1
- package/dist/cli/output.js +103 -16
- package/dist/cli/output.js.map +1 -1
- package/dist/cli/parser.d.ts +4 -0
- package/dist/cli/parser.d.ts.map +1 -1
- package/dist/cli/parser.js +50 -16
- package/dist/cli/parser.js.map +1 -1
- package/dist/cli/shell.d.ts.map +1 -1
- package/dist/cli/shell.js +27 -4
- package/dist/cli/shell.js.map +1 -1
- package/dist/core/mcp-client.d.ts +1 -0
- package/dist/core/mcp-client.d.ts.map +1 -1
- package/dist/core/mcp-client.js +14 -0
- package/dist/core/mcp-client.js.map +1 -1
- package/dist/lib/auth/oauth-flow.d.ts +1 -0
- package/dist/lib/auth/oauth-flow.d.ts.map +1 -1
- package/dist/lib/auth/oauth-flow.js +60 -16
- package/dist/lib/auth/oauth-flow.js.map +1 -1
- package/dist/lib/auth/oauth-provider.d.ts +2 -0
- package/dist/lib/auth/oauth-provider.d.ts.map +1 -1
- package/dist/lib/auth/oauth-provider.js +4 -0
- package/dist/lib/auth/oauth-provider.js.map +1 -1
- package/dist/lib/bridge-client.d.ts +1 -0
- package/dist/lib/bridge-client.d.ts.map +1 -1
- package/dist/lib/bridge-client.js.map +1 -1
- package/dist/lib/bridge-manager.d.ts +4 -1
- package/dist/lib/bridge-manager.d.ts.map +1 -1
- package/dist/lib/bridge-manager.js +97 -27
- package/dist/lib/bridge-manager.js.map +1 -1
- package/dist/lib/cleanup.d.ts +5 -0
- package/dist/lib/cleanup.d.ts.map +1 -1
- package/dist/lib/cleanup.js +38 -1
- package/dist/lib/cleanup.js.map +1 -1
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +5 -1
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/errors.d.ts.map +1 -1
- package/dist/lib/errors.js +15 -8
- package/dist/lib/errors.js.map +1 -1
- package/dist/lib/session-client.d.ts +1 -0
- package/dist/lib/session-client.d.ts.map +1 -1
- package/dist/lib/session-client.js +10 -4
- package/dist/lib/session-client.js.map +1 -1
- package/dist/lib/sessions.d.ts +1 -0
- package/dist/lib/sessions.d.ts.map +1 -1
- package/dist/lib/sessions.js +52 -4
- package/dist/lib/sessions.js.map +1 -1
- package/dist/lib/types.d.ts +5 -1
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/utils.d.ts +16 -3
- package/dist/lib/utils.d.ts.map +1 -1
- package/dist/lib/utils.js +125 -9
- package/dist/lib/utils.js.map +1 -1
- package/docs/TODOs.md +11 -0
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grep.js","sourceRoot":"","sources":["../../../src/cli/commands/grep.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"grep.js","sourceRoot":"","sources":["../../../src/cli/commands/grep.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/prompts.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/prompts.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AASzD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBxF;AAQD,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GAAG;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,GACA,OAAO,CAAC,IAAI,CAAC,CA+Bf"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { formatOutput
|
|
1
|
+
import { formatOutput } from '../output.js';
|
|
2
2
|
import { withMcpClient } from '../helpers.js';
|
|
3
3
|
import { parseCommandArgs, hasStdinData, readStdinArgs } from '../parser.js';
|
|
4
|
-
import { ClientError } from '../../lib/errors.js';
|
|
5
|
-
import { loadSchemaFromFile, validatePromptSchema, formatValidationError, } from '../../lib/schema-validator.js';
|
|
6
4
|
export async function listPrompts(target, options) {
|
|
7
5
|
await withMcpClient(target, options, async (client, _context) => {
|
|
8
6
|
const allPrompts = [];
|
|
@@ -12,7 +10,9 @@ export async function listPrompts(target, options) {
|
|
|
12
10
|
allPrompts.push(...result.prompts);
|
|
13
11
|
cursor = result.nextCursor;
|
|
14
12
|
} while (cursor);
|
|
15
|
-
console.log(formatOutput(allPrompts, options.outputMode
|
|
13
|
+
console.log(formatOutput(allPrompts, options.outputMode, {
|
|
14
|
+
...(options.maxChars && { maxChars: options.maxChars }),
|
|
15
|
+
}));
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
export async function getPrompt(target, name, options) {
|
|
@@ -30,30 +30,11 @@ export async function getPrompt(target, name, options) {
|
|
|
30
30
|
for (const [key, value] of Object.entries(parsedArgs)) {
|
|
31
31
|
promptArgs[key] = typeof value === 'string' ? value : JSON.stringify(value);
|
|
32
32
|
}
|
|
33
|
-
let expectedSchema;
|
|
34
|
-
if (options.schema) {
|
|
35
|
-
expectedSchema = (await loadSchemaFromFile(options.schema));
|
|
36
|
-
}
|
|
37
33
|
await withMcpClient(target, options, async (client, _context) => {
|
|
38
|
-
const schemaMode = options.schemaMode || 'compatible';
|
|
39
|
-
if (expectedSchema && schemaMode !== 'ignore') {
|
|
40
|
-
const result = await client.listPrompts();
|
|
41
|
-
const actualSchema = result.prompts.find((p) => p.name === name);
|
|
42
|
-
if (!actualSchema) {
|
|
43
|
-
throw new ClientError(`Prompt not found: ${name}`);
|
|
44
|
-
}
|
|
45
|
-
const validation = validatePromptSchema(actualSchema, expectedSchema, schemaMode, promptArgs);
|
|
46
|
-
if (!validation.valid) {
|
|
47
|
-
throw new ClientError(formatValidationError(validation, `prompt "${name}"`));
|
|
48
|
-
}
|
|
49
|
-
if (validation.warnings.length > 0 && options.outputMode === 'human') {
|
|
50
|
-
for (const warning of validation.warnings) {
|
|
51
|
-
console.log(formatWarning(`Schema warning: ${warning}`));
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
34
|
const result = await client.getPrompt(name, promptArgs);
|
|
56
|
-
console.log(formatOutput(result, options.outputMode
|
|
35
|
+
console.log(formatOutput(result, options.outputMode, {
|
|
36
|
+
...(options.maxChars && { maxChars: options.maxChars }),
|
|
37
|
+
}));
|
|
57
38
|
});
|
|
58
39
|
}
|
|
59
40
|
//# sourceMappingURL=prompts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/cli/commands/prompts.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/cli/commands/prompts.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAM7E,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAAc,EAAE,OAAuB;IACvE,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;QAE9D,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,IAAI,MAAM,GAAuB,SAAS,CAAC;QAE3C,GAAG,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC;QAC7B,CAAC,QAAQ,MAAM,EAAE;QAEjB,OAAO,CAAC,GAAG,CACT,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;YAC3C,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;SACxD,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,MAAc,EACd,IAAY,EACZ,OAEC;IAGD,IAAI,UAAmC,CAAC;IAGxC,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAE5C,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;SAAM,IAAI,YAAY,EAAE,EAAE,CAAC;QAE1B,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;IACrC,CAAC;SAAM,CAAC;QAEN,UAAU,GAAG,EAAE,CAAC;IAClB,CAAC;IAGD,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACtD,UAAU,CAAC,GAAG,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC9E,CAAC;IAED,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;QAC9D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAExD,OAAO,CAAC,GAAG,CACT,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE;YACvC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;SACxD,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/resources.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAMzD,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/resources.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAMzD,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB1F;AAMD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CAkBf;AAKD,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,GAAG;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAKD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CAUf;AAKD,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CAUf"}
|
|
@@ -9,7 +9,9 @@ export async function listResources(target, options) {
|
|
|
9
9
|
allResources.push(...result.resources);
|
|
10
10
|
cursor = result.nextCursor;
|
|
11
11
|
} while (cursor);
|
|
12
|
-
console.log(formatOutput(allResources, options.outputMode
|
|
12
|
+
console.log(formatOutput(allResources, options.outputMode, {
|
|
13
|
+
...(options.maxChars && { maxChars: options.maxChars }),
|
|
14
|
+
}));
|
|
13
15
|
});
|
|
14
16
|
}
|
|
15
17
|
export async function listResourceTemplates(target, options) {
|
|
@@ -21,7 +23,9 @@ export async function listResourceTemplates(target, options) {
|
|
|
21
23
|
allTemplates.push(...result.resourceTemplates);
|
|
22
24
|
cursor = result.nextCursor;
|
|
23
25
|
} while (cursor);
|
|
24
|
-
console.log(formatOutput(allTemplates, options.outputMode
|
|
26
|
+
console.log(formatOutput(allTemplates, options.outputMode, {
|
|
27
|
+
...(options.maxChars && { maxChars: options.maxChars }),
|
|
28
|
+
}));
|
|
25
29
|
});
|
|
26
30
|
}
|
|
27
31
|
export async function getResource(target, uri, options) {
|
|
@@ -42,7 +46,9 @@ export async function getResource(target, uri, options) {
|
|
|
42
46
|
}
|
|
43
47
|
return;
|
|
44
48
|
}
|
|
45
|
-
console.log(formatOutput(result, options.outputMode
|
|
49
|
+
console.log(formatOutput(result, options.outputMode, {
|
|
50
|
+
...(options.maxChars && { maxChars: options.maxChars }),
|
|
51
|
+
}));
|
|
46
52
|
});
|
|
47
53
|
}
|
|
48
54
|
export async function subscribeResource(target, uri, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../src/cli/commands/resources.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAO9C,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,OAAuB;IACzE,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;QAE9D,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,IAAI,MAAM,GAAuB,SAAS,CAAC;QAE3C,GAAG,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAClD,YAAY,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;YACvC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC;QAC7B,CAAC,QAAQ,MAAM,EAAE;QAEjB,OAAO,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../src/cli/commands/resources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,17 @@
|
|
|
1
1
|
import { OutputMode } from '../../lib/index.js';
|
|
2
|
+
export declare function resolveSessionName(parsed: {
|
|
3
|
+
type: 'url';
|
|
4
|
+
url: string;
|
|
5
|
+
} | {
|
|
6
|
+
type: 'config';
|
|
7
|
+
file: string;
|
|
8
|
+
entry: string;
|
|
9
|
+
}, options: {
|
|
10
|
+
outputMode: OutputMode;
|
|
11
|
+
profile?: string;
|
|
12
|
+
headers?: string[];
|
|
13
|
+
noProfile?: boolean;
|
|
14
|
+
}): Promise<string>;
|
|
2
15
|
export declare function connectSession(target: string, name: string, options: {
|
|
3
16
|
outputMode: OutputMode;
|
|
4
17
|
verbose?: boolean;
|
|
@@ -11,8 +24,10 @@ export declare function connectSession(target: string, name: string, options: {
|
|
|
11
24
|
proxyBearerToken?: string;
|
|
12
25
|
x402?: boolean;
|
|
13
26
|
insecure?: boolean;
|
|
27
|
+
skipDetails?: boolean;
|
|
28
|
+
quiet?: boolean;
|
|
14
29
|
}): Promise<void>;
|
|
15
|
-
export type DisplayStatus = 'live' | 'disconnected' | 'crashed' | 'unauthorized' | 'expired';
|
|
30
|
+
export type DisplayStatus = 'live' | 'connecting' | 'reconnecting' | 'disconnected' | 'crashed' | 'unauthorized' | 'expired';
|
|
16
31
|
export declare function getBridgeStatus(session: {
|
|
17
32
|
status?: string;
|
|
18
33
|
pid?: number;
|
|
@@ -41,8 +56,17 @@ export declare function restartSession(name: string, options: {
|
|
|
41
56
|
outputMode: OutputMode;
|
|
42
57
|
verbose?: boolean;
|
|
43
58
|
}): Promise<void>;
|
|
44
|
-
export declare function
|
|
59
|
+
export declare function connectAllFromConfig(configFile: string, options: {
|
|
45
60
|
outputMode: OutputMode;
|
|
61
|
+
verbose?: boolean;
|
|
62
|
+
headers?: string[];
|
|
63
|
+
timeout?: number;
|
|
64
|
+
profile?: string;
|
|
65
|
+
noProfile?: boolean;
|
|
66
|
+
proxy?: string;
|
|
67
|
+
proxyBearerToken?: string;
|
|
68
|
+
x402?: boolean;
|
|
69
|
+
insecure?: boolean;
|
|
46
70
|
}): Promise<void>;
|
|
47
71
|
export declare function openShell(target: string): Promise<void>;
|
|
48
72
|
//# sourceMappingURL=sessions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,UAAU,
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
import { createServer } from 'net';
|
|
2
|
-
import { isValidSessionName, validateProfileName, isProcessAlive, getServerHost, redactHeaders, } from '../../lib/index.js';
|
|
2
|
+
import { isValidSessionName, generateSessionName, normalizeServerUrl, validateProfileName, isProcessAlive, getServerHost, redactHeaders, } from '../../lib/index.js';
|
|
3
3
|
import { DISCONNECTED_THRESHOLD_MS } from '../../lib/types.js';
|
|
4
|
-
import { formatOutput, formatSuccess, formatError, formatSessionLine, formatServerDetails, } from '../output.js';
|
|
4
|
+
import { formatOutput, formatSuccess, formatWarning, formatError, formatSessionLine, formatServerDetails, } from '../output.js';
|
|
5
5
|
import { withMcpClient, resolveTarget, resolveAuthProfile } from '../helpers.js';
|
|
6
6
|
import { listAuthProfiles } from '../../lib/auth/profiles.js';
|
|
7
|
-
import { sessionExists, deleteSession, saveSession, updateSession, consolidateSessions, getSession, } from '../../lib/sessions.js';
|
|
8
|
-
import { startBridge, stopBridge } from '../../lib/bridge-manager.js';
|
|
7
|
+
import { sessionExists, deleteSession, saveSession, updateSession, consolidateSessions, getSession, loadSessions, } from '../../lib/sessions.js';
|
|
8
|
+
import { startBridge, stopBridge, reconnectCrashedSessions, } from '../../lib/bridge-manager.js';
|
|
9
9
|
import { storeKeychainSessionHeaders, storeKeychainProxyBearerToken, } from '../../lib/auth/keychain.js';
|
|
10
10
|
import { AuthError, ClientError, isAuthenticationError, createServerAuthError, } from '../../lib/index.js';
|
|
11
11
|
import { getWallet } from '../../lib/wallets.js';
|
|
12
12
|
import chalk from 'chalk';
|
|
13
13
|
import { createLogger } from '../../lib/logger.js';
|
|
14
14
|
import { parseProxyArg } from '../parser.js';
|
|
15
|
+
import { loadConfig, listServers } from '../../lib/config.js';
|
|
15
16
|
const logger = createLogger('sessions');
|
|
16
17
|
async function checkPortAvailable(host, port) {
|
|
17
18
|
return new Promise((resolve) => {
|
|
@@ -32,6 +33,70 @@ async function checkPortAvailable(host, port) {
|
|
|
32
33
|
server.listen(port, host);
|
|
33
34
|
});
|
|
34
35
|
}
|
|
36
|
+
async function findMatchingSession(parsed, options) {
|
|
37
|
+
const storage = await loadSessions();
|
|
38
|
+
const sessions = Object.values(storage.sessions);
|
|
39
|
+
if (sessions.length === 0)
|
|
40
|
+
return undefined;
|
|
41
|
+
const effectiveProfile = options.noProfile ? undefined : (options.profile ?? 'default');
|
|
42
|
+
for (const session of sessions) {
|
|
43
|
+
if (!session.server)
|
|
44
|
+
continue;
|
|
45
|
+
if (parsed.type === 'url') {
|
|
46
|
+
if (!session.server.url)
|
|
47
|
+
continue;
|
|
48
|
+
try {
|
|
49
|
+
const existingUrl = normalizeServerUrl(session.server.url);
|
|
50
|
+
const newUrl = normalizeServerUrl(parsed.url);
|
|
51
|
+
if (existingUrl !== newUrl)
|
|
52
|
+
continue;
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
const sessionProfile = session.profileName ?? 'default';
|
|
62
|
+
if (effectiveProfile !== sessionProfile)
|
|
63
|
+
continue;
|
|
64
|
+
const existingHeaderKeys = Object.keys(session.server.headers || {}).sort();
|
|
65
|
+
const newHeaderKeys = (options.headers || [])
|
|
66
|
+
.map((h) => h.split(':')[0]?.trim() || '')
|
|
67
|
+
.filter(Boolean)
|
|
68
|
+
.sort();
|
|
69
|
+
if (existingHeaderKeys.join(',') !== newHeaderKeys.join(','))
|
|
70
|
+
continue;
|
|
71
|
+
return session.name;
|
|
72
|
+
}
|
|
73
|
+
return undefined;
|
|
74
|
+
}
|
|
75
|
+
export async function resolveSessionName(parsed, options) {
|
|
76
|
+
const existingName = await findMatchingSession(parsed, options);
|
|
77
|
+
if (existingName) {
|
|
78
|
+
return existingName;
|
|
79
|
+
}
|
|
80
|
+
const candidateName = generateSessionName(parsed);
|
|
81
|
+
const storage = await loadSessions();
|
|
82
|
+
if (!(candidateName in storage.sessions)) {
|
|
83
|
+
if (options.outputMode === 'human') {
|
|
84
|
+
console.log(chalk.cyan(`Using session name: ${candidateName}`));
|
|
85
|
+
}
|
|
86
|
+
return candidateName;
|
|
87
|
+
}
|
|
88
|
+
for (let i = 2; i <= 99; i++) {
|
|
89
|
+
const suffixed = `${candidateName}-${i}`;
|
|
90
|
+
if (isValidSessionName(suffixed) && !(suffixed in storage.sessions)) {
|
|
91
|
+
if (options.outputMode === 'human') {
|
|
92
|
+
console.log(chalk.cyan(`Using session name: ${suffixed}`));
|
|
93
|
+
}
|
|
94
|
+
return suffixed;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
throw new ClientError(`Cannot auto-generate session name: too many sessions for this server.\n` +
|
|
98
|
+
`Specify a name explicitly: mcpc connect ${parsed.type === 'url' ? parsed.url : `${parsed.file}:${parsed.entry}`} @my-session`);
|
|
99
|
+
}
|
|
35
100
|
export async function connectSession(target, name, options) {
|
|
36
101
|
if (!isValidSessionName(name)) {
|
|
37
102
|
throw new ClientError(`Invalid session name: ${name}\n` +
|
|
@@ -57,13 +122,15 @@ export async function connectSession(target, name, options) {
|
|
|
57
122
|
if (existingSession) {
|
|
58
123
|
const bridgeStatus = getBridgeStatus(existingSession);
|
|
59
124
|
if (bridgeStatus === 'live') {
|
|
60
|
-
if (options.outputMode === 'human') {
|
|
125
|
+
if (options.outputMode === 'human' && !options.quiet) {
|
|
61
126
|
console.log(formatSuccess(`Session ${name} is already active`));
|
|
62
127
|
}
|
|
63
|
-
|
|
128
|
+
if (!options.skipDetails) {
|
|
129
|
+
await showServerDetails(name, { ...options, hideTarget: false });
|
|
130
|
+
}
|
|
64
131
|
return;
|
|
65
132
|
}
|
|
66
|
-
if (options.outputMode === 'human') {
|
|
133
|
+
if (options.outputMode === 'human' && !options.quiet) {
|
|
67
134
|
console.log(chalk.yellow(`Session ${name} exists but bridge is ${bridgeStatus}, reconnecting...`));
|
|
68
135
|
}
|
|
69
136
|
try {
|
|
@@ -142,6 +209,8 @@ export async function connectSession(target, name, options) {
|
|
|
142
209
|
await saveSession(name, {
|
|
143
210
|
server: sessionTransportConfig,
|
|
144
211
|
createdAt: new Date().toISOString(),
|
|
212
|
+
status: 'connecting',
|
|
213
|
+
lastConnectionAttemptAt: new Date().toISOString(),
|
|
145
214
|
...sessionUpdate,
|
|
146
215
|
});
|
|
147
216
|
logger.debug(`Initial session record created for: ${name}`);
|
|
@@ -168,7 +237,7 @@ export async function connectSession(target, name, options) {
|
|
|
168
237
|
bridgeOptions.insecure = true;
|
|
169
238
|
}
|
|
170
239
|
const { pid } = await startBridge(bridgeOptions);
|
|
171
|
-
await updateSession(name, { pid });
|
|
240
|
+
await updateSession(name, { pid, status: 'active' });
|
|
172
241
|
logger.debug(`Session ${name} updated with bridge PID: ${pid}`);
|
|
173
242
|
}
|
|
174
243
|
catch (error) {
|
|
@@ -182,14 +251,20 @@ export async function connectSession(target, name, options) {
|
|
|
182
251
|
}
|
|
183
252
|
throw error;
|
|
184
253
|
}
|
|
185
|
-
if (options.
|
|
186
|
-
|
|
254
|
+
if (options.skipDetails) {
|
|
255
|
+
if (options.outputMode === 'human' && !options.quiet) {
|
|
256
|
+
console.log(formatSuccess(`Session ${name} ${isReconnect ? 'reconnected' : 'created'}`));
|
|
257
|
+
}
|
|
258
|
+
return;
|
|
187
259
|
}
|
|
188
260
|
try {
|
|
189
261
|
await showServerDetails(name, {
|
|
190
262
|
...options,
|
|
191
263
|
hideTarget: false,
|
|
192
264
|
});
|
|
265
|
+
if (options.outputMode === 'human') {
|
|
266
|
+
console.log(formatSuccess(`Session ${name} ${isReconnect ? 'reconnected' : 'created'}`));
|
|
267
|
+
}
|
|
193
268
|
}
|
|
194
269
|
catch (detailsError) {
|
|
195
270
|
if (detailsError instanceof AuthError) {
|
|
@@ -198,6 +273,12 @@ export async function connectSession(target, name, options) {
|
|
|
198
273
|
if (detailsError instanceof Error && isAuthenticationError(detailsError.message)) {
|
|
199
274
|
throw createServerAuthError(serverConfig.url || target, { sessionName: name });
|
|
200
275
|
}
|
|
276
|
+
if (options.outputMode === 'human') {
|
|
277
|
+
const errorMsg = detailsError instanceof Error ? detailsError.message : String(detailsError);
|
|
278
|
+
console.log(formatWarning(`Session ${name} created but server is not responding: ${errorMsg}\n` +
|
|
279
|
+
` The session will auto-recover when the server becomes available.\n` +
|
|
280
|
+
` Check status with: mcpc ${name}`));
|
|
281
|
+
}
|
|
201
282
|
logger.debug(`showServerDetails failed for new session ${name}: ${detailsError.message}`);
|
|
202
283
|
}
|
|
203
284
|
}
|
|
@@ -208,6 +289,9 @@ export function getBridgeStatus(session) {
|
|
|
208
289
|
if (session.status === 'expired') {
|
|
209
290
|
return 'expired';
|
|
210
291
|
}
|
|
292
|
+
if (session.status === 'connecting' || session.status === 'reconnecting') {
|
|
293
|
+
return session.status;
|
|
294
|
+
}
|
|
211
295
|
if (!session.pid || !isProcessAlive(session.pid)) {
|
|
212
296
|
return 'crashed';
|
|
213
297
|
}
|
|
@@ -223,6 +307,10 @@ export function formatBridgeStatus(status) {
|
|
|
223
307
|
switch (status) {
|
|
224
308
|
case 'live':
|
|
225
309
|
return { dot: chalk.green('●'), text: chalk.green('live') };
|
|
310
|
+
case 'connecting':
|
|
311
|
+
return { dot: chalk.yellow('●'), text: chalk.yellow('connecting') };
|
|
312
|
+
case 'reconnecting':
|
|
313
|
+
return { dot: chalk.yellow('●'), text: chalk.yellow('reconnecting') };
|
|
226
314
|
case 'disconnected':
|
|
227
315
|
return { dot: chalk.yellow('●'), text: chalk.yellow('disconnected') };
|
|
228
316
|
case 'crashed':
|
|
@@ -260,6 +348,7 @@ export function formatTimeAgo(isoDate) {
|
|
|
260
348
|
export async function listSessionsAndAuthProfiles(options) {
|
|
261
349
|
const consolidateResult = await consolidateSessions(false);
|
|
262
350
|
const sessions = Object.values(consolidateResult.sessions);
|
|
351
|
+
reconnectCrashedSessions(consolidateResult.sessionsToRestart);
|
|
263
352
|
const profiles = await listAuthProfiles();
|
|
264
353
|
if (options.outputMode === 'json') {
|
|
265
354
|
const sessionsWithStatus = sessions.map((session) => ({
|
|
@@ -294,8 +383,7 @@ export async function listSessionsAndAuthProfiles(options) {
|
|
|
294
383
|
}
|
|
295
384
|
console.log(` ${formatSessionLine(session)} ${statusStr}`);
|
|
296
385
|
if (status === 'unauthorized') {
|
|
297
|
-
|
|
298
|
-
console.log(chalk.dim(` ↳ run: mcpc login ${target} && mcpc ${session.name} restart`));
|
|
386
|
+
console.log(chalk.dim(` ↳ run: mcpc ${session.name} restart`));
|
|
299
387
|
}
|
|
300
388
|
else if (status === 'crashed') {
|
|
301
389
|
console.log(chalk.dim(` ↳ run: mcpc ${session.name}`));
|
|
@@ -335,7 +423,7 @@ export async function closeSession(name, options) {
|
|
|
335
423
|
if (!(await sessionExists(name))) {
|
|
336
424
|
throw new ClientError(`Session not found: ${name}`);
|
|
337
425
|
}
|
|
338
|
-
await stopBridge(name);
|
|
426
|
+
await stopBridge(name, { graceful: true });
|
|
339
427
|
await deleteSession(name);
|
|
340
428
|
if (options.outputMode === 'human') {
|
|
341
429
|
console.log(formatSuccess(`Session ${name} closed successfully\n`));
|
|
@@ -387,7 +475,7 @@ export async function showServerDetails(target, options) {
|
|
|
387
475
|
capabilities,
|
|
388
476
|
serverInfo,
|
|
389
477
|
instructions,
|
|
390
|
-
...(tools.length > 0 && { tools }),
|
|
478
|
+
...(tools.length > 0 && { toolNames: tools.map((t) => t.name) }),
|
|
391
479
|
}, 'json'));
|
|
392
480
|
}
|
|
393
481
|
});
|
|
@@ -468,8 +556,95 @@ export async function restartSession(name, options) {
|
|
|
468
556
|
throw error;
|
|
469
557
|
}
|
|
470
558
|
}
|
|
471
|
-
export async function
|
|
472
|
-
|
|
559
|
+
export async function connectAllFromConfig(configFile, options) {
|
|
560
|
+
const config = loadConfig(configFile);
|
|
561
|
+
const serverNames = listServers(config);
|
|
562
|
+
if (serverNames.length === 0) {
|
|
563
|
+
throw new ClientError(`No servers found in config file: ${configFile}`);
|
|
564
|
+
}
|
|
565
|
+
if (options.outputMode === 'human') {
|
|
566
|
+
console.log(chalk.cyan(`Connecting ${serverNames.length} server${serverNames.length === 1 ? '' : 's'} from ${configFile}...`));
|
|
567
|
+
}
|
|
568
|
+
const entries = serverNames.map((entry) => ({
|
|
569
|
+
entry,
|
|
570
|
+
sessionName: generateSessionName({ type: 'config', file: configFile, entry }),
|
|
571
|
+
}));
|
|
572
|
+
const liveSet = new Set();
|
|
573
|
+
for (const { sessionName } of entries) {
|
|
574
|
+
const session = await getSession(sessionName);
|
|
575
|
+
if (session && getBridgeStatus(session) === 'live') {
|
|
576
|
+
liveSet.add(sessionName);
|
|
577
|
+
}
|
|
578
|
+
}
|
|
579
|
+
const settled = await Promise.allSettled(entries.map(async ({ entry, sessionName }) => connectSession(entry, sessionName, {
|
|
580
|
+
...options,
|
|
581
|
+
config: configFile,
|
|
582
|
+
skipDetails: true,
|
|
583
|
+
quiet: true,
|
|
584
|
+
})));
|
|
585
|
+
const results = settled.map((outcome, i) => {
|
|
586
|
+
const { entry, sessionName } = entries[i];
|
|
587
|
+
if (outcome.status === 'fulfilled') {
|
|
588
|
+
if (liveSet.has(sessionName)) {
|
|
589
|
+
return { entry, sessionName, status: 'active' };
|
|
590
|
+
}
|
|
591
|
+
return { entry, sessionName, status: 'created' };
|
|
592
|
+
}
|
|
593
|
+
const error = outcome.reason instanceof Error ? outcome.reason.message : String(outcome.reason);
|
|
594
|
+
return { entry, sessionName, status: 'failed', error };
|
|
595
|
+
});
|
|
596
|
+
if (options.outputMode === 'human') {
|
|
597
|
+
for (const r of results) {
|
|
598
|
+
const name = chalk.cyan(r.sessionName);
|
|
599
|
+
switch (r.status) {
|
|
600
|
+
case 'created':
|
|
601
|
+
console.log(` ${chalk.yellow('●')} ${name} ${chalk.yellow('connecting')}`);
|
|
602
|
+
break;
|
|
603
|
+
case 'active':
|
|
604
|
+
console.log(` ${chalk.green('●')} ${name} ${chalk.dim('already active')}`);
|
|
605
|
+
break;
|
|
606
|
+
case 'reconnected':
|
|
607
|
+
console.log(` ${chalk.yellow('●')} ${name} ${chalk.yellow('reconnecting')}`);
|
|
608
|
+
break;
|
|
609
|
+
case 'failed':
|
|
610
|
+
console.log(` ${chalk.red('●')} ${name} ${chalk.red('failed')}${r.error ? chalk.dim(` — ${r.error}`) : ''}`);
|
|
611
|
+
break;
|
|
612
|
+
}
|
|
613
|
+
}
|
|
614
|
+
}
|
|
615
|
+
const active = results.filter((r) => r.status === 'active').length;
|
|
616
|
+
const connecting = results.filter((r) => r.status === 'created' || r.status === 'reconnected').length;
|
|
617
|
+
const failed = results.filter((r) => r.status === 'failed').length;
|
|
618
|
+
if (options.outputMode === 'json') {
|
|
619
|
+
console.log(formatOutput({
|
|
620
|
+
configFile,
|
|
621
|
+
results: results.map((r) => ({
|
|
622
|
+
entry: r.entry,
|
|
623
|
+
sessionName: r.sessionName,
|
|
624
|
+
status: r.status,
|
|
625
|
+
...(r.error && { error: r.error }),
|
|
626
|
+
})),
|
|
627
|
+
}, 'json'));
|
|
628
|
+
}
|
|
629
|
+
else if (results.length > 1) {
|
|
630
|
+
const parts = [];
|
|
631
|
+
if (active > 0)
|
|
632
|
+
parts.push(`${active} already active`);
|
|
633
|
+
if (connecting > 0)
|
|
634
|
+
parts.push(`${connecting} connecting`);
|
|
635
|
+
if (failed > 0)
|
|
636
|
+
parts.push(`${failed} failed`);
|
|
637
|
+
const summary = parts.join(', ');
|
|
638
|
+
if (failed === 0) {
|
|
639
|
+
console.log(formatSuccess(summary));
|
|
640
|
+
}
|
|
641
|
+
else if (active + connecting > 0) {
|
|
642
|
+
console.log(formatWarning(summary));
|
|
643
|
+
}
|
|
644
|
+
}
|
|
645
|
+
if (active + connecting === 0) {
|
|
646
|
+
throw new ClientError(`Failed to connect any servers from ${configFile}`);
|
|
647
|
+
}
|
|
473
648
|
}
|
|
474
649
|
export async function openShell(target) {
|
|
475
650
|
const { startShell } = await import('../shell.js');
|