@tempoxyz/mercator 0.0.642 → 0.0.647

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.
@@ -0,0 +1,201 @@
1
+ import { createHash, randomUUID } from 'node:crypto';
2
+ import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
3
+ import { homedir } from 'node:os';
4
+ import { dirname, join } from 'node:path';
5
+ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
6
+ import { StreamableHTTPClientTransport, StreamableHTTPError, } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
7
+ import { z } from 'incur';
8
+ import packageMetadata from '../package.json' with { type: 'json' };
9
+ import { authorizeMcpClient } from './mcp-authorization.js';
10
+ /** Shared OAuth and MCP identity; credentials belong only to this CLI. */
11
+ const CLI_CLIENT_NAME = 'mercator cli';
12
+ /** Endpoint-scoped credentials never appear in command output. */
13
+ const SessionSchema = z.object({
14
+ clientId: z.string().min(1),
15
+ authorization: z.string().regex(/^Bearer \S+$/),
16
+ refreshToken: z.string().min(1).optional(),
17
+ expiresAt: z.number().finite(),
18
+ });
19
+ function sessionPath(endpoint, home) {
20
+ const url = new URL(endpoint);
21
+ if ((url.protocol !== 'https:' &&
22
+ !(url.protocol === 'http:' && url.hostname === '127.0.0.1')) ||
23
+ url.username ||
24
+ url.password ||
25
+ url.search ||
26
+ url.hash)
27
+ throw new Error('MCP endpoint requires HTTPS (or loopback HTTP), without credentials, query, or fragment');
28
+ return join(home, '.local', 'share', 'mercator', 'oauth', `${createHash('sha256').update(url.href).digest('hex')}.json`);
29
+ }
30
+ async function saveSession(endpoint, session, home) {
31
+ const path = sessionPath(endpoint, home);
32
+ await mkdir(dirname(path), { recursive: true, mode: 0o700 });
33
+ const temporary = `${path}.${randomUUID()}.tmp`;
34
+ try {
35
+ await writeFile(temporary, JSON.stringify(SessionSchema.parse(session)), {
36
+ mode: 0o600,
37
+ flag: 'wx',
38
+ });
39
+ await rename(temporary, path);
40
+ }
41
+ finally {
42
+ await rm(temporary, { force: true });
43
+ }
44
+ }
45
+ /** Explicit browser authorization; returns only a credential-free receipt. */
46
+ export async function loginMcp(endpoint, home = homedir(), authorize = authorizeMcpClient) {
47
+ sessionPath(endpoint, home);
48
+ const result = await authorize(endpoint, { clientName: CLI_CLIENT_NAME });
49
+ await saveSession(endpoint, SessionSchema.parse({ ...result, expiresAt: Date.now() + result.expiresIn * 1000 }), home);
50
+ return { connected: true, client: CLI_CLIENT_NAME, endpoint };
51
+ }
52
+ /** Removes this CLI's local credentials; server-side revocation remains in Account. */
53
+ export async function logoutMcp(endpoint, home = homedir()) {
54
+ await rm(sessionPath(endpoint, home), { force: true });
55
+ return {
56
+ disconnected: true,
57
+ endpoint,
58
+ next_action: 'Revoke the mercator cli connection in Mercator Account to revoke its wallet access.',
59
+ };
60
+ }
61
+ /** Loads or refreshes only the selected endpoint's CLI session. Never launches a browser. */
62
+ export async function mcpFetch(endpoint, home = homedir(), fetcher = fetch) {
63
+ let path;
64
+ try {
65
+ path = sessionPath(endpoint, home);
66
+ }
67
+ catch {
68
+ // Transport-only diagnostics still support endpoints that cannot hold CLI credentials.
69
+ return undefined;
70
+ }
71
+ let session;
72
+ try {
73
+ session = SessionSchema.parse(JSON.parse(await readFile(path, 'utf8')));
74
+ }
75
+ catch (error) {
76
+ if (error instanceof Error && 'code' in error && error.code === 'ENOENT')
77
+ return undefined;
78
+ throw new Error('CLI session is unreadable. Run mercator login again.');
79
+ }
80
+ if (session.expiresAt <= Date.now() + 60_000) {
81
+ if (!session.refreshToken)
82
+ throw new Error('CLI session expired. Run mercator login again.');
83
+ const response = await fetcher(new URL('/oauth/token', endpoint), {
84
+ method: 'POST',
85
+ redirect: 'error',
86
+ signal: AbortSignal.timeout(15_000),
87
+ body: new URLSearchParams({
88
+ grant_type: 'refresh_token',
89
+ refresh_token: session.refreshToken,
90
+ client_id: session.clientId,
91
+ resource: new URL(endpoint).href,
92
+ }),
93
+ });
94
+ const token = await response.json().catch(() => null);
95
+ if (!response.ok ||
96
+ !token ||
97
+ typeof token.access_token !== 'string' ||
98
+ typeof token.token_type !== 'string' ||
99
+ token.token_type.toLowerCase() !== 'bearer' ||
100
+ !Number.isSafeInteger(token.expires_in) ||
101
+ token.expires_in <= 0)
102
+ throw new Error('CLI session refresh failed. Run mercator login again.');
103
+ session = SessionSchema.parse({
104
+ ...session,
105
+ authorization: `Bearer ${token.access_token}`,
106
+ refreshToken: token.refresh_token ?? session.refreshToken,
107
+ expiresAt: Date.now() + token.expires_in * 1000,
108
+ });
109
+ await saveSession(endpoint, session, home);
110
+ }
111
+ return async (input, init) => {
112
+ const target = new URL(input instanceof Request ? input.url : String(input));
113
+ if (target.href !== new URL(endpoint).href)
114
+ throw new Error('Refusing to send CLI credentials to another endpoint');
115
+ const headers = new Headers(init?.headers);
116
+ headers.set('authorization', session.authorization);
117
+ return fetcher(input, { ...init, headers, redirect: 'error' });
118
+ };
119
+ }
120
+ /** Runs one MCP operation and closes its transport, including on protocol failure. */
121
+ export async function runMcp(endpoint, operation, name, args = {}, home = homedir()) {
122
+ const fetcher = await mcpFetch(endpoint, home);
123
+ if (!fetcher)
124
+ throw new Error('CLI is not connected. Run mercator login first.');
125
+ try {
126
+ return await withMcpClient(endpoint, fetcher, async (client) => operation === 'call'
127
+ ? client.callTool({ name: name ?? '', arguments: args })
128
+ : listMcpTools(client));
129
+ }
130
+ catch (error) {
131
+ if (error instanceof StreamableHTTPError && error.code === 401)
132
+ throw new Error('CLI authorization was rejected. Run mercator login again.');
133
+ throw error;
134
+ }
135
+ }
136
+ /** HTTP failure metadata needed to distinguish a protected endpoint from a broken transport. */
137
+ export class McpHttpError extends StreamableHTTPError {
138
+ status;
139
+ authenticate;
140
+ constructor(status, authenticate) {
141
+ super(status, `MCP request failed with HTTP ${status}`);
142
+ this.status = status;
143
+ this.authenticate = authenticate;
144
+ this.message = `MCP request failed with HTTP ${status}`;
145
+ }
146
+ }
147
+ /** One SDK lifecycle for command execution and diagnostics; callers choose their credentials. */
148
+ export async function withMcpClient(endpoint, fetcher, operation, diagnostics, timeout = 60_000) {
149
+ const client = new Client({ name: CLI_CLIENT_NAME, version: packageMetadata.version });
150
+ const instrumentedFetch = async (input, init) => {
151
+ const path = new URL(endpoint).pathname;
152
+ const message = typeof init?.body === 'string' ? JSON.parse(init.body) : undefined;
153
+ const toolName = typeof message?.params?.name === 'string' ? `:${message.params.name}` : '';
154
+ const phase = `mcp:${message?.method ?? init?.method ?? 'GET'}${toolName}`;
155
+ const request = () => fetcher(input, {
156
+ ...init,
157
+ signal: init?.signal
158
+ ? AbortSignal.any([init.signal, AbortSignal.timeout(timeout)])
159
+ : AbortSignal.timeout(timeout),
160
+ });
161
+ const response = diagnostics
162
+ ? await diagnostics.measure({ path, phase }, request)
163
+ : await request();
164
+ const requestId = response.headers.get('cf-ray') ?? response.headers.get('x-request-id');
165
+ diagnostics?.info({
166
+ httpStatus: response.status,
167
+ path,
168
+ phase: `${phase}:response`,
169
+ ...(requestId ? { requestId } : {}),
170
+ });
171
+ // GET may legitimately reject the optional standalone SSE stream.
172
+ if (init?.method === 'POST' && !response.ok) {
173
+ await response.body?.cancel();
174
+ throw new McpHttpError(response.status, response.headers.get('www-authenticate'));
175
+ }
176
+ return response;
177
+ };
178
+ try {
179
+ await client.connect(
180
+ // SDK declares optional transport fields as explicit undefined.
181
+ new StreamableHTTPClientTransport(new URL(endpoint), {
182
+ fetch: instrumentedFetch,
183
+ }), { timeout });
184
+ return await operation(client);
185
+ }
186
+ finally {
187
+ await client.close();
188
+ }
189
+ }
190
+ /** Collects every advertised page for both compatibility checks and command discovery. */
191
+ export async function listMcpTools(client, timeout = 60_000) {
192
+ const tools = [];
193
+ let cursor;
194
+ do {
195
+ const page = await client.listTools(cursor ? { cursor } : {}, { timeout });
196
+ tools.push(...page.tools);
197
+ cursor = page.nextCursor;
198
+ } while (cursor);
199
+ return { tools };
200
+ }
201
+ //# sourceMappingURL=mcp-client.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mcp-client.js","sourceRoot":"","sources":["../src/mcp-client.ts"],"names":[],"mappings":"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"}
@@ -110,26 +110,23 @@ export function formatSetupResult(result, color = false, debug, suggestedQueries
110
110
  }
