@mycompbox/compbox-cli 1.21.9 → 1.21.11
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/.tsbuildinfo +1 -1
- package/commands/list.js +1 -1
- package/commands/list.js.map +1 -1
- package/commands/machines.d.ts +4 -0
- package/commands/machines.d.ts.map +1 -1
- package/commands/machines.js +61 -2
- package/commands/machines.js.map +1 -1
- package/commands/run.d.ts +27 -1
- package/commands/run.d.ts.map +1 -1
- package/commands/run.js +182 -36
- package/commands/run.js.map +1 -1
- package/commands/update.d.ts +19 -0
- package/commands/update.d.ts.map +1 -1
- package/commands/update.js +124 -7
- package/commands/update.js.map +1 -1
- package/commands/workspace.d.ts.map +1 -1
- package/commands/workspace.js +13 -1
- package/commands/workspace.js.map +1 -1
- package/index.js +4983 -1505
- package/index.js.map +1 -1
- package/package.json +1 -1
- package/utils/agent-invoker.d.ts +264 -31
- package/utils/agent-invoker.d.ts.map +1 -1
- package/utils/agent-invoker.js +1013 -372
- package/utils/agent-invoker.js.map +1 -1
- package/utils/brew.d.ts +10 -0
- package/utils/brew.d.ts.map +1 -1
- package/utils/brew.js +14 -0
- package/utils/brew.js.map +1 -1
- package/utils/cli-version.d.ts +3 -0
- package/utils/cli-version.d.ts.map +1 -0
- package/utils/cli-version.js +18 -0
- package/utils/cli-version.js.map +1 -0
- package/utils/cloud-preflight.d.ts +68 -0
- package/utils/cloud-preflight.d.ts.map +1 -0
- package/utils/cloud-preflight.js +287 -0
- package/utils/cloud-preflight.js.map +1 -0
- package/utils/config-store.d.ts +29 -0
- package/utils/config-store.d.ts.map +1 -1
- package/utils/config-store.js +30 -0
- package/utils/config-store.js.map +1 -1
- package/utils/install-cache.d.ts +105 -0
- package/utils/install-cache.d.ts.map +1 -0
- package/utils/install-cache.js +184 -0
- package/utils/install-cache.js.map +1 -0
- package/utils/mailbox-client.d.ts +130 -3
- package/utils/mailbox-client.d.ts.map +1 -1
- package/utils/mailbox-client.js +140 -6
- package/utils/mailbox-client.js.map +1 -1
- package/utils/merge-guard.d.ts +66 -0
- package/utils/merge-guard.d.ts.map +1 -0
- package/utils/merge-guard.js +271 -0
- package/utils/merge-guard.js.map +1 -0
- package/utils/merge-policy.d.ts +68 -0
- package/utils/merge-policy.d.ts.map +1 -0
- package/utils/merge-policy.js +129 -0
- package/utils/merge-policy.js.map +1 -0
- package/utils/progress-watcher.d.ts +53 -0
- package/utils/progress-watcher.d.ts.map +1 -0
- package/utils/progress-watcher.js +109 -0
- package/utils/progress-watcher.js.map +1 -0
- package/utils/project-checks.d.ts +72 -0
- package/utils/project-checks.d.ts.map +1 -0
- package/utils/project-checks.js +276 -0
- package/utils/project-checks.js.map +1 -0
- package/utils/run-timings.d.ts +59 -0
- package/utils/run-timings.d.ts.map +1 -0
- package/utils/run-timings.js +130 -0
- package/utils/run-timings.js.map +1 -0
- package/utils/run-workspace.d.ts +200 -2
- package/utils/run-workspace.d.ts.map +1 -1
- package/utils/run-workspace.js +898 -136
- package/utils/run-workspace.js.map +1 -1
- package/utils/self-update.d.ts +104 -0
- package/utils/self-update.d.ts.map +1 -0
- package/utils/self-update.js +391 -0
- package/utils/self-update.js.map +1 -0
- package/utils/usage-limit.d.ts +30 -0
- package/utils/usage-limit.d.ts.map +1 -0
- package/utils/usage-limit.js +186 -0
- package/utils/usage-limit.js.map +1 -0
- package/utils/wrap-up.d.ts +109 -0
- package/utils/wrap-up.d.ts.map +1 -0
- package/utils/wrap-up.js +260 -0
- package/utils/wrap-up.js.map +1 -0
package/commands/list.js
CHANGED
|
@@ -126,7 +126,7 @@ export const listCommand = new Command('list')
|
|
|
126
126
|
console.log(chalk.gray(`Available: ${String(availableCount)}`));
|
|
127
127
|
if (updatesAvailable > 0) {
|
|
128
128
|
console.log(chalk.yellow(`Updates available: ${String(updatesAvailable)}`));
|
|
129
|
-
console.log(chalk.gray('\nRun: compbox update --yes'));
|
|
129
|
+
console.log(chalk.gray('\nRun: compbox update packs --yes'));
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
132
|
}
|
package/commands/list.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAiB,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAgB,MAAM,6BAA6B,CAAC;AAS3E,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;KAC3C,WAAW,CAAC,0CAA0C,CAAC;KACvD,MAAM,CAAC,aAAa,EAAE,2BAA2B,CAAC;KAClD,MAAM,CAAC,aAAa,EAAE,yCAAyC,CAAC;KAChE,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC;KACjD,MAAM,CAAC,iBAAiB,EAAE,6DAA6D,CAAC;KACxF,MAAM,CAAC,KAAK,EAAE,OAAoB,EAAE,EAAE;IACrC,MAAM,OAAO,GAAG,GAAG,CAAC,kBAAkB,CAAC,CAAC,KAAK,EAAE,CAAC;IAEhD,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;QAEtC,yBAAyB;QACzB,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QAC9D,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QAE9D,IAAI,cAAc,GAA6D,EAAE,CAAC;QAClF,IAAI,cAAc,GAAe,EAAE,CAAC;QAEpC,wBAAwB;QACxB,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,CAAC;gBAClD,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC;YAC3C,CAAC;YAAC,MAAM,CAAC;gBACP,uCAAuC;YACzC,CAAC;QACH,CAAC;QAED,sCAAsC;QACtC,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC;gBACH,cAAc,GAAG,MAAM,SAAS,CAAC,SAAS,EAAE,CAAC;YAC/C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,+CAA+C,CAAC,CAAC,CAAC;gBAC5E,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;oBAC3B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,CAAC,IAAI,EAAE,CAAC;QAEf,gCAAgC;QAChC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,4BAA4B;YAC5B,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7C,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBAC1D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC,CAAC;gBACzE,OAAO;YACT,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAc,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CACxD,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;gBACjB,IAAI;gBACJ,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,gBAAgB,EAAE,IAAI,CAAC,WAAW;aACnC,CAAC,CACH,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YAC7B,4BAA4B;YAC5B,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC,CAAC;gBACtE,OAAO;YACT,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAc,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACpD,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,IAAI,CAAC,aAAa;gBAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC,CAAC,CAAC;YACJ,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,qBAAqB;YACrB,MAAM,aAAa,GAAG,IAAI,GAAG,EAAmB,CAAC;YAEjD,sBAAsB;YACtB,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;gBAClC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;oBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,OAAO,EAAE,IAAI,CAAC,aAAa;oBAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;iBAC9B,CAAC,CAAC;YACL,CAAC;YAED,mDAAmD;YACnD,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC/D,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACzC,IAAI,QAAQ,EAAE,CAAC;oBACb,+BAA+B;oBAC/B,MAAM,WAAW,GAAG,eAAe,CAAC,eAAe,CACjD,SAAS,CAAC,OAAO,EACjB,QAAQ,CAAC,OAAO,CACjB,CAAC;oBACF,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE;wBACtB,GAAG,QAAQ;wBACX,gBAAgB,EAAE,SAAS,CAAC,OAAO;wBACnC,eAAe,EAAE,WAAW,CAAC,WAAW;4BACtC,CAAC,CAAC,QAAQ,CAAC,OAAO;4BAClB,CAAC,CAAC,SAAS;qBACd,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,4DAA4D;oBAC5D,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE;wBACtB,IAAI;wBACJ,OAAO,EAAE,SAAS,CAAC,OAAO;wBAC1B,gBAAgB,EAAE,SAAS,CAAC,OAAO;wBACnC,WAAW,EAAE,iBAAiB;qBAC/B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YAED,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC5D,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAC7B,CAAC;YAEF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBACtD,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAC5D,CAAC;gBACF,OAAO;YACT,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;YAEtD,eAAe;YACf,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;YAC1D,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC;YAC7C,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC;YAEtE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;YAChE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;YAChE,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;gBACzB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,sBAAsB,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC5E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAE3D,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}
|
package/commands/machines.d.ts
CHANGED
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
*
|
|
6
6
|
* - `list` — the caller's non-revoked machines (id / name / readiness).
|
|
7
7
|
* - `rename <id> <n>` — change a machine's display name.
|
|
8
|
+
* - `update <id> [--name n] [--auto-continue on|off]` — change settings;
|
|
9
|
+
* auto-continue re-queues stalled orchestrate runs on that machine (ENG-334).
|
|
8
10
|
* - `rm <id>` — soft-revoke a machine: cuts off its daemon token and
|
|
9
11
|
* fails its queued/in-progress jobs. Confirmed unless
|
|
10
12
|
* `--yes`/`--force` is passed.
|
|
@@ -15,4 +17,6 @@
|
|
|
15
17
|
*/
|
|
16
18
|
import { Command } from 'commander';
|
|
17
19
|
export declare const machinesCommand: Command;
|
|
20
|
+
/** Parses an on/off style toggle argument; returns null when unrecognized. */
|
|
21
|
+
export declare function parseToggle(value: string): boolean | null;
|
|
18
22
|
//# sourceMappingURL=machines.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machines.d.ts","sourceRoot":"","sources":["../../src/commands/machines.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"machines.d.ts","sourceRoot":"","sources":["../../src/commands/machines.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgDpC,eAAO,MAAM,eAAe,SAE3B,CAAC;AAwDF,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAKzD"}
|
package/commands/machines.js
CHANGED
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
*
|
|
6
6
|
* - `list` — the caller's non-revoked machines (id / name / readiness).
|
|
7
7
|
* - `rename <id> <n>` — change a machine's display name.
|
|
8
|
+
* - `update <id> [--name n] [--auto-continue on|off]` — change settings;
|
|
9
|
+
* auto-continue re-queues stalled orchestrate runs on that machine (ENG-334).
|
|
8
10
|
* - `rm <id>` — soft-revoke a machine: cuts off its daemon token and
|
|
9
11
|
* fails its queued/in-progress jobs. Confirmed unless
|
|
10
12
|
* `--yes`/`--force` is passed.
|
|
@@ -71,10 +73,20 @@ machinesCommand
|
|
|
71
73
|
return;
|
|
72
74
|
}
|
|
73
75
|
const table = new Table({
|
|
74
|
-
head: [
|
|
76
|
+
head: [
|
|
77
|
+
chalk.cyan('ID'),
|
|
78
|
+
chalk.cyan('Name'),
|
|
79
|
+
chalk.cyan('Readiness'),
|
|
80
|
+
chalk.cyan('Auto-continue'),
|
|
81
|
+
],
|
|
75
82
|
});
|
|
76
83
|
for (const machine of machines) {
|
|
77
|
-
table.push([
|
|
84
|
+
table.push([
|
|
85
|
+
machine.id,
|
|
86
|
+
machine.name,
|
|
87
|
+
formatReadiness(machine.readiness),
|
|
88
|
+
machine.autoContinue === false ? 'off' : 'on',
|
|
89
|
+
]);
|
|
78
90
|
}
|
|
79
91
|
console.log(table.toString());
|
|
80
92
|
}
|
|
@@ -96,6 +108,53 @@ machinesCommand
|
|
|
96
108
|
failWith(error, 'Failed to rename machine');
|
|
97
109
|
}
|
|
98
110
|
});
|
|
111
|
+
/** Parses an on/off style toggle argument; returns null when unrecognized. */
|
|
112
|
+
export function parseToggle(value) {
|
|
113
|
+
const v = value.trim().toLowerCase();
|
|
114
|
+
if (['on', 'true', 'yes', '1', 'enable', 'enabled'].includes(v))
|
|
115
|
+
return true;
|
|
116
|
+
if (['off', 'false', 'no', '0', 'disable', 'disabled'].includes(v))
|
|
117
|
+
return false;
|
|
118
|
+
return null;
|
|
119
|
+
}
|
|
120
|
+
machinesCommand
|
|
121
|
+
.command('update <id>')
|
|
122
|
+
.description('Change a paired machine\'s settings (name and/or auto-continue)')
|
|
123
|
+
.option('--name <name>', 'New display name')
|
|
124
|
+
.option('--auto-continue <state>', 'on|off — when on, an orchestrate run that stopped on its stall/ceiling guard after ' +
|
|
125
|
+
'making progress queues a follow-up run on this machine automatically')
|
|
126
|
+
.action(async (id, opts) => {
|
|
127
|
+
let autoContinue;
|
|
128
|
+
if (opts.autoContinue !== undefined) {
|
|
129
|
+
const parsed = parseToggle(opts.autoContinue);
|
|
130
|
+
if (parsed === null) {
|
|
131
|
+
console.error(chalk.red(`\nInvalid --auto-continue value "${opts.autoContinue}" — use "on" or "off".`));
|
|
132
|
+
process.exit(1);
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
autoContinue = parsed;
|
|
136
|
+
}
|
|
137
|
+
if (opts.name === undefined && autoContinue === undefined) {
|
|
138
|
+
console.error(chalk.red('\nNothing to update — pass --name and/or --auto-continue on|off.'));
|
|
139
|
+
process.exit(1);
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
try {
|
|
143
|
+
const { apiBaseUrl, apiToken } = requireLogin();
|
|
144
|
+
const client = new MailboxClient(apiBaseUrl);
|
|
145
|
+
const changes = {};
|
|
146
|
+
if (opts.name !== undefined)
|
|
147
|
+
changes.name = opts.name;
|
|
148
|
+
if (autoContinue !== undefined)
|
|
149
|
+
changes.autoContinue = autoContinue;
|
|
150
|
+
const machine = await client.updateMachine(apiToken, id, changes);
|
|
151
|
+
console.log(chalk.green(`✔ Machine "${machine.name}" updated.`));
|
|
152
|
+
console.log(` Auto-continue: ${machine.autoContinue === false ? 'off' : 'on'}`);
|
|
153
|
+
}
|
|
154
|
+
catch (error) {
|
|
155
|
+
failWith(error, 'Failed to update machine');
|
|
156
|
+
}
|
|
157
|
+
});
|
|
99
158
|
machinesCommand
|
|
100
159
|
.command('rm <id>')
|
|
101
160
|
.description('Remove (revoke) a paired machine — cuts off its daemon token and fails its queued jobs')
|
package/commands/machines.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machines.js","sourceRoot":"","sources":["../../src/commands/machines.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"machines.js","sourceRoot":"","sources":["../../src/commands/machines.ts"],"names":[],"mappings":"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"}
|
package/commands/run.d.ts
CHANGED
|
@@ -20,7 +20,8 @@
|
|
|
20
20
|
*/
|
|
21
21
|
import { Command } from 'commander';
|
|
22
22
|
import { type StartExecutionFix, type StartExecutionPayload } from '@mycompbox/shared';
|
|
23
|
-
import { MailboxClient, type MailboxJob } from '../utils/mailbox-client.js';
|
|
23
|
+
import { MailboxClient, MailboxClientError, type MailboxJob } from '../utils/mailbox-client.js';
|
|
24
|
+
import { type InvokeResult } from '../utils/agent-invoker.js';
|
|
24
25
|
import { type AgentRuntimeProbe } from '../utils/claude-runtime.js';
|
|
25
26
|
export declare const IDLE_POLL_INTERVAL_MS = 15000;
|
|
26
27
|
export declare const ACTIVE_POLL_INTERVAL_MS = 2000;
|
|
@@ -52,6 +53,17 @@ export declare function maxParallelJobs(env?: NodeJS.ProcessEnv): number;
|
|
|
52
53
|
* `lastRuntimeSentMs === 0` (nothing sent yet) is always due.
|
|
53
54
|
*/
|
|
54
55
|
export declare function runtimeHeartbeatDue(nowMs: number, lastRuntimeSentMs: number, intervalMs?: number): boolean;
|
|
56
|
+
/**
|
|
57
|
+
* How long the daemon waits between next-job polls once the server has said
|
|
58
|
+
* this CLI is too old (409 MACHINE_OUTDATED, ENG-320). Polling continues —
|
|
59
|
+
* slowly — so the machine picks work up again if the server's minimum drops,
|
|
60
|
+
* while the heartbeat keeps its own cadence so the machine stays online.
|
|
61
|
+
*/
|
|
62
|
+
export declare const OUTDATED_POLL_INTERVAL_MS: number;
|
|
63
|
+
/** True when an error is the server's 409 MACHINE_OUTDATED (ENG-320). */
|
|
64
|
+
export declare function isMachineOutdated(error: unknown): error is MailboxClientError;
|
|
65
|
+
/** The one-time notice shown when the server rejects this CLI as outdated (ENG-320). */
|
|
66
|
+
export declare function formatOutdatedNotice(error: MailboxClientError, currentVersion: string): string;
|
|
55
67
|
/**
|
|
56
68
|
* Runs the agent-runtime probe (ENG-136), swallowing ANY error: a probe must
|
|
57
69
|
* never stop the daemon loop or block job dispatch. `probeAgentRuntime` is
|
|
@@ -178,5 +190,19 @@ export declare function parseStartExecutionPayload(payload: unknown): StartExecu
|
|
|
178
190
|
* A malformed payload or a job missing prerequisites also fails cleanly.
|
|
179
191
|
*/
|
|
180
192
|
export declare function handleStartExecution(ctx: HandleJobContext, job: MailboxJob): Promise<void>;
|
|
193
|
+
/**
|
|
194
|
+
* Completes a job with an invoker's outcome and returns the status it was
|
|
195
|
+
* completed with.
|
|
196
|
+
*
|
|
197
|
+
* - ENG-333: a usage-limited run parks the job as `waiting` with its
|
|
198
|
+
* `resumeAt` (omitted when unknown so the server applies its backoff).
|
|
199
|
+
* - ENG-337: a run waiting for its owner's reply completes as `waiting` with
|
|
200
|
+
* its stop reason, request, and (when kept) agent session id + run folder. A
|
|
201
|
+
* server too old to accept that is answered 400; the job then completes as
|
|
202
|
+
* failed with the question as its message, so the person still sees it.
|
|
203
|
+
*
|
|
204
|
+
* Exported for unit testing.
|
|
205
|
+
*/
|
|
206
|
+
export declare function completeInvokeOutcome(client: Pick<MailboxClient, 'completeJob'>, machineToken: string, jobId: string, outcome: InvokeResult): Promise<InvokeResult['status']>;
|
|
181
207
|
export declare const runCommand: Command;
|
|
182
208
|
//# sourceMappingURL=run.d.ts.map
|
package/commands/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
package/commands/run.js
CHANGED
|
@@ -18,18 +18,21 @@
|
|
|
18
18
|
* is ever left staring at a silent "awaiting_input" forever; the browser's
|
|
19
19
|
* ENG-123-2 failure banner surfaces the reason.
|
|
20
20
|
*/
|
|
21
|
+
import { parseCloudFacts } from '../utils/cloud-preflight.js';
|
|
22
|
+
import { applyMergePolicy, finishMergeApproval, mergeApprovalResume, parseMergePolicy, } from '../utils/merge-policy.js';
|
|
21
23
|
import { Command } from 'commander';
|
|
22
24
|
import { delimiter } from 'node:path';
|
|
23
25
|
import chalk from 'chalk';
|
|
24
26
|
import { readConfig, applyPxpipeEnv, resolveProjectDirForJob, listProjectDirs, addProjectDir, unusedLegacyProjectDir, } from '../utils/config-store.js';
|
|
25
|
-
import { START_EXECUTION_KINDS } from '@mycompbox/shared';
|
|
27
|
+
import { START_EXECUTION_KINDS, formatNeedsInputText, } from '@mycompbox/shared';
|
|
26
28
|
import { retrieveSecret, MACHINE_TOKEN_ACCOUNT, AI_KEY_ACCOUNT, } from '../utils/keychain.js';
|
|
27
|
-
import { MailboxClient, MailboxClientError, parseCancelJobIds, } from '../utils/mailbox-client.js';
|
|
28
|
-
import { invokeEpicRequestStep, invokeStartExecutionPlan, invokeStartExecutionOrchestrate, invokeStartExecutionRefine, unregisteredRemoteMessage, noProjectRemoteMessage, } from '../utils/agent-invoker.js';
|
|
29
|
+
import { MailboxClient, MailboxClientError, MACHINE_OUTDATED, parseCancelJobIds, } from '../utils/mailbox-client.js';
|
|
30
|
+
import { invokeEpicRequestStep, invokeStartExecutionPlan, invokeStartExecutionOrchestrate, invokeStartExecutionRefine, isNeedsInputOutcome, parseReplyResume, unregisteredRemoteMessage, noProjectRemoteMessage, } from '../utils/agent-invoker.js';
|
|
29
31
|
import { RunWorkspaceManager } from '../utils/run-workspace.js';
|
|
30
32
|
import { invokeConnectRepo } from '../utils/repo-setup.js';
|
|
31
33
|
import { startKeepAwake } from '../utils/keep-awake.js';
|
|
32
34
|
import { ensurePackageManagerShims } from '../utils/package-manager-shims.js';
|
|
35
|
+
import { resolveCliVersion } from '../utils/cli-version.js';
|
|
33
36
|
import { probeAgentRuntime, } from '../utils/claude-runtime.js';
|
|
34
37
|
// Server-side hold requested per next-job call: NONE. The server answers
|
|
35
38
|
// immediately and this loop paces itself with the intervals below.
|
|
@@ -115,6 +118,27 @@ const HEARTBEAT_INTERVAL_MS = 20_000;
|
|
|
115
118
|
export function runtimeHeartbeatDue(nowMs, lastRuntimeSentMs, intervalMs = HEARTBEAT_INTERVAL_MS) {
|
|
116
119
|
return nowMs - lastRuntimeSentMs >= intervalMs;
|
|
117
120
|
}
|
|
121
|
+
/**
|
|
122
|
+
* How long the daemon waits between next-job polls once the server has said
|
|
123
|
+
* this CLI is too old (409 MACHINE_OUTDATED, ENG-320). Polling continues —
|
|
124
|
+
* slowly — so the machine picks work up again if the server's minimum drops,
|
|
125
|
+
* while the heartbeat keeps its own cadence so the machine stays online.
|
|
126
|
+
*/
|
|
127
|
+
export const OUTDATED_POLL_INTERVAL_MS = 5 * 60_000;
|
|
128
|
+
/** True when an error is the server's 409 MACHINE_OUTDATED (ENG-320). */
|
|
129
|
+
export function isMachineOutdated(error) {
|
|
130
|
+
return error instanceof MailboxClientError && error.code === MACHINE_OUTDATED;
|
|
131
|
+
}
|
|
132
|
+
/** The one-time notice shown when the server rejects this CLI as outdated (ENG-320). */
|
|
133
|
+
export function formatOutdatedNotice(error, currentVersion) {
|
|
134
|
+
const required = error.requiredVersion ?? 'a newer version';
|
|
135
|
+
const command = error.updateCommand ?? 'compbox update';
|
|
136
|
+
return [
|
|
137
|
+
`\n⚠ This machine's CompBox CLI (${currentVersion}) is too old for the server (needs ${required}).`,
|
|
138
|
+
` Update it with: ${command}`,
|
|
139
|
+
` Then restart the Agent Runner. Checking again every ${String(OUTDATED_POLL_INTERVAL_MS / 60_000)} minutes.`,
|
|
140
|
+
].join('\n');
|
|
141
|
+
}
|
|
118
142
|
function sleep(ms) {
|
|
119
143
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
120
144
|
}
|
|
@@ -272,6 +296,19 @@ export function parseFix(raw) {
|
|
|
272
296
|
const pullRequestUrl = typeof f.pullRequestUrl === 'string' && f.pullRequestUrl.startsWith('https://') ? f.pullRequestUrl : undefined;
|
|
273
297
|
return { branch, instructions, ...(pullRequestUrl && { pullRequestUrl }) };
|
|
274
298
|
}
|
|
299
|
+
/** ER-130: the payload's deferred features, dropping anything malformed. */
|
|
300
|
+
function parseDeferredFeatures(value) {
|
|
301
|
+
if (!Array.isArray(value))
|
|
302
|
+
return [];
|
|
303
|
+
return value
|
|
304
|
+
.filter((f) => typeof f === 'object' &&
|
|
305
|
+
f !== null &&
|
|
306
|
+
typeof f.id === 'string' &&
|
|
307
|
+
typeof f.identifier === 'string' &&
|
|
308
|
+
typeof f.title === 'string')
|
|
309
|
+
.slice(0, 50)
|
|
310
|
+
.map(({ id, identifier, title }) => ({ id, identifier, title }));
|
|
311
|
+
}
|
|
275
312
|
/**
|
|
276
313
|
* Parse a claimed job's `payload` into a {@link StartExecutionPayload}, or null
|
|
277
314
|
* if malformed. The mailbox delivers `payload` as `unknown` — already an object
|
|
@@ -321,6 +358,14 @@ export function parseStartExecutionPayload(payload) {
|
|
|
321
358
|
...(projectRemote && { projectRemote }),
|
|
322
359
|
...(useAiKey && { useAiKey }),
|
|
323
360
|
...(fix && { fix }),
|
|
361
|
+
// ENG-350: fast mode only when explicitly true.
|
|
362
|
+
...(p.fastMode === true && { fastMode: true }),
|
|
363
|
+
// ER-130: the owner's note and deferred features from "All merged — continue" / "Restart".
|
|
364
|
+
...(typeof p.ownerNote === 'string' && p.ownerNote.trim().length > 0 && { ownerNote: p.ownerNote }),
|
|
365
|
+
...(parseDeferredFeatures(p.deferredFeatures).length > 0 && {
|
|
366
|
+
deferredFeatures: parseDeferredFeatures(p.deferredFeatures),
|
|
367
|
+
}),
|
|
368
|
+
...(p.freshBranch === true && { freshBranch: true }),
|
|
324
369
|
};
|
|
325
370
|
}
|
|
326
371
|
if (p.kind === 'refine' && typeof p.epicId === 'string' && p.epicId.length > 0) {
|
|
@@ -438,26 +483,100 @@ export async function handleStartExecution(ctx, job) {
|
|
|
438
483
|
await completeWithFailure(ctx, job, 'This device is not paired with a user API token, so the orchestrator cannot run. Run `compbox configure` to re-pair.');
|
|
439
484
|
return;
|
|
440
485
|
}
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
486
|
+
// ENG-347: CompBox merges only this job's own pull request.
|
|
487
|
+
const merge = async (reason, number) => ctx.client.mergePullRequest(ctx.machineToken, job.id, { reason, number });
|
|
488
|
+
// ENG-347: the owner answered the "approve merge?" question — merge (or
|
|
489
|
+
// leave it open) without spawning the agent again.
|
|
490
|
+
const approval = mergeApprovalResume(job);
|
|
491
|
+
if (approval) {
|
|
492
|
+
console.log(chalk.gray(' The owner answered the merge question (start_execution / orchestrate)...'));
|
|
493
|
+
await runInvokerAndComplete(ctx, job, () => finishMergeApproval(approval, merge));
|
|
494
|
+
return;
|
|
495
|
+
}
|
|
496
|
+
const mergePolicy = parseMergePolicy(job.mergePolicy);
|
|
497
|
+
// ENG-339: the owner replied to this paused build — resume it with the reply.
|
|
498
|
+
const resume = parseReplyResume(job);
|
|
499
|
+
console.log(chalk.gray(resume
|
|
500
|
+
? ' Resuming the orchestrator with the owner\'s reply (start_execution / orchestrate)...'
|
|
501
|
+
: ' Running the orchestrator headless (start_execution / orchestrate)...'));
|
|
502
|
+
await runInvokerAndComplete(ctx, job, async () => {
|
|
503
|
+
const outcome = await invokeStartExecutionOrchestrate({
|
|
504
|
+
mailboxClient: ctx.client,
|
|
505
|
+
machineToken: ctx.machineToken,
|
|
506
|
+
jobId: job.id,
|
|
507
|
+
...(ctx.signal && { signal: ctx.signal }),
|
|
508
|
+
epicId: payload.epicId,
|
|
509
|
+
projectDir: jobProjectDir,
|
|
510
|
+
...(keyRun && { keyRun }),
|
|
511
|
+
...(payload.fix && { fix: payload.fix }),
|
|
512
|
+
...(payload.fastMode === true && { fastMode: true }),
|
|
513
|
+
...(payload.ownerNote && { ownerNote: payload.ownerNote }),
|
|
514
|
+
...(payload.deferredFeatures && { deferredFeatures: payload.deferredFeatures }),
|
|
515
|
+
...(payload.freshBranch === true && { freshBranch: true }),
|
|
516
|
+
...(resume && { resume }),
|
|
517
|
+
// ENG-345: cloud facts for the preflight (absent on older servers).
|
|
518
|
+
cloud: parseCloudFacts(job.cloud),
|
|
519
|
+
...(payload.projectRemote && { projectRemote: payload.projectRemote }),
|
|
520
|
+
}, {
|
|
521
|
+
// H4: keep this machine online during the long orchestrator run — the
|
|
522
|
+
// poll loop (its own heartbeat) is blocked for the whole job.
|
|
523
|
+
heartbeat: () => jobHeartbeat(ctx),
|
|
524
|
+
// Own branch + worktree per run, finishing with a pull request (opened
|
|
525
|
+
// through CompBox's GitHub app when the project is connected to it).
|
|
526
|
+
// ENG-349: this machine's in-flight run folders are never pruned.
|
|
527
|
+
activeRunDirs: ACTIVE_RUN_DIRS,
|
|
528
|
+
workspace: new RunWorkspaceManager({
|
|
529
|
+
openPullRequest: (input) => ctx.client.openPullRequest(ctx.machineToken, job.id, input),
|
|
530
|
+
}),
|
|
531
|
+
});
|
|
532
|
+
// ENG-347: after the branch is pushed and the PR opened, follow the
|
|
533
|
+
// project's merge policy (never / ask / auto). Fix runs never merge.
|
|
534
|
+
return payload.fix ? outcome : applyMergePolicy(mergePolicy, outcome, merge);
|
|
535
|
+
});
|
|
536
|
+
}
|
|
537
|
+
/**
|
|
538
|
+
* ENG-349: run folders of the orchestrator jobs this daemon is running right
|
|
539
|
+
* now (one process, several jobs at once). Each run adds its folder while it
|
|
540
|
+
* runs, so another job's stale-folder pruning skips it.
|
|
541
|
+
*/
|
|
542
|
+
const ACTIVE_RUN_DIRS = new Set();
|
|
543
|
+
/**
|
|
544
|
+
* Completes a job with an invoker's outcome and returns the status it was
|
|
545
|
+
* completed with.
|
|
546
|
+
*
|
|
547
|
+
* - ENG-333: a usage-limited run parks the job as `waiting` with its
|
|
548
|
+
* `resumeAt` (omitted when unknown so the server applies its backoff).
|
|
549
|
+
* - ENG-337: a run waiting for its owner's reply completes as `waiting` with
|
|
550
|
+
* its stop reason, request, and (when kept) agent session id + run folder. A
|
|
551
|
+
* server too old to accept that is answered 400; the job then completes as
|
|
552
|
+
* failed with the question as its message, so the person still sees it.
|
|
553
|
+
*
|
|
554
|
+
* Exported for unit testing.
|
|
555
|
+
*/
|
|
556
|
+
export async function completeInvokeOutcome(client, machineToken, jobId, outcome) {
|
|
557
|
+
if (outcome.status === 'waiting' && outcome.resumeAt !== undefined) {
|
|
558
|
+
await client.completeJob(machineToken, jobId, 'waiting', outcome.result, outcome.resumeAt);
|
|
559
|
+
return 'waiting';
|
|
560
|
+
}
|
|
561
|
+
if (isNeedsInputOutcome(outcome)) {
|
|
562
|
+
try {
|
|
563
|
+
await client.completeJob(machineToken, jobId, 'waiting', outcome.result);
|
|
564
|
+
return 'waiting';
|
|
565
|
+
}
|
|
566
|
+
catch (error) {
|
|
567
|
+
if (!(error instanceof MailboxClientError) || error.status !== 400)
|
|
568
|
+
throw error;
|
|
569
|
+
const question = formatNeedsInputText(outcome.result.needsInput);
|
|
570
|
+
await client.completeJob(machineToken, jobId, 'failed', {
|
|
571
|
+
...outcome.result,
|
|
572
|
+
error: question,
|
|
573
|
+
message: question,
|
|
574
|
+
});
|
|
575
|
+
return 'failed';
|
|
576
|
+
}
|
|
577
|
+
}
|
|
578
|
+
await client.completeJob(machineToken, jobId, outcome.status, outcome.result);
|
|
579
|
+
return outcome.status;
|
|
461
580
|
}
|
|
462
581
|
/** Runs an agent invoker and closes out the job with its result, logging either way. */
|
|
463
582
|
async function runInvokerAndComplete(ctx, job, invoke) {
|
|
@@ -467,10 +586,12 @@ async function runInvokerAndComplete(ctx, job, invoke) {
|
|
|
467
586
|
console.log(chalk.gray(` Job ${job.id}: replied; waiting for the person.`));
|
|
468
587
|
return;
|
|
469
588
|
}
|
|
470
|
-
await ctx.client
|
|
471
|
-
console.log(
|
|
589
|
+
const sent = await completeInvokeOutcome(ctx.client, ctx.machineToken, job.id, outcome);
|
|
590
|
+
console.log(sent === 'done'
|
|
472
591
|
? chalk.green(` Job ${job.id} completed: ${JSON.stringify(outcome.result)}`)
|
|
473
|
-
:
|
|
592
|
+
: sent === 'waiting'
|
|
593
|
+
? chalk.yellow(` Job ${job.id} waiting ${isNeedsInputOutcome(outcome) ? 'for your reply' : 'on a usage limit'}: ${JSON.stringify(outcome.result)}`)
|
|
594
|
+
: chalk.yellow(` Job ${job.id} failed: ${JSON.stringify(outcome.result)}`));
|
|
474
595
|
}
|
|
475
596
|
catch (error) {
|
|
476
597
|
const message = error instanceof MailboxClientError ? error.message : 'complete-job failed';
|
|
@@ -694,13 +815,21 @@ export const runCommand = new Command('run')
|
|
|
694
815
|
// Jobs running right now, by id. The loop keeps polling while they run, so
|
|
695
816
|
// a second build can start alongside the first.
|
|
696
817
|
const inFlight = new Map();
|
|
818
|
+
// ER-130: heartbeats say which builds this daemon is running, so one whose
|
|
819
|
+
// run ended without reporting is shown as stopped, not "running".
|
|
820
|
+
client.runningJobIds = () => [...inFlight.keys()];
|
|
821
|
+
// 409 MACHINE_OUTDATED (ENG-320): notice printed once per process, and the
|
|
822
|
+
// earliest time the next next-job poll may be attempted.
|
|
823
|
+
let outdatedNoticeShown = false;
|
|
824
|
+
let outdatedRetryAt = 0;
|
|
697
825
|
do {
|
|
698
826
|
let job = null;
|
|
699
827
|
// Cancels from this poll — applied after any new job is registered.
|
|
700
828
|
let pollCancelIds = [];
|
|
701
829
|
try {
|
|
702
830
|
// At capacity: don't ask for more work, just keep the heartbeat going.
|
|
703
|
-
|
|
831
|
+
// Outdated (ENG-320): skip polls until the slow retry is due.
|
|
832
|
+
if (inFlight.size < maxJobs && Date.now() >= outdatedRetryAt) {
|
|
704
833
|
const polled = await client.pollNextJob(machineToken, waitMs, [...inFlight.keys()]);
|
|
705
834
|
job = polled.job;
|
|
706
835
|
pollCancelIds = polled.cancelJobIds;
|
|
@@ -711,15 +840,32 @@ export const runCommand = new Command('run')
|
|
|
711
840
|
// to next-job, or the runtime heartbeat is starved — see startup note).
|
|
712
841
|
}
|
|
713
842
|
catch (error) {
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
843
|
+
// 409 MACHINE_OUTDATED (ENG-320): not a transient failure, so it does
|
|
844
|
+
// not count toward consecutiveErrors or the reconnect backoff. Show the
|
|
845
|
+
// notice once, poll again only every OUTDATED_POLL_INTERVAL_MS, and fall
|
|
846
|
+
// through so the heartbeat below keeps the machine online.
|
|
847
|
+
if (isMachineOutdated(error)) {
|
|
848
|
+
if (!outdatedNoticeShown) {
|
|
849
|
+
console.error(chalk.yellow(formatOutdatedNotice(error, resolveCliVersion())));
|
|
850
|
+
outdatedNoticeShown = true;
|
|
851
|
+
}
|
|
852
|
+
if (options.once) {
|
|
853
|
+
process.exitCode = 1;
|
|
854
|
+
break;
|
|
855
|
+
}
|
|
856
|
+
outdatedRetryAt = Date.now() + OUTDATED_POLL_INTERVAL_MS;
|
|
857
|
+
}
|
|
858
|
+
else {
|
|
859
|
+
consecutiveErrors += 1;
|
|
860
|
+
const message = error instanceof MailboxClientError ? error.message : 'next-job request failed';
|
|
861
|
+
const delay = backoffDelay(consecutiveErrors);
|
|
862
|
+
console.error(chalk.red(`\n✖ next-job failed (attempt ${String(consecutiveErrors)}): ${message}`));
|
|
863
|
+
console.error(chalk.gray(` Reconnecting in ${String(Math.round(delay / 1000))}s...`));
|
|
864
|
+
if (options.once)
|
|
865
|
+
break;
|
|
866
|
+
await sleep(delay);
|
|
867
|
+
continue;
|
|
868
|
+
}
|
|
723
869
|
}
|
|
724
870
|
// An older server ignores `running` and resumes a job we already have.
|
|
725
871
|
if (job && inFlight.has(job.id))
|