@mainwave/cli 0.6.1 → 0.7.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 +97 -18
- package/dist/adapters/claude-code.js +258 -38
- package/dist/adapters/claude-code.js.map +1 -1
- package/dist/adapters/claude-desktop.js +0 -87
- package/dist/adapters/claude-desktop.js.map +1 -1
- package/dist/adapters/codex-cli.js +0 -65
- package/dist/adapters/codex-cli.js.map +1 -1
- package/dist/adapters/copilot-chat.js +7 -42
- package/dist/adapters/copilot-chat.js.map +1 -1
- package/dist/adapters/copilot-cli.js +7 -32
- package/dist/adapters/copilot-cli.js.map +1 -1
- package/dist/adapters/cursor-enterprise.js +4 -53
- package/dist/adapters/cursor-enterprise.js.map +1 -1
- package/dist/adapters/cursor.js +0 -62
- package/dist/adapters/cursor.js.map +1 -1
- package/dist/api/index.js +0 -1
- package/dist/api/index.js.map +1 -1
- package/dist/api/types.gen.js +0 -1
- package/dist/api/types.gen.js.map +1 -1
- package/dist/core/apply.js +73 -97
- package/dist/core/apply.js.map +1 -1
- package/dist/core/auth-commands.js +5 -20
- package/dist/core/auth-commands.js.map +1 -1
- package/dist/core/behaviour-hooks.js +0 -7
- package/dist/core/behaviour-hooks.js.map +1 -1
- package/dist/core/browser.js +0 -18
- package/dist/core/browser.js.map +1 -1
- package/dist/core/codecs/cursor-hooks-json.js +0 -8
- package/dist/core/codecs/cursor-hooks-json.js.map +1 -1
- package/dist/core/codecs/json-flat.js +0 -28
- package/dist/core/codecs/json-flat.js.map +1 -1
- package/dist/core/codecs/json-managed.js +0 -30
- package/dist/core/codecs/json-managed.js.map +1 -1
- package/dist/core/codecs/toml-otel.js +0 -39
- package/dist/core/codecs/toml-otel.js.map +1 -1
- package/dist/core/detect.js +0 -29
- package/dist/core/detect.js.map +1 -1
- package/dist/core/device-login.js +0 -22
- package/dist/core/device-login.js.map +1 -1
- package/dist/core/doctor.js +209 -48
- package/dist/core/doctor.js.map +1 -1
- package/dist/core/edit.js +18 -0
- package/dist/core/edit.js.map +1 -1
- package/dist/core/effective-settings.js +107 -10
- package/dist/core/effective-settings.js.map +1 -1
- package/dist/core/env-command.js +0 -9
- package/dist/core/env-command.js.map +1 -1
- package/dist/core/errors.js +0 -12
- package/dist/core/errors.js.map +1 -1
- package/dist/core/flags.js +0 -13
- package/dist/core/flags.js.map +1 -1
- package/dist/core/format.js +0 -56
- package/dist/core/format.js.map +1 -1
- package/dist/core/git.js +0 -9
- package/dist/core/git.js.map +1 -1
- package/dist/core/headers.js +4 -97
- package/dist/core/headers.js.map +1 -1
- package/dist/core/install-hooks.js +81 -0
- package/dist/core/install-hooks.js.map +1 -0
- package/dist/core/interview.js +25 -151
- package/dist/core/interview.js.map +1 -1
- package/dist/core/keys.js +0 -18
- package/dist/core/keys.js.map +1 -1
- package/dist/core/layer-policy.js +34 -0
- package/dist/core/layer-policy.js.map +1 -0
- package/dist/core/markers.js +220 -117
- package/dist/core/markers.js.map +1 -1
- package/dist/core/pinned-use-case.js +11 -0
- package/dist/core/pinned-use-case.js.map +1 -0
- package/dist/core/platform.js +5 -47
- package/dist/core/platform.js.map +1 -1
- package/dist/core/post-setup.js +7 -18
- package/dist/core/post-setup.js.map +1 -1
- package/dist/core/prompts.js +0 -59
- package/dist/core/prompts.js.map +1 -1
- package/dist/core/settings.js +20 -16
- package/dist/core/settings.js.map +1 -1
- package/dist/core/skills.js +0 -75
- package/dist/core/skills.js.map +1 -1
- package/dist/core/status.js +97 -45
- package/dist/core/status.js.map +1 -1
- package/dist/core/store.js +4 -34
- package/dist/core/store.js.map +1 -1
- package/dist/core/tty.js +0 -9
- package/dist/core/tty.js.map +1 -1
- package/dist/core/ucid.js +0 -13
- package/dist/core/ucid.js.map +1 -1
- package/dist/core/ui.js +0 -11
- package/dist/core/ui.js.map +1 -1
- package/dist/core/use-case.js +3 -49
- package/dist/core/use-case.js.map +1 -1
- package/dist/core/validate.js +0 -5
- package/dist/core/validate.js.map +1 -1
- package/dist/core/verify.js +51 -33
- package/dist/core/verify.js.map +1 -1
- package/dist/core/version.js +0 -3
- package/dist/core/version.js.map +1 -1
- package/dist/core/wizard.js +172 -128
- package/dist/core/wizard.js.map +1 -1
- package/dist/main.js +16 -38
- package/dist/main.js.map +1 -1
- package/hooks/cursor-otlp.mjs +4 -4
- package/hooks/github-pr-marker.mjs +31 -12
- package/hooks/jira-ticket-marker.mjs +46 -27
- package/hooks/linear-ticket-marker.mjs +58 -37
- package/hooks/marker-core.mjs +671 -59
- package/hooks/matchers.json +1 -1
- package/hooks/vocabulary.d.mts +9 -1
- package/hooks/vocabulary.mjs +73 -23
- package/package.json +3 -3
- package/skills/mainwave-instrument/SKILL.md +6 -5
- package/skills/mainwave-instrument/reference/frameworks.md +33 -22
- package/skills/mainwave-instrument/reference/troubleshooting.md +13 -4
- package/skills/mainwave-setup/SKILL.md +22 -6
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { promises as fs } from 'node:fs';
|
|
2
|
-
import { join } from 'node:path';
|
|
2
|
+
import { isAbsolute, join, resolve } from 'node:path';
|
|
3
|
+
import { ignoredKeysAt, isManagedLayer, policyState } from './layer-policy.js';
|
|
3
4
|
import { readExistingEnv } from './settings.js';
|
|
4
5
|
const extensionFor = (codec) => {
|
|
5
6
|
if (codec.format === 'toml')
|
|
@@ -25,6 +26,7 @@ const scanFile = async (layer, path, codec) => {
|
|
|
25
26
|
};
|
|
26
27
|
}
|
|
27
28
|
};
|
|
29
|
+
export const dropInNames = (entries, ext = '.json') => entries.filter((e) => e.endsWith(ext) && !e.startsWith('.')).sort();
|
|
28
30
|
const scanDir = async (layer, codec) => {
|
|
29
31
|
let entries;
|
|
30
32
|
try {
|
|
@@ -44,25 +46,120 @@ const scanDir = async (layer, codec) => {
|
|
|
44
46
|
},
|
|
45
47
|
];
|
|
46
48
|
}
|
|
47
|
-
const
|
|
48
|
-
const matching = entries.filter((e) => e.endsWith(ext)).sort();
|
|
49
|
+
const matching = dropInNames(entries, extensionFor(codec)).reverse();
|
|
49
50
|
if (matching.length === 0) {
|
|
50
51
|
return [{ layer, path: layer.path, status: 'missing', env: {} }];
|
|
51
52
|
}
|
|
52
53
|
return Promise.all(matching.map((name) => scanFile(layer, join(layer.path, name), codec)));
|
|
53
54
|
};
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
const
|
|
55
|
+
const scanLayer = (codec) => async (layer) => layer.kind === 'dir' ? scanDir(layer, codec) : [await scanFile(layer, layer.path, codec)];
|
|
56
|
+
const inactiveLayers = async (adapter, scans) => {
|
|
57
|
+
if (!adapter.inactiveLayers)
|
|
58
|
+
return [];
|
|
59
|
+
const projectDir = process.env.CLAUDE_PROJECT_DIR;
|
|
60
|
+
const sessionProjectScans = projectDir && isAbsolute(projectDir)
|
|
61
|
+
? (await Promise.all(adapter.hierarchy
|
|
62
|
+
.filter((l) => !isAbsolute(l.path))
|
|
63
|
+
.map((l) => scanLayer(adapter.codec)({ ...l, path: join(projectDir, l.path) })))).flat()
|
|
64
|
+
: [];
|
|
65
|
+
const shell = { ...process.env };
|
|
66
|
+
for (const scan of [...scans, ...sessionProjectScans]) {
|
|
67
|
+
if (scan.layer.id === 'user')
|
|
68
|
+
continue;
|
|
69
|
+
for (const [k, v] of Object.entries(scan.env))
|
|
70
|
+
if (shell[k] === v)
|
|
71
|
+
delete shell[k];
|
|
72
|
+
}
|
|
73
|
+
const user = scans.filter((scan) => scan.layer.id === 'user').map((scan) => scan.env);
|
|
74
|
+
return adapter.inactiveLayers(Object.assign(shell, ...user));
|
|
75
|
+
};
|
|
76
|
+
export const activeHierarchy = async (adapter) => {
|
|
77
|
+
if (!adapter.inactiveLayers)
|
|
78
|
+
return adapter.hierarchy;
|
|
79
|
+
const scans = (await Promise.all(adapter.hierarchy.map(scanLayer(adapter.codec)))).flat();
|
|
80
|
+
const skip = await inactiveLayers(adapter, scans);
|
|
81
|
+
return adapter.hierarchy.filter((l) => !skip.some((s) => s.id === l.id));
|
|
82
|
+
};
|
|
83
|
+
export const flattenEffective = (effective) => {
|
|
84
|
+
const out = {};
|
|
85
|
+
for (const [k, entry] of Object.entries(effective.effective)) {
|
|
86
|
+
out[k] = entry.value;
|
|
87
|
+
}
|
|
88
|
+
return out;
|
|
89
|
+
};
|
|
90
|
+
export const nativeIdentityReason = async (adapter, effective) => {
|
|
91
|
+
if (!adapter.nativeIdentityAbsent)
|
|
92
|
+
return undefined;
|
|
93
|
+
const e = effective ?? (await computeEffective(adapter));
|
|
94
|
+
return adapter.nativeIdentityAbsent({ ...process.env, ...flattenEffective(e) }, e.scans.filter((s) => s.status === 'present').map((s) => s.path));
|
|
95
|
+
};
|
|
96
|
+
export const computeEffective = async (adapter, policyOverride) => {
|
|
97
|
+
const allScans = await Promise.all(adapter.hierarchy.map(scanLayer(adapter.codec)));
|
|
98
|
+
const skip = await inactiveLayers(adapter, allScans.flat());
|
|
99
|
+
const skipped = adapter.hierarchy.flatMap((layer) => {
|
|
100
|
+
const reason = skip.find((s) => s.id === layer.id)?.reason;
|
|
101
|
+
return reason === undefined ? [] : [{ layer, reason }];
|
|
102
|
+
});
|
|
103
|
+
const nestedScans = allScans.filter((_, i) => !skipped.some((s) => s.layer === adapter.hierarchy[i]));
|
|
104
|
+
const flat = nestedScans.flat();
|
|
105
|
+
const scans = flat.filter((scan, i) => !flat.slice(i + 1).some((later) => resolve(later.path) === resolve(scan.path)));
|
|
106
|
+
return { ...effectiveFrom(adapter, scans, policyOverride), skipped };
|
|
107
|
+
};
|
|
108
|
+
export const effectiveFrom = (adapter, scans, policyOverride) => {
|
|
109
|
+
const ignored = [];
|
|
110
|
+
if (adapter.layerKeyPolicy) {
|
|
111
|
+
for (const scan of scans) {
|
|
112
|
+
const keys = ignoredKeysAt(adapter.layerKeyPolicy, scan.layer.id, scan.env);
|
|
113
|
+
if (keys.length > 0)
|
|
114
|
+
ignored.push({ scan, keys });
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
const policy = policyOverride ??
|
|
118
|
+
(adapter.layerKeyPolicy && ignored.length > 0
|
|
119
|
+
? policyState(adapter.layerKeyPolicy)
|
|
120
|
+
: 'inactive');
|
|
121
|
+
const unitKey = adapter.managedUnitKey;
|
|
122
|
+
const unitSource = unitKey
|
|
123
|
+
? scans.find((scan) => isManagedLayer(scan.layer) &&
|
|
124
|
+
scan.layer.managedSource !== undefined &&
|
|
125
|
+
Object.keys(scan.env).some((k) => unitKey(k)))?.layer.managedSource
|
|
126
|
+
: undefined;
|
|
127
|
+
const droppedInManaged = (scan, key) => unitSource !== undefined &&
|
|
128
|
+
unitKey !== undefined &&
|
|
129
|
+
unitKey(key) &&
|
|
130
|
+
scan.layer.managedSource !== unitSource;
|
|
131
|
+
const managedEnv = {};
|
|
132
|
+
for (const scan of scans) {
|
|
133
|
+
if (!isManagedLayer(scan.layer))
|
|
134
|
+
continue;
|
|
135
|
+
for (const [k, v] of Object.entries(scan.env)) {
|
|
136
|
+
if (!(k in managedEnv) && !droppedInManaged(scan, k))
|
|
137
|
+
managedEnv[k] = v;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
const policyIgnores = (scan, key) => ignored.some((i) => i.scan === scan && i.keys.includes(key));
|
|
141
|
+
const ignoredHere = (scan, key) => policy === 'active' && policyIgnores(scan, key);
|
|
142
|
+
const locked = [];
|
|
143
|
+
if (adapter.managedLock) {
|
|
144
|
+
for (const scan of scans) {
|
|
145
|
+
if (isManagedLayer(scan.layer))
|
|
146
|
+
continue;
|
|
147
|
+
const keys = Object.keys(scan.env).filter((k) => !policyIgnores(scan, k) && adapter.managedLock(k, managedEnv));
|
|
148
|
+
if (keys.length > 0)
|
|
149
|
+
locked.push({ scan, keys });
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
const dropped = (scan, key) => ignoredHere(scan, key) ||
|
|
153
|
+
(isManagedLayer(scan.layer)
|
|
154
|
+
? droppedInManaged(scan, key)
|
|
155
|
+
: locked.some((l) => l.scan === scan && l.keys.includes(key)));
|
|
59
156
|
const effective = {};
|
|
60
157
|
for (const scan of scans) {
|
|
61
158
|
for (const [k, v] of Object.entries(scan.env)) {
|
|
62
|
-
if (!(k in effective))
|
|
159
|
+
if (!(k in effective) && !dropped(scan, k))
|
|
63
160
|
effective[k] = { key: k, value: v, source: scan };
|
|
64
161
|
}
|
|
65
162
|
}
|
|
66
|
-
return { scans, effective };
|
|
163
|
+
return { scans, effective, policy, ignored, unitSource, locked };
|
|
67
164
|
};
|
|
68
165
|
//# sourceMappingURL=effective-settings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effective-settings.js","sourceRoot":"","sources":["../../src/core/effective-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"effective-settings.js","sourceRoot":"","sources":["../../src/core/effective-settings.ts"],"names":[],"mappings":"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"}
|
package/dist/core/env-command.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
import { computeEffective } from './effective-settings.js';
|
|
2
|
-
/**
|
|
3
|
-
* Emits `export KEY="value"` lines for the adapter's managed env keys, read
|
|
4
|
-
* from the effective settings (hierarchy walk). Intended usage:
|
|
5
|
-
* eval "$(mainwave-cli env <adapter>)"
|
|
6
|
-
*
|
|
7
|
-
* Only adapters whose codec stores shell env vars (`format === 'env'`) can be
|
|
8
|
-
* sourced — TOML / JSON adapters use the managed keys for in-process
|
|
9
|
-
* configuration, not shell export.
|
|
10
|
-
*/
|
|
11
2
|
const escapeDoubleQuoted = (s) => s.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n');
|
|
12
3
|
export const runEnvCommand = async (adapter) => {
|
|
13
4
|
if (adapter.codec.format !== 'env') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-command.js","sourceRoot":"","sources":["../../src/core/env-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"env-command.js","sourceRoot":"","sources":["../../src/core/env-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAc1D,MAAM,kBAAkB,GAAG,CAAC,CAAS,EAAU,EAAE,CAC/C,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;AAErE,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,OAAgB,EAAmB,EAAE;IACvE,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QACnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,qBAAqB,OAAO,CAAC,WAAW,2BAA2B;YACjE,iBAAiB,OAAO,CAAC,KAAK,CAAC,MAAM,+BAA+B;YACpE,kDAAkD,CACrD,CAAA;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACjD,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACtC,IAAI,CAAC,KAAK;YAAE,SAAQ;QACpB,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,KAAK,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAClE,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,mDAAmD,OAAO,CAAC,WAAW,IAAI;YACxE,4BAA4B,OAAO,CAAC,IAAI,aAAa,CACxD,CAAA;QACD,OAAO,CAAC,CAAA;IACV,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAA;IACnC,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC,CAAA"}
|
package/dist/core/errors.js
CHANGED
|
@@ -8,20 +8,9 @@ export class ValidateError extends Error {
|
|
|
8
8
|
this.status = status;
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
/**
|
|
12
|
-
* A failed call to the platform API. Mirrors `ValidateError`'s shape (the
|
|
13
|
-
* collector's equivalent) so command-level handling can treat "the server said
|
|
14
|
-
* no" and "I could not reach the server" differently — the second is worth a
|
|
15
|
-
* retry, the first is not.
|
|
16
|
-
*/
|
|
17
11
|
export class PlatformError extends Error {
|
|
18
12
|
reason;
|
|
19
13
|
status;
|
|
20
|
-
/**
|
|
21
|
-
* The decoded response payload, when there was one. Carried because some
|
|
22
|
-
* failures are data: a device-login poll answers 400 with the RFC 8628 reason
|
|
23
|
-
* the CLI acts on, and re-parsing that out of the message would be worse.
|
|
24
|
-
*/
|
|
25
14
|
body;
|
|
26
15
|
constructor(reason, message, status, body) {
|
|
27
16
|
super(message);
|
|
@@ -31,7 +20,6 @@ export class PlatformError extends Error {
|
|
|
31
20
|
this.body = body;
|
|
32
21
|
}
|
|
33
22
|
}
|
|
34
|
-
/** Thrown when the user aborts the wizard mid-flow (Ctrl-C, "no" at confirm, etc.). */
|
|
35
23
|
export class WizardAbort extends Error {
|
|
36
24
|
constructor(message = 'aborted') {
|
|
37
25
|
super(message);
|
package/dist/core/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/core/errors.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAc,SAAQ,KAAK;IAC7B,MAAM,CAAgB;IACtB,MAAM,CAAS;IAExB,YAAY,MAAsB,EAAE,OAAe,EAAE,MAAe;QAClE,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,eAAe,CAAA;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/core/errors.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAc,SAAQ,KAAK;IAC7B,MAAM,CAAgB;IACtB,MAAM,CAAS;IAExB,YAAY,MAAsB,EAAE,OAAe,EAAE,MAAe;QAClE,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,eAAe,CAAA;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;CACF;AAUD,MAAM,OAAO,aAAc,SAAQ,KAAK;IAC7B,MAAM,CAAgB;IACtB,MAAM,CAAS;IAMf,IAAI,CAAU;IAEvB,YAAY,MAAsB,EAAE,OAAe,EAAE,MAAe,EAAE,IAAc;QAClF,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,eAAe,CAAA;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;CACF;AAGD,MAAM,OAAO,WAAY,SAAQ,KAAK;IACpC,YAAY,OAAO,GAAG,SAAS;QAC7B,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;IAC3B,CAAC;CACF"}
|
package/dist/core/flags.js
CHANGED
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* A small argv parser (MAI-1423).
|
|
3
|
-
*
|
|
4
|
-
* Every prompt gets a flag twin so a script — or a coding agent driving the CLI
|
|
5
|
-
* — can answer without a TTY, which means argv parsing stops being an
|
|
6
|
-
* afterthought. Deliberately tiny: `--key value`, `--key=value`, bare `--key`
|
|
7
|
-
* for booleans, and `--no-key` for their negation. No aliases, no arg schema, no
|
|
8
|
-
* dependency.
|
|
9
|
-
*/
|
|
10
1
|
export const parseArgs = (args) => {
|
|
11
2
|
const positionals = [];
|
|
12
3
|
const flags = new Map();
|
|
@@ -29,8 +20,6 @@ export const parseArgs = (args) => {
|
|
|
29
20
|
continue;
|
|
30
21
|
}
|
|
31
22
|
const next = args[i + 1];
|
|
32
|
-
// A following token that is itself a flag means this one is a boolean; that
|
|
33
|
-
// is why `--json --ucid <id>` parses the way a reader expects.
|
|
34
23
|
if (next !== undefined && !next.startsWith('--')) {
|
|
35
24
|
flags.set(body, next);
|
|
36
25
|
i++;
|
|
@@ -41,12 +30,10 @@ export const parseArgs = (args) => {
|
|
|
41
30
|
}
|
|
42
31
|
return { positionals, flags };
|
|
43
32
|
};
|
|
44
|
-
/** The string value of a flag, or undefined when absent or given as a boolean. */
|
|
45
33
|
export const flagValue = ({ flags }, name) => {
|
|
46
34
|
const value = flags.get(name);
|
|
47
35
|
return typeof value === 'string' ? value : undefined;
|
|
48
36
|
};
|
|
49
|
-
/** Whether a boolean flag was set. `--no-<name>` reads as false, absence as undefined. */
|
|
50
37
|
export const flagBool = ({ flags }, name) => {
|
|
51
38
|
const value = flags.get(name);
|
|
52
39
|
if (value === undefined)
|
package/dist/core/flags.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/core/flags.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/core/flags.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAuB,EAAc,EAAE;IAC/D,MAAM,WAAW,GAAa,EAAE,CAAA;IAChC,MAAM,KAAK,GAAG,IAAI,GAAG,EAA4B,CAAA;IAEjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAE,CAAA;QACpB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACrB,SAAQ;QACV,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACzB,IAAI,IAAI,KAAK,EAAE;YAAE,SAAQ;QACzB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC5B,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YACd,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;YAChD,SAAQ;QACV,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;YAC/B,SAAQ;QACV,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QAGxB,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACrB,CAAC,EAAE,CAAA;QACL,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAA;AAC/B,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EAAE,KAAK,EAAc,EAAE,IAAY,EAAsB,EAAE;IACnF,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;AACtD,CAAC,CAAA;AAGD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAc,EAAE,IAAY,EAAuB,EAAE;IACnF,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC7B,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAA;IACzC,OAAO,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,EAAE,KAAK,EAAc,EAAE,IAAY,EAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA"}
|
package/dist/core/format.js
CHANGED
|
@@ -1,31 +1,15 @@
|
|
|
1
1
|
import pc from 'picocolors';
|
|
2
2
|
import { hasCredentialShape, isBearerValue, isSecretHeaderName, redactHeaderCollection, } from './headers.js';
|
|
3
|
-
/**
|
|
4
|
-
* Masks a secret the way the platform UI does (`ApiKeysPage`): reveals the
|
|
5
|
-
* first 8 characters — the stored `key_prefix` — then a fixed `••••` run, so a
|
|
6
|
-
* setup diff reads `mw_Z7K7Y••••` and matches what the user sees in the app.
|
|
7
|
-
* The bullet count is fixed (never the real length) so nothing leaks; values
|
|
8
|
-
* of 8 chars or fewer reveal nothing.
|
|
9
|
-
*/
|
|
10
3
|
export const maskSecret = (value) => {
|
|
11
4
|
if (value.length <= 8)
|
|
12
5
|
return '••••';
|
|
13
6
|
return `${value.slice(0, 8)}••••`;
|
|
14
7
|
};
|
|
15
|
-
/** Last dotted segment of a key, case-insensitive — `otel.exporter.otlp-http.headers.Authorization` → `authorization`. */
|
|
16
8
|
const lastSegment = (key) => {
|
|
17
9
|
const parts = key.split('.');
|
|
18
10
|
return (parts[parts.length - 1] ?? key).toLowerCase();
|
|
19
11
|
};
|
|
20
|
-
/**
|
|
21
|
-
* Capture a `Bearer <token>` value. eslint(prefer-regexp-exec) would prefer
|
|
22
|
-
* .exec, but that token is what the repo's security hook scans for. Stick
|
|
23
|
-
* with .match — semantically identical here.
|
|
24
|
-
*/
|
|
25
|
-
/* eslint-disable @typescript-eslint/prefer-regexp-exec */
|
|
26
12
|
const matchBearer = (value) => value.match(/^(\s*)(bearer)\s+(\S.*)$/i);
|
|
27
|
-
/* eslint-enable @typescript-eslint/prefer-regexp-exec */
|
|
28
|
-
/** Mask a `Bearer <token>` value while keeping the `Bearer ` literal visible. */
|
|
29
13
|
const maskBearerValue = (value) => {
|
|
30
14
|
const m = matchBearer(value);
|
|
31
15
|
const [, leading, prefix, token] = m ?? [];
|
|
@@ -34,53 +18,14 @@ const maskBearerValue = (value) => {
|
|
|
34
18
|
}
|
|
35
19
|
return `${leading}${prefix} ${maskSecret(token.trim())}`;
|
|
36
20
|
};
|
|
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
21
|
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
22
|
const maskHeaderCollection = (value) => {
|
|
60
23
|
const redacted = redactHeaderCollection(value, maskBearerValue);
|
|
61
24
|
if (redacted !== undefined)
|
|
62
25
|
return redacted;
|
|
63
26
|
return hasCredentialShape(value) ? UNREADABLE : value;
|
|
64
27
|
};
|
|
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
28
|
export const maskAuthHeader = (value) => maskHeaderCollection(value);
|
|
72
|
-
/**
|
|
73
|
-
* Mask any secret-looking value before printing to the user.
|
|
74
|
-
*
|
|
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.
|
|
83
|
-
*/
|
|
84
29
|
export const maskForDisplay = (envKey, value) => {
|
|
85
30
|
if (isBearerValue(value))
|
|
86
31
|
return maskBearerValue(value);
|
|
@@ -88,7 +33,6 @@ export const maskForDisplay = (envKey, value) => {
|
|
|
88
33
|
return maskSecret(value);
|
|
89
34
|
return maskHeaderCollection(value);
|
|
90
35
|
};
|
|
91
|
-
/** Renders a settings diff as plain text suitable for stdout. */
|
|
92
36
|
export const renderDiff = (diff) => {
|
|
93
37
|
const lines = [];
|
|
94
38
|
for (const { key, value } of diff.added) {
|
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;AAE3B,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/core/format.ts"],"names":[],"mappings":"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"}
|
package/dist/core/git.js
CHANGED
|
@@ -1,12 +1,4 @@
|
|
|
1
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
2
|
export const detectGitEmail = () => {
|
|
11
3
|
try {
|
|
12
4
|
const r = spawnSync('git', ['config', '--get', 'user.email'], {
|
|
@@ -19,7 +11,6 @@ export const detectGitEmail = () => {
|
|
|
19
11
|
return email || undefined;
|
|
20
12
|
}
|
|
21
13
|
catch {
|
|
22
|
-
// Any unexpected spawn failure — no default, the prompt just starts empty.
|
|
23
14
|
return undefined;
|
|
24
15
|
}
|
|
25
16
|
};
|
package/dist/core/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/core/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/core/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAU9C,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;QAEP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC,CAAA"}
|
package/dist/core/headers.js
CHANGED
|
@@ -1,100 +1,39 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* The OTLP header collection every adapter sends to the collector, the
|
|
3
|
-
* encodings a single settings value can carry it in, and the rule for which
|
|
4
|
-
* header holds a secret. One module owns all three because the display path
|
|
5
|
-
* has to reverse exactly what the build path produced: `core/format.ts` masks
|
|
6
|
-
* a rendered value by asking each encoding declared here to redact it, rather
|
|
7
|
-
* than pattern-matching the setting's name.
|
|
8
|
-
*
|
|
9
|
-
* That coupling is the fix for MAI-1340. Claude Desktop stores its headers as
|
|
10
|
-
* a JSON-object string under `otlpHeaders`; the masker only knew the
|
|
11
|
-
* comma-separated env-var form and two key names, so it printed a live org key
|
|
12
|
-
* in the wizard diff and in `doctor`. An adapter that needs a fourth encoding
|
|
13
|
-
* adds it to `HEADER_ENCODINGS` — which is what it has to build with — and the
|
|
14
|
-
* masker picks it up with no change.
|
|
15
|
-
*
|
|
16
|
-
* Adapters that split headers across one settings key per header (Codex CLI's
|
|
17
|
-
* `otel.*.otlp-http.headers.Authorization`) carry no collection to decode; the
|
|
18
|
-
* masker catches those via `isSecretHeaderName` on the key's last dotted
|
|
19
|
-
* segment, against the same name list used here.
|
|
20
|
-
*/
|
|
21
1
|
export const HEADER_NAME = {
|
|
22
2
|
authorization: 'Authorization',
|
|
23
3
|
ucid: 'X-Mainwave-UCID',
|
|
24
|
-
// Promoted by the collector to `mainwave.ucid_source` (its generic
|
|
25
|
-
// `X-Mainwave-<Suffix>` → `mainwave.<suffix>` rule, hyphens→underscores), so a
|
|
26
|
-
// header-tenancy tool declares how its ucid was configured just like the
|
|
27
|
-
// resource-attr adapters do (MAI-1480).
|
|
28
4
|
ucidSource: 'X-Mainwave-Ucid-Source',
|
|
29
5
|
source: 'X-Mainwave-Source',
|
|
6
|
+
userEmail: 'X-Mainwave-User-Email',
|
|
30
7
|
};
|
|
31
|
-
/** The only ucid-provenance value the CLI stamps: an id it wrote is one the
|
|
32
|
-
* developer explicitly configured (a use case, or a minted per-machine id) —
|
|
33
|
-
* never the collector's "unknown" fallback for an unconfigured tool. */
|
|
34
8
|
export const UCID_SOURCE_EXPLICIT = 'explicit';
|
|
35
|
-
/**
|
|
36
|
-
* Header names whose value is a credential, lowercased for comparison. The
|
|
37
|
-
* single source of truth for "this must never be printed" — consulted both
|
|
38
|
-
* when redacting an encoded collection and when masking a per-header key.
|
|
39
|
-
*/
|
|
40
9
|
const SECRET_HEADER_NAMES = [HEADER_NAME.authorization.toLowerCase()];
|
|
41
10
|
export const isSecretHeaderName = (name) => SECRET_HEADER_NAMES.includes(name.trim().toLowerCase());
|
|
42
11
|
const BEARER_VALUE_RE = /^\s*bearer\s+\S/i;
|
|
43
|
-
/** True when a header value carries a bearer token, whatever the header is called. */
|
|
44
12
|
export const isBearerValue = (value) => BEARER_VALUE_RE.test(value);
|
|
45
|
-
/**
|
|
46
|
-
* A header entry must be masked when its name is a known credential header, or
|
|
47
|
-
* when the value is bearer-shaped regardless of name — defense in depth for a
|
|
48
|
-
* future tool that names its auth header something else.
|
|
49
|
-
*/
|
|
50
13
|
const isSensitiveEntry = (name, value) => isSecretHeaderName(name) || isBearerValue(value);
|
|
51
14
|
const CREDENTIAL_SHAPE_RES = [
|
|
52
15
|
/bearer\s+\S/i,
|
|
53
16
|
new RegExp(SECRET_HEADER_NAMES.join('|'), 'i'),
|
|
54
17
|
];
|
|
55
|
-
/**
|
|
56
|
-
* True when a string looks like it carries a credential *somewhere* — a bearer
|
|
57
|
-
* token or a secret header name, at any offset.
|
|
58
|
-
*
|
|
59
|
-
* This is the fail-closed trigger, not a masking rule: a value no encoding
|
|
60
|
-
* could decode (truncated JSON, a nested non-string value, a token containing
|
|
61
|
-
* the delimiter) must never be rendered verbatim when it might hold a key.
|
|
62
|
-
* `doctor` reads whatever is on disk, and a managed-settings file is exactly
|
|
63
|
-
* the thing an MDM or a human hand-edits into an unparseable state.
|
|
64
|
-
*/
|
|
65
18
|
export const hasCredentialShape = (raw) => CREDENTIAL_SHAPE_RES.some((re) => re.test(raw));
|
|
66
|
-
|
|
67
|
-
* The tenancy/auth headers, in a stable key order so a re-run doesn't churn the
|
|
68
|
-
* encoded value (and therefore doesn't produce a spurious wizard diff).
|
|
69
|
-
*/
|
|
70
|
-
export const buildHeaders = ({ apiKey, ucid, source, }) => {
|
|
19
|
+
export const buildHeaders = ({ apiKey, ucid, source, userEmail, }) => {
|
|
71
20
|
const headers = {
|
|
72
21
|
[HEADER_NAME.authorization]: `Bearer ${apiKey}`,
|
|
73
22
|
};
|
|
74
|
-
// ucid_source rides only when a ucid does — provenance of an absent id is
|
|
75
|
-
// meaningless, and an id-less tool still lands in the collector's unmapped
|
|
76
|
-
// bucket (MAI-1033).
|
|
77
23
|
if (ucid) {
|
|
78
24
|
headers[HEADER_NAME.ucid] = ucid;
|
|
79
25
|
headers[HEADER_NAME.ucidSource] = UCID_SOURCE_EXPLICIT;
|
|
80
26
|
}
|
|
81
27
|
headers[HEADER_NAME.source] = source;
|
|
28
|
+
if (userEmail)
|
|
29
|
+
headers[HEADER_NAME.userEmail] = userEmail;
|
|
82
30
|
return headers;
|
|
83
31
|
};
|
|
84
|
-
/** Extracts the token from a `Bearer <token>` header value. */
|
|
85
32
|
export const headerBearerToken = (value) => {
|
|
86
33
|
if (typeof value !== 'string' || !value.toLowerCase().startsWith('bearer '))
|
|
87
34
|
return undefined;
|
|
88
35
|
return value.slice('bearer '.length).trim() || undefined;
|
|
89
36
|
};
|
|
90
|
-
/**
|
|
91
|
-
* Renders one decoded header entry. Sensitive entries are masked; the rest are
|
|
92
|
-
* recursed into first, so a value that itself holds an encoded collection (a
|
|
93
|
-
* doubly-encoded blob from a hand-written profile) is masked rather than
|
|
94
|
-
* printed. Returns `undefined` to decline — the value looks like it carries a
|
|
95
|
-
* credential but no encoding could render it — which propagates up and makes
|
|
96
|
-
* the whole collection fail closed.
|
|
97
|
-
*/
|
|
98
37
|
const redactEntry = (name, value, mask) => {
|
|
99
38
|
if (isSensitiveEntry(name, value))
|
|
100
39
|
return mask(value);
|
|
@@ -104,11 +43,6 @@ const redactEntry = (name, value, mask) => {
|
|
|
104
43
|
return hasCredentialShape(value) ? undefined : value;
|
|
105
44
|
};
|
|
106
45
|
const isPlainObject = (v) => v !== null && typeof v === 'object' && !Array.isArray(v);
|
|
107
|
-
/**
|
|
108
|
-
* JSON-object string — the managed-configuration encoding (macOS plist,
|
|
109
|
-
* Windows registry, Linux `managed-settings.json`) that Claude Desktop's
|
|
110
|
-
* `otlpHeaders` requires.
|
|
111
|
-
*/
|
|
112
46
|
export const jsonObjectHeaders = {
|
|
113
47
|
id: 'json-object',
|
|
114
48
|
encode: (headers) => JSON.stringify(headers),
|
|
@@ -125,8 +59,6 @@ export const jsonObjectHeaders = {
|
|
|
125
59
|
if (!isPlainObject(parsed))
|
|
126
60
|
return undefined;
|
|
127
61
|
const out = {};
|
|
128
|
-
// All-string values only: anything else isn't a header map, and coercing it
|
|
129
|
-
// would make the masked render differ in shape from what is on disk.
|
|
130
62
|
for (const [k, v] of Object.entries(parsed)) {
|
|
131
63
|
if (typeof v !== 'string')
|
|
132
64
|
return undefined;
|
|
@@ -134,7 +66,6 @@ export const jsonObjectHeaders = {
|
|
|
134
66
|
}
|
|
135
67
|
return Object.keys(out).length > 0 ? out : undefined;
|
|
136
68
|
},
|
|
137
|
-
// JSON is machine-written here, so decode/encode round-trips losslessly.
|
|
138
69
|
redact: (raw, mask) => {
|
|
139
70
|
const headers = jsonObjectHeaders.decode(raw);
|
|
140
71
|
if (!headers)
|
|
@@ -149,25 +80,16 @@ export const jsonObjectHeaders = {
|
|
|
149
80
|
return jsonObjectHeaders.encode(out);
|
|
150
81
|
},
|
|
151
82
|
};
|
|
152
|
-
/** RFC 7230 token — header names, and the dotted attribute names OTel reuses. No spaces. */
|
|
153
83
|
const TOKEN_RE = /^[A-Za-z0-9!#$%&'*+.^_`|~-]+$/;
|
|
154
|
-
/** Splits `key=value`; `undefined` when the segment isn't a well-formed pair. */
|
|
155
84
|
const splitPair = (segment) => {
|
|
156
85
|
const eq = segment.indexOf('=');
|
|
157
86
|
if (eq < 0)
|
|
158
87
|
return undefined;
|
|
159
88
|
const name = segment.slice(0, eq).trim();
|
|
160
|
-
// A base64 token's `=` padding must not read as a pair — the name has to look
|
|
161
|
-
// like a header name.
|
|
162
89
|
if (!TOKEN_RE.test(name))
|
|
163
90
|
return undefined;
|
|
164
91
|
return { name, value: segment.slice(eq + 1) };
|
|
165
92
|
};
|
|
166
|
-
/**
|
|
167
|
-
* Comma-separated `key=value` pairs — the OpenTelemetry env-var convention
|
|
168
|
-
* (`OTEL_EXPORTER_OTLP_HEADERS`), and the form the first-party Cowork admin
|
|
169
|
-
* console accepts (it rejects a JSON object; see the claude-desktop adapter).
|
|
170
|
-
*/
|
|
171
93
|
export const kvPairsHeaders = {
|
|
172
94
|
id: 'kv-pairs',
|
|
173
95
|
encode: (headers) => Object.entries(headers)
|
|
@@ -182,15 +104,6 @@ export const kvPairsHeaders = {
|
|
|
182
104
|
}
|
|
183
105
|
return Object.keys(out).length > 0 ? out : undefined;
|
|
184
106
|
},
|
|
185
|
-
/**
|
|
186
|
-
* Rewrites sensitive pairs in place and passes every other segment through
|
|
187
|
-
* byte-for-byte, so a hand-edited value renders as it is on disk.
|
|
188
|
-
*
|
|
189
|
-
* Declines outright when a segment doesn't parse and the value looks like it
|
|
190
|
-
* carries a credential: the split is on `,`, so an unparseable segment can be
|
|
191
|
-
* the tail of a token the split cut in half, and rendering it would print a
|
|
192
|
-
* fragment of the secret.
|
|
193
|
-
*/
|
|
194
107
|
redact: (raw, mask) => {
|
|
195
108
|
let sawPair = false;
|
|
196
109
|
let sawUnparseable = false;
|
|
@@ -217,13 +130,7 @@ export const kvPairsHeaders = {
|
|
|
217
130
|
return segments.join(',');
|
|
218
131
|
},
|
|
219
132
|
};
|
|
220
|
-
/** Every encoding the CLI can emit a header collection in. Order is try-order when redacting. */
|
|
221
133
|
export const HEADER_ENCODINGS = [jsonObjectHeaders, kvPairsHeaders];
|
|
222
|
-
/**
|
|
223
|
-
* Renders `raw` with its credentials masked, using whichever declared encoding
|
|
224
|
-
* claims it. `undefined` means no encoding would render it safely — callers
|
|
225
|
-
* must fail closed, never fall back to the raw value.
|
|
226
|
-
*/
|
|
227
134
|
export const redactHeaderCollection = (raw, mask) => {
|
|
228
135
|
for (const encoding of HEADER_ENCODINGS) {
|
|
229
136
|
const redacted = encoding.redact(raw, mask);
|
package/dist/core/headers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../src/core/headers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../src/core/headers.ts"],"names":[],"mappings":"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"}
|