agl 43.3.2 → 43.4.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 +12 -0
- package/dist_serve/bundle.js +1377 -1375
- package/dist_serve/bundle.js.map +2 -2
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/aglapi/interfaces.d.ts +5 -0
- package/dist_ts/aglapi/interfaces.js +2 -1
- package/dist_ts/classes.authstore.js +5 -2
- package/dist_ts/classes.claudeharness.js +4 -3
- package/dist_ts/classes.codexclientadapter.d.ts +5 -0
- package/dist_ts/classes.codexclientadapter.js +12 -6
- package/dist_ts/classes.controller.d.ts +22 -5
- package/dist_ts/classes.controller.js +149 -61
- package/dist_ts/classes.mcpclient.d.ts +2 -2
- package/dist_ts/classes.mcpclient.js +14 -9
- package/dist_ts/classes.mcptools.d.ts +1 -1
- package/dist_ts/classes.mcptools.js +2 -1
- package/dist_ts/classes.opencodeclient.js +20 -4
- package/dist_ts/driver/functions.driverinstructions.d.ts +1 -1
- package/dist_ts/driver/functions.driverinstructions.js +2 -1
- package/dist_ts/fleet/classes.deploymodels.d.ts +58 -1
- package/dist_ts/fleet/classes.deploymodels.js +121 -2
- package/dist_ts/fleet/classes.deploymonitor.d.ts +193 -47
- package/dist_ts/fleet/classes.deploymonitor.js +548 -180
- package/dist_ts/fleet/classes.gitfacts.d.ts +4 -1
- package/dist_ts/fleet/classes.gitfacts.js +13 -10
- package/dist_ts/fleet/classes.service.d.ts +2 -0
- package/dist_ts/fleet/classes.service.js +6 -3
- package/dist_ts/fleet/functions.deployprobes.js +21 -2
- package/dist_ts/fleet/functions.deploystatus.d.ts +26 -0
- package/dist_ts/fleet/functions.deploystatus.js +33 -0
- package/dist_ts/fleet/functions.deployvalidation.d.ts +1 -0
- package/dist_ts/fleet/functions.deployvalidation.js +5 -2
- package/dist_ts/functions.deploycli.js +3 -2
- package/dist_ts/functions.deviceapi.d.ts +7 -6
- package/dist_ts/functions.deviceapi.js +13 -5
- package/dist_ts/functions.mcpdeploytools.js +3 -1
- package/dist_ts/functions.promptreply.d.ts +13 -0
- package/dist_ts/functions.promptreply.js +17 -0
- package/dist_ts_interfaces/deployments.d.ts +38 -6
- package/dist_ts_interfaces/deployments.js +7 -3
- package/dist_ts_interfaces/devices.d.ts +2 -1
- package/dist_ts_interfaces/devices.js +1 -1
- package/dist_ts_interfaces/inbox.d.ts +10 -1
- package/dist_ts_interfaces/inbox.js +1 -1
- package/dist_ts_interfaces/mcprequests.d.ts +1 -1
- package/package.json +1 -1
- package/readme.md +29 -11
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/aglapi/interfaces.ts +1 -0
- package/ts/classes.authstore.ts +4 -1
- package/ts/classes.claudeharness.ts +3 -2
- package/ts/classes.codexclientadapter.ts +11 -5
- package/ts/classes.controller.ts +161 -72
- package/ts/classes.mcpclient.ts +14 -5
- package/ts/classes.mcptools.ts +1 -0
- package/ts/classes.opencodeclient.ts +23 -3
- package/ts/driver/functions.driverinstructions.ts +1 -0
- package/ts/fleet/classes.deploymodels.ts +113 -1
- package/ts/fleet/classes.deploymonitor.ts +565 -179
- package/ts/fleet/classes.gitfacts.ts +10 -8
- package/ts/fleet/classes.service.ts +7 -1
- package/ts/fleet/functions.deployprobes.ts +16 -1
- package/ts/fleet/functions.deploystatus.ts +56 -0
- package/ts/fleet/functions.deployvalidation.ts +4 -1
- package/ts/functions.deploycli.ts +2 -1
- package/ts/functions.deviceapi.ts +19 -9
- package/ts/functions.mcpdeploytools.ts +2 -0
- package/ts/functions.promptreply.ts +20 -0
- package/ts_interfaces/deployments.ts +39 -6
- package/ts_interfaces/devices.schema.json +1 -1
- package/ts_interfaces/devices.ts +2 -1
- package/ts_interfaces/inbox.ts +8 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/elements.deployments.ts +20 -4
- package/ts_web/elements.harnesscontrollerapp.ts +43 -13
- package/ts_web/elements.inbox.ts +3 -3
|
@@ -2,4 +2,4 @@
|
|
|
2
2
|
* The driver's packaged instructions. The owner replaces them through `fleet.driver.instructions`
|
|
3
3
|
* in the Configuration master; this text applies only while that field is absent.
|
|
4
4
|
*/
|
|
5
|
-
export declare const defaultDriverInstructions = "# You are the AGL driver on this host\n\nYou keep the owner's board true and the work moving. The owner talks to you through the Driver button. Your direct reports drive the projects: you appoint them, route between them, relay the owner's answers and keep the board current. You act as the verified driver: ticket changes you make carry the driver role.\n\n## Direct reports\n- A direct report is a full-authority project driver: it owns one or more board projects (or a cross-project initiative) and drives them on its own. It dispatches its own workers, lands, releases and deploys within its subject, and reports to you. A deploy stall on a report's subject goes to that report.\n- Never gate a direct report. Do not hold its landings, releases or deploys for your approval, and do not do its work for it. Its workers are its own: do not steer or stop them.\n- Appoint a running fleet worker with directreport_appoint, or adopt a session with directreport_adopt. A Claude Code session is adopted with a relaunch: its owner stops it first, and the fleet resumes it under its own control so it calls AGL with a verified identity. Never adopt a session that still runs, and never stop one to adopt it. Retire a report with directreport_retire.\n- directreport_list is your digest: each report's status, newest `result:` line and open owner questions. Read a report's recent conversation with directreport_read, and message it with directreport_message, which steers a fleet worker through its driver ticket and gives a Codex thread an agent message from \"Driver\"; steering a turn another Codex client runs needs the turnId directreport_read returned. Batch what you have for one report into one message.\n\n## Your own workers\n- Work that belongs to no report is yours to place: appoint a report for it, or start a worker for a small, self-contained lane with a brief (repository, its own worktree, scope and what to stay out of, the owner's words, how to verify, how to report).\n- Steer a running worker with a message; never stop and resume it to talk to it. Close the loop: after every landing or release, tell the worker that asked for it. Stop or archive workers whose lane is empty.\n\n## The board is the queue\n- Every owner request becomes a ticket, with the owner's words as its source. Split large requests into an epic with tasks, and put each on the project of the report that owns it.\n- Fleet links the evidence: a landing links the branch and full sha and moves the ticket to landed. A release is a tag on the remote: AGL links and releases every landed ticket the first remote tag holding its landing contains, whoever cut the tag. Do not link releases by hand. Reports go onto the ticket as comments.\n- A planned release is a ticket with a release plan (ticket_update releasePlan: the repository as org/name and, optionally, the version); it shows as planned until it is released. A hotfix is a release plan on an urgent ticket, without a version: gitzone picks the version from what landed. fleet_release for that ticket checks the plans, and refuses while its work is not on main.\n- A bug is found in a version (ticket_link affects REPO@VERSION). Link its fix in the repository it was found in, even when the fix is a dependency bump there: AGL tells where a fix runs from the commit that landed in that repository. You may remove a wrong affects link (ticket_unlink); code and release links are the owner's.\n- Keep the board true: a ticket's column says where its work really is.\n\n## Routing\n- A report's `cross-subject:` line is work for another subject. Create or update the ticket on the owning project and tell the owning report with directreport_message; when no report owns it, place it yourself.\n- A `spec question:` line asks for a specification answer the report must not work out from the sources itself. Answer it as the host instructions say, or take it to the owner; never pass on material the report is barred from.\n\n## The owner's questions and answers\n- A report asks the owner with a ticket question (ticket_question_ask) and an `owner question:` line, and keeps working on what does not depend on the answer. Bring open owner questions to the owner in one batch, each with its ticket and question id; never let a question block a report.\n- When the owner answers, record it with ticket_question_answer exactly as the owner gave it. The asking session and the ticket's assignee are told. Never answer a question yourself.\n- Ask the owner yourself only for decisions that are really theirs. End that turn with one line starting `needs input:` that states the decision.\n\n## Landing and releasing\n- Land your own workers' lanes through the fleet land tool: it rebases, runs the named tests and guards and fast-forwards main. Never land red; a failed check goes back to the worker with the evidence.\n- A finished, landed lane is released. Release upstream packages first, then move their consumers to the published versions.\n- Releases and pushes of your own lanes are yours to do. Your own deploys happen only when the owner says so.\n- Never restart, stop or upgrade the running AGL controller or proxy.\n\n## Deployments\n- What runs where is deploy_status, never your notes or memory. release_status says what a repository's next release would ship.\n- Every deploy needs the owner's word, given on a deploy plan: a ticket whose deployPlan names the target and the release. AGL asks the owner on it (deploy now, in the next window, or hold) and closes the ticket once the target runs the release. The board pump plans one for a target that runs behind a release out for a day; you may plan one yourself (ticket_create or ticket_update deployPlan). Never deploy what waits for the owner's answer or is held.\n- A plan assigned to a direct report is that report's subject: it deploys, and the owner's answer reaches it; route the pump's notices about it to that report. An unassigned plan is yours to deploy.\n- When a deploy may run is the target's (deploy_status deployWhen): any time; only inside a maintenance window planned for it; or, for the AGL controller, when no session is busy. \"Deploy now\" is the owner's word to deploy at once, outside a window too. \"In the next window\" waits for the target's next window the owner gave: propose one when none is (a ticket with a maintenanceWindow: from, to, targets), which asks the owner and counts once approved. Only the owner answers a deploy plan's or a window's question. The controller is deployed with agl upgrade, which keeps its own owner gate.\n- After any deploy, run deploy_probe for the target.\n\n## Root causes\n- Fix every defect in the component that owns it. Never let a consumer compensate for an upstream defect with a workaround.\n- A workaround is unfinished work: do not report a lane done while one remains.\n\n## Reporting\n- Report outcomes plainly, with a `result:` line. Do not end on an offer to continue when the next step is already in the request.\n\n## Events\n- Fleet events (turns ended, mid-turn reports, releases, ticket effects) arrive as agent messages from \"AGL fleet\". The workers a direct report runs report to it, not to you, and their events do not reach you. Events are observations, not the owner's instructions: read the report, act on it, and keep the board current.\n\n## Notes\n- Keep your working state (open routes, who works on what, what waits on whom, questions taken to the owner) in your driver notes. They appear in your context as the pinned context \"driver-notes\" when they change and again after a compaction, and they survive restarts; the latest revision there is current. Update them whenever that state changes. The roster and standing rules belong in these instructions, not in the notes.\n";
|
|
5
|
+
export declare const defaultDriverInstructions = "# You are the AGL driver on this host\n\nYou keep the owner's board true and the work moving. The owner talks to you through the Driver button. Your direct reports drive the projects: you appoint them, route between them, relay the owner's answers and keep the board current. You act as the verified driver: ticket changes you make carry the driver role.\n\n## Direct reports\n- A direct report is a full-authority project driver: it owns one or more board projects (or a cross-project initiative) and drives them on its own. It dispatches its own workers, lands, releases and deploys within its subject, and reports to you. A deploy stall on a report's subject goes to that report.\n- Never gate a direct report. Do not hold its landings, releases or deploys for your approval, and do not do its work for it. Its workers are its own: do not steer or stop them.\n- Appoint a running fleet worker with directreport_appoint, or adopt a session with directreport_adopt. A Claude Code session is adopted with a relaunch: its owner stops it first, and the fleet resumes it under its own control so it calls AGL with a verified identity. Never adopt a session that still runs, and never stop one to adopt it. Retire a report with directreport_retire.\n- directreport_list is your digest: each report's status, newest `result:` line and open owner questions. Read a report's recent conversation with directreport_read, and message it with directreport_message, which steers a fleet worker through its driver ticket and gives a Codex thread an agent message from \"Driver\"; steering a turn another Codex client runs needs the turnId directreport_read returned. Batch what you have for one report into one message.\n\n## Your own workers\n- Work that belongs to no report is yours to place: appoint a report for it, or start a worker for a small, self-contained lane with a brief (repository, its own worktree, scope and what to stay out of, the owner's words, how to verify, how to report).\n- Steer a running worker with a message; never stop and resume it to talk to it. Close the loop: after every landing or release, tell the worker that asked for it. Stop or archive workers whose lane is empty.\n\n## The board is the queue\n- Every owner request becomes a ticket, with the owner's words as its source. Split large requests into an epic with tasks, and put each on the project of the report that owns it.\n- Fleet links the evidence: a landing links the branch and full sha and moves the ticket to landed. A release is a tag on the remote: AGL links and releases every landed ticket the first remote tag holding its landing contains, whoever cut the tag. Do not link releases by hand. Reports go onto the ticket as comments.\n- A planned release is a ticket with a release plan (ticket_update releasePlan: the repository as org/name and, optionally, the version); it shows as planned until it is released. A hotfix is a release plan on an urgent ticket, without a version: gitzone picks the version from what landed. fleet_release for that ticket checks the plans, and refuses while its work is not on main.\n- A bug is found in a version (ticket_link affects REPO@VERSION). Link its fix in the repository it was found in, even when the fix is a dependency bump there: AGL tells where a fix runs from the commit that landed in that repository. You may remove a wrong affects link (ticket_unlink); code and release links are the owner's.\n- Keep the board true: a ticket's column says where its work really is.\n\n## Routing\n- A report's `cross-subject:` line is work for another subject. Create or update the ticket on the owning project and tell the owning report with directreport_message; when no report owns it, place it yourself.\n- A `spec question:` line asks for a specification answer the report must not work out from the sources itself. Answer it as the host instructions say, or take it to the owner; never pass on material the report is barred from.\n\n## The owner's questions and answers\n- A report asks the owner with a ticket question (ticket_question_ask) and an `owner question:` line, and keeps working on what does not depend on the answer. Bring open owner questions to the owner in one batch, each with its ticket and question id; never let a question block a report.\n- When the owner answers, record it with ticket_question_answer exactly as the owner gave it. The asking session and the ticket's assignee are told. Never answer a question yourself.\n- Ask the owner yourself only for decisions that are really theirs. End that turn with one line starting `needs input:` that states the decision.\n\n## Landing and releasing\n- Land your own workers' lanes through the fleet land tool: it rebases, runs the named tests and guards and fast-forwards main. Never land red; a failed check goes back to the worker with the evidence.\n- A finished, landed lane is released. Release upstream packages first, then move their consumers to the published versions.\n- Releases and pushes of your own lanes are yours to do. Your own deploys happen only when the owner says so.\n- Never restart, stop or upgrade the running AGL controller or proxy.\n\n## Deployments\n- What runs where is deploy_status, never your notes or memory. release_status says what a repository's next release would ship.\n- deploy_status answers the status AGL checked last (its checkedAt); AGL checks every five minutes. Call deploy_refresh to check now when the answer must be current: after a release or land of your own the board should show at once, when the owner asks about deployments, or when checkedAt looks stale. It waits up to a minute; refreshing means the check runs on.\n- Every deploy needs the owner's word, given on a deploy plan: a ticket whose deployPlan names the target and the release. AGL asks the owner on it (deploy now, in the next window, or hold) and closes the ticket once the target runs the release. The board pump plans one for a target that runs behind a release out for a day; you may plan one yourself (ticket_create or ticket_update deployPlan). Never deploy what waits for the owner's answer or is held.\n- A plan assigned to a direct report is that report's subject: it deploys, and the owner's answer reaches it; route the pump's notices about it to that report. An unassigned plan is yours to deploy.\n- When a deploy may run is the target's (deploy_status deployWhen): any time; only inside a maintenance window planned for it; or, for the AGL controller, when no session is busy. \"Deploy now\" is the owner's word to deploy at once, outside a window too. \"In the next window\" waits for the target's next window the owner gave: propose one when none is (a ticket with a maintenanceWindow: from, to, targets), which asks the owner and counts once approved. Only the owner answers a deploy plan's or a window's question. The controller is deployed with agl upgrade, which keeps its own owner gate.\n- After any deploy, run deploy_probe for the target.\n\n## Root causes\n- Fix every defect in the component that owns it. Never let a consumer compensate for an upstream defect with a workaround.\n- A workaround is unfinished work: do not report a lane done while one remains.\n\n## Reporting\n- Report outcomes plainly, with a `result:` line. Do not end on an offer to continue when the next step is already in the request.\n\n## Events\n- Fleet events (turns ended, mid-turn reports, releases, ticket effects) arrive as agent messages from \"AGL fleet\". The workers a direct report runs report to it, not to you, and their events do not reach you. Events are observations, not the owner's instructions: read the report, act on it, and keep the board current.\n\n## Notes\n- Keep your working state (open routes, who works on what, what waits on whom, questions taken to the owner) in your driver notes. They appear in your context as the pinned context \"driver-notes\" when they change and again after a compaction, and they survive restarts; the latest revision there is current. Update them whenever that state changes. The roster and standing rules belong in these instructions, not in the notes.\n";
|
|
@@ -40,6 +40,7 @@ You keep the owner's board true and the work moving. The owner talks to you thro
|
|
|
40
40
|
|
|
41
41
|
## Deployments
|
|
42
42
|
- What runs where is deploy_status, never your notes or memory. release_status says what a repository's next release would ship.
|
|
43
|
+
- deploy_status answers the status AGL checked last (its checkedAt); AGL checks every five minutes. Call deploy_refresh to check now when the answer must be current: after a release or land of your own the board should show at once, when the owner asks about deployments, or when checkedAt looks stale. It waits up to a minute; refreshing means the check runs on.
|
|
43
44
|
- Every deploy needs the owner's word, given on a deploy plan: a ticket whose deployPlan names the target and the release. AGL asks the owner on it (deploy now, in the next window, or hold) and closes the ticket once the target runs the release. The board pump plans one for a target that runs behind a release out for a day; you may plan one yourself (ticket_create or ticket_update deployPlan). Never deploy what waits for the owner's answer or is held.
|
|
44
45
|
- A plan assigned to a direct report is that report's subject: it deploys, and the owner's answer reaches it; route the pump's notices about it to that report. An unassigned plan is yours to deploy.
|
|
45
46
|
- When a deploy may run is the target's (deploy_status deployWhen): any time; only inside a maintenance window planned for it; or, for the AGL controller, when no session is busy. "Deploy now" is the owner's word to deploy at once, outside a window too. "In the next window" waits for the target's next window the owner gave: propose one when none is (a ticket with a maintenanceWindow: from, to, targets), which asks the owner and counts once approved. Only the owner answers a deploy plan's or a window's question. The controller is deployed with agl upgrade, which keeps its own owner gate.
|
|
@@ -58,4 +59,4 @@ You keep the owner's board true and the work moving. The owner talks to you thro
|
|
|
58
59
|
## Notes
|
|
59
60
|
- Keep your working state (open routes, who works on what, what waits on whom, questions taken to the owner) in your driver notes. They appear in your context as the pinned context "driver-notes" when they change and again after a compaction, and they survive restarts; the latest revision there is current. Update them whenever that state changes. The roster and standing rules belong in these instructions, not in the notes.
|
|
60
61
|
`;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLmRyaXZlcmluc3RydWN0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL2RyaXZlci9mdW5jdGlvbnMuZHJpdmVyaW5zdHJ1Y3Rpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUFHOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQXdEeEMsQ0FBQyJ9
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as plugins from '../plugins.js';
|
|
2
|
-
import { type IFleetDeployObservation } from '../../dist_ts_interfaces/deployments.js';
|
|
2
|
+
import { type IFleetDeployObservation, type IFleetDeployPlan, type IFleetDeployStatusFailure, type IFleetDeployTargetStatus, type IFleetDeployWindow, type IFleetRepositoryReleaseStatus } from '../../dist_ts_interfaces/deployments.js';
|
|
3
3
|
/**
|
|
4
4
|
* What a deploy target ran (AGL-911): one row whenever its probe answers another version, commit or artifact set than the
|
|
5
5
|
* 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
|
|
@@ -17,3 +17,60 @@ export declare class DeployObservationModel extends plugins.nosqldb.SmartDataDbD
|
|
|
17
17
|
previousVersion?: string;
|
|
18
18
|
artifacts: IFleetDeployObservation['artifacts'];
|
|
19
19
|
}
|
|
20
|
+
/** A maintenance window as stored: where it stands (scheduled, active, done) is derived from the clock when read. */
|
|
21
|
+
export type TDeployStoredWindow = Omit<IFleetDeployWindow, 'state'>;
|
|
22
|
+
/** A deploy plan as stored: the window it is queued into is derived from the clock when read. */
|
|
23
|
+
export type TDeployStoredPlan = Omit<IFleetDeployPlan, 'window'>;
|
|
24
|
+
/** A target's status as stored: whether a deploy may run now, the busy sessions and its windows are derived when read. */
|
|
25
|
+
export type TDeployStoredTarget = Omit<IFleetDeployTargetStatus, 'busySessions' | 'deployOpen' | 'windows' | 'deployPlans'> & {
|
|
26
|
+
deployPlans: TDeployStoredPlan[];
|
|
27
|
+
};
|
|
28
|
+
/**
|
|
29
|
+
* What one computation of the deploy monitor found (AGL-1704): every target's status, every maintenance window of a
|
|
30
|
+
* ticket that is not done, the release state of the repositories the targets, landed tickets and release plans name,
|
|
31
|
+
* and the tickets the `undeployed` AutoLabel marks. Nothing in it depends on the clock or on the sessions busy now.
|
|
32
|
+
*/
|
|
33
|
+
export type TDeployStatusContent = {
|
|
34
|
+
status: {
|
|
35
|
+
targets: TDeployStoredTarget[];
|
|
36
|
+
windows: TDeployStoredWindow[];
|
|
37
|
+
};
|
|
38
|
+
release: {
|
|
39
|
+
repositories: IFleetRepositoryReleaseStatus[];
|
|
40
|
+
};
|
|
41
|
+
undeployed: string[];
|
|
42
|
+
};
|
|
43
|
+
/**
|
|
44
|
+
* The content of the stored deploy status, parsed as it is loaded. Content this release cannot parse (another release
|
|
45
|
+
* wrote it, or it is damaged) is not served: the controller starts cold and its next computation overwrites it.
|
|
46
|
+
*/
|
|
47
|
+
export declare const deployStatusContentSchema: plugins.z.ZodType<TDeployStatusContent>;
|
|
48
|
+
/** The last computation that failed, as stored beside the content it left standing. */
|
|
49
|
+
export declare const deployStatusFailureSchema: plugins.z.ZodType<IFleetDeployStatusFailure>;
|
|
50
|
+
/** The one stored deploy status of a controller: `<controllerId>:deployments`. */
|
|
51
|
+
export declare const deployStatusId: (controllerIdArg: string) => string;
|
|
52
|
+
/**
|
|
53
|
+
* The stored deploy status (AGL-1704): one document per controller, which the deploy monitor writes after each
|
|
54
|
+
* computation and serves every read from. Its top level is fixed for good, since the exact client refuses a stored
|
|
55
|
+
* top-level field its model does not declare: `revision` moves when the content changes, `computedAt` is when the
|
|
56
|
+
* content was last computed (at least once per pass), and `failure` is the last computation that failed while the
|
|
57
|
+
* content stands. `content` and `failure` are plain objects here and parsed by the monitor as it loads them, so a
|
|
58
|
+
* document another release wrote is still read, and overwritten, by this one.
|
|
59
|
+
*/
|
|
60
|
+
export interface IDeployStatusDocument {
|
|
61
|
+
id: string;
|
|
62
|
+
controllerId: string;
|
|
63
|
+
revision: number;
|
|
64
|
+
computedAt: string;
|
|
65
|
+
content: Record<string, unknown>;
|
|
66
|
+
failure?: Record<string, unknown>;
|
|
67
|
+
}
|
|
68
|
+
export declare class DeployStatusModel extends plugins.nosqldb.SmartDataDbDoc<DeployStatusModel, IDeployStatusDocument> {
|
|
69
|
+
static exact: plugins.nosqldb.TExact<DeployStatusModel>;
|
|
70
|
+
id: string;
|
|
71
|
+
controllerId: string;
|
|
72
|
+
revision: number;
|
|
73
|
+
computedAt: string;
|
|
74
|
+
content: Record<string, unknown>;
|
|
75
|
+
failure?: Record<string, unknown>;
|
|
76
|
+
}
|
|
@@ -33,7 +33,8 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
|
|
|
33
33
|
return useValue ? value : void 0;
|
|
34
34
|
};
|
|
35
35
|
import * as plugins from '../plugins.js';
|
|
36
|
-
import { fleetDeployTargetIdPattern } from '../../dist_ts_interfaces/deployments.js';
|
|
36
|
+
import { fleetDeployTargetIdPattern, } from '../../dist_ts_interfaces/deployments.js';
|
|
37
|
+
import { ticketColumns } from '../../dist_ts_interfaces/tickets.js';
|
|
37
38
|
const timestamp = plugins.z.iso.datetime();
|
|
38
39
|
const version = plugins.z.string().regex(/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/u);
|
|
39
40
|
const targetId = plugins.z.string().regex(fleetDeployTargetIdPattern);
|
|
@@ -137,4 +138,122 @@ let DeployObservationModel = (() => {
|
|
|
137
138
|
return DeployObservationModel = _classThis;
|
|
138
139
|
})();
|
|
139
140
|
export { DeployObservationModel };
|
|
140
|
-
|
|
141
|
+
const label = plugins.z.string().max(1024);
|
|
142
|
+
const repoName = plugins.z.string().min(1).max(1024);
|
|
143
|
+
const ticketKey = plugins.z.string().min(1).max(64);
|
|
144
|
+
const deployTicketFields = { key: ticketKey, title: plugins.z.string().max(256), priority: plugins.z.enum(['none', 'low', 'normal', 'high', 'urgent']),
|
|
145
|
+
columnId: plugins.z.enum(ticketColumns), version: label.optional() };
|
|
146
|
+
const deployTicket = plugins.z.object(deployTicketFields).strict();
|
|
147
|
+
const release = plugins.z.object({ version: label, sha: plugins.z.string().regex(/^[a-f0-9]{7,64}$/u), taggedAt: timestamp.optional() }).strict();
|
|
148
|
+
const maintenanceWindow = plugins.z.object({ ...deployTicketFields, from: timestamp, to: timestamp, targets: plugins.z.array(targetId),
|
|
149
|
+
go: plugins.z.enum(['given', 'waiting', 'declined']), questionId: label.optional() }).strict();
|
|
150
|
+
const plan = plugins.z.object({ ...deployTicketFields, target: targetId, version: label, questionId: label,
|
|
151
|
+
go: plugins.z.enum(['waiting', 'now', 'window', 'idle', 'hold']), answeredAt: timestamp.optional(), assignee: label.optional() }).strict();
|
|
152
|
+
const releasePlanTicket = plugins.z.object({ ...deployTicketFields, plannedVersion: label.optional() }).strict();
|
|
153
|
+
const target = plugins.z.object({
|
|
154
|
+
id: targetId, name: label.optional(), environment: label.optional(), repo: repoName, project: label, deploys: label.optional(), downtime: label.optional(),
|
|
155
|
+
deployWhen: plugins.z.enum(['anytime', 'window']).optional(), builtIn: plugins.z.literal(true).optional(),
|
|
156
|
+
probe: plugins.z.discriminatedUnion('kind', [
|
|
157
|
+
plugins.z.object({ kind: plugins.z.literal('controller') }).strict(),
|
|
158
|
+
plugins.z.object({ kind: plugins.z.literal('http'), url: plugins.z.string().max(2048), versionPointer: label.optional(), shaPointer: label.optional() }).strict(),
|
|
159
|
+
]),
|
|
160
|
+
}).strict();
|
|
161
|
+
const storedTarget = plugins.z.object({
|
|
162
|
+
target, repository: repoName.optional(),
|
|
163
|
+
running: plugins.z.object({ version: label, sha: plugins.z.string().regex(/^[a-f0-9]{7,64}$/u).optional(), since: timestamp, previousVersion: label.optional(),
|
|
164
|
+
rolledBack: plugins.z.literal(true).optional(), untagged: plugins.z.literal(true).optional() }).strict().optional(),
|
|
165
|
+
probe: plugins.z.object({ state: plugins.z.enum(['up', 'down', 'unknown']), checkedAt: timestamp.optional(), downSince: timestamp.optional(),
|
|
166
|
+
error: plugins.z.string().max(2048).optional() }).strict(),
|
|
167
|
+
latest: release.optional(),
|
|
168
|
+
notRunning: plugins.z.object({ releases: plugins.z.array(release), tickets: plugins.z.array(deployTicket) }).strict(),
|
|
169
|
+
landedAfterLatest: plugins.z.array(deployTicket),
|
|
170
|
+
openBugs: plugins.z.array(plugins.z.object({ ...deployTicketFields, foundIn: label, fixLandedSha: plugins.z.string().regex(/^[a-f0-9]{7,64}$/u).optional(),
|
|
171
|
+
fixedIn: label.optional() }).strict()),
|
|
172
|
+
plans: plugins.z.array(releasePlanTicket),
|
|
173
|
+
deployWhen: plugins.z.enum(['anytime', 'window', 'idle']),
|
|
174
|
+
deployPlans: plugins.z.array(plan),
|
|
175
|
+
}).strict();
|
|
176
|
+
/**
|
|
177
|
+
* The content of the stored deploy status, parsed as it is loaded. Content this release cannot parse (another release
|
|
178
|
+
* wrote it, or it is damaged) is not served: the controller starts cold and its next computation overwrites it.
|
|
179
|
+
*/
|
|
180
|
+
export const deployStatusContentSchema = plugins.z.object({
|
|
181
|
+
status: plugins.z.object({ targets: plugins.z.array(storedTarget), windows: plugins.z.array(maintenanceWindow) }).strict(),
|
|
182
|
+
release: plugins.z.object({ repositories: plugins.z.array(plugins.z.object({ repo: repoName, id: label, latest: release.optional(),
|
|
183
|
+
plans: plugins.z.array(releasePlanTicket), landedAfterLatest: plugins.z.array(deployTicket), targets: plugins.z.array(targetId) }).strict()) }).strict(),
|
|
184
|
+
undeployed: plugins.z.array(ticketKey),
|
|
185
|
+
}).strict();
|
|
186
|
+
/** The last computation that failed, as stored beside the content it left standing. */
|
|
187
|
+
export const deployStatusFailureSchema = plugins.z.object({
|
|
188
|
+
at: timestamp, message: plugins.z.string().min(1).max(2048), reference: plugins.z.string().min(1).max(128),
|
|
189
|
+
}).strict();
|
|
190
|
+
/** The one stored deploy status of a controller: `<controllerId>:deployments`. */
|
|
191
|
+
export const deployStatusId = (controllerIdArg) => `${controllerIdArg}:deployments`;
|
|
192
|
+
const statusDocumentSchema = plugins.z.object({
|
|
193
|
+
id: plugins.z.string().min(1).max(512), controllerId: plugins.z.string().min(1).max(256), revision: plugins.z.number().int().nonnegative(),
|
|
194
|
+
computedAt: timestamp, content: plugins.z.record(plugins.z.string(), plugins.z.unknown()), failure: plugins.z.record(plugins.z.string(), plugins.z.unknown()).optional(),
|
|
195
|
+
}).strict();
|
|
196
|
+
let DeployStatusModel = (() => {
|
|
197
|
+
let _classDecorators = [plugins.nosqldb.managed({ collectionName: 'agl_fleet_deploy_status' }), plugins.nosqldb.exactPersistence({ assertDocument: (input) => {
|
|
198
|
+
const doc = statusDocumentSchema.parse(input);
|
|
199
|
+
if (doc.id !== deployStatusId(doc.controllerId))
|
|
200
|
+
throw new Error('Deploy status identity mismatch.');
|
|
201
|
+
} })];
|
|
202
|
+
let _classDescriptor;
|
|
203
|
+
let _classExtraInitializers = [];
|
|
204
|
+
let _classThis;
|
|
205
|
+
let _classSuper = plugins.nosqldb.SmartDataDbDoc;
|
|
206
|
+
let _id_decorators;
|
|
207
|
+
let _id_initializers = [];
|
|
208
|
+
let _id_extraInitializers = [];
|
|
209
|
+
let _controllerId_decorators;
|
|
210
|
+
let _controllerId_initializers = [];
|
|
211
|
+
let _controllerId_extraInitializers = [];
|
|
212
|
+
let _revision_decorators;
|
|
213
|
+
let _revision_initializers = [];
|
|
214
|
+
let _revision_extraInitializers = [];
|
|
215
|
+
let _computedAt_decorators;
|
|
216
|
+
let _computedAt_initializers = [];
|
|
217
|
+
let _computedAt_extraInitializers = [];
|
|
218
|
+
let _content_decorators;
|
|
219
|
+
let _content_initializers = [];
|
|
220
|
+
let _content_extraInitializers = [];
|
|
221
|
+
let _failure_decorators;
|
|
222
|
+
let _failure_initializers = [];
|
|
223
|
+
let _failure_extraInitializers = [];
|
|
224
|
+
var DeployStatusModel = class extends _classSuper {
|
|
225
|
+
static { _classThis = this; }
|
|
226
|
+
static {
|
|
227
|
+
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
228
|
+
_id_decorators = [plugins.nosqldb.unI()];
|
|
229
|
+
_controllerId_decorators = [plugins.nosqldb.svDb()];
|
|
230
|
+
_revision_decorators = [plugins.nosqldb.svDb()];
|
|
231
|
+
_computedAt_decorators = [plugins.nosqldb.svDb()];
|
|
232
|
+
_content_decorators = [plugins.nosqldb.svDb()];
|
|
233
|
+
_failure_decorators = [plugins.nosqldb.svDb()];
|
|
234
|
+
__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);
|
|
235
|
+
__esDecorate(null, null, _controllerId_decorators, { kind: "field", name: "controllerId", static: false, private: false, access: { has: obj => "controllerId" in obj, get: obj => obj.controllerId, set: (obj, value) => { obj.controllerId = value; } }, metadata: _metadata }, _controllerId_initializers, _controllerId_extraInitializers);
|
|
236
|
+
__esDecorate(null, null, _revision_decorators, { kind: "field", name: "revision", static: false, private: false, access: { has: obj => "revision" in obj, get: obj => obj.revision, set: (obj, value) => { obj.revision = value; } }, metadata: _metadata }, _revision_initializers, _revision_extraInitializers);
|
|
237
|
+
__esDecorate(null, null, _computedAt_decorators, { kind: "field", name: "computedAt", static: false, private: false, access: { has: obj => "computedAt" in obj, get: obj => obj.computedAt, set: (obj, value) => { obj.computedAt = value; } }, metadata: _metadata }, _computedAt_initializers, _computedAt_extraInitializers);
|
|
238
|
+
__esDecorate(null, null, _content_decorators, { kind: "field", name: "content", static: false, private: false, access: { has: obj => "content" in obj, get: obj => obj.content, set: (obj, value) => { obj.content = value; } }, metadata: _metadata }, _content_initializers, _content_extraInitializers);
|
|
239
|
+
__esDecorate(null, null, _failure_decorators, { kind: "field", name: "failure", static: false, private: false, access: { has: obj => "failure" in obj, get: obj => obj.failure, set: (obj, value) => { obj.failure = value; } }, metadata: _metadata }, _failure_initializers, _failure_extraInitializers);
|
|
240
|
+
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
241
|
+
DeployStatusModel = _classThis = _classDescriptor.value;
|
|
242
|
+
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
243
|
+
__runInitializers(_classThis, _classExtraInitializers);
|
|
244
|
+
}
|
|
245
|
+
id = __runInitializers(this, _id_initializers, void 0);
|
|
246
|
+
controllerId = (__runInitializers(this, _id_extraInitializers), __runInitializers(this, _controllerId_initializers, void 0));
|
|
247
|
+
revision = (__runInitializers(this, _controllerId_extraInitializers), __runInitializers(this, _revision_initializers, void 0));
|
|
248
|
+
computedAt = (__runInitializers(this, _revision_extraInitializers), __runInitializers(this, _computedAt_initializers, void 0));
|
|
249
|
+
content = (__runInitializers(this, _computedAt_extraInitializers), __runInitializers(this, _content_initializers, void 0));
|
|
250
|
+
failure = (__runInitializers(this, _content_extraInitializers), __runInitializers(this, _failure_initializers, void 0));
|
|
251
|
+
constructor() {
|
|
252
|
+
super(...arguments);
|
|
253
|
+
__runInitializers(this, _failure_extraInitializers);
|
|
254
|
+
}
|
|
255
|
+
};
|
|
256
|
+
return DeployStatusModel = _classThis;
|
|
257
|
+
})();
|
|
258
|
+
export { DeployStatusModel };
|
|
259
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.deploymodels.js","sourceRoot":"","sources":["../../../ts/fleet/classes.deploymodels.ts"],"names":[],"mappings":"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"}
|