@inf-monkeys-tech/monkeys-cli 0.11.6 → 0.12.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.
Files changed (105) hide show
  1. package/LICENSE +232 -0
  2. package/README.md +15 -8
  3. package/README.zh.md +12 -9
  4. package/bin/run.js +4 -52
  5. package/bin/update-cache.js +3 -1
  6. package/dist/cli/run.d.ts +2 -0
  7. package/dist/cli/run.d.ts.map +1 -0
  8. package/dist/cli/run.js +45 -0
  9. package/dist/cli/run.js.map +1 -0
  10. package/dist/command/metadata.d.ts +1 -2
  11. package/dist/command/metadata.d.ts.map +1 -1
  12. package/dist/command/metadata.js +4 -13
  13. package/dist/command/metadata.js.map +1 -1
  14. package/dist/commands/dev-agent/work/watch.d.ts.map +1 -1
  15. package/dist/commands/dev-agent/work/watch.js +4 -7
  16. package/dist/commands/dev-agent/work/watch.js.map +1 -1
  17. package/dist/commands/execution/watch.d.ts.map +1 -1
  18. package/dist/commands/execution/watch.js +4 -7
  19. package/dist/commands/execution/watch.js.map +1 -1
  20. package/dist/commands/install.d.ts +12 -0
  21. package/dist/commands/install.d.ts.map +1 -0
  22. package/dist/commands/install.js +66 -0
  23. package/dist/commands/install.js.map +1 -0
  24. package/dist/commands/update.d.ts +3 -0
  25. package/dist/commands/update.d.ts.map +1 -1
  26. package/dist/commands/update.js +68 -3
  27. package/dist/commands/update.js.map +1 -1
  28. package/dist/config/index.d.ts +0 -1
  29. package/dist/config/index.d.ts.map +1 -1
  30. package/dist/config/index.js +0 -1
  31. package/dist/config/index.js.map +1 -1
  32. package/dist/config/local-command.d.ts +0 -2
  33. package/dist/config/local-command.d.ts.map +1 -1
  34. package/dist/config/local-command.js +8 -14
  35. package/dist/config/local-command.js.map +1 -1
  36. package/dist/config/registry.d.ts.map +1 -1
  37. package/dist/config/registry.js +2 -12
  38. package/dist/config/registry.js.map +1 -1
  39. package/dist/config/store.d.ts.map +1 -1
  40. package/dist/config/store.js +46 -5
  41. package/dist/config/store.js.map +1 -1
  42. package/dist/contracts/result.d.ts +1 -1
  43. package/dist/contracts/result.js +1 -1
  44. package/dist/contracts/version.d.ts +2 -2
  45. package/dist/contracts/version.js +2 -2
  46. package/dist/errors/cli-error.d.ts +3 -0
  47. package/dist/errors/cli-error.d.ts.map +1 -1
  48. package/dist/errors/cli-error.js +17 -0
  49. package/dist/errors/cli-error.js.map +1 -1
  50. package/dist/output/render.js +1 -1
  51. package/dist/schema/command-schema.d.ts +2 -1
  52. package/dist/schema/command-schema.d.ts.map +1 -1
  53. package/dist/schema/command-schema.js +2 -1
  54. package/dist/schema/command-schema.js.map +1 -1
  55. package/dist/security/redact.d.ts.map +1 -1
  56. package/dist/security/redact.js +16 -2
  57. package/dist/security/redact.js.map +1 -1
  58. package/dist/skills/content.d.ts +1 -0
  59. package/dist/skills/content.d.ts.map +1 -1
  60. package/dist/skills/content.js +2 -2
  61. package/dist/skills/content.js.map +1 -1
  62. package/dist/skills/state.d.ts +33 -7
  63. package/dist/skills/state.d.ts.map +1 -1
  64. package/dist/skills/state.js +103 -14
  65. package/dist/skills/state.js.map +1 -1
  66. package/dist/skills/sync.d.ts +5 -2
  67. package/dist/skills/sync.d.ts.map +1 -1
  68. package/dist/skills/sync.js +110 -9
  69. package/dist/skills/sync.js.map +1 -1
  70. package/dist/transport/http-client.d.ts.map +1 -1
  71. package/dist/transport/http-client.js +46 -20
  72. package/dist/transport/http-client.js.map +1 -1
  73. package/dist/transport/url-policy.d.ts +2 -0
  74. package/dist/transport/url-policy.d.ts.map +1 -0
  75. package/dist/transport/url-policy.js +33 -0
  76. package/dist/transport/url-policy.js.map +1 -0
  77. package/dist/update/finalize.d.ts +26 -0
  78. package/dist/update/finalize.d.ts.map +1 -0
  79. package/dist/update/finalize.js +5 -0
  80. package/dist/update/finalize.js.map +1 -0
  81. package/dist/update/installation.d.ts +17 -0
  82. package/dist/update/installation.d.ts.map +1 -0
  83. package/dist/update/installation.js +63 -0
  84. package/dist/update/installation.js.map +1 -0
  85. package/dist/update/notifier.d.ts +4 -4
  86. package/dist/update/notifier.d.ts.map +1 -1
  87. package/dist/update/notifier.js +68 -39
  88. package/dist/update/notifier.js.map +1 -1
  89. package/dist/update/process.d.ts +11 -0
  90. package/dist/update/process.d.ts.map +1 -0
  91. package/dist/update/process.js +20 -0
  92. package/dist/update/process.js.map +1 -0
  93. package/dist/update/updater.d.ts +12 -13
  94. package/dist/update/updater.d.ts.map +1 -1
  95. package/dist/update/updater.js +149 -59
  96. package/dist/update/updater.js.map +1 -1
  97. package/oclif.manifest.json +235 -2811
  98. package/package.json +6 -14
  99. package/skills/monkeys-shared/SKILL.md +1 -1
  100. package/skills/monkeys-shared/references/compatibility.md +2 -2
  101. package/bin/install-wizard.js +0 -77
  102. package/dist/config/fast-subscription-list.d.ts +0 -6
  103. package/dist/config/fast-subscription-list.d.ts.map +0 -1
  104. package/dist/config/fast-subscription-list.js +0 -19
  105. package/dist/config/fast-subscription-list.js.map +0 -1
