looply-cli 0.5.43 → 0.5.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (133) hide show
  1. package/dist/.src-hash +1 -1
  2. package/dist/additive-union.d.ts +31 -0
  3. package/dist/additive-union.d.ts.map +1 -0
  4. package/dist/additive-union.js +129 -0
  5. package/dist/additive-union.js.map +1 -0
  6. package/dist/autonomy-controller.d.ts.map +1 -1
  7. package/dist/autonomy-controller.js +6 -0
  8. package/dist/autonomy-controller.js.map +1 -1
  9. package/dist/autonomy-tick.d.ts.map +1 -1
  10. package/dist/autonomy-tick.js +20 -2
  11. package/dist/autonomy-tick.js.map +1 -1
  12. package/dist/bin.d.ts.map +1 -1
  13. package/dist/bin.js +4 -0
  14. package/dist/bin.js.map +1 -1
  15. package/dist/branch-delivery-wiring.d.ts +41 -1
  16. package/dist/branch-delivery-wiring.d.ts.map +1 -1
  17. package/dist/branch-delivery-wiring.js +95 -2
  18. package/dist/branch-delivery-wiring.js.map +1 -1
  19. package/dist/branch-delivery.d.ts +51 -2
  20. package/dist/branch-delivery.d.ts.map +1 -1
  21. package/dist/branch-delivery.js +220 -13
  22. package/dist/branch-delivery.js.map +1 -1
  23. package/dist/branch-replay.d.ts +9 -1
  24. package/dist/branch-replay.d.ts.map +1 -1
  25. package/dist/branch-replay.js +58 -6
  26. package/dist/branch-replay.js.map +1 -1
  27. package/dist/canary-cmd.d.ts +42 -0
  28. package/dist/canary-cmd.d.ts.map +1 -0
  29. package/dist/canary-cmd.js +242 -0
  30. package/dist/canary-cmd.js.map +1 -0
  31. package/dist/canary-wiring.d.ts +31 -0
  32. package/dist/canary-wiring.d.ts.map +1 -0
  33. package/dist/canary-wiring.js +139 -0
  34. package/dist/canary-wiring.js.map +1 -0
  35. package/dist/canary.d.ts +123 -0
  36. package/dist/canary.d.ts.map +1 -0
  37. package/dist/canary.js +259 -0
  38. package/dist/canary.js.map +1 -0
  39. package/dist/coordinator-state.d.ts.map +1 -1
  40. package/dist/coordinator-state.js +6 -4
  41. package/dist/coordinator-state.js.map +1 -1
  42. package/dist/daemon-cmd.d.ts.map +1 -1
  43. package/dist/daemon-cmd.js +37 -3
  44. package/dist/daemon-cmd.js.map +1 -1
  45. package/dist/deliver-cmd.d.ts +12 -0
  46. package/dist/deliver-cmd.d.ts.map +1 -1
  47. package/dist/deliver-cmd.js +25 -0
  48. package/dist/deliver-cmd.js.map +1 -1
  49. package/dist/environment-hold.d.ts +32 -1
  50. package/dist/environment-hold.d.ts.map +1 -1
  51. package/dist/environment-hold.js +52 -5
  52. package/dist/environment-hold.js.map +1 -1
  53. package/dist/feature-report.d.ts +4 -2
  54. package/dist/feature-report.d.ts.map +1 -1
  55. package/dist/feature-report.js +24 -6
  56. package/dist/feature-report.js.map +1 -1
  57. package/dist/fresh-gates.d.ts +105 -0
  58. package/dist/fresh-gates.d.ts.map +1 -0
  59. package/dist/fresh-gates.js +200 -0
  60. package/dist/fresh-gates.js.map +1 -0
  61. package/dist/git-driver.d.ts +5 -0
  62. package/dist/git-driver.d.ts.map +1 -1
  63. package/dist/git-driver.js +8 -0
  64. package/dist/git-driver.js.map +1 -1
  65. package/dist/goal-adaptive.d.ts +25 -1
  66. package/dist/goal-adaptive.d.ts.map +1 -1
  67. package/dist/goal-adaptive.js +42 -1
  68. package/dist/goal-adaptive.js.map +1 -1
  69. package/dist/goal-compile.d.ts.map +1 -1
  70. package/dist/goal-compile.js +13 -0
  71. package/dist/goal-compile.js.map +1 -1
  72. package/dist/goal-gap.d.ts +14 -3
  73. package/dist/goal-gap.d.ts.map +1 -1
  74. package/dist/goal-gap.js +46 -6
  75. package/dist/goal-gap.js.map +1 -1
  76. package/dist/grant-waiting-wiring.d.ts +3 -2
  77. package/dist/grant-waiting-wiring.d.ts.map +1 -1
  78. package/dist/grant-waiting-wiring.js +5 -4
  79. package/dist/grant-waiting-wiring.js.map +1 -1
  80. package/dist/machine-settings.d.ts +4 -0
  81. package/dist/machine-settings.d.ts.map +1 -1
  82. package/dist/machine-settings.js +15 -1
  83. package/dist/machine-settings.js.map +1 -1
  84. package/dist/outcome-audit.d.ts +152 -0
  85. package/dist/outcome-audit.d.ts.map +1 -0
  86. package/dist/outcome-audit.js +313 -0
  87. package/dist/outcome-audit.js.map +1 -0
  88. package/dist/parts-attribution.d.ts +38 -0
  89. package/dist/parts-attribution.d.ts.map +1 -0
  90. package/dist/parts-attribution.js +61 -0
  91. package/dist/parts-attribution.js.map +1 -0
  92. package/dist/project-terminal.d.ts +3 -1
  93. package/dist/project-terminal.d.ts.map +1 -1
  94. package/dist/project-terminal.js +37 -5
  95. package/dist/project-terminal.js.map +1 -1
  96. package/dist/pursuit-delivery.d.ts +5 -20
  97. package/dist/pursuit-delivery.d.ts.map +1 -1
  98. package/dist/pursuit-delivery.js +30 -2
  99. package/dist/pursuit-delivery.js.map +1 -1
  100. package/dist/pursuit-ending.d.ts.map +1 -1
  101. package/dist/pursuit-ending.js +10 -0
  102. package/dist/pursuit-ending.js.map +1 -1
  103. package/dist/run-cmd.d.ts.map +1 -1
  104. package/dist/run-cmd.js +47 -1
  105. package/dist/run-cmd.js.map +1 -1
  106. package/dist/run-refusal-marks.d.ts +8 -1
  107. package/dist/run-refusal-marks.d.ts.map +1 -1
  108. package/dist/run-refusal-marks.js +14 -1
  109. package/dist/run-refusal-marks.js.map +1 -1
  110. package/dist/server-client.d.ts +26 -1
  111. package/dist/server-client.d.ts.map +1 -1
  112. package/dist/server-client.js +24 -0
  113. package/dist/server-client.js.map +1 -1
  114. package/dist/setup-check-wiring.d.ts +18 -0
  115. package/dist/setup-check-wiring.d.ts.map +1 -1
  116. package/dist/setup-check-wiring.js +63 -1
  117. package/dist/setup-check-wiring.js.map +1 -1
  118. package/dist/setup-check.d.ts +6 -0
  119. package/dist/setup-check.d.ts.map +1 -1
  120. package/dist/setup-check.js +19 -7
  121. package/dist/setup-check.js.map +1 -1
  122. package/dist/ticket-words.d.ts.map +1 -1
  123. package/dist/ticket-words.js +4 -0
  124. package/dist/ticket-words.js.map +1 -1
  125. package/dist/watchdog-wiring.d.ts +116 -5
  126. package/dist/watchdog-wiring.d.ts.map +1 -1
  127. package/dist/watchdog-wiring.js +302 -4
  128. package/dist/watchdog-wiring.js.map +1 -1
  129. package/dist/watchdog.d.ts +20 -3
  130. package/dist/watchdog.d.ts.map +1 -1
  131. package/dist/watchdog.js +24 -4
  132. package/dist/watchdog.js.map +1 -1
  133. package/package.json +2 -2
