@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.
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.assertTokenPurpose = assertTokenPurpose;
4
+ const oauthClient_1 = require("./oauthClient");
5
+ const CliError_1 = require("../errors/CliError");
6
+ /** Local anti-confusion check only. The resource server verifies JWT/provenance and fresh Auth authority. */
7
+ function assertTokenPurpose(env, token) {
8
+ const claims = (0, oauthClient_1.decodeJwtClaims)(token.accessToken), administrative = env.accessPurpose === 'administration';
9
+ if (!administrative) {
10
+ if (claims.resource_access_purpose === 'administration')
11
+ throw new CliError_1.CliError(CliError_1.CliErrorCodes.InsufficientScope, 'An administration credential cannot bootstrap the runtime.');
12
+ return;
13
+ }
14
+ const audience = claims.aud, validAudience = audience === env.oauthResource || (Array.isArray(audience)
15
+ && audience.length > 0 && audience.every(value => typeof value === 'string') && new Set(audience).size === audience.length && audience.includes(env.oauthResource));
16
+ const subject = claims.sub, client = claims.client_id ?? claims.azp;
17
+ if (token.subjectType !== 'user' || claims.sub_type === 'client' || claims.resource_access_purpose !== 'administration'
18
+ || claims.oauth_resource !== env.oauthResource || claims.resource_product_id !== 'xyra-ai' || !validAudience || client !== env.clientId
19
+ || (claims.client_id !== undefined && claims.azp !== undefined && claims.client_id !== claims.azp)
20
+ || typeof subject !== 'string' || !/^[a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$/i.test(subject)
21
+ || ['runtime_identity', 'runtime_identity_v2', 'license_source_product_id', 'licensed_product_id', 'license_owner_tenant_id',
22
+ 'license_binding_id', 'entitlement_id', 'edition_id', 'host_tenant_id', 'host_user_id'].some(field => claims[field] != null))
23
+ throw new CliError_1.CliError(CliError_1.CliErrorCodes.InsufficientScope, 'The credential does not match this administration client, human, resource or purpose.', 'Sign in using the separately registered Xyra-owned administration CLI profile. Local claims never confer authority.');
24
+ }
25
+ //# sourceMappingURL=administrationSession.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"administrationSession.js","sourceRoot":"","sources":["../../src/auth/administrationSession.ts"],"names":[],"mappings":";;AAMA,gDAkBC;AAtBD,+CAA8C;AAC9C,iDAA0D;AAE1D,6GAA6G;AAC7G,SAAgB,kBAAkB,CAAC,GAAmB,EAAC,KAAiB;IACvE,MAAM,MAAM,GAAC,IAAA,6BAAe,EAAC,KAAK,CAAC,WAAW,CAAC,EAAC,cAAc,GAAC,GAAG,CAAC,aAAa,KAAG,gBAAgB,CAAC;IACpG,IAAG,CAAC,cAAc,EAAC,CAAC;QACnB,IAAG,MAAM,CAAC,uBAAuB,KAAG,gBAAgB;YAAC,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,iBAAiB,EACtG,4DAA4D,CAAC,CAAC;QAC/D,OAAO;IACR,CAAC;IACD,MAAM,QAAQ,GAAC,MAAM,CAAC,GAAG,EAAC,aAAa,GAAC,QAAQ,KAAG,GAAG,CAAC,aAAa,IAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;WAC3F,QAAQ,CAAC,MAAM,GAAC,CAAC,IAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAA,EAAE,CAAA,OAAO,KAAK,KAAG,QAAQ,CAAC,IAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,KAAG,QAAQ,CAAC,MAAM,IAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IACtJ,MAAM,OAAO,GAAC,MAAM,CAAC,GAAG,EAAC,MAAM,GAAC,MAAM,CAAC,SAAS,IAAE,MAAM,CAAC,GAAG,CAAC;IAC7D,IAAG,KAAK,CAAC,WAAW,KAAG,MAAM,IAAE,MAAM,CAAC,QAAQ,KAAG,QAAQ,IAAE,MAAM,CAAC,uBAAuB,KAAG,gBAAgB;WACzG,MAAM,CAAC,cAAc,KAAG,GAAG,CAAC,aAAa,IAAE,MAAM,CAAC,mBAAmB,KAAG,SAAS,IAAE,CAAC,aAAa,IAAE,MAAM,KAAG,GAAG,CAAC,QAAQ;WACxH,CAAC,MAAM,CAAC,SAAS,KAAG,SAAS,IAAE,MAAM,CAAC,GAAG,KAAG,SAAS,IAAE,MAAM,CAAC,SAAS,KAAG,MAAM,CAAC,GAAG,CAAC;WACrF,OAAO,OAAO,KAAG,QAAQ,IAAE,CAAC,4EAA4E,CAAC,IAAI,CAAC,OAAO,CAAC;WACtH,CAAC,kBAAkB,EAAC,qBAAqB,EAAC,2BAA2B,EAAC,qBAAqB,EAAC,yBAAyB;YACtH,oBAAoB,EAAC,gBAAgB,EAAC,YAAY,EAAC,gBAAgB,EAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,CAAA,EAAE,CAAA,MAAM,CAAC,KAAK,CAAC,IAAE,IAAI,CAAC;QACrH,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,iBAAiB,EAAC,uFAAuF,EACzI,qHAAqH,CAAC,CAAC;AAC1H,CAAC"}
@@ -79,7 +79,7 @@ function refreshToken(env, refresh) {
79
79
  });