@@ -2,15 +2,33 @@ import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
2
2
  import { dirname, join } from 'node:path';
3
3
  import { z } from 'zod';
4
4
  import { configDirectory, resolveConfigPath } from '../config/paths.js';
5
+ import { CliError, EXIT_CODES } from '../errors/cli-error.js';
6
+ import { runUpdateProcess } from '../update/process.js';
7
+ import { checksumSkillDirectory } from './content.js';
8
+ const ownedSkillSchema = z
9
+ .object({
10
+ checksum: z.string().regex(/^[a-f0-9]{64}$/),
11
+ name: z.string().min(1),
12
+ path: z.string().min(1),
13
+ })
14
+ .strict();
5
15
  const skillsStateSchema = z
6
16
  .object({
7
17
  cliVersion: z.string().min(1),
8
- schemaVersion: z.literal(1),
9
- skills: z.array(z.object({ checksum: z.string().regex(/^[a-f0-9]{64}$/), name: z.string().min(1) })),
18
+ schemaVersion: z.literal(2),
19
+ skills: z.array(ownedSkillSchema),
10
20
  source: z.enum(['install', 'sync', 'update']),
11
21
  syncedAt: z.string().datetime(),
12
22
  })
13
23
  .strict();
24
+ const discoveredSkillSchema = z
25
+ .object({
26
+ name: z.string().min(1),
27
+ path: z.string().min(1),
28
+ scope: z.string().optional(),
29
+ })
30
+ .passthrough();
31
+ export const LEGACY_OFFICIAL_SKILL_NAMES = ['monkeys'];
14
32
  export function defaultSkillsStatePath() {
15
33
  return join(configDirectory(resolveConfigPath()), 'skills-state.json');
16
34
  }
