@experiture/xyra-cli 0.6.0 → 0.6.2

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":";;AAWA,gCAiBC;AA8ED,4CAKC;AAGD,gDAKC;AAOD,sCAiDC;AA/KD,iDAA6D;AAE7D,+CAA4D;AAE5D,6CAAyC;AACzC,qCAAyG;AACzG,qCAAiC;AACjC,yCAAiC;AACjC,oDAA6D;AAE7D,sFAAsF;AACtF,SAAgB,UAAU,CAAC,GAAoB,EAAE,WAAoB;IACnE,IAAI,WAAW,KAAK,SAAS;QAAE,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;IACpE,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,mBAAQ,CAChB,wBAAa,CAAC,gBAAgB,EAC9B,6HAA6H,CAC9H,CAAC;IACJ,CAAC;IACD,0EAA0E;IAC1E,0EAA0E;IAC1E,MAAM,WAAW,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;QAC7D,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,qBAAqB,EAAE,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,aAAa;QACtF,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,QAAQ;KAC9C,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAClB,yEAAyE;IACzE,wEAAwE;IACxE,OAAO,cAAc,WAAW,EAAE,CAAC;AACrC,CAAC;AAED,MAAM,uBAAuB,GAAG,MAAM,CAAC;AACvC,MAAM,qBAAqB,GAAG,MAAM,CAAC;AACrC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AACxC,MAAM,gBAAgB,GAAG,IAAA,gBAAI,EAAC,IAAA,gBAAM,GAAE,EAAE,wBAAwB,CAAC,CAAC;AAElE,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,MAAM,MAAM,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/E,OAAO,IAAA,gBAAI,EAAC,gBAAgB,EAAE,GAAG,MAAM,OAAO,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,yBAAyB,CAAC,EAAU;IAC3C,IAAA,uBAAa,EAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACrB,IAAA,mBAAS,EAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AACtG,CAAC;AAED,KAAK,UAAU,eAAe,CAAI,OAAe,EAAE,MAAwB;IACzE,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACtC,IAAA,mBAAS,EAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI,EAAE,GAAkB,IAAI,CAAC;IAC7B,IAAI,SAAS,GAA0C,IAAI,CAAC;IAE5D,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,EAAE,GAAG,IAAA,kBAAQ,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACjC,yBAAyB,CAAC,EAAE,CAAC,CAAC;YAC9B,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;gBAC3B,IAAI,EAAE,KAAK,IAAI;oBAAE,yBAAyB,CAAC,EAAE,CAAC,CAAC;YACjD,CAAC,EAAE,yBAAyB,CAAC,CAAC;YAC9B,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,KAAK,EAAE,IAAI,KAAK,QAAQ;gBAAE,MAAM,KAAK,CAAC;YAE1C,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC1D,IAAI,KAAK,GAAG,qBAAqB,EAAE,CAAC;oBAClC,IAAA,oBAAU,EAAC,IAAI,CAAC,CAAC;oBACjB,SAAS;gBACX,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YAED,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,uBAAuB,EAAE,CAAC;gBACrD,MAAM,IAAI,mBAAQ,CAChB,wBAAa,CAAC,mBAAmB,EACjC,uEAAuE,EACvE,sEAAsE,CACvE,CAAC;YACJ,CAAC;YAED,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,EAAE,CAAC;IACxB,CAAC;YAAS,CAAC;QACT,IAAI,SAAS;YAAE,aAAa,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC;YACH,IAAI,EAAE,KAAK,IAAI;gBAAE,IAAA,mBAAS,EAAC,EAAE,CAAC,CAAC;QACjC,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC;gBACH,IAAA,oBAAU,EAAC,IAAI,CAAC,CAAC;YACnB,CAAC;YAAC,MAAM,CAAC;gBACP,uBAAuB;YACzB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,yFAAyF;AAClF,KAAK,UAAU,gBAAgB,CACpC,GAAoB,EAAE,KAAiB,EAAE,KAAkB,EAAE,WAAoB;IAEjF,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACzC,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,sFAAsF;AAC/E,KAAK,UAAU,kBAAkB,CACtC,GAAoB,EAAE,KAAiB,EAAE,WAAoB;IAE7D,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACzC,MAAM,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AACtD,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,aAAa,CACjC,GAAoB,EACpB,KAAiB,EACjB,WAAoB;IAEpB,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACzC,MAAM,YAAY,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,cAAc,WAAW,GAAG,CAAC;IAC5G,MAAM,SAAS,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,6BAA6B,WAAW,IAAI,CAAC;IACjH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,gBAAgB,EAAE,oBAAoB,YAAY,GAAG,EAAE,SAAS,CAAC,CAAC;IACrG,CAAC;IACD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QAClC,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACzB,MAAM,IAAI,mBAAQ,CAChB,wBAAa,CAAC,gBAAgB,EAC9B,aAAa,YAAY,6CAA6C,EACtE,SAAS,CACV,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,gBAAgB,EAAE,oBAAoB,YAAY,GAAG,EAAE,SAAS,CAAC,CAAC;QACrG,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;YAClC,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YACzB,MAAM,IAAI,mBAAQ,CAChB,wBAAa,CAAC,gBAAgB,EAC9B,aAAa,YAAY,6CAA6C,EACtE,SAAS,CACV,CAAC;QACJ,CAAC;QAED,MAAM,SAAS,GAAG,IAAA,2BAAa,EAAC,MAAM,IAAA,6BAAmB,EACvD,oBAAoB,EACpB,GAAG,EAAE,CAAC,IAAA,0BAAY,EAAC,GAAG,EAAE,MAAM,CAAC,YAAa,CAAC,CAC9C,CAAC,CAAC;QACH,6EAA6E;QAC7E,4DAA4D;QAC5D,IAAI,CAAC,SAAS,CAAC,YAAY;YAAE,SAAS,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QAC1E,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAChC,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC"}
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
  }
