@mainwave/cli 0.1.1 → 0.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +21 -0
- package/dist/adapters/claude-code.js +3 -0
- package/dist/adapters/claude-code.js.map +1 -1
- package/dist/adapters/claude-desktop.js +16 -48
- package/dist/adapters/claude-desktop.js.map +1 -1
- package/dist/adapters/copilot-chat.js +5 -28
- package/dist/adapters/copilot-chat.js.map +1 -1
- package/dist/adapters/copilot-cli.js +7 -30
- package/dist/adapters/copilot-cli.js.map +1 -1
- package/dist/core/doctor.js +10 -2
- package/dist/core/doctor.js.map +1 -1
- package/dist/core/format.js +48 -35
- package/dist/core/format.js.map +1 -1
- package/dist/core/headers.js +221 -0
- package/dist/core/headers.js.map +1 -0
- package/dist/core/markers.js +324 -0
- package/dist/core/markers.js.map +1 -0
- package/dist/core/prompts.js +11 -0
- package/dist/core/prompts.js.map +1 -1
- package/dist/core/version.js +8 -0
- package/dist/core/version.js.map +1 -0
- package/dist/core/wizard.js +91 -3
- package/dist/core/wizard.js.map +1 -1
- package/dist/main.js +2 -1
- package/dist/main.js.map +1 -1
- package/hooks/github-pr-marker.mjs +206 -0
- package/hooks/jira-ticket-marker.mjs +183 -0
- package/hooks/linear-ticket-marker.mjs +214 -0
- package/hooks/marker-core.mjs +228 -0
- package/hooks/matchers.json +17 -0
- package/package.json +3 -1
package/README.md
CHANGED
|
@@ -27,6 +27,27 @@ collector before exiting.
|
|
|
27
27
|
Re-run it any time. Existing values pre-fill the prompts, and opting back out of a setting removes it
|
|
28
28
|
rather than leaving it stale.
|
|
29
29
|
|
|
30
|
+
## Ticket & PR markers
|
|
31
|
+
|
|
32
|
+
For Claude Code, setup also offers **ticket & PR markers**: small post-tool hooks that emit one event
|
|
33
|
+
when a Linear or Jira issue is filed and one when a pull request is opened with `gh pr create`. They
|
|
34
|
+
are what populates "Tickets filed" and "PRs created" on the use case — without them those counts
|
|
35
|
+
read zero.
|
|
36
|
+
|
|
37
|
+
What leaves your machine: the issue key, whether it was a create or an update, and the PR's
|
|
38
|
+
url/number/title plus aggregate diff counts. Never ticket bodies, never diff content. The hooks fail
|
|
39
|
+
open — a telemetry problem can never block or slow a coding session — and count forward only from
|
|
40
|
+
when you enable them.
|
|
41
|
+
|
|
42
|
+
Mechanics: the hook scripts are copied to `~/.mainwave/hooks/` and referenced from the same settings
|
|
43
|
+
file the wizard writes. Upgrading the CLI does not update them by itself — **re-run setup after an
|
|
44
|
+
upgrade** to refresh both the scripts and the tool-matching rules; `doctor` warns when the installed
|
|
45
|
+
entries were written by an older CLI version. To disable, re-run setup and answer no at the markers
|
|
46
|
+
prompt — the entries are removed cleanly.
|
|
47
|
+
|
|
48
|
+
Markers are available only for tools with a hooks mechanism (today: Claude Code). For other tools
|
|
49
|
+
the wizard says so instead of appearing to succeed.
|
|
50
|
+
|
|
30
51
|
## Other commands
|
|
31
52
|
|
|
32
53
|
```bash
|
|
@@ -180,5 +180,8 @@ export const claudeCode = {
|
|
|
180
180
|
buildEnv,
|
|
181
181
|
parseEnv,
|
|
182
182
|
collectChecks,
|
|
183
|
+
markers: {
|
|
184
|
+
disclosure: 'Sends Linear/Jira issue ids and GitHub PR urls to the collector — never ticket bodies or diff content.',
|
|
185
|
+
},
|
|
183
186
|
};
|
|
184
187
|
//# sourceMappingURL=claude-code.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
-
|
|
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.
|
|
105
|
-
*
|
|
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) =>
|
|
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]:
|
|
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
|
|
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 =
|
|
131
|
+
const headers = parseHeaders(env[KEY.headers]);
|
|
162
132
|
if (headers) {
|
|
163
|
-
const token =
|
|
133
|
+
const token = headerBearerToken(headers[HEADER_NAME.authorization]);
|
|
164
134
|
if (token)
|
|
165
135
|
out.apiKey = token;
|
|
166
|
-
const ucid = headers[
|
|
167
|
-
if (
|
|
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 =
|
|
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:
|
|
191
|
-
ucid:
|
|
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(
|
|
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":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"claude-desktop.js","sourceRoot":"","sources":["../../src/adapters/claude-desktop.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
|
-
|
|
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 =
|
|
106
|
+
const token = headerBearerToken(headers[HEADER_NAME.authorization]);
|
|
130
107
|
if (token)
|
|
131
108
|
out.apiKey = token;
|
|
132
|
-
const u = headers[
|
|
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":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAU1D;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,MAAM,YAAY,GAAG,2BAA2B,CAAA;AAEhD,MAAM,kBAAkB,GAAG,kCAAkC,CAAA;AAC7D,MAAM,wBAAwB,GAAG,uCAAuC,CAAA;AACxE,MAAM,wBAAwB,GAAG,uCAAuC,CAAA;AACxE,MAAM,0BAA0B,GAAG,yCAAyC,CAAA;AAE5E,MAAM,qBAAqB,GAAG;IAC5B,kBAAkB;IAClB,wBAAwB;IACxB,wBAAwB;IACxB,0BAA0B;CAClB,CAAA;AAEV,MAAM,gBAAgB,GAAG;IACvB,6BAA6B;IAC7B,4BAA4B;IAC5B,6BAA6B;IAC7B,0BAA0B;CAClB,CAAA;AAEV,MAAM,gBAAgB,GAAG,GAAW,EAAE;IACpC,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAA;IAC7B,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAA;IAC3F,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;QAC5E,OAAO,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAA;IACvD,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAA;AACpE,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,gBAAgB,EAAE,CAAA;AAC/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAA;AAC5D,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;AAC7E,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAA;AAEjE,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAE3E,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,IAAa,EAAU,EAAE,CAClE
|
|
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
|
-
|
|
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 =
|
|
61
|
+
const token = headerBearerToken(headers[HEADER_NAME.authorization]);
|
|
85
62
|
if (token)
|
|
86
63
|
out.apiKey = token;
|
|
87
|
-
const ucid = headers[
|
|
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.
|
|
101
|
-
ucid = headers[
|
|
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":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAI1D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,MAAM,YAAY,GAAG,0BAA0B,CAAA;AAE/C,MAAM,gBAAgB,GAAG;IACvB,6BAA6B;IAC7B,4BAA4B;IAC5B,6BAA6B;IAC7B,sBAAsB;CACd,CAAA;AAEV,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAA;AACnE,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAA;AAEvD,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAE3E,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,IAAa,EAAU,EAAE,CAClE
|
|
1
|
+
{"version":3,"file":"copilot-cli.js","sourceRoot":"","sources":["../../src/adapters/copilot-cli.ts"],"names":[],"mappings":"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"}
|
package/dist/core/doctor.js
CHANGED
|
@@ -4,8 +4,10 @@ import { envFileCodec } from './codecs/env-file.js';
|
|
|
4
4
|
import { computeEffective } from './effective-settings.js';
|
|
5
5
|
import { ValidateError } from './errors.js';
|
|
6
6
|
import { color, maskForDisplay } from './format.js';
|
|
7
|
+
import { collectMarkerIssues, readPackagedMatchers, scanForMarkers } from './markers.js';
|
|
7
8
|
import { readExistingEnv } from './settings.js';
|
|
8
9
|
import { validateCollector } from './validate.js';
|
|
10
|
+
import { VERSION } from './version.js';
|
|
9
11
|
const renderFiles = (effective, hierarchy) => {
|
|
10
12
|
console.log(color.bold('Settings files (highest → lowest precedence):'));
|
|
11
13
|
for (const layer of hierarchy) {
|
|
@@ -314,7 +316,13 @@ export const runDoctor = async (adapter, options = {}) => {
|
|
|
314
316
|
console.log();
|
|
315
317
|
const issues = collectIssues(effective, adapter);
|
|
316
318
|
const shellEnvIssues = await checkShellEnv(adapter);
|
|
317
|
-
|
|
319
|
+
// Marker checks (MAI-1218): configured-at-all, stale version/matcher after a
|
|
320
|
+
// CLI upgrade, missing scripts, internal-installer double-emit, and the
|
|
321
|
+
// configured-but-never-emitted signal from the hooks' own log files.
|
|
322
|
+
const markerIssues = adapter.markers
|
|
323
|
+
? await collectMarkerIssues(await scanForMarkers(adapter.hierarchy), VERSION, await readPackagedMatchers())
|
|
324
|
+
: [];
|
|
325
|
+
renderChecks([...issues, ...shellEnvIssues, ...markerIssues]);
|
|
318
326
|
let validateFailed = false;
|
|
319
327
|
if (options.validate) {
|
|
320
328
|
console.log();
|
|
@@ -328,7 +336,7 @@ export const runDoctor = async (adapter, options = {}) => {
|
|
|
328
336
|
validateFailed = true;
|
|
329
337
|
}
|
|
330
338
|
}
|
|
331
|
-
const hasError = [...issues, ...shellEnvIssues].some((i) => i.level === 'error');
|
|
339
|
+
const hasError = [...issues, ...shellEnvIssues, ...markerIssues].some((i) => i.level === 'error');
|
|
332
340
|
return hasError || validateFailed ? 1 : 0;
|
|
333
341
|
};
|
|
334
342
|
//# sourceMappingURL=doctor.js.map
|
package/dist/core/doctor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/core/doctor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/core/doctor.ts"],"names":[],"mappings":"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"}
|
package/dist/core/format.js
CHANGED
|
@@ -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.
|
|
63
|
-
*
|
|
64
|
-
*
|
|
65
|
-
*
|
|
66
|
-
*
|
|
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 (
|
|
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
|
-
|
|
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) => {
|
package/dist/core/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/core/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/core/format.ts"],"names":[],"mappings":"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"}
|