@@ -1,18 +1,31 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RUN_ACCOUNT_ROLES = void 0;
3
4
  exports.requesterOfGoal = requesterOfGoal;
4
5
  exports.goalAccounts = goalAccounts;
5
6
  exports.accountFreeForGoal = accountFreeForGoal;
7
+ exports.readStartFacts = readStartFacts;
8
+ exports.goalAttemptOf = goalAttemptOf;
9
+ exports.stillWanted = stillWanted;
10
+ exports.deliveryRetryWanted = deliveryRetryWanted;
6
11
  exports.makeDaemonWatchdog = makeDaemonWatchdog;
7
12
  const node_fs_1 = require("node:fs");
8
13
  const node_path_1 = require("node:path");
14
+ const core_1 = require("@looply/core");
9
15
  const account_standing_1 = require("./account-standing");
16
+ const autonomy_store_1 = require("./autonomy-store");
10
17
  const branch_delivery_1 = require("./branch-delivery");
11
18
  const checkout_leftovers_1 = require("./checkout-leftovers");
12
19
  const environment_hold_1 = require("./environment-hold");
13
20
  const gate_health_1 = require("./gate-health");
14
21
  const git_driver_1 = require("./git-driver");
15
22
  const grant_waiting_wiring_1 = require("./grant-waiting-wiring");
23
+ const ledger_store_1 = require("./ledger-store");
24
+ const pursuit_delivery_1 = require("./pursuit-delivery");
25
+ const run_ended_1 = require("./run-ended");
26
+ const run_ending_locator_1 = require("./run-ending-locator");
27
+ const run_refusal_marks_1 = require("./run-refusal-marks");
28
+ const run_start_marks_1 = require("./run-start-marks");
16
29
  const watchdog_1 = require("./watchdog");