@@ -22183,7 +22216,7 @@ var XyraTurnProtocolValidator = class {
22183
22216
  }
22184
22217
  };
22185
22218
 
22186
- // node_modules/@experiture/xyra-runtime-client/dist/client.js
22219
+ // ../../node_modules/@experiture/xyra-runtime-client/dist/client.js
22187
22220
  var VOICE_CAPABILITY_LIMIT_KEYS = [
22188
22221
  "maxSessionDurationMs",
22189
22222
  "maxUtteranceDurationMs",
@@ -22247,12 +22280,29 @@ function combineAbortSignals(...signals) {
22247
22280
  function extractSseEvents(buffer) {
22248
22281
  const segments = buffer.split("\n\n");
22249
22282
  const remaining = segments.pop() ?? "";
22250
- const events = segments.map((entry) => entry.trim()).filter(Boolean).map((entry) => {
22251
- const lines = entry.split("\n");
22252
- const event = lines.find((line) => line.startsWith("event:"))?.slice(6).trim() || "message";
22253
- const data = lines.filter((line) => line.startsWith("data:")).map((line) => line.slice(5).trim()).join("\n");
22254
- return { event, data };
22255
- });
22283
+ const events = [];
22284
+ for (const segment of segments) {
22285
+ let event = "message";
22286
+ let hasData = false;
22287
+ const dataLines = [];
22288
+ for (const line of segment.split("\n")) {
22289
+ if (line.startsWith(":"))
22290
+ continue;
22291
+ const separator = line.indexOf(":");
22292
+ const field = separator < 0 ? line : line.slice(0, separator);
22293
+ let value = separator < 0 ? "" : line.slice(separator + 1);
22294
+ if (value.startsWith(" "))
22295
+ value = value.slice(1);
22296
+ if (field === "event")
22297
+ event = value || "message";
22298
+ if (field === "data") {
22299
+ hasData = true;
22300
+ dataLines.push(value);
22301
+ }
22302
+ }
22303
+ if (hasData)
22304
+ events.push({ event, data: dataLines.join("\n") });
22305
+ }
22256
22306
  return { events, remaining };
22257
22307
  }
22258
22308
  var XyraRuntimeClient = class {
@@ -22431,6 +22481,12 @@ var XyraRuntimeClient = class {
22431
22481
  query.set("query", input.query);
22432
22482
  if (input.productId)
22433
22483
  query.set("productId", input.productId);
22484
+ if (input.kinds?.length)
22485
+ query.set("kinds", input.kinds.join(","));
22486
+ if (input.mimeTypes?.length)
22487
+ query.set("mimeTypes", input.mimeTypes.join(","));
22488
+ if (input.maxBytes !== void 0)
22489
+ query.set("maxBytes", String(input.maxBytes));
22434
22490
  const suffix = query.size > 0 ? `?${query.toString()}` : "";
22435
22491
  const response = await this.executeRequest(`${this.baseUrl}/media/library/items${suffix}`, {
22436
22492
  method: "GET",
@@ -22698,7 +22754,30 @@ var XyraRuntimeClient = class {
22698
22754
  }
22699
22755
  }
22700
22756
  const payload = await this.readSuccessEnvelope(response);
22701
- if (payload.schemaVersion !== 2 || payload.delivery !== "complete-response" || !Array.isArray(payload.events)) {
22757
+ if (payload.schemaVersion !== 2 || payload.delivery !== "complete-response") {
22758
+ throw new XyraRuntimeClientError({
22759
+ kind: "canonical",
22760
+ code: "XYRA.RUNTIME.TURN_PROTOCOL_VIOLATION",
22761
+ message: "Complete HTTP returned an invalid turn representation."
22762
+ });
22763
+ }
22764
+ if (payload.disposition === "waiting") {
22765
+ if (!payload.conversationId || !payload.clientRequestId || !payload.runtimeTurnId) {
22766
+ throw new XyraRuntimeClientError({
22767
+ kind: "canonical",
22768
+ code: "XYRA.RUNTIME.TURN_PROTOCOL_VIOLATION",
22769
+ message: "Complete HTTP waiting response omitted the accepted turn identity."
22770
+ });
22771
+ }
22772
+ return {
22773
+ disposition: "waiting",
22774
+ reason: payload.reason ?? "observation_window_ended",
22775
+ conversationId: payload.conversationId,
22776
+ clientRequestId: payload.clientRequestId,
22777
+ runtimeTurnId: payload.runtimeTurnId
22778
+ };
22779
+ }
22780
+ if (!Array.isArray(payload.events)) {
22702
22781
  throw new XyraRuntimeClientError({
22703
22782
  kind: "canonical",
22704
22783
  code: "XYRA.RUNTIME.TURN_PROTOCOL_VIOLATION",
@@ -22821,38 +22900,7 @@ var XyraRuntimeClient = class {
22821
22900
 
22822
22901
  // src/chat/runtimeChatClient.ts
22823
22902
  var import_conversation_creation = __toESM(require_conversation_creation());
22824
-
22825
- // src/errors/CliError.ts
22826
- var CliError = class extends Error {
22827
- code;
22828
- hint;
22829
- httpStatus;
22830
- constructor(code, message, hint, httpStatus) {
22831
- super(message);
22832
- this.name = "CliError";
22833
- this.code = code;
22834
- this.hint = hint;
22835
- this.httpStatus = httpStatus;
22836
- }
22837
- };
22838
- var CliErrorCodes = {
22839
- ConfigInvalid: "XYRA.CLI.CONFIG_INVALID",
22840
- EnvironmentNotFound: "XYRA.CLI.ENVIRONMENT_NOT_FOUND",
22841
- NotAuthenticated: "XYRA.CLI.NOT_AUTHENTICATED",
22842
- OAuthStateMismatch: "XYRA.CLI.OAUTH_STATE_MISMATCH",
22843
- OAuthCallbackError: "XYRA.CLI.OAUTH_CALLBACK_ERROR",
22844
- TokenStoreUnavailable: "XYRA.CLI.TOKEN_STORE_UNAVAILABLE",
22845
- TokenExchangeFailed: "XYRA.CLI.TOKEN_EXCHANGE_FAILED",
22846
- InsufficientScope: "XYRA.CLI.INSUFFICIENT_SCOPE",
22847
- McpProtocolError: "XYRA.CLI.MCP_PROTOCOL_ERROR",
22848
- ToolCallFailed: "XYRA.CLI.TOOL_CALL_FAILED",
22849
- ChatRequestFailed: "XYRA.CLI.CHAT_REQUEST_FAILED",
22850
- InvalidArguments: "XYRA.CLI.INVALID_ARGUMENTS",
22851
- ConfirmationRequired: "XYRA.CLI.CONFIRMATION_REQUIRED",
22852
- AmbiguousAlias: "XYRA.CLI.AMBIGUOUS_ALIAS"
22853
- };
22854
-
22855
- // src/chat/runtimeChatClient.ts
22903
+ var import_CliError = require("../errors/CliError");
22856
22904
  var XYRA_CLI_RUNTIME_LOCALES = ["en", "fr", "zh-Hans"];
22857
22905
  var XYRA_CLI_RUNTIME_STREAM_TIMEOUT_MS_V1 = 3e5;
22858
22906
  function isRecord3(value) {
@@ -22863,8 +22911,8 @@ function parseRuntimeLocale(value) {
22863
22911
  if (XYRA_CLI_RUNTIME_LOCALES.includes(candidate)) {
22864
22912
  return candidate;
22865
22913
  }
22866
- throw new CliError(
22867
- CliErrorCodes.InvalidArguments,
22914
+ throw new import_CliError.CliError(
22915
+ import_CliError.CliErrorCodes.InvalidArguments,
22868
22916
  `Unsupported chat locale '${candidate}'.`,
22869
22917
  `Use one of: ${XYRA_CLI_RUNTIME_LOCALES.join(", ")}.`
22870
22918
  );
@@ -22890,13 +22938,36 @@ function runtimeErrorBody(value) {
22890
22938
  if (!isRecord3(value)) {
22891
22939
  return value instanceof Error ? { message: value.message } : {};
22892
22940
  }
22941
+ const rawDiagnostic = isRecord3(value.browserDiagnostic) ? value.browserDiagnostic : void 0;
22942
+ const protocolDiagnostic = rawDiagnostic ? {
22943
+ ...typeof rawDiagnostic.protocolIssue === "string" ? { protocolIssue: rawDiagnostic.protocolIssue } : {},
22944
+ ...typeof rawDiagnostic.observedEventType === "string" ? { observedEventType: rawDiagnostic.observedEventType } : {},
22945
+ ...typeof rawDiagnostic.clientRequestId === "string" ? { clientRequestId: rawDiagnostic.clientRequestId } : {},
22946
+ ...typeof rawDiagnostic.conversationId === "string" ? { conversationId: rawDiagnostic.conversationId } : {},
22947
+ ...typeof rawDiagnostic.requestId === "string" ? { requestId: rawDiagnostic.requestId } : {},
22948
+ ...typeof rawDiagnostic.streamId === "string" ? { streamId: rawDiagnostic.streamId } : {}
22949
+ } : void 0;
22893
22950
  return {
22894
22951
  code: typeof value.code === "string" ? value.code : void 0,
22895
22952
  message: typeof value.message === "string" ? value.message : void 0,
22896
22953
  correlationId: typeof value.correlationId === "string" ? value.correlationId : void 0,
22897
- details: value.details
22954
+ ...protocolDiagnostic && Object.keys(protocolDiagnostic).length > 0 ? { protocolDiagnostic } : {}
22898
22955
  };
22899
22956
  }
22957
+ function protocolDiagnosticHint(error) {
22958
+ const diagnostic = error.protocolDiagnostic;
22959
+ if (!diagnostic) return error.message;
22960
+ const fields = [
22961
+ diagnostic.protocolIssue ? `protocol issue: ${diagnostic.protocolIssue}` : void 0,
22962
+ diagnostic.observedEventType ? `event: ${diagnostic.observedEventType}` : void 0,
22963
+ error.correlationId ? `correlation ID: ${error.correlationId}` : void 0,
22964
+ diagnostic.clientRequestId ? `client request ID: ${diagnostic.clientRequestId}` : void 0,
22965
+ diagnostic.conversationId ? `conversation ID: ${diagnostic.conversationId}` : void 0,
22966
+ diagnostic.requestId ? `request ID: ${diagnostic.requestId}` : void 0,
22967
+ diagnostic.streamId ? `stream ID: ${diagnostic.streamId}` : void 0
22968
+ ].filter((field) => Boolean(field));
22969
+ return fields.length > 0 ? fields.join("; ") : error.message;
22970
+ }
22900
22971
  async function readJsonBody(response) {
22901
22972
  const text = await response.text();
22902
22973
  if (!text) return {};
@@ -22911,8 +22982,8 @@ async function assertOk(response, action) {
22911
22982
  if (response.ok) return body;
22912
22983
  const canonical = canonicalErrorBody(body);
22913
22984
  const suffix = canonical.correlationId ? ` Correlation ID: ${canonical.correlationId}.` : "";
22914
- throw new CliError(
22915
- CliErrorCodes.ChatRequestFailed,
22985
+ throw new import_CliError.CliError(
22986
+ import_CliError.CliErrorCodes.ChatRequestFailed,
22916
22987
  `${action} failed${canonical.code ? ` (${canonical.code})` : ""}.${suffix}`,
22917
22988
  canonical.message ?? `HTTP ${response.status}`,
22918
22989
  response.status
@@ -22920,11 +22991,11 @@ async function assertOk(response, action) {
22920
22991
  }
22921
22992
  function conversationFromEnvelope(body) {
22922
22993
  if (!isRecord3(body) || body.success !== true || !isRecord3(body.data)) {
22923
- throw new CliError(CliErrorCodes.ChatRequestFailed, "Conversation creation returned an invalid response.");
22994
+ throw new import_CliError.CliError(import_CliError.CliErrorCodes.ChatRequestFailed, "Conversation creation returned an invalid response.");
22924
22995
  }
22925
22996
  const data = body.data;
22926
22997
  if (typeof data.id !== "string" || typeof data.title !== "string") {
22927
- throw new CliError(CliErrorCodes.ChatRequestFailed, "Conversation creation did not return a usable conversation.");
22998
+ throw new import_CliError.CliError(import_CliError.CliErrorCodes.ChatRequestFailed, "Conversation creation did not return a usable conversation.");
22928
22999
  }
22929
23000
  return {
22930
23001
  id: data.id,
@@ -22939,8 +23010,8 @@ function messageFromResponse(response) {
22939
23010
  }
22940
23011
  function requiredIdentity(value, field) {
22941
23012
  if (value) return value;
22942
- throw new CliError(
22943
- CliErrorCodes.ChatRequestFailed,
23013
+ throw new import_CliError.CliError(
23014
+ import_CliError.CliErrorCodes.ChatRequestFailed,
22944
23015
  `Chat stream completed without ${field}.`,
22945
23016
  "The Orchestrator returned an invalid runtime stream."
22946
23017
  );
@@ -23000,8 +23071,8 @@ var XyraRuntimeChatClient = class {
23000
23071
  if (response.status === 404 && canonicalErrorBody(await readJsonBody(response.clone())).code === "XYRA.CONVERSATION.NOT_FOUND") return null;
23001
23072
  const body = await assertOk(response, "Conversation creation lookup");
23002
23073
  const receipt = (0, import_conversation_creation.parseXyraConversationCreationReceiptV1)(isRecord3(body) && body.success === true ? body.data : void 0);
23003
- if (receipt.clientRequestId !== requestId) throw new CliError(
23004
- CliErrorCodes.ChatRequestFailed,
23074
+ if (receipt.clientRequestId !== requestId) throw new import_CliError.CliError(
23075
+ import_CliError.CliErrorCodes.ChatRequestFailed,
23005
23076
  "Conversation creation lookup returned a different request.",
23006
23077
  "Keep the original request unresolved; do not create another conversation."
23007
23078
  );
@@ -23059,10 +23130,10 @@ var XyraRuntimeChatClient = class {
23059
23130
  } catch (cause) {
23060
23131
  if (!outcome) {
23061
23132
  const runtimeError = runtimeErrorBody(cause);
23062
- throw new CliError(
23063
- CliErrorCodes.ChatRequestFailed,
23133
+ throw new import_CliError.CliError(
23134
+ import_CliError.CliErrorCodes.ChatRequestFailed,
23064
23135
  `Chat stream failed${runtimeError.code ? ` (${runtimeError.code})` : ""}.`,
23065
- runtimeError.message ?? "The Orchestrator response ended before a valid terminal event."
23136
+ protocolDiagnosticHint(runtimeError) ?? "The Orchestrator response ended before a valid terminal event."
23066
23137
  );
23067
23138
  }
23068
23139
  error ??= runtimeErrorBody(cause);