@experiture/xyra-cli 0.6.1 → 0.6.4

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.
@@ -1,8 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.runChatAttention = runChatAttention;
3
+ exports.createClient = createClient;
4
4
  exports.runChatStart = runChatStart;
5
5
  exports.runChatSend = runChatSend;
6
+ exports.runChatResume = runChatResume;
7
+ exports.runChatStop = runChatStop;
6
8
  const crypto_1 = require("crypto");
7
9
  const tokenStore_1 = require("../auth/tokenStore");
8
10
  const session_1 = require("../auth/session");
@@ -10,6 +12,28 @@ const latency_1 = require("../diagnostics/latency");
10
12
  const CliError_1 = require("../errors/CliError");
11
13
  const formatters_1 = require("../output/formatters");
12
14
  const runtimeChatClient_1 = require("../chat/runtimeChatClient");
15
+ function savedEntityOutput(writer) {
16
+ const shown = new Set();
17
+ return operation => {
18
+ for (const result of operation.results)
19
+ for (const action of result.presentation.recordActions) {
20
+ const destination = action.destination;
21
+ const key = `${operation.operationId}:${result.resultId}:${action.actionId}`;
22
+ if (shown.has(key) || destination?.status !== 'resolved')
23
+ continue;
24
+ shown.add(key);
25
+ writer.out(`Saved: ${action.label}\n${destination.relativePath}`);
26
+ }
27
+ };
28
+ }
29
+ function selectedWorkflow(options) {
30
+ if (options.execution === undefined && options.revision === undefined)
31
+ return undefined;
32
+ const revision = Number(options.revision), executionId = options.execution?.trim();
33
+ if (!executionId || !Number.isSafeInteger(revision) || revision < 1)
34
+ throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'Selecting paused work requires both --execution and a positive whole-number --revision.');
35
+ return { executionId, revision };
36
+ }
13
37
  function collapseMessage(parts) {
14
38
  const text = Array.isArray(parts) ? parts.join(' ') : parts;
15
39
  const trimmed = text.trim();
@@ -22,11 +46,10 @@ async function createClient(config) {
22
46
  const env = config.getActiveEnvironment();
23
47
  if (env.accessPurpose === 'administration')
24
48
  throw new CliError_1.CliError(CliError_1.CliErrorCodes.InsufficientScope, 'Administration is metadata maintenance, not runtime chat or paid execution.');
25
- const token = await (0, latency_1.measureLatencyPhase)('auth.token_load', async () => {
26
- const store = await (0, tokenStore_1.createTokenStore)();
27
- return (0, session_1.getValidToken)(env, store);
28
- });
29
- return new runtimeChatClient_1.XyraRuntimeChatClient(env, token.accessToken);
49
+ const store = await (0, tokenStore_1.createTokenStore)();
50
+ const resolveToken = () => (0, session_1.getValidToken)(env, store, config.getSessionName());
51
+ const token = await (0, latency_1.measureLatencyPhase)('auth.token_load', resolveToken);
52
+ return new runtimeChatClient_1.XyraRuntimeChatClient(env, token.accessToken, fetch, resolveToken);
30
53
  }
31
54
  function approvalReference(result) {
32
55
  return result.pendingHumanApproval?.confirmation.id;
@@ -45,22 +68,37 @@ function formatPendingApproval(result) {
45
68
  }
46
69
  return lines.join('\n');
47
70
  }
71
+ /** The owner has already validated these findings; render them without choosing a repair or retry. */
72
+ function formatContinuationRequirements(result) {
73
+ const findings = new Set();
74
+ for (const continuation of result.continuations ?? []) {
75
+ for (const issue of continuation.requirements?.unmet ?? []) {
76
+ findings.add(`${issue.path}: ${issue.explanation}`);
77
+ }
78
+ }
79
+ const actionable = (result.continuations ?? []).filter(reference => reference.correction || reference.proposal);
80
+ if (!findings.size && !actionable.length)
81
+ return undefined;
82
+ const continuationRequestId = result.continuationObservation?.clientRequestId ?? result.clientRequestId;
83
+ const controls = actionable.flatMap(reference => {
84
+ const target = `--conversation ${result.conversationId} --request ${continuationRequestId} --execution ${reference.executionId} --revision ${reference.revision}`;
85
+ return [...(reference.correction?.attempts ?? []).map(attempt => `Tried: ${attempt.reason}`),
86
+ ...(reference.correction ? [`Keep fixing: xyra chat resume ${target} [--guidance \"your guidance\"]`] : []),
87
+ ...(reference.proposal ? [`Review: xyra chat proposal ${target} --step ${reference.proposal.stepKey}`] : []),
88
+ `Stop: xyra chat stop ${target}`];
89
+ });
90
+ return ['Further work needs attention:', ...[...findings].map(finding => `- ${finding}`), ...controls].join('\n');
91
+ }
48
92
  function formatChatResult(result) {
49
93
  if (approvalReference(result))
50
94
  return formatPendingApproval(result);
51
95
  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
- }
60
96
  if (result.message)
61
97
  lines.push(result.message);
62
98
  else if (result.error !== undefined)
63
99
  lines.push((0, formatters_1.toJson)(result.error));
100
+ else if (formatContinuationRequirements(result))
101
+ lines.push('Further work is waiting.');
64
102
  else
65
103
  lines.push('Xyra completed the turn without returning message text.');
66
104
  return lines.join('\n');
@@ -68,8 +106,6 @@ function formatChatResult(result) {
68
106
  function chatExitCode(result) {
69
107
  if (approvalReference(result))
70
108
  return 2;
71
- if (result.waiting || result.outcome === 'waiting')
72
- return 0;
73
109
  return result.outcome === 'completed' ? 0 : 1;
74
110
  }
75
111
  /** A finished 4xx answer is a refusal. Unresolved is only for uncertain delivery. */
@@ -99,23 +135,6 @@ async function createOwnedConversation(client, title) {
99
135
  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.`);
100
136
  }
101
137
  }
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
- }
119
138
  async function runChatStart(config, writer, options = {}) {
120
139
  const client = await createClient(config);
121
140
  const conversation = await (0, latency_1.measureLatencyPhase)('chat.conversation_create', () => createOwnedConversation(client, options.title));
@@ -128,6 +147,35 @@ async function runChatStart(config, writer, options = {}) {
128
147
  }
129
148
  return 0;
130
149
  }
150
+ /** Ctrl-C is an explicit Stop; transport loss alone remains an observation gap. */
151
+ async function withChatStop(client, identity, writer, work) {
152
+ const controller = new AbortController();
153
+ let stopping;
154
+ const stop = () => {
155
+ if (stopping)
156
+ return;
157
+ writer.err('Stopping the current work…');
158
+ stopping = client.cancelMessage(identity.conversationId, identity.clientRequestId).then(result => {
159
+ writer.err(result.status === 'accepted' ? 'Stop accepted. Saved work is preserved.' : result.status === 'completion_pending'
160
+ ? 'The saved result is already committed; its outcome is being preserved.' : 'No active work was found to stop.');
161
+ }).catch(() => { writer.err('Stop could not be confirmed. Use the original conversation and request IDs to check the work.'); })
162
+ .finally(() => controller.abort());
163
+ };
164
+ process.on('SIGINT', stop);
165
+ try {
166
+ const result = await work(controller.signal);
167
+ return stopping ? undefined : result;
168
+ }
169
+ catch (error) {
170
+ if (!stopping)
171
+ throw error;
172
+ return undefined;
173
+ }
174
+ finally {
175
+ process.off('SIGINT', stop);
176
+ await stopping;
177
+ }
178
+ }
131
179
  async function runChatSend(config, writer, messageParts, options = {}) {
132
180
  const message = collapseMessage(messageParts);
133
181
  const locale = (0, runtimeChatClient_1.parseRuntimeLocale)(options.locale);
@@ -142,13 +190,31 @@ async function runChatSend(config, writer, messageParts, options = {}) {
142
190
  conversationId = createdConversation.id;
143
191
  }
144
192
  const renderChunksLive = !options.json && typeof writer.write === 'function';
145
- const result = await (0, latency_1.measureLatencyPhase)('chat.send', () => client.sendMessage({
193
+ let savedResultShown = false;
194
+ const clientRequestId = (0, crypto_1.randomUUID)();
195
+ const result = await withChatStop(client, { conversationId, clientRequestId }, writer, signal => (0, latency_1.measureLatencyPhase)('chat.send', () => client.sendMessage({
146
196
  conversationId,
197
+ clientRequestId,
147
198
  message,
148
199
  locale,
149
200
  }, {
201
+ signal,
202
+ onAccepted: identity => { writer.err(`Conversation: ${identity.conversationId}\nRequest: ${identity.clientRequestId}`); },
203
+ ...(!options.json ? { onContentOperation: savedEntityOutput(writer) } : {}),
150
204
  ...(renderChunksLive ? { onChunk: (content) => writer.write(content) } : {}),
151
- }));
205
+ ...(options.waitBackground ? { waitBackground: true, onSavedResult: (saved) => {
206
+ if (options.json)
207
+ writer.err(saved.message ?? 'The main request completed.');
208
+ else if (renderChunksLive && saved.chunkCount > 0)
209
+ writer.write('\n');
210
+ else
211
+ writer.out(formatChatResult(saved));
212
+ writer.err('Following the saved reply’s background work.');
213
+ savedResultShown = true;
214
+ } } : {}),
215
+ })));
216
+ if (!result)
217
+ return 130;
152
218
  if (options.json) {
153
219
  writer.out((0, formatters_1.toJson)({
154
220
  ...(createdConversation ? { conversation: createdConversation } : {}),
@@ -156,11 +222,13 @@ async function runChatSend(config, writer, messageParts, options = {}) {
156
222
  }));
157
223
  }
158
224
  else {
159
- if (createdConversation)
160
- writer.err(`Conversation: ${createdConversation.id}`);
161
225
  if (approvalReference(result)) {
162
226
  writer.err(formatPendingApproval(result));
163
227
  }
228
+ else if (savedResultShown) {
229
+ if (result.background)
230
+ writer.err(`Background observation: ${result.background.observation}.${result.background.error ? ` ${result.background.error}` : ''}`);
231
+ }
164
232
  else if (renderChunksLive && result.chunkCount > 0) {
165
233
  writer.write('\n');
166
234
  if (result.outcome !== 'completed' && result.error !== undefined)
@@ -170,6 +238,60 @@ async function runChatSend(config, writer, messageParts, options = {}) {
170
238
  writer.out(formatChatResult(result));
171
239
  }
172
240
  }
241
+ if (!options.json) {
242
+ const requirements = formatContinuationRequirements(result);
243
+ if (requirements)
244
+ writer.err(requirements);
245
+ }
173
246
  return chatExitCode(result);
174
247
  }
248
+ async function runChatResume(config, writer, options) {
249
+ const conversationId = options.conversation?.trim(), clientRequestId = options.request?.trim();
250
+ if (!conversationId || !clientRequestId)
251
+ throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'Resuming requires the original conversation and request IDs.');
252
+ const workflow = selectedWorkflow(options);
253
+ const client = await createClient(config);
254
+ let shown = false;
255
+ writer.err(`Conversation: ${conversationId}\nRequest: ${clientRequestId}`);
256
+ const result = await withChatStop(client, { conversationId, clientRequestId }, writer, signal => client.resumeMessage(conversationId, clientRequestId, {
257
+ signal, continueCorrection: true, ...(options.guidance !== undefined ? { guidance: options.guidance } : {}),
258
+ ...(workflow ? { workflow } : {}),
259
+ ...(!options.json ? { onContentOperation: savedEntityOutput(writer) } : {}),
260
+ ...(options.waitBackground ? { waitBackground: true, onSavedResult: (saved) => {
261
+ if (options.json)
262
+ writer.err(formatChatResult(saved));
263
+ else
264
+ writer.out(formatChatResult(saved));
265
+ writer.err('Following the saved reply’s background work.');
266
+ shown = true;
267
+ } } : {}),
268
+ }));
269
+ if (!result)
270
+ return 130;
271
+ if (options.json)
272
+ writer.out((0, formatters_1.toJson)({ result }));
273
+ else if (!shown)
274
+ writer.out(formatChatResult(result));
275
+ else if (result.background)
276
+ writer.err(`Background observation: ${result.background.observation}.`);
277
+ if (!options.json) {
278
+ const requirements = formatContinuationRequirements(result);
279
+ if (requirements)
280
+ writer.err(requirements);
281
+ }
282
+ return chatExitCode(result);
283
+ }
284
+ /** Explicit Stop uses the existing owner cancellation boundary. Saved content is retained. */
285
+ async function runChatStop(config, writer, options) {
286
+ const conversationId = options.conversation?.trim(), clientRequestId = options.request?.trim();
287
+ if (!conversationId || !clientRequestId)
288
+ throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'Stopping requires the original conversation and request IDs.');
289
+ const workflow = selectedWorkflow(options);
290
+ const result = await (await createClient(config)).cancelMessage(conversationId, clientRequestId, workflow);
291
+ if (options.json)
292
+ writer.out((0, formatters_1.toJson)(result));
293
+ else
294
+ writer.out('Stop requested. Saved content and retained history are kept; canceled work is not resumed.');
295
+ return 0;
296
+ }
175
297
  //# sourceMappingURL=chat.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"chat.js","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"chat.js","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":";;AAmEA,oCAQC;AAyFD,oCAcC;AAsBD,kCAqEC;AAED,sCA0BC;AAGD,kCAOC;AAnTD,mCAAoC;AAGpC,mDAAsD;AACtD,6CAAgD;AAChD,oDAA6D;AAC7D,iDAA6D;AAC7D,qDAA8C;AAC9C,iEAKmC;AAEnC,SAAS,iBAAiB,CAAC,MAAmB;IAC5C,MAAM,KAAK,GAAC,IAAI,GAAG,EAAU,CAAC;IAC9B,OAAO,SAAS,CAAA,EAAE;QAAC,KAAI,MAAM,MAAM,IAAI,SAAS,CAAC,OAAO;YAAC,KAAI,MAAM,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,aAAa,EAAC,CAAC;gBAC9G,MAAM,WAAW,GAAC,MAAM,CAAC,WAAW,CAAC;gBACrC,MAAM,GAAG,GAAC,GAAG,SAAS,CAAC,WAAW,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAC3E,IAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAE,WAAW,EAAE,MAAM,KAAG,UAAU;oBAAC,SAAS;gBAC7D,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,UAAU,MAAM,CAAC,KAAK,KAAK,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC;YACpE,CAAC;IAAA,CAAC,CAAC;AACL,CAAC;AA0BD,SAAS,gBAAgB,CAAC,OAA0B;IAClD,IAAG,OAAO,CAAC,SAAS,KAAG,SAAS,IAAE,OAAO,CAAC,QAAQ,KAAG,SAAS;QAAC,OAAO,SAAS,CAAC;IAChF,MAAM,QAAQ,GAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC,WAAW,GAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IAC9E,IAAG,CAAC,WAAW,IAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAE,QAAQ,GAAC,CAAC;QAAC,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,gBAAgB,EAC5G,yFAAyF,CAAC,CAAC;IAC7F,OAAO,EAAC,WAAW,EAAC,QAAQ,EAAC,CAAC;AAChC,CAAC;AAED,SAAS,eAAe,CAAC,KAAwB;IAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC5D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,gBAAgB,EAAE,+BAA+B,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,MAAmB;IACpD,MAAM,GAAG,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAC1C,IAAG,GAAG,CAAC,aAAa,KAAG,gBAAgB;QAAC,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,iBAAiB,EACxF,6EAA6E,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,MAAM,IAAA,6BAAgB,GAAE,CAAC;IACvC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,IAAA,uBAAa,EAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,MAAM,IAAA,6BAAmB,EAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;IACzE,OAAO,IAAI,yCAAqB,CAAC,GAAG,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAyB;IAClD,OAAO,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAC,EAAE,CAAC;AACtD,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAyB;IACtD,MAAM,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,CAAC,mCAAmC,CAAC,CAAC;IACpD,IAAI,MAAM,CAAC,OAAO;QAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,EAAE,EAAE,CAAC;QACP,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAC9B,KAAK,CAAC,IAAI,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,sGAAsG;AACtG,SAAS,8BAA8B,CAAC,MAAyB;IAC/D,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,aAAa,IAAI,EAAE,EAAE,CAAC;QACtD,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE,EAAE,CAAC;YAC3D,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IACD,MAAM,UAAU,GAAC,CAAC,MAAM,CAAC,aAAa,IAAE,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAA,EAAE,CAAA,SAAS,CAAC,UAAU,IAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IACxG,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAE,CAAC,UAAU,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IACzD,MAAM,qBAAqB,GAAC,MAAM,CAAC,uBAAuB,EAAE,eAAe,IAAE,MAAM,CAAC,eAAe,CAAC;IACpG,MAAM,QAAQ,GAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAA,EAAE;QAC3C,MAAM,MAAM,GAAC,kBAAkB,MAAM,CAAC,cAAc,cAAc,qBAAqB,gBAAgB,SAAS,CAAC,WAAW,eAAe,SAAS,CAAC,QAAQ,EAAE,CAAC;QAChK,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,IAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA,EAAE,CAAA,UAAU,OAAO,CAAC,MAAM,EAAE,CAAC;YACtF,GAAG,CAAC,SAAS,CAAC,UAAU,CAAA,CAAC,CAAA,CAAC,iCAAiC,MAAM,iCAAiC,CAAC,CAAA,CAAC,CAAA,EAAE,CAAC;YACvG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAA,CAAC,CAAA,CAAC,8BAA8B,MAAM,WAAW,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA,CAAC,CAAA,EAAE,CAAC;YACxG,wBAAwB,MAAM,EAAE,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,+BAA+B,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,OAAO,EAAE,CAAC,EAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACnH,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAyB;IACjD,IAAI,iBAAiB,CAAC,MAAM,CAAC;QAAE,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACpE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,MAAM,CAAC,OAAO;QAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAC1C,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;SACjE,IAAI,8BAA8B,CAAC,MAAM,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;;QACnF,KAAK,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;IAC3E,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,YAAY,CAAC,MAAyB;IAC7C,IAAI,iBAAiB,CAAC,MAAM,CAAC;QAAE,OAAO,CAAC,CAAC;IACxC,OAAO,MAAM,CAAC,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,qFAAqF;AACrF,SAAS,gBAAgB,CAAC,KAAc;IACtC,OAAO,KAAK,YAAY,mBAAQ;WAC3B,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ;WACpC,KAAK,CAAC,UAAU,IAAI,GAAG;WACvB,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC;AAC9B,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,MAA6B,EAC7B,KAAc;IAEd,MAAM,eAAe,GAAG,IAAA,mBAAU,GAAE,CAAC;IACrC,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,gBAAgB,CAAC,KAAK,CAAC;YAAE,MAAM,KAAK,CAAC;QACzC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACzF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,EAAE,EAAE,OAAO,CAAC,cAAc;gBAC1B,KAAK,EAAE,KAAK,IAAI,kBAAkB;gBAClC,WAAW,EAAE,WAAW;gBACxB,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,mBAAQ,CAChB,wBAAa,CAAC,iBAAiB,EAC/B,wCAAwC,eAAe,0CAA0C,EACjG,iBAAiB,eAAe,uFAAuF,CACxH,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,MAAmB,EACnB,MAAoB,EACpB,UAA4B,EAAE;IAE9B,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,IAAA,6BAAmB,EAAC,0BAA0B,EAAE,GAAG,EAAE,CAAC,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IACjI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,CAAC,GAAG,CAAC,IAAA,mBAAM,EAAC,YAAY,CAAC,CAAC,CAAC;IACnC,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,GAAG,CAAC,yBAAyB,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QACvD,MAAM,CAAC,GAAG,CAAC,UAAU,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,mFAAmF;AACnF,KAAK,UAAU,YAAY,CAAI,MAA4B,EAAE,QAAuD,EAClH,MAAmB,EAAE,IAAqC;IAC1D,MAAM,UAAU,GAAC,IAAI,eAAe,EAAE,CAAC;IACvC,IAAI,QAAgC,CAAC;IACrC,MAAM,IAAI,GAAC,GAAE,EAAE;QACb,IAAG,QAAQ;YAAC,OAAO;QACnB,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QACzC,QAAQ,GAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,cAAc,EAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,MAAM,CAAA,EAAE;YAC3F,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,KAAG,UAAU,CAAA,CAAC,CAAA,yCAAyC,CAAA,CAAC,CAAA,MAAM,CAAC,MAAM,KAAG,oBAAoB;gBAClH,CAAC,CAAA,wEAAwE,CAAA,CAAC,CAAA,mCAAmC,CAAC,CAAC;QACnH,CAAC,CAAC,CAAC,KAAK,CAAC,GAAE,EAAE,GAAC,MAAM,CAAC,GAAG,CAAC,+FAA+F,CAAC,CAAC,CAAA,CAAC,CAAC;aACzH,OAAO,CAAC,GAAE,EAAE,CAAA,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;IACrC,CAAC,CAAC;IACF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,CAAC;QAAA,MAAM,MAAM,GAAC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAAA,OAAO,QAAQ,CAAA,CAAC,CAAA,SAAS,CAAA,CAAC,CAAA,MAAM,CAAC;IAAA,CAAC;IAClF,OAAM,KAAK,EAAC,CAAC;QAAA,IAAG,CAAC,QAAQ;YAAC,MAAM,KAAK,CAAC;QAAA,OAAO,SAAS,CAAC;IAAA,CAAC;YAChD,CAAC;QAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAC,IAAI,CAAC,CAAC;QAAA,MAAM,QAAQ,CAAC;IAAA,CAAC;AACtD,CAAC;AAEM,KAAK,UAAU,WAAW,CAC/B,MAAmB,EACnB,MAAoB,EACpB,YAA+B,EAC/B,UAA2B,EAAE;IAE7B,MAAM,OAAO,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAA,sCAAkB,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,cAAc,GAAG,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjG,IAAI,mBAAiG,CAAC;IAEtG,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;YACjB,MAAM,IAAI,mBAAQ,CAChB,wBAAa,CAAC,gBAAgB,EAC9B,kEAAkE,EAClE,8EAA8E,CAC/E,CAAC;QACJ,CAAC;QACD,mBAAmB,GAAG,MAAM,IAAA,6BAAmB,EAAC,0BAA0B,EAAE,GAAG,EAAE,CAAC,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAClI,cAAc,GAAG,mBAAmB,CAAC,EAAE,CAAC;IAC1C,CAAC;IAED,MAAM,gBAAgB,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,UAAU,CAAC;IAC7E,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,MAAM,eAAe,GAAG,IAAA,mBAAU,GAAE,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,EAAC,EAAC,cAAc,EAAC,eAAe,EAAC,EAAC,MAAM,EAAC,MAAM,CAAC,EAAE,CAAC,IAAA,6BAAmB,EAAC,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC;QACnJ,cAAc;QACd,eAAe;QACf,OAAO;QACP,MAAM;KACP,EAAE;QACD,MAAM;QACN,UAAU,EAAE,QAAQ,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,iBAAiB,QAAQ,CAAC,cAAc,cAAc,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;QACzH,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,kBAAkB,EAAC,iBAAiB,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,MAAM,CAAC,KAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrF,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,KAAwB,EAAE,EAAE;gBAC/F,IAAI,OAAO,CAAC,IAAI;oBAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,6BAA6B,CAAC,CAAC;qBACxE,IAAI,gBAAgB,IAAI,KAAK,CAAC,UAAU,GAAG,CAAC;oBAAE,MAAM,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC;;oBAClE,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;gBACzC,MAAM,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;gBAC3D,gBAAgB,GAAG,IAAI,CAAC;YAC1B,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACV,CAAC,CAAC,CAAC,CAAC;IACL,IAAI,CAAC,MAAM;QAAE,OAAO,GAAG,CAAC;IAExB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,CAAC,GAAG,CAAC,IAAA,mBAAM,EAAC;YAChB,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrE,MAAM;SACP,CAAC,CAAC,CAAC;IACN,CAAC;SAAM,CAAC;QACN,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,gBAAgB,EAAE,CAAC;YAC5B,IAAI,MAAM,CAAC,UAAU;gBAAE,MAAM,CAAC,GAAG,CAAC,2BAA2B,MAAM,CAAC,UAAU,CAAC,WAAW,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAChK,CAAC;aAAM,IAAI,gBAAgB,IAAI,MAAM,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;YACrD,MAAM,CAAC,KAAM,CAAC,IAAI,CAAC,CAAC;YACpB,IAAI,MAAM,CAAC,OAAO,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS;gBAAE,MAAM,CAAC,GAAG,CAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACrG,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,YAAY,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC;QAC5D,IAAI,YAAY;YAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,MAAmB,EAAE,MAAoB,EAAE,OAA0B;IACvG,MAAM,cAAc,GAAC,OAAO,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,eAAe,GAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3F,IAAI,CAAC,cAAc,IAAI,CAAC,eAAe;QAAE,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,gBAAgB,EACxF,8DAA8D,CAAC,CAAC;IAClE,MAAM,QAAQ,GAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,MAAM,GAAC,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,KAAK,GAAC,KAAK,CAAC;IAChB,MAAM,CAAC,GAAG,CAAC,iBAAiB,cAAc,cAAc,eAAe,EAAE,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAC,MAAM,YAAY,CAAC,MAAM,EAAC,EAAC,cAAc,EAAC,eAAe,EAAC,EAAC,MAAM,EAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,EAAC,eAAe,EAAC;QAC3I,MAAM,EAAC,kBAAkB,EAAC,IAAI,EAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAG,SAAS,CAAA,CAAC,CAAA,EAAC,QAAQ,EAAC,OAAO,CAAC,QAAQ,EAAC,CAAA,CAAC,CAAA,EAAE,CAAC;QAC/F,GAAG,CAAC,QAAQ,CAAA,CAAC,CAAA,EAAC,QAAQ,EAAC,CAAA,CAAC,CAAA,EAAE,CAAC;QAC3B,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAA,CAAC,CAAA,EAAC,kBAAkB,EAAC,iBAAiB,CAAC,MAAM,CAAC,EAAC,CAAA,CAAC,CAAA,EAAE,CAAC;QACpE,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAC,cAAc,EAAC,IAAI,EAAC,aAAa,EAAC,CAAC,KAAuB,EAAC,EAAE;gBACzF,IAAG,OAAO,CAAC,IAAI;oBAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;;oBAAK,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC7F,MAAM,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;gBAAA,KAAK,GAAC,IAAI,CAAC;YACxE,CAAC,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACT,CAAC,CAAC,CAAC;IACJ,IAAG,CAAC,MAAM;QAAC,OAAO,GAAG,CAAC;IACtB,IAAG,OAAO,CAAC,IAAI;QAAC,MAAM,CAAC,GAAG,CAAC,IAAA,mBAAM,EAAC,EAAC,MAAM,EAAC,CAAC,CAAC,CAAC;SACxC,IAAG,CAAC,KAAK;QAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;SAC/C,IAAG,MAAM,CAAC,UAAU;QAAC,MAAM,CAAC,GAAG,CAAC,2BAA2B,MAAM,CAAC,UAAU,CAAC,WAAW,GAAG,CAAC,CAAC;IAClG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,YAAY,GAAG,8BAA8B,CAAC,MAAM,CAAC,CAAC;QAC5D,IAAI,YAAY;YAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,8FAA8F;AACvF,KAAK,UAAU,WAAW,CAAC,MAAkB,EAAC,MAAmB,EAAC,OAAyB;IACjG,MAAM,cAAc,GAAC,OAAO,CAAC,YAAY,EAAE,IAAI,EAAE,EAAC,eAAe,GAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1F,IAAG,CAAC,cAAc,IAAE,CAAC,eAAe;QAAC,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,gBAAgB,EAAC,8DAA8D,CAAC,CAAC;IACvJ,MAAM,QAAQ,GAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,MAAM,GAAC,MAAM,CAAC,MAAM,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,cAAc,EAAC,eAAe,EAAC,QAAQ,CAAC,CAAC;IACvG,IAAG,OAAO,CAAC,IAAI;QAAC,MAAM,CAAC,GAAG,CAAC,IAAA,mBAAM,EAAC,MAAM,CAAC,CAAC,CAAC;;QAAK,MAAM,CAAC,GAAG,CAAC,4FAA4F,CAAC,CAAC;IACzJ,OAAO,CAAC,CAAC;AACV,CAAC"}
@@ -17,7 +17,7 @@ async function runLogin(config, writer, options = {}) {
17
17
  const env = config.getActiveEnvironment();
18
18
  const session = options.session ?? config.getSessionName?.();
19
19
  (0, session_1.accountKey)(env, session);
20
- const scopes = [...env.scopes];
20
+ const scopes = await (0, oauthClient_1.discoverLoginScopes)(env, options.scope?.split(/\s+/).filter(Boolean));
21
21
  const pkce = (0, pkce_1.createPkcePair)();
22
22
  const state = (0, pkce_1.createState)();
23
23
  const listener = new loopbackServer_1.LoopbackListener(env.redirectPath, state);
@@ -28,19 +28,19 @@ async function runLogin(config, writer, options = {}) {
28
28
  codeChallenge: pkce.codeChallenge,
29
29
  scopes,
30
30
  });
31
- writer.err(`Signing in to '${env.name}' (${scopes.join(' ')}).`);
31
+ writer.err(`Signing in to '${env.name}'.`);
32
32
  if (options.noBrowser) {
33
- writer.err('Open this URL in your browser to continue:');
33
+ writer.err("Open this URL in your browser to continue:");
34
34
  writer.out(authorizeUrl);
35
35
  }
36
36
  else {
37
37
  const opened = (0, browser_1.openBrowser)(authorizeUrl);
38
38
  if (!opened) {
39
- writer.err('Could not launch a browser. Open this URL manually:');
39
+ writer.err("Could not launch a browser. Open this URL manually:");
40
40
  writer.out(authorizeUrl);
41
41
  }
42
42
  else {
43
- writer.err('A browser window was opened to complete authentication.');
43
+ writer.err("A browser window was opened to complete authentication.");
44
44
  }
45
45
  }
46
46
  let code;
@@ -59,9 +59,9 @@ async function runLogin(config, writer, options = {}) {
59
59
  const store = await (0, tokenStore_1.createTokenStore)();
60
60
  await (0, session_1.saveSessionToken)(env, store, token, session);
61
61
  const claims = (0, oauthClient_2.decodeJwtClaims)(token.accessToken);
62
- const subject = claims.sub ?? '(unknown)';
62
+ const subject = claims.sub ?? "(unknown)";
63
63
  writer.err(`Signed in as ${subject} [${token.subjectType}] on '${env.name}'.`);
64
- writer.err(`Granted scope: ${token.scope ?? scopes.join(' ')}`);
64
+ writer.err(`Granted scope: ${token.scope ?? scopes.join(" ")}`);
65
65
  writer.err(`Tokens stored in: ${store.backend}`);
66
66
  if (session !== undefined)
67
67
  writer.err(`Session: ${session}`);
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
@@ -24,8 +24,8 @@ function mapConnectionError(error, mcpUrl) {
24
24
  */
25
25
  async function withMcpClient(config, writer, action, context = {}) {
26
26
  const env = config.getActiveEnvironment();
27
- const token = await (0, latency_1.measureLatencyPhase)('auth.token_load', async () => {
28
- const store = await (0, tokenStore_1.createTokenStore)();
27
+ const store = await (0, tokenStore_1.createTokenStore)();
28
+ const initialToken = await (0, latency_1.measureLatencyPhase)('auth.token_load', async () => {
29
29
  const loaded = await (0, session_1.getValidToken)(env, store, context.sessionName ?? config.getSessionName?.());
30
30
  context.validateToken?.(loaded);
31
31
  return loaded;
@@ -40,7 +40,10 @@ async function withMcpClient(config, writer, action, context = {}) {
40
40
  },
41
41
  });
42
42
  const sdkFetch = async (input, init) => {
43
+ const current = await (0, session_1.getValidToken)(env, store, context.sessionName ?? config.getSessionName?.());
44
+ context.validateToken?.(current);
43
45
  const headers = new Headers(init?.headers);
46
+ headers.set("authorization", `Bearer ${current.accessToken}`);
44
47
  (0, latency_1.getLatencyDiagnostics)()?.injectTraceHeaders(headers);
45
48
  const response = await fetch(input, { ...init, headers });
46
49
  (0, latency_1.getLatencyDiagnostics)()?.observeResponseHeaders(response.headers);
@@ -48,7 +51,6 @@ async function withMcpClient(config, writer, action, context = {}) {
48
51
  return response;
49
52
  };
50
53
  const transport = new streamableHttp_js_1.StreamableHTTPClientTransport(new URL(env.mcpUrl), {
51
- requestInit: { headers: { authorization: `Bearer ${token.accessToken}` } },
52
54
  fetch: sdkFetch,
53
55
  });
54
56
  try {
@@ -58,10 +60,34 @@ async function withMcpClient(config, writer, action, context = {}) {
58
60
  await sdk.close().catch(() => undefined);
59
61
  throw mapConnectionError(error, env.mcpUrl);
60
62
  }
63
+ let renewalTimer;
64
+ let stopped = false;
65
+ const scheduleRenewal = (token) => {
66
+ const expiry = token.accessTokenExpiresAt ?? token.expiresAt;
67
+ if (!Number.isFinite(expiry) || stopped)
68
+ return;
69
+ renewalTimer = setTimeout(async () => {
70
+ try {
71
+ const current = await (0, session_1.getValidToken)(env, store, context.sessionName ?? config.getSessionName?.());
72
+ context.validateToken?.(current);
73
+ await sdk.ping();
74
+ scheduleRenewal(current);
75
+ }
76
+ catch (error) {
77
+ if (!stopped)
78
+ writer.err(`Connection renewal needs attention: ${error instanceof Error ? error.message : String(error)}`);
79
+ }
80
+ }, Math.max(1, Math.min(expiry - Date.now(), 2_147_483_647)));
81
+ renewalTimer.unref?.();
82
+ };
83
+ scheduleRenewal(initialToken);
61
84
  try {
62
85
  return await action(new mcpClient_1.McpClient(sdk, transport, rawCapture, env.administrationTarget));
63
86
  }
64
87
  finally {
88
+ stopped = true;
89
+ if (renewalTimer)
90
+ clearTimeout(renewalTimer);
65
91
  try {
66
92
  await (0, latency_1.measureLatencyPhase)('mcp.session_terminate', () => transport.terminateSession());
67
93
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mcpContext.js","sourceRoot":"","sources":["../../src/commands/mcpContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mcpContext.js","sourceRoot":"","sources":["../../src/commands/mcpContext.ts"],"names":[],"mappings":"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"}
@@ -4,14 +4,15 @@ exports.buildWhoamiSummary = buildWhoamiSummary;
4
4
  exports.formatWhoamiSummary = formatWhoamiSummary;
5
5
  exports.runLogout = runLogout;
6
6
  exports.runWhoami = runWhoami;
7
+ const oauthClient_1 = require("../auth/oauthClient");
7
8
  const tokenStore_1 = require("../auth/tokenStore");
8
9
  const session_1 = require("../auth/session");
9
- const oauthClient_1 = require("../auth/oauthClient");
10
+ const oauthClient_2 = require("../auth/oauthClient");
10
11
  const formatters_1 = require("../output/formatters");
11
12
  function stringClaim(claims, ...names) {
12
13
  for (const name of names) {
13
14
  const value = claims[name];
14
- if (typeof value === 'string' && value.trim().length > 0)
15
+ if (typeof value === "string" && value.trim().length > 0)
15
16
  return value.trim();
16
17
  }
17
18
  return null;
@@ -19,50 +20,52 @@ function stringClaim(claims, ...names) {
19
20
  function stringArrayClaim(claims, name) {
20
21
  const value = claims[name];
21
22
  if (Array.isArray(value)) {
22
- return value.filter((item) => typeof item === 'string' && item.trim().length > 0);
23
+ return value.filter((item) => typeof item === "string" && item.trim().length > 0);
23
24
  }
24
- return typeof value === 'string' && value.trim().length > 0 ? [value.trim()] : [];
25
+ return typeof value === "string" && value.trim().length > 0
26
+ ? [value.trim()]
27
+ : [];
25
28
  }
26
29
  /** Build a human-safe local projection of the active JWT; never includes token material or permissions. */
27
30
  function buildWhoamiSummary(env, token, claims, tokenStore, session) {
28
31
  const subjectType = token.subjectType;
29
- const clientId = stringClaim(claims, 'client_id', 'azp') ?? env.clientId;
32
+ const clientId = stringClaim(claims, "client_id", "azp") ?? env.clientId;
30
33
  return {
31
34
  environment: env.name,
32
35
  ...(session === undefined ? {} : { session }),
33
- subject: stringClaim(claims, 'sub', 'user_id'),
36
+ subject: stringClaim(claims, "sub", "user_id"),
34
37
  subjectType,
35
- name: subjectType === 'client'
36
- ? stringClaim(claims, 'client_name')
37
- : stringClaim(claims, 'name'),
38
- email: stringClaim(claims, 'email'),
39
- tenantId: stringClaim(claims, 'tenant_id', 'tenantId'),
40
- productId: stringClaim(claims, 'resource_product_id', 'product_id', 'productId'),
41
- editionId: stringClaim(claims, 'edition_id', 'editionId'),
42
- roles: stringArrayClaim(claims, 'roles'),
38
+ name: subjectType === "client"
39
+ ? stringClaim(claims, "client_name")
40
+ : stringClaim(claims, "name"),
41
+ email: stringClaim(claims, "email"),
42
+ tenantId: stringClaim(claims, "tenant_id", "tenantId"),
43
+ productId: stringClaim(claims, "resource_product_id", "product_id", "productId"),
44
+ editionId: stringClaim(claims, "edition_id", "editionId"),
45
+ roles: stringArrayClaim(claims, "roles"),
43
46
  clientId,
44
- scope: token.scope ?? stringClaim(claims, 'scope'),
47
+ scope: token.scope ?? stringClaim(claims, "scope"),
45
48
  expiresAt: new Date(token.expiresAt).toISOString(),
46
49
  tokenStore,
47
50
  };
48
51
  }
49
52
  function formatWhoamiSummary(summary) {
50
- const identity = summary.name ?? summary.email ?? summary.subject ?? '(unknown)';
51
- const identitySuffix = summary.email && summary.name ? ` <${summary.email}>` : '';
52
- const identityKind = summary.subjectType === 'user' ? 'delegated user' : 'machine client';
53
+ const identity = summary.name ?? summary.email ?? summary.subject ?? "(unknown)";
54
+ const identitySuffix = summary.email && summary.name ? ` <${summary.email}>` : "";
55
+ const identityKind = summary.subjectType === "user" ? "delegated user" : "machine client";
53
56
  const lines = [
54
57
  `Environment : ${summary.environment}`,
55
58
  `Signed in as: ${identity}${identitySuffix} [${identityKind}]`,
56
- `Tenant : ${summary.tenantId ?? '(none)'}`,
57
- `Product : ${summary.productId ?? '(none)'}`,
59
+ `Tenant : ${summary.tenantId ?? "(none)"}`,
60
+ `Product : ${summary.productId ?? "(none)"}`,
58
61
  ];
59
62
  if (summary.session !== undefined)
60
63
  lines.splice(1, 0, `Session : ${summary.session}`);
61
64
  if (summary.editionId)
62
65
  lines.push(`Edition : ${summary.editionId}`);
63
66
  if (summary.roles.length > 0)
64
- lines.push(`Roles : ${summary.roles.join(', ')}`);
65
- lines.push(`OAuth client: ${summary.clientId}`, `Subject ID : ${summary.subject ?? '(unknown)'}`, `Login scopes: ${summary.scope ?? '(unknown)'}`, `Expires : ${summary.expiresAt}`, `Token store : ${summary.tokenStore}`);
67
+ lines.push(`Roles : ${summary.roles.join(", ")}`);
68
+ lines.push(`OAuth client: ${summary.clientId}`, `Subject ID : ${summary.subject ?? "(unknown)"}`, `Login scopes: ${summary.scope ?? "(unknown)"}`, `Expires : ${summary.expiresAt}`, `Token store : ${summary.tokenStore}`);
66
69
  return lines;
67
70
  }
68
71
  /** `xyra logout` — delete the stored token for the active environment. */
@@ -71,8 +74,13 @@ async function runLogout(config, writer, options = {}) {
71
74
  const session = options.session ?? config.getSessionName?.();
72
75
  (0, session_1.accountKey)(env, session);
73
76
  const store = await (0, tokenStore_1.createTokenStore)();
77
+ const token = await store.get((0, session_1.accountKey)(env, session));
78
+ if (token)
79
+ await (0, oauthClient_1.revokeStoredToken)(env, token);
74
80
  await (0, session_1.deleteSessionToken)(env, store, session);
75
- const label = session === undefined ? `'${env.name}'` : `'${env.name}' session '${session}'`;
81
+ const label = session === undefined
82
+ ? `'${env.name}'`
83
+ : `'${env.name}' session '${session}'`;
76
84
  writer.err(`Signed out of ${label}. Token removed from ${store.backend}.`);
77
85
  return 0;
78
86
  }
@@ -82,7 +90,7 @@ async function runWhoami(config, writer, options = {}) {
82
90
  const session = options.session ?? config.getSessionName?.();
83
91
  const store = await (0, tokenStore_1.createTokenStore)();
84
92
  const token = await (0, session_1.getValidToken)(env, store, session);
85
- const claims = (0, oauthClient_1.decodeJwtClaims)(token.accessToken);
93
+ const claims = (0, oauthClient_2.decodeJwtClaims)(token.accessToken);
86
94
  const summary = buildWhoamiSummary(env, token, claims, store.backend, session);
87
95
  if (options.json) {
88
96
  writer.out((0, formatters_1.toJson)(summary));
@@ -1 +1 @@
1
- {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/commands/session.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/commands/session.ts"],"names":[],"mappings":"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"}