agl 42.1.0 → 42.2.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/changelog.md +38 -0
- package/dist_serve/bundle.js +797 -785
- package/dist_serve/bundle.js.map +2 -2
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/aglapi/aglapisurface.document.js +124 -10
- package/dist_ts/classes.accountsactions.d.ts +3 -1
- package/dist_ts/classes.accountsactions.js +16 -1
- package/dist_ts/classes.authstore.js +9 -1
- package/dist_ts/classes.cli.js +19 -49
- package/dist_ts/classes.configurationauthority.js +2 -2
- package/dist_ts/classes.controllerservice.d.ts +20 -2
- package/dist_ts/classes.controllerservice.js +42 -6
- package/dist_ts/classes.flexservice.js +8 -3
- package/dist_ts/classes.inferencegateway.d.ts +30 -2
- package/dist_ts/classes.inferencegateway.js +115 -20
- package/dist_ts/classes.inferencerouter.d.ts +16 -0
- package/dist_ts/classes.inferencerouter.js +5 -3
- package/dist_ts/classes.inferenceservice.js +7 -3
- package/dist_ts/classes.ticketmodels.js +4 -3
- package/dist_ts/classes.ticketnotifier.js +9 -2
- package/dist_ts/classes.ticketstore.js +9 -5
- package/dist_ts/classes.upgradecoordinator.d.ts +6 -1
- package/dist_ts/classes.upgradecoordinator.js +9 -2
- package/dist_ts/classes.upgradetransaction.d.ts +27 -1
- package/dist_ts/classes.upgradetransaction.js +92 -2
- package/dist_ts/configuration/functions.master.d.ts +7 -2
- package/dist_ts/configuration/functions.master.js +7 -4
- package/dist_ts/driver/classes.drivereventrelay.d.ts +1 -1
- package/dist_ts/driver/classes.drivereventrelay.js +3 -3
- package/dist_ts/fleet/classes.boardpump.d.ts +1 -1
- package/dist_ts/fleet/classes.boardpump.js +7 -4
- package/dist_ts/fleet/classes.claudeworkers.d.ts +6 -0
- package/dist_ts/fleet/classes.claudeworkers.js +17 -7
- package/dist_ts/fleet/classes.deploymodels.d.ts +19 -0
- package/dist_ts/fleet/classes.deploymodels.js +140 -0
- package/dist_ts/fleet/functions.validation.d.ts +8 -1
- package/dist_ts/fleet/functions.validation.js +65 -3
- package/dist_ts/fleet/interfaces.workers.d.ts +6 -0
- package/dist_ts/fleet/interfaces.workers.js +65 -2
- package/dist_ts/functions.fleetworkercli.d.ts +16 -3
- package/dist_ts/functions.fleetworkercli.js +21 -7
- package/dist_ts/functions.inferencecli.js +4 -2
- package/dist_ts/functions.mcptickettools.d.ts +1 -0
- package/dist_ts/functions.ticketvalidation.d.ts +36 -3
- package/dist_ts/functions.ticketvalidation.js +45 -14
- package/dist_ts/interfaces.auth.d.ts +1 -1
- package/dist_ts/interfaces.auth.js +2 -1
- package/dist_ts_authswitch/authority-contract.d.ts +23 -0
- package/dist_ts_authswitch/authority-contract.js +1 -1
- package/dist_ts_authswitch/classes.authoritybroker.d.ts +6 -0
- package/dist_ts_authswitch/classes.authoritybroker.js +31 -4
- package/dist_ts_authswitch/classes.authoritycli.d.ts +1 -0
- package/dist_ts_authswitch/classes.authoritycli.js +26 -1
- package/dist_ts_authswitch/classes.authorityclient.d.ts +3 -1
- package/dist_ts_authswitch/classes.authorityclient.js +10 -4
- package/dist_ts_authswitch/classes.authoritydaemon.js +7 -1
- package/dist_ts_authswitch/classes.authorityimport.js +2 -2
- package/dist_ts_authswitch/classes.authoritymodels.d.ts +3 -0
- package/dist_ts_authswitch/classes.authoritymodels.js +10 -3
- package/dist_ts_authswitch/testsupport.js +4 -4
- package/dist_ts_authswitch/ts_migration/0012_account_claude_code.d.ts +11 -0
- package/dist_ts_authswitch/ts_migration/0012_account_claude_code.js +18 -0
- package/dist_ts_authswitch/ts_migration/index.js +3 -1
- package/dist_ts_interfaces/deployments.d.ts +104 -0
- package/dist_ts_interfaces/deployments.js +8 -0
- package/dist_ts_interfaces/fleet.d.ts +2 -0
- package/dist_ts_interfaces/index.d.ts +1 -0
- package/dist_ts_interfaces/index.js +2 -1
- package/dist_ts_interfaces/interfaces.d.ts +1 -1
- package/dist_ts_interfaces/interfaces.js +1 -1
- package/dist_ts_interfaces/requests.accounts.d.ts +18 -0
- package/dist_ts_interfaces/requests.accounts.js +1 -1
- package/dist_ts_interfaces/requests.d.ts +2 -2
- package/dist_ts_interfaces/requests.js +1 -1
- package/dist_ts_interfaces/tickets.d.ts +53 -4
- package/dist_ts_interfaces/tickets.js +6 -2
- package/dist_ts_migration/index.d.ts +1 -0
- package/dist_ts_migration/index.js +2 -1
- package/dist_ts_migration/v41_ticketmigrationmarkers.d.ts +19 -0
- package/dist_ts_migration/v41_ticketmigrationmarkers.js +85 -0
- package/docs/authswitch.md +6 -0
- package/package.json +5 -5
- package/readme.md +48 -12
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/aglapi/aglapisurface.document.ts +123 -9
- package/ts/classes.accountsactions.ts +24 -0
- package/ts/classes.authstore.ts +8 -0
- package/ts/classes.cli.ts +17 -54
- package/ts/classes.configurationauthority.ts +1 -1
- package/ts/classes.controllerservice.ts +49 -6
- package/ts/classes.flexservice.ts +7 -2
- package/ts/classes.inferencegateway.ts +133 -19
- package/ts/classes.inferencerouter.ts +20 -2
- package/ts/classes.inferenceservice.ts +6 -3
- package/ts/classes.ticketmodels.ts +3 -2
- package/ts/classes.ticketnotifier.ts +8 -1
- package/ts/classes.ticketstore.ts +8 -4
- package/ts/classes.upgradecoordinator.ts +14 -4
- package/ts/classes.upgradetransaction.ts +118 -0
- package/ts/configuration/functions.master.ts +6 -3
- package/ts/driver/classes.drivereventrelay.ts +2 -2
- package/ts/fleet/classes.boardpump.ts +7 -4
- package/ts/fleet/classes.claudeworkers.ts +16 -6
- package/ts/fleet/classes.deploymodels.ts +44 -0
- package/ts/fleet/functions.validation.ts +50 -2
- package/ts/fleet/interfaces.workers.ts +56 -1
- package/ts/functions.fleetworkercli.ts +26 -8
- package/ts/functions.inferencecli.ts +3 -1
- package/ts/functions.ticketvalidation.ts +48 -13
- package/ts/interfaces.auth.ts +1 -0
- package/ts_authswitch/authority-contract.ts +18 -0
- package/ts_authswitch/classes.authoritybroker.ts +29 -3
- package/ts_authswitch/classes.authoritycli.ts +29 -0
- package/ts_authswitch/classes.authorityclient.ts +12 -4
- package/ts_authswitch/classes.authoritydaemon.ts +8 -1
- package/ts_authswitch/classes.authorityimport.ts +1 -1
- package/ts_authswitch/classes.authoritymodels.ts +5 -1
- package/ts_authswitch/native-contracts.md +10 -0
- package/ts_authswitch/testsupport.ts +3 -3
- package/ts_authswitch/ts_migration/0012_account_claude_code.ts +17 -0
- package/ts_authswitch/ts_migration/index.ts +2 -0
- package/ts_interfaces/deployments.ts +98 -0
- package/ts_interfaces/fleet.ts +2 -0
- package/ts_interfaces/index.ts +1 -0
- package/ts_interfaces/interfaces.ts +1 -1
- package/ts_interfaces/requests.accounts.ts +16 -0
- package/ts_interfaces/requests.ts +2 -0
- package/ts_interfaces/tickets.ts +34 -4
- package/ts_migration/index.ts +1 -0
- package/ts_migration/v41_ticketmigrationmarkers.ts +28 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/classes.accountsreadmodel.ts +12 -1
- package/ts_web/elements.accounts.ts +44 -0
- package/ts_web/elements.ticketboard.ts +15 -4
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
|
|
2
|
+
function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
|
|
3
|
+
var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
|
|
4
|
+
var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
|
|
5
|
+
var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
|
|
6
|
+
var _, done = false;
|
|
7
|
+
for (var i = decorators.length - 1; i >= 0; i--) {
|
|
8
|
+
var context = {};
|
|
9
|
+
for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
|
|
10
|
+
for (var p in contextIn.access) context.access[p] = contextIn.access[p];
|
|
11
|
+
context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
|
|
12
|
+
var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
|
|
13
|
+
if (kind === "accessor") {
|
|
14
|
+
if (result === void 0) continue;
|
|
15
|
+
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
|
|
16
|
+
if (_ = accept(result.get)) descriptor.get = _;
|
|
17
|
+
if (_ = accept(result.set)) descriptor.set = _;
|
|
18
|
+
if (_ = accept(result.init)) initializers.unshift(_);
|
|
19
|
+
}
|
|
20
|
+
else if (_ = accept(result)) {
|
|
21
|
+
if (kind === "field") initializers.unshift(_);
|
|
22
|
+
else descriptor[key] = _;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
if (target) Object.defineProperty(target, contextIn.name, descriptor);
|
|
26
|
+
done = true;
|
|
27
|
+
};
|
|
28
|
+
var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
|
|
29
|
+
var useValue = arguments.length > 2;
|
|
30
|
+
for (var i = 0; i < initializers.length; i++) {
|
|
31
|
+
value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
|
|
32
|
+
}
|
|
33
|
+
return useValue ? value : void 0;
|
|
34
|
+
};
|
|
35
|
+
import * as plugins from '../plugins.js';
|
|
36
|
+
import { fleetDeployTargetIdPattern } from '../../dist_ts_interfaces/deployments.js';
|
|
37
|
+
const timestamp = plugins.z.iso.datetime();
|
|
38
|
+
const version = plugins.z.string().regex(/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/u);
|
|
39
|
+
const targetId = plugins.z.string().regex(fleetDeployTargetIdPattern);
|
|
40
|
+
const sha256Digest = plugins.z.string().regex(/^sha256:[a-f0-9]{64}$/u);
|
|
41
|
+
const subject = plugins.z.discriminatedUnion('kind', [
|
|
42
|
+
plugins.z.object({ kind: plugins.z.literal('lockfile'), repo: plugins.z.string().min(1).max(1024),
|
|
43
|
+
sha: plugins.z.string().regex(/^(?:[a-f0-9]{40}|[a-f0-9]{64})$/u), path: plugins.z.string().min(1).max(1024),
|
|
44
|
+
blob: plugins.z.string().regex(/^(?:[a-f0-9]{40}|[a-f0-9]{64})$/u) }).strict(),
|
|
45
|
+
plugins.z.object({ kind: plugins.z.literal('image'), digest: sha256Digest }).strict(),
|
|
46
|
+
plugins.z.object({ kind: plugins.z.literal('installed'), targetId, treeDigest: sha256Digest }).strict(),
|
|
47
|
+
plugins.z.object({ kind: plugins.z.literal('binary'), sha256: sha256Digest }).strict(),
|
|
48
|
+
]);
|
|
49
|
+
const observationSchema = plugins.z.object({
|
|
50
|
+
id: plugins.z.string().min(1).max(256), targetId, seq: plugins.z.number().int().positive(), repo: plugins.z.string().min(1).max(1024), version,
|
|
51
|
+
sha: plugins.z.string().regex(/^[a-f0-9]{7,64}$/u).optional(), observedAt: timestamp, previousVersion: version.optional(),
|
|
52
|
+
artifacts: plugins.z.array(plugins.z.object({ subject, replicas: plugins.z.number().int().positive().optional() }).strict()).max(256),
|
|
53
|
+
}).strict();
|
|
54
|
+
/**
|
|
55
|
+
* What a deploy target ran (AGL-911): one row whenever its probe answers another version, commit or artifact set than the
|
|
56
|
+
* target's newest row holds. History and rollbacks are computed from these rows; nothing else about a deployment is stored. A row's id is
|
|
57
|
+
* its target and number, and `(targetId, seq)` is unique.
|
|
58
|
+
*/
|
|
59
|
+
let DeployObservationModel = (() => {
|
|
60
|
+
let _classDecorators = [plugins.nosqldb.compoundIndex({ name: 'deploy_target_seq', key: { targetId: 1, seq: -1 }, options: { unique: true } }), plugins.nosqldb.managed({ collectionName: 'agl_fleet_deploy_observations' }), plugins.nosqldb.exactPersistence({ assertDocument: (input) => {
|
|
61
|
+
const doc = observationSchema.parse(input);
|
|
62
|
+
if (doc.id !== `${doc.targetId}:${doc.seq}`)
|
|
63
|
+
throw new Error('Deploy observation identity mismatch.');
|
|
64
|
+
} })];
|
|
65
|
+
let _classDescriptor;
|
|
66
|
+
let _classExtraInitializers = [];
|
|
67
|
+
let _classThis;
|
|
68
|
+
let _classSuper = plugins.nosqldb.SmartDataDbDoc;
|
|
69
|
+
let _id_decorators;
|
|
70
|
+
let _id_initializers = [];
|
|
71
|
+
let _id_extraInitializers = [];
|
|
72
|
+
let _targetId_decorators;
|
|
73
|
+
let _targetId_initializers = [];
|
|
74
|
+
let _targetId_extraInitializers = [];
|
|
75
|
+
let _seq_decorators;
|
|
76
|
+
let _seq_initializers = [];
|
|
77
|
+
let _seq_extraInitializers = [];
|
|
78
|
+
let _repo_decorators;
|
|
79
|
+
let _repo_initializers = [];
|
|
80
|
+
let _repo_extraInitializers = [];
|
|
81
|
+
let _version_decorators;
|
|
82
|
+
let _version_initializers = [];
|
|
83
|
+
let _version_extraInitializers = [];
|
|
84
|
+
let _sha_decorators;
|
|
85
|
+
let _sha_initializers = [];
|
|
86
|
+
let _sha_extraInitializers = [];
|
|
87
|
+
let _observedAt_decorators;
|
|
88
|
+
let _observedAt_initializers = [];
|
|
89
|
+
let _observedAt_extraInitializers = [];
|
|
90
|
+
let _previousVersion_decorators;
|
|
91
|
+
let _previousVersion_initializers = [];
|
|
92
|
+
let _previousVersion_extraInitializers = [];
|
|
93
|
+
let _artifacts_decorators;
|
|
94
|
+
let _artifacts_initializers = [];
|
|
95
|
+
let _artifacts_extraInitializers = [];
|
|
96
|
+
var DeployObservationModel = class extends _classSuper {
|
|
97
|
+
static { _classThis = this; }
|
|
98
|
+
static {
|
|
99
|
+
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
100
|
+
_id_decorators = [plugins.nosqldb.unI()];
|
|
101
|
+
_targetId_decorators = [plugins.nosqldb.svDb()];
|
|
102
|
+
_seq_decorators = [plugins.nosqldb.svDb()];
|
|
103
|
+
_repo_decorators = [plugins.nosqldb.svDb()];
|
|
104
|
+
_version_decorators = [plugins.nosqldb.svDb()];
|
|
105
|
+
_sha_decorators = [plugins.nosqldb.svDb()];
|
|
106
|
+
_observedAt_decorators = [plugins.nosqldb.svDb()];
|
|
107
|
+
_previousVersion_decorators = [plugins.nosqldb.svDb()];
|
|
108
|
+
_artifacts_decorators = [plugins.nosqldb.svDb()];
|
|
109
|
+
__esDecorate(null, null, _id_decorators, { kind: "field", name: "id", static: false, private: false, access: { has: obj => "id" in obj, get: obj => obj.id, set: (obj, value) => { obj.id = value; } }, metadata: _metadata }, _id_initializers, _id_extraInitializers);
|
|
110
|
+
__esDecorate(null, null, _targetId_decorators, { kind: "field", name: "targetId", static: false, private: false, access: { has: obj => "targetId" in obj, get: obj => obj.targetId, set: (obj, value) => { obj.targetId = value; } }, metadata: _metadata }, _targetId_initializers, _targetId_extraInitializers);
|
|
111
|
+
__esDecorate(null, null, _seq_decorators, { kind: "field", name: "seq", static: false, private: false, access: { has: obj => "seq" in obj, get: obj => obj.seq, set: (obj, value) => { obj.seq = value; } }, metadata: _metadata }, _seq_initializers, _seq_extraInitializers);
|
|
112
|
+
__esDecorate(null, null, _repo_decorators, { kind: "field", name: "repo", static: false, private: false, access: { has: obj => "repo" in obj, get: obj => obj.repo, set: (obj, value) => { obj.repo = value; } }, metadata: _metadata }, _repo_initializers, _repo_extraInitializers);
|
|
113
|
+
__esDecorate(null, null, _version_decorators, { kind: "field", name: "version", static: false, private: false, access: { has: obj => "version" in obj, get: obj => obj.version, set: (obj, value) => { obj.version = value; } }, metadata: _metadata }, _version_initializers, _version_extraInitializers);
|
|
114
|
+
__esDecorate(null, null, _sha_decorators, { kind: "field", name: "sha", static: false, private: false, access: { has: obj => "sha" in obj, get: obj => obj.sha, set: (obj, value) => { obj.sha = value; } }, metadata: _metadata }, _sha_initializers, _sha_extraInitializers);
|
|
115
|
+
__esDecorate(null, null, _observedAt_decorators, { kind: "field", name: "observedAt", static: false, private: false, access: { has: obj => "observedAt" in obj, get: obj => obj.observedAt, set: (obj, value) => { obj.observedAt = value; } }, metadata: _metadata }, _observedAt_initializers, _observedAt_extraInitializers);
|
|
116
|
+
__esDecorate(null, null, _previousVersion_decorators, { kind: "field", name: "previousVersion", static: false, private: false, access: { has: obj => "previousVersion" in obj, get: obj => obj.previousVersion, set: (obj, value) => { obj.previousVersion = value; } }, metadata: _metadata }, _previousVersion_initializers, _previousVersion_extraInitializers);
|
|
117
|
+
__esDecorate(null, null, _artifacts_decorators, { kind: "field", name: "artifacts", static: false, private: false, access: { has: obj => "artifacts" in obj, get: obj => obj.artifacts, set: (obj, value) => { obj.artifacts = value; } }, metadata: _metadata }, _artifacts_initializers, _artifacts_extraInitializers);
|
|
118
|
+
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
119
|
+
DeployObservationModel = _classThis = _classDescriptor.value;
|
|
120
|
+
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
121
|
+
__runInitializers(_classThis, _classExtraInitializers);
|
|
122
|
+
}
|
|
123
|
+
id = __runInitializers(this, _id_initializers, void 0);
|
|
124
|
+
targetId = (__runInitializers(this, _id_extraInitializers), __runInitializers(this, _targetId_initializers, void 0));
|
|
125
|
+
seq = (__runInitializers(this, _targetId_extraInitializers), __runInitializers(this, _seq_initializers, void 0));
|
|
126
|
+
repo = (__runInitializers(this, _seq_extraInitializers), __runInitializers(this, _repo_initializers, void 0));
|
|
127
|
+
version = (__runInitializers(this, _repo_extraInitializers), __runInitializers(this, _version_initializers, void 0));
|
|
128
|
+
sha = (__runInitializers(this, _version_extraInitializers), __runInitializers(this, _sha_initializers, void 0));
|
|
129
|
+
observedAt = (__runInitializers(this, _sha_extraInitializers), __runInitializers(this, _observedAt_initializers, void 0));
|
|
130
|
+
previousVersion = (__runInitializers(this, _observedAt_extraInitializers), __runInitializers(this, _previousVersion_initializers, void 0));
|
|
131
|
+
artifacts = (__runInitializers(this, _previousVersion_extraInitializers), __runInitializers(this, _artifacts_initializers, void 0));
|
|
132
|
+
constructor() {
|
|
133
|
+
super(...arguments);
|
|
134
|
+
__runInitializers(this, _artifacts_extraInitializers);
|
|
135
|
+
}
|
|
136
|
+
};
|
|
137
|
+
return DeployObservationModel = _classThis;
|
|
138
|
+
})();
|
|
139
|
+
export { DeployObservationModel };
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kZXBsb3ltb2RlbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9mbGVldC9jbGFzc2VzLmRlcGxveW1vZGVscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUFFLDBCQUEwQixFQUFnQyxNQUFNLG9DQUFvQyxDQUFDO0FBRTlHLE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxDQUFDO0FBQzNDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxDQUFDLHNDQUFzQyxDQUFDLENBQUM7QUFDakYsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLENBQUMsMEJBQTBCLENBQUMsQ0FBQztBQUN0RSxNQUFNLFlBQVksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO0FBQ3hFLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxFQUFFO0lBQ25ELE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDO1FBQy9GLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxFQUFFLElB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
|
|
@@ -7,7 +7,14 @@ export declare const parseFleetToolingSpec: (spec: string) => {
|
|
|
7
7
|
/** Validates the settings a repository declares in its own `.smartconfig.json` fleet section. */
|
|
8
8
|
export declare const validateFleetSection: (input: unknown) => IFleetRepositorySection;
|
|
9
9
|
export declare const fleetRepositoryIdPattern: RegExp;
|
|
10
|
-
|
|
10
|
+
/**
|
|
11
|
+
* Validates the Configuration master's `fleet` section. `save` checks a document being saved, which may be stricter
|
|
12
|
+
* than one being read: a field this release reads but the next one writes is refused on save, so a rollback to this
|
|
13
|
+
* release never meets a master it cannot run.
|
|
14
|
+
*/
|
|
15
|
+
export declare const validateFleetConfiguration: (input: unknown, optionsArg?: {
|
|
16
|
+
save?: boolean;
|
|
17
|
+
}) => IFleetConfiguration;
|
|
11
18
|
/** Validates one operation's configuration with its discovered repositories. */
|
|
12
19
|
export declare const validateFleetScope: (input: unknown) => IFleetScope;
|
|
13
20
|
export declare const assertFleetRequest: <T extends TFleetOperation>(operation: T, input: unknown) => TFleetRequest<T>;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { fleetDeployTargetIdPattern } from '../../dist_ts_interfaces/deployments.js';
|
|
1
2
|
import * as plugins from '../plugins.js';
|
|
2
3
|
import { validateFleetWorkerProfiles } from './functions.workervalidation.js';
|
|
3
4
|
import { fleetTicketKeySchema, fleetTicketSyncSchema } from './functions.ticketcontext.js';
|
|
@@ -130,9 +131,68 @@ const validateFleetBoardPump = (input) => {
|
|
|
130
131
|
|| pump.landedAfterHours <= 0 || pump.landedAfterHours > 720))
|
|
131
132
|
throw new Error('The fleet board pump landedAfterHours must be more than 0 and at most 720.');
|
|
132
133
|
};
|
|
133
|
-
|
|
134
|
+
/** RFC 6901: the empty pointer or `/`-separated tokens, `~` only as `~0` or `~1`. */
|
|
135
|
+
const jsonPointerPattern = /^(?:\/(?:[^~/]|~[01])*)*$/u;
|
|
136
|
+
const label = (value, name) => {
|
|
137
|
+
if (typeof value !== 'string' || !value.trim() || value.length > 200 || /[\0\r\n]/u.test(value))
|
|
138
|
+
throw new Error(`The deploy target ${name} must be one line of at most 200 characters.`);
|
|
139
|
+
};
|
|
140
|
+
const validateFleetDeployTargets = (input) => {
|
|
141
|
+
if (!Array.isArray(input) || input.length > 64)
|
|
142
|
+
throw new Error('The fleet deploy targets must be a list of at most 64.');
|
|
143
|
+
const ids = new Set();
|
|
144
|
+
let controllers = 0;
|
|
145
|
+
for (const entry of input) {
|
|
146
|
+
const target = object(entry);
|
|
147
|
+
keys(target, ['id', 'repo', 'probe', 'project'], ['name', 'environment', 'deploys', 'downtime', 'deployWhen']);
|
|
148
|
+
if (typeof target.id !== 'string' || !fleetDeployTargetIdPattern.test(target.id))
|
|
149
|
+
throw new Error('A deploy target id is lowercase letters, digits, ., _ and -, at most 64.');
|
|
150
|
+
if (ids.has(target.id))
|
|
151
|
+
throw new Error(`The deploy target ${target.id} is named twice.`);
|
|
152
|
+
ids.add(target.id);
|
|
153
|
+
if (typeof target.repo !== 'string' || !fleetRepositoryIdPattern.test(target.repo))
|
|
154
|
+
throw new Error(`The deploy target ${target.id} needs its repository as org/name.`);
|
|
155
|
+
for (const field of ['name', 'environment', 'deploys', 'downtime'])
|
|
156
|
+
if (target[field] !== undefined)
|
|
157
|
+
label(target[field], field);
|
|
158
|
+
label(target.project, 'project');
|
|
159
|
+
if (target.deployWhen !== undefined && target.deployWhen !== 'anytime' && target.deployWhen !== 'window') {
|
|
160
|
+
throw new Error(`The deploy target ${target.id} deploys anytime or only inside a maintenance window (window).`);
|
|
161
|
+
}
|
|
162
|
+
const probe = object(target.probe);
|
|
163
|
+
if (probe.kind === 'controller') {
|
|
164
|
+
keys(probe, ['kind']);
|
|
165
|
+
controllers += 1;
|
|
166
|
+
if (target.deployWhen !== undefined)
|
|
167
|
+
throw new Error(`The deploy target ${target.id} probes the controller, which needs no window: it is upgraded when no session is busy.`);
|
|
168
|
+
continue;
|
|
169
|
+
}
|
|
170
|
+
if (probe.kind !== 'http')
|
|
171
|
+
throw new Error(`The deploy target ${target.id} probes kind controller or http.`);
|
|
172
|
+
keys(probe, ['kind', 'url'], ['versionPointer', 'shaPointer']);
|
|
173
|
+
const url = typeof probe.url === 'string' && probe.url.length <= 2048 && URL.canParse(probe.url) ? new URL(probe.url) : undefined;
|
|
174
|
+
if (!url || !['http:', 'https:'].includes(url.protocol) || url.username || url.password)
|
|
175
|
+
throw new Error(`The deploy target ${target.id} probes an http(s) URL without credentials.`);
|
|
176
|
+
for (const field of ['versionPointer', 'shaPointer']) {
|
|
177
|
+
if (probe[field] !== undefined && (typeof probe[field] !== 'string' || probe[field].length > 256 || !jsonPointerPattern.test(probe[field]))) {
|
|
178
|
+
throw new Error(`The deploy target ${target.id} ${field} must be a JSON pointer such as /version.`);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
if (controllers > 1)
|
|
183
|
+
throw new Error('Only one deploy target can probe the controller.');
|
|
184
|
+
};
|
|
185
|
+
/**
|
|
186
|
+
* Validates the Configuration master's `fleet` section. `save` checks a document being saved, which may be stricter
|
|
187
|
+
* than one being read: a field this release reads but the next one writes is refused on save, so a rollback to this
|
|
188
|
+
* release never meets a master it cannot run.
|
|
189
|
+
*/
|
|
190
|
+
export const validateFleetConfiguration = (input, optionsArg = {}) => {
|
|
134
191
|
const config = object(input);
|
|
135
|
-
keys(config, [], ['environment', 'workerProfiles', 'driver', 'boardPump']);
|
|
192
|
+
keys(config, [], ['environment', 'workerProfiles', 'driver', 'boardPump', 'deployTargets']);
|
|
193
|
+
if (optionsArg.save && config.deployTargets !== undefined) {
|
|
194
|
+
throw new Error('fleet.deployTargets is read by this AGL release and saved by the next one; upgrade AGL to configure deploy targets.');
|
|
195
|
+
}
|
|
136
196
|
if (config.environment !== undefined)
|
|
137
197
|
validateEnvironment(config.environment);
|
|
138
198
|
if (config.workerProfiles !== undefined)
|
|
@@ -141,6 +201,8 @@ export const validateFleetConfiguration = (input) => {
|
|
|
141
201
|
validateFleetDriver(config.driver);
|
|
142
202
|
if (config.boardPump !== undefined)
|
|
143
203
|
validateFleetBoardPump(config.boardPump);
|
|
204
|
+
if (config.deployTargets !== undefined)
|
|
205
|
+
validateFleetDeployTargets(config.deployTargets);
|
|
144
206
|
return structuredClone(config);
|
|
145
207
|
};
|
|
146
208
|
/** Validates one operation's configuration with its discovered repositories. */
|
|
@@ -236,4 +298,4 @@ export const assertFleetOperation = (input) => {
|
|
|
236
298
|
string(value.error);
|
|
237
299
|
return value;
|
|
238
300
|
};
|
|
239
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.validation.js","sourceRoot":"","sources":["../../../ts/fleet/functions.validation.ts"],"names":[],"mappings":"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"}
|
|
301
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"functions.validation.js","sourceRoot":"","sources":["../../../ts/fleet/functions.validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,6 +123,12 @@ export interface IFleetWorkerBackend {
|
|
|
123
123
|
* mid-turn and counts as a report too.
|
|
124
124
|
*/
|
|
125
125
|
export declare const fleetReportMarker: RegExp;
|
|
126
|
+
/**
|
|
127
|
+
* A worker report within 32 KiB of UTF-8, `truncated` when it was longer. A longer report keeps, in order, its head
|
|
128
|
+
* (its summary and first rows), its last marker line (`fleetReportMarker`, its `result:` line; at most 1 KiB) when
|
|
129
|
+
* that line lies between the head and the end, and its last 4 KiB from a line start. A line
|
|
130
|
+
* `[… N bytes cut; the worker's transcript holds the whole report …]` stands where a part was left out.
|
|
131
|
+
*/
|
|
126
132
|
export declare const boundedFleetReport: (text: string) => {
|
|
127
133
|
text: string;
|
|
128
134
|
truncated: boolean;
|
|
@@ -14,10 +14,73 @@ export class FleetDispatchError extends Error {
|
|
|
14
14
|
* mid-turn and counts as a report too.
|
|
15
15
|
*/
|
|
16
16
|
export const fleetReportMarker = /(?:^|\n)[ \t]*(?:result:|needs input:|owner question:|cross-subject:|spec question:|ready (?:for|to) (?:land|release)|#{1,3} Handoff|@?driver:|@driver\b|question for the driver\b)/iu;
|
|
17
|
-
|
|
17
|
+
/** A report is kept whole up to 32 KiB of UTF-8; a longer one keeps its head, its result line and its end (AGL-158). */
|
|
18
|
+
const fleetReportBytes = 32 * 1024, fleetReportEndBytes = 4 * 1024, fleetReportLineBytes = 1024;
|
|
19
|
+
/** What one gap line takes at most, its line breaks included. */
|
|
20
|
+
const fleetReportGapBytes = 128;
|
|
21
|
+
/** The first (`head`) or last (`tail`) `bytesArg` UTF-8 bytes of `textArg` at most; a cut never splits a character. */
|
|
22
|
+
const clipFleetReport = (textArg, bytesArg, keepArg) => {
|
|
23
|
+
const bytes = Buffer.from(textArg);
|
|
24
|
+
if (bytes.length <= bytesArg)
|
|
25
|
+
return textArg;
|
|
26
|
+
if (keepArg === 'head') {
|
|
27
|
+
let end = bytesArg;
|
|
28
|
+
while (end > 0 && (bytes[end] & 0xc0) === 0x80)
|
|
29
|
+
end -= 1;
|
|
30
|
+
return bytes.subarray(0, end).toString('utf8');
|
|
31
|
+
}
|
|
32
|
+
let start = bytes.length - bytesArg;
|
|
33
|
+
while (start < bytes.length && (bytes[start] & 0xc0) === 0x80)
|
|
34
|
+
start += 1;
|
|
35
|
+
return bytes.subarray(start).toString('utf8');
|
|
36
|
+
};
|
|
37
|
+
const fleetReportGap = (bytesArg) => `[… ${bytesArg} bytes cut; the worker's transcript holds the whole report …]`;
|
|
38
|
+
/**
|
|
39
|
+
* A worker report within 32 KiB of UTF-8, `truncated` when it was longer. A longer report keeps, in order, its head
|
|
40
|
+
* (its summary and first rows), its last marker line (`fleetReportMarker`, its `result:` line; at most 1 KiB) when
|
|
41
|
+
* that line lies between the head and the end, and its last 4 KiB from a line start. A line
|
|
42
|
+
* `[… N bytes cut; the worker's transcript holds the whole report …]` stands where a part was left out.
|
|
43
|
+
*/
|
|
44
|
+
export const boundedFleetReport = (text) => {
|
|
45
|
+
if (Buffer.byteLength(text) <= fleetReportBytes)
|
|
46
|
+
return { text, truncated: false };
|
|
47
|
+
let end = clipFleetReport(text, fleetReportEndBytes, 'tail');
|
|
48
|
+
const lineStart = end.indexOf('\n');
|
|
49
|
+
if (lineStart >= 0 && lineStart + 1 < end.length)
|
|
50
|
+
end = end.slice(lineStart + 1);
|
|
51
|
+
const endAt = text.length - end.length;
|
|
52
|
+
let headBytes = fleetReportBytes - Buffer.byteLength(end) - fleetReportGapBytes;
|
|
53
|
+
// The last marker line, when the head does not reach it and the end does not hold it.
|
|
54
|
+
const lines = text.split('\n');
|
|
55
|
+
let markerAt = text.length;
|
|
56
|
+
for (let index = lines.length - 1, at = text.length; index >= 0; index -= 1) {
|
|
57
|
+
at -= lines[index].length;
|
|
58
|
+
if (fleetReportMarker.test(lines[index])) {
|
|
59
|
+
markerAt = at;
|
|
60
|
+
break;
|
|
61
|
+
}
|
|
62
|
+
at -= 1;
|
|
63
|
+
}
|
|
64
|
+
const segments = [];
|
|
65
|
+
if (markerAt < endAt && Buffer.byteLength(text.slice(0, markerAt)) >= headBytes) {
|
|
66
|
+
const lineEnd = text.indexOf('\n', markerAt);
|
|
67
|
+
const line = clipFleetReport(text.slice(markerAt, lineEnd < 0 ? text.length : lineEnd), fleetReportLineBytes, 'head');
|
|
68
|
+
headBytes -= Buffer.byteLength(line) + fleetReportGapBytes;
|
|
69
|
+
segments.push([markerAt, Math.min(markerAt + line.length, endAt)]);
|
|
70
|
+
}
|
|
71
|
+
segments.unshift([0, clipFleetReport(text, headBytes, 'head').length]);
|
|
72
|
+
segments.push([endAt, text.length]);
|
|
73
|
+
let bounded = '';
|
|
74
|
+
for (const [index, [from, to]] of segments.entries()) {
|
|
75
|
+
const cut = index ? text.slice(segments[index - 1][1], from) : '';
|
|
76
|
+
bounded += cut === '' || cut === '\n' ? cut : `\n${fleetReportGap(Buffer.byteLength(cut))}\n`;
|
|
77
|
+
bounded += text.slice(from, to);
|
|
78
|
+
}
|
|
79
|
+
return { text: bounded, truncated: true };
|
|
80
|
+
};
|
|
18
81
|
/**
|
|
19
82
|
* The SHA-256 (hex) a steer fence keeps of its message and a reconfirm compares a transcript's message with. Line
|
|
20
83
|
* endings and surrounding whitespace do not count, so a harness that normalises either still matches.
|
|
21
84
|
*/
|
|
22
85
|
export const fleetMessageDigest = (text) => plugins.crypto.createHash('sha256').update(text.replace(/\r\n?/gu, '\n').trim()).digest('hex');
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
86
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy53b3JrZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvZmxlZXQvaW50ZXJmYWNlcy53b3JrZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sZUFBZSxDQUFDO0FBSXpDLE1BQU0sT0FBTyxrQkFBbUIsU0FBUSxLQUFLO0lBQ0UsVUFBVTtJQUF2RCxZQUFZLE9BQWUsRUFBa0IsVUFBbUIsRUFBRSxPQUFzQjtRQUFJLEtBQUssQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7MEJBQXZFLFVBQVU7UUFBOEQsSUFBSSxDQUFDLElBQUksR0FBRyxvQkFBb0IsQ0FBQztJQUFDLENBQUM7Q0FDeko7QUE2RUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyx1TEFBdUwsQ0FBQztBQUN6Tix3SEFBd0g7QUFDeEgsTUFBTSxnQkFBZ0IsR0FBRyxFQUFFLEdBQUcsSUFBSSxFQUFFLG1CQUFtQixHQUFHLENBQUMsR0FBRyxJQUFJLEVBQUUsb0JBQW9CLEdBQUcsSUFBSSxDQUFDO0FBQ2hHLGlFQUFpRTtBQUNqRSxNQUFNLG1CQUFtQixHQUFHLEdBQUcsQ0FBQztBQUNoQyx1SEFBdUg7QUFDdkgsTUFBTSxlQUFlLEdBQUcsQ0FBQyxPQUFlLEVBQUUsUUFBZ0IsRUFBRSxPQUF3QixFQUFVLEVBQUU7SUFDOUYsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNuQyxJQUFJLEtBQUssQ0FBQyxNQUFNLElBQUksUUFBUTtRQUFFLE9BQU8sT0FBTyxDQUFDO0lBQzdDLElBQUksT0FBTyxLQUFLLE1BQU0sRUFBRSxDQUFDO1FBQ3ZCLElBQUksR0FBRyxHQUFHLFFBQVEsQ0FBQztRQUNuQixPQUFPLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFFLEdBQUcsSUFBSSxDQUFD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
|
|
@@ -1,13 +1,20 @@
|
|
|
1
1
|
import { type IFleetWatchChange, type IFleetWatchProbeOptions } from './fleet/functions.watchprobes.js';
|
|
2
2
|
import type { IFleetWorker, TFleetWorkerAction, TFleetWorkerRequest, IFleetEventCursor, IFleetWatchResult } from '../dist_ts_interfaces/fleetworkers.js';
|
|
3
|
-
export declare const fleetWorkerCliHelp = "Usage: agl fleet worker start NAME --profile ID --cwd PATH --prompt-file FILE\n agl fleet worker adopt NAME --profile ID --cwd PATH --native-id ID [--relaunch-file FILE]\n agl fleet worker adopt NAME --profile ID --cwd PATH --native-id ID --rebind --reason TEXT\n agl fleet worker resolve-lost NAME --reason TEXT\n agl fleet worker reconfirm NAME --reason TEXT\n agl fleet worker steer NAME --message-file FILE\n agl fleet worker steer --messages-file FILE (JSON array of {name,text})\n agl fleet worker message NAME|NATIVE_ID --message-file FILE\n agl fleet worker native-message NATIVE_ID --message-file FILE --sender LABEL\n agl fleet worker report|stop|archive NAME\n agl fleet worker refresh NAME --next-name NAME [--profile ID] --handoff-file FILE [--note-file FILE]\n agl fleet worker move NAME --next-name NAME --profile CODEX_PROFILE --handoff-file FILE [--note-file FILE]\n agl fleet worker list [--archived]\n agl fleet worker status JOB_ID\n agl fleet watch [--cursor JSON] [--once] [--lines] [--site NAME=URL \u2026] [--ci OWNER/REPO[@REF] \u2026]\n [--gitea URL] [--gitea-token-file FILE] [--probe-interval SECONDS]\nAll accept --ticket KEY, --json and --port PORT. Actions and report require --ticket; list/status/watch accept it as a filter.\nProfiles live in fleet.workerProfiles in the Configuration master.\nMutation and report commands wait for the returned job; MCP tools return its handle immediately.\nrefresh --profile ID starts the successor on that configured profile, which must run the worker's own harness (only move\nchanges the harness); without --profile the successor keeps the worker's recorded profile.\nWatch emits one JSON object per poll with events and the continuation cursor. Ctrl-C disconnects observation only.\nWatch runs until stopped in ten-minute windows, each under a fresh owner capability, so a pending upgrade waits at most one window.\nA failed window writes a {\"disconnected\":\u2026} line and retries from the cursor; after a restart the next page has reset: true.\n--lines writes one plain line per event or change instead, nothing for an empty page or a host load sample.\n--site probes NAME's URL with a GET and --ci follows a Gitea repository's combined commit status on REF (default main)\nevery --probe-interval seconds (default 60); each writes its state first and then one {\"change\":\u2026} line per change.\n--gitea defaults to https://code.foss.global; a token from --gitea-token-file reaches private repositories over https.\nSteer and message reach a live worker through a relay and resume a reaped or stopped one with its saved options.\nMessage addresses one worker by its name or by its native session id (a unique prefix of at least 8 characters).\nnative-message wakes a settled (done, blocked or stopped) Claude Code background job that no fleet worker binds, named by\nits session id or a unique prefix of at least 8 characters, through Claude Code itself, as the browser's native session\nsend does. The text arrives behind the session_message attribution header with the --sender label and the local owner\ncapability, never as the job's user. A running, failed or held job, a fleet worker's session and a project conversation\nare refused with their reason. A native wake holds no dispatch fence, writes no ticket comment and does not observe the\nwoken turn; the receipt names the command that adopts the job. It takes no --ticket.\nAdopt registers a native session as it is. --relaunch-file resumes a settled Claude Code session under the fleet with the\nfile's prompt, so the worker calls AGL with a verified identity; a background job continues as a copy under a new\nsession id. The adopt refuses while the session still runs: its owner stops it first, the adopt never does.\n--rebind requires --ticket and --reason. It moves the existing Claude worker NAME (same ticket, cwd and profile) onto\nthe settled background job ID of its lane, records the resolver and a ticket comment, and sends and resumes nothing;\nthe next steer wakes ID with its saved options. A fresh inventory must list ID settled (reaped or stopped) and the\nworker's own session settled or not at all; ID's transcript must hold the newest record of the worker's (a copy\nClaude Code started), or else the inventory must list ID under the worker's name and cwd. It refuses an unresolved or\nlost dispatch, a reconfirmation without its saved comment, a running job, a predecessor/successor link and a session\nany worker is bound to. Repeating it only synchronizes the comment. Codex workers are not re-bound.\nClaude receipts prove queued delivery, not consumption. Unknown dispatches are never retried automatically.\nresolve-lost requires --ticket and a reason. It proves Claude absence, records the resolver and ticket comment,\nand sends nothing. A live fence holder or running job refuses; lost workers allow stop/archive and are no longer polled.\nFor an unidentified start, other registered workers' native UUIDs (all owners, archived included) are excluded.\nA same-name/cwd session still refuses. An unexcluded candidate is named by session id, name, cwd and startedAt.\nreconfirm requires --ticket and a reason. It clears a steer fence whose native session a fresh inventory shows as the\nsame session, settled before and after its transcript is read, and records from the transcript whether the message\narrived (delivered, not-found or unproven) with the resolver and a ticket comment. It sends nothing; steer again to resend.\n";
|
|
3
|
+
export declare const fleetWorkerCliHelp = "Usage: agl fleet worker start NAME --profile ID --cwd PATH --prompt-file FILE\n agl fleet worker adopt NAME --profile ID --cwd PATH --native-id ID [--relaunch-file FILE]\n agl fleet worker adopt NAME --profile ID --cwd PATH --native-id ID --rebind --reason TEXT\n agl fleet worker resolve-lost NAME --reason TEXT\n agl fleet worker reconfirm NAME --reason TEXT\n agl fleet worker steer NAME --message-file FILE\n agl fleet worker steer --messages-file FILE (JSON array of {name,text})\n agl fleet worker message NAME|NATIVE_ID --message-file FILE [--ticket KEY]\n agl fleet worker native-message NATIVE_ID --message-file FILE --sender LABEL\n agl fleet worker report|stop|archive NAME\n agl fleet worker refresh NAME --next-name NAME [--profile ID] --handoff-file FILE [--note-file FILE]\n agl fleet worker move NAME --next-name NAME --profile CODEX_PROFILE --handoff-file FILE [--note-file FILE]\n agl fleet worker list [--archived]\n agl fleet worker status JOB_ID\n agl fleet watch [--cursor JSON] [--once] [--lines] [--site NAME=URL \u2026] [--ci OWNER/REPO[@REF] \u2026]\n [--gitea URL] [--gitea-token-file FILE] [--probe-interval SECONDS]\nAll accept --ticket KEY, --json and --port PORT. Actions and report require --ticket, except message; list/status/watch accept it as a filter.\nProfiles live in fleet.workerProfiles in the Configuration master.\nMutation and report commands wait for the returned job; MCP tools return its handle immediately.\nrefresh --profile ID starts the successor on that configured profile, which must run the worker's own harness (only move\nchanges the harness); without --profile the successor keeps the worker's recorded profile.\nWatch emits one JSON object per poll with events and the continuation cursor. Ctrl-C disconnects observation only.\nWatch runs until stopped in ten-minute windows, each under a fresh owner capability, so a pending upgrade waits at most one window.\nA failed window writes a {\"disconnected\":\u2026} line and retries from the cursor; after a restart the next page has reset: true.\n--lines writes one plain line per event or change instead, nothing for an empty page or a host load sample.\n--site probes NAME's URL with a GET and --ci follows a Gitea repository's combined commit status on REF (default main)\nevery --probe-interval seconds (default 60); each writes its state first and then one {\"change\":\u2026} line per change.\n--gitea defaults to https://code.foss.global; a token from --gitea-token-file reaches private repositories over https.\nSteer and message reach a live worker through a relay and resume a reaped or stopped one with its saved options.\nMessage addresses one worker by its name or by its native session id (a unique prefix of at least 8 characters).\nWithout --ticket it steers the worker on its own ticket; a --ticket the worker is not on, and a worker on no ticket, are refused.\nnative-message wakes a settled (done, blocked or stopped) Claude Code background job that no fleet worker binds, named by\nits session id or a unique prefix of at least 8 characters, through Claude Code itself, as the browser's native session\nsend does. The text arrives behind the session_message attribution header with the --sender label and the local owner\ncapability, never as the job's user. A running, failed or held job, a fleet worker's session and a project conversation\nare refused with their reason. A native wake holds no dispatch fence, writes no ticket comment and does not observe the\nwoken turn; the receipt names the command that adopts the job. It takes no --ticket.\nAdopt registers a native session as it is. --relaunch-file resumes a settled Claude Code session under the fleet with the\nfile's prompt, so the worker calls AGL with a verified identity; a background job continues as a copy under a new\nsession id. The adopt refuses while the session still runs: its owner stops it first, the adopt never does.\n--rebind requires --ticket and --reason. It moves the existing Claude worker NAME (same ticket, cwd and profile) onto\nthe settled background job ID of its lane, records the resolver and a ticket comment, and sends and resumes nothing;\nthe next steer wakes ID with its saved options. A fresh inventory must list ID settled (reaped or stopped) and the\nworker's own session settled or not at all; ID's transcript must hold the newest record of the worker's (a copy\nClaude Code started), or else the inventory must list ID under the worker's name and cwd. It refuses an unresolved or\nlost dispatch, a reconfirmation without its saved comment, a running job, a predecessor/successor link and a session\nany worker is bound to. Repeating it only synchronizes the comment. Codex workers are not re-bound.\nClaude receipts prove queued delivery, not consumption. Unknown dispatches are never retried automatically.\nresolve-lost requires --ticket and a reason. It proves Claude absence, records the resolver and ticket comment,\nand sends nothing. A live fence holder or running job refuses; lost workers allow stop/archive and are no longer polled.\nFor an unidentified start, other registered workers' native UUIDs (all owners, archived included) are excluded.\nA same-name/cwd session still refuses. An unexcluded candidate is named by session id, name, cwd and startedAt.\nreconfirm requires --ticket and a reason. It clears a steer fence whose native session a fresh inventory shows as the\nsame session, settled before and after its transcript is read, and records from the transcript whether the message\narrived (delivered, not-found or unproven) with the resolver and a ticket comment. It sends nothing; steer again to resend.\n";
|
|
4
|
+
/** A `message` steer before its recipient is resolved: without --ticket it names no ticket yet. */
|
|
5
|
+
export type TFleetWorkerCliMessageRequest = Omit<TFleetWorkerRequest<'steer'>, 'ticketKey'> & {
|
|
6
|
+
ticketKey?: string;
|
|
7
|
+
};
|
|
4
8
|
export interface IFleetWorkerCliArguments {
|
|
5
9
|
action: TFleetWorkerAction;
|
|
6
|
-
request: TFleetWorkerRequest<TFleetWorkerAction
|
|
10
|
+
request: TFleetWorkerRequest<TFleetWorkerAction> | TFleetWorkerCliMessageRequest;
|
|
7
11
|
port: number;
|
|
8
12
|
json: boolean;
|
|
9
13
|
once: boolean;
|
|
10
|
-
/**
|
|
14
|
+
/**
|
|
15
|
+
* `message`: the steer recipient is a worker name or native session id the controller's worker list resolves;
|
|
16
|
+
* `fleetWorkerMessageRequest` then addresses it and names its ticket.
|
|
17
|
+
*/
|
|
11
18
|
target?: string;
|
|
12
19
|
/** `message`: the file the message came from, which a refusal's native-message command names. */
|
|
13
20
|
messageFile?: string;
|
|
@@ -22,6 +29,12 @@ export interface IFleetWorkerCliArguments {
|
|
|
22
29
|
* command that wakes a settled Claude Code background job with the same file.
|
|
23
30
|
*/
|
|
24
31
|
export declare const resolveFleetWorkerTarget: (workers: IFleetWorker[], target: string, messageFile?: string) => IFleetWorker;
|
|
32
|
+
/**
|
|
33
|
+
* The steer `message` sends once its recipient resolved to `worker` (AGL-919): addressed by the worker's name, on the
|
|
34
|
+
* ticket --ticket named or else on the worker's own. A --ticket the worker is not on and a worker on no ticket are
|
|
35
|
+
* refused before anything is sent; the fleet still checks the ticket when it takes the steer.
|
|
36
|
+
*/
|
|
37
|
+
export declare const fleetWorkerMessageRequest: (request: TFleetWorkerCliMessageRequest, worker: IFleetWorker) => TFleetWorkerRequest<'steer'>;
|
|
25
38
|
export declare const parseFleetWorkerCliArguments: (args: string[]) => Promise<IFleetWorkerCliArguments>;
|
|
26
39
|
/** The line a continuing watch writes for each failed attempt to reach the controller. */
|
|
27
40
|
export interface IFleetWatchDisconnection {
|