@experiture/xyra-cli 0.4.0 → 0.6.0
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/README.md +57 -15
- package/dist/auth/oauthClient.js +12 -2
- package/dist/auth/oauthClient.js.map +1 -1
- package/dist/auth/session.js +41 -13
- package/dist/auth/session.js.map +1 -1
- package/dist/chat/runtimeChatClient.js +23102 -0
- package/dist/chat/runtimeChatClient.js.map +7 -0
- package/dist/commands/chat.js +145 -0
- package/dist/commands/chat.js.map +1 -0
- package/dist/commands/login.js +4 -1
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/mcpContext.js +16 -6
- package/dist/commands/mcpContext.js.map +1 -1
- package/dist/commands/session.js +11 -6
- package/dist/commands/session.js.map +1 -1
- package/dist/commands/tools.js +1 -1
- package/dist/commands/tools.js.map +1 -1
- package/dist/config/configStore.js +25 -1
- package/dist/config/configStore.js.map +1 -1
- package/dist/config/environments.js +13 -0
- package/dist/config/environments.js.map +1 -1
- package/dist/diagnostics/latency.js +139 -0
- package/dist/diagnostics/latency.js.map +1 -0
- package/dist/errors/CliError.js +4 -1
- package/dist/errors/CliError.js.map +1 -1
- package/dist/evaluation/localSession.js +62 -0
- package/dist/evaluation/localSession.js.map +1 -0
- package/dist/index.js +39 -4
- package/dist/index.js.map +1 -1
- package/dist/mcp/confirmation.js +14 -17
- package/dist/mcp/confirmation.js.map +1 -1
- package/dist/mcp/mcpClient.js +17 -1
- package/dist/mcp/mcpClient.js.map +1 -1
- package/dist/output/console.js +3 -1
- package/dist/output/console.js.map +1 -1
- package/package.json +12 -3
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.LatencyDiagnostics = void 0;
|
|
7
|
+
exports.configureLatencyDiagnostics = configureLatencyDiagnostics;
|
|
8
|
+
exports.beginLatencyDiagnostics = beginLatencyDiagnostics;
|
|
9
|
+
exports.getLatencyDiagnostics = getLatencyDiagnostics;
|
|
10
|
+
exports.endLatencyDiagnostics = endLatencyDiagnostics;
|
|
11
|
+
exports.measureLatencyPhase = measureLatencyPhase;
|
|
12
|
+
exports.createTimedOutputWriter = createTimedOutputWriter;
|
|
13
|
+
exports.emitLatencyDiagnostics = emitLatencyDiagnostics;
|
|
14
|
+
const node_crypto_1 = __importDefault(require("node:crypto"));
|
|
15
|
+
const api_1 = require("@opentelemetry/api");
|
|
16
|
+
const core_1 = require("@opentelemetry/core");
|
|
17
|
+
let configuredMode;
|
|
18
|
+
let activeDiagnostics;
|
|
19
|
+
function elapsedMs(startedAt) {
|
|
20
|
+
return Math.round((performance.now() - startedAt) * 100) / 100;
|
|
21
|
+
}
|
|
22
|
+
function validTraceId(value) {
|
|
23
|
+
return Boolean(value && /^[0-9a-f]{32}$/i.test(value) && !/^0{32}$/.test(value));
|
|
24
|
+
}
|
|
25
|
+
class LatencyDiagnostics {
|
|
26
|
+
mode;
|
|
27
|
+
startedAt = performance.now();
|
|
28
|
+
records = [];
|
|
29
|
+
linkage = {};
|
|
30
|
+
traceContext;
|
|
31
|
+
constructor(mode) {
|
|
32
|
+
this.mode = mode;
|
|
33
|
+
const traceId = node_crypto_1.default.randomBytes(16).toString('hex');
|
|
34
|
+
const spanId = node_crypto_1.default.randomBytes(8).toString('hex');
|
|
35
|
+
this.linkage.traceId = traceId;
|
|
36
|
+
this.traceContext = api_1.trace.setSpanContext(api_1.context.active(), {
|
|
37
|
+
traceId,
|
|
38
|
+
spanId,
|
|
39
|
+
traceFlags: api_1.TraceFlags.SAMPLED,
|
|
40
|
+
isRemote: false,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
async measure(name, fn, metadata) {
|
|
44
|
+
const startedAt = performance.now();
|
|
45
|
+
try {
|
|
46
|
+
return await fn();
|
|
47
|
+
}
|
|
48
|
+
finally {
|
|
49
|
+
this.records.push({ name, durationMs: elapsedMs(startedAt), ...(metadata ? { metadata } : {}) });
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
record(name, durationMs, metadata) {
|
|
53
|
+
this.records.push({ name, durationMs: Math.round(durationMs * 100) / 100, ...(metadata ? { metadata } : {}) });
|
|
54
|
+
}
|
|
55
|
+
injectTraceHeaders(headers) {
|
|
56
|
+
new core_1.W3CTraceContextPropagator().inject(this.traceContext, headers, {
|
|
57
|
+
set(carrier, key, value) {
|
|
58
|
+
carrier.set(key, value);
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
observeResponseHeaders(headers) {
|
|
63
|
+
const serverTraceId = headers.get('x-trace-id');
|
|
64
|
+
if (validTraceId(serverTraceId))
|
|
65
|
+
this.linkage.traceId = serverTraceId.toLowerCase();
|
|
66
|
+
const correlationId = headers.get('x-correlation-id');
|
|
67
|
+
if (correlationId)
|
|
68
|
+
this.linkage.correlationId = correlationId;
|
|
69
|
+
const serverTiming = headers.get('server-timing');
|
|
70
|
+
if (serverTiming)
|
|
71
|
+
this.linkage.serverTiming = serverTiming;
|
|
72
|
+
}
|
|
73
|
+
report() {
|
|
74
|
+
return {
|
|
75
|
+
schemaVersion: 1,
|
|
76
|
+
generatedAt: new Date().toISOString(),
|
|
77
|
+
totalDurationMs: elapsedMs(this.startedAt),
|
|
78
|
+
phases: [...this.records],
|
|
79
|
+
linkage: { ...this.linkage },
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
exports.LatencyDiagnostics = LatencyDiagnostics;
|
|
84
|
+
function configureLatencyDiagnostics(options) {
|
|
85
|
+
configuredMode = options.timingsJson ? 'json' : options.timings ? 'human' : undefined;
|
|
86
|
+
}
|
|
87
|
+
function beginLatencyDiagnostics() {
|
|
88
|
+
activeDiagnostics = configuredMode ? new LatencyDiagnostics(configuredMode) : undefined;
|
|
89
|
+
return activeDiagnostics;
|
|
90
|
+
}
|
|
91
|
+
function getLatencyDiagnostics() {
|
|
92
|
+
return activeDiagnostics;
|
|
93
|
+
}
|
|
94
|
+
function endLatencyDiagnostics() {
|
|
95
|
+
activeDiagnostics = undefined;
|
|
96
|
+
}
|
|
97
|
+
async function measureLatencyPhase(name, fn, metadata) {
|
|
98
|
+
return activeDiagnostics
|
|
99
|
+
? activeDiagnostics.measure(name, fn, metadata)
|
|
100
|
+
: fn();
|
|
101
|
+
}
|
|
102
|
+
function createTimedOutputWriter(writer) {
|
|
103
|
+
return {
|
|
104
|
+
out(message) {
|
|
105
|
+
const startedAt = performance.now();
|
|
106
|
+
try {
|
|
107
|
+
writer.out(message);
|
|
108
|
+
}
|
|
109
|
+
finally {
|
|
110
|
+
activeDiagnostics?.record('output.render', elapsedMs(startedAt), { stream: 'stdout' });
|
|
111
|
+
}
|
|
112
|
+
},
|
|
113
|
+
err(message) {
|
|
114
|
+
const startedAt = performance.now();
|
|
115
|
+
try {
|
|
116
|
+
writer.err(message);
|
|
117
|
+
}
|
|
118
|
+
finally {
|
|
119
|
+
activeDiagnostics?.record('output.render', elapsedMs(startedAt), { stream: 'stderr' });
|
|
120
|
+
}
|
|
121
|
+
},
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
function emitLatencyDiagnostics(diagnostics, writer) {
|
|
125
|
+
const report = diagnostics.report();
|
|
126
|
+
if (diagnostics.mode === 'json') {
|
|
127
|
+
writer.err(JSON.stringify(report));
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
const rows = report.phases.map((phase) => ` ${phase.name}: ${phase.durationMs.toFixed(2)} ms`);
|
|
131
|
+
writer.err([
|
|
132
|
+
`Latency diagnostics: ${report.totalDurationMs.toFixed(2)} ms total`,
|
|
133
|
+
...rows,
|
|
134
|
+
...(report.linkage.serverTiming ? [` server-timing: ${report.linkage.serverTiming}`] : []),
|
|
135
|
+
...(report.linkage.traceId ? [` trace-id: ${report.linkage.traceId}`] : []),
|
|
136
|
+
...(report.linkage.correlationId ? [` correlation-id: ${report.linkage.correlationId}`] : []),
|
|
137
|
+
].join('\n'));
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=latency.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"latency.js","sourceRoot":"","sources":["../../src/diagnostics/latency.ts"],"names":[],"mappings":"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"}
|
package/dist/errors/CliError.js
CHANGED
|
@@ -9,11 +9,13 @@ exports.CliErrorCodes = exports.CliError = void 0;
|
|
|
9
9
|
class CliError extends Error {
|
|
10
10
|
code;
|
|
11
11
|
hint;
|
|
12
|
-
|
|
12
|
+
httpStatus;
|
|
13
|
+
constructor(code, message, hint, httpStatus) {
|
|
13
14
|
super(message);
|
|
14
15
|
this.name = 'CliError';
|
|
15
16
|
this.code = code;
|
|
16
17
|
this.hint = hint;
|
|
18
|
+
this.httpStatus = httpStatus;
|
|
17
19
|
}
|
|
18
20
|
}
|
|
19
21
|
exports.CliError = CliError;
|
|
@@ -28,6 +30,7 @@ exports.CliErrorCodes = {
|
|
|
28
30
|
InsufficientScope: 'XYRA.CLI.INSUFFICIENT_SCOPE',
|
|
29
31
|
McpProtocolError: 'XYRA.CLI.MCP_PROTOCOL_ERROR',
|
|
30
32
|
ToolCallFailed: 'XYRA.CLI.TOOL_CALL_FAILED',
|
|
33
|
+
ChatRequestFailed: 'XYRA.CLI.CHAT_REQUEST_FAILED',
|
|
31
34
|
InvalidArguments: 'XYRA.CLI.INVALID_ARGUMENTS',
|
|
32
35
|
ConfirmationRequired: 'XYRA.CLI.CONFIRMATION_REQUIRED',
|
|
33
36
|
AmbiguousAlias: 'XYRA.CLI.AMBIGUOUS_ALIAS',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliError.js","sourceRoot":"","sources":["../../src/errors/CliError.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,MAAa,QAAS,SAAQ,KAAK;IACxB,IAAI,CAAS;IACb,IAAI,CAAU;
|
|
1
|
+
{"version":3,"file":"CliError.js","sourceRoot":"","sources":["../../src/errors/CliError.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,MAAa,QAAS,SAAQ,KAAK;IACxB,IAAI,CAAS;IACb,IAAI,CAAU;IACd,UAAU,CAAU;IAE7B,YAAY,IAAY,EAAE,OAAe,EAAE,IAAa,EAAE,UAAmB;QAC3E,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF;AAZD,4BAYC;AAEY,QAAA,aAAa,GAAG;IAC3B,aAAa,EAAE,yBAAyB;IACxC,mBAAmB,EAAE,gCAAgC;IACrD,gBAAgB,EAAE,4BAA4B;IAC9C,kBAAkB,EAAE,+BAA+B;IACnD,kBAAkB,EAAE,+BAA+B;IACnD,qBAAqB,EAAE,kCAAkC;IACzD,mBAAmB,EAAE,gCAAgC;IACrD,iBAAiB,EAAE,6BAA6B;IAChD,gBAAgB,EAAE,6BAA6B;IAC/C,cAAc,EAAE,2BAA2B;IAC3C,iBAAiB,EAAE,8BAA8B;IACjD,gBAAgB,EAAE,4BAA4B;IAC9C,oBAAoB,EAAE,gCAAgC;IACtD,cAAc,EAAE,0BAA0B;CAClC,CAAC"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LocalEvaluationSession = void 0;
|
|
4
|
+
exports.createLocalEvaluationSession = createLocalEvaluationSession;
|
|
5
|
+
const configStore_1 = require("../config/configStore");
|
|
6
|
+
const tokenStore_1 = require("../auth/tokenStore");
|
|
7
|
+
const session_1 = require("../auth/session");
|
|
8
|
+
const oauthClient_1 = require("../auth/oauthClient");
|
|
9
|
+
const session_2 = require("../commands/session");
|
|
10
|
+
const mcpContext_1 = require("../commands/mcpContext");
|
|
11
|
+
const runtimeChatClient_1 = require("../chat/runtimeChatClient");
|
|
12
|
+
/** Local mismatch detection only. The destination service owns authorization. */
|
|
13
|
+
class LocalEvaluationSession {
|
|
14
|
+
sessionName;
|
|
15
|
+
expected;
|
|
16
|
+
environment;
|
|
17
|
+
pinnedIdentity;
|
|
18
|
+
constructor(config, sessionName, expected = {}) {
|
|
19
|
+
this.sessionName = sessionName;
|
|
20
|
+
this.expected = expected;
|
|
21
|
+
this.environment = { ...config.getActiveEnvironment() };
|
|
22
|
+
(0, session_1.accountKey)(this.environment, sessionName);
|
|
23
|
+
}
|
|
24
|
+
projectIdentity(token) {
|
|
25
|
+
const summary = (0, session_2.buildWhoamiSummary)(this.environment, token, (0, oauthClient_1.decodeJwtClaims)(token.accessToken), 'local-evaluation', this.sessionName);
|
|
26
|
+
if (!summary.subject || !summary.tenantId)
|
|
27
|
+
throw new Error('XYRA.CERTIFICATION.IDENTITY_INCOMPLETE');
|
|
28
|
+
const identity = { subject: summary.subject, subjectType: summary.subjectType, tenantId: summary.tenantId };
|
|
29
|
+
const expected = this.pinnedIdentity ?? this.expected;
|
|
30
|
+
if ((expected.subject && expected.subject !== identity.subject)
|
|
31
|
+
|| (expected.tenantId && expected.tenantId !== identity.tenantId)
|
|
32
|
+
|| (this.pinnedIdentity && this.pinnedIdentity.subjectType !== identity.subjectType)) {
|
|
33
|
+
throw new Error('XYRA.CERTIFICATION.IDENTITY_CHANGED');
|
|
34
|
+
}
|
|
35
|
+
this.pinnedIdentity ??= identity;
|
|
36
|
+
return identity;
|
|
37
|
+
}
|
|
38
|
+
async loadToken() {
|
|
39
|
+
const token = await (0, session_1.getValidToken)(this.environment, await (0, tokenStore_1.createTokenStore)(), this.sessionName);
|
|
40
|
+
this.projectIdentity(token);
|
|
41
|
+
return token;
|
|
42
|
+
}
|
|
43
|
+
async readIdentity() {
|
|
44
|
+
return this.projectIdentity(await this.loadToken());
|
|
45
|
+
}
|
|
46
|
+
async withMcpClient(writer, action) {
|
|
47
|
+
const config = { getActiveEnvironment: () => this.environment };
|
|
48
|
+
return (0, mcpContext_1.withMcpClient)(config, writer, action, {
|
|
49
|
+
sessionName: this.sessionName,
|
|
50
|
+
validateToken: token => { this.projectIdentity(token); },
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
async withRuntimeClient(action) {
|
|
54
|
+
const token = await this.loadToken();
|
|
55
|
+
return action(new runtimeChatClient_1.XyraRuntimeChatClient(this.environment, token.accessToken));
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
exports.LocalEvaluationSession = LocalEvaluationSession;
|
|
59
|
+
function createLocalEvaluationSession(sessionName, expected) {
|
|
60
|
+
return new LocalEvaluationSession(new configStore_1.ConfigStore(), sessionName, expected);
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=localSession.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"localSession.js","sourceRoot":"","sources":["../../src/evaluation/localSession.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -12,8 +12,10 @@ const env_1 = require("./commands/env");
|
|
|
12
12
|
const mcp_1 = require("./commands/mcp");
|
|
13
13
|
const tools_1 = require("./commands/tools");
|
|
14
14
|
const docs_1 = require("./commands/docs");
|
|
15
|
+
const chat_1 = require("./commands/chat");
|
|
15
16
|
const generatedCommandRegistry_1 = require("./commands/generatedCommandRegistry");
|
|
16
17
|
const version_1 = require("./version");
|
|
18
|
+
const latency_1 = require("./diagnostics/latency");
|
|
17
19
|
/**
|
|
18
20
|
* Apply an optional `--env <name>` override before a command runs, without
|
|
19
21
|
* persisting it (transient selection for this invocation).
|
|
@@ -23,6 +25,7 @@ function configFor(envOverride) {
|
|
|
23
25
|
}
|
|
24
26
|
/** Wrap an async command so failures render cleanly and set a non-zero exit code. */
|
|
25
27
|
function run(writer, action) {
|
|
28
|
+
const diagnostics = (0, latency_1.beginLatencyDiagnostics)();
|
|
26
29
|
Promise.resolve()
|
|
27
30
|
.then(action)
|
|
28
31
|
.then((code) => {
|
|
@@ -32,15 +35,27 @@ function run(writer, action) {
|
|
|
32
35
|
const formatted = (0, mcpErrorFormatter_1.formatError)(error);
|
|
33
36
|
writer.err(formatted.human);
|
|
34
37
|
process.exitCode = 1;
|
|
38
|
+
})
|
|
39
|
+
.finally(() => {
|
|
40
|
+
if (diagnostics)
|
|
41
|
+
(0, latency_1.emitLatencyDiagnostics)(diagnostics, writer);
|
|
42
|
+
(0, latency_1.endLatencyDiagnostics)();
|
|
35
43
|
});
|
|
36
44
|
}
|
|
37
|
-
function buildProgram(
|
|
45
|
+
function buildProgram(baseWriter = console_1.defaultWriter) {
|
|
46
|
+
const writer = (0, latency_1.createTimedOutputWriter)(baseWriter);
|
|
38
47
|
const program = new commander_1.Command();
|
|
39
48
|
program
|
|
40
49
|
.name('xyra')
|
|
41
50
|
.description('Xyra headless MCP command-line client (delegated OAuth).')
|
|
42
51
|
.version(version_1.CLI_VERSION, '-v, --version')
|
|
43
|
-
.option('--env <name>', 'Environment to target for this command (overrides the active one).')
|
|
52
|
+
.option('--env <name>', 'Environment to target for this command (overrides the active one).')
|
|
53
|
+
.option('--timings', 'Print local end-to-end latency phases to stderr.')
|
|
54
|
+
.option('--timings-json', 'Print local latency diagnostics as JSON to stderr.');
|
|
55
|
+
program.hook('preAction', (_thisCommand, actionCommand) => {
|
|
56
|
+
const options = actionCommand.optsWithGlobals();
|
|
57
|
+
(0, latency_1.configureLatencyDiagnostics)({ timings: options.timings, timingsJson: options.timingsJson });
|
|
58
|
+
});
|
|
44
59
|
const globalEnv = () => program.opts().env;
|
|
45
60
|
// ---- env ----
|
|
46
61
|
const env = program.command('env').description('Manage connection environments.');
|
|
@@ -64,16 +79,36 @@ function buildProgram(writer = console_1.defaultWriter) {
|
|
|
64
79
|
.description('Sign in via delegated OAuth (Authorization Code + PKCE).')
|
|
65
80
|
.option('--no-browser', 'Print the authorization URL instead of opening a browser.')
|
|
66
81
|
.option('--no-open', 'Alias for --no-browser (az/gh convention).')
|
|
67
|
-
.
|
|
82
|
+
.option('--session <name>', 'Store this login separately for an explicitly selected identity.')
|
|
83
|
+
.action((opts) => run(writer, () => (0, login_1.runLogin)(configFor(globalEnv()), writer, { noBrowser: !opts.browser || !opts.open, session: opts.session })));
|
|
68
84
|
program
|
|
69
85
|
.command('logout')
|
|
70
86
|
.description('Remove the stored token for the active environment.')
|
|
71
|
-
.
|
|
87
|
+
.option('--session <name>', 'Remove only this named login.')
|
|
88
|
+
.action((opts) => run(writer, () => (0, session_1.runLogout)(configFor(globalEnv()), writer, opts)));
|
|
72
89
|
program
|
|
73
90
|
.command('whoami')
|
|
74
91
|
.description('Show the current identity, login scopes, and token status (never prints the token).')
|
|
75
92
|
.option('--json', 'Emit JSON.')
|
|
93
|
+
.option('--session <name>', 'Inspect this named login.')
|
|
76
94
|
.action((opts) => run(writer, () => (0, session_1.runWhoami)(configFor(globalEnv()), writer, opts)));
|
|
95
|
+
// ---- chat ----
|
|
96
|
+
const chat = program.command('chat').description('Use the Xyra in-app chat runtime from the CLI.');
|
|
97
|
+
chat
|
|
98
|
+
.command('start')
|
|
99
|
+
.description('Create a new Xyra chat conversation.')
|
|
100
|
+
.option('--title <title>', 'Optional conversation title.')
|
|
101
|
+
.option('--json', 'Emit JSON.')
|
|
102
|
+
.action((opts) => run(writer, () => (0, chat_1.runChatStart)(configFor(globalEnv()), writer, opts)));
|
|
103
|
+
chat
|
|
104
|
+
.command('send <message...>')
|
|
105
|
+
.description('Send a message through the Xyra in-app chat runtime.')
|
|
106
|
+
.option('--conversation <id>', 'Existing conversation id.')
|
|
107
|
+
.option('--new', 'Create a conversation before sending.')
|
|
108
|
+
.option('--title <title>', 'Conversation title when --new is supplied.')
|
|
109
|
+
.option('--locale <locale>', 'Runtime locale: en, fr, or zh-Hans.', 'en')
|
|
110
|
+
.option('--json', 'Emit JSON.')
|
|
111
|
+
.action((message, opts) => run(writer, () => (0, chat_1.runChatSend)(configFor(globalEnv()), writer, message, opts)));
|
|
77
112
|
// ---- mcp ----
|
|
78
113
|
const mcp = program.command('mcp').description('Low-level MCP operations.');
|
|
79
114
|
mcp
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/confirmation.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.READ_SIDE_EFFECT = void 0;
|
|
4
4
|
exports.classifyToolConfirmation = classifyToolConfirmation;
|
|
5
5
|
exports.extractServerConfirmationChallenge = extractServerConfirmationChallenge;
|
|
6
6
|
const xyraToolDescriptor_1 = require("../metadata/xyraToolDescriptor");
|
|
@@ -14,8 +14,6 @@ const xyraToolDescriptor_1 = require("../metadata/xyraToolDescriptor");
|
|
|
14
14
|
* Canonical vocabulary: libs/xyra-types/src/api-catalog.ts.
|
|
15
15
|
*/
|
|
16
16
|
exports.READ_SIDE_EFFECT = 'read';
|
|
17
|
-
/** Canonical server code raised when a tool demands server-side confirmation. */
|
|
18
|
-
exports.SERVER_CONFIRMATION_CODE = 'XYRA.OPERATION.CONFIRMATION_REQUIRED';
|
|
19
17
|
/**
|
|
20
18
|
* Decide whether the CLI must confirm locally before calling a tool.
|
|
21
19
|
* Fail safe: only a declared 'read' side effect skips confirmation; a tool
|
|
@@ -32,25 +30,24 @@ function asRecord(value) {
|
|
|
32
30
|
}
|
|
33
31
|
/**
|
|
34
32
|
* Detect a server-issued confirmation challenge in a tools/call result.
|
|
35
|
-
* Ground truth:
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
* carries { code, message, details }. Detection is deliberately defensive —
|
|
39
|
-
* it matches either the canonical code or a typed confirmation object,
|
|
40
|
-
* so a challenge is still recognized if the server changes one of the two.
|
|
33
|
+
* Ground truth: the MCP V2 envelope reports status=control_required and carries
|
|
34
|
+
* a typed human-confirmation control. It is not an error and is never inferred
|
|
35
|
+
* from prose or an error code.
|
|
41
36
|
*/
|
|
42
37
|
function extractServerConfirmationChallenge(result) {
|
|
43
|
-
const
|
|
44
|
-
if (
|
|
38
|
+
const envelope = asRecord(result.structuredContent);
|
|
39
|
+
if (envelope?.schemaVersion !== 2 || envelope.status !== 'control_required')
|
|
45
40
|
return undefined;
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
41
|
+
const control = asRecord(envelope.control);
|
|
42
|
+
if (control?.type !== 'human_confirmation')
|
|
43
|
+
return undefined;
|
|
44
|
+
const confirmation = asRecord(control.challenge);
|
|
45
|
+
if (!confirmation)
|
|
50
46
|
return undefined;
|
|
51
47
|
return {
|
|
52
|
-
|
|
53
|
-
|
|
48
|
+
message: typeof confirmation.approvalPrompt === 'string'
|
|
49
|
+
? confirmation.approvalPrompt
|
|
50
|
+
: undefined,
|
|
54
51
|
confirmation,
|
|
55
52
|
};
|
|
56
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirmation.js","sourceRoot":"","sources":["../../src/mcp/confirmation.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"confirmation.js","sourceRoot":"","sources":["../../src/mcp/confirmation.ts"],"names":[],"mappings":";;;AA0BA,4DAKC;AAkBD,gFAaC;AA7DD,uEAAyE;AAEzE;;;;;;;;GAQG;AAEU,QAAA,gBAAgB,GAAG,MAAM,CAAC;AAQvC;;;;GAIG;AACH,SAAgB,wBAAwB,CAAC,IAA4B;IACnE,MAAM,UAAU,GAAG,IAAA,4CAAuB,EAAC,IAAI,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,CAAC;IAC1C,MAAM,YAAY,GAAG,UAAU,EAAE,YAAY,CAAC;IAC9C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,yBAAyB,EAAE,UAAU,KAAK,wBAAgB,EAAE,CAAC;AAClG,CAAC;AAQD,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAiC,CAAC,CAAC,CAAC,SAAS,CAAC;AACtH,CAAC;AAED;;;;;GAKG;AACH,SAAgB,kCAAkC,CAAC,MAAsB;IACvE,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACpD,IAAI,QAAQ,EAAE,aAAa,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,kBAAkB;QAAE,OAAO,SAAS,CAAC;IAC9F,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,OAAO,EAAE,IAAI,KAAK,oBAAoB;QAAE,OAAO,SAAS,CAAC;IAC7D,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,CAAC,YAAY;QAAE,OAAO,SAAS,CAAC;IACpC,OAAO;QACL,OAAO,EAAE,OAAO,YAAY,CAAC,cAAc,KAAK,QAAQ;YACtD,CAAC,CAAC,YAAY,CAAC,cAAc;YAC7B,CAAC,CAAC,SAAS;QACb,YAAY;KACb,CAAC;AACJ,CAAC"}
|
package/dist/mcp/mcpClient.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.McpClient = exports.McpRawResponseCapture = void 0;
|
|
4
4
|
const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
|
|
5
5
|
const mcpError_1 = require("./mcpError");
|
|
6
|
+
const latency_1 = require("../diagnostics/latency");
|
|
6
7
|
class McpRawResponseCapture {
|
|
7
8
|
callback;
|
|
8
9
|
begin(callback) {
|
|
@@ -43,7 +44,7 @@ class McpClient {
|
|
|
43
44
|
async request(method, params = {}, options) {
|
|
44
45
|
this.rawCapture?.begin(options?.captureRaw);
|
|
45
46
|
try {
|
|
46
|
-
return await this.sdk.request({ method, params }, types_js_1.ResultSchema);
|
|
47
|
+
return await (0, latency_1.measureLatencyPhase)('mcp.method', () => this.sdk.request({ method, params }, types_js_1.ResultSchema), { method });
|
|
47
48
|
}
|
|
48
49
|
catch (error) {
|
|
49
50
|
throw mcpError_1.McpRpcError.from(error) ?? error;
|
|
@@ -63,6 +64,17 @@ class McpClient {
|
|
|
63
64
|
});
|
|
64
65
|
}
|
|
65
66
|
}
|
|
67
|
+
assertChatExtension() {
|
|
68
|
+
const experimental = this.sdk.getServerCapabilities()?.experimental;
|
|
69
|
+
const extension = experimental?.['com.experiture.xyra.chat'];
|
|
70
|
+
if (extension?.version !== 1) {
|
|
71
|
+
throw new mcpError_1.McpRpcError({
|
|
72
|
+
code: -32602,
|
|
73
|
+
message: 'The server did not negotiate the Xyra chat extension.',
|
|
74
|
+
data: { xyraCode: 'XYRA.MCP.EXTENSION_NOT_NEGOTIATED' },
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
}
|
|
66
78
|
/** Page through every visible tool unless a hard limit is supplied. */
|
|
67
79
|
async listTools(filters) {
|
|
68
80
|
const tools = [];
|
|
@@ -121,6 +133,10 @@ class McpClient {
|
|
|
121
133
|
this.assertConfirmationExtension();
|
|
122
134
|
return this.request('xyra/confirmations/cancel', { id });
|
|
123
135
|
}
|
|
136
|
+
chat(params) {
|
|
137
|
+
this.assertChatExtension();
|
|
138
|
+
return this.request('xyra/chat', params);
|
|
139
|
+
}
|
|
124
140
|
}
|
|
125
141
|
exports.McpClient = McpClient;
|
|
126
142
|
//# sourceMappingURL=mcpClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpClient.js","sourceRoot":"","sources":["../../src/mcp/mcpClient.ts"],"names":[],"mappings":";;;AAEA,iEAAkE;
|
|
1
|
+
{"version":3,"file":"mcpClient.js","sourceRoot":"","sources":["../../src/mcp/mcpClient.ts"],"names":[],"mappings":"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"}
|
package/dist/output/console.js
CHANGED
|
@@ -5,13 +5,15 @@ exports.redactSecrets = redactSecrets;
|
|
|
5
5
|
exports.defaultWriter = {
|
|
6
6
|
out: (line) => process.stdout.write(line.endsWith('\n') ? line : `${line}\n`),
|
|
7
7
|
err: (line) => process.stderr.write(line.endsWith('\n') ? line : `${line}\n`),
|
|
8
|
+
write: (text) => process.stdout.write(text),
|
|
8
9
|
};
|
|
9
10
|
/** Keys whose values must never be printed or logged. */
|
|
10
11
|
const SECRET_KEYS = new Set([
|
|
11
12
|
'access_token',
|
|
12
13
|
'refresh_token',
|
|
13
14
|
'id_token',
|
|
14
|
-
'
|
|
15
|
+
'authorization_code',
|
|
16
|
+
'oauth_code',
|
|
15
17
|
'code_verifier',
|
|
16
18
|
'client_secret',
|
|
17
19
|
'authorization',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../src/output/console.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../src/output/console.ts"],"names":[],"mappings":";;;AAmCA,sCAYC;AApCY,QAAA,aAAa,GAAiB;IACzC,GAAG,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC;IACrF,GAAG,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC;IACrF,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;CACpD,CAAC;AAEF,yDAAyD;AACzD,MAAM,WAAW,GAAG,IAAI,GAAG,CACzB;IACE,cAAc;IACd,eAAe;IACf,UAAU;IACV,oBAAoB;IACpB,YAAY;IACZ,eAAe;IACf,eAAe;IACf,eAAe;IACf,QAAQ;IACR,YAAY;IACZ,UAAU;CACX,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAC9B,CAAC;AAEF,4EAA4E;AAC5E,SAAgB,aAAa,CAAC,KAAc;IAC1C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvC,MAAM,GAAG,GAA4B,EAAE,CAAC;QACxC,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YAC1E,GAAG,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACxF,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@experiture/xyra-cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.0",
|
|
4
4
|
"description": "Xyra CLI - headless application runner over the Xyra MCP server and Auth delegated OAuth flow.",
|
|
5
5
|
"license": "UNLICENSED",
|
|
6
6
|
"private": false,
|
|
@@ -33,22 +33,31 @@
|
|
|
33
33
|
"registry": "https://registry.npmjs.org/"
|
|
34
34
|
},
|
|
35
35
|
"scripts": {
|
|
36
|
-
"build": "npm run clean && tsc && node -e \"require('node:fs').chmodSync('dist/index.js', 0o755)\"",
|
|
36
|
+
"build": "npm run clean && tsc && esbuild src/chat/runtimeChatClient.ts --bundle --platform=node --format=cjs --target=node20 --sourcemap --outfile=dist/chat/runtimeChatClient.js && node -e \"require('node:fs').chmodSync('dist/index.js', 0o755)\"",
|
|
37
|
+
"benchmark:latency": "node scripts/benchmark-latency.mjs",
|
|
38
|
+
"certify:router-acknowledgement": "node scripts/router-acknowledgement-certification.mjs",
|
|
37
39
|
"clean": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\"",
|
|
38
40
|
"test": "jest",
|
|
39
|
-
"start": "node dist/index.js"
|
|
41
|
+
"start": "node dist/index.js",
|
|
42
|
+
"prebuild": "npm run build:evaluations --prefix ../.."
|
|
40
43
|
},
|
|
41
44
|
"dependencies": {
|
|
42
45
|
"@modelcontextprotocol/sdk": "1.29.0",
|
|
46
|
+
"@opentelemetry/api": "^1.9.0",
|
|
47
|
+
"@opentelemetry/core": "^2.6.0",
|
|
43
48
|
"commander": "^12.1.0"
|
|
44
49
|
},
|
|
45
50
|
"optionalDependencies": {
|
|
46
51
|
"keytar": "^7.9.0"
|
|
47
52
|
},
|
|
48
53
|
"devDependencies": {
|
|
54
|
+
"@experiture/xyra-provider-client": "^0.1.13",
|
|
55
|
+
"@experiture/xyra-runtime-client": "0.1.42",
|
|
49
56
|
"@jest/globals": "^29.7.0",
|
|
50
57
|
"@types/jest": "^29.5.0",
|
|
51
58
|
"@types/node": "^20.11.0",
|
|
59
|
+
"@xyra/types": "1.0.0",
|
|
60
|
+
"esbuild": "^0.25.12",
|
|
52
61
|
"jest": "^29.7.0",
|
|
53
62
|
"ts-jest": "^29.4.5",
|
|
54
63
|
"typescript": "^5.3.3"
|