@mainwave/cli 0.2.0 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  import { homedir } from 'node:os';
2
2
  import { join } from 'node:path';
3
3
  import { jsonManagedCodec } from '../core/codecs/json-managed.js';
4
+ import { buildHeaders, HEADER_NAME, headerBearerToken, jsonObjectHeaders, kvPairsHeaders, } from '../core/headers.js';
4
5
  /**
5
6
  * Claude Desktop (Cowork on Team/Enterprise, and the third-party-inference
6
7
  * "3P" builds) exports session activity to any OpenTelemetry collector — this
@@ -81,39 +82,25 @@ const contentCategories = (optIns) => {
81
82
  cats.push('toolContent');
82
83
  return cats;
83
84
  };
84
- /**
85
- * The tenancy/auth headers — one source of truth for both encodings the two
86
- * surfaces need (see `buildEnv` for the JSON managed-config form and
87
- * `headersAsConsoleValue` for the console form). Key order is stable so a re-run
88
- * doesn't churn the JSON.
89
- */
90
- const buildHeaders = ({ ucid, apiKey, }) => {
91
- const headers = { Authorization: `Bearer ${apiKey}` };
92
- // Omit the UCID header when unset — events land unmapped. See MAI-1033.
93
- if (ucid)
94
- headers['X-Mainwave-UCID'] = ucid;
95
- headers['X-Mainwave-Source'] = SOURCE_VALUE;
96
- return headers;
97
- };
85
+ /** The tenancy/auth headers, in the shared shape both surfaces encode from. */
86
+ const headersFor = (input) => buildHeaders({ apiKey: input.apiKey, ucid: input.ucid, source: SOURCE_VALUE });
98
87
  /**
99
88
  * The first-party Cowork console (Admin settings → Cowork) takes OTLP headers in
100
89
  * the OpenTelemetry env-var convention — comma-separated `key=value` pairs — and
101
90
  * REJECTS a JSON object (verified against a live claude.ai admin-settings install,
102
91
  * MAI-1187). The JSON-object form (`buildEnv`'s `otlpHeaders`) is the
103
92
  * managed-config (plist / registry / managed-settings.json) encoding only; the
104
- * two must not be swapped. No spaces between pairs; the one space in
105
- * `Bearer <key>` is part of the value.
93
+ * two must not be swapped. Both come from `core/headers.ts`, which is also what
94
+ * the display masker decodes with.
106
95
  */
107
- const headersAsConsoleValue = (headers) => Object.entries(headers)
108
- .map(([k, v]) => `${k}=${v}`)
109
- .join(',');
96
+ const headersAsConsoleValue = (headers) => kvPairsHeaders.encode(headers);
110
97
  const buildEnv = ({ ucid, collectorUrl, apiKey, optIns, }) => {
111
98
  const out = {
112
99
  [KEY.endpoint]: stripTrailingSlash(collectorUrl),
113
100
  [KEY.protocol]: DEFAULT_PROTOCOL,
114
101
  // Managed-config surface: JSON-object string, the encoding the plist /
115
102
  // registry / managed-settings.json keys require.
116
- [KEY.headers]: JSON.stringify(buildHeaders({ ucid, apiKey })),
103
+ [KEY.headers]: jsonObjectHeaders.encode(headersFor({ ucid, apiKey })),
117
104
  [KEY.tracesEnabled]: 'true',
118
105
  };
119
106
  const cats = contentCategories(optIns);
@@ -121,19 +108,7 @@ const buildEnv = ({ ucid, collectorUrl, apiKey, optIns, }) => {
121
108
  out[KEY.contentCapture] = JSON.stringify(cats);
122
109
  return out;
123
110
  };
124
- const tryParseObject = (raw) => {
125
- if (!raw)
126
- return undefined;
127
- try {
128
- const parsed = JSON.parse(raw);
129
- return parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)
130
- ? parsed
131
- : undefined;
132
- }
133
- catch {
134
- return undefined;
135
- }
136
- };
111
+ const parseHeaders = (raw) => raw ? jsonObjectHeaders.decode(raw) : undefined;
137
112
  const tryParseArray = (raw) => {
138
113
  if (!raw)
139
114
  return [];
@@ -145,11 +120,6 @@ const tryParseArray = (raw) => {
145
120
  return [];
146
121
  }
147
122
  };