@@ -18,17 +36,62 @@ export async function readSkillsState(path = defaultSkillsStatePath()) {
18
36
  try {
19
37
  return skillsStateSchema.parse(JSON.parse(await readFile(path, 'utf8')));
20
38
  }
21
- catch (error) {
22
- if (error instanceof Error && 'code' in error && error.code === 'ENOENT')
23
- return undefined;
39
+ catch {
24
40
  return undefined;
25
41
  }
26
42
  }
43
+ export async function discoverGlobalSkills(runner = runUpdateProcess) {
44
+ const result = runner('npx', ['-y', 'skills', 'ls', '-g', '--json']);
45
+ if (result.error || result.status !== 0) {
46
+ throw new CliError('Unable to enumerate globally installed Agent Skills.', {
47
+ cause: result.error,
48
+ code: 'SKILL_DISCOVERY_FAILED',
49
+ exitCode: EXIT_CODES.internal,
50
+ safeDetails: { detail: `${result.stdout}\n${result.stderr}`.trim().slice(0, 2_000) },
51
+ });
52
+ }
53
+ let parsed;
54
+ try {
55
+ parsed = JSON.parse(result.stdout);
56
+ }
57
+ catch (cause) {
58
+ throw new CliError('The Agent Skill discovery command returned invalid JSON.', {
59
+ cause,
60
+ code: 'SKILL_DISCOVERY_INVALID',
61
+ exitCode: EXIT_CODES.compatibility,
62
+ });
63
+ }
64
+ const entries = z.array(discoveredSkillSchema).parse(parsed);
65
+ const unique = new Map();
66
+ for (const entry of entries) {
67
+ if (entry.scope && entry.scope !== 'global')
68
+ continue;
69
+ if (unique.has(entry.name)) {
70
+ throw new CliError('Agent Skill discovery returned duplicate global names.', {
71
+ code: 'SKILL_DISCOVERY_AMBIGUOUS',
72
+ exitCode: EXIT_CODES.compatibility,
73
+ safeDetails: { name: entry.name },
74
+ });
75
+ }
76
+ try {
77
+ unique.set(entry.name, { checksum: await checksumSkillDirectory(entry.path), name: entry.name, path: entry.path });
78
+ }
79
+ catch (cause) {
80
+ throw new CliError('An installed Agent Skill cannot be read for verification.', {
81
+ cause,
82
+ code: 'SKILL_INSTALLED_UNREADABLE',
83
+ exitCode: EXIT_CODES.compatibility,
84
+ safeDetails: { name: entry.name, path: entry.path },
85
+ });
86
+ }
87
+ }
88
+ return [...unique.values()].sort((left, right) => left.name.localeCompare(right.name));
89
+ }
27
90
  export async function writeSkillsState(cliVersion, skills, source, path = defaultSkillsStatePath()) {
28
91
  const state = skillsStateSchema.parse({
29
92
  cliVersion,
30
- schemaVersion: 1,
31
- skills: skills.map(({ checksum, name }) => ({ checksum, name })),
93
+ schemaVersion: 2,
94
+ skills: skills.map(({ checksum, name, path: installedPath }) => ({ checksum, name, path: installedPath })),
32
95
  source,
33
96
  syncedAt: new Date().toISOString(),
34
97
  });
@@ -38,19 +101,45 @@ export async function writeSkillsState(cliVersion, skills, source, path = defaul
38
101
  await rename(temporary, path);
39
102
  return state;
40
103
  }
41
- export async function skillsStatus(cliVersion, bundled, path = defaultSkillsStatePath()) {
42
- const state = await readSkillsState(path);
104
+ export async function skillsStatus(cliVersion, bundled, path = defaultSkillsStatePath(), runner = runUpdateProcess) {
105
+ const [state, discovered] = await Promise.all([readSkillsState(path), discoverGlobalSkills(runner)]);
106
+ const installedByName = new Map(discovered.map((skill) => [skill.name, skill]));
43
107
  const expected = bundled.map(({ checksum, name }) => ({ checksum, name }));
44
- const versionMatch = state?.cliVersion === cliVersion;
45
- const skillsMatch = state ? JSON.stringify(state.skills) === JSON.stringify(expected) : false;
108
+ const actual = expected.map(({ checksum, name }) => {
109
+ const installed = installedByName.get(name);
110
+ return {
111
+ expectedChecksum: checksum,
112
+ installed: Boolean(installed),
113
+ ...(installed ? { installedChecksum: installed.checksum, path: installed.path } : {}),
114
+ matches: installed?.checksum === checksum,
115
+ name,
116
+ };
117
+ });
118
+ const orphaned = [
119
+ ...LEGACY_OFFICIAL_SKILL_NAMES.filter((name) => installedByName.has(name)),
120
+ ...(state?.skills ?? [])
121
+ .map(({ name }) => name)
122
+ .filter((name) => !expected.some((skill) => skill.name === name) && installedByName.has(name)),
123
+ ].filter((name, index, values) => values.indexOf(name) === index);
124
+ const stateMatchesActual = Boolean(state &&
125
+ state.cliVersion === cliVersion &&
126
+ state.skills.length === expected.length &&
127
+ state.skills.every((owned) => {
128
+ const installed = installedByName.get(owned.name);
129
+ return installed?.path === owned.path && installed.checksum === owned.checksum;
130
+ }));
131
+ const contentMatches = actual.every((skill) => skill.installed && skill.matches);
46
132
  return {
133
+ actual,
47
134
  bundled: expected,
48
135
  cliVersion,
49
- inSync: Boolean(state && versionMatch && skillsMatch),
136
+ contentMatches,
137
+ inSync: Boolean(state && stateMatchesActual && contentMatches && orphaned.length === 0),
138
+ orphaned,
139
+ stateMatchesActual,
50
140
  stateRecorded: Boolean(state),
51
141
  ...(state ? { state } : {}),
52
- skillsMatch,
53
- versionMatch,
142
+ versionMatch: state?.cliVersion === cliVersion,
54
143
  };
55
144
  }
56
145
  //# sourceMappingURL=state.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/skills/state.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/skills/state.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { ProcessRunner } from '../update/updater.js';
1
+ import { type ProcessRunner } from '../update/process.js';
2
2
  import { type SkillsState } from './state.js';
3
3
  export interface SyncSkillsOptions {
4
4
  cliVersion: string;
@@ -10,16 +10,19 @@ export interface SyncSkillsOptions {
10
10
  export declare function syncBundledSkills(options: SyncSkillsOptions): Promise<{
11
11
  action: 'failed';
12
12
  warning: string;
13
+ removed?: never;
13
14
  state?: never;
14
15
  } | {
15
16
  warning?: never;
16
17
  action: 'synced';
18
+ removed: string[];
17
19
  state: {
18
20
  cliVersion: string;
19
- schemaVersion: 1;
21
+ schemaVersion: 2;
20
22
  skills: {
21
23
  checksum: string;
22
24
  name: string;
25
+ path: string;
23
26
  }[];
24
27
  source: "install" | "sync" | "update";
25
28
  syncedAt: string;
@@ -1 +1 @@
1
- {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/skills/sync.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAI1D,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAEhE,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB;YAM7C,QAAQ;;;;;YAIV,QAAQ;;;;;;;;;;;GAC1B"}
1
+ {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/skills/sync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAwCD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB;YAkB3C,QAAQ;;;;;;YA+CR,QAAQ;;;;;;;;;;;;;GAW9B"}
@@ -1,17 +1,118 @@
1
- import { runUpdateProcess } from '../update/updater.js';
1
+ import { cp, mkdtemp, rm } from 'node:fs/promises';
2
+ import { tmpdir } from 'node:os';
2
3
  import { join } from 'node:path';
4
+ import { runUpdateProcess } from '../update/process.js';
3
5
  import { listBundledSkills } from './content.js';
4
- import { writeSkillsState } from './state.js';
6
+ import { discoverGlobalSkills, LEGACY_OFFICIAL_SKILL_NAMES, readSkillsState, writeSkillsState, } from './state.js';
7
+ function processFailure(result) {
8
+ return `${result.stdout}\n${result.stderr}`.trim().slice(0, 2_000) || result.error?.message || 'unknown failure';
9
+ }
10
+ function removal(runner, name) {
11
+ return runner('npx', ['-y', 'skills', 'remove', name, '-g', '-y']);
12
+ }
13
+ async function rollbackSkills(runner, affectedNames, backupRoot, before) {
14
+ const failures = [];
15
+ for (const name of affectedNames) {
16
+ const result = removal(runner, name);
17
+ if (result.error || result.status !== 0)
18
+ failures.push(`remove ${name}: ${processFailure(result)}`);
19
+ }
20
+ if (before.length > 0) {
21
+ const restored = runner('npx', ['-y', 'skills', 'add', backupRoot, '-y', '-g', '--copy']);
22
+ if (restored.error || restored.status !== 0)
23
+ failures.push(`restore: ${processFailure(restored)}`);
24
+ }
25
+ if (failures.length === 0) {
26
+ try {
27
+ const restored = new Map((await discoverGlobalSkills(runner)).map((skill) => [skill.name, skill]));
28
+ const mismatch = before.find((skill) => restored.get(skill.name)?.checksum !== skill.checksum);
29
+ if (mismatch)
30
+ failures.push(`restored content mismatch for ${mismatch.name}`);
31
+ const originalNames = new Set(before.map((skill) => skill.name));
32
+ const unexpected = affectedNames.find((name) => !originalNames.has(name) && restored.has(name));
33
+ if (unexpected)
34
+ failures.push(`unexpected Skill remains after rollback: ${unexpected}`);
35
+ }
36
+ catch (error) {
37
+ failures.push(`restore verification: ${error instanceof Error ? error.message : String(error)}`);
38
+ }
39
+ }
40
+ return failures.length === 0 ? 'previous Skill set restored' : `Skill rollback failed: ${failures.join('; ')}`;
41
+ }
5
42
  export async function syncBundledSkills(options) {
6
43
  const runner = options.runner ?? runUpdateProcess;
7
44
  const skillsRoot = join(options.packageRoot, 'skills');
8
- const result = runner('npx', ['-y', 'skills', 'add', skillsRoot, '-y', '-g', '--copy']);
9
- if (result.error || result.status !== 0) {
10
- const detail = `${result.stdout}\n${result.stderr}`.trim().slice(0, 2_000) || result.error?.message || 'unknown failure';
11
- return { action: 'failed', warning: `Skill sync failed: ${detail}` };
45
+ const bundled = await listBundledSkills(skillsRoot);
46
+ const expectedNames = new Set(bundled.map(({ name }) => name));
47
+ const previousState = await readSkillsState(options.statePath);
48
+ const previousOwned = new Map((previousState?.skills ?? []).map((skill) => [skill.name, skill]));
49
+ const discoveredBefore = await discoverGlobalSkills(runner);
50
+ const beforeByName = new Map(discoveredBefore.map((skill) => [skill.name, skill]));
51
+ const staleNames = [
52
+ ...LEGACY_OFFICIAL_SKILL_NAMES,
53
+ ...(previousState?.skills ?? []).map(({ name }) => name).filter((name) => !expectedNames.has(name)),
54
+ ].filter((name, index, names) => names.indexOf(name) === index && beforeByName.has(name));
55
+ for (const name of staleNames) {
56
+ const previous = previousOwned.get(name);
57
+ const installed = beforeByName.get(name);
58
+ if (previous && previous.checksum !== installed.checksum) {
59
+ return { action: 'failed', warning: `Former official Skill ${name} was modified; refusing to delete ${installed.path}.` };
60
+ }
61
+ }
62
+ const affectedNames = [...new Set([...bundled.map(({ name }) => name), ...staleNames])];
63
+ const affectedBefore = affectedNames.map((name) => beforeByName.get(name)).filter((skill) => skill !== undefined);
64
+ const transactionRoot = await mkdtemp(join(tmpdir(), 'monkeys-skills-transaction-'));
65
+ const backupRoot = join(transactionRoot, 'skills');
66
+ try {
67
+ for (const skill of affectedBefore)
68
+ await cp(skill.path, join(backupRoot, skill.name), { recursive: true });
69
+ let failure;
70
+ for (const name of staleNames) {
71
+ const removed = removal(runner, name);
72
+ if (removed.error || removed.status !== 0) {
73
+ failure = `Unable to remove former official Skill ${name}: ${processFailure(removed)}`;
74
+ break;
75
+ }
76
+ }
77
+ if (!failure) {
78
+ const installed = runner('npx', ['-y', 'skills', 'add', skillsRoot, '-y', '-g', '--copy']);
79
+ if (installed.error || installed.status !== 0)
80
+ failure = `Skill installation failed: ${processFailure(installed)}`;
81
+ }
82
+ let owned = [];
83
+ if (!failure) {
84
+ try {
85
+ const after = await discoverGlobalSkills(runner);
86
+ const afterByName = new Map(after.map((skill) => [skill.name, skill]));
87
+ owned = bundled.map(({ name }) => afterByName.get(name)).filter((skill) => skill !== undefined);
88
+ const mismatch = bundled.find(({ checksum, name }) => afterByName.get(name)?.checksum !== checksum);
89
+ const orphaned = staleNames.filter((name) => afterByName.has(name));
90
+ if (mismatch || owned.length !== bundled.length || orphaned.length > 0) {
91
+ failure = `Installed Skill verification failed${mismatch ? ` for ${mismatch.name}` : ''}${orphaned.length ? `; stale Skills remain: ${orphaned.join(', ')}` : ''}.`;
92
+ }
93
+ }
94
+ catch (error) {
95
+ failure = `Installed Skill verification failed: ${error instanceof Error ? error.message : String(error)}`;
96
+ }
97
+ }
98
+ if (failure) {
99
+ const rollback = await rollbackSkills(runner, affectedNames, backupRoot, affectedBefore);
100
+ return { action: 'failed', warning: `${failure}; ${rollback}` };
101
+ }
102
+ try {
103
+ const state = await writeSkillsState(options.cliVersion, owned, options.source, options.statePath);
104
+ return { action: 'synced', removed: staleNames, state };
105
+ }
106
+ catch (error) {
107
+ const rollback = await rollbackSkills(runner, affectedNames, backupRoot, affectedBefore);
108
+ return {
109
+ action: 'failed',
110
+ warning: `Unable to commit Skill ownership state: ${error instanceof Error ? error.message : String(error)}; ${rollback}`,
111
+ };
112
+ }
113
+ }
114
+ finally {
115
+ await rm(transactionRoot, { force: true, recursive: true });
12
116
  }
13
- const skills = await listBundledSkills(skillsRoot);
14
- const state = await writeSkillsState(options.cliVersion, skills, options.source, options.statePath);
15
- return { action: 'synced', state };
16
117
  }
17
118
  //# sourceMappingURL=sync.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/skills/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAoB,MAAM,YAAY,CAAC;AAUhE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAA0B;IAChE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,gBAAgB,CAAC;IAClD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACxF,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,IAAI,iBAAiB,CAAC;QACzH,OAAO,EAAE,MAAM,EAAE,QAAiB,EAAE,OAAO,EAAE,sBAAsB,MAAM,EAAE,EAAE,CAAC;IAChF,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACpG,OAAO,EAAE,MAAM,EAAE,QAAiB,EAAE,KAAK,EAAE,CAAC;AAC9C,CAAC"}
1
+ {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/skills/sync.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/transport/http-client.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAiIpH,qBAAa,UAAU;;IAKrB,OAAO,eAIN;IAED,OAAa,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,CAmClG;IAEK,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CA4EvE;IAEK,UAAU,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAqDhE;IAEK,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAiDlF;CACF"}
1
+ {"version":3,"file":"http-client.d.ts","sourceRoot":"","sources":["../../src/transport/http-client.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAiJpH,qBAAa,UAAU;;IAKrB,OAAO,eAIN;IAED,OAAa,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,CAmClG;IAEK,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAiFvE;IAEK,UAAU,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA0DhE;IAEK,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsDlF;CACF"}
@@ -2,26 +2,34 @@ import { readFile } from 'node:fs/promises';
2
2
  import { Agent, ProxyAgent, request as undiciRequest } from 'undici';
3
3
  import { CliError, EXIT_CODES } from '../errors/cli-error.js';
4
4
  import { assertSafeCustomHeaders } from './headers.js';
5
+ import { normalizeDeploymentBaseUrl } from './url-policy.js';
5
6
  const DEFAULT_TIMEOUT_MS = 30_000;
6
7
  const DEFAULT_MAX_RESPONSE_BYTES = 10 * 1024 * 1024;
7
8
  const RETRYABLE_STATUS = new Set([429, 502, 503, 504]);
8
- function normalizeBaseUrl(value) {
9
- let url;
10
- try {
11
- url = new URL(value);
12
- }
13
- catch {
14
- throw new CliError('Deployment Base URL is invalid.', { code: 'INVALID_BASE_URL', exitCode: EXIT_CODES.configuration });
9
+ function requestDeadline(timeoutMs, callerSignal) {
10
+ const timeoutSignal = AbortSignal.timeout(timeoutMs);
11
+ return {
12
+ signal: callerSignal ? AbortSignal.any([callerSignal, timeoutSignal]) : timeoutSignal,
13
+ timedOut: () => timeoutSignal.aborted,
14
+ };
15
+ }
16
+ function deadlineError(deadline, callerSignal) {
17
+ if (deadline.timedOut()) {
18
+ return new CliError('Network request exceeded its total timeout.', {
19
+ code: 'REQUEST_TIMEOUT',
20
+ exitCode: EXIT_CODES.network,
21
+ retryable: true,
22
+ });
15
23
  }
16
- if (url.protocol !== 'https:' && !(url.protocol === 'http:' && ['127.0.0.1', 'localhost', '::1'].includes(url.hostname))) {
17
- throw new CliError('Only HTTPS is allowed; HTTP can only be used for local addresses.', {
18
- code: 'INSECURE_BASE_URL',
19
- exitCode: EXIT_CODES.configuration,
20
- safeDetails: { origin: url.origin },
24
+ if (callerSignal?.aborted) {
25
+ return new CliError('Network request was aborted by the caller.', {
26
+ code: 'REQUEST_ABORTED',
27
+ exitCode: EXIT_CODES.network,
21
28
  });
22
29
  }
23
- url.pathname = url.pathname.replace(/\/+$/, '');
24
- return url;
30
+ }
31
+ function normalizeBaseUrl(value) {
32
+ return new URL(normalizeDeploymentBaseUrl(value));
25
33
  }
26
34
  function buildUrl(context, input) {
27
35
  if (!input.path.startsWith('/') || /^\/\//.test(input.path) || /^[a-z][a-z\d+.-]*:/i.test(input.path)) {
@@ -193,23 +201,26 @@ export class HttpClient {
193
201
  const encodedBody = input.rawBody ?? (input.body === undefined ? undefined : JSON.stringify(input.body));
194
202
  if (input.body !== undefined)
195
203
  headers['content-type'] = 'application/json';
204
+ const timeoutMs = input.timeoutMs ?? DEFAULT_TIMEOUT_MS;
205
+ const deadline = requestDeadline(timeoutMs, input.signal);
196
206
  let lastError;
197
207
  for (let attempt = 1; attempt <= this.#maxAttempts; attempt += 1) {
198
208
  try {
199
209
  const response = await undiciRequest(url, {
200
210
  ...(encodedBody === undefined ? {} : { body: encodedBody }),
201
211
  ...(this.#dispatcher ? { dispatcher: this.#dispatcher } : {}),
212
+ bodyTimeout: timeoutMs,
202
213
  headers,
203
- headersTimeout: input.timeoutMs ?? DEFAULT_TIMEOUT_MS,
214
+ headersTimeout: timeoutMs,
204
215
  method: input.method,
205
- ...(input.signal ? { signal: input.signal } : {}),
216
+ signal: deadline.signal,
206
217
  });
207
218
  const normalizedHeaders = normalizedResponseHeaders(response.headers);
208
219
  const retryable = RETRYABLE_STATUS.has(response.statusCode) && isReplaySafe(input) && attempt < this.#maxAttempts;
209
220
  if (retryable) {
210
221
  response.body.destroy();
211
222
  const retryAfter = parseRetryAfter(normalizedHeaders['retry-after']);
212
- await delay(retryAfter ?? Math.min(250 * 2 ** (attempt - 1) + Math.floor(Math.random() * 100), 2_000), input.signal);
223
+ await delay(retryAfter ?? Math.min(250 * 2 ** (attempt - 1) + Math.floor(Math.random() * 100), 2_000), deadline.signal);
213
224
  continue;
214
225
  }
215
226
  const buffer = await readLimitedBody(response.body, input.maxResponseBytes ?? DEFAULT_MAX_RESPONSE_BYTES);
@@ -239,9 +250,12 @@ export class HttpClient {
239
250
  lastError = error;
240
251
  if (error instanceof CliError)
241
252
  throw error;
253
+ const terminal = deadlineError(deadline, input.signal);
254
+ if (terminal)
255
+ throw terminal;
242
256
  if (!isReplaySafe(input) || attempt >= this.#maxAttempts)
243
257
  break;
244
- await delay(Math.min(250 * 2 ** (attempt - 1) + Math.floor(Math.random() * 100), 2_000), input.signal);
258
+ await delay(Math.min(250 * 2 ** (attempt - 1) + Math.floor(Math.random() * 100), 2_000), deadline.signal);
245
259
  }
246
260
  }
247
261
  throw new CliError('Network request failed.', {
@@ -267,17 +281,23 @@ export class HttpClient {
267
281
  ...(this.#context.teamId ? { 'x-monkeys-teamid': this.#context.teamId } : {}),
268
282
  ...(input.headers ?? {}),
269
283
  };
284
+ const timeoutMs = input.timeoutMs ?? DEFAULT_TIMEOUT_MS;
285
+ const deadline = requestDeadline(timeoutMs, input.signal);
270
286
  let response;
271
287
  try {
272
288
  response = await undiciRequest(url, {
273
289
  ...(this.#dispatcher ? { dispatcher: this.#dispatcher } : {}),
290
+ bodyTimeout: timeoutMs,
274
291
  headers,
275
- headersTimeout: input.timeoutMs ?? DEFAULT_TIMEOUT_MS,
292
+ headersTimeout: timeoutMs,
276
293
  method: input.method,
277
- ...(input.signal ? { signal: input.signal } : {}),
294
+ signal: deadline.signal,
278
295
  });
279
296
  }
280
297
  catch (cause) {
298
+ const terminal = deadlineError(deadline, input.signal);
299
+ if (terminal)
300
+ throw terminal;
281
301
  throw new CliError('Failed to open streaming response.', {
282
302
  cause,
283
303
  code: 'NETWORK_ERROR',
@@ -317,16 +337,22 @@ export class HttpClient {
317
337
  safeDetails: { origin: url.origin },
318
338
  });
319
339
  }
340
+ const deadline = requestDeadline(DEFAULT_TIMEOUT_MS);
320
341
  let response;
321
342
  try {
322
343
  response = await undiciRequest(url, {
323
344
  ...(this.#dispatcher ? { dispatcher: this.#dispatcher } : {}),
345
+ bodyTimeout: DEFAULT_TIMEOUT_MS,
324
346
  headers: { accept: '*/*' },
325
347
  headersTimeout: DEFAULT_TIMEOUT_MS,
326
348
  method: 'GET',
349
+ signal: deadline.signal,
327
350
  });
328
351
  }
329
352
  catch (cause) {
353
+ const terminal = deadlineError(deadline);
354
+ if (terminal)
355
+ throw terminal;
330
356
  throw new CliError('Failed to open external media stream.', {
331
357
  cause,
332
358
  code: 'MEDIA_DOWNLOAD_NETWORK_ERROR',
@@ -1 +1 @@
1
- {"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/transport/http-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../src/transport/http-client.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export declare function normalizeDeploymentBaseUrl(value: string): string;
2
+ //# sourceMappingURL=url-policy.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"url-policy.d.ts","sourceRoot":"","sources":["../../src/transport/url-policy.ts"],"names":[],"mappings":"AAIA,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CA8BhE"}
@@ -0,0 +1,33 @@
1
+ import { CliError, EXIT_CODES } from '../errors/cli-error.js';
2
+ const LOCAL_HTTP_HOSTS = new Set(['127.0.0.1', '::1', '[::1]', 'localhost']);
3
+ export function normalizeDeploymentBaseUrl(value) {
4
+ let url;
5
+ try {
6
+ url = new URL(value);
7
+ }
8
+ catch (cause) {
9
+ throw new CliError('Deployment Base URL is invalid.', {
10
+ cause,
11
+ code: 'DEPLOYMENT_URL_INVALID',
12
+ exitCode: EXIT_CODES.configuration,
13
+ });
14
+ }
15
+ const localHttp = url.protocol === 'http:' && LOCAL_HTTP_HOSTS.has(url.hostname.toLowerCase());
16
+ if (url.protocol !== 'https:' && !localHttp) {
17
+ throw new CliError('Deployment Base URL must use HTTPS; HTTP is allowed only for local addresses.', {
18
+ code: 'INSECURE_BASE_URL',
19
+ exitCode: EXIT_CODES.configuration,
20
+ safeDetails: { origin: url.origin },
21
+ });
22
+ }
23
+ if (url.username || url.password || url.search || url.hash) {
24
+ throw new CliError('Deployment Base URL cannot contain user information, query parameters, or fragments.', {
25
+ code: 'DEPLOYMENT_URL_INVALID',
26
+ exitCode: EXIT_CODES.configuration,
27
+ safeDetails: { origin: url.origin },
28
+ });
29
+ }
30
+ url.pathname = url.pathname.replace(/\/+$/, '');
31
+ return url.toString().replace(/\/$/, '');
32
+ }
33
+ //# sourceMappingURL=url-policy.js.map