@mainwave/cli 0.7.1 → 0.9.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/README.md +141 -42
- package/dist/adapters/claude-code.js +33 -7
- package/dist/adapters/claude-desktop.js +0 -1
- package/dist/adapters/codex-cli.js +1 -2
- package/dist/adapters/copilot-chat.js +0 -1
- package/dist/adapters/copilot-cli.js +0 -1
- package/dist/adapters/cursor-enterprise.js +0 -1
- package/dist/adapters/cursor.js +15 -4
- package/dist/adapters/index.js +0 -1
- package/dist/adapters/types.js +0 -1
- package/dist/api/index.js +0 -1
- package/dist/api/types.gen.js +0 -1
- package/dist/cli.js +0 -1
- package/dist/core/apply.js +151 -42
- package/dist/core/auth-commands.js +0 -1
- package/dist/core/behaviour-hooks.js +0 -1
- package/dist/core/browser.js +0 -1
- package/dist/core/codecs/cursor-hooks-json.js +0 -1
- package/dist/core/codecs/env-file.js +0 -1
- package/dist/core/codecs/json-env.js +0 -1
- package/dist/core/codecs/json-flat.js +0 -1
- package/dist/core/codecs/json-managed.js +0 -1
- package/dist/core/codecs/toml-otel.js +0 -1
- package/dist/core/codecs/types.js +0 -1
- package/dist/core/detect.js +0 -1
- package/dist/core/device-login.js +0 -1
- package/dist/core/doctor.js +45 -9
- package/dist/core/edit.js +9 -5
- package/dist/core/effective-settings.js +71 -20
- package/dist/core/entry-script.js +90 -0
- package/dist/core/env-command.js +0 -1
- package/dist/core/errors.js +0 -1
- package/dist/core/flags.js +0 -1
- package/dist/core/format.js +0 -1
- package/dist/core/git-bash.js +40 -0
- package/dist/core/git.js +0 -1
- package/dist/core/headers.js +0 -1
- package/dist/core/install-hooks.js +127 -44
- package/dist/core/interview.js +53 -4
- package/dist/core/keys.js +0 -1
- package/dist/core/layer-policy.js +2 -1
- package/dist/core/markers.js +826 -133
- package/dist/core/pinned-use-case.js +0 -1
- package/dist/core/platform.js +0 -1
- package/dist/core/post-setup.js +0 -1
- package/dist/core/prompts.js +0 -1
- package/dist/core/settings.js +32 -8
- package/dist/core/skills.js +5 -2
- package/dist/core/status.js +7 -5
- package/dist/core/store.js +0 -1
- package/dist/core/tty.js +0 -1
- package/dist/core/ucid.js +0 -1
- package/dist/core/ui.js +0 -1
- package/dist/core/use-case.js +0 -1
- package/dist/core/validate.js +0 -1
- package/dist/core/verify.js +0 -1
- package/dist/core/version.js +0 -1
- package/dist/core/wizard.js +49 -8
- package/dist/main.js +16 -10
- package/hooks/cursor-otlp.mjs +13 -15
- package/hooks/github-pr-marker.mjs +55 -31
- package/hooks/glab-mr-marker.mjs +795 -0
- package/hooks/jira-ticket-marker.mjs +35 -23
- package/hooks/linear-ticket-marker.mjs +35 -21
- package/hooks/mainwave-hook-node.mjs +42 -0
- package/hooks/mainwave-hook.mjs +301 -0
- package/hooks/managed-entry.mjs +42 -0
- package/hooks/marker-core.mjs +389 -62
- package/hooks/matchers.json +82 -6
- package/hooks/plan-snapshot.mjs +529 -0
- package/hooks/stop-failure.mjs +43 -0
- package/hooks/vocabulary.d.mts +48 -0
- package/hooks/vocabulary.mjs +181 -0
- package/package.json +6 -5
- package/skills/mainwave-instrument/SKILL.md +21 -7
- package/skills/mainwave-instrument/reference/api.md +29 -10
- package/skills/mainwave-instrument/reference/frameworks.md +3 -3
- package/skills/mainwave-instrument/reference/troubleshooting.md +12 -5
- package/skills/mainwave-instrument-node/SKILL.md +420 -0
- package/skills/mainwave-instrument-node/reference/api.md +96 -0
- package/skills/mainwave-instrument-node/reference/frameworks.md +82 -0
- package/skills/mainwave-instrument-node/reference/troubleshooting.md +152 -0
- package/skills/mainwave-setup/SKILL.md +47 -12
- package/dist/adapters/claude-code.js.map +0 -1
- package/dist/adapters/claude-desktop.js.map +0 -1
- package/dist/adapters/codex-cli.js.map +0 -1
- package/dist/adapters/copilot-chat.js.map +0 -1
- package/dist/adapters/copilot-cli.js.map +0 -1
- package/dist/adapters/cursor-enterprise.js.map +0 -1
- package/dist/adapters/cursor.js.map +0 -1
- package/dist/adapters/index.js.map +0 -1
- package/dist/adapters/types.js.map +0 -1
- package/dist/api/index.js.map +0 -1
- package/dist/api/types.gen.js.map +0 -1
- package/dist/cli.js.map +0 -1
- package/dist/core/apply.js.map +0 -1
- package/dist/core/auth-commands.js.map +0 -1
- package/dist/core/behaviour-hooks.js.map +0 -1
- package/dist/core/browser.js.map +0 -1
- package/dist/core/codecs/cursor-hooks-json.js.map +0 -1
- package/dist/core/codecs/env-file.js.map +0 -1
- package/dist/core/codecs/json-env.js.map +0 -1
- package/dist/core/codecs/json-flat.js.map +0 -1
- package/dist/core/codecs/json-managed.js.map +0 -1
- package/dist/core/codecs/toml-otel.js.map +0 -1
- package/dist/core/codecs/types.js.map +0 -1
- package/dist/core/detect.js.map +0 -1
- package/dist/core/device-login.js.map +0 -1
- package/dist/core/doctor.js.map +0 -1
- package/dist/core/edit.js.map +0 -1
- package/dist/core/effective-settings.js.map +0 -1
- package/dist/core/env-command.js.map +0 -1
- package/dist/core/errors.js.map +0 -1
- package/dist/core/flags.js.map +0 -1
- package/dist/core/format.js.map +0 -1
- package/dist/core/git.js.map +0 -1
- package/dist/core/headers.js.map +0 -1
- package/dist/core/install-hooks.js.map +0 -1
- package/dist/core/interview.js.map +0 -1
- package/dist/core/keys.js.map +0 -1
- package/dist/core/layer-policy.js.map +0 -1
- package/dist/core/markers.js.map +0 -1
- package/dist/core/pinned-use-case.js.map +0 -1
- package/dist/core/platform.js.map +0 -1
- package/dist/core/post-setup.js.map +0 -1
- package/dist/core/prompts.js.map +0 -1
- package/dist/core/settings.js.map +0 -1
- package/dist/core/skills.js.map +0 -1
- package/dist/core/status.js.map +0 -1
- package/dist/core/store.js.map +0 -1
- package/dist/core/tty.js.map +0 -1
- package/dist/core/ucid.js.map +0 -1
- package/dist/core/ui.js.map +0 -1
- package/dist/core/use-case.js.map +0 -1
- package/dist/core/validate.js.map +0 -1
- package/dist/core/verify.js.map +0 -1
- package/dist/core/version.js.map +0 -1
- package/dist/core/wizard.js.map +0 -1
- package/dist/main.js.map +0 -1
package/dist/core/apply.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
|
-
import {
|
|
2
|
+
import { dirname, resolve } from 'node:path';
|
|
3
3
|
import { adapters } from '../adapters/index.js';
|
|
4
|
-
import { activeHierarchy } from './effective-settings.js';
|
|
4
|
+
import { activeHierarchy, effectiveEnv } from './effective-settings.js';
|
|
5
5
|
import { color, renderDiff } from './format.js';
|
|
6
|
-
import {
|
|
6
|
+
import { claudeHookShellMissing, GIT_BASH_FIX, GIT_BASH_MISSING_REASON } from './git-bash.js';
|
|
7
|
+
import { activeManagedScans, BOOTSTRAP_KEY, commandGeneration, copyHookScripts, DEFAULT_MARKER_TOOL, describeMarkersPlan, hooksBlocked, hostRunsBootstrap, installedHooksDir, isPlanSnapshot, isPlanSnapshotRoute, legacyCommandSends, managedDeliversEntry, managedDeliversPlanSnapshot, managedHooksDir, managedMarkerDeliveries, matchersForTool, packagedHooksDir, planMarkers, prepareMarkersFile, readPackagedMatchers, routeLabel, scanForMarkers, scanRoutes, selectHookMatchers, syncManagedHooks, syncOrgDelivered, userHookGroups, writeOptOutFlags, } from './markers.js';
|
|
7
8
|
import { isManagedLayer } from './layer-policy.js';
|
|
8
9
|
import { adapterEffective } from './status.js';
|
|
9
10
|
import { applyUpdate, prepareUpdate, readExistingEnv } from './settings.js';
|
|
@@ -92,19 +93,38 @@ export const planAdapter = async (adapter, answers, context = {}) => {
|
|
|
92
93
|
codec: adapter.codec,
|
|
93
94
|
});
|
|
94
95
|
const markersOn = adapter.markers ? answers.markers : null;
|
|
96
|
+
let planSnapshotOn = null;
|
|
97
|
+
let planSnapshotOrgDelivered = false;
|
|
95
98
|
let markersPlan = null;
|
|
96
|
-
let hookFiles = [];
|
|
97
99
|
let separateMarkersUpdate = null;
|
|
98
100
|
let markersCarrier = null;
|
|
101
|
+
let hookHost = null;
|
|
102
|
+
let stageHooks = false;
|
|
103
|
+
let hookEvents = [];
|
|
104
|
+
let orgDeliversEntry = false;
|
|
105
|
+
let hookShellMissing = false;
|
|
99
106
|
if (markersOn !== null) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
const
|
|
106
|
-
|
|
107
|
-
|
|
107
|
+
hookHost = adapter.markers?.runtimeTool ?? DEFAULT_MARKER_TOOL;
|
|
108
|
+
const hosted = matchersForTool(await readPackagedMatchers(), hookHost);
|
|
109
|
+
if (hosted.some(isPlanSnapshot))
|
|
110
|
+
planSnapshotOn = markersOn;
|
|
111
|
+
hookShellMissing = await hookShellMissingFor(adapter, async () => effectiveEnv(adapter, adapter.codec.readEnv(primaryUpdate.next)));
|
|
112
|
+
const on = { markers: markersOn };
|
|
113
|
+
const selected = hookShellMissing ? [] : selectHookMatchers(hosted, on);
|
|
114
|
+
stageHooks = selected.length > 0;
|
|
115
|
+
hookEvents = [
|
|
116
|
+
...new Set([
|
|
117
|
+
...(stageHooks && hostRunsBootstrap(hookHost) ? ['SessionStart'] : []),
|
|
118
|
+
...selected.map((m) => m.event),
|
|
119
|
+
]),
|
|
120
|
+
];
|
|
121
|
+
const managedScans = adapter.markers?.hooksFile
|
|
122
|
+
? []
|
|
123
|
+
: await scanForMarkers((await activeHierarchy(adapter)).filter(isManagedLayer));
|
|
124
|
+
const delivered = managedMarkerDeliveries(managedScans);
|
|
125
|
+
orgDeliversEntry = managedDeliversEntry(managedScans);
|
|
126
|
+
planSnapshotOrgDelivered = planSnapshotOn !== null && managedDeliversPlanSnapshot(managedScans);
|
|
127
|
+
const groups = hookShellMissing ? [] : userHookGroups(hosted, on, delivered, hookHost);
|
|
108
128
|
const hooksFile = adapter.markers?.hooksFile;
|
|
109
129
|
if (hooksFile) {
|
|
110
130
|
const prepared = await prepareMarkersFile(hooksFile.path, hooksFile.codec, groups);
|
|
@@ -113,7 +133,14 @@ export const planAdapter = async (adapter, answers, context = {}) => {
|
|
|
113
133
|
markersCarrier = prepared.update;
|
|
114
134
|
}
|
|
115
135
|
else {
|
|
116
|
-
|
|
136
|
+
const keepRunnable = (o, g) => !(markersOn &&
|
|
137
|
+
o === 'cli' &&
|
|
138
|
+
commandGeneration(g.command) === 'legacy' &&
|
|
139
|
+
legacyCommandSends(g.command) &&
|
|
140
|
+
/^node "/.test(g.command));
|
|
141
|
+
markersPlan = hookShellMissing
|
|
142
|
+
? planMarkers(primaryUpdate.next, groups, keepRunnable)
|
|
143
|
+
: planMarkers(primaryUpdate.next, groups);
|
|
117
144
|
primaryUpdate.next = markersPlan.next;
|
|
118
145
|
markersCarrier = primaryUpdate;
|
|
119
146
|
}
|
|
@@ -143,14 +170,59 @@ export const planAdapter = async (adapter, answers, context = {}) => {
|
|
|
143
170
|
input,
|
|
144
171
|
changed,
|
|
145
172
|
markersOn,
|
|
173
|
+
planSnapshotOn,
|
|
174
|
+
planSnapshotOrgDelivered,
|
|
146
175
|
markersPlan,
|
|
147
176
|
markersCarrier,
|
|
148
|
-
|
|
177
|
+
hookHost,
|
|
178
|
+
stageHooks,
|
|
179
|
+
hookEvents,
|
|
180
|
+
orgDeliversEntry,
|
|
181
|
+
hookShellMissing,
|
|
149
182
|
...(teamUcid ? { teamUcid } : {}),
|
|
150
183
|
...(keptPin ? { keptPin: pin } : {}),
|
|
151
184
|
};
|
|
152
185
|
};
|
|
186
|
+
export const hookShellMissingFor = async (adapter, settingsEnv) => {
|
|
187
|
+
if (process.platform !== 'win32')
|
|
188
|
+
return false;
|
|
189
|
+
const markers = adapter.markers;
|
|
190
|
+
if (markers === undefined || markers.hooksFile !== undefined)
|
|
191
|
+
return false;
|
|
192
|
+
if ((markers.runtimeTool ?? DEFAULT_MARKER_TOOL) !== DEFAULT_MARKER_TOOL)
|
|
193
|
+
return false;
|
|
194
|
+
return claudeHookShellMissing({ ...process.env, ...((await settingsEnv()) ?? {}) });
|
|
195
|
+
};
|
|
196
|
+
export const managedSnapshotDelivery = async (adapter) => {
|
|
197
|
+
if (!adapter.markers?.planSnapshotDisclosure || adapter.markers.hooksFile)
|
|
198
|
+
return false;
|
|
199
|
+
const managed = (await activeHierarchy(adapter)).filter(isManagedLayer);
|
|
200
|
+
return managedDeliversPlanSnapshot(await scanForMarkers(managed));
|
|
201
|
+
};
|
|
202
|
+
export const planSnapshotBlocked = async (adapter) => {
|
|
203
|
+
if (!adapter.markers?.planSnapshotDisclosure || adapter.markers.hooksFile)
|
|
204
|
+
return undefined;
|
|
205
|
+
if (await hookShellMissingFor(adapter, () => effectiveEnv(adapter))) {
|
|
206
|
+
return { reason: GIT_BASH_MISSING_REASON, fix: GIT_BASH_FIX, notInstalled: true };
|
|
207
|
+
}
|
|
208
|
+
const scans = await scanForMarkers(await activeHierarchy(adapter));
|
|
209
|
+
const blocked = hooksBlocked(scans);
|
|
210
|
+
if (blocked.developer === undefined)
|
|
211
|
+
return undefined;
|
|
212
|
+
if (blocked.managed === undefined && managedDeliversPlanSnapshot(scans))
|
|
213
|
+
return undefined;
|
|
214
|
+
const fix = blocked.managed !== undefined
|
|
215
|
+
? 'Only your Claude admin can turn hooks back on.'
|
|
216
|
+
: blocked.managedOnly
|
|
217
|
+
? 'Ask your Claude admin to deliver it through managed settings.'
|
|
218
|
+
: 'Remove disableAllHooks from that file to let it run.';
|
|
219
|
+
return { reason: blocked.developer, fix };
|
|
220
|
+
};
|
|
153
221
|
export const renderPlan = (plan) => {
|
|
222
|
+
for (const { message } of plan.markersPlan?.skipped ?? []) {
|
|
223
|
+
say('');
|
|
224
|
+
say(color.yellow(`! ${plan.adapter.displayName}: ${message}`));
|
|
225
|
+
}
|
|
154
226
|
if (plan.changed.length === 0) {
|
|
155
227
|
say('');
|
|
156
228
|
say(color.dim(`${plan.adapter.displayName}: no changes needed in ${plan.primaryPath}.`));
|
|
@@ -175,17 +247,30 @@ export const renderPlan = (plan) => {
|
|
|
175
247
|
}
|
|
176
248
|
};
|
|
177
249
|
export const planHasChanges = (plans) => plans.some((p) => p.changed.length > 0);
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
250
|
+
const defaultHookDirs = () => ({
|
|
251
|
+
managedDir: managedHooksDir(),
|
|
252
|
+
flatDir: installedHooksDir(),
|
|
253
|
+
});
|
|
254
|
+
export const userHooksPath = (adapter) => adapter.markers?.hooksFile?.path ?? adapter.paths.global;
|
|
255
|
+
export const writePlan = async (plan, dirs = defaultHookDirs()) => {
|
|
256
|
+
if (plan.stageHooks) {
|
|
257
|
+
const updated = await syncManagedHooks(await readPackagedMatchers(), packagedHooksDir(), dirs.managedDir, VERSION);
|
|
185
258
|
say('');
|
|
186
|
-
say(
|
|
187
|
-
? color.dim(`Hook scripts
|
|
188
|
-
: color.green(`✓ Hook scripts installed to ${
|
|
259
|
+
say(updated.length === 0
|
|
260
|
+
? color.dim(`Hook scripts in ${dirs.managedDir} are current.`)
|
|
261
|
+
: color.green(`✓ Hook scripts installed to ${dirs.managedDir}`));
|
|
262
|
+
}
|
|
263
|
+
if (plan.hookHost !== null) {
|
|
264
|
+
await writeOptOutFlags(plan.hookHost, { markers: plan.markersOn ?? undefined }, resolve(dirs.managedDir, '..'));
|
|
265
|
+
if (plan.hookHost === DEFAULT_MARKER_TOOL) {
|
|
266
|
+
await syncOrgDelivered(plan.orgDeliversEntry, dirname(plan.adapter.paths.global), dirs.managedDir);
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
const bundled = plan.adapter.bundledHookScripts ?? [];
|
|
270
|
+
if (bundled.length > 0) {
|
|
271
|
+
const dest = await copyHookScripts(bundled, packagedHooksDir(), dirs.flatDir);
|
|
272
|
+
say('');
|
|
273
|
+
say(color.dim(`Hook scripts refreshed in ${dest}.`));
|
|
189
274
|
}
|
|
190
275
|
for (const { update } of plan.changed) {
|
|
191
276
|
const result = await applyUpdate(update);
|
|
@@ -202,10 +287,7 @@ export const printMarkerCoexistenceNotes = async (adapter, targetPath, markersOn
|
|
|
202
287
|
const blockedBy = hooksBlocked(scans);
|
|
203
288
|
const blocked = blockedBy.developer;
|
|
204
289
|
const targetHasMarkers = scans.some((s) => resolve(s.path) === resolve(targetPath) && s.groups.some((g) => g.ownership === 'cli'));
|
|
205
|
-
if (
|
|
206
|
-
blocked !== undefined &&
|
|
207
|
-
targetHasMarkers &&
|
|
208
|
-
adapter.markers?.hooksFile === undefined) {
|
|
290
|
+
if (blocked !== undefined && targetHasMarkers && adapter.markers?.hooksFile === undefined) {
|
|
209
291
|
say('');
|
|
210
292
|
say(color.yellow(`Note: Claude Code won't run the marker hooks in ${targetPath}: ${blocked}.`));
|
|
211
293
|
}
|
|
@@ -217,16 +299,33 @@ export const printMarkerCoexistenceNotes = async (adapter, targetPath, markersOn
|
|
|
217
299
|
for (const s of others) {
|
|
218
300
|
const hasInternal = cliRuns && runs(s) && s.groups.some((g) => g.ownership === 'internal');
|
|
219
301
|
const hasCli = s.groups.some((g) => g.ownership === 'cli');
|
|
220
|
-
const
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
if (hasCli && s.managed) {
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
302
|
+
const routes = scanRoutes(s).filter((k) => k !== BOOTSTRAP_KEY);
|
|
303
|
+
const leftOut = markersOn ? routes : [];
|
|
304
|
+
const stillRun = markersOn ? [] : routes;
|
|
305
|
+
if (hasCli && s.managed && routes.length === 0) {
|
|
306
|
+
}
|
|
307
|
+
else if (hasCli && s.managed) {
|
|
308
|
+
if (leftOut.length > 0) {
|
|
309
|
+
const leftMarkers = leftOut.some((k) => !isPlanSnapshotRoute(k));
|
|
310
|
+
const leftSnapshot = leftOut.some(isPlanSnapshotRoute);
|
|
311
|
+
const twice = [
|
|
312
|
+
...(leftMarkers ? ['marking each ticket and PR'] : []),
|
|
313
|
+
...(leftSnapshot ? ['sending the plan snapshot'] : []),
|
|
314
|
+
].join(' or ');
|
|
315
|
+
say('');
|
|
316
|
+
say(color.dim(`Note: your organization's managed settings (${s.path}) deliver ${leftOut.map(routeLabel).join(', ')},\n` +
|
|
317
|
+
`so setup left those out of your user settings to avoid ${twice} twice.`));
|
|
318
|
+
}
|
|
319
|
+
if (stillRun.length > 0) {
|
|
320
|
+
const markerRun = stillRun.some((k) => !isPlanSnapshotRoute(k));
|
|
321
|
+
const snapshotRun = stillRun.some(isPlanSnapshotRoute);
|
|
322
|
+
say('');
|
|
323
|
+
say(color.dim(`Note: your organization's managed settings (${s.path}) still run the ${markerRun
|
|
324
|
+
? snapshotRun
|
|
325
|
+
? 'marker hooks and the plan snapshot'
|
|
326
|
+
: 'marker hooks'
|
|
327
|
+
: 'plan snapshot'};\n--no-markers removes only the copy in your user settings.`));
|
|
328
|
+
}
|
|
230
329
|
}
|
|
231
330
|
else if (hasInternal) {
|
|
232
331
|
say('');
|
|
@@ -237,17 +336,28 @@ export const printMarkerCoexistenceNotes = async (adapter, targetPath, markersOn
|
|
|
237
336
|
}
|
|
238
337
|
else if (hasCli) {
|
|
239
338
|
say('');
|
|
240
|
-
say(color.dim(`Note: ${s.path} also carries CLI-managed
|
|
339
|
+
say(color.dim(`Note: ${s.path} also carries CLI-managed Mainwave hooks. Identical handlers run\n` +
|
|
241
340
|
'once, so counts stay correct; `mainwave-cli doctor` flags them if they drift.'));
|
|
242
341
|
}
|
|
243
342
|
}
|
|
244
343
|
};
|
|
245
344
|
export const printPostSetup = (plan) => {
|
|
246
|
-
if (plan.markersOn === true
|
|
345
|
+
if (plan.hookShellMissing && plan.markersOn === true) {
|
|
346
|
+
say('');
|
|
347
|
+
say(color.yellow(`No Mainwave hooks installed for ${plan.adapter.displayName}: ${GIT_BASH_MISSING_REASON}. ${GIT_BASH_FIX}`));
|
|
348
|
+
}
|
|
349
|
+
else if (plan.markersOn === true && plan.adapter.markers) {
|
|
247
350
|
say('');
|
|
248
351
|
say(color.dim(`Ticket & PR markers installed for ${plan.adapter.displayName}. ` +
|
|
249
352
|
`${plan.adapter.markers.disclosure}\n` +
|
|
250
|
-
`Remove them
|
|
353
|
+
`Remove them${plan.planSnapshotOn === true ? ' and the Claude plan snapshot' : ''} with ` +
|
|
354
|
+
`\`mainwave-cli setup ${plan.adapter.name} --no-markers\`, which installs no Mainwave hooks.`));
|
|
355
|
+
}
|
|
356
|
+
if (plan.hookEvents.includes('SessionStart')) {
|
|
357
|
+
say('');
|
|
358
|
+
say(color.dim(`${plan.adapter.displayName} also runs \`npx @mainwave/cli@latest install-hooks\` in the background when a session ` +
|
|
359
|
+
'starts, resumes or forks: it refreshes the hook scripts from the latest release and keeps the hooks above ' +
|
|
360
|
+
'current, on the same events only — a new kind of hook waits for your next setup run.'));
|
|
251
361
|
}
|
|
252
362
|
const snippet = plan.adapter.printPostSetupInstructions?.(plan.input, 'global');
|
|
253
363
|
if (snippet) {
|
|
@@ -260,4 +370,3 @@ export const printPostSetup = (plan) => {
|
|
|
260
370
|
say(`Next for ${plan.adapter.displayName}: run ${color.bold(plan.adapter.runInstruction)}.`);
|
|
261
371
|
}
|
|
262
372
|
};
|
|
263
|
-
//# sourceMappingURL=apply.js.map
|
package/dist/core/browser.js
CHANGED
package/dist/core/detect.js
CHANGED
package/dist/core/doctor.js
CHANGED
|
@@ -7,9 +7,9 @@ import { ValidateError } from './errors.js';
|
|
|
7
7
|
import { color, maskForDisplay } from './format.js';
|
|
8
8
|
import { collectBehaviourHookIssues } from './behaviour-hooks.js';
|
|
9
9
|
import { isManagedIdentityConfig, isManagedLayer, policyState } from './layer-policy.js';
|
|
10
|
-
import { collectMarkerIssues, readPackagedMatchers, scanForMarkers } from './markers.js';
|
|
10
|
+
import { collectMarkerIssues, DEFAULT_MARKER_TOOL, managedHooksDir, matchersForTool, readPackagedMatchers, scanForMarkers, } from './markers.js';
|
|
11
11
|
import { readExistingEnv } from './settings.js';
|
|
12
|
-
import { teamUcidStanding } from './apply.js';
|
|
12
|
+
import { hookShellMissingFor, teamUcidStanding } from './apply.js';
|
|
13
13
|
import { adapterEffective, primaryCarries } from './status.js';
|
|
14
14
|
import { readSettings } from './store.js';
|
|
15
15
|
import { emitJson } from './ui.js';
|
|
@@ -283,6 +283,25 @@ const collectIssues = (effective, adapter, secondary = {}) => {
|
|
|
283
283
|
"collector they didn't choose.",
|
|
284
284
|
});
|
|
285
285
|
}
|
|
286
|
+
const claim = effective.unitClaim;
|
|
287
|
+
if (claim) {
|
|
288
|
+
const where = `${claim.scan.layer.label} (${claim.scan.path})`;
|
|
289
|
+
issues.push(claim.lands
|
|
290
|
+
? {
|
|
291
|
+
level: adapter.markers ? 'warn' : 'info',
|
|
292
|
+
message: `${where} sets ${claim.setting}, so ${adapter.displayName} generates its OTLP headers ` +
|
|
293
|
+
'with that command.' +
|
|
294
|
+
(adapter.markers
|
|
295
|
+
? " The ticket and PR marker hooks don't run it, so they send no markers."
|
|
296
|
+
: ''),
|
|
297
|
+
}
|
|
298
|
+
: {
|
|
299
|
+
level: 'info',
|
|
300
|
+
message: `${where} sets ${claim.setting} but isn't the managed source ${adapter.displayName} uses, ` +
|
|
301
|
+
'so it supplies none of the managed OTLP settings and lower managed sources are ignored ' +
|
|
302
|
+
'for them too.',
|
|
303
|
+
});
|
|
304
|
+
}
|
|
286
305
|
for (const { layer, reason } of effective.skipped ?? []) {
|
|
287
306
|
issues.push({
|
|
288
307
|
level: 'info',
|
|
@@ -444,6 +463,28 @@ const renderChecks = (issues) => {
|
|
|
444
463
|
console.log(`${prefix} ${issue.message}`);
|
|
445
464
|
}
|
|
446
465
|
};
|
|
466
|
+
const markerMatchers = (adapter, matchers) => matchersForTool(matchers, adapter.markers?.runtimeTool ?? DEFAULT_MARKER_TOOL);
|
|
467
|
+
const hookChoices = async (adapter) => {
|
|
468
|
+
const { hooks } = await readSettings();
|
|
469
|
+
return { markers: hooks?.markers?.[adapter.name] ?? true };
|
|
470
|
+
};
|
|
471
|
+
const markerLayers = async (adapter) => {
|
|
472
|
+
const hooksFile = adapter.markers?.hooksFile;
|
|
473
|
+
if (hooksFile === undefined)
|
|
474
|
+
return activeHierarchy(adapter);
|
|
475
|
+
return [
|
|
476
|
+
...(hooksFile.localPath
|
|
477
|
+
? [{ id: 'project', label: 'Project hooks file', path: hooksFile.localPath, kind: 'file' }]
|
|
478
|
+
: []),
|
|
479
|
+
{ id: 'user', label: 'User hooks file', path: hooksFile.path, kind: 'file' },
|
|
480
|
+
];
|
|
481
|
+
};
|
|
482
|
+
const markerIssuesFor = async (adapter, effective) => adapter.markers
|
|
483
|
+
? collectMarkerIssues(await scanForMarkers(await markerLayers(adapter)), VERSION, markerMatchers(adapter, await readPackagedMatchers()), await skippedMarkerScans(effective), await hookChoices(adapter), adapter.markers.runtimeTool ?? DEFAULT_MARKER_TOOL, {
|
|
484
|
+
managedDir: managedHooksDir(),
|
|
485
|
+
hookShellMissing: await hookShellMissingFor(adapter, () => flattenEffective(effective)),
|
|
486
|
+
})
|
|
487
|
+
: [];
|
|
447
488
|
const skippedMarkerScans = async (effective) => {
|
|
448
489
|
const out = [];
|
|
449
490
|
for (const { layer, reason } of effective.skipped ?? []) {
|
|
@@ -517,9 +558,7 @@ export const runDoctor = async (adapter, options = {}) => {
|
|
|
517
558
|
console.log();
|
|
518
559
|
const issues = collectIssues(effective, adapter, await attributionContext(adapter, effective));
|
|
519
560
|
const shellEnvIssues = await checkShellEnv(adapter);
|
|
520
|
-
const markerIssues = adapter
|
|
521
|
-
? await collectMarkerIssues(await scanForMarkers(await activeHierarchy(adapter)), VERSION, await readPackagedMatchers(), await skippedMarkerScans(effective))
|
|
522
|
-
: [];
|
|
561
|
+
const markerIssues = await markerIssuesFor(adapter, effective);
|
|
523
562
|
const behaviourHookIssues = adapter.behaviourHooks
|
|
524
563
|
? await collectBehaviourHookIssues(adapter.behaviourHooks, VERSION)
|
|
525
564
|
: [];
|
|
@@ -545,9 +584,7 @@ const runDoctorJson = async (adapter, options) => {
|
|
|
545
584
|
const issues = [
|
|
546
585
|
...collectIssues(effective, adapter, await attributionContext(adapter, effective)),
|
|
547
586
|
...(await checkShellEnv(adapter)),
|
|
548
|
-
...(adapter
|
|
549
|
-
? await collectMarkerIssues(await scanForMarkers(await activeHierarchy(adapter)), VERSION, await readPackagedMatchers(), await skippedMarkerScans(effective))
|
|
550
|
-
: []),
|
|
587
|
+
...(await markerIssuesFor(adapter, effective)),
|
|
551
588
|
...(adapter.behaviourHooks
|
|
552
589
|
? await collectBehaviourHookIssues(adapter.behaviourHooks, VERSION)
|
|
553
590
|
: []),
|
|
@@ -556,4 +593,3 @@ const runDoctorJson = async (adapter, options) => {
|
|
|
556
593
|
emitJson(await doctorJson(adapter, effective, issues, validation));
|
|
557
594
|
return issues.some((i) => i.level === 'error') || validation?.ok === false ? 1 : 0;
|
|
558
595
|
};
|
|
559
|
-
//# sourceMappingURL=doctor.js.map
|
package/dist/core/edit.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { select } from '@inquirer/prompts';
|
|
2
2
|
import { spawn } from 'node:child_process';
|
|
3
3
|
import { promises as fs } from 'node:fs';
|
|
4
|
-
import { resolve } from 'node:path';
|
|
5
4
|
import { WizardAbort } from './errors.js';
|
|
6
5
|
import { color } from './format.js';
|
|
7
6
|
import { policyState } from './layer-policy.js';
|
|
7
|
+
import { isSamePath } from './settings.js';
|
|
8
8
|
const candidatesFor = (adapter) => {
|
|
9
9
|
const out = [
|
|
10
10
|
{ label: 'Global', path: adapter.paths.global },
|
|
@@ -102,10 +102,15 @@ const spawnEditor = (editor, path) => new Promise((resolve, reject) => {
|
|
|
102
102
|
});
|
|
103
103
|
const isInteractive = () => Boolean(process.stdin.isTTY && process.stdout.isTTY);
|
|
104
104
|
export const ignoredKeysEditNote = (adapter, target) => {
|
|
105
|
-
|
|
106
|
-
|
|
105
|
+
if (target !== adapter.paths.local)
|
|
106
|
+
return null;
|
|
107
|
+
if (isSamePath(target, adapter.paths.global))
|
|
107
108
|
return null;
|
|
108
|
-
if (
|
|
109
|
+
if (adapter.paths.localIgnored !== undefined) {
|
|
110
|
+
return `${adapter.paths.localIgnored}. To change where telemetry goes, run \`mainwave-cli edit ${adapter.name} --global\`.`;
|
|
111
|
+
}
|
|
112
|
+
const policy = adapter.layerKeyPolicy;
|
|
113
|
+
if (!policy)
|
|
109
114
|
return null;
|
|
110
115
|
const layerId = adapter.hierarchy.find((l) => l.path === target)?.id;
|
|
111
116
|
if (!layerId || !policy.layers.includes(layerId) || policyState(policy) !== 'active')
|
|
@@ -140,4 +145,3 @@ export const runEdit = async (adapter, opts) => {
|
|
|
140
145
|
console.error(color.yellow(`⚠ ${note}`));
|
|
141
146
|
return spawnEditor(resolveEditor(), target);
|
|
142
147
|
};
|
|
143
|
-
//# sourceMappingURL=edit.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { promises as fs } from 'node:fs';
|
|
2
2
|
import { isAbsolute, join, resolve } from 'node:path';
|
|
3
|
-
import { ignoredKeysAt, isManagedLayer, policyState } from './layer-policy.js';
|
|
3
|
+
import { ignoredKeysAt, isManagedLayer, isPolicyKey, policyState, } from './layer-policy.js';
|
|
4
4
|
import { readExistingEnv } from './settings.js';
|
|
5
5
|
const extensionFor = (codec) => {
|
|
6
6
|
if (codec.format === 'toml')
|
|
@@ -9,12 +9,32 @@ const extensionFor = (codec) => {
|
|
|
9
9
|
return '.env';
|
|
10
10
|
return '.json';
|
|
11
11
|
};
|
|
12
|
-
const
|
|
12
|
+
const managedFactsOf = async (path, unitClaim) => {
|
|
13
|
+
let doc;
|
|
14
|
+
try {
|
|
15
|
+
doc = JSON.parse(await fs.readFile(path, 'utf8'));
|
|
16
|
+
}
|
|
17
|
+
catch {
|
|
18
|
+
return undefined;
|
|
19
|
+
}
|
|
20
|
+
if (doc === null || typeof doc !== 'object' || Array.isArray(doc))
|
|
21
|
+
return undefined;
|
|
22
|
+
const settings = doc;
|
|
23
|
+
const claim = unitClaim?.(settings);
|
|
24
|
+
return {
|
|
25
|
+
hasPolicyKey: Object.keys(settings).some(isPolicyKey),
|
|
26
|
+
...(claim !== undefined ? { unitClaim: claim } : {}),
|
|
27
|
+
};
|
|
28
|
+
};
|
|
29
|
+
const scanFile = async (layer, path, codec, unitClaim) => {
|
|
13
30
|
try {
|
|
14
31
|
const env = await readExistingEnv(path, codec);
|
|
15
32
|
if (env === null)
|
|
16
33
|
return { layer, path, status: 'missing', env: {} };
|
|
17
|
-
|
|
34
|
+
const facts = layer.managedSource !== undefined && codec.format === 'json'
|
|
35
|
+
? await managedFactsOf(path, unitClaim)
|
|
36
|
+
: undefined;
|
|
37
|
+
return { layer, path, status: 'present', env, ...(facts ? { managedFacts: facts } : {}) };
|
|
18
38
|
}
|
|
19
39
|
catch (err) {
|
|
20
40
|
return {
|
|
@@ -27,7 +47,7 @@ const scanFile = async (layer, path, codec) => {
|
|
|
27
47
|
}
|
|
28
48
|
};
|
|
29
49
|
export const dropInNames = (entries, ext = '.json') => entries.filter((e) => e.endsWith(ext) && !e.startsWith('.')).sort();
|
|
30
|
-
const scanDir = async (layer, codec) => {
|
|
50
|
+
const scanDir = async (layer, codec, unitClaim) => {
|
|
31
51
|
let entries;
|
|
32
52
|
try {
|
|
33
53
|
entries = await fs.readdir(layer.path);
|
|
@@ -50,9 +70,11 @@ const scanDir = async (layer, codec) => {
|
|
|
50
70
|
if (matching.length === 0) {
|
|
51
71
|
return [{ layer, path: layer.path, status: 'missing', env: {} }];
|
|
52
72
|
}
|
|
53
|
-
return Promise.all(matching.map((name) => scanFile(layer, join(layer.path, name), codec)));
|
|
73
|
+
return Promise.all(matching.map((name) => scanFile(layer, join(layer.path, name), codec, unitClaim)));
|
|
54
74
|
};
|
|
55
|
-
const scanLayer = (codec) => async (layer) => layer.kind === 'dir'
|
|
75
|
+
const scanLayer = (codec, unitClaim) => async (layer) => layer.kind === 'dir'
|
|
76
|
+
? scanDir(layer, codec, unitClaim)
|
|
77
|
+
: [await scanFile(layer, layer.path, codec, unitClaim)];
|
|
56
78
|
const inactiveLayers = async (adapter, scans) => {
|
|
57
79
|
if (!adapter.inactiveLayers)
|
|
58
80
|
return [];
|
|
@@ -87,6 +109,16 @@ export const flattenEffective = (effective) => {
|
|
|
87
109
|
}
|
|
88
110
|
return out;
|
|
89
111
|
};
|
|
112
|
+
export const effectiveEnv = async (adapter, userEnv) => {
|
|
113
|
+
const effective = await computeEffective(adapter);
|
|
114
|
+
if (userEnv === undefined)
|
|
115
|
+
return flattenEffective(effective);
|
|
116
|
+
const written = resolve(adapter.paths.global);
|
|
117
|
+
const scans = effective.scans.map((scan) => resolve(scan.path) === written
|
|
118
|
+
? { ...scan, status: 'present', env: { ...userEnv } }
|
|
119
|
+
: scan);
|
|
120
|
+
return flattenEffective(effectiveFrom(adapter, scans));
|
|
121
|
+
};
|
|
90
122
|
export const nativeIdentityReason = async (adapter, effective) => {
|
|
91
123
|
if (!adapter.nativeIdentityAbsent)
|
|
92
124
|
return undefined;
|
|
@@ -94,7 +126,7 @@ export const nativeIdentityReason = async (adapter, effective) => {
|
|
|
94
126
|
return adapter.nativeIdentityAbsent({ ...process.env, ...flattenEffective(e) }, e.scans.filter((s) => s.status === 'present').map((s) => s.path));
|
|
95
127
|
};
|
|
96
128
|
export const computeEffective = async (adapter, policyOverride) => {
|
|
97
|
-
const allScans = await Promise.all(adapter.hierarchy.map(scanLayer(adapter.codec)));
|
|
129
|
+
const allScans = await Promise.all(adapter.hierarchy.map(scanLayer(adapter.codec, adapter.managedUnitClaim)));
|
|
98
130
|
const skip = await inactiveLayers(adapter, allScans.flat());
|
|
99
131
|
const skipped = adapter.hierarchy.flatMap((layer) => {
|
|
100
132
|
const reason = skip.find((s) => s.id === layer.id)?.reason;
|
|
@@ -105,6 +137,25 @@ export const computeEffective = async (adapter, policyOverride) => {
|
|
|
105
137
|
const scans = flat.filter((scan, i) => !flat.slice(i + 1).some((later) => resolve(later.path) === resolve(scan.path)));
|
|
106
138
|
return { ...effectiveFrom(adapter, scans, policyOverride), skipped };
|
|
107
139
|
};
|
|
140
|
+
const isManagedSourceScan = (scan) => isManagedLayer(scan.layer) && scan.layer.managedSource !== undefined;
|
|
141
|
+
const managedUnit = (adapter, scans) => {
|
|
142
|
+
const unitKey = adapter.managedUnitKey;
|
|
143
|
+
if (!unitKey)
|
|
144
|
+
return {};
|
|
145
|
+
const managed = scans.filter(isManagedSourceScan);
|
|
146
|
+
const unitSource = managed.find((scan) => Object.keys(scan.env).some((k) => unitKey(k)) || scan.managedFacts?.unitClaim !== undefined)?.layer.managedSource;
|
|
147
|
+
if (unitSource === undefined)
|
|
148
|
+
return {};
|
|
149
|
+
const claiming = managed.find((scan) => scan.layer.managedSource === unitSource && scan.managedFacts?.unitClaim !== undefined);
|
|
150
|
+
const setting = claiming?.managedFacts?.unitClaim;
|
|
151
|
+
if (claiming === undefined || setting === undefined)
|
|
152
|
+
return { unitSource };
|
|
153
|
+
const inEffect = managed.find((scan) => scan.managedFacts?.hasPolicyKey ?? Object.keys(scan.env).length > 0)?.layer.managedSource;
|
|
154
|
+
return { unitSource, unitClaim: { setting, lands: inEffect === unitSource, scan: claiming } };
|
|
155
|
+
};
|
|
156
|
+
export const isManagedUnitDrop = (adapter, { unitSource, unitClaim }, scan, key) => unitSource !== undefined &&
|
|
157
|
+
adapter.managedUnitKey?.(key) === true &&
|
|
158
|
+
(scan.layer.managedSource !== unitSource || unitClaim?.lands === false);
|
|
108
159
|
export const effectiveFrom = (adapter, scans, policyOverride) => {
|
|
109
160
|
const ignored = [];
|
|
110
161
|
if (adapter.layerKeyPolicy) {
|
|
@@ -118,16 +169,8 @@ export const effectiveFrom = (adapter, scans, policyOverride) => {
|
|
|
118
169
|
(adapter.layerKeyPolicy && ignored.length > 0
|
|
119
170
|
? policyState(adapter.layerKeyPolicy)
|
|
120
171
|
: 'inactive');
|
|
121
|
-
const
|
|
122
|
-
const
|
|
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;
|
|
172
|
+
const { unitSource, unitClaim } = managedUnit(adapter, scans);
|
|
173
|
+
const droppedInManaged = (scan, key) => isManagedUnitDrop(adapter, { unitSource, unitClaim }, scan, key);
|
|
131
174
|
const managedEnv = {};
|
|
132
175
|
for (const scan of scans) {
|
|
133
176
|
if (!isManagedLayer(scan.layer))
|
|
@@ -144,7 +187,8 @@ export const effectiveFrom = (adapter, scans, policyOverride) => {
|
|
|
144
187
|
for (const scan of scans) {
|
|
145
188
|
if (isManagedLayer(scan.layer))
|
|
146
189
|
continue;
|
|
147
|
-
const keys = Object.keys(scan.env).filter((k) => !policyIgnores(scan, k) &&
|
|
190
|
+
const keys = Object.keys(scan.env).filter((k) => !policyIgnores(scan, k) &&
|
|
191
|
+
adapter.managedLock(k, managedEnv, unitClaim?.lands ? unitClaim.setting : undefined));
|
|
148
192
|
if (keys.length > 0)
|
|
149
193
|
locked.push({ scan, keys });
|
|
150
194
|
}
|
|
@@ -160,6 +204,13 @@ export const effectiveFrom = (adapter, scans, policyOverride) => {
|
|
|
160
204
|
effective[k] = { key: k, value: v, source: scan };
|
|
161
205
|
}
|
|
162
206
|
}
|
|
163
|
-
return {
|
|
207
|
+
return {
|
|
208
|
+
scans,
|
|
209
|
+
effective,
|
|
210
|
+
policy,
|
|
211
|
+
ignored,
|
|
212
|
+
unitSource,
|
|
213
|
+
...(unitClaim ? { unitClaim } : {}),
|
|
214
|
+
locked,
|
|
215
|
+
};
|
|
164
216
|
};
|
|
165
|
-
//# sourceMappingURL=effective-settings.js.map
|