@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,145 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runChatStart = runChatStart;
|
|
4
|
+
exports.runChatSend = runChatSend;
|
|
5
|
+
const crypto_1 = require("crypto");
|
|
6
|
+
const tokenStore_1 = require("../auth/tokenStore");
|
|
7
|
+
const session_1 = require("../auth/session");
|
|
8
|
+
const latency_1 = require("../diagnostics/latency");
|
|
9
|
+
const CliError_1 = require("../errors/CliError");
|
|
10
|
+
const formatters_1 = require("../output/formatters");
|
|
11
|
+
const runtimeChatClient_1 = require("../chat/runtimeChatClient");
|
|
12
|
+
function collapseMessage(parts) {
|
|
13
|
+
const text = Array.isArray(parts) ? parts.join(' ') : parts;
|
|
14
|
+
const trimmed = text.trim();
|
|
15
|
+
if (!trimmed) {
|
|
16
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'Chat message cannot be empty.');
|
|
17
|
+
}
|
|
18
|
+
return trimmed;
|
|
19
|
+
}
|
|
20
|
+
async function createClient(config) {
|
|
21
|
+
const env = config.getActiveEnvironment();
|
|
22
|
+
const token = await (0, latency_1.measureLatencyPhase)('auth.token_load', async () => {
|
|
23
|
+
const store = await (0, tokenStore_1.createTokenStore)();
|
|
24
|
+
return (0, session_1.getValidToken)(env, store);
|
|
25
|
+
});
|
|
26
|
+
return new runtimeChatClient_1.XyraRuntimeChatClient(env, token.accessToken);
|
|
27
|
+
}
|
|
28
|
+
function approvalReference(result) {
|
|
29
|
+
return result.pendingHumanApproval?.confirmation.id;
|
|
30
|
+
}
|
|
31
|
+
function formatPendingApproval(result) {
|
|
32
|
+
const id = approvalReference(result);
|
|
33
|
+
const lines = ['This action is awaiting approval.'];
|
|
34
|
+
if (result.message)
|
|
35
|
+
lines.unshift(result.message);
|
|
36
|
+
if (id) {
|
|
37
|
+
lines.push(`Approval: ${id}`);
|
|
38
|
+
lines.push(`Next: xyra approvals approve ${id}`);
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
lines.push('Next: open the approval in Xyra and decide it there.');
|
|
42
|
+
}
|
|
43
|
+
return lines.join('\n');
|
|
44
|
+
}
|
|
45
|
+
function formatChatResult(result) {
|
|
46
|
+
if (approvalReference(result))
|
|
47
|
+
return formatPendingApproval(result);
|
|
48
|
+
const lines = [];
|
|
49
|
+
if (result.message)
|
|
50
|
+
lines.push(result.message);
|
|
51
|
+
else if (result.error !== undefined)
|
|
52
|
+
lines.push((0, formatters_1.toJson)(result.error));
|
|
53
|
+
else
|
|
54
|
+
lines.push('Xyra completed the turn without returning message text.');
|
|
55
|
+
return lines.join('\n');
|
|
56
|
+
}
|
|
57
|
+
function chatExitCode(result) {
|
|
58
|
+
if (approvalReference(result))
|
|
59
|
+
return 2;
|
|
60
|
+
return result.outcome === 'completed' ? 0 : 1;
|
|
61
|
+
}
|
|
62
|
+
/** A finished 4xx answer is a refusal. Unresolved is only for uncertain delivery. */
|
|
63
|
+
function confirmedRefusal(error) {
|
|
64
|
+
return error instanceof CliError_1.CliError
|
|
65
|
+
&& typeof error.httpStatus === 'number'
|
|
66
|
+
&& error.httpStatus >= 400
|
|
67
|
+
&& error.httpStatus < 500;
|
|
68
|
+
}
|
|
69
|
+
async function createOwnedConversation(client, title) {
|
|
70
|
+
const clientRequestId = (0, crypto_1.randomUUID)();
|
|
71
|
+
try {
|
|
72
|
+
return await client.createConversation(title, clientRequestId);
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
if (confirmedRefusal(error))
|
|
76
|
+
throw error;
|
|
77
|
+
const receipt = await client.findConversationCreation(clientRequestId).catch(() => null);
|
|
78
|
+
if (receipt) {
|
|
79
|
+
return {
|
|
80
|
+
id: receipt.conversationId,
|
|
81
|
+
title: title ?? 'New Conversation',
|
|
82
|
+
titleSource: 'recovered',
|
|
83
|
+
createdAt: receipt.createdAt,
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.ChatRequestFailed, `Conversation creation is unresolved (${clientRequestId}). Another conversation was not created.`, `Check request ${clientRequestId} before trying again. Do not start a replacement conversation while it is unresolved.`);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
async function runChatStart(config, writer, options = {}) {
|
|
90
|
+
const client = await createClient(config);
|
|
91
|
+
const conversation = await (0, latency_1.measureLatencyPhase)('chat.conversation_create', () => createOwnedConversation(client, options.title));
|
|
92
|
+
if (options.json) {
|
|
93
|
+
writer.out((0, formatters_1.toJson)(conversation));
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
writer.out(`Conversation created: ${conversation.id}`);
|
|
97
|
+
writer.out(`Title: ${conversation.title}`);
|
|
98
|
+
}
|
|
99
|
+
return 0;
|
|
100
|
+
}
|
|
101
|
+
async function runChatSend(config, writer, messageParts, options = {}) {
|
|
102
|
+
const message = collapseMessage(messageParts);
|
|
103
|
+
const locale = (0, runtimeChatClient_1.parseRuntimeLocale)(options.locale);
|
|
104
|
+
const client = await createClient(config);
|
|
105
|
+
let conversationId = typeof options.conversation === 'string' ? options.conversation.trim() : '';
|
|
106
|
+
let createdConversation;
|
|
107
|
+
if (!conversationId) {
|
|
108
|
+
if (!options.new) {
|
|
109
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'Chat send requires --conversation <id> unless --new is supplied.', "Use 'xyra chat start' first, or run 'xyra chat send --new \"your message\"'.");
|
|
110
|
+
}
|
|
111
|
+
createdConversation = await (0, latency_1.measureLatencyPhase)('chat.conversation_create', () => createOwnedConversation(client, options.title));
|
|
112
|
+
conversationId = createdConversation.id;
|
|
113
|
+
}
|
|
114
|
+
const renderChunksLive = !options.json && typeof writer.write === 'function';
|
|
115
|
+
const result = await (0, latency_1.measureLatencyPhase)('chat.send', () => client.sendMessage({
|
|
116
|
+
conversationId,
|
|
117
|
+
message,
|
|
118
|
+
locale,
|
|
119
|
+
}, {
|
|
120
|
+
...(renderChunksLive ? { onChunk: (content) => writer.write(content) } : {}),
|
|
121
|
+
}));
|
|
122
|
+
if (options.json) {
|
|
123
|
+
writer.out((0, formatters_1.toJson)({
|
|
124
|
+
...(createdConversation ? { conversation: createdConversation } : {}),
|
|
125
|
+
result,
|
|
126
|
+
}));
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
if (createdConversation)
|
|
130
|
+
writer.err(`Conversation: ${createdConversation.id}`);
|
|
131
|
+
if (approvalReference(result)) {
|
|
132
|
+
writer.err(formatPendingApproval(result));
|
|
133
|
+
}
|
|
134
|
+
else if (renderChunksLive && result.chunkCount > 0) {
|
|
135
|
+
writer.write('\n');
|
|
136
|
+
if (result.outcome !== 'completed' && result.error !== undefined)
|
|
137
|
+
writer.err((0, formatters_1.toJson)(result.error));
|
|
138
|
+
}
|
|
139
|
+
else {
|
|
140
|
+
writer.out(formatChatResult(result));
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
return chatExitCode(result);
|
|
144
|
+
}
|
|
145
|
+
//# sourceMappingURL=chat.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/login.js
CHANGED
|
@@ -15,6 +15,7 @@ const oauthClient_2 = require("../auth/oauthClient");
|
|
|
15
15
|
*/
|
|
16
16
|
async function runLogin(config, writer, options = {}) {
|
|
17
17
|
const env = config.getActiveEnvironment();
|
|
18
|
+
(0, session_1.accountKey)(env, options.session);
|
|
18
19
|
const scopes = [...env.scopes];
|
|
19
20
|
const pkce = (0, pkce_1.createPkcePair)();
|
|
20
21
|
const state = (0, pkce_1.createState)();
|
|
@@ -55,12 +56,14 @@ async function runLogin(config, writer, options = {}) {
|
|
|
55
56
|
});
|
|
56
57
|
const token = (0, oauthClient_1.toStoredToken)(tokenResponse);
|
|
57
58
|
const store = await (0, tokenStore_1.createTokenStore)();
|
|
58
|
-
await
|
|
59
|
+
await (0, session_1.saveSessionToken)(env, store, token, options.session);
|
|
59
60
|
const claims = (0, oauthClient_2.decodeJwtClaims)(token.accessToken);
|
|
60
61
|
const subject = claims.sub ?? '(unknown)';
|
|
61
62
|
writer.err(`Signed in as ${subject} [${token.subjectType}] on '${env.name}'.`);
|
|
62
63
|
writer.err(`Granted scope: ${token.scope ?? scopes.join(' ')}`);
|
|
63
64
|
writer.err(`Tokens stored in: ${store.backend}`);
|
|
65
|
+
if (options.session !== undefined)
|
|
66
|
+
writer.err(`Session: ${options.session}`);
|
|
64
67
|
return 0;
|
|
65
68
|
}
|
|
66
69
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,9 @@ const session_1 = require("../auth/session");
|
|
|
8
8
|
const CliError_1 = require("../errors/CliError");
|
|
9
9
|
const mcpClient_1 = require("../mcp/mcpClient");
|
|
10
10
|
const version_1 = require("../version");
|
|
11
|
+
const latency_1 = require("../diagnostics/latency");
|
|
11
12
|
const XYRA_CONFIRMATION_EXTENSION = 'com.experiture.xyra.confirmations';
|
|
13
|
+
const XYRA_CHAT_EXTENSION = 'com.experiture.xyra.chat';
|
|
12
14
|
function mapConnectionError(error, mcpUrl) {
|
|
13
15
|
const message = error instanceof Error ? error.message : String(error);
|
|
14
16
|
if (/401|unauthori[sz]ed|invalid_token/i.test(message)) {
|
|
@@ -20,20 +22,28 @@ function mapConnectionError(error, mcpUrl) {
|
|
|
20
22
|
* Run one command inside a complete SDK-managed MCP session. Session ids are
|
|
21
23
|
* memory-only and are terminated before process exit.
|
|
22
24
|
*/
|
|
23
|
-
async function withMcpClient(config, writer, action) {
|
|
25
|
+
async function withMcpClient(config, writer, action, context = {}) {
|
|
24
26
|
const env = config.getActiveEnvironment();
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
+
const token = await (0, latency_1.measureLatencyPhase)('auth.token_load', async () => {
|
|
28
|
+
const store = await (0, tokenStore_1.createTokenStore)();
|
|
29
|
+
const loaded = await (0, session_1.getValidToken)(env, store, context.sessionName);
|
|
30
|
+
context.validateToken?.(loaded);
|
|
31
|
+
return loaded;
|
|
32
|
+
});
|
|
27
33
|
const rawCapture = new mcpClient_1.McpRawResponseCapture();
|
|
28
34
|
const sdk = new index_js_1.Client({ name: 'xyra-cli', version: version_1.CLI_VERSION }, {
|
|
29
35
|
capabilities: {
|
|
30
36
|
experimental: {
|
|
31
37
|
[XYRA_CONFIRMATION_EXTENSION]: { supportedVersions: [1] },
|
|
38
|
+
[XYRA_CHAT_EXTENSION]: { supportedVersions: [1] },
|
|
32
39
|
},
|
|
33
40
|
},
|
|
34
41
|
});
|
|
35
42
|
const sdkFetch = async (input, init) => {
|
|
36
|
-
const
|
|
43
|
+
const headers = new Headers(init?.headers);
|
|
44
|
+
(0, latency_1.getLatencyDiagnostics)()?.injectTraceHeaders(headers);
|
|
45
|
+
const response = await fetch(input, { ...init, headers });
|
|
46
|
+
(0, latency_1.getLatencyDiagnostics)()?.observeResponseHeaders(response.headers);
|
|
37
47
|
await rawCapture.observe(response);
|
|
38
48
|
return response;
|
|
39
49
|
};
|
|
@@ -42,7 +52,7 @@ async function withMcpClient(config, writer, action) {
|
|
|
42
52
|
fetch: sdkFetch,
|
|
43
53
|
});
|
|
44
54
|
try {
|
|
45
|
-
await sdk.connect(transport);
|
|
55
|
+
await (0, latency_1.measureLatencyPhase)('mcp.connect', () => sdk.connect(transport));
|
|
46
56
|
}
|
|
47
57
|
catch (error) {
|
|
48
58
|
await sdk.close().catch(() => undefined);
|
|
@@ -53,7 +63,7 @@ async function withMcpClient(config, writer, action) {
|
|
|
53
63
|
}
|
|
54
64
|
finally {
|
|
55
65
|
try {
|
|
56
|
-
await transport.terminateSession();
|
|
66
|
+
await (0, latency_1.measureLatencyPhase)('mcp.session_terminate', () => transport.terminateSession());
|
|
57
67
|
}
|
|
58
68
|
catch (error) {
|
|
59
69
|
writer.err(`Warning: MCP session termination failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpContext.js","sourceRoot":"","sources":["../../src/commands/mcpContext.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"mcpContext.js","sourceRoot":"","sources":["../../src/commands/mcpContext.ts"],"names":[],"mappings":";;AA8BA,sCAyDC;AAvFD,wEAAmE;AACnE,0FAAmG;AAEnG,mDAAwE;AACxE,6CAAgD;AAChD,iDAA6D;AAE7D,gDAAoE;AACpE,wCAAyC;AACzC,oDAAoF;AAEpF,MAAM,2BAA2B,GAAG,mCAAmC,CAAC;AACxE,MAAM,mBAAmB,GAAG,0BAA0B,CAAC;AAEvD,SAAS,kBAAkB,CAAC,KAAc,EAAE,MAAc;IACxD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,IAAI,oCAAoC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACvD,OAAO,IAAI,mBAAQ,CACjB,wBAAa,CAAC,iBAAiB,EAC/B,2CAA2C,EAC3C,4DAA4D,CAC7D,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,mBAAQ,CAAC,wBAAa,CAAC,gBAAgB,EAAE,qCAAqC,MAAM,GAAG,EAAE,OAAO,CAAC,CAAC;AAC/G,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa,CACjC,MAAmB,EACnB,MAAoB,EACpB,MAAyC,EACzC,UAAkF,EAAE;IAEpF,MAAM,GAAG,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,IAAA,6BAAmB,EAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;QACpE,MAAM,KAAK,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAa,EAAC,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,OAAO,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC;QAChC,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,IAAI,iCAAqB,EAAE,CAAC;IAC/C,MAAM,GAAG,GAAG,IAAI,iBAAM,CACpB,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,qBAAW,EAAE,EAC1C;QACE,YAAY,EAAE;YACZ,YAAY,EAAE;gBACZ,CAAC,2BAA2B,CAAC,EAAE,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE;gBACzD,CAAC,mBAAmB,CAAC,EAAE,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE;aAClD;SACF;KACF,CACF,CAAC;IACF,MAAM,QAAQ,GAAiB,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAA,+BAAqB,GAAE,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,IAAA,+BAAqB,GAAE,EAAE,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACnC,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,iDAA6B,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QACvE,WAAW,EAAE,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE;QAC1E,KAAK,EAAE,QAAQ;KAChB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,IAAA,6BAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,IAAI,qBAAS,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IACjE,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YACH,MAAM,IAAA,6BAAmB,EAAC,uBAAuB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACzF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,4CAA4C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,MAAM,CAAC,GAAG,CAAC,0CAA0C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACjH,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
package/dist/commands/session.js
CHANGED
|
@@ -24,11 +24,12 @@ function stringArrayClaim(claims, name) {
|
|
|
24
24
|
return typeof value === 'string' && value.trim().length > 0 ? [value.trim()] : [];
|
|
25
25
|
}
|
|
26
26
|
/** Build a human-safe local projection of the active JWT; never includes token material or permissions. */
|
|
27
|
-
function buildWhoamiSummary(env, token, claims, tokenStore) {
|
|
27
|
+
function buildWhoamiSummary(env, token, claims, tokenStore, session) {
|
|
28
28
|
const subjectType = token.subjectType;
|
|
29
29
|
const clientId = stringClaim(claims, 'client_id', 'azp') ?? env.clientId;
|
|
30
30
|
return {
|
|
31
31
|
environment: env.name,
|
|
32
|
+
...(session === undefined ? {} : { session }),
|
|
32
33
|
subject: stringClaim(claims, 'sub', 'user_id'),
|
|
33
34
|
subjectType,
|
|
34
35
|
name: subjectType === 'client'
|
|
@@ -55,6 +56,8 @@ function formatWhoamiSummary(summary) {
|
|
|
55
56
|
`Tenant : ${summary.tenantId ?? '(none)'}`,
|
|
56
57
|
`Product : ${summary.productId ?? '(none)'}`,
|
|
57
58
|
];
|
|
59
|
+
if (summary.session !== undefined)
|
|
60
|
+
lines.splice(1, 0, `Session : ${summary.session}`);
|
|
58
61
|
if (summary.editionId)
|
|
59
62
|
lines.push(`Edition : ${summary.editionId}`);
|
|
60
63
|
if (summary.roles.length > 0)
|
|
@@ -63,20 +66,22 @@ function formatWhoamiSummary(summary) {
|
|
|
63
66
|
return lines;
|
|
64
67
|
}
|
|
65
68
|
/** `xyra logout` — delete the stored token for the active environment. */
|
|
66
|
-
async function runLogout(config, writer) {
|
|
69
|
+
async function runLogout(config, writer, options = {}) {
|
|
67
70
|
const env = config.getActiveEnvironment();
|
|
71
|
+
(0, session_1.accountKey)(env, options.session);
|
|
68
72
|
const store = await (0, tokenStore_1.createTokenStore)();
|
|
69
|
-
await
|
|
70
|
-
|
|
73
|
+
await (0, session_1.deleteSessionToken)(env, store, options.session);
|
|
74
|
+
const label = options.session === undefined ? `'${env.name}'` : `'${env.name}' session '${options.session}'`;
|
|
75
|
+
writer.err(`Signed out of ${label}. Token removed from ${store.backend}.`);
|
|
71
76
|
return 0;
|
|
72
77
|
}
|
|
73
78
|
/** `xyra whoami` — show current identity and login-scope metadata without ever printing the token. */
|
|
74
79
|
async function runWhoami(config, writer, options = {}) {
|
|
75
80
|
const env = config.getActiveEnvironment();
|
|
76
81
|
const store = await (0, tokenStore_1.createTokenStore)();
|
|
77
|
-
const token = await (0, session_1.getValidToken)(env, store);
|
|
82
|
+
const token = await (0, session_1.getValidToken)(env, store, options.session);
|
|
78
83
|
const claims = (0, oauthClient_1.decodeJwtClaims)(token.accessToken);
|
|
79
|
-
const summary = buildWhoamiSummary(env, token, claims, store.backend);
|
|
84
|
+
const summary = buildWhoamiSummary(env, token, claims, store.backend, options.session);
|
|
80
85
|
if (options.json) {
|
|
81
86
|
writer.out((0, formatters_1.toJson)(summary));
|
|
82
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/commands/session.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/commands/session.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/tools.js
CHANGED
|
@@ -115,7 +115,7 @@ function describeServerChallenge(challenge, toolKey) {
|
|
|
115
115
|
const toolDisplayName = typeof request?.toolDisplayName === 'string' && request.toolDisplayName.trim()
|
|
116
116
|
? request.toolDisplayName.trim()
|
|
117
117
|
: toolKey;
|
|
118
|
-
const lines = [`The server requires confirmation before running '${toolDisplayName}'
|
|
118
|
+
const lines = [`The server requires confirmation before running '${toolDisplayName}'.`];
|
|
119
119
|
if (request) {
|
|
120
120
|
if (typeof request.riskLevel === 'string')
|
|
121
121
|
lines.push(`Risk level: ${request.riskLevel}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/commands/tools.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/commands/tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,22 @@ function requireHttpsOrTest(name, url) {
|
|
|
22
22
|
throw new CliError_1.CliError(CliError_1.CliErrorCodes.ConfigInvalid, `Environment '${name}' must use https (got ${parsed.protocol}//${parsed.host}).`);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
+
function requireHttpOrigin(name, url) {
|
|
26
|
+
let parsed;
|
|
27
|
+
try {
|
|
28
|
+
parsed = new URL(url);
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.ConfigInvalid, `Environment '${name}' has an invalid URL: ${url}`);
|
|
32
|
+
}
|
|
33
|
+
const isLocalhost = parsed.hostname === 'localhost' || parsed.hostname === '127.0.0.1';
|
|
34
|
+
const isTestDomain = parsed.hostname.endsWith('.test');
|
|
35
|
+
const allowedProtocol = parsed.protocol === 'https:' || (parsed.protocol === 'http:' && (isLocalhost || isTestDomain));
|
|
36
|
+
if (!allowedProtocol || parsed.username || parsed.password || parsed.search || parsed.hash
|
|
37
|
+
|| (parsed.pathname !== '/' && parsed.pathname !== '')) {
|
|
38
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.ConfigInvalid, `Environment '${name}' must be an HTTP(S) origin without credentials, path, query, or fragment.`);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
25
41
|
function validateEnvironment(env) {
|
|
26
42
|
for (const [field, url] of [
|
|
27
43
|
['mcpUrl', env.mcpUrl],
|
|
@@ -33,6 +49,10 @@ function validateEnvironment(env) {
|
|
|
33
49
|
}
|
|
34
50
|
requireHttpsOrTest(`${env.name}.${field}`, url);
|
|
35
51
|
}
|
|
52
|
+
if (!env.orchestratorUrl) {
|
|
53
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.ConfigInvalid, `Environment '${env.name}' is missing orchestratorUrl.`);
|
|
54
|
+
}
|
|
55
|
+
requireHttpOrigin(`${env.name}.orchestratorUrl`, env.orchestratorUrl);
|
|
36
56
|
if (!env.clientId) {
|
|
37
57
|
throw new CliError_1.CliError(CliError_1.CliErrorCodes.ConfigInvalid, `Environment '${env.name}' is missing clientId.`);
|
|
38
58
|
}
|
|
@@ -63,7 +83,11 @@ class ConfigStore {
|
|
|
63
83
|
}
|
|
64
84
|
// Merge built-in defaults so new default envs appear without a rewrite,
|
|
65
85
|
// but user-defined overrides win.
|
|
66
|
-
const environments = { ...environments_1.DEFAULT_ENVIRONMENTS, ...(raw.environments ?? {}) }
|
|
86
|
+
const environments = Object.fromEntries(Object.entries({ ...environments_1.DEFAULT_ENVIRONMENTS, ...(raw.environments ?? {}) })
|
|
87
|
+
.map(([name, env]) => [
|
|
88
|
+
name,
|
|
89
|
+
environments_1.DEFAULT_ENVIRONMENTS[name] ? { ...environments_1.DEFAULT_ENVIRONMENTS[name], ...env } : env,
|
|
90
|
+
]));
|
|
67
91
|
const activeEnvironment = this.activeEnvironmentOverride ?? raw.activeEnvironment ?? environments_1.DEFAULT_ENVIRONMENT_NAME;
|
|
68
92
|
return { activeEnvironment, environments };
|
|
69
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configStore.js","sourceRoot":"","sources":["../../src/config/configStore.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"configStore.js","sourceRoot":"","sources":["../../src/config/configStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ exports.DEFAULT_ENVIRONMENTS = {
|
|
|
5
5
|
dev: {
|
|
6
6
|
name: 'dev',
|
|
7
7
|
mcpUrl: 'https://mcp.dev.experiture.ai/mcp',
|
|
8
|
+
orchestratorUrl: 'https://orchestrator.dev.experiture.ai',
|
|
8
9
|
oauthResource: 'https://mcp.dev.experiture.ai/mcp',
|
|
9
10
|
authorizationEndpoint: 'https://dev.app.experiture.ai/api/auth/oauth/authorize',
|
|
10
11
|
tokenEndpoint: 'https://dev.app.experiture.ai/api/auth/oauth/token',
|
|
@@ -12,9 +13,21 @@ exports.DEFAULT_ENVIRONMENTS = {
|
|
|
12
13
|
redirectPath: '/callback/QYfSVwRg9okE',
|
|
13
14
|
scopes: ['openid', 'profile', 'email', 'offline_access'],
|
|
14
15
|
},
|
|
16
|
+
staging: {
|
|
17
|
+
name: 'staging',
|
|
18
|
+
mcpUrl: 'https://mcp.staging.experiture.ai/mcp',
|
|
19
|
+
orchestratorUrl: 'https://app.experiture.ai',
|
|
20
|
+
oauthResource: 'https://mcp.staging.experiture.ai/mcp',
|
|
21
|
+
authorizationEndpoint: 'https://app.experiture.ai/api/auth/oauth/authorize',
|
|
22
|
+
tokenEndpoint: 'https://app.experiture.ai/api/auth/oauth/token',
|
|
23
|
+
clientId: 'experiture-xyra-mcp-delegated',
|
|
24
|
+
redirectPath: '/callback/QYfSVwRg9okE',
|
|
25
|
+
scopes: ['openid', 'profile', 'email', 'offline_access'],
|
|
26
|
+
},
|
|
15
27
|
local: {
|
|
16
28
|
name: 'local',
|
|
17
29
|
mcpUrl: 'https://app.experiture.test/mcp',
|
|
30
|
+
orchestratorUrl: 'http://localhost:8000',
|
|
18
31
|
oauthResource: 'https://mcp.dev.experiture.ai/mcp',
|
|
19
32
|
authorizationEndpoint: 'https://app.experiture.test/api/auth/oauth/authorize',
|
|
20
33
|
tokenEndpoint: 'https://app.experiture.test/api/auth/oauth/token',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environments.js","sourceRoot":"","sources":["../../src/config/environments.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"environments.js","sourceRoot":"","sources":["../../src/config/environments.ts"],"names":[],"mappings":";;;AAuBa,QAAA,oBAAoB,GAAoC;IACnE,GAAG,EAAE;QACH,IAAI,EAAE,KAAK;QACX,MAAM,EAAE,mCAAmC;QAC3C,eAAe,EAAE,wCAAwC;QACzD,aAAa,EAAE,mCAAmC;QAClD,qBAAqB,EAAE,wDAAwD;QAC/E,aAAa,EAAE,oDAAoD;QACnE,QAAQ,EAAE,+BAA+B;QACzC,YAAY,EAAE,wBAAwB;QACtC,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,CAAC;KACzD;IACD,OAAO,EAAE;QACP,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,uCAAuC;QAC/C,eAAe,EAAE,2BAA2B;QAC5C,aAAa,EAAE,uCAAuC;QACtD,qBAAqB,EAAE,oDAAoD;QAC3E,aAAa,EAAE,gDAAgD;QAC/D,QAAQ,EAAE,+BAA+B;QACzC,YAAY,EAAE,wBAAwB;QACtC,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,CAAC;KACzD;IACD,KAAK,EAAE;QACL,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,iCAAiC;QACzC,eAAe,EAAE,uBAAuB;QACxC,aAAa,EAAE,mCAAmC;QAClD,qBAAqB,EAAE,sDAAsD;QAC7E,aAAa,EAAE,kDAAkD;QACjE,QAAQ,EAAE,+BAA+B;QACzC,YAAY,EAAE,wBAAwB;QACtC,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,gBAAgB,CAAC;KACzD;CACF,CAAC;AAEW,QAAA,wBAAwB,GAAG,KAAK,CAAC"}
|