@experiture/xyra-cli 0.6.0 → 0.6.1
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/dist/auth/administrationSession.js +25 -0
- package/dist/auth/administrationSession.js.map +1 -0
- package/dist/auth/oauthClient.js +1 -1
- package/dist/auth/oauthClient.js.map +1 -1
- package/dist/auth/session.js +11 -0
- package/dist/auth/session.js.map +1 -1
- package/dist/chat/runtimeChatClient.js +128 -13
- package/dist/chat/runtimeChatClient.js.map +3 -3
- package/dist/commands/chat.js +30 -0
- package/dist/commands/chat.js.map +1 -1
- package/dist/commands/generatedCommandRegistry.js +17 -2
- package/dist/commands/generatedCommandRegistry.js.map +1 -1
- package/dist/commands/login.js +5 -4
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/mcpContext.js +2 -2
- package/dist/commands/mcpContext.js.map +1 -1
- package/dist/commands/session.js +7 -5
- package/dist/commands/session.js.map +1 -1
- package/dist/config/configStore.js +665 -106
- package/dist/config/configStore.js.map +7 -1
- package/dist/config/environments.js.map +1 -1
- package/dist/index.js +36 -22
- package/dist/index.js.map +1 -1
- package/dist/mcp/mcpClient.js +274 -129
- package/dist/mcp/mcpClient.js.map +7 -1
- package/package.json +3 -3
package/dist/commands/chat.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.runChatAttention = runChatAttention;
|
|
3
4
|
exports.runChatStart = runChatStart;
|
|
4
5
|
exports.runChatSend = runChatSend;
|
|
5
6
|
const crypto_1 = require("crypto");
|
|
@@ -19,6 +20,8 @@ function collapseMessage(parts) {
|
|
|
19
20
|
}
|
|
20
21
|
async function createClient(config) {
|
|
21
22
|
const env = config.getActiveEnvironment();
|
|
23
|
+
if (env.accessPurpose === 'administration')
|
|
24
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.InsufficientScope, 'Administration is metadata maintenance, not runtime chat or paid execution.');
|
|
22
25
|
const token = await (0, latency_1.measureLatencyPhase)('auth.token_load', async () => {
|
|
23
26
|
const store = await (0, tokenStore_1.createTokenStore)();
|
|
24
27
|
return (0, session_1.getValidToken)(env, store);
|
|
@@ -46,6 +49,14 @@ function formatChatResult(result) {
|
|
|
46
49
|
if (approvalReference(result))
|
|
47
50
|
return formatPendingApproval(result);
|
|
48
51
|
const lines = [];
|
|
52
|
+
if (result.waiting) {
|
|
53
|
+
lines.push(result.message || 'The same work is still running. Read its status instead of sending it again.');
|
|
54
|
+
lines.push(`Conversation: ${result.conversationId}`);
|
|
55
|
+
lines.push(`Request: ${result.clientRequestId}`);
|
|
56
|
+
lines.push(`Turn: ${result.executionId}`);
|
|
57
|
+
lines.push('Choices: xyra chat attention <keep_waiting|show_ready|see_other_options|stop_waiting|cancel_operation> --conversation <id> --request <clientRequestId> --turn <runtimeTurnId> --epoch <epoch>');
|
|
58
|
+
return lines.join('\n');
|
|
59
|
+
}
|
|
49
60
|
if (result.message)
|
|
50
61
|
lines.push(result.message);
|
|
51
62
|
else if (result.error !== undefined)
|
|
@@ -57,6 +68,8 @@ function formatChatResult(result) {
|
|
|
57
68
|
function chatExitCode(result) {
|
|
58
69
|
if (approvalReference(result))
|
|
59
70
|
return 2;
|
|
71
|
+
if (result.waiting || result.outcome === 'waiting')
|
|
72
|
+
return 0;
|
|
60
73
|
return result.outcome === 'completed' ? 0 : 1;
|
|
61
74
|
}
|
|
62
75
|
/** A finished 4xx answer is a refusal. Unresolved is only for uncertain delivery. */
|
|
@@ -86,6 +99,23 @@ async function createOwnedConversation(client, title) {
|
|
|
86
99
|
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
100
|
}
|
|
88
101
|
}
|
|
102
|
+
async function runChatAttention(config, writer, action, options = {}) {
|
|
103
|
+
const allowed = ['keep_waiting', 'show_ready', 'see_other_options', 'stop_waiting', 'cancel_operation'];
|
|
104
|
+
if (!allowed.includes(action) || !options.conversation || !options.request || !options.turn || !options.epoch) {
|
|
105
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'An attention choice needs the action, conversation, original request, runtime turn, and epoch.', 'Use: xyra chat attention <action> --conversation <id> --request <clientRequestId> --turn <runtimeTurnId> --epoch <epoch>');
|
|
106
|
+
}
|
|
107
|
+
const client = await createClient(config);
|
|
108
|
+
const result = await client.decideAttention({
|
|
109
|
+
conversationId: options.conversation,
|
|
110
|
+
clientRequestId: options.request,
|
|
111
|
+
runtimeTurnId: options.turn,
|
|
112
|
+
epoch: Number(options.epoch),
|
|
113
|
+
action: action,
|
|
114
|
+
locale: (0, runtimeChatClient_1.parseRuntimeLocale)(options.locale),
|
|
115
|
+
});
|
|
116
|
+
writer.out(options.json ? (0, formatters_1.toJson)(result) : 'The choice was sent. Read the turn status before sending the original request again.');
|
|
117
|
+
return 0;
|
|
118
|
+
}
|
|
89
119
|
async function runChatStart(config, writer, options = {}) {
|
|
90
120
|
const client = await createClient(config);
|
|
91
121
|
const conversation = await (0, latency_1.measureLatencyPhase)('chat.conversation_create', () => createOwnedConversation(client, options.title));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,8 +25,22 @@ function extractAliasCandidate(program, argv) {
|
|
|
25
25
|
const raw = argv.slice(2);
|
|
26
26
|
const tokens = [];
|
|
27
27
|
let envOverride;
|
|
28
|
+
let accessPurposeOverride, administrationTargetOverride, sessionNameOverride;
|
|
28
29
|
for (let index = 0; index < raw.length; index += 1) {
|
|
29
30
|
const token = raw[index];
|
|
31
|
+
for (const flag of ['--access-purpose', '--administration-target', '--session']) {
|
|
32
|
+
if (token === flag || token.startsWith(`${flag}=`)) {
|
|
33
|
+
const value = token === flag ? raw[++index] : token.slice(flag.length + 1);
|
|
34
|
+
if (flag === '--access-purpose')
|
|
35
|
+
accessPurposeOverride = value;
|
|
36
|
+
else if (flag === '--session')
|
|
37
|
+
sessionNameOverride = value;
|
|
38
|
+
else
|
|
39
|
+
administrationTargetOverride = value;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (['--access-purpose', '--administration-target', '--session'].some(flag => token === flag || token.startsWith(`${flag}=`)))
|
|
43
|
+
continue;
|
|
30
44
|
if (envOverride === undefined && (token === '--env' || token.startsWith('--env='))) {
|
|
31
45
|
if (token === '--env') {
|
|
32
46
|
envOverride = raw[index + 1];
|
|
@@ -44,7 +58,8 @@ function extractAliasCandidate(program, argv) {
|
|
|
44
58
|
return null;
|
|
45
59
|
if (knownCommandNames(program).has(first))
|
|
46
60
|
return null;
|
|
47
|
-
return { tokens, envOverride }
|
|
61
|
+
return { tokens, envOverride, ...(accessPurposeOverride === undefined ? {} : { accessPurposeOverride }),
|
|
62
|
+
...(administrationTargetOverride === undefined ? {} : { administrationTargetOverride }), ...(sessionNameOverride === undefined ? {} : { sessionNameOverride }) };
|
|
48
63
|
}
|
|
49
64
|
/**
|
|
50
65
|
* Parse argv, first attempting metadata-backed friendly-command resolution for
|
|
@@ -55,7 +70,7 @@ async function parseWithGeneratedCommands(program, argv, writer, deps = {}) {
|
|
|
55
70
|
const candidate = extractAliasCandidate(program, argv);
|
|
56
71
|
if (candidate) {
|
|
57
72
|
try {
|
|
58
|
-
const config = new configStore_1.ConfigStore(undefined, candidate.envOverride);
|
|
73
|
+
const config = new configStore_1.ConfigStore(undefined, candidate.envOverride, candidate.accessPurposeOverride, candidate.administrationTargetOverride, candidate.sessionNameOverride);
|
|
59
74
|
const exitCode = await (0, aliasResolver_1.resolveAliasCommand)(config, writer, candidate.tokens, deps);
|
|
60
75
|
if (exitCode !== null) {
|
|
61
76
|
process.exitCode = exitCode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatedCommandRegistry.js","sourceRoot":"","sources":["../../src/commands/generatedCommandRegistry.ts"],"names":[],"mappings":";;AAgBA,8CAOC;
|
|
1
|
+
{"version":3,"file":"generatedCommandRegistry.js","sourceRoot":"","sources":["../../src/commands/generatedCommandRegistry.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/login.js
CHANGED
|
@@ -15,7 +15,8 @@ const oauthClient_2 = require("../auth/oauthClient");
|
|
|
15
15
|
*/
|
|
16
16
|
async function runLogin(config, writer, options = {}) {
|
|
17
17
|
const env = config.getActiveEnvironment();
|
|
18
|
-
|
|
18
|
+
const session = options.session ?? config.getSessionName?.();
|
|
19
|
+
(0, session_1.accountKey)(env, session);
|
|
19
20
|
const scopes = [...env.scopes];
|
|
20
21
|
const pkce = (0, pkce_1.createPkcePair)();
|
|
21
22
|
const state = (0, pkce_1.createState)();
|
|
@@ -56,14 +57,14 @@ async function runLogin(config, writer, options = {}) {
|
|
|
56
57
|
});
|
|
57
58
|
const token = (0, oauthClient_1.toStoredToken)(tokenResponse);
|
|
58
59
|
const store = await (0, tokenStore_1.createTokenStore)();
|
|
59
|
-
await (0, session_1.saveSessionToken)(env, store, token,
|
|
60
|
+
await (0, session_1.saveSessionToken)(env, store, token, session);
|
|
60
61
|
const claims = (0, oauthClient_2.decodeJwtClaims)(token.accessToken);
|
|
61
62
|
const subject = claims.sub ?? '(unknown)';
|
|
62
63
|
writer.err(`Signed in as ${subject} [${token.subjectType}] on '${env.name}'.`);
|
|
63
64
|
writer.err(`Granted scope: ${token.scope ?? scopes.join(' ')}`);
|
|
64
65
|
writer.err(`Tokens stored in: ${store.backend}`);
|
|
65
|
-
if (
|
|
66
|
-
writer.err(`Session: ${
|
|
66
|
+
if (session !== undefined)
|
|
67
|
+
writer.err(`Session: ${session}`);
|
|
67
68
|
return 0;
|
|
68
69
|
}
|
|
69
70
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":";;AAsBA,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ async function withMcpClient(config, writer, action, context = {}) {
|
|
|
26
26
|
const env = config.getActiveEnvironment();
|
|
27
27
|
const token = await (0, latency_1.measureLatencyPhase)('auth.token_load', async () => {
|
|
28
28
|
const store = await (0, tokenStore_1.createTokenStore)();
|
|
29
|
-
const loaded = await (0, session_1.getValidToken)(env, store, context.sessionName);
|
|
29
|
+
const loaded = await (0, session_1.getValidToken)(env, store, context.sessionName ?? config.getSessionName?.());
|
|
30
30
|
context.validateToken?.(loaded);
|
|
31
31
|
return loaded;
|
|
32
32
|
});
|
|
@@ -59,7 +59,7 @@ async function withMcpClient(config, writer, action, context = {}) {
|
|
|
59
59
|
throw mapConnectionError(error, env.mcpUrl);
|
|
60
60
|
}
|
|
61
61
|
try {
|
|
62
|
-
return await action(new mcpClient_1.McpClient(sdk, transport, rawCapture));
|
|
62
|
+
return await action(new mcpClient_1.McpClient(sdk, transport, rawCapture, env.administrationTarget));
|
|
63
63
|
}
|
|
64
64
|
finally {
|
|
65
65
|
try {
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"mcpContext.js","sourceRoot":"","sources":["../../src/commands/mcpContext.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/session.js
CHANGED
|
@@ -68,20 +68,22 @@ function formatWhoamiSummary(summary) {
|
|
|
68
68
|
/** `xyra logout` — delete the stored token for the active environment. */
|
|
69
69
|
async function runLogout(config, writer, options = {}) {
|
|
70
70
|
const env = config.getActiveEnvironment();
|
|
71
|
-
|
|
71
|
+
const session = options.session ?? config.getSessionName?.();
|
|
72
|
+
(0, session_1.accountKey)(env, session);
|
|
72
73
|
const store = await (0, tokenStore_1.createTokenStore)();
|
|
73
|
-
await (0, session_1.deleteSessionToken)(env, store,
|
|
74
|
-
const label =
|
|
74
|
+
await (0, session_1.deleteSessionToken)(env, store, session);
|
|
75
|
+
const label = session === undefined ? `'${env.name}'` : `'${env.name}' session '${session}'`;
|
|
75
76
|
writer.err(`Signed out of ${label}. Token removed from ${store.backend}.`);
|
|
76
77
|
return 0;
|
|
77
78
|
}
|
|
78
79
|
/** `xyra whoami` — show current identity and login-scope metadata without ever printing the token. */
|
|
79
80
|
async function runWhoami(config, writer, options = {}) {
|
|
80
81
|
const env = config.getActiveEnvironment();
|
|
82
|
+
const session = options.session ?? config.getSessionName?.();
|
|
81
83
|
const store = await (0, tokenStore_1.createTokenStore)();
|
|
82
|
-
const token = await (0, session_1.getValidToken)(env, store,
|
|
84
|
+
const token = await (0, session_1.getValidToken)(env, store, session);
|
|
83
85
|
const claims = (0, oauthClient_1.decodeJwtClaims)(token.accessToken);
|
|
84
|
-
const summary = buildWhoamiSummary(env, token, claims, store.backend,
|
|
86
|
+
const summary = buildWhoamiSummary(env, token, claims, store.backend, session);
|
|
85
87
|
if (options.json) {
|
|
86
88
|
writer.out((0, formatters_1.toJson)(summary));
|
|
87
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/commands/session.ts"],"names":[],"mappings":";;AA2CA,gDA4BC;AAED,kDAuBC;AAGD,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/commands/session.ts"],"names":[],"mappings":"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"}
|