@inf-monkeys-tech/monkeys-cli 0.11.6 → 0.12.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 +11 -8
- package/README.zh.md +11 -8
- package/bin/run.js +4 -52
- package/bin/update-cache.js +3 -1
- package/dist/cli/run.d.ts +2 -0
- package/dist/cli/run.d.ts.map +1 -0
- package/dist/cli/run.js +45 -0
- package/dist/cli/run.js.map +1 -0
- package/dist/command/metadata.d.ts +1 -2
- package/dist/command/metadata.d.ts.map +1 -1
- package/dist/command/metadata.js +4 -13
- package/dist/command/metadata.js.map +1 -1
- package/dist/commands/dev-agent/work/watch.d.ts.map +1 -1
- package/dist/commands/dev-agent/work/watch.js +4 -7
- package/dist/commands/dev-agent/work/watch.js.map +1 -1
- package/dist/commands/execution/watch.d.ts.map +1 -1
- package/dist/commands/execution/watch.js +4 -7
- package/dist/commands/execution/watch.js.map +1 -1
- package/dist/commands/install.d.ts +12 -0
- package/dist/commands/install.d.ts.map +1 -0
- package/dist/commands/install.js +66 -0
- package/dist/commands/install.js.map +1 -0
- package/dist/commands/update.d.ts +3 -0
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +68 -3
- package/dist/commands/update.js.map +1 -1
- package/dist/config/index.d.ts +0 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +0 -1
- package/dist/config/index.js.map +1 -1
- package/dist/config/local-command.d.ts +0 -2
- package/dist/config/local-command.d.ts.map +1 -1
- package/dist/config/local-command.js +8 -14
- package/dist/config/local-command.js.map +1 -1
- package/dist/config/registry.d.ts.map +1 -1
- package/dist/config/registry.js +2 -12
- package/dist/config/registry.js.map +1 -1
- package/dist/config/store.d.ts.map +1 -1
- package/dist/config/store.js +46 -5
- package/dist/config/store.js.map +1 -1
- package/dist/contracts/result.d.ts +1 -1
- package/dist/contracts/result.js +1 -1
- package/dist/contracts/version.d.ts +2 -2
- package/dist/contracts/version.js +2 -2
- package/dist/errors/cli-error.d.ts +3 -0
- package/dist/errors/cli-error.d.ts.map +1 -1
- package/dist/errors/cli-error.js +17 -0
- package/dist/errors/cli-error.js.map +1 -1
- package/dist/output/render.js +1 -1
- package/dist/schema/command-schema.d.ts +2 -1
- package/dist/schema/command-schema.d.ts.map +1 -1
- package/dist/schema/command-schema.js +2 -1
- package/dist/schema/command-schema.js.map +1 -1
- package/dist/security/redact.d.ts.map +1 -1
- package/dist/security/redact.js +16 -2
- package/dist/security/redact.js.map +1 -1
- package/dist/skills/content.d.ts +1 -0
- package/dist/skills/content.d.ts.map +1 -1
- package/dist/skills/content.js +2 -2
- package/dist/skills/content.js.map +1 -1
- package/dist/skills/state.d.ts +33 -7
- package/dist/skills/state.d.ts.map +1 -1
- package/dist/skills/state.js +103 -14
- package/dist/skills/state.js.map +1 -1
- package/dist/skills/sync.d.ts +5 -2
- package/dist/skills/sync.d.ts.map +1 -1
- package/dist/skills/sync.js +110 -9
- package/dist/skills/sync.js.map +1 -1
- package/dist/transport/http-client.d.ts.map +1 -1
- package/dist/transport/http-client.js +46 -20
- package/dist/transport/http-client.js.map +1 -1
- package/dist/transport/url-policy.d.ts +2 -0
- package/dist/transport/url-policy.d.ts.map +1 -0
- package/dist/transport/url-policy.js +33 -0
- package/dist/transport/url-policy.js.map +1 -0
- package/dist/update/finalize.d.ts +26 -0
- package/dist/update/finalize.d.ts.map +1 -0
- package/dist/update/finalize.js +5 -0
- package/dist/update/finalize.js.map +1 -0
- package/dist/update/installation.d.ts +17 -0
- package/dist/update/installation.d.ts.map +1 -0
- package/dist/update/installation.js +63 -0
- package/dist/update/installation.js.map +1 -0
- package/dist/update/notifier.d.ts +4 -4
- package/dist/update/notifier.d.ts.map +1 -1
- package/dist/update/notifier.js +68 -39
- package/dist/update/notifier.js.map +1 -1
- package/dist/update/process.d.ts +11 -0
- package/dist/update/process.d.ts.map +1 -0
- package/dist/update/process.js +20 -0
- package/dist/update/process.js.map +1 -0
- package/dist/update/updater.d.ts +12 -13
- package/dist/update/updater.d.ts.map +1 -1
- package/dist/update/updater.js +149 -59
- package/dist/update/updater.js.map +1 -1
- package/oclif.manifest.json +235 -2811
- package/package.json +5 -13
- package/skills/monkeys-shared/SKILL.md +1 -1
- package/skills/monkeys-shared/references/compatibility.md +2 -2
- package/bin/install-wizard.js +0 -77
- package/dist/config/fast-subscription-list.d.ts +0 -6
- package/dist/config/fast-subscription-list.d.ts.map +0 -1
- package/dist/config/fast-subscription-list.js +0 -19
- package/dist/config/fast-subscription-list.js.map +0 -1
package/dist/commands/update.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { Flags } from '@oclif/core';
|
|
2
|
+
import { dirname } from 'node:path';
|
|
2
3
|
import { LocalCommand, localOutputFlag } from '../config/local-command.js';
|
|
3
4
|
import { asCliError, CliError, EXIT_CODES } from '../errors/cli-error.js';
|
|
5
|
+
import { bundledSkillsRoot } from '../skills/content.js';
|
|
6
|
+
import { finalizeCliUpdate } from '../update/finalize.js';
|
|
7
|
+
import { detectCliInstallation } from '../update/installation.js';
|
|
4
8
|
import { clearPendingUpdateNotice, fetchLatestVersion, isNewerVersion } from '../update/notifier.js';
|
|
5
9
|
import { installCliAndSkill, UpdateProcessError } from '../update/updater.js';
|
|
6
10
|
export default class Update extends LocalCommand {
|
|
@@ -8,6 +12,13 @@ export default class Update extends LocalCommand {
|
|
|
8
12
|
static examples = ['<%= config.bin %> update --check', '<%= config.bin %> update --dry-run', '<%= config.bin %> update'];
|
|
9
13
|
static flags = {
|
|
10
14
|
check: Flags.boolean({ default: false, summary: 'Only check for updates; do not install anything' }),
|
|
15
|
+
// Stable handoff contract for already-installed updaters. The newly installed CLI owns all post-install migration logic.
|
|
16
|
+
finalize: Flags.boolean({ default: false, exclusive: ['check', 'dry-run', 'force'], hidden: true }),
|
|
17
|
+
'finalize-source': Flags.string({ dependsOn: ['finalize'], hidden: true, options: ['install', 'update'] }),
|
|
18
|
+
'dry-run': Flags.boolean({
|
|
19
|
+
default: false,
|
|
20
|
+
summary: 'Validate the update and return the exact installation plan without changing anything',
|
|
21
|
+
}),
|
|
11
22
|
force: Flags.boolean({ default: false, summary: 'Reinstall CLI and Skills even if already on the latest version' }),
|
|
12
23
|
output: localOutputFlag,
|
|
13
24
|
};
|
|
@@ -16,9 +27,36 @@ export default class Update extends LocalCommand {
|
|
|
16
27
|
const { flags } = await this.parse(Update);
|
|
17
28
|
await this.emit('update', flags.output, async () => {
|
|
18
29
|
const currentVersion = this.config.version;
|
|
30
|
+
const installation = await detectCliInstallation();
|
|
31
|
+
if (flags.finalize) {
|
|
32
|
+
const finalized = await finalizeCliUpdate({
|
|
33
|
+
cliVersion: currentVersion,
|
|
34
|
+
packageRoot: dirname(bundledSkillsRoot()),
|
|
35
|
+
source: flags['finalize-source'] === 'install' ? 'install' : 'update',
|
|
36
|
+
});
|
|
37
|
+
if (finalized.action === 'failed') {
|
|
38
|
+
throw new CliError('Unable to finalize the CLI update.', {
|
|
39
|
+
code: 'SKILL_SYNC_FAILED',
|
|
40
|
+
exitCode: EXIT_CODES.internal,
|
|
41
|
+
recovery: ['Run `monkeys skills sync --output json` with the newly installed CLI.'],
|
|
42
|
+
safeDetails: { warning: finalized.warning },
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
return {
|
|
46
|
+
action: 'finalized',
|
|
47
|
+
autoUpdate: true,
|
|
48
|
+
command: 'monkeys update',
|
|
49
|
+
currentVersion,
|
|
50
|
+
executable: installation.executable,
|
|
51
|
+
installationMethod: installation.method,
|
|
52
|
+
latestVersion: currentVersion,
|
|
53
|
+
previousVersion: currentVersion,
|
|
54
|
+
skillsAction: 'synced',
|
|
55
|
+
};
|
|
56
|
+
}
|
|
19
57
|
let latestVersion;
|
|
20
58
|
try {
|
|
21
|
-
latestVersion = await fetchLatestVersion();
|
|
59
|
+
latestVersion = await fetchLatestVersion({ manager: installation.method === 'manual' ? 'npm' : installation.method });
|
|
22
60
|
}
|
|
23
61
|
catch (error) {
|
|
24
62
|
throw new CliError('Unable to query npm latest version.', {
|
|
@@ -33,24 +71,51 @@ export default class Update extends LocalCommand {
|
|
|
33
71
|
if (flags.check || (!updateAvailable && !flags.force)) {
|
|
34
72
|
return {
|
|
35
73
|
action: updateAvailable ? 'update_available' : 'already_up_to_date',
|
|
74
|
+
autoUpdate: installation.method !== 'manual',
|
|
75
|
+
command: 'monkeys update',
|
|
76
|
+
currentVersion,
|
|
77
|
+
executable: installation.executable,
|
|
78
|
+
installationMethod: installation.method,
|
|
79
|
+
latestVersion,
|
|
80
|
+
previousVersion: currentVersion,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
if (installation.method === 'manual') {
|
|
84
|
+
throw new CliError('This monkeys CLI installation is not owned by npm or pnpm and cannot be updated automatically.', {
|
|
85
|
+
code: 'UPDATE_MANUAL_INSTALLATION',
|
|
86
|
+
exitCode: EXIT_CODES.compatibility,
|
|
87
|
+
recovery: ['Install the exact release through npm or pnpm, then run `monkeys skills sync`.'],
|
|
88
|
+
safeDetails: { currentVersion, executable: installation.executable, latestVersion },
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
if (flags['dry-run']) {
|
|
92
|
+
return {
|
|
93
|
+
action: 'planned',
|
|
36
94
|
autoUpdate: true,
|
|
37
95
|
command: 'monkeys update',
|
|
38
96
|
currentVersion,
|
|
97
|
+
executable: installation.executable,
|
|
98
|
+
installationMethod: installation.method,
|
|
39
99
|
latestVersion,
|
|
100
|
+
plan: { manager: installation.method, package: '@inf-monkeys-tech/monkeys-cli', version: latestVersion },
|
|
40
101
|
previousVersion: currentVersion,
|
|
41
102
|
};
|
|
42
103
|
}
|
|
43
104
|
try {
|
|
44
|
-
const installed = await installCliAndSkill(latestVersion
|
|
105
|
+
const installed = await installCliAndSkill(latestVersion, {
|
|
106
|
+
manager: installation.method,
|
|
107
|
+
previousVersion: currentVersion,
|
|
108
|
+
});
|
|
45
109
|
return {
|
|
46
110
|
action: 'updated',
|
|
47
111
|
autoUpdate: true,
|
|
48
112
|
command: 'monkeys update',
|
|
49
113
|
currentVersion: installed.currentVersion,
|
|
114
|
+
executable: installed.executable,
|
|
115
|
+
installationMethod: installed.manager,
|
|
50
116
|
latestVersion,
|
|
51
117
|
previousVersion: currentVersion,
|
|
52
118
|
skillsAction: installed.skillsAction,
|
|
53
|
-
...(installed.skillsWarning ? { skillsWarning: installed.skillsWarning } : {}),
|
|
54
119
|
};
|
|
55
120
|
}
|
|
56
121
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACrG,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
package/dist/config/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC"}
|
package/dist/config/index.js
CHANGED
package/dist/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC"}
|
|
@@ -2,8 +2,6 @@ import { Command } from '@oclif/core';
|
|
|
2
2
|
export declare const localOutputFlag: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
3
3
|
export declare abstract class LocalCommand extends Command {
|
|
4
4
|
static baseFlags: {
|
|
5
|
-
'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
6
|
-
format: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
7
5
|
jq: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
8
6
|
yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
|
|
9
7
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-command.d.ts","sourceRoot":"","sources":["../../src/config/local-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAS7C,eAAO,MAAM,eAAe,qGAI1B,CAAC;AAeH,8BAAsB,YAAa,SAAQ,OAAO;IAChD,OAAgB,SAAS;QACvB,
|
|
1
|
+
{"version":3,"file":"local-command.d.ts","sourceRoot":"","sources":["../../src/config/local-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AAS7C,eAAO,MAAM,eAAe,qGAI1B,CAAC;AAeH,8BAAsB,YAAa,SAAQ,OAAO;IAChD,OAAgB,SAAS;QACvB,EAAE;QACF,GAAG;MACH;IAEF,UAAgB,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBvI;CACF"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { Command, Flags } from '@oclif/core';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
2
|
+
import { getCommandMetadata } from '../command/metadata.js';
|
|
3
|
+
import { successResult } from '../contracts/result.js';
|
|
4
|
+
import { bindCliErrorToCommand } from '../errors/cli-error.js';
|
|
5
5
|
import { OUTPUT_FORMATS, renderCommandResult } from '../output/render.js';
|
|
6
6
|
import { assertConfirmation } from '../policy/risk.js';
|
|
7
7
|
import { redactValue } from '../security/redact.js';
|
|
8
8
|
export const localOutputFlag = Flags.string({
|
|
9
9
|
default: 'json',
|
|
10
10
|
options: [...OUTPUT_FORMATS],
|
|
11
|
-
summary: 'Output format
|
|
11
|
+
summary: 'Output format',
|
|
12
12
|
});
|
|
13
13
|
function optionValue(argv, name, short) {
|
|
14
14
|
for (let index = 0; index < argv.length; index += 1) {
|
|
@@ -25,33 +25,27 @@ function hasFlag(argv, name, short) {
|
|
|
25
25
|
}
|
|
26
26
|
export class LocalCommand extends Command {
|
|
27
27
|
static baseFlags = {
|
|
28
|
-
'dry-run': Flags.boolean({ default: false, summary: 'Preview the operation without applying changes' }),
|
|
29
|
-
format: Flags.string({ options: [...OUTPUT_FORMATS], summary: 'Output format' }),
|
|
30
28
|
jq: Flags.string({ char: 'q', summary: 'Filter the JSON result with a jq expression' }),
|
|
31
29
|
yes: Flags.boolean({ char: 'y', default: false, summary: 'Confirm destructive or privileged operations' }),
|
|
32
30
|
};
|
|
33
31
|
async emit(command, output, operation, options = {}) {
|
|
34
|
-
const format =
|
|
32
|
+
const format = output;
|
|
35
33
|
const jq = optionValue(this.argv, 'jq', 'q');
|
|
36
34
|
try {
|
|
37
35
|
const metadata = getCommandMetadata(command);
|
|
38
|
-
|
|
39
|
-
if (!dryRun && metadata.confirmationEnforcement === 'generic') {
|
|
36
|
+
if (metadata.confirmationEnforcement === 'generic') {
|
|
40
37
|
assertConfirmation({
|
|
41
38
|
interactive: Boolean(process.stdin.isTTY),
|
|
42
39
|
risk: metadata.confirmationRequired ? metadata.risk : 'read',
|
|
43
40
|
yes: hasFlag(this.argv, 'yes', 'y'),
|
|
44
41
|
});
|
|
45
42
|
}
|
|
46
|
-
const data =
|
|
43
|
+
const data = await operation();
|
|
47
44
|
const result = (options.redact === false ? successResult(data, { command }) : redactValue(successResult(data, { command })));
|
|
48
45
|
this.log(await renderCommandResult(result, { format, ...(jq ? { jq } : {}) }));
|
|
49
46
|
}
|
|
50
47
|
catch (error) {
|
|
51
|
-
|
|
52
|
-
const result = redactValue(errorResult(cliError.toErrorDetail(), { command }));
|
|
53
|
-
this.log(await renderCommandResult(result, { format, ...(jq ? { jq } : {}) }));
|
|
54
|
-
this.exit(cliError.exitCode);
|
|
48
|
+
throw bindCliErrorToCommand(error, command);
|
|
55
49
|
}
|
|
56
50
|
}
|
|
57
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-command.js","sourceRoot":"","sources":["../../src/config/local-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"local-command.js","sourceRoot":"","sources":["../../src/config/local-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/config/registry.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/config/registry.ts"],"names":[],"mappings":"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"}
|
package/dist/config/registry.js
CHANGED
|
@@ -3,19 +3,9 @@ import { configurationError } from './errors.js';
|
|
|
3
3
|
import { normalizePathReference } from './paths.js';
|
|
4
4
|
import { deploymentSchema, subscriptionSchema, resourceNameSchema, } from './schema.js';
|
|
5
5
|
import { ConfigStore } from './store.js';
|
|
6
|
+
import { normalizeDeploymentBaseUrl } from '../transport/url-policy.js';
|
|
6
7
|
export function normalizeBaseUrl(value) {
|
|
7
|
-
|
|
8
|
-
try {
|
|
9
|
-
url = new URL(value);
|
|
10
|
-
}
|
|
11
|
-
catch (error) {
|
|
12
|
-
throw configurationError('DEPLOYMENT_URL_INVALID', `Invalid base URL: ${value}`, { cause: error });
|
|
13
|
-
}
|
|
14
|
-
if (!['http:', 'https:'].includes(url.protocol) || url.username || url.password || url.search || url.hash) {
|
|
15
|
-
throw configurationError('DEPLOYMENT_URL_INVALID', 'The Base URL must be an http(s) URL without user information, query parameters, and fragments.');
|
|
16
|
-
}
|
|
17
|
-
url.pathname = url.pathname.replace(/\/+$/, '');
|
|
18
|
-
return url.toString().replace(/\/$/, '');
|
|
8
|
+
return normalizeDeploymentBaseUrl(value);
|
|
19
9
|
}
|
|
20
10
|
function validateName(name) {
|
|
21
11
|
const parsed = resourceNameSchema.safeParse(name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/config/registry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/config/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/config/store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/config/store.ts"],"names":[],"mappings":"AAOA,OAAO,EAA6B,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5E,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AA4FD,qBAAa,WAAW;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAoB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,YAAY,OAAO,GAAE,kBAAuB,EAM3C;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAEK,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC,CAInC;IAEK,iBAAiB,IAAI,OAAO,CAAC,aAAa,CAAC,CAOhD;IAEK,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAS9E;IAEK,KAAK,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAIhD;YAEa,WAAW;IAgDzB,OAAO,CAAC,cAAc;YAQR,QAAQ;IAatB,OAAO,CAAC,QAAQ;YAQF,QAAQ;YAmCR,aAAa;CAa5B"}
|
package/dist/config/store.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
1
2
|
import { constants } from 'node:fs';
|
|
2
3
|
import { access, mkdir, open, readFile, rename, stat, unlink } from 'node:fs/promises';
|
|
3
4
|
import { dirname } from 'node:path';
|
|
@@ -13,6 +14,33 @@ const DEFAULT_LOCK_TIMEOUT_MS = 10_000;
|
|
|
13
14
|
function isNodeError(error, code) {
|
|
14
15
|
return error instanceof Error && 'code' in error && error.code === code;
|
|
15
16
|
}
|
|
17
|
+
function parseLockRecord(value) {
|
|
18
|
+
try {
|
|
19
|
+
const parsed = JSON.parse(value);
|
|
20
|
+
if (typeof parsed.createdAt !== 'string' ||
|
|
21
|
+
!Number.isSafeInteger(parsed.pid) ||
|
|
22
|
+
parsed.pid <= 0 ||
|
|
23
|
+
typeof parsed.token !== 'string' ||
|
|
24
|
+
!parsed.token) {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
return parsed;
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
function processIsAlive(pid) {
|
|
34
|
+
if (pid === process.pid)
|
|
35
|
+
return true;
|
|
36
|
+
try {
|
|
37
|
+
process.kill(pid, 0);
|
|
38
|
+
return true;
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
return isNodeError(error, 'EPERM');
|
|
42
|
+
}
|
|
43
|
+
}
|
|
16
44
|
function parseConfigText(text, path) {
|
|
17
45
|
try {
|
|
18
46
|
const document = parse(text, { maxAliasCount: 20, uniqueKeys: true });
|
|
@@ -117,9 +145,10 @@ export class ConfigStore {
|
|
|
117
145
|
for (;;) {
|
|
118
146
|
try {
|
|
119
147
|
const handle = await open(this.lockPath, 'wx', 0o600);
|
|
120
|
-
|
|
148
|
+
const token = randomUUID();
|
|
149
|
+
await handle.writeFile(JSON.stringify({ createdAt: new Date().toISOString(), pid: process.pid, token }));
|
|
121
150
|
await handle.sync();
|
|
122
|
-
return handle;
|
|
151
|
+
return { handle, token };
|
|
123
152
|
}
|
|
124
153
|
catch (error) {
|
|
125
154
|
const lockContention = isNodeError(error, 'EEXIST') || (process.platform === 'win32' && isNodeError(error, 'EPERM'));
|
|
@@ -129,8 +158,16 @@ export class ConfigStore {
|
|
|
129
158
|
try {
|
|
130
159
|
const lockStat = await stat(this.lockPath);
|
|
131
160
|
if (Date.now() - lockStat.mtimeMs > this.lockStaleMs) {
|
|
132
|
-
await
|
|
133
|
-
|
|
161
|
+
const observed = await readFile(this.lockPath, 'utf8');
|
|
162
|
+
const owner = parseLockRecord(observed);
|
|
163
|
+
if (!owner || !processIsAlive(owner.pid)) {
|
|
164
|
+
// Re-read immediately before deletion so stale evidence from a
|
|
165
|
+
// replaced lock cannot delete the new owner's lease.
|
|
166
|
+
if ((await readFile(this.lockPath, 'utf8')) === observed) {
|
|
167
|
+
await unlink(this.lockPath);
|
|
168
|
+
continue;
|
|
169
|
+
}
|
|
170
|
+
}
|
|
134
171
|
}
|
|
135
172
|
}
|
|
136
173
|
catch (lockError) {
|
|
@@ -178,7 +215,7 @@ export class ConfigStore {
|
|
|
178
215
|
}
|
|
179
216
|
}
|
|
180
217
|
async withLock(operation) {
|
|
181
|
-
const handle = await this.acquireLock();
|
|
218
|
+
const { handle, token } = await this.acquireLock();
|
|
182
219
|
let result;
|
|
183
220
|
let operationError;
|
|
184
221
|
try {
|
|
@@ -190,6 +227,10 @@ export class ConfigStore {
|
|
|
190
227
|
let releaseError;
|
|
191
228
|
try {
|
|
192
229
|
await handle.close();
|
|
230
|
+
const owner = parseLockRecord(await readFile(this.lockPath, 'utf8'));
|
|
231
|
+
if (owner?.token !== token) {
|
|
232
|
+
throw configurationError('CONFIG_LOCK_OWNERSHIP_LOST', `Configuration lock ownership changed: ${this.lockPath}`);
|
|
233
|
+
}
|
|
193
234
|
await unlink(this.lockPath);
|
|
194
235
|
}
|
|
195
236
|
catch (error) {
|
package/dist/config/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/config/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,MAAM,EAAY,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAsB,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,oCAAoC,EAAE,MAAM,+BAA+B,CAAC;AAUrF,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,MAAM,qBAAqB,GAAG,MAAM,CAAC;AACrC,MAAM,uBAAuB,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/config/store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { type UpdateNotice } from '../update/notifier.js';
|
|
3
|
-
export declare const RESULT_SCHEMA_VERSION: '
|
|
3
|
+
export declare const RESULT_SCHEMA_VERSION: '2';
|
|
4
4
|
export declare const contextSummarySchema: z.ZodObject<{
|
|
5
5
|
authSurface: z.ZodOptional<z.ZodString>;
|
|
6
6
|
deployment: z.ZodOptional<z.ZodString>;
|
package/dist/contracts/result.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { getPendingUpdateNotice } from '../update/notifier.js';
|
|
3
|
-
export const RESULT_SCHEMA_VERSION = '
|
|
3
|
+
export const RESULT_SCHEMA_VERSION = '2';
|
|
4
4
|
export const contextSummarySchema = z.object({
|
|
5
5
|
authSurface: z.string().optional(),
|
|
6
6
|
deployment: z.string().optional(),
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export declare const COMMAND_SCHEMA_MAJOR:
|
|
1
|
+
export declare const COMMAND_SCHEMA_MAJOR: 4;
|
|
2
2
|
export declare const BUNDLED_SKILL_NAMES: readonly ['monkeys-shared', 'monkeys-auth', 'monkeys-workflow', 'monkeys-dev-agent-work', 'monkeys-data', 'monkeys-system-config', 'monkeys-openapi'];
|
|
3
|
-
export declare const BUNDLED_SKILL_MINIMUM_CLI_VERSION: '0.
|
|
3
|
+
export declare const BUNDLED_SKILL_MINIMUM_CLI_VERSION: '0.12.0';
|
|
4
4
|
export declare function isCliSkillCompatible(cliVersion: string, minimumCliVersion: string, skillSchemaMajor: number): boolean;
|
|
5
5
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export const COMMAND_SCHEMA_MAJOR =
|
|
1
|
+
export const COMMAND_SCHEMA_MAJOR = 4;
|
|
2
2
|
export const BUNDLED_SKILL_NAMES = [
|
|
3
3
|
'monkeys-shared',
|
|
4
4
|
'monkeys-auth',
|
|
@@ -8,7 +8,7 @@ export const BUNDLED_SKILL_NAMES = [
|
|
|
8
8
|
'monkeys-system-config',
|
|
9
9
|
'monkeys-openapi',
|
|
10
10
|
];
|
|
11
|
-
export const BUNDLED_SKILL_MINIMUM_CLI_VERSION = '0.
|
|
11
|
+
export const BUNDLED_SKILL_MINIMUM_CLI_VERSION = '0.12.0';
|
|
12
12
|
function semverTuple(value) {
|
|
13
13
|
const match = /^v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/.exec(value.trim());
|
|
14
14
|
return match ? [Number(match[1]), Number(match[2]), Number(match[3])] : undefined;
|
|
@@ -16,6 +16,7 @@ export type ExitCode = (typeof EXIT_CODES)[keyof typeof EXIT_CODES];
|
|
|
16
16
|
export interface CliErrorOptions {
|
|
17
17
|
cause?: unknown;
|
|
18
18
|
code: string;
|
|
19
|
+
command?: string;
|
|
19
20
|
exitCode: ExitCode;
|
|
20
21
|
fallbackEligible?: boolean;
|
|
21
22
|
recovery?: string[];
|
|
@@ -24,6 +25,7 @@ export interface CliErrorOptions {
|
|
|
24
25
|
}
|
|
25
26
|
export declare class CliError extends Error {
|
|
26
27
|
readonly code: string;
|
|
28
|
+
readonly command: string | undefined;
|
|
27
29
|
readonly exitCode: ExitCode;
|
|
28
30
|
readonly fallbackEligible: boolean;
|
|
29
31
|
readonly recovery: string[] | undefined;
|
|
@@ -32,5 +34,6 @@ export declare class CliError extends Error {
|
|
|
32
34
|
constructor(message: string, options: CliErrorOptions);
|
|
33
35
|
toErrorDetail(): ErrorDetail;
|
|
34
36
|
}
|
|
37
|
+
export declare function bindCliErrorToCommand(error: unknown, command: string): CliError;
|
|
35
38
|
export declare function asCliError(error: unknown): CliError;
|
|
36
39
|
//# sourceMappingURL=cli-error.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-error.d.ts","sourceRoot":"","sources":["../../src/errors/cli-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,eAAO,MAAM,UAAU;aACrB,GAAG,EAAE,CAAC;aACN,cAAc,EAAE,CAAC;aACjB,aAAa,EAAE,CAAC;aAChB,aAAa,EAAE,CAAC;aAChB,aAAa,EAAE,CAAC;aAChB,YAAY,EAAE,CAAC;aACf,QAAQ,EAAE,EAAE;aACZ,OAAO,EAAE,CAAC;aACV,OAAO,EAAE,CAAC;aACV,OAAO,EAAE,CAAC;aACV,UAAU,EAAE,CAAC;CACL,CAAC;AAEX,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAEpE,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,qBAAa,QAAS,SAAQ,KAAK;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAE/B,YAAY,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"cli-error.d.ts","sourceRoot":"","sources":["../../src/errors/cli-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,eAAO,MAAM,UAAU;aACrB,GAAG,EAAE,CAAC;aACN,cAAc,EAAE,CAAC;aACjB,aAAa,EAAE,CAAC;aAChB,aAAa,EAAE,CAAC;aAChB,aAAa,EAAE,CAAC;aAChB,YAAY,EAAE,CAAC;aACf,QAAQ,EAAE,EAAE;aACZ,OAAO,EAAE,CAAC;aACV,OAAO,EAAE,CAAC;aACV,OAAO,EAAE,CAAC;aACV,UAAU,EAAE,CAAC;CACL,CAAC;AAEX,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAEpE,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,qBAAa,QAAS,SAAQ,KAAK;IACjC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAE/B,YAAY,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAUpD;IAED,aAAa,IAAI,WAAW,CAS3B;CACF;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,CAa/E;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,QAAQ,CAGnD"}
|
package/dist/errors/cli-error.js
CHANGED
|
@@ -13,6 +13,7 @@ export const EXIT_CODES = {
|
|
|
13
13
|
};
|
|
14
14
|
export class CliError extends Error {
|
|
15
15
|
code;
|
|
16
|
+
command;
|
|
16
17
|
exitCode;
|
|
17
18
|
fallbackEligible;
|
|
18
19
|
recovery;
|
|
@@ -22,6 +23,7 @@ export class CliError extends Error {
|
|
|
22
23
|
super(message, { cause: options.cause });
|
|
23
24
|
this.name = 'CliError';
|
|
24
25
|
this.code = options.code;
|
|
26
|
+
this.command = options.command;
|
|
25
27
|
this.exitCode = options.exitCode;
|
|
26
28
|
this.fallbackEligible = options.fallbackEligible ?? false;
|
|
27
29
|
this.recovery = options.recovery;
|
|
@@ -39,6 +41,21 @@ export class CliError extends Error {
|
|
|
39
41
|
};
|
|
40
42
|
}
|
|
41
43
|
}
|
|
44
|
+
export function bindCliErrorToCommand(error, command) {
|
|
45
|
+
const cliError = asCliError(error);
|
|
46
|
+
if (cliError.command === command)
|
|
47
|
+
return cliError;
|
|
48
|
+
return new CliError(cliError.message, {
|
|
49
|
+
cause: cliError,
|
|
50
|
+
code: cliError.code,
|
|
51
|
+
command,
|
|
52
|
+
exitCode: cliError.exitCode,
|
|
53
|
+
fallbackEligible: cliError.fallbackEligible,
|
|
54
|
+
...(cliError.recovery ? { recovery: cliError.recovery } : {}),
|
|
55
|
+
retryable: cliError.retryable,
|
|
56
|
+
...(cliError.safeDetails === undefined ? {} : { safeDetails: cliError.safeDetails }),
|
|
57
|
+
});
|
|
58
|
+
}
|
|
42
59
|
export function asCliError(error) {
|
|
43
60
|
if (error instanceof CliError)
|
|
44
61
|
return error;
|