80
80
  return postToken(env, body);
81
81
  }
82
- /** Decode a JWT payload without verifying (local display only; never trusted for authz). */
82
+ /** Decode untrusted claims for display/anti-confusion only; the resource server owns verification and authority. */
83
83
  function decodeJwtClaims(accessToken) {
84
84
  const parts = accessToken.split('.');
85
85
  if (parts.length !== 3)
@@ -1 +1 @@
1
- {"version":3,"file":"oauthClient.js","sourceRoot":"","sources":["../../src/auth/oauthClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauthClient.js","sourceRoot":"","sources":["../../src/auth/oauthClient.ts"],"names":[],"mappings":"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"}
@@ -11,8 +11,15 @@ const node_fs_1 = require("node:fs");
11
11
  const node_os_1 = require("node:os");
12
12
  const node_path_1 = require("node:path");
13
13
  const latency_1 = require("../diagnostics/latency");
14
+ const administrationSession_1 = require("./administrationSession");
14
15
  /** Named sessions separate concurrent identities; their names confer no authority. */
15
16
  function accountKey(env, sessionName) {
17
+ if (env.accessPurpose === 'administration') {
18
+ if (sessionName !== undefined && !/^[a-z][a-z0-9_-]{0,63}$/.test(sessionName))
19
+ throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'Invalid session name.');
20
+ return `administration:v1:${(0, node_crypto_1.createHash)('sha256').update(JSON.stringify([env.name, sessionName ?? null, env.authorizationEndpoint,
21
+ env.tokenEndpoint, env.oauthResource, env.mcpUrl, env.clientId, env.redirectPath])).digest('hex')}`;
22
+ }
16
23
  if (sessionName === undefined)
17
24
  return `${env.name}:${env.clientId}`;
18
25
  if (!/^[a-z][a-z0-9_-]{0,63}$/.test(sessionName)) {
@@ -101,6 +108,7 @@ async function withSessionLock(account, action) {
101
108
  /** Serialize login replacement with refresh, so an older refresh cannot overwrite it. */
102
109
  async function saveSessionToken(env, store, token, sessionName) {
103
110
  const key = accountKey(env, sessionName);
111
+ (0, administrationSession_1.assertTokenPurpose)(env, token);
104
112
  await withSessionLock(key, () => store.set(key, token));
105
113
  }
106
114
  /** Logout waits for an in-flight refresh before deleting its resulting credential. */
@@ -121,6 +129,7 @@ async function getValidToken(env, store, sessionName) {
121
129
  if (!stored) {
122
130
  throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Not signed in to ${sessionLabel}.`, loginHint);
123
131
  }
132
+ (0, administrationSession_1.assertTokenPurpose)(env, stored);
124
133
  if (Date.now() < stored.expiresAt) {
125
134
  return stored;
126
135
  }
@@ -132,6 +141,7 @@ async function getValidToken(env, store, sessionName) {
132
141
  if (!latest) {
133
142
  throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Not signed in to ${sessionLabel}.`, loginHint);
134
143
  }
144
+ (0, administrationSession_1.assertTokenPurpose)(env, latest);
135
145
  if (Date.now() < latest.expiresAt) {
136
146
  return latest;
137
147
  }
@@ -143,6 +153,7 @@ async function getValidToken(env, store, sessionName) {
143
153
  // a rotated refresh_token; persisting it here is mandatory.
144
154
  if (!refreshed.refreshToken)
145
155
  refreshed.refreshToken = latest.refreshToken;
156
+ (0, administrationSession_1.assertTokenPurpose)(env, refreshed);
146
157
  await store.set(key, refreshed);
147
158
  return refreshed;
148
159
  });
@@ -1 +1 @@
1
- {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"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"}
@@ -42,6 +42,7 @@ var require_evaluation_error_catalog = __commonJS({
42
42
  CATALOG_CONTRACT_INVALID: [400, "Evaluation catalog request needs correction", "The evaluation catalog request is invalid.", "Review the query or draft fields and submit a corrected request."],
43
43
  CATALOG_UNAVAILABLE: [503, "Evaluation catalog unavailable", "The evaluation catalog could not be verified.", "Restore the catalog connection before selecting or publishing evaluation settings."],
44
44
  AUTHORITY_UNAVAILABLE: [503, "Evaluation access unavailable", "Current access to this evaluation could not be verified.", "Restore the connection and refresh the evaluation before continuing."],
45
+ AUDIT_UNAVAILABLE: [503, "Evaluation audit unavailable", "Required evaluation administration audit could not be saved.", "Restore the audit connection before refreshing the selected evaluation."],
45
46
  DRAFT_VERSION_CONFLICT: [409, "Test draft changed", "The test draft changed before this request could be saved.", "Reload the current draft and review its changes before continuing."],
46
47
  DRAFT_EXPIRED: [409, "Test draft expired", "This test draft has expired.", "Create a new draft before publishing."],
47
48
  DRAFT_STATE_INVALID: [409, "Test draft unavailable", "This draft or its test suite no longer allows this change.", "Refresh the suite and select an active draft."],
@@ -543,6 +544,38 @@ var require_errors = __commonJS({
543
544
  }
544
545
  exports2.xyraErrorCatalog = withPresentation({
545
546
  ...evaluation_error_catalog_1.evaluationErrorCatalogV1,
547
+ "XYRA.ADMINISTRATION.AUDIT_UNAVAILABLE": {
548
+ code: "XYRA.ADMINISTRATION.AUDIT_UNAVAILABLE",
549
+ httpStatus: 503,
550
+ publicMessage: "Required administration audit could not be saved.",
551
+ remediation: "Restore the audit connection before reopening the selected definitions.",
552
+ retryable: false,
553
+ presentation: { title: "Administration audit unavailable", severity: "error" },
554
+ detailsEvidence: {
555
+ schema: { type: "object", additionalProperties: false, maxProperties: 0 },
556
+ modelPaths: [],
557
+ userDisclosurePaths: [],
558
+ operatorOnlyPaths: [],
559
+ forbiddenPaths: [],
560
+ maxCanonicalBytes: 2
561
+ }
562
+ },
563
+ "XYRA.MEDIA.AUDIT_UNAVAILABLE": {
564
+ code: "XYRA.MEDIA.AUDIT_UNAVAILABLE",
565
+ httpStatus: 503,
566
+ publicMessage: "Required media administration audit could not be saved.",
567
+ remediation: "Restore the audit connection before reopening the selected media.",
568
+ retryable: false,
569
+ presentation: { title: "Media audit unavailable", severity: "error" },
570
+ detailsEvidence: {
571
+ schema: { type: "object", additionalProperties: false, maxProperties: 0 },
572
+ modelPaths: [],
573
+ userDisclosurePaths: [],
574
+ operatorOnlyPaths: [],
575
+ forbiddenPaths: [],
576
+ maxCanonicalBytes: 2
577
+ }
578
+ },
546
579
  "XYRA.INTERNAL_DELIVERY.CORRECTION_NOT_ADMITTED": {
547
580
  code: "XYRA.INTERNAL_DELIVERY.CORRECTION_NOT_ADMITTED",
548
581
  httpStatus: 409,
@@ -21717,7 +21750,7 @@ function normalizeXyraImageInputs(inputs) {
21717
21750
  });
21718
21751
  }
21719
21752
 
21720
- // node_modules/@experiture/xyra-runtime-client/dist/errors.js
21753
+ // ../../node_modules/@experiture/xyra-runtime-client/dist/errors.js
21721
21754
  var XyraRuntimeClientError = class extends Error {
21722
21755
  kind;
21723
21756
  code;
@@ -21846,7 +21879,7 @@ function normalizeRuntimeError(error) {
21846
21879
  });
21847
21880
  }
21848
21881
 
21849
- // node_modules/@experiture/xyra-runtime-client/dist/turn-protocol-validator.js
21882
+ // ../../node_modules/@experiture/xyra-runtime-client/dist/turn-protocol-validator.js
21850
21883
  function isRecord(value) {
21851
21884
  return typeof value === "object" && value !== null && !Array.isArray(value);
21852
21885
  }
@@ -21870,7 +21903,7 @@ var RUNTIME_ACTIVITY_DETAIL_KINDS = [
21870
21903
  "recovery",
21871
21904
  "response"
21872
21905
  ];
21873
- var ACTIVITY_ID = /^(?:preparing:(?:context|media)|routing:route|routing:capability-handoff:o[1-9][0-9]*|working:solver(?::o[1-9][0-9]*)?|working:recovery|responding:response|working:tool:r[1-9][0-9]*:t[1-9][0-9]*(?::s[1-9][0-9]*:(?:a[1-9][0-9]*|retry:a(?:[2-9]|[1-9][0-9]+)))?|(?:preparing|routing|working|responding):provider-retry:e[1-9][0-9]*:a(?:[2-9]|[1-9][0-9]+))$/;
21906
+ var ACTIVITY_ID = /^(?:preparing:(?:context|media)|routing:route|routing:capability-handoff:o[1-9][0-9]*|working:attention|working:solver(?::o[1-9][0-9]*)?|working:recovery|responding:response|working:tool:r[1-9][0-9]*:t[1-9][0-9]*(?::s[1-9][0-9]*:(?:a[1-9][0-9]*|retry:a(?:[2-9]|[1-9][0-9]+)))?|(?:preparing|routing|working|responding):provider-retry:e[1-9][0-9]*:a(?:[2-9]|[1-9][0-9]+))$/;
21874
21907
  var CONTROL_OR_BIDI = /[\p{Cc}\u061c\u200e\u200f\u202a-\u202e\u2066-\u2069]/u;
21875
21908
  function includes(values, value) {
21876
21909
  return typeof value === "string" && values.includes(value);
@@ -21878,7 +21911,7 @@ function includes(values, value) {
21878
21911
  function runtimeActivityIssue(value) {
21879
21912
  if (!isRecord(value))
21880
21913
  return "activity_detail_shape_invalid";
21881
- if (Object.keys(value).sort().join("|") !== ["activityId", "detail", "displayText", "phase", "schemaVersion", "status", "textSource"].join("|"))
21914
+ if (Object.keys(value).sort().join("|") !== ["activityId", ...value.attention === void 0 ? [] : ["attention"], "detail", "displayText", "phase", "schemaVersion", "status", "textSource"].sort().join("|"))
21882
21915
  return "activity_unexpected_field";
21883
21916
  if (value.schemaVersion !== 2)
21884
21917
  return "activity_schema_version_invalid";
@@ -21899,7 +21932,7 @@ function runtimeActivityIssue(value) {
21899
21932
  if (!includes(RUNTIME_ACTIVITY_DETAIL_KINDS, value.detail.kind))
21900
21933
  return "activity_detail_kind_invalid";
21901
21934
  const identity = value.activityId;
21902
- const expectedKind = identity === "preparing:context" ? "context" : identity === "preparing:media" ? "media" : identity === "routing:route" ? "route" : identity.startsWith("routing:capability-handoff:o") ? "capability_handoff" : identity === "working:solver" || identity.startsWith("working:solver:o") ? "solver" : identity === "working:recovery" ? "recovery" : identity === "responding:response" ? "response" : identity.includes(":provider-retry:") || identity.includes(":retry:") ? "retry" : identity.includes(":s") ? "workflow_step" : "tool";
21935
+ const expectedKind = identity === "preparing:context" ? "context" : identity === "preparing:media" ? "media" : identity === "routing:route" ? "route" : identity.startsWith("routing:capability-handoff:o") ? "capability_handoff" : identity === "working:attention" ? "tool" : identity === "working:solver" || identity.startsWith("working:solver:o") ? "solver" : identity === "working:recovery" ? "recovery" : identity === "responding:response" ? "response" : identity.includes(":provider-retry:") || identity.includes(":retry:") ? "retry" : identity.includes(":s") ? "workflow_step" : "tool";
21903
21936
  if (value.detail.kind !== expectedKind || !identity.startsWith(`${value.phase}:`))
21904
21937
  return "activity_detail_identity_mismatch";
21905
21938
  const bounded = (number, minimum = 0) => typeof number === "number" && Number.isSafeInteger(number) && number >= minimum && number <= 999;
@@ -22021,7 +22054,9 @@ var XyraTurnProtocolValidator = class {
22021
22054
  if (activityIssue)
22022
22055
  this.failProtocol(activityIssue, "Runtime turn emitted an invalid activity payload.", "activity");
22023
22056
  const prior = this.activityLifecycle.get(payload2.activityId);
22024
- if (!prior) {
22057
+ if (payload2.activityId === "working:attention") {
22058
+ this.activityLifecycle.set(payload2.activityId, payload2);
22059
+ } else if (!prior) {
22025
22060
  if (payload2.status !== "started") {
22026
22061
  this.failProtocol("activity_terminal_before_started", "Runtime activity terminal status arrived before started.", "activity");
22027
22062
  }
@@ -22183,7 +22218,7 @@ var XyraTurnProtocolValidator = class {
22183
22218
  }
22184
22219
  };
22185
22220
 
22186
- // node_modules/@experiture/xyra-runtime-client/dist/client.js
22221
+ // ../../node_modules/@experiture/xyra-runtime-client/dist/client.js
22187
22222
  var VOICE_CAPABILITY_LIMIT_KEYS = [
22188
22223
  "maxSessionDurationMs",
22189
22224
  "maxUtteranceDurationMs",
@@ -22289,6 +22324,15 @@ var XyraRuntimeClient = class {
22289
22324
  });
22290
22325
  return this.readSuccessEnvelope(response);
22291
22326
  }
22327
+ async submitTimingAction(submission, options = {}) {
22328
+ const response = await this.executeRequest(`${this.baseUrl}/actions`, {
22329
+ method: "POST",
22330
+ headers: this.buildHeaders(options),
22331
+ body: JSON.stringify(submission),
22332
+ signal: options.signal
22333
+ });
22334
+ return this.readSuccessEnvelope(response);
22335
+ }
22292
22336
  async getHumanApprovalPostureOptions(conversationId, options = {}) {
22293
22337
  const response = await this.submitAction({
22294
22338
  conversationId,
@@ -22431,6 +22475,12 @@ var XyraRuntimeClient = class {
22431
22475
  query.set("query", input.query);
22432
22476
  if (input.productId)
22433
22477
  query.set("productId", input.productId);
22478
+ if (input.kinds?.length)
22479
+ query.set("kinds", input.kinds.join(","));
22480
+ if (input.mimeTypes?.length)
22481
+ query.set("mimeTypes", input.mimeTypes.join(","));
22482
+ if (input.maxBytes !== void 0)
22483
+ query.set("maxBytes", String(input.maxBytes));
22434
22484
  const suffix = query.size > 0 ? `?${query.toString()}` : "";
22435
22485
  const response = await this.executeRequest(`${this.baseUrl}/media/library/items${suffix}`, {
22436
22486
  method: "GET",
@@ -22698,7 +22748,31 @@ var XyraRuntimeClient = class {
22698
22748
  }
22699
22749
  }
22700
22750
  const payload = await this.readSuccessEnvelope(response);
22701
- if (payload.schemaVersion !== 2 || payload.delivery !== "complete-response" || !Array.isArray(payload.events)) {
22751
+ if (payload.schemaVersion !== 2 || payload.delivery !== "complete-response") {
22752
+ throw new XyraRuntimeClientError({
22753
+ kind: "canonical",
22754
+ code: "XYRA.RUNTIME.TURN_PROTOCOL_VIOLATION",
22755
+ message: "Complete HTTP returned an invalid turn representation."
22756
+ });
22757
+ }
22758
+ if (payload.disposition === "waiting") {
22759
+ if (!payload.conversationId || !payload.clientRequestId || !payload.runtimeTurnId || !payload.attention) {
22760
+ throw new XyraRuntimeClientError({
22761
+ kind: "canonical",
22762
+ code: "XYRA.RUNTIME.TURN_PROTOCOL_VIOLATION",
22763
+ message: "Complete HTTP waiting response omitted the accepted turn identity."
22764
+ });
22765
+ }
22766
+ return {
22767
+ disposition: "waiting",
22768
+ reason: payload.reason ?? "observation_window_ended",
22769
+ conversationId: payload.conversationId,
22770
+ clientRequestId: payload.clientRequestId,
22771
+ runtimeTurnId: payload.runtimeTurnId,
22772
+ attention: payload.attention
22773
+ };
22774
+ }
22775
+ if (!Array.isArray(payload.events)) {
22702
22776
  throw new XyraRuntimeClientError({
22703
22777
  kind: "canonical",
22704
22778
  code: "XYRA.RUNTIME.TURN_PROTOCOL_VIOLATION",
@@ -23015,15 +23089,24 @@ var XyraRuntimeChatClient = class {
23015
23089
  let userMessageId;
23016
23090
  let assistantMessageId;
23017
23091
  let outcome;
23092
+ let waiting = false;
23018
23093
  let response;
23019
23094
  let error;
23020
23095
  let message = "";
23021
23096
  let eventCount = 0;
23022
23097
  let chunkCount = 0;
23098
+ const observation = new AbortController();
23099
+ const stopObservation = () => observation.abort(options.signal?.reason);
23100
+ if (options.signal?.aborted) stopObservation();
23101
+ options.signal?.addEventListener("abort", stopObservation, { once: true });
23023
23102
  const captureIdentity = (event) => {
23024
23103
  requestId = event.requestId;
23025
23104
  streamId = event.streamId;
23026
23105
  eventCount += 1;
23106
+ if (event.type === "activity" && isRecord3(event.payload) && event.payload.activityId === "working:attention" && event.payload.status === "waiting_confirmation") {
23107
+ waiting = true;
23108
+ observation.abort();
23109
+ }
23027
23110
  if (event.type === "start" && isRecord3(event.payload)) {
23028
23111
  executionId = typeof event.payload.executionId === "string" ? event.payload.executionId : executionId;
23029
23112
  userMessageId = typeof event.payload.userMessageId === "string" ? event.payload.userMessageId : userMessageId;
@@ -23050,14 +23133,15 @@ var XyraRuntimeChatClient = class {
23050
23133
  },
23051
23134
  onTerminal: (payload) => {
23052
23135
  outcome = payload.outcome;
23136
+ if (isRecord3(payload) && payload.waiting === true) waiting = true;
23053
23137
  }
23054
23138
  }, {
23055
- signal: options.signal,
23139
+ signal: observation.signal,
23056
23140
  headers: { "x-correlation-id": clientRequestId }
23057
23141
  });
23058
- outcome = "completed";
23142
+ if (!waiting) outcome = "completed";
23059
23143
  } catch (cause) {
23060
- if (!outcome) {
23144
+ if (!outcome && !waiting) {
23061
23145
  const runtimeError = runtimeErrorBody(cause);
23062
23146
  throw new CliError(
23063
23147
  CliErrorCodes.ChatRequestFailed,
@@ -23065,7 +23149,9 @@ var XyraRuntimeChatClient = class {
23065
23149
  runtimeError.message ?? "The Orchestrator response ended before a valid terminal event."
23066
23150
  );
23067
23151
  }
23068
- error ??= runtimeErrorBody(cause);
23152
+ if (!waiting) error ??= runtimeErrorBody(cause);
23153
+ } finally {
23154
+ options.signal?.removeEventListener("abort", stopObservation);
23069
23155
  }
23070
23156
  const result = {
23071
23157
  schemaVersion: 1,
@@ -23075,7 +23161,8 @@ var XyraRuntimeChatClient = class {
23075
23161
  executionId: requiredIdentity(executionId, "an execution ID"),
23076
23162
  streamId: requiredIdentity(streamId, "a stream ID"),
23077
23163
  userMessageId: requiredIdentity(userMessageId, "a user message ID"),
23078
- outcome: outcome ?? "interrupted",
23164
+ outcome: waiting ? "waiting" : outcome ?? "interrupted",
23165
+ ...waiting ? { waiting: true } : {},
23079
23166
  ...assistantMessageId ? { assistantMessageId } : {},
23080
23167
  ...message ? { message } : {},
23081
23168
  ...response ? {
@@ -23091,6 +23178,34 @@ var XyraRuntimeChatClient = class {
23091
23178
  };
23092
23179
  return result;
23093
23180
  }
23181
+ async decideAttention(input) {
23182
+ const response = await this.httpFetch(new URL("/api/runtime/actions", this.env.orchestratorUrl), {
23183
+ method: "POST",
23184
+ headers: bearerHeaders(this.accessToken),
23185
+ body: JSON.stringify({
23186
+ conversationId: input.conversationId,
23187
+ surface: "chat",
23188
+ action: {
23189
+ id: input.action,
23190
+ type: `timing.${input.action}`,
23191
+ payload: {
23192
+ clientRequestId: input.clientRequestId,
23193
+ runtimeTurnId: input.runtimeTurnId,
23194
+ attentionEpoch: input.epoch,
23195
+ actionRequestId: (0, import_node_crypto.randomUUID)()
23196
+ }
23197
+ },
23198
+ turn: {
23199
+ schemaVersion: 2,
23200
+ interactionProfile: "text",
23201
+ transportPreference: "http",
23202
+ locale: input.locale,
23203
+ localeSource: "platform_i18n"
23204
+ }
23205
+ })
23206
+ });
23207
+ return assertOk(response, "Attention choice");
23208
+ }
23094
23209
  };
23095
23210
  // Annotate the CommonJS export names for ESM import in node:
23096
23211
  0 && (module.exports = {