111
111
  }
112
112
  if ('diagnosis' in result) {
113
- const clientManagedAuthorization = result.ready && result.diagnosis.authorization === 'required';
114
113
  readiness.push(formatSetupRow(result.diagnosis.transport === 'ready' ? '✓' : '✗', 'MCP transport', humanizeStatus(result.diagnosis.transport), color));
115
- if (clientManagedAuthorization) {
116
- readiness.push(formatSetupRow('○', 'OAuth authorization', 'managed by connected client', color));
117
- }
118
- else {
119
- readiness.push(formatSetupRow(result.diagnosis.discovery === 'ready'
120
- ? '✓'
121
- : result.diagnosis.transport === 'ready'
122
- ? '✗'
123
- : '○', 'Service discovery', result.diagnosis.transport === 'ready'
124
- ? humanizeStatus(result.diagnosis.discovery)
125
- : 'not checked', color), formatSetupRow(result.diagnosis.paidExecution === 'ready'
126
- ? '✓'
127
- : result.diagnosis.paidExecution === 'failed'
128
- ? '✗'
129
- : '○', 'Paid execution', humanizeStatus(result.diagnosis.paidExecution), color));
130
- if (result.diagnosis.error)
131
- readiness.push(` ${result.diagnosis.error}`);
114
+ if (result.diagnosis.authorization === 'required') {
115
+ readiness.push(formatSetupRow('○', 'OAuth authorization', 'not verified — complete in your client', color));
132
116
  }
117
+ readiness.push(formatSetupRow(result.diagnosis.discovery === 'ready'
118
+ ? '✓'
119
+ : result.diagnosis.discovery === 'failed'
120
+ ? '✗'
121
+ : '○', 'Service discovery', result.diagnosis.transport === 'ready'
122
+ ? humanizeStatus(result.diagnosis.discovery)
123
+ : 'not checked', color), formatSetupRow(result.diagnosis.paidExecution === 'ready'
124
+ ? '✓'
125
+ : result.diagnosis.paidExecution === 'failed'
126
+ ? '✗'
127
+ : '○', 'Paid execution', humanizeStatus(result.diagnosis.paidExecution), color));
128
+ if (result.diagnosis.error)
129
+ readiness.push(` ${result.diagnosis.error}`);
133
130
  }
134
131
  if (readiness.length > 0) {
135
132
  lines.push('', styleText('Readiness', 'bold', color), ...readiness);
@@ -152,7 +149,12 @@ export function formatSetupResult(result, color = false, debug, suggestedQueries
152
149
  return appendDebugContext(lines.join('\n'), result, debug, color);
153
150
  }
154
151
  if (!result.ready) {
155
- lines.push('', 'Your completed setup was preserved.', '', 'Retry readiness checks:', ' mercator doctor');
152
+ lines.push('', 'Your completed setup was preserved.', '', ...('diagnosis' in result && result.diagnosis.authorization === 'required'
153
+ ? [
154
+ 'Authorize in your client if needed, then call search_services and get_connection_status there.',
155
+ 'mercator doctor cannot read credentials managed by your client.',
156
+ ]
157
+ : ['Retry readiness checks:', ' mercator doctor']));
156
158
  return appendDebugContext(lines.join('\n'), result, debug, color);
157
159
  }
158
160
  if ('marketplacePlugins' in result) {
@@ -1 +1 @@
1
- {"version":3,"file":"setup-render.js","sourceRoot":"","sources":["../src/setup-render.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setup-render.js","sourceRoot":"","sources":["../src/setup-render.ts"],"names":[],"mappings":"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"}
package/dist/setup.d.ts CHANGED
@@ -1,11 +1,10 @@
1
1
  import type { installCodexAgents, removeCodexAgents } from './agents.js';
2
2
  import type { selectSetupClients } from './client-selection.js';
3
- import { type ClientId, type configurationState, type installedClients, type mergeConfigFile, type protectGrokConfig, type removeConfigFile } from './clients.js';
3
+ import { type ClientId, type configurationState, type installedClients, type mergeConfigFile, type removeConfigFile } from './clients.js';
4
4
  import type { installClaudeMarketplacePlugin, installGrokMarketplacePlugin, MarketplaceClient, MarketplaceInstallResult, removeCodexMarketplacePlugin } from './codex-marketplace.js';
5
5
  import type { installCodexPlugin } from './codex-plugin.js';
6
6
  import type { runInteractiveCommand } from './command.js';
7
7
  import type { diagnose } from './doctor.js';
8
- import type { authorizeMcpClient } from './mcp-authorization.js';
9
8
  import type { setupNativePayments } from './native-payments.js';
10
9
  import type { confirmSetup } from './setup-confirmation.js';
11
10
  import type { SetupDiagnostics } from './setup-diagnostics.js';
@@ -22,10 +21,8 @@ export type SetupDependencies = {
22
21
  removeCodexMarketplacePlugin: typeof removeCodexMarketplacePlugin;
23
22
  installClaudeMarketplacePlugin: typeof installClaudeMarketplacePlugin;
24
23
  installGrokMarketplacePlugin: typeof installGrokMarketplacePlugin;
25
- authorizeMcpClient: typeof authorizeMcpClient;
26
24
  mergeConfigFile: typeof mergeConfigFile;
27
25
  runCommand: typeof runInteractiveCommand;
28
- protectGrokConfig: typeof protectGrokConfig;
29
26
  installCodexAgents: typeof installCodexAgents;
30
27
  setupNativePayments: typeof setupNativePayments;
31
28
  removeConfigFile: typeof removeConfigFile;
@@ -108,16 +105,7 @@ export declare function setup(options: SetupOptions, dependencies: SetupDependen
108
105
  client: ClientId;
109
106
  status: "already_configured" | "configured" | "conflict" | "planned" | "reconfigured" | "skipped";
110
107
  }[];
111
- diagnosis: {
112
- authorization?: "required";
113
- discovery: "failed" | "not_verified" | "ready";
114
- endpoint: string;
115
- error?: string;
116
- paidExecution: "failed" | "not_verified" | "ready";
117
- serverVersion?: string;
118
- tools: string[];
119
- transport: "failed" | "ready";
120
- };
108
+ diagnosis: import("./doctor.js").DoctorReport;
121
109
  dryRun: boolean;
122
110
  nativePayments: import("./native-payments.js").NativePaymentReport[];
123
111
  agents?: {
package/dist/setup.js CHANGED
@@ -115,7 +115,6 @@ export async function setup(options, dependencies, progress, telemetry, diagnost
115
115
  warnings.push('No integration target is available. Run mercator setup --manual for generic MCP/OAuth instructions, install a supported client and rerun, or rerun without --no-plugin for the Codex/ChatGPT desktop plugin.');
116
116
  }
117
117
  const inspectionErrors = new Map();
118
- let diagnosticAuthorization;
119
118
  const uncheckedClients = clients.filter((client) => !detectedStates.has(client));
120
119
  if (uncheckedClients.length > 0) {
121
120
  progress?.report('Checking existing MCP registrations...');
@@ -231,14 +230,15 @@ export async function setup(options, dependencies, progress, telemetry, diagnost
231
230
  }
232
231
  for (const client of clients) {
233
232
  const endpoint = clientEndpoint(client, options.url);
234
- let plan = setupPlan(client, endpoint);
233
+ const plan = setupPlan(client, endpoint);
235
234
  const state = detectedStates.get(client);
235
+ const authorizationAction = clientAuthorizationGuidance(client, endpoint);
236
236
  if (state === undefined)
237
237
  throw new Error(`${client}: MCP state was not inspected.`);
238
238
  const replaceExisting = options.force || state === 'legacy';
239
239
  if (state === 'current' && !options.force) {
240
240
  clientResults.push({
241
- ...clientNextAction(client, endpoint),
241
+ ...(authorizationAction ? { action: authorizationAction } : {}),
242
242
  client,
243
243
  status: 'already_configured',
244
244
  });
@@ -265,21 +265,6 @@ export async function setup(options, dependencies, progress, telemetry, diagnost
265
265
  }
266
266
  try {
267
267
  await runDiagnostic(diagnostics, diagnosticOperation('client-configuration', client, plan), async () => {
268
- if (client === Client.Grok && isProtectedMcpEndpoint(endpoint)) {
269
- progress?.report('Authorize Grok in Tempo Wallet...');
270
- const authorization = diagnostics
271
- ? await dependencies.authorizeMcpClient(endpoint, {
272
- onEvent: (event) => diagnostics.info({
273
- client,
274
- phase: `oauth:${event}`,
275
- }),
276
- })
277
- : await dependencies.authorizeMcpClient(endpoint);
278
- diagnosticAuthorization = authorization.authorization;
279
- plan = setupPlan(client, endpoint, {
280
- authorization: authorization.authorization,
281
- });
282
- }
283
268
  if (replaceExisting && state !== 'missing') {
284
269
  progress?.report(`Removing existing ${client} MCP registration...`);
285
270
  await removeClientConfiguration(client, dependencies, diagnostics);
@@ -295,17 +280,25 @@ export async function setup(options, dependencies, progress, telemetry, diagnost
295
280
  }
296
281
  else
297
282
  await dependencies.runCommand(plan.command, plan.args);
298
- if (client === Client.Grok && diagnosticAuthorization) {
299
- await dependencies.protectGrokConfig();
300
- diagnostics?.info({ client, phase: 'oauth:config-secured' });
301
- }
302
283
  }
303
284
  });
304
285
  clientResults.push({
305
- ...clientNextAction(client, endpoint),
286
+ ...(authorizationAction ? { action: authorizationAction } : {}),
306
287
  client,
307
288
  status: replaceExisting && state !== 'missing' ? 'reconfigured' : 'configured',
308
289
  });
290
+ if (client === Client.OpenClaw &&
291
+ isProtectedMcpEndpoint(endpoint) &&
292
+ process.stdin.isTTY &&
293
+ process.stdout.isTTY) {
294
+ try {
295
+ progress?.report('Authorize OpenClaw in Tempo Wallet...');
296
+ await dependencies.runCommand('openclaw', ['mcp', 'login', 'mercator']);
297
+ }
298
+ catch {
299
+ warnings.push('OpenClaw configuration was saved, but OAuth login did not complete. Run openclaw mcp login mercator to retry.');
300
+ }
301
+ }
309
302
  }
310
303
  catch (error) {
311
304
  clientResults.push({
@@ -327,11 +320,12 @@ export async function setup(options, dependencies, progress, telemetry, diagnost
327
320
  }
328
321
  }
329
322
  let nativePayments = [];
330
- const nativePaymentClients = clients.filter((client) => client === Client.OpenClaw || client === Client.Hermes);
323
+ const nativePaymentClients = clients.filter((client) => (client === Client.OpenClaw || client === Client.Hermes) &&
324
+ !isProtectedMcpEndpoint(clientEndpoint(client, options.url)));
331
325
  if (nativePaymentClients.length > 0) {
332
326
  progress?.report('Checking client-managed MCP payments...');
333
327
  try {
334
- nativePayments = await runDiagnostic(diagnostics, { phase: 'native-payments' }, () => dependencies.setupNativePayments(clients, {
328
+ nativePayments = await runDiagnostic(diagnostics, { phase: 'native-payments' }, () => dependencies.setupNativePayments(nativePaymentClients, {
335
329
  dryRun: options.dryRun || options.force,
336
330
  endpoint: options.url,
337
331
  }));
@@ -357,13 +351,7 @@ export async function setup(options, dependencies, progress, telemetry, diagnost
357
351
  try {
358
352
  const diagnosticEndpoints = new Set(clients.map((client) => clientEndpoint(client, options.url)));
359
353
  const diagnosticEndpoint = diagnosticEndpoints.size === 1 ? [...diagnosticEndpoints][0] : options.url;
360
- const hostedClients = clients.filter((client) => isProtectedMcpEndpoint(clientEndpoint(client, options.url)));
361
- const grokRegistrationVerified = !options.force &&
362
- hostedClients.includes(Client.Grok) &&
363
- detectedStates.get(Client.Grok) === 'current';
364
- const authorizationIsClientManaged = (plugin !== undefined || hostedClients.length > 0) &&
365
- hostedClients.every((client) => client !== Client.Grok || grokRegistrationVerified);
366
- diagnosis = await runDiagnostic(diagnostics, { phase: 'readiness' }, () => diagnoseWithoutWallet(diagnosticEndpoint ?? options.url, dependencies, progress, diagnosticAuthorization, authorizationIsClientManaged, diagnostics));
354
+ diagnosis = await runDiagnostic(diagnostics, { phase: 'readiness' }, () => diagnoseWithoutWallet(diagnosticEndpoint ?? options.url, dependencies, progress, diagnostics));
367
355
  diagnostics?.info({
368
356
  phase: 'readiness-result',
369
357
  state: diagnosis.ready ? 'ready' : 'failed',
@@ -439,15 +427,19 @@ export function recordSetupResult(telemetry, result) {
439
427
  : 'partial',
440
428
  });
441
429
  }
442
- /** Muse's OAuth command resolves settings entries, independently of plugin installation. */
443
- function clientNextAction(client, endpoint) {
444
- if (client !== Client.Muse)
445
- return {};
446
- return {
447
- action: isProtectedMcpEndpoint(endpoint)
430
+ /** Native hosts own credentials; setup never claims their grants were verified. */
431
+ function clientAuthorizationGuidance(client, endpoint) {
432
+ if (client === Client.Muse)
433
+ return isProtectedMcpEndpoint(endpoint)
448
434
  ? 'Run muse mcp login mercator to authorize if needed, then start a new Muse session and check /mcp.'
449
- : 'Start a new Muse session and check /mcp.',
450
- };
435
+ : 'Start a new Muse session and check /mcp.';
436
+ if (!isProtectedMcpEndpoint(endpoint))
437
+ return undefined;
438
+ if (client === Client.OpenClaw)
439
+ return 'Run openclaw mcp login mercator, then call search_services and get_connection_status from OpenClaw. Remote browsers can use OpenClaw’s documented --code fallback.';
440
+ if (client === Client.Grok)
441
+ return 'In Grok, open /mcps, select Mercator, and press i to authorize. Then verify search_services and get_connection_status in Grok. For SSH sessions, the browser must reach Grok’s printed loopback callback; use local port forwarding or authorize on a browser-capable host.';
442
+ return 'Complete OAuth in your client, then call search_services and get_connection_status there. Registration alone does not verify payment readiness.';
451
443
  }
452
444
  function unavailableClientGuidance(client) {
453
445
  if (client === Client.Codex) {
@@ -474,7 +466,8 @@ function setupConfirmationActions(clients, options) {
474
466
  if (options.agents && (options.plugin || clients.includes(Client.Codex))) {
475
467
  actions.push('Install Mercator guidance');
476
468
  }
477
- if (clients.some((client) => client === Client.OpenClaw || client === Client.Hermes)) {
469
+ if (clients.some((client) => (client === Client.OpenClaw || client === Client.Hermes) &&
470
+ !isProtectedMcpEndpoint(clientEndpoint(client, options.url)))) {
478
471
  actions.push('Configure client-managed MCP payments');
479
472
  }
480
473
  return actions;
@@ -496,32 +489,19 @@ async function removeClientConfiguration(client, dependencies, diagnostics) {
496
489
  }
497
490
  function describeSetupPlan(plan) {
498
491
  return plan.kind === 'command'
499
- ? [plan.command, ...plan.args].join(' ')
492
+ ? [plan.command, ...plan.args]
493
+ .map((arg) => /^[\w./:=@-]+$/.test(arg) ? arg : `'${arg.replaceAll("'", "'\\''")}'`)
494
+ .join(' ')
500
495
  : `Update ${plan.path}`;
501
496
  }
502
497
  /** Checks remote MCP readiness without requiring a local payment wallet. */
503
- async function diagnoseWithoutWallet(endpoint, dependencies, progress, authorization, authorizationIsClientManaged = false, diagnostics) {
504
- const authenticatedFetch = authorization
505
- ? (input, init) => {
506
- const headers = new Headers(init?.headers);
507
- headers.set('authorization', authorization);
508
- return fetch(input, { ...init, headers });
509
- }
510
- : undefined;
498
+ async function diagnoseWithoutWallet(endpoint, dependencies, progress, diagnostics) {
511
499
  const diagnosed = diagnostics
512
- ? await dependencies.diagnose(endpoint, authenticatedFetch, progress?.report, diagnostics)
513
- : await dependencies.diagnose(endpoint, authenticatedFetch, progress?.report);
500
+ ? await dependencies.diagnose(endpoint, undefined, progress?.report, diagnostics)
501
+ : await dependencies.diagnose(endpoint, undefined, progress?.report);
514
502
  const remoteReady = diagnosed.transport === 'ready' &&
515
503
  diagnosed.discovery === 'ready' &&
516
504
  diagnosed.paidExecution === 'ready';
517
- const clientManagedReady = authorizationIsClientManaged &&
518
- diagnosed.authorization === 'required' &&
519
- diagnosed.transport === 'ready';
520
- if (clientManagedReady) {
521
- const report = { ...diagnosed };
522
- delete report.error;
523
- return { ready: true, report };
524
- }
525
505
  return {
526
506
  ready: remoteReady,
527
507
  report: diagnosed,