17
30
  const workspace_1 = require("./workspace");
18
31
  /** Who asked for a goal (`requestedBy.ref` in the goal mirror), or null. */
@@ -28,13 +41,20 @@ function requesterOfGoal(stateDir, goalId) {
28
41
  }
29
42
  }
30
43
  /** The accounts a goal may use now, with its requester from the goal mirror. */
44
+ /**
45
+ * EVERY MODEL ROLE A RUN CALLS: the planner (`brain` — a compile always plans through it, brain switched on or not:
46
+ * `run-cmd.ts` `pooled('brain')`), the implementer, the verifier and the prover. A goal waits on a usage limit until
47
+ * each has an account back (`accountsRetryAt`), and the watchdog releases it early only when one account can take
48
+ * all of them. RBB-B-220 (2026-10-22) was refused for planning alone.
49
+ */
50
+ exports.RUN_ACCOUNT_ROLES = ['brain', 'implementer', 'verifier', 'prover'];
31
51
  function goalAccounts(stateDir, projectId, goalId, now = Date.now(), opts = {}) {
32
52
  const input = { projectId, requesterRef: requesterOfGoal(stateDir, goalId), now, ...(opts.role ? { role: opts.role } : {}), ...(opts.provider ? { provider: opts.provider } : {}) };
33
53
  return opts.home === undefined ? (0, account_standing_1.accountStanding)(input) : (0, account_standing_1.accountStanding)(input, opts.home);
34
54
  }
35
55
  /**
36
56
  * An account that may take this goal's calls in EVERY role its runs use, and is not resting — or
37
- * null. A run calls an implementer, a verifier and a prover (and the brain, when the project has it on); an
57
+ * null. A run calls the planner (`brain`), an implementer, a verifier and a prover (`RUN_ACCOUNT_ROLES`); an
38
58
  * account free for one of them only would meet the limit again on the next call.
39
59
  */
40
60
  function accountFreeForGoal(stateDir, projectId, goalId, roles, provider, now = Date.now(), home) {
@@ -47,14 +67,258 @@ function accountFreeForGoal(stateDir, projectId, goalId, roles, provider, now =
47
67
  }
48
68
  return common?.[0] ?? null;
49
69
  }
