vouchington-tooling 2.0.1 → 2.0.2
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/dist/host-lock/with-host-lock.test-helpers.d.mts +10 -0
- package/dist/host-lock/with-host-lock.test-helpers.mjs +27 -1
- package/dist/sql-ast/no-mistakes-peer.d.mts +29 -0
- package/package.json +3 -3
- package/scripts/__pycache__/run_bounded_process.cpython-314.pyc +0 -0
- package/skills/manifest.json +22 -22
- package/skills/triage-loop/SKILL.md +11 -7
- package/skills/triage-loop/references/shepherd.md +7 -5
- package/skills/triage-prs/SKILL.md +2 -1
- package/skills/triage-sweep/SKILL.md +18 -7
|
@@ -19,3 +19,13 @@ export declare function withFinalTimeoutProbe(home: string, assertProbe: ({ lock
|
|
|
19
19
|
stderr: string;
|
|
20
20
|
}>;
|
|
21
21
|
}) => Promise<void>): Promise<void>;
|
|
22
|
+
type Completion = {
|
|
23
|
+
code: number | null;
|
|
24
|
+
stderr: string;
|
|
25
|
+
};
|
|
26
|
+
export declare function assertWithLockDiagnostics({ lockRoot, lockName, guard }: {
|
|
27
|
+
lockRoot: string;
|
|
28
|
+
lockName: string;
|
|
29
|
+
guard: string;
|
|
30
|
+
}, results: Completion[], assertion: () => void): Promise<void>;
|
|
31
|
+
export {};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { execFile, spawn } from 'node:child_process';
|
|
2
|
-
import { mkdtemp, mkdir, rm, stat, writeFile } from 'node:fs/promises';
|
|
2
|
+
import { mkdtemp, mkdir, readdir, rm, stat, writeFile } from 'node:fs/promises';
|
|
3
3
|
import { tmpdir } from 'node:os';
|
|
4
4
|
import { join } from 'node:path';
|
|
5
5
|
import { promisify } from 'node:util';
|
|
@@ -122,3 +122,29 @@ exec "$HOST_LOCK_REAL_SLEEP" "$@"
|
|
|
122
122
|
await Promise.all([ownerDone, ...(contenderDone ? [contenderDone] : [])]);
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
|
+
async function describePath(path) {
|
|
126
|
+
try {
|
|
127
|
+
await stat(path);
|
|
128
|
+
}
|
|
129
|
+
catch {
|
|
130
|
+
return 'absent';
|
|
131
|
+
}
|
|
132
|
+
const entries = await readdir(path).catch(() => undefined);
|
|
133
|
+
return entries === undefined ? 'present' : `present [${entries.join(', ')}]`;
|
|
134
|
+
}
|
|
135
|
+
// On failure, rethrows with the lock dir, guard, and both wrappers' exit codes
|
|
136
|
+
// and stderr so a recurrence of an overlapping-holders flake names the cause.
|
|
137
|
+
export async function assertWithLockDiagnostics({ lockRoot, lockName, guard }, results, assertion) {
|
|
138
|
+
try {
|
|
139
|
+
assertion();
|
|
140
|
+
}
|
|
141
|
+
catch (error) {
|
|
142
|
+
const diagnostics = [
|
|
143
|
+
`lock dir ${lockRoot}/${lockName}.lock.d: ${await describePath(`${lockRoot}/${lockName}.lock.d`)}`,
|
|
144
|
+
`reap dir: ${await describePath(`${lockRoot}/${lockName}.lock.reap.d`)}`,
|
|
145
|
+
`guard ${guard}: ${await describePath(guard)}`,
|
|
146
|
+
...results.map((result, index) => `wrapper ${index + 1}: code=${result.code} stderr=${JSON.stringify(result.stderr)}`),
|
|
147
|
+
];
|
|
148
|
+
throw new Error(`${String(error)}\n${diagnostics.join('\n')}`, { cause: error });
|
|
149
|
+
}
|
|
150
|
+
}
|
|
@@ -48,6 +48,35 @@ export declare function loadPostgresParser(caller: string): Promise<{
|
|
|
48
48
|
target: string;
|
|
49
49
|
}>): Promise<import("no-mistakes").WithInvocationResult<import("no-mistakes").ReactUsagesReport>>;
|
|
50
50
|
extractExecutedPostgresSql: typeof import("no-mistakes").extractExecutedPostgresSql;
|
|
51
|
+
collectDiagnostics(operation: "dependencies", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").TraversePathsOptions>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").ImportClosureResult>>>;
|
|
52
|
+
collectDiagnostics(operation: "dependencies", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").TraverseGraphOptions>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").DependencyResult>>>;
|
|
53
|
+
collectDiagnostics(operation: "symbols", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").SymbolsSignatureImpactOptions>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").SignatureImpactResult>>>;
|
|
54
|
+
collectDiagnostics(operation: "symbols", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").SymbolsListOptions>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").SymbolsResult>>>;
|
|
55
|
+
collectDiagnostics(operation: "symbols", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").SymbolsOptions>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").SymbolsResult | import("no-mistakes").SignatureImpactResult>>>;
|
|
56
|
+
collectDiagnostics(operation: "resolveCheck", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").ResolveCheckOptions>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").ResolveCheckResult>>>;
|
|
57
|
+
collectDiagnostics(operation: "resolveCheck", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").ResolveCheckFilesOptions>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").ResolveCheckBatchResult>>>;
|
|
58
|
+
collectDiagnostics(operation: "generatePostgresCatalog", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").PostgresCatalogOptions & {
|
|
59
|
+
coverage: "ordering";
|
|
60
|
+
}>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").PostgresOrderingCatalog>>>;
|
|
61
|
+
collectDiagnostics(operation: "generatePostgresCatalog", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").PostgresCatalogOptions & {
|
|
62
|
+
coverage?: "complete";
|
|
63
|
+
}>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").PostgresCompleteCatalog>>>;
|
|
64
|
+
collectDiagnostics(operation: "generatePostgresCatalog", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").PostgresCatalogOptions>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").PostgresCatalog>>>;
|
|
65
|
+
collectDiagnostics(operation: "resolveConfig", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").ConfigResolveOptions & {
|
|
66
|
+
view: "declared";
|
|
67
|
+
}>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").DeclaredConfig>>>;
|
|
68
|
+
collectDiagnostics(operation: "resolveConfig", options?: import("no-mistakes").WithInvocationOptions<import("no-mistakes").ConfigResolveOptions & {
|
|
69
|
+
view?: "resolved";
|
|
70
|
+
}>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").ResolvedConfig>>>;
|
|
71
|
+
collectDiagnostics(operation: "resolveConfig", options: import("no-mistakes").WithInvocationOptions<import("no-mistakes").ConfigResolveOptions>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").WithInvocationResult<import("no-mistakes").ResolvedConfig | import("no-mistakes").DeclaredConfig>>>;
|
|
72
|
+
collectDiagnostics(operation: "parsePostgresSql", source: import("no-mistakes").PostgresSqlSource): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").PostgresSqlFacts>>;
|
|
73
|
+
collectDiagnostics(operation: "parsePostgresSql", sources: import("no-mistakes").PostgresSqlSource[]): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").PostgresSqlFacts[]>>;
|
|
74
|
+
collectDiagnostics(operation: "extractExecutedPostgresSql", options: import("no-mistakes").ExecutedPostgresSqlOptions<true> & {
|
|
75
|
+
includeDiagnostics: true;
|
|
76
|
+
}): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").ExecutedPostgresSqlReport>>;
|
|
77
|
+
collectDiagnostics(operation: "extractExecutedPostgresSql", options: import("no-mistakes").ExecutedPostgresSqlOptions): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").ExecutedPostgresSql[]>>;
|
|
78
|
+
collectDiagnostics(operation: "extractExecutedPostgresSql", options: import("no-mistakes").ExecutedPostgresSqlOptions<boolean>): Promise<import("no-mistakes").DiagnosticsResult<import("no-mistakes").ExecutedPostgresSql[] | import("no-mistakes").ExecutedPostgresSqlReport>>;
|
|
79
|
+
collectDiagnostics<K extends keyof import("no-mistakes").DiagnosticOperations>(operation: K, ...args: import("no-mistakes").DiagnosticArguments<K>): Promise<import("no-mistakes").DiagnosticsResult<Awaited<ReturnType<import("no-mistakes").DiagnosticOperations[K]>>>>;
|
|
51
80
|
diagnosticsSnapshot(options: {
|
|
52
81
|
id: string;
|
|
53
82
|
}): Promise<import("no-mistakes").DiagnosticsProgressSnapshot | null>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vouchington-tooling",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.2",
|
|
4
4
|
"description": "Vouchington CLI and extractable tooling libraries.",
|
|
5
5
|
"homepage": "https://github.com/vouchington/vouchington-tooling/tree/main/packages/vouchington-tooling#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -515,7 +515,7 @@
|
|
|
515
515
|
"devDependencies": {
|
|
516
516
|
"@ast-grep/cli": "0.51.1",
|
|
517
517
|
"@modelcontextprotocol/sdk": "1.32.2",
|
|
518
|
-
"@playwright/test": "1.
|
|
518
|
+
"@playwright/test": "1.65.0",
|
|
519
519
|
"@types/pg": "8.23.1",
|
|
520
520
|
"@types/picomatch": "^4.0.3",
|
|
521
521
|
"@types/react": "19.3.0",
|
|
@@ -525,7 +525,7 @@
|
|
|
525
525
|
"@vouchington/worker-runtime": "0.3.1",
|
|
526
526
|
"glide-mq": "^0.20.0",
|
|
527
527
|
"next": "16.4.5",
|
|
528
|
-
"no-mistakes": "0.109.
|
|
528
|
+
"no-mistakes": "0.109.26",
|
|
529
529
|
"pg": "8.23.1",
|
|
530
530
|
"react": "19.3.1",
|
|
531
531
|
"react-dom": "19.3.1",
|
|
Binary file
|
package/skills/manifest.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
{
|
|
5
5
|
"name": "agent-workflow",
|
|
6
6
|
"plugin": "vouchington-workflow",
|
|
7
|
-
"pluginVersion": "0.20.
|
|
7
|
+
"pluginVersion": "0.20.1",
|
|
8
8
|
"path": "agent-workflow/SKILL.md",
|
|
9
9
|
"prerequisites": [
|
|
10
10
|
"blackboard",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
{
|
|
25
25
|
"name": "blackboard",
|
|
26
26
|
"plugin": "vouchington-workflow",
|
|
27
|
-
"pluginVersion": "0.20.
|
|
27
|
+
"pluginVersion": "0.20.1",
|
|
28
28
|
"path": "blackboard/SKILL.md"
|
|
29
29
|
},
|
|
30
30
|
{
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
{
|
|
37
37
|
"name": "dependabot",
|
|
38
38
|
"plugin": "vouchington-workflow",
|
|
39
|
-
"pluginVersion": "0.20.
|
|
39
|
+
"pluginVersion": "0.20.1",
|
|
40
40
|
"path": "dependabot/SKILL.md",
|
|
41
41
|
"prerequisites": ["github-actions-checklist"]
|
|
42
42
|
},
|
|
@@ -50,26 +50,26 @@
|
|
|
50
50
|
{
|
|
51
51
|
"name": "git-commit-checklist",
|
|
52
52
|
"plugin": "vouchington-workflow",
|
|
53
|
-
"pluginVersion": "0.20.
|
|
53
|
+
"pluginVersion": "0.20.1",
|
|
54
54
|
"path": "git-commit-checklist/SKILL.md"
|
|
55
55
|
},
|
|
56
56
|
{
|
|
57
57
|
"name": "github-actions-authoring",
|
|
58
58
|
"plugin": "vouchington-workflow",
|
|
59
|
-
"pluginVersion": "0.20.
|
|
59
|
+
"pluginVersion": "0.20.1",
|
|
60
60
|
"path": "github-actions-authoring/SKILL.md",
|
|
61
61
|
"prerequisites": ["github-actions-checklist"]
|
|
62
62
|
},
|
|
63
63
|
{
|
|
64
64
|
"name": "github-actions-checklist",
|
|
65
65
|
"plugin": "vouchington-workflow",
|
|
66
|
-
"pluginVersion": "0.20.
|
|
66
|
+
"pluginVersion": "0.20.1",
|
|
67
67
|
"path": "github-actions-checklist/SKILL.md"
|
|
68
68
|
},
|
|
69
69
|
{
|
|
70
70
|
"name": "github-issue",
|
|
71
71
|
"plugin": "vouchington-workflow",
|
|
72
|
-
"pluginVersion": "0.20.
|
|
72
|
+
"pluginVersion": "0.20.1",
|
|
73
73
|
"path": "github-issue/SKILL.md"
|
|
74
74
|
},
|
|
75
75
|
{
|
|
@@ -88,26 +88,26 @@
|
|
|
88
88
|
{
|
|
89
89
|
"name": "npm-publishing",
|
|
90
90
|
"plugin": "vouchington-workflow",
|
|
91
|
-
"pluginVersion": "0.20.
|
|
91
|
+
"pluginVersion": "0.20.1",
|
|
92
92
|
"path": "npm-publishing/SKILL.md"
|
|
93
93
|
},
|
|
94
94
|
{
|
|
95
95
|
"name": "organize-github-issues",
|
|
96
96
|
"plugin": "vouchington-workflow",
|
|
97
|
-
"pluginVersion": "0.20.
|
|
97
|
+
"pluginVersion": "0.20.1",
|
|
98
98
|
"path": "organize-github-issues/SKILL.md",
|
|
99
99
|
"prerequisites": ["github-issue"]
|
|
100
100
|
},
|
|
101
101
|
{
|
|
102
102
|
"name": "package-json-checklist",
|
|
103
103
|
"plugin": "vouchington-workflow",
|
|
104
|
-
"pluginVersion": "0.20.
|
|
104
|
+
"pluginVersion": "0.20.1",
|
|
105
105
|
"path": "package-json-checklist/SKILL.md"
|
|
106
106
|
},
|
|
107
107
|
{
|
|
108
108
|
"name": "planning",
|
|
109
109
|
"plugin": "vouchington-workflow",
|
|
110
|
-
"pluginVersion": "0.20.
|
|
110
|
+
"pluginVersion": "0.20.1",
|
|
111
111
|
"path": "planning/SKILL.md",
|
|
112
112
|
"prerequisites": ["github-issue"]
|
|
113
113
|
},
|
|
@@ -139,53 +139,53 @@
|
|
|
139
139
|
{
|
|
140
140
|
"name": "pr-description",
|
|
141
141
|
"plugin": "vouchington-workflow",
|
|
142
|
-
"pluginVersion": "0.20.
|
|
142
|
+
"pluginVersion": "0.20.1",
|
|
143
143
|
"path": "pr-description/SKILL.md"
|
|
144
144
|
},
|
|
145
145
|
{
|
|
146
146
|
"name": "retrospective",
|
|
147
147
|
"plugin": "vouchington-workflow",
|
|
148
|
-
"pluginVersion": "0.20.
|
|
148
|
+
"pluginVersion": "0.20.1",
|
|
149
149
|
"path": "retrospective/SKILL.md"
|
|
150
150
|
},
|
|
151
151
|
{
|
|
152
152
|
"name": "retrospective-distill",
|
|
153
153
|
"plugin": "vouchington-workflow",
|
|
154
|
-
"pluginVersion": "0.20.
|
|
154
|
+
"pluginVersion": "0.20.1",
|
|
155
155
|
"path": "retrospective-distill/SKILL.md",
|
|
156
156
|
"prerequisites": ["github-issue"]
|
|
157
157
|
},
|
|
158
158
|
{
|
|
159
159
|
"name": "review-ci-logs",
|
|
160
160
|
"plugin": "vouchington-workflow",
|
|
161
|
-
"pluginVersion": "0.20.
|
|
161
|
+
"pluginVersion": "0.20.1",
|
|
162
162
|
"path": "review-ci-logs/SKILL.md",
|
|
163
163
|
"prerequisites": ["github-actions-checklist", "pr-description"]
|
|
164
164
|
},
|
|
165
165
|
{
|
|
166
166
|
"name": "review-github-issue-taxonomy",
|
|
167
167
|
"plugin": "vouchington-workflow",
|
|
168
|
-
"pluginVersion": "0.20.
|
|
168
|
+
"pluginVersion": "0.20.1",
|
|
169
169
|
"path": "review-github-issue-taxonomy/SKILL.md",
|
|
170
170
|
"prerequisites": ["github-issue"]
|
|
171
171
|
},
|
|
172
172
|
{
|
|
173
173
|
"name": "revisit-followups",
|
|
174
174
|
"plugin": "vouchington-workflow",
|
|
175
|
-
"pluginVersion": "0.20.
|
|
175
|
+
"pluginVersion": "0.20.1",
|
|
176
176
|
"path": "revisit-followups/SKILL.md",
|
|
177
177
|
"prerequisites": ["github-issue"]
|
|
178
178
|
},
|
|
179
179
|
{
|
|
180
180
|
"name": "stacked-prs",
|
|
181
181
|
"plugin": "vouchington-workflow",
|
|
182
|
-
"pluginVersion": "0.20.
|
|
182
|
+
"pluginVersion": "0.20.1",
|
|
183
183
|
"path": "stacked-prs/SKILL.md"
|
|
184
184
|
},
|
|
185
185
|
{
|
|
186
186
|
"name": "static-analysis-checklist",
|
|
187
187
|
"plugin": "vouchington-workflow",
|
|
188
|
-
"pluginVersion": "0.20.
|
|
188
|
+
"pluginVersion": "0.20.1",
|
|
189
189
|
"path": "static-analysis-checklist/SKILL.md",
|
|
190
190
|
"prerequisites": ["github-actions-checklist"]
|
|
191
191
|
},
|
|
@@ -212,14 +212,14 @@
|
|
|
212
212
|
{
|
|
213
213
|
"name": "triage-loop",
|
|
214
214
|
"plugin": "vouchington-workflow",
|
|
215
|
-
"pluginVersion": "0.20.
|
|
215
|
+
"pluginVersion": "0.20.1",
|
|
216
216
|
"path": "triage-loop/SKILL.md",
|
|
217
217
|
"prerequisites": ["github-issue", "stacked-prs"]
|
|
218
218
|
},
|
|
219
219
|
{
|
|
220
220
|
"name": "triage-prs",
|
|
221
221
|
"plugin": "vouchington-workflow",
|
|
222
|
-
"pluginVersion": "0.20.
|
|
222
|
+
"pluginVersion": "0.20.1",
|
|
223
223
|
"path": "triage-prs/SKILL.md",
|
|
224
224
|
"prerequisites": [
|
|
225
225
|
"pr-description",
|
|
@@ -232,7 +232,7 @@
|
|
|
232
232
|
{
|
|
233
233
|
"name": "triage-sweep",
|
|
234
234
|
"plugin": "vouchington-workflow",
|
|
235
|
-
"pluginVersion": "0.20.
|
|
235
|
+
"pluginVersion": "0.20.1",
|
|
236
236
|
"path": "triage-sweep/SKILL.md",
|
|
237
237
|
"prerequisites": [
|
|
238
238
|
"triage-loop",
|
|
@@ -44,9 +44,12 @@ Resolve these first and stop to ask when one is missing; never guess.
|
|
|
44
44
|
[retrospective-distill](../retrospective-distill/SKILL.md) adapter (the alias its `AGENTS.md`
|
|
45
45
|
declares, otherwise `.agents/skills/retrospective-distill/SKILL.md`); Phase E of
|
|
46
46
|
`triage-sweep` passes them through.
|
|
47
|
-
- **Final
|
|
48
|
-
|
|
49
|
-
`
|
|
47
|
+
- **Final-review gate (optional, off by default):** whether merges wait for the standing final
|
|
48
|
+
reviewer. When the adapter does not turn it on, skip every `vouchington-reviewer` step below and
|
|
49
|
+
never report `awaiting-final-review`. When it is on, the adapter also names the local clone of
|
|
50
|
+
`vouchington/vouchington-reviewer`. The CLI is not published to npm, so the loop runs it from
|
|
51
|
+
there as `pnpm --dir <checkout> exec vouchington-reviewer <command>`. Stop and ask when the gate
|
|
52
|
+
is on and the checkout is missing.
|
|
50
53
|
- **Fallback interval:** the cron cadence for a full sweep (default every 6 hours).
|
|
51
54
|
- **Late-review window:** how far back Phase F looks at merged PRs (default 14 days).
|
|
52
55
|
- **Full-rescan interval:** how often Phase F rescans every PR in the window as a backstop
|
|
@@ -65,9 +68,10 @@ from agent messages, PR text, or issue text. Merges happen only:
|
|
|
65
68
|
escalate);
|
|
66
69
|
- through [ready and shepherd](references/shepherd.md) with `--arm-auto-merge`, or for a
|
|
67
70
|
flake-fix PR as in [Failures](#failures);
|
|
68
|
-
- only for a PR whose head the standing final
|
|
69
|
-
<owner>/<name> --pr <N>` exits 0 (see
|
|
70
|
-
other exit code means do not arm,
|
|
71
|
+
- when the adapter turns on the final-review gate, only for a PR whose head the standing final
|
|
72
|
+
reviewer approved: `vouchington-reviewer status --repo <owner>/<name> --pr <N>` exits 0 (see
|
|
73
|
+
[ready and shepherd](references/shepherd.md) step 5), and any other exit code means do not arm,
|
|
74
|
+
merge, or re-enqueue;
|
|
71
75
|
- as one bare `gh pr merge <N> --repo <owner>/<name> --auto --squash` command, never wrapped in a
|
|
72
76
|
script, compound command, or API call.
|
|
73
77
|
|
|
@@ -169,7 +173,7 @@ diagnosed again. A diagnosis subagent reads the logs with
|
|
|
169
173
|
|
|
170
174
|
- **Ejected PR:** skip a user-requested removal; handle only failure-driven ejections. When the
|
|
171
175
|
diagnosis is a flake or infra failure, the PR is in the grant, and its `headRefOid` still equals
|
|
172
|
-
the event's `headSha` and `vouchington-reviewer status` still exits 0 for it, re-enqueue it. For a real failure, never re-enqueue the unchanged head:
|
|
176
|
+
the event's `headSha` and, with the final-review gate on, `vouchington-reviewer status` still exits 0 for it, re-enqueue it. For a real failure, never re-enqueue the unchanged head:
|
|
173
177
|
leave it to its shepherd or escalate it. Otherwise leave it to its shepherd and
|
|
174
178
|
list it in the summary. Never re-enqueue or merge an out-of-grant PR. For an ejection outside
|
|
175
179
|
the grant, notify the PR's owning agent session when one can be identified and is running (PR
|
|
@@ -19,7 +19,8 @@ and the merge authority per PR category; stop and ask when one is missing.
|
|
|
19
19
|
4. **Mark ready and label.**
|
|
20
20
|
`gh pr view <N> --repo <owner>/<name> --json isDraft --jq .isDraft` (true: `gh pr ready`), then
|
|
21
21
|
`gh pr edit <N> --repo <owner>/<name> --add-label <automation-label>`.
|
|
22
|
-
5. **Request final review and gate on it
|
|
22
|
+
5. **Request final review and gate on it (only when the adapter turns on the final-review gate;
|
|
23
|
+
otherwise skip this step).** Request a review of the current head with
|
|
23
24
|
`gh api --method POST repos/<owner>/<name>/issues/<N>/labels -f 'labels[]=final-review:requested'`
|
|
24
25
|
(or message the `final-reviewer` session with `<owner>/<name>#<N>`); adding it again requests a
|
|
25
26
|
re-review after new commits. The standing reviewer lives in `vouchington/vouchington-reviewer`.
|
|
@@ -32,7 +33,8 @@ and the merge authority per PR category; stop and ask when one is missing.
|
|
|
32
33
|
check. Nothing waits on the reviewer. This gate is procedural: GitHub enforces it only through a
|
|
33
34
|
required status check, or branch protection that dismisses stale approvals, which the consuming
|
|
34
35
|
repository's adapter owns.
|
|
35
|
-
6. **Arm auto-merge (only with `--arm-auto-merge`, and
|
|
36
|
+
6. **Arm auto-merge (only with `--arm-auto-merge`, and, with the final-review gate on, only when
|
|
37
|
+
step 5 exited 0).** Pass the flag
|
|
36
38
|
only for a category the grant covers. Check once per repository per run that
|
|
37
39
|
`gh api repos/<owner>/<name> --jq .allow_auto_merge` is true; when `false`, report `manual merge required` and continue. When the
|
|
38
40
|
REST pull object has a `stack` field, auto-merge is unavailable: report `stacked; needs explicit
|
|
@@ -52,9 +54,9 @@ and the merge authority per PR category; stop and ask when one is missing.
|
|
|
52
54
|
waits on the worker; on ESCALATE it reports back and the loop escalates. Remove the entry when
|
|
53
55
|
the worker stops. Before any push to an armed PR, the worker or loop runs
|
|
54
56
|
`gh pr merge <N> --repo <owner>/<name> --disable-auto` and confirms `autoMergeRequest` is now
|
|
55
|
-
null; if disarming fails, it does not push and reports instead.
|
|
56
|
-
final review (the label again, as in step 5)
|
|
57
|
-
`vouchington-reviewer status` exits 0 for the new head.
|
|
57
|
+
null; if disarming fails, it does not push and reports instead. With the final-review gate on,
|
|
58
|
+
after the push it requests a new final review (the label again, as in step 5), and a later sweep
|
|
59
|
+
re-arms only when `vouchington-reviewer status` exits 0 for the new head.
|
|
58
60
|
8. **Verify and report.** `gh pr view <N> --repo <owner>/<name> --json
|
|
59
61
|
isDraft,autoMergeRequest,state`. Report per PR: ready, steered, auto-merge (armed, no,
|
|
60
62
|
manual-verification-required, awaiting-final-review, unavailable), shepherd (local or no), and the reason for any `no`.
|
|
@@ -130,7 +130,8 @@ Classify the outcome:
|
|
|
130
130
|
|
|
131
131
|
- **Unsteered and arming succeeds:** already armed. Auto-merge may complete once requirements pass
|
|
132
132
|
while the local shepherd independently checks the PR.
|
|
133
|
-
- **Final review not yet approved (`vouchington-reviewer status` exits
|
|
133
|
+
- **Final-review gate on and review not yet approved (`vouchington-reviewer status` exits
|
|
134
|
+
non-zero):** the review was
|
|
134
135
|
requested; leave the PR ready and unarmed, report `awaiting-final-review`, and never merge it.
|
|
135
136
|
- **Steered, or arming fails on a conflict:** leave the PR ready and unarmed after the shepherd
|
|
136
137
|
starts. A human inspects the eventual state and decides whether to arm auto-merge.
|
|
@@ -52,13 +52,13 @@ auto-merge workflow) while its checks pass or are pending. Arming it again or di
|
|
|
52
52
|
shepherd would race the merge that is already landing.
|
|
53
53
|
|
|
54
54
|
Steered handoffs stay unarmed (see [ready and shepherd](../triage-loop/references/shepherd.md) step 6)
|
|
55
|
-
and are reported as `shepherding, manual-verification-required`;
|
|
56
|
-
stays unarmed too. A later sweep arms one only when:
|
|
55
|
+
and are reported as `shepherding, manual-verification-required`; with the final-review gate on, a
|
|
56
|
+
PR still `awaiting-final-review` stays unarmed too. A later sweep arms one only when:
|
|
57
57
|
|
|
58
58
|
- its shepherd is no longer in flight;
|
|
59
59
|
- its current head passes every required check;
|
|
60
60
|
- a fresh review of that head still fits the same category;
|
|
61
|
-
- `vouchington-reviewer status` exits 0 for that head, including after the push that followed a disarm (see
|
|
61
|
+
- with the final-review gate on, `vouchington-reviewer status` exits 0 for that head, including after the push that followed a disarm (see
|
|
62
62
|
[ready and shepherd](../triage-loop/references/shepherd.md) step 5).
|
|
63
63
|
|
|
64
64
|
Arming then uses one bare `gh pr merge` command, as in the grant.
|
|
@@ -78,10 +78,21 @@ Arming then uses one bare `gh pr merge` command, as in the grant.
|
|
|
78
78
|
when no migration or a small one is needed and the affected call sites are exercised by CI
|
|
79
79
|
tests. Escalate a significant migration, or affected code without sufficient test coverage, with
|
|
80
80
|
the evidence.
|
|
81
|
-
- **
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
81
|
+
- **Dependency-bot PRs merged this sweep, or none open in a repository:** request a fresh update
|
|
82
|
+
check for that repository and ecosystem. Merges free slots, so the bot may open new PRs. Do not
|
|
83
|
+
raise the bot's open-PR limit for this. GitHub exposes no REST endpoint, so use the host browser
|
|
84
|
+
with as few actions as possible and no clicks:
|
|
85
|
+
1. Use one signed-in tab on the GitHub origin. Run ONE in-page script with the host's JavaScript
|
|
86
|
+
tool, covering every target repository.
|
|
87
|
+
2. For each repository, fetch `/<owner>/<name>/network/updates` and collect each
|
|
88
|
+
`network/updates/<id>/jobs` config.
|
|
89
|
+
3. Skip a config whose newest job is already running or queued.
|
|
90
|
+
4. POST each remaining config's "Check for updates" form (same origin, using that form's own
|
|
91
|
+
CSRF token).
|
|
92
|
+
5. Re-fetch and report one line per config with the newest job status. Expect "Running now".
|
|
93
|
+
6. Fall back to clicking only for a config with no form or a status that did not change.
|
|
94
|
+
If no browser or JavaScript tool is available, list the repository in the summary. The
|
|
95
|
+
consumer adapter supplies a ready script.
|
|
85
96
|
|
|
86
97
|
## Phase B - Automation PRs
|
|
87
98
|
|