148
- const parseBearer = (header) => {
149
- if (typeof header !== 'string' || !header.toLowerCase().startsWith('bearer '))
150
- return undefined;
151
- return header.slice('bearer '.length).trim() || undefined;
152
- };
153
123
  const parseEnv = (env) => {
154
124
  if (!MANAGED_ENV_KEYS.some((k) => k in env))
155
125
  return {};
@@ -158,13 +128,13 @@ const parseEnv = (env) => {
158
128
  // per-signal path itself, so there is no /v1/<signal> suffix to strip.
159
129
  if (env[KEY.endpoint])
160
130
  out.collectorUrl = env[KEY.endpoint];
161
- const headers = tryParseObject(env[KEY.headers]);
131
+ const headers = parseHeaders(env[KEY.headers]);
162
132
  if (headers) {
163
- const token = parseBearer(headers.Authorization);
133
+ const token = headerBearerToken(headers[HEADER_NAME.authorization]);
164
134
  if (token)
165
135
  out.apiKey = token;
166
- const ucid = headers['X-Mainwave-UCID'];
167
- if (typeof ucid === 'string' && ucid)
136
+ const ucid = headers[HEADER_NAME.ucid];
137
+ if (ucid)
168
138
  out.ucid = ucid;
169
139
  }
170
140
  const cats = tryParseArray(env[KEY.contentCapture]);
@@ -182,13 +152,11 @@ const parseEnv = (env) => {
182
152
  * doctor.ts would always report "missing mainwave.ucid" for Desktop setups.
183
153
  */
184
154
  const normalizeForGenericChecks = (env) => {
185
- const headers = tryParseObject(env[KEY.headers]);
186
- const auth = headers?.Authorization;
187
- const ucid = headers?.['X-Mainwave-UCID'];
155
+ const headers = parseHeaders(env[KEY.headers]);
188
156
  return {
189
157
  endpoint: env[KEY.endpoint],
190
- auth: typeof auth === 'string' ? auth : undefined,
191
- ucid: typeof ucid === 'string' ? ucid : undefined,
158
+ auth: headers?.[HEADER_NAME.authorization],
159
+ ucid: headers?.[HEADER_NAME.ucid],
192
160
  };
193
161
  };
194
162
  const collectChecks = (env) => {
@@ -244,7 +212,7 @@ const HIERARCHY = [
244
212
  const printPostSetupInstructions = (input) => {
245
213
  const env = buildEnv(input);
246
214
  // Console headers are comma-separated key=value (NOT the JSON in the profile).
247
- const consoleHeaders = headersAsConsoleValue(buildHeaders(input));
215
+ const consoleHeaders = headersAsConsoleValue(headersFor(input));
248
216
  const lines = [
249
217
  'Claude Desktop reads OTel config from a managed source, not this file directly.',
250
218
  'Deploy the generated profile one of two ways:',
@@ -1 +1 @@
1
- {"version":3,"file":"claude-desktop.js","sourceRoot":"","sources":["../../src/adapters/claude-desktop.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"claude-desktop.js","sourceRoot":"","sources":["../../src/adapters/claude-desktop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,EACL,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,GACf,MAAM,oBAAoB,CAAA;AAU3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,MAAM,YAAY,GAAG,uBAAuB,CAAA;AAC5C,MAAM,gBAAgB,GAAG,eAAe,CAAA;AAExC;;;;;;GAMG;AACH,MAAM,oBAAoB,GAAG,UAAU,CAAA;AACvC,MAAM,sBAAsB,GAAG,WAAW,CAAA;AAE1C,MAAM,GAAG,GAAG;IACV,QAAQ,EAAE,cAAc;IACxB,QAAQ,EAAE,cAAc;IACxB,OAAO,EAAE,aAAa;IACtB,cAAc,EAAE,oBAAoB;IACpC,aAAa,EAAE,mBAAmB;CAC1B,CAAA;AAEV,iGAAiG;AACjG,MAAM,gBAAgB,GAAsB;IAC1C,GAAG,CAAC,QAAQ;IACZ,GAAG,CAAC,QAAQ;IACZ,GAAG,CAAC,OAAO;IACX,GAAG,CAAC,cAAc;IAClB,GAAG,CAAC,aAAa;CAClB,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAE3E;;;;;;;;GAQG;AACH,MAAM,iBAAiB,GAAG,CAAC,MAA+B,EAAY,EAAE;IACtE,MAAM,IAAI,GAAa,EAAE,CAAA;IACzB,IAAI,MAAM,CAAC,WAAW;QAAE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,oBAAoB,CAAC,CAAA;IACtE,IAAI,MAAM,CAAC,WAAW;QAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAChD,IAAI,MAAM,CAAC,WAAW;QAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAChD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,+EAA+E;AAC/E,MAAM,UAAU,GAAG,CAAC,KAA6C,EAA0B,EAAE,CAC3F,YAAY,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAA;AAEhF;;;;;;;;GAQG;AACH,MAAM,qBAAqB,GAAG,CAAC,OAA+B,EAAU,EAAE,CACxE,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AAEhC,MAAM,QAAQ,GAAG,CAAC,EAChB,IAAI,EACJ,YAAY,EACZ,MAAM,EACN,MAAM,GACQ,EAA0B,EAAE;IAC1C,MAAM,GAAG,GAA2B;QAClC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,kBAAkB,CAAC,YAAY,CAAC;QAChD,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,gBAAgB;QAChC,uEAAuE;QACvE,iDAAiD;QACjD,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACrE,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,MAAM;KAC5B,CAAA;IAED,MAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAA;IACtC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACnE,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,GAAuB,EAAsC,EAAE,CACnF,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAEjD,MAAM,aAAa,GAAG,CAAC,GAAuB,EAAY,EAAE;IAC1D,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAA;IACnB,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACvC,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,GAA2B,EAA0B,EAAE;IACvE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC;QAAE,OAAO,EAAE,CAAA;IAEtD,MAAM,GAAG,GAA2B,EAAE,CAAA;IAEtC,uEAAuE;IACvE,uEAAuE;IACvE,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,GAAG,CAAC,YAAY,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAE3D,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;IAC9C,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAA;QACnE,IAAI,KAAK;YAAE,GAAG,CAAC,MAAM,GAAG,KAAK,CAAA;QAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,IAAI;YAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;IAC3B,CAAC;IAED,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAA;IACnD,GAAG,CAAC,MAAM,GAAG;QACX,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;QACzC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;QACzC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;KAC1C,CAAA;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,yBAAyB,GAAG,CAChC,GAAqC,EACd,EAAE;IACzB,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;IAC9C,OAAO;QACL,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC3B,IAAI,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC;QAC1C,IAAI,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;KAClC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,GAAqC,EAAoB,EAAE;IAChF,MAAM,MAAM,GAAY,EAAE,CAAA;IAE1B,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAClC,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IAExC,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,OAAO;YACd,OAAO,EACL,mFAAmF;gBACnF,gFAAgF;gBAChF,8DAA8D;SACjE,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,MAAM;YACb,OAAO,EACL,gBAAgB,QAAQ,iEAAiE;gBACzF,yFAAyF;gBACzF,wBAAwB;SAC3B,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CAAC;QACV,KAAK,EAAE,MAAM;QACb,OAAO,EACL,6CAA6C,oBAAoB,oBAAoB;YACrF,kCAAkC,sBAAsB,+BAA+B;KAC1F,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED;;;;;;;;;;;GAWG;AACH,MAAM,gBAAgB,GAAG,sCAAsC,CAAA;AAC/D,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAA;AACxE,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAA;AAE5D,MAAM,SAAS,GAA6B;IAC1C;QACE,EAAE,EAAE,SAAS;QACb,KAAK,EAAE,oCAAoC;QAC3C,IAAI,EAAE,iBAAiB;QACvB,IAAI,EAAE,MAAM;KACb;CACF,CAAA;AAED,MAAM,0BAA0B,GAAG,CAAC,KAAoB,EAAU,EAAE;IAClE,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC3B,+EAA+E;IAC/E,MAAM,cAAc,GAAG,qBAAqB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAA;IAC/D,MAAM,KAAK,GAAG;QACZ,iFAAiF;QACjF,+CAA+C;QAC/C,EAAE;QACF,wEAAwE;QACxE,yBAAyB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAC5C,yBAAyB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;QAC5C,yBAAyB,cAAc,EAAE;QACzC,uFAAuF;QACvF,EAAE;QACF,iFAAiF;QACjF,0FAA0F;QAC1F,yEAAyE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC3F,EAAE;QACF,kEAAkE;KACnE,CAAA;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAY;IACpC,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE,yBAAyB;IACtC,KAAK,EAAE;QACL,KAAK,EAAE,gBAAgB;QACvB,MAAM,EAAE,iBAAiB;KAC1B;IACD,KAAK,EAAE,gBAAgB;IACvB,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,SAAS;IACpB,QAAQ;IACR,QAAQ;IACR,aAAa;IACb,yBAAyB;IACzB,0BAA0B;CAC3B,CAAA"}
@@ -1,5 +1,6 @@
1
1
  import { homedir } from 'node:os';
2
2
  import { join } from 'node:path';
3
+ import { jsonEnvCodec } from '../core/codecs/json-env.js';
3
4
  import { tomlOtelCodec } from '../core/codecs/toml-otel.js';
4
5
  /**
5
6
  * Codex CLI's OTEL config is structured TOML, not env vars in a JSON `env`
@@ -27,13 +28,22 @@ const SIGNAL_PATH = {
27
28
  trace_exporter: '/v1/traces',
28
29
  metrics_exporter: '/v1/metrics',
29
30
  };
30
- const HEADER_NAMES = ['Authorization', 'X-Mainwave-UCID', 'X-Mainwave-Source'];
31
+ const HEADER_NAMES = [
32
+ 'Authorization',
33
+ 'X-Mainwave-UCID',
34
+ 'X-Mainwave-Source',
35
+ 'X-Mainwave-User-Email',
36
+ ];
31
37
  const endpointKey = (block) => `otel.${block}.otlp-http.endpoint`;
32
38
  const protocolKey = (block) => `otel.${block}.otlp-http.protocol`;
33
39
  const headerKey = (block, name) => `otel.${block}.otlp-http.headers.${name}`;
34
40
  /** Every key buildEnv can emit — settings.ts clears these on re-run to remove opted-out keys. */
35
41
  const MANAGED_ENV_KEYS = [
36
42
  'otel.log_user_prompt',
43
+ 'otel.log_system_prompt',
44
+ 'otel.log_tool_payloads',
45
+ 'otel.log_mcp_interactions',
46
+ 'otel.log_governance_events',
37
47
  ...SIGNAL_BLOCKS.flatMap((b) => [
38
48
  endpointKey(b),
39
49
  protocolKey(b),
@@ -41,11 +51,29 @@ const MANAGED_ENV_KEYS = [
41
51
  ]),
42
52
  ];
43
53
  const stripTrailingSlash = (url) => url.replace(/\/+$/, '');
44
- const buildEnv = ({ ucid, collectorUrl, apiKey, optIns, }) => {
54
+ const buildEnv = ({ ucid, collectorUrl, apiKey, optIns, userEmail, }) => {
45
55
  const base = stripTrailingSlash(collectorUrl);
46
56
  const out = {};
47
- if (optIns.userPrompts)
57
+ // Prompt content — the user prompt and the system prompt bodies — under the
58
+ // prompt opt-in ("logs full prompt content").
59
+ if (optIns.userPrompts) {
48
60
  out['otel.log_user_prompt'] = 'true';
61
+ out['otel.log_system_prompt'] = 'true';
62
+ }
63
+ // Codex can't split tool metadata from tool content the way Claude Code's
64
+ // OTEL_LOG_TOOL_DETAILS / _CONTENT can: a single `log_tool_payloads` carries
65
+ // the tool name, the command (arguments), success, and — with governance —
66
+ // the approval decision, together. So enable the tool / MCP / governance
67
+ // logging when the user opts into EITHER tool stream (tool details OR tool
68
+ // content). This is the config that lets the Codex tool-call / success-rate /
69
+ // auto-approve telemetry (MAI-1406) actually flow — without it a standard
70
+ // install produces the empty-Codex experience (MAI-1407). collectChecks below
71
+ // already warns that Codex ships full tool stdout regardless of these flags.
72
+ if (optIns.toolDetails || optIns.toolContent) {
73
+ out['otel.log_tool_payloads'] = 'true';
74
+ out['otel.log_mcp_interactions'] = 'true';
75
+ out['otel.log_governance_events'] = 'true';
76
+ }
49
77
  for (const block of SIGNAL_BLOCKS) {
50
78
  out[endpointKey(block)] = `${base}${SIGNAL_PATH[block]}`;
51
79
  out[protocolKey(block)] = 'binary';
@@ -54,6 +82,11 @@ const buildEnv = ({ ucid, collectorUrl, apiKey, optIns, }) => {
54
82
  if (ucid)
55
83
  out[headerKey(block, 'X-Mainwave-UCID')] = ucid;
56
84
  out[headerKey(block, 'X-Mainwave-Source')] = SOURCE_VALUE;
85
+ // Codex spans carry no user.email and only ~half its logs do; stamp the
86
+ // developer's email so the collector promotes it to mainwave.user_email and
87
+ // reads attribute the activity to a person. Omitted when unset (MAI-1394).
88
+ if (userEmail)
89
+ out[headerKey(block, 'X-Mainwave-User-Email')] = userEmail;
57
90
  }
58
91
  return out;
59
92
  };
@@ -90,10 +123,18 @@ const parseEnv = (env) => {
90
123
  const ucid = env[headerKey('exporter', 'X-Mainwave-UCID')];
91
124
  if (ucid)
92
125
  out.ucid = ucid;
126
+ const userEmail = env[headerKey('exporter', 'X-Mainwave-User-Email')];
127
+ if (userEmail)
128
+ out.userEmail = userEmail;
129
+ // toolDetails / toolContent both drive the single `log_tool_payloads` flag, so
130
+ // a re-run can't tell which the user picked — recover both from it, preserving
131
+ // the enabled state on re-run (unchecking either still leaves the flag on via
132
+ // the OR in buildEnv; unchecking both clears it). userPrompts drives both the
133
+ // user- and system-prompt flags, so log_user_prompt is a sufficient witness.
93
134
  out.optIns = {
94
135
  userPrompts: env['otel.log_user_prompt'] === 'true',
95
- toolDetails: false,
96
- toolContent: false,
136
+ toolDetails: env['otel.log_tool_payloads'] === 'true',
137
+ toolContent: env['otel.log_tool_payloads'] === 'true',
97
138
  };
98
139
  return out;
99
140
  };
@@ -175,6 +216,14 @@ export const codexCli = {
175
216
  global: join(homedir(), '.codex', 'config.toml'),
176
217
  },
177
218
  localScopeWarning: 'ignored by Codex 0.130+ (otel keys are dropped from project-local config)',
219
+ // Codex spans with an empty UCID never surface on the Use Cases page, so mint
220
+ // one at setup when the user gives none — the runs then land as an unbound
221
+ // UCID they can assign to a use case (MAI-1382).
222
+ autoUcid: true,
223
+ // Codex spans carry no identity and only ~half its logs carry user.email, so
224
+ // the wizard resolves the developer's email (git config default) and buildEnv
225
+ // stamps it as X-Mainwave-User-Email for the collector to attribute (MAI-1394).
226
+ injectsIdentity: true,
178
227
  codec: tomlOtelCodec,
179
228
  managedEnvKeys: MANAGED_ENV_KEYS,
180
229
  hierarchy: HIERARCHY,
@@ -183,5 +232,19 @@ export const codexCli = {
183
232
  collectChecks,
184
233
  collectFileChecks,
185
234
  normalizeForGenericChecks,
235
+ // Codex fires PostToolUse hooks with the same shape as Claude Code (tool_name,
236
+ // tool_input.command, mcp__server__tool names), so the same marker scripts and
237
+ // matchers work — but hooks load from a sibling `hooks.json`, not the otel
238
+ // config.toml, and the scripts resolve OTLP config from config.toml at runtime
239
+ // (runtimeTool). MAI-1395.
240
+ markers: {
241
+ disclosure: 'Sends Linear/Jira issue ids and GitHub PR urls to the collector — never ticket bodies or diff content.',
242
+ hooksFile: {
243
+ path: join(homedir(), '.codex', 'hooks.json'),
244
+ localPath: join('.codex', 'hooks.json'),
245
+ codec: jsonEnvCodec,
246
+ },
247
+ runtimeTool: 'codex',
248
+ },
186
249
  };
187
250
  //# sourceMappingURL=codex-cli.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"codex-cli.js","sourceRoot":"","sources":["../../src/adapters/codex-cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"codex-cli.js","sourceRoot":"","sources":["../../src/adapters/codex-cli.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ import { join } from 'node:path';
3
3
  import { envFileCodec } from '../core/codecs/env-file.js';
4
4
  import { jsonFlatCodec } from '../core/codecs/json-flat.js';
5
5
  import { color } from '../core/format.js';
6
+ import { buildHeaders, HEADER_NAME, headerBearerToken, kvPairsHeaders } from '../core/headers.js';
6
7
  import { renderEnvFileBlock } from '../core/post-setup.js';
7
8
  /**
8
9
  * VS Code's GitHub Copilot Chat extension splits OTLP configuration across
@@ -59,32 +60,8 @@ const LOCAL_SETTINGS_PATH = join('.vscode', 'settings.json');
59
60
  const ENV_FILE_GLOBAL_PATH = join(homedir(), '.mainwave', 'copilot-chat.env');
60
61
  const ENV_FILE_LOCAL_PATH = join('.mainwave', 'copilot-chat.env');
61
62
  const stripTrailingSlash = (url) => url.replace(/\/+$/, '');
62
- const buildHeadersValue = (apiKey, ucid) => [
63
- `Authorization=Bearer ${apiKey}`,
64
- // Omit the UCID header when unset — events land unmapped. See MAI-1033.
65
- ...(ucid ? [`X-Mainwave-UCID=${ucid}`] : []),
66
- `X-Mainwave-Source=${SOURCE_VALUE}`,
67
- ].join(',');
68
- const parseHeaders = (raw) => {
69
- const out = {};
70
- for (const pair of raw.split(',')) {
71
- const eq = pair.indexOf('=');
72
- if (eq < 0)
73
- continue;
74
- const k = pair.slice(0, eq).trim();
75
- const v = pair.slice(eq + 1).trim();
76
- if (k)
77
- out[k] = v;
78
- }
79
- return out;
80
- };
81
- const parseBearer = (auth) => {
82
- if (!auth)
83
- return undefined;
84
- if (!auth.toLowerCase().startsWith('bearer '))
85
- return undefined;
86
- return auth.slice('bearer '.length).trim() || undefined;
87
- };
63
+ const buildHeadersValue = (apiKey, ucid) => kvPairsHeaders.encode(buildHeaders({ apiKey, ucid, source: SOURCE_VALUE }));
64
+ const parseHeaders = (raw) => kvPairsHeaders.decode(raw) ?? {};
88
65
  const buildEnv = ({ collectorUrl, optIns }) => ({
89
66
  [VSCODE_KEY_ENABLED]: 'true',
90
67
  [VSCODE_KEY_EXPORTER_TYPE]: 'otlp-http',
@@ -126,10 +103,10 @@ const parseEnvFile = (env) => {
126
103
  const raw = env.OTEL_EXPORTER_OTLP_HEADERS;
127
104
  if (raw) {
128
105
  const headers = parseHeaders(raw);
129
- const token = parseBearer(headers.Authorization);
106
+ const token = headerBearerToken(headers[HEADER_NAME.authorization]);
130
107
  if (token)
131
108
  out.apiKey = token;
132
- const u = headers['X-Mainwave-UCID'];
109
+ const u = headers[HEADER_NAME.ucid];
133
110
  if (u)
134
111
  out.ucid = u;
135
112
  }
@@ -1 +1 @@
1
- {"version":3,"file":"copilot-chat.js","sourceRoot":"","sources":["../../src/adapters/copilot-chat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"copilot-chat.js","sourceRoot":"","sources":["../../src/adapters/copilot-chat.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import { homedir } from 'node:os';
2
2
  import { join } from 'node:path';
3
3
  import { envFileCodec } from '../core/codecs/env-file.js';
4
4
  import { color } from '../core/format.js';
5
+ import { buildHeaders, HEADER_NAME, headerBearerToken, kvPairsHeaders } from '../core/headers.js';
5
6
  import { renderEnvFileBlock } from '../core/post-setup.js';
6
7
  /**
7
8
  * GitHub Copilot CLI (the standalone `copilot` terminal binary) configures
@@ -38,32 +39,8 @@ const MANAGED_ENV_KEYS = [
38
39
  const GLOBAL_PATH = join(homedir(), '.mainwave', 'copilot-cli.env');
39
40
  const LOCAL_PATH = join('.mainwave', 'copilot-cli.env');
40
41
  const stripTrailingSlash = (url) => url.replace(/\/+$/, '');
41
- const buildHeadersValue = (apiKey, ucid) => [
42
- `Authorization=Bearer ${apiKey}`,
43
- // Omit the UCID header when unset — events land unmapped. See MAI-1033.
44
- ...(ucid ? [`X-Mainwave-UCID=${ucid}`] : []),
45
- `X-Mainwave-Source=${SOURCE_VALUE}`,
46
- ].join(',');
47
- const parseHeaders = (raw) => {
48
- const out = {};
49
- for (const pair of raw.split(',')) {
50
- const eq = pair.indexOf('=');
51
- if (eq < 0)
52
- continue;
53
- const k = pair.slice(0, eq).trim();
54
- const v = pair.slice(eq + 1).trim();
55
- if (k)
56
- out[k] = v;
57
- }
58
- return out;
59
- };
60
- const parseBearer = (auth) => {
61
- if (!auth)
62
- return undefined;
63
- if (!auth.toLowerCase().startsWith('bearer '))
64
- return undefined;
65
- return auth.slice('bearer '.length).trim() || undefined;
66
- };
42
+ const buildHeadersValue = (apiKey, ucid) => kvPairsHeaders.encode(buildHeaders({ apiKey, ucid, source: SOURCE_VALUE }));
43
+ const parseHeaders = (raw) => kvPairsHeaders.decode(raw) ?? {};
67
44
  const buildEnv = ({ ucid, collectorUrl, apiKey }) => ({
68
45
  OTEL_EXPORTER_OTLP_ENDPOINT: stripTrailingSlash(collectorUrl),
69
46
  OTEL_EXPORTER_OTLP_HEADERS: buildHeadersValue(apiKey, ucid),
@@ -81,10 +58,10 @@ const parseEnv = (env) => {
81
58
  const raw = env.OTEL_EXPORTER_OTLP_HEADERS;
82
59
  if (raw) {
83
60
  const headers = parseHeaders(raw);
84
- const token = parseBearer(headers.Authorization);
61
+ const token = headerBearerToken(headers[HEADER_NAME.authorization]);
85
62
  if (token)
86
63
  out.apiKey = token;
87
- const ucid = headers['X-Mainwave-UCID'];
64
+ const ucid = headers[HEADER_NAME.ucid];
88
65
  if (ucid)
89
66
  out.ucid = ucid;
90
67
  }
@@ -97,8 +74,8 @@ const normalizeForGenericChecks = (env) => {
97
74
  let ucid;
98
75
  if (raw) {
99
76
  const headers = parseHeaders(raw);
100
- auth = headers.Authorization;
101
- ucid = headers['X-Mainwave-UCID'];
77
+ auth = headers[HEADER_NAME.authorization];
78
+ ucid = headers[HEADER_NAME.ucid];
102
79
  }
103
80
  return { endpoint, auth, ucid };
104
81
  };
@@ -1 +1 @@
1
- {"version":3,"file":"copilot-cli.js","sourceRoot":"","sources":["../../src/adapters/copilot-cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"copilot-cli.js","sourceRoot":"","sources":["../../src/adapters/copilot-cli.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import pc from 'picocolors';
2
+ import { hasCredentialShape, isBearerValue, isSecretHeaderName, redactHeaderCollection, } from './headers.js';
2
3
  /**
3
4
  * Masks a secret the way the platform UI does (`ApiKeysPage`): reveals the
4
5
  * first 8 characters — the stored `key_prefix` — then a fixed `••••` run, so a
@@ -11,34 +12,11 @@ export const maskSecret = (value) => {
11
12
  return '••••';
12
13
  return `${value.slice(0, 8)}••••`;
13
14
  };
14
- /**
15
- * Masks an `OTEL_EXPORTER_OTLP_HEADERS`-shaped value, leaving non-secret keys
16
- * visible and masking the bearer token portion. Other key=value pairs in the
17
- * comma-separated string pass through unchanged.
18
- */
19
- export const maskAuthHeader = (value) => value
20
- .split(',')
21
- .map((pair) => {
22
- const eq = pair.indexOf('=');
23
- if (eq < 0)
24
- return pair;
25
- const key = pair.slice(0, eq);
26
- const v = pair.slice(eq + 1).trim();
27
- if (key.trim().toLowerCase() !== 'authorization')
28
- return pair;
29
- if (v.toLowerCase().startsWith('bearer ')) {
30
- const token = v.slice('bearer '.length).trim();
31
- return `${key}=Bearer ${maskSecret(token)}`;
32
- }
33
- return `${key}=${maskSecret(v)}`;
34
- })
35
- .join(',');
36
15
  /** Last dotted segment of a key, case-insensitive — `otel.exporter.otlp-http.headers.Authorization` → `authorization`. */
37
16
  const lastSegment = (key) => {
38
17
  const parts = key.split('.');
39
18
  return (parts[parts.length - 1] ?? key).toLowerCase();
40
19
  };
41
- const BEARER_PREFIX_RE = /^\s*bearer\s+\S/i;
42
20
  /**
43
21
  * Capture a `Bearer <token>` value. eslint(prefer-regexp-exec) would prefer
44
22
  * .exec, but that token is what the repo's security hook scans for. Stick
@@ -56,24 +34,59 @@ const maskBearerValue = (value) => {
56
34
  }
57
35
  return `${leading}${prefix} ${maskSecret(token.trim())}`;
58
36
  };
37
+ /**
38
+ * Stands in for a value that carries something credential-shaped which no
39
+ * declared encoding could render. Printing the value would leak; printing
40
+ * nothing would hide that the file is broken — the marker says both.
41
+ */
42
+ const UNREADABLE = '<unreadable value, redacted>';
43
+ /**
44
+ * Masks a value that holds a header collection, by handing it to each encoding
45
+ * `core/headers.ts` declares — the comma-separated `key=value` form of
46
+ * `OTEL_EXPORTER_OTLP_HEADERS` and the Cowork console, or the JSON-object form
47
+ * of Claude Desktop's `otlpHeaders`.
48
+ *
49
+ * Dispatching on the *value's* encoding rather than the setting's name is the
50
+ * point: adapters call this key `otlpHeaders`, `OTEL_EXPORTER_OTLP_HEADERS`, or
51
+ * whatever their tool wants, and a name-based masker misses every name it
52
+ * wasn't told about — which is how MAI-1340 printed a live key.
53
+ *
54
+ * Fails closed. When nothing can render the value — truncated JSON, a nested
55
+ * non-string value, a token containing the `,` delimiter — the value is
56
+ * replaced with a marker rather than echoed. `doctor` prints what is on disk,
57
+ * and a hand-edited or MDM-mangled profile is exactly where that bites.
58
+ */
59
+ const maskHeaderCollection = (value) => {
60
+ const redacted = redactHeaderCollection(value, maskBearerValue);
61
+ if (redacted !== undefined)
62
+ return redacted;
63
+ return hasCredentialShape(value) ? UNREADABLE : value;
64
+ };
65
+ /**
66
+ * Masks an `OTEL_EXPORTER_OTLP_HEADERS`-shaped value, leaving non-secret keys
67
+ * visible and masking the bearer token portion. Kept as a named entry point for
68
+ * the env-var header form; values carrying no credential pass through
69
+ * unchanged, and unrenderable ones are replaced with a marker.
70
+ */
71
+ export const maskAuthHeader = (value) => maskHeaderCollection(value);
59
72
  /**
60
73
  * Mask any secret-looking value before printing to the user.
61
74
  *
62
- * 1. `OTEL_EXPORTER_OTLP_HEADERS` (legacy env-shaped header string).
63
- * 2. Any key whose last dotted segment is `authorization` — catches Codex TOML
64
- * paths like `otel.exporter.otlp-http.headers.Authorization`.
65
- * 3. Catch-all: any value that looks like a Bearer token, regardless of key.
66
- * Defense in depth for future adapters that use non-Authorization keys.
75
+ * 1. Any value that looks like a Bearer token — a single header value, such as
76
+ * Codex's one-TOML-key-per-header shape. Checked first so a base64 token's
77
+ * `=` padding can't be mistaken for a `key=value` pair below.
78
+ * 2. Any key whose last dotted segment names a secret header (`authorization`),
79
+ * for non-Bearer credential values.
80
+ * 3. A whole header collection in any encoding `core/headers.ts` declares —
81
+ * regardless of what the setting holding it is called, and failing closed
82
+ * when the value carries a credential nothing can render.
67
83
  */
68
84
  export const maskForDisplay = (envKey, value) => {
69
- if (envKey === 'OTEL_EXPORTER_OTLP_HEADERS')
70
- return maskAuthHeader(value);
71
- if (lastSegment(envKey) === 'authorization') {
72
- return BEARER_PREFIX_RE.test(value) ? maskBearerValue(value) : maskSecret(value);
73
- }
74
- if (BEARER_PREFIX_RE.test(value))
85
+ if (isBearerValue(value))
75
86
  return maskBearerValue(value);
76
- return value;
87
+ if (isSecretHeaderName(lastSegment(envKey)))
88
+ return maskSecret(value);
89
+ return maskHeaderCollection(value);
77
90
  };
78
91
  /** Renders a settings diff as plain text suitable for stdout. */
79
92
  export const renderDiff = (diff) => {
@@ -1 +1 @@
1
- {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/core/format.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/core/format.ts"],"names":[],"mappings":"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"}