70
+ function ledgerRuns(text) {
71
+ const runs = new Map();
72
+ const of = (runId) => runs.get(runId) ?? { rounds: null, elapsedMs: null, halted: null, ended: false };
73
+ for (const e of (0, core_1.parseLines)(text).events) {
74
+ if (e.kind === 'run.ended') {
75
+ const d = e.data;
76
+ runs.set(e.runId, {
77
+ ...of(e.runId),
78
+ ended: true,
79
+ rounds: typeof d.totals?.rounds === 'number' ? d.totals.rounds : null,
80
+ elapsedMs: typeof d.elapsedMs === 'number' ? d.elapsedMs : null,
81
+ });
82
+ }
83
+ else if (e.kind === 'alert') {
84
+ const d = e.data;
85
+ if (d?.code === run_ended_1.HALTED_ALERT_CODE && typeof d.text === 'string' && d.text !== '')
86
+ runs.set(e.runId, { ...of(e.runId), halted: d.text });
87
+ }
88
+ }
89
+ return runs;
90
+ }
91
+ /**
92
+ * EVERY START OF A GRANT, AS ITS RECORDS SAY (`outcome-audit.ts`): the receipts (`autonomy/<id>/`),
93
+ * the run it started (the start marks, else its `.run` receipt) and what its ledger says of it — read
94
+ * where the run executed, only in this project's own checkouts (`isProjectExecutionRoot`). A run
95
+ * whose ending cannot be read has `rounds: null`, never 0: unknown is not evidence of a fault.
96
+ */
97
+ async function readStartFacts(opts) {
98
+ const dir = (0, node_path_1.join)(opts.stateDir, 'autonomy', opts.grant.controllerId);
99
+ let names;
100
+ try {
101
+ names = (0, node_fs_1.readdirSync)(dir);
102
+ }
103
+ catch {
104
+ return [];
105
+ }
106
+ const json = (name) => {
107
+ try {
108
+ const v = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(dir, name), 'utf8'));
109
+ return typeof v === 'object' && v !== null ? v : null;
110
+ }
111
+ catch {
112
+ return null;
113
+ }
114
+ };
115
+ const ledgerOf = (checkout) => {
116
+ if (!(0, run_ending_locator_1.isProjectExecutionRoot)(opts.cwd, checkout, opts.home).ok)
117
+ return null;
118
+ const path = (0, node_path_1.join)((0, git_driver_1.executionStateDir)(checkout), 'events.jsonl');
119
+ try {
120
+ const st = (0, node_fs_1.statSync)(path);
121
+ const stamp = `${st.mtimeMs}:${st.size}`;
122
+ const known = opts.ledgers.get(path);
123
+ if (known !== undefined && known.stamp === stamp)
124
+ return known.runs;
125
+ const runs = ledgerRuns((0, node_fs_1.readFileSync)(path, 'utf8'));
126
+ opts.ledgers.set(path, { stamp, runs });
127
+ return runs;
128
+ }
129
+ catch {
130
+ return null;
131
+ }
132
+ };
133
+ const ordinals = names
134
+ .map((n) => /^(\d{4})\.start\.json$/.exec(n))
135
+ .filter((m) => m !== null)
136
+ .map((m) => Number(m[1]))
137
+ .sort((a, b) => a - b);
138
+ const facts = [];
139
+ for (const n of ordinals) {
140
+ const pad = String(n).padStart(4, '0');
141
+ const ended = names.includes(`${pad}.done.json`);
142
+ const v = names.includes(`${pad}.void.json`) ? json(`${pad}.void.json`) : null;
143
+ const voided = v !== null && (0, core_1.isEnvironmentCode)(v['code']) ? { code: v['code'], reason: typeof v['reason'] === 'string' ? v['reason'] : '' } : null;
144
+ const id = (0, autonomy_store_1.autonomyStartId)(opts.grant.controllerId, n);
145
+ const mark = opts.starts.find(id);
146
+ const refusal = opts.refusals.find(id);
147
+ const receipt = names.includes(`${pad}.run.json`) ? json(`${pad}.run.json`) : null;
148
+ const runId = mark?.runId ?? (typeof receipt?.['runId'] === 'string' ? receipt['runId'] : null);
149
+ let rounds = null;
150
+ let elapsedMs = null;
151
+ let halted = null;
152
+ if (runId !== null) {
153
+ const run = ledgerOf(mark?.workspace ?? opts.cwd)?.get(runId);
154
+ if (run?.ended === true) {
155
+ rounds = run.rounds;
156
+ elapsedMs = run.elapsedMs;
157
+ }
158
+ halted = run?.halted ?? null;
159
+ }
160
+ else if (ended && (voided !== null || refusal !== null)) {
161
+ // Ended on a fault or a refusal with no run on record: nothing ran.
162
+ rounds = 0;
163
+ }
164
+ facts.push({
165
+ ordinal: n,
166
+ ended,
167
+ startedAt: mark?.at ?? null,
168
+ runId,
169
+ rounds,
170
+ elapsedMs,
171
+ voided,
172
+ refusal: refusal?.code ?? null,
173
+ note: voided?.reason || refusal?.reason || halted || null,
174
+ });
175
+ }
176
+ return facts;
177
+ }
178
+ /**
179
+ * A goal's ticket and attempt from its clientRef: AutoRyn's `<caller>:<tenant>:<task|bug>:<ticket>:<n>`,
180
+ * or a split ticket's member `…:<n>:<providerProjectId>` (one goal per component repository).
181
+ */
182
+ function goalAttemptOf(clientRef) {
183
+ return typeof clientRef === 'string' ? (0, branch_delivery_1.ticketAttemptOf)(clientRef.replace(/:prj_[A-Za-z0-9]+$/, '')) : null;
184
+ }
185
+ /**
186
+ * IS DELIVERING A SETTLED GOAL'S COMMIT STILL WHAT THE TICKET WANTS? (`outcome-audit.ts`, invariant 1)
187
+ *
188
+ * Cheapest first: the goal mirror (active, at the grant's version), a later attempt at the same
189
+ * ticket, another goal's unmerged pull request this commit is built on (delivering it alone would
190
+ * drop that work — RBB-B-214 attempt 2 on PR #3), then the server, read now (as the settle does).
191
+ * The server unreachable is a `retry`: asked again next look, never delivered on a guess.
192
+ */
193
+ async function stillWanted(opts) {
194
+ const no = (because, retry = false) => ({ wanted: false, because, retry });
195
+ // A person closed or withdrew the ticket on purpose: nothing for anyone to do, so nothing is said.
196
+ const closed = (because) => ({ wanted: false, because, retry: false, quiet: true });
197
+ const { grant } = opts;
198
+ let goals = [];
199
+ try {
200
+ goals = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(opts.stateDir, 'goals.json'), 'utf8')).goals ?? [];
201
+ }
202
+ catch {
203
+ return no('the goal mirror could not be read', true);
204
+ }
205
+ const mine = goals.find((g) => g['id'] === grant.goalId);
206
+ if (mine === undefined)
207
+ return no('this machine no longer has the goal');
208
+ if (mine['state'] === 'abandoned')
209
+ return closed('the goal was abandoned (its ticket was closed or withdrawn)');
210
+ if (mine['state'] !== 'active')
211
+ return no(`the goal is ${String(mine['state'])} now`);
212
+ if (mine['version'] !== grant.goalVersion)
213
+ return no(`the goal was changed since (version ${String(mine['version'])}; this work answered version ${grant.goalVersion})`);
214
+ const attempt = goalAttemptOf(mine['clientRef']);
215
+ const laterIn = (list) => attempt === null
216
+ ? undefined
217
+ : list.find((g) => {
218
+ const t = goalAttemptOf(g['clientRef']);
219
+ return g['id'] !== grant.goalId && t !== null && t.ticket === attempt.ticket && t.attempt > attempt.attempt;
220
+ });
221
+ const laterHere = laterIn(goals);
222
+ if (laterHere !== undefined)
223
+ return no(`a later attempt at the same ticket exists (${String(laterHere['id'])})`);
224
+ const under = await opts.openUnder(grant.goalId, opts.sha).catch(() => null);
225
+ if (under === null)
226
+ return no('could not tell whether it is built on other unmerged work', true);
227
+ if (under.length > 0) {
228
+ const named = under.map((u) => u.pullRequestUrl ?? u.goalId).join(', ');
229
+ return no(`it is built on unmerged work of ${under.map((u) => u.goalId).join(', ')} (${named}); delivered alone it would drop that work, and delivered as it is it would carry it`);
230
+ }
231
+ if (opts.goalAutonomy === undefined)
232
+ return no('the server cannot be asked from here', true);
233
+ // A later attempt made on ANOTHER machine is on the server, not in this one's mirror yet.
234
+ if (attempt !== null) {
235
+ if (opts.projectGoals === undefined)
236
+ return no('the server cannot be asked from here', true);
237
+ let all;
238
+ try {
239
+ all = (await opts.projectGoals());
240
+ }
241
+ catch (e) {
242
+ return no(`the server could not be read (${e.message})`, true);
243
+ }
244
+ const laterThere = laterIn(all);
245
+ if (laterThere !== undefined)
246
+ return no(`a later attempt at the same ticket exists (${String(laterThere['id'])})`);
247
+ }
248
+ let read;
249
+ try {
250
+ read = await opts.goalAutonomy(grant.goalId);
251
+ }
252
+ catch (e) {
253
+ return no(`the server could not be read (${e.message})`, true);
254
+ }
255
+ if (read.goal === null)
256
+ return no('the server has no such goal any more');
257
+ if (read.goal.state === 'abandoned')
258
+ return closed('the server says the goal was abandoned (its ticket was closed or withdrawn)');
259
+ if (read.goal.state !== 'active')
260
+ return no(`the server says the goal is ${read.goal.state}`);
261
+ if (read.goal.version !== grant.goalVersion)
262
+ return no(`the server has the goal at version ${read.goal.version}; this work answered version ${grant.goalVersion}`);
263
+ const row = read.autonomy.find((a) => a.controllerId === grant.controllerId);
264
+ if (row === undefined)
265
+ return no('the server has no record of this grant');
266
+ if (row.state !== grant.state)
267
+ return no(`the server has this pursuit as ${row.state}, not ${grant.state}`);
268
+ return { wanted: true };
269
+ }
270
+ /**
271
+ * MAY THE WATCHDOG DELIVER THIS AGAIN? With this machine's newest grant for the goal: the outcome auditor's check
272
+ * (`stillWanted`; the stacking was decided by the first delivery). With none here (a hand-run `looply deliver`): wanted
273
+ * unless the server says the goal is abandoned (quiet) or gone.
274
+ */
275
+ async function deliveryRetryWanted(opts) {
276
+ const grant = [...opts.grants].reverse().find((g) => g.goalId === opts.goalId);
277
+ if (grant === undefined) {
278
+ if (opts.goalAutonomy === undefined)
279
+ return { wanted: true };
280
+ let read;
281
+ try {
282
+ read = await opts.goalAutonomy(opts.goalId);
283
+ }
284
+ catch (e) {
285
+ return { wanted: false, because: `the server could not be read (${e.message})`, retry: true };
286
+ }
287
+ if (read.goal === null)
288
+ return { wanted: false, because: 'the server has no such goal any more', retry: false };
289
+ if (read.goal.state === 'abandoned')
290
+ return { wanted: false, because: 'the server says the goal was abandoned (its ticket was closed or withdrawn)', retry: false, quiet: true };
291
+ return { wanted: true };
292
+ }
293
+ return stillWanted({
294
+ stateDir: opts.stateDir,
295
+ grant,
296
+ sha: opts.sha,
297
+ openUnder: async () => [],
298
+ ...(opts.goalAutonomy ? { goalAutonomy: opts.goalAutonomy } : {}),
299
+ ...(opts.projectGoals ? { projectGoals: opts.projectGoals } : {}),
300
+ });
301
+ }
50
302
  /** The daemon's watchdog, from the pieces it already has. */
