@mainwave/cli 0.2.1 → 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.
- package/dist/adapters/codex-cli.js +68 -5
- package/dist/adapters/codex-cli.js.map +1 -1
- package/dist/core/git.js +26 -0
- package/dist/core/git.js.map +1 -0
- package/dist/core/markers.js +38 -5
- package/dist/core/markers.js.map +1 -1
- package/dist/core/prompts.js +16 -1
- package/dist/core/prompts.js.map +1 -1
- package/dist/core/wizard.js +67 -13
- package/dist/core/wizard.js.map +1 -1
- package/hooks/github-pr-marker.mjs +6 -1
- package/hooks/jira-ticket-marker.mjs +6 -1
- package/hooks/linear-ticket-marker.mjs +6 -1
- package/hooks/marker-core.mjs +56 -3
- package/package.json +1 -1
|
@@ -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 = [
|
|
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
|
-
|
|
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:
|
|
96
|
-
toolContent:
|
|
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":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAW3D;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,YAAY,GAAG,wBAAwB,CAAA;AAE7C,MAAM,aAAa,GAAG,CAAC,UAAU,EAAE,gBAAgB,EAAE,kBAAkB,CAAU,CAAA;AAGjF,MAAM,WAAW,GAAgC;IAC/C,QAAQ,EAAE,UAAU;IACpB,cAAc,EAAE,YAAY;IAC5B,gBAAgB,EAAE,aAAa;CAChC,CAAA;AAED,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"codex-cli.js","sourceRoot":"","sources":["../../src/adapters/codex-cli.ts"],"names":[],"mappings":"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"}
|
package/dist/core/git.js
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { spawnSync } from 'node:child_process';
|
|
2
|
+
/**
|
|
3
|
+
* The developer's email from `git config user.email`, or undefined when git
|
|
4
|
+
* isn't installed, isn't configured, or the command fails. Used to pre-fill the
|
|
5
|
+
* identity prompt for adapters that inject identity (Codex), so the developer's
|
|
6
|
+
* activity can be attributed without them typing their address (MAI-1394). The
|
|
7
|
+
* prompt lets them override or clear it, so a stale/shared git identity is never
|
|
8
|
+
* silently authoritative.
|
|
9
|
+
*/
|
|
10
|
+
export const detectGitEmail = () => {
|
|
11
|
+
try {
|
|
12
|
+
const r = spawnSync('git', ['config', '--get', 'user.email'], {
|
|
13
|
+
encoding: 'utf8',
|
|
14
|
+
timeout: 2000,
|
|
15
|
+
});
|
|
16
|
+
if (r.status !== 0)
|
|
17
|
+
return undefined;
|
|
18
|
+
const email = r.stdout.trim();
|
|
19
|
+
return email || undefined;
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
// Any unexpected spawn failure — no default, the prompt just starts empty.
|
|
23
|
+
return undefined;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
//# sourceMappingURL=git.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/core/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAuB,EAAE;IACrD,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE;YAC5D,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QACF,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAA;QACpC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAC7B,OAAO,KAAK,IAAI,SAAS,CAAA;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,2EAA2E;QAC3E,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC,CAAA"}
|
package/dist/core/markers.js
CHANGED
|
@@ -86,9 +86,14 @@ export const copyHookScripts = async (files, srcDir = packagedHooksDir(), destDi
|
|
|
86
86
|
* a plain invocation is written there and a missing script is a visible,
|
|
87
87
|
* non-blocking error instead.
|
|
88
88
|
*/
|
|
89
|
-
export const buildHookCommand = (scriptPath, version, plat = process.platform) =>
|
|
90
|
-
|
|
91
|
-
|
|
89
|
+
export const buildHookCommand = (scriptPath, version, plat = process.platform, runtimeTool) => {
|
|
90
|
+
// `--tool <name>` selects which config format the shared marker scripts read
|
|
91
|
+
// OTLP settings from at runtime (Codex: config.toml). Omitted → their default.
|
|
92
|
+
const toolArg = runtimeTool ? ` --tool ${runtimeTool}` : '';
|
|
93
|
+
return plat === 'win32'
|
|
94
|
+
? `node "${scriptPath}" ${MANAGED_BY}@${version}${toolArg}`
|
|
95
|
+
: `f="${scriptPath}"; [ -f "$f" ] && exec node "$f" ${MANAGED_BY}@${version}${toolArg}; exit 0`;
|
|
96
|
+
};
|
|
92
97
|
/** The version stamped in a CLI-owned command, or undefined for other shapes.
|
|
93
98
|
* Stops at `;` as well as whitespace — in the POSIX wrapper the stamp is
|
|
94
99
|
* immediately followed by `; exit 0`. */
|
|
@@ -99,12 +104,12 @@ export const parseManagedByVersion = (command) => {
|
|
|
99
104
|
/** First quoted `*.mjs` path in a command — where the entry expects its script. */
|
|
100
105
|
export const scriptPathFromCommand = (command) => /"([^"]+\.mjs)"/.exec(command)?.[1];
|
|
101
106
|
/** Matches the internal installer: PostToolUse, 5s timeout. */
|
|
102
|
-
export const buildHookGroups = (matchers, version, hookDir = installedHooksDir(), plat = process.platform) => matchers.map((m) => ({
|
|
107
|
+
export const buildHookGroups = (matchers, version, hookDir = installedHooksDir(), plat = process.platform, runtimeTool) => matchers.map((m) => ({
|
|
103
108
|
matcher: m.matcher,
|
|
104
109
|
hooks: [
|
|
105
110
|
{
|
|
106
111
|
type: 'command',
|
|
107
|
-
command: buildHookCommand(join(hookDir, m.hook), version, plat),
|
|
112
|
+
command: buildHookCommand(join(hookDir, m.hook), version, plat, runtimeTool),
|
|
108
113
|
timeout: 5,
|
|
109
114
|
},
|
|
110
115
|
],
|
|
@@ -206,6 +211,34 @@ export const planMarkers = (doc, groups) => {
|
|
|
206
211
|
const added = groups.filter((a) => !before.some((b) => sameGroup(b, a)));
|
|
207
212
|
return { next, removed, added, unchanged, changed: removed.length > 0 || added.length > 0 };
|
|
208
213
|
};
|
|
214
|
+
/**
|
|
215
|
+
* Prepare a marker write against a standalone hooks file (Codex's `hooks.json`),
|
|
216
|
+
* separate from the adapter's OTel-config file. Reads the file (empty doc when
|
|
217
|
+
* absent), splices our groups via `planMarkers`, and returns a `SettingsUpdate`
|
|
218
|
+
* whose `next` is the planned document — the env diff is empty because a hooks
|
|
219
|
+
* file carries no env, so the caller gates the write on `plan.changed`. Written
|
|
220
|
+
* through the same `applyUpdate` atomic path as every other surface.
|
|
221
|
+
*/
|
|
222
|
+
export const prepareMarkersFile = async (path, codec, groups, mode = 0o600) => {
|
|
223
|
+
let body;
|
|
224
|
+
try {
|
|
225
|
+
body = await fs.readFile(path, 'utf8');
|
|
226
|
+
}
|
|
227
|
+
catch {
|
|
228
|
+
body = null;
|
|
229
|
+
}
|
|
230
|
+
const doc = body === null ? codec.empty() : codec.parse(body, path);
|
|
231
|
+
const plan = planMarkers(doc, groups);
|
|
232
|
+
const update = {
|
|
233
|
+
path,
|
|
234
|
+
exists: body !== null,
|
|
235
|
+
codec,
|
|
236
|
+
next: plan.next,
|
|
237
|
+
diff: { added: [], changed: [], removed: [], unchanged: 0 },
|
|
238
|
+
mode,
|
|
239
|
+
};
|
|
240
|
+
return { update, plan };
|
|
241
|
+
};
|
|
209
242
|
const shortCommand = (command) => {
|
|
210
243
|
const script = scriptPathFromCommand(command);
|
|
211
244
|
const version = parseManagedByVersion(command);
|
package/dist/core/markers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markers.js","sourceRoot":"","sources":["../../src/core/markers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"markers.js","sourceRoot":"","sources":["../../src/core/markers.ts"],"names":[],"mappings":"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"}
|
package/dist/core/prompts.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { checkbox, confirm, input, password, select } from '@inquirer/prompts';
|
|
2
2
|
import { maskSecret } from './format.js';
|
|
3
3
|
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
4
|
+
// Deliberately loose: enough to catch a fat-fingered non-address, not to police
|
|
5
|
+
// valid RFC 5322 forms. The value is attribution metadata, not an auth boundary.
|
|
6
|
+
const EMAIL_RE = /^[^@\s]+@[^@\s]+\.[^@\s]+$/;
|
|
4
7
|
export const promptScope = async (localPath, globalPath, localWarning) => select({
|
|
5
8
|
message: 'Where should the configuration be written?',
|
|
6
9
|
default: localWarning ? 'global' : 'local',
|
|
@@ -24,6 +27,18 @@ export const promptUcid = async (defaultUcid) => {
|
|
|
24
27
|
const trimmed = value.trim();
|
|
25
28
|
return trimmed === '' ? undefined : trimmed;
|
|
26
29
|
};
|
|
30
|
+
export const promptUserEmail = async (defaultEmail) => {
|
|
31
|
+
const value = await input({
|
|
32
|
+
message: 'Your email for activity attribution (optional — press enter to skip):',
|
|
33
|
+
default: defaultEmail,
|
|
34
|
+
validate: (v) => {
|
|
35
|
+
const t = v.trim();
|
|
36
|
+
return t === '' || EMAIL_RE.test(t) || 'must be an email address, or empty to skip';
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
const trimmed = value.trim();
|
|
40
|
+
return trimmed === '' ? undefined : trimmed;
|
|
41
|
+
};
|
|
27
42
|
export const promptCollectorUrl = async (defaultUrl) => {
|
|
28
43
|
const value = await input({
|
|
29
44
|
message: 'Collector URL:',
|
|
@@ -63,7 +78,7 @@ export const promptApiKey = async (existing) => {
|
|
|
63
78
|
};
|
|
64
79
|
export const promptOptIns = async (existing) => {
|
|
65
80
|
const selected = await checkbox({
|
|
66
|
-
message: "Sensitive-data telemetry (space toggles, 'a' selects all):",
|
|
81
|
+
message: "Sensitive-data telemetry — enabling any of these sends that content off this machine to your collector (space toggles, 'a' selects all):",
|
|
67
82
|
choices: [
|
|
68
83
|
{
|
|
69
84
|
name: 'User prompts (logs full prompt content)',
|
package/dist/core/prompts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/core/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE9E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAIxC,MAAM,OAAO,GAAG,iEAAiE,CAAA;
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/core/prompts.ts"],"names":[],"mappings":"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"}
|
package/dist/core/wizard.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { select } from '@inquirer/prompts';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
2
3
|
import { resolve } from 'node:path';
|
|
3
4
|
import { ValidateError, WizardAbort } from './errors.js';
|
|
4
5
|
import { color, renderDiff } from './format.js';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
6
|
+
import { detectGitEmail } from './git.js';
|
|
7
|
+
import { buildHookGroups, copyHookScripts, describeMarkersPlan, hookScriptFiles, planMarkers, prepareMarkersFile, readOwnedGroups, readPackagedMatchers, scanForMarkers, } from './markers.js';
|
|
8
|
+
import { promptApiKey, promptCollectorUrl, promptConfirmWrite, promptMarkers, promptOptIns, promptScope, promptUcid, promptUserEmail, } from './prompts.js';
|
|
7
9
|
import { applyUpdate, prepareUpdate, readExistingEnv } from './settings.js';
|
|
8
10
|
import { ensureTty } from './tty.js';
|
|
9
11
|
import { validateCollector } from './validate.js';
|
|
@@ -97,12 +99,38 @@ export const runWizard = async (adapter) => {
|
|
|
97
99
|
// because the pre-fill read below is keyed on the chosen path.
|
|
98
100
|
const initialKey = await promptApiKey(existing.apiKey);
|
|
99
101
|
const initialUrl = await promptCollectorUrl(existing.collectorUrl ?? DEFAULT_COLLECTOR_URL);
|
|
100
|
-
|
|
101
|
-
if (!ucid) {
|
|
102
|
+
let ucid = await promptUcid(existing.ucid);
|
|
103
|
+
if (!ucid && adapter.autoUcid) {
|
|
104
|
+
// This tool's telemetry is invisible without a UCID (empty UCID → dropped
|
|
105
|
+
// from the Use Cases view), so mint one rather than orphan the runs. It
|
|
106
|
+
// persists in the config, so a re-run pre-fills and keeps this same id
|
|
107
|
+
// (MAI-1382).
|
|
108
|
+
ucid = randomUUID();
|
|
109
|
+
console.log();
|
|
110
|
+
console.log(color.yellow(`No use case ID set — generated ${ucid}.\n` +
|
|
111
|
+
"It'll appear under Unassigned Agent Activity on the Use Cases page,\n" +
|
|
112
|
+
'where you can assign it to a use case.'));
|
|
113
|
+
}
|
|
114
|
+
else if (!ucid) {
|
|
102
115
|
console.log();
|
|
103
116
|
console.log(color.yellow('No use case ID set — events still reach the collector but land in the\n' +
|
|
104
117
|
'unmapped bucket until you assign a UCID (re-run setup to add one).'));
|
|
105
118
|
}
|
|
119
|
+
// Identity for tools whose telemetry omits it (Codex stamps user.email on only
|
|
120
|
+
// ~half its records and its spans carry none). Resolve the developer's email —
|
|
121
|
+
// git config as the editable default — so the collector can attribute activity
|
|
122
|
+
// via the X-Mainwave-User-Email header. Tools that emit user.email natively
|
|
123
|
+
// (Claude Code) leave injectsIdentity unset and are never prompted (MAI-1394).
|
|
124
|
+
let userEmail;
|
|
125
|
+
if (adapter.injectsIdentity) {
|
|
126
|
+
userEmail = await promptUserEmail(existing.userEmail ?? detectGitEmail());
|
|
127
|
+
if (!userEmail) {
|
|
128
|
+
console.log();
|
|
129
|
+
console.log(color.yellow(`No email set — ${adapter.displayName} activity that arrives without a native\n` +
|
|
130
|
+
'user.email stays unattributed on the People and per-user cost views\n' +
|
|
131
|
+
'(re-run setup to add one).'));
|
|
132
|
+
}
|
|
133
|
+
}
|
|
106
134
|
const optIns = await promptOptIns(existing.optIns);
|
|
107
135
|
if (optIns.userPrompts) {
|
|
108
136
|
console.log();
|
|
@@ -115,7 +143,11 @@ export const runWizard = async (adapter) => {
|
|
|
115
143
|
// on-disk state, read from the file the wizard is about to write.
|
|
116
144
|
let markersOn = null;
|
|
117
145
|
if (adapter.markers) {
|
|
118
|
-
|
|
146
|
+
// Read the re-run default from wherever the hooks actually live — the sibling
|
|
147
|
+
// hooks.json for Codex, the primary settings file otherwise.
|
|
148
|
+
const hf = adapter.markers.hooksFile;
|
|
149
|
+
const markersReadPath = hf ? (scope === 'local' ? (hf.localPath ?? hf.path) : hf.path) : path;
|
|
150
|
+
const current = await readOwnedGroups(markersReadPath);
|
|
119
151
|
const configured = (current ?? []).some((g) => g.ownership === 'cli');
|
|
120
152
|
markersOn = await promptMarkers(adapter.markers.disclosure, configured || undefined);
|
|
121
153
|
}
|
|
@@ -126,23 +158,42 @@ export const runWizard = async (adapter) => {
|
|
|
126
158
|
}
|
|
127
159
|
console.log();
|
|
128
160
|
const { url: collectorUrl, key: apiKey } = await validateWithRetry(initialUrl, initialKey);
|
|
129
|
-
const buildInput = { ucid, collectorUrl, apiKey, optIns };
|
|
161
|
+
const buildInput = { ucid, collectorUrl, apiKey, optIns, userEmail };
|
|
130
162
|
const primaryUpdate = await prepareUpdate({
|
|
131
163
|
path,
|
|
132
164
|
newEnv: adapter.buildEnv(buildInput),
|
|
133
165
|
managedKeys: adapter.managedEnvKeys,
|
|
134
166
|
codec: adapter.codec,
|
|
135
167
|
});
|
|
136
|
-
//
|
|
137
|
-
//
|
|
138
|
-
//
|
|
168
|
+
// Marker hook groups: remove everything we own (any prior shape), then append
|
|
169
|
+
// fresh groups from the packaged matchers — or nothing, when opted out. Claude
|
|
170
|
+
// Code co-locates hooks in its settings file (splice into the primary write);
|
|
171
|
+
// Codex loads them from a sibling hooks.json, which gets its own write.
|
|
172
|
+
// `markersCarrier` is whichever update's document holds them, so change
|
|
173
|
+
// detection and the diff render key off the right one.
|
|
139
174
|
let markersPlan = null;
|
|
140
175
|
let hookFiles = [];
|
|
176
|
+
let separateMarkersUpdate = null;
|
|
177
|
+
let markersCarrier = null;
|
|
141
178
|
if (markersOn !== null) {
|
|
142
179
|
const matchers = await readPackagedMatchers();
|
|
143
180
|
hookFiles = hookScriptFiles(matchers);
|
|
144
|
-
|
|
145
|
-
|
|
181
|
+
const groups = markersOn
|
|
182
|
+
? buildHookGroups(matchers, VERSION, undefined, undefined, adapter.markers?.runtimeTool)
|
|
183
|
+
: [];
|
|
184
|
+
const hooksFile = adapter.markers?.hooksFile;
|
|
185
|
+
if (hooksFile) {
|
|
186
|
+
const hooksPath = scope === 'local' ? (hooksFile.localPath ?? hooksFile.path) : hooksFile.path;
|
|
187
|
+
const prepared = await prepareMarkersFile(hooksPath, hooksFile.codec, groups);
|
|
188
|
+
markersPlan = prepared.plan;
|
|
189
|
+
separateMarkersUpdate = prepared.update;
|
|
190
|
+
markersCarrier = prepared.update;
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
markersPlan = planMarkers(primaryUpdate.next, groups);
|
|
194
|
+
primaryUpdate.next = markersPlan.next;
|
|
195
|
+
markersCarrier = primaryUpdate;
|
|
196
|
+
}
|
|
146
197
|
}
|
|
147
198
|
const additionalUpdates = await Promise.all(additionalWritePaths.map(({ aw, path: awPath }) => prepareUpdate({
|
|
148
199
|
path: awPath,
|
|
@@ -153,13 +204,16 @@ export const runWizard = async (adapter) => {
|
|
|
153
204
|
})));
|
|
154
205
|
const labeledUpdates = [
|
|
155
206
|
{ label: path, update: primaryUpdate },
|
|
207
|
+
...(separateMarkersUpdate
|
|
208
|
+
? [{ label: separateMarkersUpdate.path, update: separateMarkersUpdate }]
|
|
209
|
+
: []),
|
|
156
210
|
...additionalUpdates.map((update, i) => ({
|
|
157
211
|
label: `${additionalWritePaths[i].aw.label} (${update.path})`,
|
|
158
212
|
update,
|
|
159
213
|
})),
|
|
160
214
|
];
|
|
161
215
|
const markersChanged = markersPlan?.changed ?? false;
|
|
162
|
-
const changedUpdates = labeledUpdates.filter(({ update }) => hasAnyChange(update.diff) || (update ===
|
|
216
|
+
const changedUpdates = labeledUpdates.filter(({ update }) => hasAnyChange(update.diff) || (update === markersCarrier && markersChanged));
|
|
163
217
|
if (changedUpdates.length === 0) {
|
|
164
218
|
console.log();
|
|
165
219
|
console.log(color.dim(`No changes needed in ${path}.`));
|
|
@@ -179,7 +233,7 @@ export const runWizard = async (adapter) => {
|
|
|
179
233
|
const body = renderDiff(update.diff);
|
|
180
234
|
if (body)
|
|
181
235
|
console.log(body);
|
|
182
|
-
if (update ===
|
|
236
|
+
if (update === markersCarrier && markersPlan && markersChanged) {
|
|
183
237
|
for (const line of describeMarkersPlan(markersPlan)) {
|
|
184
238
|
const painted = line.startsWith('+')
|
|
185
239
|
? color.green(line)
|
package/dist/core/wizard.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../src/core/wizard.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../src/core/wizard.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ import {
|
|
|
26
26
|
buildMarkerPayload,
|
|
27
27
|
emitMarker,
|
|
28
28
|
loadOtelConfig,
|
|
29
|
+
markerTool,
|
|
29
30
|
makeLog,
|
|
30
31
|
payloadShape,
|
|
31
32
|
readStdin,
|
|
@@ -164,7 +165,11 @@ const main = async () => {
|
|
|
164
165
|
const title = extractPrTitle(command)
|
|
165
166
|
|
|
166
167
|
const cwd = payload.cwd || process.cwd()
|
|
167
|
-
const { endpoint, bearer, resourceAttrs } = loadOtelConfig(
|
|
168
|
+
const { endpoint, bearer, resourceAttrs } = loadOtelConfig(
|
|
169
|
+
cwd,
|
|
170
|
+
process.env,
|
|
171
|
+
markerTool(process.argv),
|
|
172
|
+
)
|
|
168
173
|
log(
|
|
169
174
|
`pr=${number} endpoint=${endpoint ? 'set' : 'MISSING'} ` +
|
|
170
175
|
`bearer=${bearer ? 'set' : 'MISSING'} ucid=${resourceAttrs['mainwave.ucid'] || 'MISSING'}`,
|
|
@@ -30,6 +30,7 @@ import {
|
|
|
30
30
|
buildMarkerPayload,
|
|
31
31
|
emitMarker,
|
|
32
32
|
loadOtelConfig,
|
|
33
|
+
markerTool,
|
|
33
34
|
makeLog,
|
|
34
35
|
payloadShape,
|
|
35
36
|
readStdin,
|
|
@@ -152,7 +153,11 @@ const main = async () => {
|
|
|
152
153
|
const op = detectOp(payload.tool_name)
|
|
153
154
|
|
|
154
155
|
const cwd = payload.cwd || process.cwd()
|
|
155
|
-
const { endpoint, bearer, resourceAttrs } = loadOtelConfig(
|
|
156
|
+
const { endpoint, bearer, resourceAttrs } = loadOtelConfig(
|
|
157
|
+
cwd,
|
|
158
|
+
process.env,
|
|
159
|
+
markerTool(process.argv),
|
|
160
|
+
)
|
|
156
161
|
log(
|
|
157
162
|
`issue=${issueKey} op=${op} endpoint=${endpoint ? 'set' : 'MISSING'} ` +
|
|
158
163
|
`bearer=${bearer ? 'set' : 'MISSING'} ucid=${resourceAttrs['mainwave.ucid'] || 'MISSING'}`,
|
|
@@ -29,6 +29,7 @@ import {
|
|
|
29
29
|
buildMarkerPayload,
|
|
30
30
|
emitMarker,
|
|
31
31
|
loadOtelConfig,
|
|
32
|
+
markerTool,
|
|
32
33
|
makeLog,
|
|
33
34
|
markerResourceAttrs as coreMarkerResourceAttrs,
|
|
34
35
|
payloadShape,
|
|
@@ -183,7 +184,11 @@ const main = async () => {
|
|
|
183
184
|
const op = detectOp(payload.tool_name, payload.tool_input)
|
|
184
185
|
|
|
185
186
|
const cwd = payload.cwd || process.cwd()
|
|
186
|
-
const { endpoint, bearer, resourceAttrs } = loadOtelConfig(
|
|
187
|
+
const { endpoint, bearer, resourceAttrs } = loadOtelConfig(
|
|
188
|
+
cwd,
|
|
189
|
+
process.env,
|
|
190
|
+
markerTool(process.argv),
|
|
191
|
+
)
|
|
187
192
|
log(
|
|
188
193
|
`issue=${issueKey} op=${op} endpoint=${endpoint ? 'set' : 'MISSING'} ` +
|
|
189
194
|
`bearer=${bearer ? 'set' : 'MISSING'} ucid=${resourceAttrs['mainwave.ucid'] || 'MISSING'}`,
|
package/hooks/marker-core.mjs
CHANGED
|
@@ -94,9 +94,62 @@ export const settingsEnvBlocks = (cwd) =>
|
|
|
94
94
|
join(cwd, '.claude', 'settings.local.json'),
|
|
95
95
|
].map((p) => settingsEnv(readFileSafe(p)))
|
|
96
96
|
|
|
97
|
-
/**
|
|
98
|
-
|
|
99
|
-
|
|
97
|
+
/**
|
|
98
|
+
* Which tool's config format to resolve OTLP settings from, read off the
|
|
99
|
+
* `--tool <name>` flag the CLI bakes into the hook command. Codex reads its
|
|
100
|
+
* `config.toml`; the default (Claude Code) reads `.claude/settings.json`.
|
|
101
|
+
*/
|
|
102
|
+
export const markerTool = (argv) => {
|
|
103
|
+
const i = (argv ?? []).indexOf('--tool')
|
|
104
|
+
return i !== -1 && argv[i + 1] ? argv[i + 1] : 'claude-code'
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/** Last `key = "value"` match in TOML-ish text; last wins so a project-local
|
|
108
|
+
* config.toml overrides the global one when both are concatenated. The key may
|
|
109
|
+
* be bare (`X-Mainwave-UCID = …`) or quoted (`"X-Mainwave-UCID" = …`), covering
|
|
110
|
+
* either TOML rendering. */
|
|
111
|
+
const lastTomlString = (text, key) => {
|
|
112
|
+
const escaped = key.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')
|
|
113
|
+
const re = new RegExp(`"?${escaped}"?\\s*=\\s*"([^"]*)"`, 'g')
|
|
114
|
+
let m
|
|
115
|
+
let last
|
|
116
|
+
while ((m = re.exec(text)) !== null) last = m[1]
|
|
117
|
+
return last
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/** Strip a per-signal OTLP suffix (`/v1/logs` …) back to the base endpoint the
|
|
121
|
+
* emit re-adds `/v1/traces` to. Codex writes per-signal endpoints; Claude Code's
|
|
122
|
+
* OTEL_EXPORTER_OTLP_ENDPOINT is already the base, so this is Codex-only. */
|
|
123
|
+
const stripSignalSuffix = (endpoint) =>
|
|
124
|
+
(endpoint ?? '').replace(/\/v1\/(logs|traces|metrics)\/?$/, '')
|
|
125
|
+
|
|
126
|
+
/**
|
|
127
|
+
* OTLP config from Codex's `config.toml` (global + project-local). Codex carries
|
|
128
|
+
* tenancy on HTTP headers rather than OTEL_RESOURCE_ATTRIBUTES, so the UCID is the
|
|
129
|
+
* `X-Mainwave-UCID` header value and the bearer is the `Authorization` header — the
|
|
130
|
+
* marker re-emits the UCID as a `mainwave.ucid` resource attr, which the collector
|
|
131
|
+
* reads the same as a header-promoted one. Missing keys → undefined (the hook
|
|
132
|
+
* skips, fail-open), never a broken emit.
|
|
133
|
+
*/
|
|
134
|
+
export const codexOtelConfig = (cwd, readFile = readFileSafe) => {
|
|
135
|
+
const text = [
|
|
136
|
+
readFile(join(homedir(), '.codex', 'config.toml')),
|
|
137
|
+
readFile(join(cwd, '.codex', 'config.toml')),
|
|
138
|
+
].join('\n')
|
|
139
|
+
const endpoint = stripSignalSuffix(lastTomlString(text, 'endpoint'))
|
|
140
|
+
const bearer = lastTomlString(text, 'Authorization')
|
|
141
|
+
const ucid = lastTomlString(text, 'X-Mainwave-UCID')
|
|
142
|
+
return {
|
|
143
|
+
endpoint: endpoint || undefined,
|
|
144
|
+
bearer: bearer || undefined,
|
|
145
|
+
resourceAttrs: ucid ? { 'mainwave.ucid': ucid } : {},
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
/** Resolve OTLP config for the marker emit. `tool` selects the source format:
|
|
150
|
+
* 'codex' reads config.toml; the default reads Claude Code's settings.json env. */
|
|
151
|
+
export const loadOtelConfig = (cwd, processEnv, tool = 'claude-code') =>
|
|
152
|
+
tool === 'codex' ? codexOtelConfig(cwd) : resolveOtelConfig(settingsEnvBlocks(cwd), processEnv)
|
|
100
153
|
|
|
101
154
|
/**
|
|
102
155
|
* Keep the developer's identity attrs — above all `mainwave.ucid`, so the marker
|