51
303
  function makeDaemonWatchdog(opts) {
52
304
  const stateDir = (0, git_driver_1.projectStateDir)(opts.cwd);
53
305
  const now = opts.now ?? Date.now;
54
306
  const version = (0, grant_waiting_wiring_1.packageVersion)();
55
307
  const provider = opts.provider ?? 'claude';
56
- // Every model role a run calls: the prover too (it runs a model), and the brain when the project has it on.
57
- const roles = opts.brain === true ? ['implementer', 'verifier', 'prover', 'brain'] : ['implementer', 'verifier', 'prover'];
308
+ // Every model role a run calls — the planner's `brain` always, whether or not the project's brain is on.
309
+ const roles = exports.RUN_ACCOUNT_ROLES;
310
+ // The outcome auditor's reads: the marks are written by run processes, so they are read again each look.
311
+ const startMarks = new run_start_marks_1.RunStartMarks(stateDir, ledger_store_1.nodeLedgerFs);
312
+ const refusalMarks = new run_refusal_marks_1.RunRefusalMarks(stateDir, ledger_store_1.nodeLedgerFs);
313
+ const ledgers = new Map();
314
+ let marksAt = -Infinity;
315
+ const marks = async () => {
316
+ if (now() - marksAt < 60_000)
317
+ return;
318
+ await startMarks.load();
319
+ await refusalMarks.load();
320
+ marksAt = now();
321
+ };
58
322
  const deps = {
59
323
  stateDir,
60
324
  now,
@@ -63,7 +327,15 @@ function makeDaemonWatchdog(opts) {
63
327
  waits: opts.waits,
64
328
  holdRecords: {
65
329
  read: (controllerId) => (0, environment_hold_1.readEnvironmentHold)(stateDir, controllerId),
66
- stands: (record) => (0, environment_hold_1.decideEnvironmentHold)(record, { at: now(), looplyVersion: version, configDigest: (0, environment_hold_1.configDigest)(opts.cwd) }).held,
330
+ // The same answer the tick gets: a usage limit waits on every role's standing.
331
+ stands: (record, goalId) => (0, environment_hold_1.decideEnvironmentHold)(record, {
332
+ at: now(),
333
+ looplyVersion: version,
334
+ configDigest: (0, environment_hold_1.configDigest)(opts.cwd),
335
+ ...(record.code === 'provider_limit' && record.released === undefined
336
+ ? { accounts: roles.map((role) => goalAccounts(stateDir, opts.projectId, goalId, now(), { role, provider })) }
337
+ : {}),
338
+ }).held,
67
339
  release: (controllerId) => (0, environment_hold_1.releaseEnvironmentHold)(stateDir, controllerId, now()),
68
340
  },
69
341
  accounts: (goalId) => goalAccounts(stateDir, opts.projectId, goalId, now(), { provider }),
@@ -98,10 +370,36 @@ function makeDaemonWatchdog(opts) {
98
370
  deliveries: {
99
371
  all: () => (0, branch_delivery_1.fileDeliveryStore)(stateDir).all(),
100
372
  retry: (goalId) => opts.deliverer.retry(goalId),
373
+ // The same check the outcome auditor makes before a delivery; the stacking was decided by the first delivery.
374
+ wanted: (goalId, sha) => deliveryRetryWanted({
375
+ stateDir,
376
+ grants: opts.grants.all(),
377
+ goalId,
378
+ sha,
379
+ ...(opts.goalAutonomy ? { goalAutonomy: opts.goalAutonomy } : {}),
380
+ ...(opts.projectGoals ? { projectGoals: opts.projectGoals } : {}),
381
+ }),
101
382
  },
102
383
  herokuLogins: () => opts.deliverer.herokuLogins(),
103
384
  tellHold: (goalId, hold) => opts.grantWaiting().say(goalId, hold),
104
385
  untellHold: (goalId, code) => opts.grantWaiting().unsay(goalId, code),
386
+ audit: {
387
+ grants: () => opts.grants.all(),
388
+ settled: async (grant) => {
389
+ await marks();
390
+ const mark = (0, pursuit_delivery_1.settledMark)((id) => refusalMarks.find(id), grant.controllerId, grant.maxStarts);
391
+ return mark?.delivery === undefined ? null : { delivery: mark.delivery, at: mark.at };
392
+ },
393
+ mode: () => opts.deliverer.mode(),
394
+ deliveries: () => (0, branch_delivery_1.fileDeliveryStore)(stateDir).all(),
395
+ landed: (sha) => opts.deliverer.landed(sha),
396
+ stillWanted: (grant, sha) => stillWanted({ stateDir, grant, sha, openUnder: opts.deliverer.openUnder, ...(opts.goalAutonomy ? { goalAutonomy: opts.goalAutonomy } : {}), ...(opts.projectGoals ? { projectGoals: opts.projectGoals } : {}) }),
397
+ backfill: (goalId, delivery, split) => opts.deliverer.backfill(goalId, delivery, split),
398
+ starts: async (grant) => {
399
+ await marks();
400
+ return readStartFacts({ cwd: opts.cwd, stateDir, grant, starts: startMarks, refusals: refusalMarks, ledgers });
401
+ },
402
+ },
105
403
  };
106
404
  return (0, watchdog_1.makeWatchdog)(deps);
107
405
  }
@@ -1 +1 @@
1
- {"version":3,"file":"watchdog-wiring.js","sourceRoot":"","sources":["../src/watchdog-wiring.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"watchdog-wiring.js","sourceRoot":"","sources":["../src/watchdog-wiring.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ import { type DeliveryEntry } from './branch-delivery';
4
4
  import type { HerokuLoginFact } from './branch-delivery-wiring';
5
5
  import type { SetAside } from './checkout-leftovers';
6
6
  import type { EnvironmentHoldRecord } from './environment-hold';
7
+ import { type OutcomeAuditDeps } from './outcome-audit';
7
8
  /**
8
9
  * LOOPLY NOTICES AND REPAIRS ITS OWN STUCK STATES.
9
10
  *
@@ -30,7 +31,9 @@ import type { EnvironmentHoldRecord } from './environment-hold';
30
31
  * (`stall.ts`: the hold's or the delivery's diagnosis, which AutoRyn puts on the ticket when it
31
32
  * is due) — and only a wait nobody told the ticket about is told here;
32
33
  * 4. records what it did in `.looply/state/watchdog.json`, which the feature report carries to
33
- * AutoRyn (core `watchdog.ts`).
34
+ * AutoRyn (core `watchdog.ts`);
35
+ * 5. checks that what Looply REPORTED actually happened (`outcome-audit.ts`): a settled goal was
36
+ * delivered, Starts do work, a budget went on the goal, deliveries move.
34
37
  *
35
38
  * ⚠️ NEVER DESTRUCTIVE TO A PERSON'S WORK. Nothing here touches the project's own folder or a
36
39
  * checkout a person made (`machineMadeCheckout`); a Looply checkout's changes are SAVED (a patch and
@@ -60,8 +63,8 @@ export interface WatchdogDeps {
60
63
  }>;
61
64
  readonly holdRecords: {
62
65
  read(controllerId: string): EnvironmentHoldRecord | null;
63
- /** Does it hold now (`decideEnvironmentHold` with this Looply and this config)? */
64
- stands(record: EnvironmentHoldRecord): boolean;
66
+ /** Does it hold now (`decideEnvironmentHold` with this Looply, this config and — for a usage limit — this goal's accounts)? */
67
+ stands(record: EnvironmentHoldRecord, goalId: string): boolean;
65
68
  release(controllerId: string): boolean;
66
69
  };
67
70
  /** The accounts a goal may use now, for its implementer (`account-standing.ts`); null when unknown. */
@@ -91,12 +94,26 @@ export interface WatchdogDeps {
91
94
  readonly deliveries?: {
92
95
  all(): readonly DeliveryEntry[];
93
96
  retry(goalId: string): Promise<BranchDeliveryReport | null>;
97
+ /**
98
+ * Is delivering it again still wanted (the outcome auditor's check: the goal active at its version, no later attempt,
99
+ * the server agreeing, read now)? `retry`: cannot tell now; `quiet`: a person ended it on purpose. Absent: not asked.
100
+ */
101
+ wanted?(goalId: string, sha: string): Promise<{
102
+ wanted: true;
103
+ } | {
104
+ wanted: false;
105
+ because: string;
106
+ retry: boolean;
107
+ quiet?: boolean;
108
+ }>;
94
109
  };
95
110
  herokuLogins?(): Promise<readonly HerokuLoginFact[]>;
96
111
  /** Tell the server a wait, as a hold (`grant-waiting-wiring.ts`'s `say`). */
97
112
  tellHold?(goalId: string, hold: GoalHold): void;
98
113
  /** Clear the hold the server shows for a goal, ONLY when it is still one of this code (`unsay`). */
99
114
  untellHold?(goalId: string, code: GoalHold['code']): void;
115
+ /** The outcome auditor's reads and its one repair (`outcome-audit.ts`). */
116
+ readonly audit?: OutcomeAuditDeps;
100
117
  }
101
118
  /** The last look, as AutoRyn is shown it; null before the first. */
102
119
  export declare function readWatchdogReport(stateDir: string): WatchdogReport | null;
@@ -1 +1 @@
1
- {"version":3,"file":"watchdog.d.ts","sourceRoot":"","sources":["../src/watchdog.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"watchdog.d.ts","sourceRoot":"","sources":["../src/watchdog.ts"],"names":[],"mappings":"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"}
package/dist/watchdog.js CHANGED
@@ -9,6 +9,7 @@ const node_fs_1 = require("node:fs");
9
9
  const node_path_1 = require("node:path");
10
10
  const core_1 = require("@looply/core");
11
11
  const branch_delivery_1 = require("./branch-delivery");
12
+ const outcome_audit_1 = require("./outcome-audit");
12
13
  /**
13
14
  * LOOPLY NOTICES AND REPAIRS ITS OWN STUCK STATES.
14
15
  *
@@ -35,7 +36,9 @@ const branch_delivery_1 = require("./branch-delivery");
35
36
  * (`stall.ts`: the hold's or the delivery's diagnosis, which AutoRyn puts on the ticket when it
36
37
  * is due) — and only a wait nobody told the ticket about is told here;
37
38
  * 4. records what it did in `.looply/state/watchdog.json`, which the feature report carries to
38
- * AutoRyn (core `watchdog.ts`).
39
+ * AutoRyn (core `watchdog.ts`);
40
+ * 5. checks that what Looply REPORTED actually happened (`outcome-audit.ts`): a settled goal was
41
+ * delivered, Starts do work, a budget went on the goal, deliveries move.
39
42
  *
40
43
  * ⚠️ NEVER DESTRUCTIVE TO A PERSON'S WORK. Nothing here touches the project's own folder or a
41
44
  * checkout a person made (`machineMadeCheckout`); a Looply checkout's changes are SAVED (a patch and
@@ -65,7 +68,7 @@ const PROVIDER_WAIT = /^the AI provider is not ready on this machine\b/;
65
68
  /** A delivery that no pass advances, and that delivering again can move. */
66
69
  const PUSH_FAILED = /\bgit push to origin failed\b/;
67
70
  const NO_PULL_REQUEST = /\bno pull request could be opened\b/;
68
- const empty = () => ({ version: 1, report: null, dirty: {}, said: [], retried: {}, logins: {}, failed: {}, waits: {}, told: [] });
71
+ const empty = () => ({ version: 1, report: null, dirty: {}, said: [], retried: {}, logins: {}, failed: {}, waits: {}, told: [], audit: (0, outcome_audit_1.emptyAuditState)() });
69
72
  function readState(stateDir) {
70
73
  try {
71
74
  const raw = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(stateDir, exports.WATCHDOG_FILE), 'utf8'));
@@ -82,6 +85,7 @@ function readState(stateDir) {
82
85
  failed: obj(raw.failed),
83
86
  waits: obj(raw.waits),
84
87
  told: Array.isArray(raw.told) ? raw.told.filter((s) => typeof s === 'string') : [],
88
+ audit: (0, outcome_audit_1.readAuditState)(raw.audit),
85
89
  };
86
90
  }
87
91
  catch {
@@ -249,7 +253,7 @@ async function watchdogPass(deps) {
249
253
  if (g.state !== 'authorized')
250
254
  continue;
251
255
  const record = safely(() => deps.holdRecords.read(g.controllerId), null);
252
- if (record === null || !safely(() => deps.holdRecords.stands(record), false))
256
+ if (record === null || !safely(() => deps.holdRecords.stands(record, g.goalId), false))
253
257
  continue;
254
258
  held.add(g.goalId);
255
259
  const since = record.firstSince ?? record.since;
@@ -325,7 +329,14 @@ async function watchdogPass(deps) {
325
329
  const r = prior !== undefined && prior.sha === e.sha ? prior : { sha: e.sha, count: 0, last: '' };
326
330
  retried[e.goalId] = r;
327
331
  const due = r.count < exports.DELIVERY_RETRIES_MAX && (r.last === '' || now - Date.parse(r.last) >= exports.DELIVERY_RETRY_MS) && now - Date.parse(e.updatedAt) >= exports.DELIVERY_RETRY_MS;
328
- if (due) {
332
+ // 🔴 Still wanted? A ticket closed since (its goal abandoned) is never pushed or opened again.
333
+ const want = due && deps.deliveries.wanted !== undefined
334
+ ? await deps.deliveries.wanted(e.goalId, e.sha).catch((err) => ({ wanted: false, because: err.message, retry: true, quiet: false }))
335
+ : { wanted: true };
336
+ if (!want.wanted && !want.retry && want.quiet !== true && once(`delivery-unwanted|${e.goalId}|${e.sha}`)) {
337
+ act({ area: 'delivery', outcome: 'alerted', goalId: e.goalId, code: e.state, said: `not delivered again: ${want.because.slice(0, 200)}`, todo: 'a person decides: deliver it by hand, or close the ticket' });
338
+ }
339
+ if (due && want.wanted) {
329
340
  const report = await deps.deliveries.retry(e.goalId).catch((err) => {
330
341
  deps.log(`watchdog: ${e.goalId}: delivering again failed — ${err.message}`);
331
342
  return null;
@@ -386,6 +397,15 @@ async function watchdogPass(deps) {
386
397
  }
387
398
  }
388
399
  }
400
+ // ── 6. what Looply reported, against what happened ──
401
+ if (deps.audit !== undefined) {
402
+ try {
403
+ state.audit = await (0, outcome_audit_1.auditOutcomes)(deps.audit, { now, at, once, act, log: deps.log }, state.audit);
404
+ }
405
+ catch (e) {
406
+ deps.log(`watchdog: the outcome check failed — ${e.message}`);
407
+ }
408
+ }
389
409
  const report = {
390
410
  at,
391
411
  waiting: waiting.sort((a, b) => Date.parse(a.since) - Date.parse(b.since)).slice(0, core_1.WATCHDOG_WAITING_MAX),