@farmslot/agent-runtime 0.21.3 → 0.22.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 +4 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/task-init/branch-update.d.ts +50 -0
- package/dist/task-init/branch-update.d.ts.map +1 -0
- package/dist/task-init/branch-update.js +728 -0
- package/dist/task-init/branch-update.js.map +1 -0
- package/dist/task-init/index.d.ts +1 -0
- package/dist/task-init/index.d.ts.map +1 -1
- package/dist/task-init/index.js +5 -2
- package/dist/task-init/index.js.map +1 -1
- package/dist/task-init/task-document.d.ts +3 -1
- package/dist/task-init/task-document.d.ts.map +1 -1
- package/dist/task-init/task-document.js +44 -4
- package/dist/task-init/task-document.js.map +1 -1
- package/package.json +7 -5
- package/scripts/branch-update.mjs +35 -0
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,10 @@
|
|
|
4
4
|
|
|
5
5
|
- Active-development baseline; add user-facing changes here before release or package publication.
|
|
6
6
|
|
|
7
|
+
## 0.22.0 - 2026-10-15
|
|
8
|
+
|
|
9
|
+
- Verify and execute provenance-bound branch maintenance with one shared guard and exact push leases.
|
|
10
|
+
|
|
7
11
|
## 0.21.3 - 2026-10-14
|
|
8
12
|
|
|
9
13
|
- Prepare native workspace decisions in the selected account home before farm reviews. Refuse Grok reviews with account hooks or unverifiable hook safety. Suppress repository startup automation, preserve Git-readable content and enforce source write restrictions.
|
package/dist/index.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export declare const AGENT_RUNTIME_SCRIPT_EXPORTS: {
|
|
|
4
4
|
readonly workerTerminalContract: "@farmslot/agent-runtime/scripts/worker-terminal-contract.cjs";
|
|
5
5
|
readonly checkTaskArtifactContract: "@farmslot/agent-runtime/scripts/check-task-artifact-contract.mjs";
|
|
6
6
|
readonly taskInitCli: "@farmslot/agent-runtime/scripts/task-init-cli.mjs";
|
|
7
|
+
readonly branchUpdate: "@farmslot/agent-runtime/scripts/branch-update.mjs";
|
|
7
8
|
readonly acceptanceCli: "@farmslot/agent-runtime/scripts/acceptance-cli.cjs";
|
|
8
9
|
};
|
|
9
10
|
export * from './execution-template/index.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAE/D,eAAO,MAAM,4BAA4B
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAE/D,eAAO,MAAM,4BAA4B;;;;;;;CAO/B,CAAC;AAEX,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -4,6 +4,7 @@ export const AGENT_RUNTIME_SCRIPT_EXPORTS = {
|
|
|
4
4
|
workerTerminalContract: '@farmslot/agent-runtime/scripts/worker-terminal-contract.cjs',
|
|
5
5
|
checkTaskArtifactContract: '@farmslot/agent-runtime/scripts/check-task-artifact-contract.mjs',
|
|
6
6
|
taskInitCli: '@farmslot/agent-runtime/scripts/task-init-cli.mjs',
|
|
7
|
+
branchUpdate: '@farmslot/agent-runtime/scripts/branch-update.mjs',
|
|
7
8
|
acceptanceCli: '@farmslot/agent-runtime/scripts/acceptance-cli.cjs',
|
|
8
9
|
};
|
|
9
10
|
export * from './execution-template/index.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC;AAE/D,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,iBAAiB,EAAE,yDAAyD;IAC5E,sBAAsB,EAAE,8DAA8D;IACtF,yBAAyB,EAAE,kEAAkE;IAC7F,WAAW,EAAE,mDAAmD;IAChE,aAAa,EAAE,oDAAoD;CAC3D,CAAC;AAEX,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC;AAE/D,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,iBAAiB,EAAE,yDAAyD;IAC5E,sBAAsB,EAAE,8DAA8D;IACtF,yBAAyB,EAAE,kEAAkE;IAC7F,WAAW,EAAE,mDAAmD;IAChE,YAAY,EAAE,mDAAmD;IACjE,aAAa,EAAE,oDAAoD;CAC3D,CAAC;AAEX,cAAc,+BAA+B,CAAC;AAC9C,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import type { BranchMaintenanceOperation } from '@farmslot/protocol';
|
|
2
|
+
export interface BranchMaintenanceRequest {
|
|
3
|
+
id: string;
|
|
4
|
+
ownerRunId: string;
|
|
5
|
+
project: string;
|
|
6
|
+
repo: string;
|
|
7
|
+
branch: string;
|
|
8
|
+
baseRef: string;
|
|
9
|
+
kind: BranchMaintenanceOperation['kind'];
|
|
10
|
+
authority: {
|
|
11
|
+
headSha: string;
|
|
12
|
+
comparisonBaseSha: string;
|
|
13
|
+
replayBoundarySha: string;
|
|
14
|
+
};
|
|
15
|
+
expectedCheckpoint?: BranchMaintenanceOperation['expectedCheckpoint'];
|
|
16
|
+
upstreamMergeSha?: string;
|
|
17
|
+
}
|
|
18
|
+
export interface OrdinaryBranchMaintenanceRequest {
|
|
19
|
+
kind: 'ordinary';
|
|
20
|
+
repo: string;
|
|
21
|
+
branch: string;
|
|
22
|
+
baseRef: string;
|
|
23
|
+
}
|
|
24
|
+
export declare class BranchMaintenanceRefusal extends Error {
|
|
25
|
+
readonly code: string;
|
|
26
|
+
constructor(code: string, cause?: unknown);
|
|
27
|
+
}
|
|
28
|
+
export declare function normalizeMaintenanceBranch(value: string): string;
|
|
29
|
+
export declare function inspectBranchMaintenance(request: BranchMaintenanceRequest): BranchMaintenanceOperation;
|
|
30
|
+
export declare function executeBranchMaintenance(operation: BranchMaintenanceOperation): string;
|
|
31
|
+
export declare function pushBranchMaintenance(operation: BranchMaintenanceOperation): void;
|
|
32
|
+
export declare function verifyBranchMaintenance(operation: BranchMaintenanceOperation): {
|
|
33
|
+
headSha: string;
|
|
34
|
+
replayBoundarySha: string;
|
|
35
|
+
};
|
|
36
|
+
export interface BranchMaintenanceValidation {
|
|
37
|
+
status: 'pending' | 'pushed' | 'stale';
|
|
38
|
+
reason?: 'TARGET_CHANGED' | 'REMOTE_CHILD_CHANGED' | 'OPERATION_RETIRED';
|
|
39
|
+
}
|
|
40
|
+
/** Inspect retained input without changing the checkout or replacing its pins. */
|
|
41
|
+
export declare function validateBranchMaintenance(operation: BranchMaintenanceOperation): BranchMaintenanceValidation;
|
|
42
|
+
export interface BranchMaintenanceRetirement {
|
|
43
|
+
status: 'retired';
|
|
44
|
+
recoveredHeadSha?: string;
|
|
45
|
+
}
|
|
46
|
+
/** Explicitly retire stale input. Preserve every source/result before local recovery. */
|
|
47
|
+
export declare function retireBranchMaintenance(operation: BranchMaintenanceOperation, recoverLocal?: boolean): BranchMaintenanceRetirement;
|
|
48
|
+
export declare function executeOrdinaryBranchMaintenance(request: OrdinaryBranchMaintenanceRequest): string;
|
|
49
|
+
export declare function pushOrdinaryBranchMaintenance(request: OrdinaryBranchMaintenanceRequest): void;
|
|
50
|
+
//# sourceMappingURL=branch-update.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"branch-update.d.ts","sourceRoot":"","sources":["../../src/task-init/branch-update.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAErE,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,0BAA0B,CAAC,MAAM,CAAC,CAAC;IACzC,SAAS,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAA;KAAE,CAAC;IACrF,kBAAkB,CAAC,EAAE,0BAA0B,CAAC,oBAAoB,CAAC,CAAC;IACtE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAsBD,qBAAa,wBAAyB,SAAQ,KAAK;aAE/B,IAAI,EAAE,MAAM;gBAAZ,IAAI,EAAE,MAAM,EAC5B,KAAK,CAAC,EAAE,OAAO;CAIlB;AAUD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhE;AAqDD,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,wBAAwB,GAChC,0BAA0B,CA6B5B;AA0ND,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,0BAA0B,GAAG,MAAM,CA2DtF;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,0BAA0B,GAAG,IAAI,CAwCjF;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,0BAA0B,GAAG;IAC9E,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CA8BA;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;IACvC,MAAM,CAAC,EAAE,gBAAgB,GAAG,sBAAsB,GAAG,mBAAmB,CAAC;CAC1E;AAED,kFAAkF;AAClF,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,0BAA0B,GACpC,2BAA2B,CAwB7B;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,SAAS,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAsCD,yFAAyF;AACzF,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,0BAA0B,EACrC,YAAY,UAAQ,GACnB,2BAA2B,CAqL7B;AAWD,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,gCAAgC,GACxC,MAAM,CA2DR;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,gCAAgC,GAAG,IAAI,CAO7F"}
|
|
@@ -0,0 +1,728 @@
|
|
|
1
|
+
import { execFileSync } from 'node:child_process';
|
|
2
|
+
import { createHash } from 'node:crypto';
|
|
3
|
+
import { closeSync, existsSync, fsyncSync, openSync, readFileSync, renameSync, writeFileSync, } from 'node:fs';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
export class BranchMaintenanceRefusal extends Error {
|
|
6
|
+
constructor(code, cause) {
|
|
7
|
+
super(`Branch maintenance refused: ${code}`, { cause });
|
|
8
|
+
this.code = code;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
function refuse(code) {
|
|
12
|
+
throw new BranchMaintenanceRefusal(code);
|
|
13
|
+
}
|
|
14
|
+
const sha = (value) => /^[a-f0-9]{40}$/i.test(value) ? value : refuse('INVALID_COMMIT');
|
|
15
|
+
const digest = (value) => createHash('sha256').update(value).digest('hex');
|
|
16
|
+
const quote = (value) => "'" + value.replaceAll("'", "'\"'\"'") + "'";
|
|
17
|
+
export function normalizeMaintenanceBranch(value) {
|
|
18
|
+
return value.replace(/^(?:refs\/remotes\/origin\/|refs\/heads\/|origin\/)/, '');
|
|
19
|
+
}
|
|
20
|
+
function git(repo, args, input, authorEnv) {
|
|
21
|
+
return execFileSync('git', args, {
|
|
22
|
+
cwd: repo,
|
|
23
|
+
...(authorEnv ? { env: { ...process.env, ...authorEnv } } : {}),
|
|
24
|
+
encoding: 'utf8',
|
|
25
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
26
|
+
input,
|
|
27
|
+
maxBuffer: 16 * 1024 * 1024,
|
|
28
|
+
}).trimEnd();
|
|
29
|
+
}
|
|
30
|
+
function ancestor(repo, left, right) {
|
|
31
|
+
try {
|
|
32
|
+
git(repo, ['merge-base', '--is-ancestor', sha(left), sha(right)]);
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
if (error.status === 1)
|
|
37
|
+
return false;
|
|
38
|
+
throw error;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
function fetchHeads(repo, branch, base) {
|
|
42
|
+
for (const value of [branch, base])
|
|
43
|
+
git(repo, ['check-ref-format', `refs/heads/${value}`]);
|
|
44
|
+
try {
|
|
45
|
+
git(repo, [
|
|
46
|
+
'fetch',
|
|
47
|
+
'origin',
|
|
48
|
+
...new Set([branch, base].map((value) => `+refs/heads/${value}:refs/remotes/origin/${value}`)),
|
|
49
|
+
]);
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
throw new BranchMaintenanceRefusal('FETCH_FAILED', error);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
function ref(repo, branch) {
|
|
56
|
+
return sha(git(repo, ['rev-parse', `refs/remotes/origin/${branch}`]).trim());
|
|
57
|
+
}
|
|
58
|
+
function assertSource(operation, source) {
|
|
59
|
+
if (!ancestor(operation.repo, operation.authorityHeadSha, source))
|
|
60
|
+
refuse('PARENT_SOURCE_CHANGED');
|
|
61
|
+
if (!ancestor(operation.repo, operation.replayBoundarySha, source))
|
|
62
|
+
refuse('PARENT_BOUNDARY_MISSING');
|
|
63
|
+
if (!ancestor(operation.repo, operation.remoteHeadSha, source))
|
|
64
|
+
refuse('REMOTE_CHILD_COMMITS_MISSING');
|
|
65
|
+
if (git(operation.repo, ['rev-list', '--merges', `${operation.authorityHeadSha}..${source}`]))
|
|
66
|
+
refuse('UNVERIFIED_MERGE');
|
|
67
|
+
}
|
|
68
|
+
export function inspectBranchMaintenance(request) {
|
|
69
|
+
const branch = normalizeMaintenanceBranch(request.branch);
|
|
70
|
+
const baseRef = normalizeMaintenanceBranch(request.baseRef);
|
|
71
|
+
fetchHeads(request.repo, branch, baseRef);
|
|
72
|
+
const remoteHeadSha = ref(request.repo, branch);
|
|
73
|
+
const targetSha = ref(request.repo, baseRef);
|
|
74
|
+
// Handoff can precede prepare, so pin the remote source without relying
|
|
75
|
+
// on the checkout currently occupying the slot. Execute verifies that checkout.
|
|
76
|
+
const sourceHeadSha = remoteHeadSha;
|
|
77
|
+
const { authority, ...input } = request;
|
|
78
|
+
const operation = {
|
|
79
|
+
...input,
|
|
80
|
+
branch,
|
|
81
|
+
baseRef,
|
|
82
|
+
sourceHeadSha,
|
|
83
|
+
remoteHeadSha,
|
|
84
|
+
targetSha,
|
|
85
|
+
comparisonBaseSha: sha(authority.comparisonBaseSha),
|
|
86
|
+
replayBoundarySha: sha(authority.replayBoundarySha),
|
|
87
|
+
authorityHeadSha: sha(authority.headSha),
|
|
88
|
+
preparedAt: new Date().toISOString(),
|
|
89
|
+
};
|
|
90
|
+
assertSource(operation, sourceHeadSha);
|
|
91
|
+
// Gateway supplies the settled immutable contribution comparison. Its tree
|
|
92
|
+
// may be synthetic and need not be an ancestor of the recorded replay boundary.
|
|
93
|
+
// Never replace that authority with a live merge-base or the replay boundary.
|
|
94
|
+
if (request.upstreamMergeSha && !ancestor(request.repo, request.upstreamMergeSha, targetSha))
|
|
95
|
+
refuse('RETARGET_PROVENANCE_MISSING');
|
|
96
|
+
return operation;
|
|
97
|
+
}
|
|
98
|
+
function operationHash(operation) {
|
|
99
|
+
return digest(JSON.stringify(operation));
|
|
100
|
+
}
|
|
101
|
+
function receiptPath(operation) {
|
|
102
|
+
return path.resolve(operation.repo, git(operation.repo, [
|
|
103
|
+
'rev-parse',
|
|
104
|
+
'--git-path',
|
|
105
|
+
`farmslot-branch-${digest(operation.id)}.json`,
|
|
106
|
+
]).trim());
|
|
107
|
+
}
|
|
108
|
+
function readReceipt(operation) {
|
|
109
|
+
const file = receiptPath(operation);
|
|
110
|
+
if (!existsSync(file))
|
|
111
|
+
return undefined;
|
|
112
|
+
const value = JSON.parse(readFileSync(file, 'utf8'));
|
|
113
|
+
if (value.operationHash !== operationHash(operation))
|
|
114
|
+
refuse('OPERATION_CHANGED');
|
|
115
|
+
assertSource(operation, sha(value.sourceHeadSha));
|
|
116
|
+
sha(value.replayHeadSha);
|
|
117
|
+
sha(value.boundarySha);
|
|
118
|
+
if (!['prepared', 'rebasing', 'completed', 'retired'].includes(value.phase))
|
|
119
|
+
refuse('RECEIPT_INVALID');
|
|
120
|
+
return value;
|
|
121
|
+
}
|
|
122
|
+
function recordReceipt(operation, value) {
|
|
123
|
+
const file = receiptPath(operation);
|
|
124
|
+
const temp = `${file}.${process.pid}.tmp`;
|
|
125
|
+
const fd = openSync(temp, 'w', 0o600);
|
|
126
|
+
try {
|
|
127
|
+
writeFileSync(fd, JSON.stringify(value));
|
|
128
|
+
fsyncSync(fd);
|
|
129
|
+
}
|
|
130
|
+
finally {
|
|
131
|
+
closeSync(fd);
|
|
132
|
+
}
|
|
133
|
+
renameSync(temp, file);
|
|
134
|
+
const directory = openSync(path.dirname(file), 'r');
|
|
135
|
+
try {
|
|
136
|
+
fsyncSync(directory);
|
|
137
|
+
}
|
|
138
|
+
finally {
|
|
139
|
+
closeSync(directory);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
function rebaseActive(repo) {
|
|
143
|
+
return ['rebase-merge', 'rebase-apply'].some((name) => existsSync(path.resolve(repo, git(repo, ['rev-parse', '--git-path', name]).trim())));
|
|
144
|
+
}
|
|
145
|
+
function fenceTarget(operation) {
|
|
146
|
+
fetchHeads(operation.repo, operation.branch, operation.baseRef);
|
|
147
|
+
if (ref(operation.repo, operation.baseRef) !== sha(operation.targetSha))
|
|
148
|
+
refuse('TARGET_CHANGED');
|
|
149
|
+
return ref(operation.repo, operation.branch);
|
|
150
|
+
}
|
|
151
|
+
function assertCheckout(operation) {
|
|
152
|
+
if (git(operation.repo, ['branch', '--show-current']).trim() !== operation.branch)
|
|
153
|
+
refuse('BRANCH_CHANGED');
|
|
154
|
+
if (git(operation.repo, ['status', '--porcelain']))
|
|
155
|
+
refuse('UNCOMMITTED_CHANGES');
|
|
156
|
+
}
|
|
157
|
+
function assertOwnedResult(operation, receipt, head) {
|
|
158
|
+
if (!ancestor(operation.repo, operation.targetSha, head))
|
|
159
|
+
refuse('RESULT_TARGET_MISSING');
|
|
160
|
+
if (git(operation.repo, ['rev-list', '--merges', `${operation.targetSha}..${head}`]))
|
|
161
|
+
refuse('UNVERIFIED_RESULT_MERGE');
|
|
162
|
+
const paths = (base, result) => git(operation.repo, ['diff', '--name-only', '-z', base, result, '--'])
|
|
163
|
+
.split('\0')
|
|
164
|
+
.filter(Boolean);
|
|
165
|
+
const owned = new Set([
|
|
166
|
+
...paths(operation.comparisonBaseSha, receipt.sourceHeadSha),
|
|
167
|
+
...(receipt.rebaseResultSha ? paths(receipt.rebaseResultSha, head) : []),
|
|
168
|
+
]);
|
|
169
|
+
if (paths(operation.targetSha, head).some((value) => !owned.has(value)))
|
|
170
|
+
refuse('INHERITED_CHANGES_REPLAYED');
|
|
171
|
+
}
|
|
172
|
+
function journalCommand(operation) {
|
|
173
|
+
// Rebase runs this after each applied commit, including `rebase --continue`.
|
|
174
|
+
// The durable result journal closes the successful-rebase/pre-renewal crash gap.
|
|
175
|
+
const code = `const f=require('node:fs'),p=require('node:path'),c=require('node:child_process');const file=process.argv[1],v=JSON.parse(f.readFileSync(file,'utf8'));if(v.operationHash!==process.argv[2]||v.phase!=='rebasing')throw Error('OPERATION_CHANGED');v.observedHeadSha=c.execFileSync('git',['rev-parse','HEAD'],{encoding:'utf8'}).trim();const tmp=file+'.'+process.pid+'.tmp',fd=f.openSync(tmp,'w',384);try{f.writeFileSync(fd,JSON.stringify(v));f.fsyncSync(fd)}finally{f.closeSync(fd)}f.renameSync(tmp,file);const d=f.openSync(p.dirname(file),'r');try{f.fsyncSync(d)}finally{f.closeSync(d)}`;
|
|
176
|
+
return `${quote(process.execPath)} -e ${quote(code)} ${quote(receiptPath(operation))} ${quote(operationHash(operation))}`;
|
|
177
|
+
}
|
|
178
|
+
function prepareReceipt(operation, head) {
|
|
179
|
+
const repo = operation.repo;
|
|
180
|
+
assertSource(operation, head);
|
|
181
|
+
let boundary = operation.replayBoundarySha;
|
|
182
|
+
let replay = head;
|
|
183
|
+
if (operation.ownerRunId !== 'ordinary' &&
|
|
184
|
+
git(repo, ['rev-list', '--merges', `${boundary}..${head}`])) {
|
|
185
|
+
// A single committed child delta preserves merge resolutions without
|
|
186
|
+
// replaying inherited squash/default commits removed by the new target.
|
|
187
|
+
boundary = operation.comparisonBaseSha;
|
|
188
|
+
const signing = git(repo, ['config', '--type=bool', '--default=false', '--get', 'commit.gpgsign']).trim() ===
|
|
189
|
+
'true';
|
|
190
|
+
replay = sha(git(repo, [
|
|
191
|
+
'commit-tree',
|
|
192
|
+
git(repo, ['rev-parse', `${head}^{tree}`]).trim(),
|
|
193
|
+
'-p',
|
|
194
|
+
boundary,
|
|
195
|
+
...(signing ? ['-S'] : []),
|
|
196
|
+
], 'fix: retain verified child changes during branch maintenance\n').trim());
|
|
197
|
+
}
|
|
198
|
+
const receipt = {
|
|
199
|
+
operationHash: operationHash(operation),
|
|
200
|
+
operation,
|
|
201
|
+
sourceHeadSha: head,
|
|
202
|
+
replayHeadSha: replay,
|
|
203
|
+
boundarySha: boundary,
|
|
204
|
+
phase: 'prepared',
|
|
205
|
+
};
|
|
206
|
+
// Persist before reset or rebase can alter the branch.
|
|
207
|
+
recordReceipt(operation, receipt);
|
|
208
|
+
return receipt;
|
|
209
|
+
}
|
|
210
|
+
function assertGraphResult(operation, head) {
|
|
211
|
+
if (!ancestor(operation.repo, operation.targetSha, head))
|
|
212
|
+
refuse('RESULT_TARGET_MISSING');
|
|
213
|
+
if (head === operation.remoteHeadSha)
|
|
214
|
+
return;
|
|
215
|
+
const parents = git(operation.repo, ['rev-list', '--parents', '-n', '1', head])
|
|
216
|
+
.split(/\s+/)
|
|
217
|
+
.slice(1);
|
|
218
|
+
if (parents.length !== 2 ||
|
|
219
|
+
parents[0] !== operation.remoteHeadSha ||
|
|
220
|
+
parents[1] !== operation.targetSha)
|
|
221
|
+
refuse('GRAPH_MERGE_CHANGED');
|
|
222
|
+
const tree = cleanMergeTree(operation.repo, operation.remoteHeadSha, operation.targetSha);
|
|
223
|
+
if (git(operation.repo, ['rev-parse', `${head}^{tree}`]).trim() !== tree)
|
|
224
|
+
refuse('GRAPH_MERGE_TREE_CHANGED');
|
|
225
|
+
}
|
|
226
|
+
function cleanMergeTree(repo, left, right, base) {
|
|
227
|
+
try {
|
|
228
|
+
return sha(git(repo, [
|
|
229
|
+
'merge-tree',
|
|
230
|
+
'--write-tree',
|
|
231
|
+
...(base ? ['--merge-base', base] : []),
|
|
232
|
+
left,
|
|
233
|
+
right,
|
|
234
|
+
]).trim());
|
|
235
|
+
}
|
|
236
|
+
catch (error) {
|
|
237
|
+
throw new BranchMaintenanceRefusal('MERGE_CONFLICT', error);
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
function executeGraphMaintenance(operation) {
|
|
241
|
+
const receipt = readReceipt(operation);
|
|
242
|
+
if (receipt?.phase === 'retired')
|
|
243
|
+
refuse('OPERATION_RETIRED');
|
|
244
|
+
const remote = fenceTarget(operation);
|
|
245
|
+
if (receipt?.resultHeadSha && receipt.phase === 'completed') {
|
|
246
|
+
if (remote !== operation.remoteHeadSha && remote !== receipt.resultHeadSha)
|
|
247
|
+
refuse('REMOTE_CHILD_CHANGED');
|
|
248
|
+
assertGraphResult(operation, receipt.resultHeadSha);
|
|
249
|
+
return receipt.resultHeadSha;
|
|
250
|
+
}
|
|
251
|
+
if (remote !== operation.remoteHeadSha)
|
|
252
|
+
refuse('REMOTE_CHILD_CHANGED');
|
|
253
|
+
assertSource(operation, remote);
|
|
254
|
+
const prepared = {
|
|
255
|
+
operationHash: operationHash(operation),
|
|
256
|
+
operation,
|
|
257
|
+
sourceHeadSha: remote,
|
|
258
|
+
replayHeadSha: remote,
|
|
259
|
+
boundarySha: operation.replayBoundarySha,
|
|
260
|
+
phase: 'prepared',
|
|
261
|
+
};
|
|
262
|
+
recordReceipt(operation, prepared);
|
|
263
|
+
let result = remote;
|
|
264
|
+
if (!ancestor(operation.repo, operation.targetSha, remote)) {
|
|
265
|
+
let tree;
|
|
266
|
+
try {
|
|
267
|
+
tree = cleanMergeTree(operation.repo, remote, operation.targetSha);
|
|
268
|
+
}
|
|
269
|
+
catch (error) {
|
|
270
|
+
throw new BranchMaintenanceRefusal('GRAPH_MERGE_CONFLICT', error);
|
|
271
|
+
}
|
|
272
|
+
try {
|
|
273
|
+
result = sha(git(operation.repo, ['commit-tree', '-S', tree, '-p', remote, '-p', operation.targetSha], 'fix: merge the pinned publication base into the stacked branch\n').trim());
|
|
274
|
+
}
|
|
275
|
+
catch (error) {
|
|
276
|
+
throw new BranchMaintenanceRefusal('GRAPH_SIGNING_REFUSED', error);
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
assertGraphResult(operation, result);
|
|
280
|
+
const prefix = `refs/farmslot/branch-maintenance/${operationHash(operation)}`;
|
|
281
|
+
git(operation.repo, ['update-ref', `${prefix}/source`, remote]);
|
|
282
|
+
git(operation.repo, ['update-ref', `${prefix}/result`, result]);
|
|
283
|
+
recordReceipt(operation, { ...prepared, phase: 'completed', resultHeadSha: result });
|
|
284
|
+
return result;
|
|
285
|
+
}
|
|
286
|
+
export function executeBranchMaintenance(operation) {
|
|
287
|
+
if (operation.kind === 'graph-merge')
|
|
288
|
+
return executeGraphMaintenance(operation);
|
|
289
|
+
const repo = operation.repo;
|
|
290
|
+
let receipt = readReceipt(operation);
|
|
291
|
+
if (receipt?.phase === 'retired')
|
|
292
|
+
refuse('OPERATION_RETIRED');
|
|
293
|
+
const remote = fenceTarget(operation);
|
|
294
|
+
if (remote !== operation.remoteHeadSha && remote !== receipt?.resultHeadSha)
|
|
295
|
+
refuse('REMOTE_CHILD_CHANGED');
|
|
296
|
+
if (rebaseActive(repo))
|
|
297
|
+
refuse('RESOLVE_REBASE_CONFLICT');
|
|
298
|
+
assertCheckout(operation);
|
|
299
|
+
let head = sha(git(repo, ['rev-parse', 'HEAD']).trim());
|
|
300
|
+
if (receipt?.phase === 'completed') {
|
|
301
|
+
if (head !== receipt.resultHeadSha)
|
|
302
|
+
refuse('LOCAL_RESULT_CHANGED');
|
|
303
|
+
assertOwnedResult(operation, receipt, head);
|
|
304
|
+
return head;
|
|
305
|
+
}
|
|
306
|
+
if (!receipt)
|
|
307
|
+
receipt = prepareReceipt(operation, head);
|
|
308
|
+
if (receipt.phase === 'rebasing' &&
|
|
309
|
+
head !== receipt.replayHeadSha &&
|
|
310
|
+
head !== receipt.sourceHeadSha) {
|
|
311
|
+
const allAlreadyPresent = head === operation.targetSha &&
|
|
312
|
+
!git(repo, ['cherry', operation.targetSha, receipt.replayHeadSha, receipt.boundarySha])
|
|
313
|
+
.split('\n')
|
|
314
|
+
.some((line) => line.startsWith('+'));
|
|
315
|
+
if (head !== receipt.observedHeadSha && !allAlreadyPresent)
|
|
316
|
+
refuse('REBASE_RESULT_UNVERIFIED');
|
|
317
|
+
}
|
|
318
|
+
else {
|
|
319
|
+
if (head !== receipt.sourceHeadSha && head !== receipt.replayHeadSha)
|
|
320
|
+
refuse('LOCAL_SOURCE_CHANGED');
|
|
321
|
+
receipt = { ...receipt, phase: 'rebasing' };
|
|
322
|
+
recordReceipt(operation, receipt);
|
|
323
|
+
if (head !== receipt.replayHeadSha)
|
|
324
|
+
git(repo, ['reset', '--soft', receipt.replayHeadSha]);
|
|
325
|
+
try {
|
|
326
|
+
git(repo, [
|
|
327
|
+
'rebase',
|
|
328
|
+
'--onto',
|
|
329
|
+
operation.targetSha,
|
|
330
|
+
receipt.boundarySha,
|
|
331
|
+
'--exec',
|
|
332
|
+
journalCommand(operation),
|
|
333
|
+
operation.branch,
|
|
334
|
+
]);
|
|
335
|
+
}
|
|
336
|
+
catch (error) {
|
|
337
|
+
if (rebaseActive(repo))
|
|
338
|
+
throw new BranchMaintenanceRefusal('RESOLVE_REBASE_CONFLICT', error);
|
|
339
|
+
throw new BranchMaintenanceRefusal('REBASE_REFUSED', error);
|
|
340
|
+
}
|
|
341
|
+
head = sha(git(repo, ['rev-parse', 'HEAD']).trim());
|
|
342
|
+
receipt = readReceipt(operation);
|
|
343
|
+
}
|
|
344
|
+
assertOwnedResult(operation, receipt, head);
|
|
345
|
+
recordReceipt(operation, {
|
|
346
|
+
...receipt,
|
|
347
|
+
phase: 'completed',
|
|
348
|
+
rebaseResultSha: head,
|
|
349
|
+
resultHeadSha: head,
|
|
350
|
+
});
|
|
351
|
+
return head;
|
|
352
|
+
}
|
|
353
|
+
export function pushBranchMaintenance(operation) {
|
|
354
|
+
let receipt = readReceipt(operation);
|
|
355
|
+
const remote = fenceTarget(operation);
|
|
356
|
+
if (!receipt?.resultHeadSha || receipt.phase !== 'completed')
|
|
357
|
+
refuse('GUARDED_RESULT_MISSING');
|
|
358
|
+
if (operation.kind === 'rebase')
|
|
359
|
+
assertCheckout(operation);
|
|
360
|
+
const head = operation.kind === 'graph-merge'
|
|
361
|
+
? receipt.resultHeadSha
|
|
362
|
+
: sha(git(operation.repo, ['rev-parse', 'HEAD']).trim());
|
|
363
|
+
if (remote !== operation.remoteHeadSha && remote !== head)
|
|
364
|
+
refuse('REMOTE_CHILD_CHANGED');
|
|
365
|
+
if (head !== receipt.resultHeadSha) {
|
|
366
|
+
if (!ancestor(operation.repo, receipt.resultHeadSha, head) ||
|
|
367
|
+
git(operation.repo, ['rev-list', '--merges', `${receipt.resultHeadSha}..${head}`]))
|
|
368
|
+
refuse('LOCAL_RESULT_CHANGED');
|
|
369
|
+
// Inline fixes may append worker-owned commits after the guarded rebase.
|
|
370
|
+
// Bind that verified continuation before any remote write.
|
|
371
|
+
receipt = { ...receipt, resultHeadSha: head };
|
|
372
|
+
assertOwnedResult(operation, receipt, head);
|
|
373
|
+
recordReceipt(operation, receipt);
|
|
374
|
+
}
|
|
375
|
+
if (operation.kind === 'graph-merge')
|
|
376
|
+
assertGraphResult(operation, head);
|
|
377
|
+
else
|
|
378
|
+
assertOwnedResult(operation, receipt, head);
|
|
379
|
+
if (remote === head) {
|
|
380
|
+
recordReceipt(operation, { ...receipt, pushedHeadSha: head });
|
|
381
|
+
return;
|
|
382
|
+
}
|
|
383
|
+
if (remote !== operation.remoteHeadSha)
|
|
384
|
+
refuse('REMOTE_CHILD_CHANGED');
|
|
385
|
+
try {
|
|
386
|
+
git(operation.repo, [
|
|
387
|
+
'push',
|
|
388
|
+
'origin',
|
|
389
|
+
`${receipt.resultHeadSha}:refs/heads/${operation.branch}`,
|
|
390
|
+
`--force-with-lease=refs/heads/${operation.branch}:${operation.remoteHeadSha}`,
|
|
391
|
+
]);
|
|
392
|
+
}
|
|
393
|
+
catch (error) {
|
|
394
|
+
throw new BranchMaintenanceRefusal('PUSH_REFUSED', error);
|
|
395
|
+
}
|
|
396
|
+
recordReceipt(operation, { ...receipt, pushedHeadSha: head });
|
|
397
|
+
}
|
|
398
|
+
export function verifyBranchMaintenance(operation) {
|
|
399
|
+
const receipt = readReceipt(operation);
|
|
400
|
+
fetchHeads(operation.repo, operation.branch, operation.baseRef);
|
|
401
|
+
const headSha = ref(operation.repo, operation.branch);
|
|
402
|
+
const targetChanged = ref(operation.repo, operation.baseRef) !== operation.targetSha;
|
|
403
|
+
if (operation.kind === 'graph-merge') {
|
|
404
|
+
if (headSha === operation.remoteHeadSha) {
|
|
405
|
+
if (targetChanged)
|
|
406
|
+
refuse('TARGET_CHANGED');
|
|
407
|
+
if (!ancestor(operation.repo, operation.targetSha, headSha))
|
|
408
|
+
refuse('GRAPH_UPDATE_PENDING');
|
|
409
|
+
}
|
|
410
|
+
assertGraphResult(operation, headSha);
|
|
411
|
+
return { headSha, replayBoundarySha: operation.replayBoundarySha };
|
|
412
|
+
}
|
|
413
|
+
if (!receipt?.resultHeadSha || receipt.phase !== 'completed') {
|
|
414
|
+
if (targetChanged)
|
|
415
|
+
refuse('TARGET_CHANGED');
|
|
416
|
+
refuse('GUARDED_RESULT_MISSING');
|
|
417
|
+
}
|
|
418
|
+
if (receipt.resultHeadSha !== headSha) {
|
|
419
|
+
if (targetChanged)
|
|
420
|
+
refuse('TARGET_CHANGED');
|
|
421
|
+
refuse('REMOTE_RESULT_CHANGED');
|
|
422
|
+
}
|
|
423
|
+
// Exact remote equality to a changed guarded result also recovers a crash
|
|
424
|
+
// after the leased push and before its local success mark. A no-op requires
|
|
425
|
+
// the shared push's explicit mark because its remote head never changed.
|
|
426
|
+
if (headSha === operation.remoteHeadSha && receipt.pushedHeadSha !== headSha) {
|
|
427
|
+
if (targetChanged)
|
|
428
|
+
refuse('TARGET_CHANGED');
|
|
429
|
+
refuse('RESULT_NOT_PUSHED');
|
|
430
|
+
}
|
|
431
|
+
assertOwnedResult(operation, receipt, headSha);
|
|
432
|
+
return { headSha, replayBoundarySha: operation.targetSha };
|
|
433
|
+
}
|
|
434
|
+
/** Inspect retained input without changing the checkout or replacing its pins. */
|
|
435
|
+
export function validateBranchMaintenance(operation) {
|
|
436
|
+
const receipt = readReceipt(operation);
|
|
437
|
+
if (receipt?.phase === 'retired')
|
|
438
|
+
return { status: 'stale', reason: 'OPERATION_RETIRED' };
|
|
439
|
+
fetchHeads(operation.repo, operation.branch, operation.baseRef);
|
|
440
|
+
const remote = ref(operation.repo, operation.branch);
|
|
441
|
+
if (operation.kind === 'graph-merge' &&
|
|
442
|
+
remote === operation.remoteHeadSha &&
|
|
443
|
+
ref(operation.repo, operation.baseRef) !== operation.targetSha)
|
|
444
|
+
return { status: 'stale', reason: 'TARGET_CHANGED' };
|
|
445
|
+
if (receipt?.phase === 'completed' &&
|
|
446
|
+
receipt.resultHeadSha === remote &&
|
|
447
|
+
(remote !== operation.remoteHeadSha || receipt.pushedHeadSha === remote)) {
|
|
448
|
+
verifyBranchMaintenance(operation);
|
|
449
|
+
return { status: 'pushed' };
|
|
450
|
+
}
|
|
451
|
+
if (ref(operation.repo, operation.baseRef) !== operation.targetSha)
|
|
452
|
+
return { status: 'stale', reason: 'TARGET_CHANGED' };
|
|
453
|
+
if (remote !== operation.remoteHeadSha)
|
|
454
|
+
return { status: 'stale', reason: 'REMOTE_CHILD_CHANGED' };
|
|
455
|
+
return { status: 'pending' };
|
|
456
|
+
}
|
|
457
|
+
function assertRecoveryCheckout(operation, recovery) {
|
|
458
|
+
const repo = operation.repo;
|
|
459
|
+
if (git(repo, ['branch', '--show-current']).trim() !== operation.branch)
|
|
460
|
+
refuse('BRANCH_CHANGED');
|
|
461
|
+
if (git(repo, ['ls-files', '--others', '--exclude-standard']))
|
|
462
|
+
refuse('UNCOMMITTED_CHANGES');
|
|
463
|
+
const matches = (head) => {
|
|
464
|
+
try {
|
|
465
|
+
git(repo, ['diff', '--quiet', head, '--']);
|
|
466
|
+
git(repo, ['diff', '--cached', '--quiet', head, '--']);
|
|
467
|
+
return true;
|
|
468
|
+
}
|
|
469
|
+
catch (error) {
|
|
470
|
+
if (error.status === 1)
|
|
471
|
+
return false;
|
|
472
|
+
throw error;
|
|
473
|
+
}
|
|
474
|
+
};
|
|
475
|
+
if (!matches(recovery.previousHeadSha) && !matches(recovery.recoveredHeadSha))
|
|
476
|
+
refuse('UNCOMMITTED_CHANGES');
|
|
477
|
+
}
|
|
478
|
+
function retainReceiptHeads(operation, receipt) {
|
|
479
|
+
const prefix = `refs/farmslot/branch-maintenance/${operationHash(operation)}`;
|
|
480
|
+
const heads = {
|
|
481
|
+
source: receipt.sourceHeadSha,
|
|
482
|
+
replay: receipt.replayHeadSha,
|
|
483
|
+
result: receipt.resultHeadSha,
|
|
484
|
+
recovered: receipt.recovery?.recoveredHeadSha,
|
|
485
|
+
};
|
|
486
|
+
for (const [name, head] of Object.entries(heads))
|
|
487
|
+
if (head)
|
|
488
|
+
git(operation.repo, ['update-ref', `${prefix}/${name}`, head]);
|
|
489
|
+
}
|
|
490
|
+
/** Explicitly retire stale input. Preserve every source/result before local recovery. */
|
|
491
|
+
export function retireBranchMaintenance(operation, recoverLocal = false) {
|
|
492
|
+
let receipt = readReceipt(operation);
|
|
493
|
+
if (receipt?.phase === 'retired')
|
|
494
|
+
return { status: 'retired', recoveredHeadSha: receipt.recovery?.recoveredHeadSha };
|
|
495
|
+
const validation = validateBranchMaintenance(operation);
|
|
496
|
+
if (validation.status === 'pushed')
|
|
497
|
+
refuse('OPERATION_ALREADY_PUSHED');
|
|
498
|
+
const repo = operation.repo;
|
|
499
|
+
if (operation.kind === 'graph-merge') {
|
|
500
|
+
recordReceipt(operation, {
|
|
501
|
+
...(receipt ?? {
|
|
502
|
+
operationHash: operationHash(operation),
|
|
503
|
+
operation,
|
|
504
|
+
sourceHeadSha: operation.sourceHeadSha,
|
|
505
|
+
replayHeadSha: operation.sourceHeadSha,
|
|
506
|
+
boundarySha: operation.replayBoundarySha,
|
|
507
|
+
}),
|
|
508
|
+
phase: 'retired',
|
|
509
|
+
retiredReason: validation.reason ?? 'OPERATION_CANCELLED',
|
|
510
|
+
});
|
|
511
|
+
return { status: 'retired' };
|
|
512
|
+
}
|
|
513
|
+
if (!receipt) {
|
|
514
|
+
// Inspect can run before slot prepare. No local replay receipt means this
|
|
515
|
+
// operation has not changed that checkout, so cancellation needs no reset.
|
|
516
|
+
recordReceipt(operation, {
|
|
517
|
+
operationHash: operationHash(operation),
|
|
518
|
+
operation,
|
|
519
|
+
sourceHeadSha: operation.sourceHeadSha,
|
|
520
|
+
replayHeadSha: operation.sourceHeadSha,
|
|
521
|
+
boundarySha: operation.replayBoundarySha,
|
|
522
|
+
phase: 'retired',
|
|
523
|
+
retiredReason: validation.reason ?? 'OPERATION_CANCELLED',
|
|
524
|
+
});
|
|
525
|
+
return { status: 'retired' };
|
|
526
|
+
}
|
|
527
|
+
if (rebaseActive(repo))
|
|
528
|
+
refuse('RESOLVE_REBASE_CONFLICT');
|
|
529
|
+
const currentHead = sha(git(repo, ['rev-parse', 'HEAD']).trim());
|
|
530
|
+
const currentRemote = ref(repo, operation.branch);
|
|
531
|
+
if (currentHead === currentRemote &&
|
|
532
|
+
(currentRemote !== operation.remoteHeadSha ||
|
|
533
|
+
(receipt.phase === 'completed' && currentHead !== receipt.resultHeadSha && !receipt.recovery))) {
|
|
534
|
+
// Prepare replaced this checkout with verified remote content. Retain the
|
|
535
|
+
// abandoned attempt, then start fresh without rewriting any current work.
|
|
536
|
+
assertCheckout(operation);
|
|
537
|
+
retainReceiptHeads(operation, receipt);
|
|
538
|
+
recordReceipt(operation, {
|
|
539
|
+
...receipt,
|
|
540
|
+
phase: 'retired',
|
|
541
|
+
retiredReason: 'CHECKOUT_REPREPARED',
|
|
542
|
+
});
|
|
543
|
+
return { status: 'retired' };
|
|
544
|
+
}
|
|
545
|
+
if (receipt?.recovery)
|
|
546
|
+
assertRecoveryCheckout(operation, receipt.recovery);
|
|
547
|
+
else
|
|
548
|
+
assertCheckout(operation);
|
|
549
|
+
const head = sha(git(repo, ['rev-parse', 'HEAD']).trim());
|
|
550
|
+
if (head === receipt.sourceHeadSha && !receipt.recovery) {
|
|
551
|
+
recordReceipt(operation, {
|
|
552
|
+
...receipt,
|
|
553
|
+
phase: 'retired',
|
|
554
|
+
retiredReason: validation.reason ?? 'OPERATION_CANCELLED',
|
|
555
|
+
});
|
|
556
|
+
return { status: 'retired' };
|
|
557
|
+
}
|
|
558
|
+
if (ref(repo, operation.branch) !== operation.remoteHeadSha)
|
|
559
|
+
refuse('REMOTE_CHILD_CHANGED');
|
|
560
|
+
if (!recoverLocal)
|
|
561
|
+
refuse('LOCAL_RECOVERY_REQUIRED');
|
|
562
|
+
let recovery = receipt.recovery;
|
|
563
|
+
if (!recovery) {
|
|
564
|
+
const originalTree = git(repo, ['rev-parse', `${receipt.sourceHeadSha}^{tree}`]).trim();
|
|
565
|
+
const unstartedReplay = receipt.phase !== 'completed' &&
|
|
566
|
+
head === receipt.replayHeadSha &&
|
|
567
|
+
git(repo, ['rev-parse', `${head}^{tree}`]).trim() === originalTree;
|
|
568
|
+
let recoveredHeadSha = receipt.sourceHeadSha;
|
|
569
|
+
if (!unstartedReplay) {
|
|
570
|
+
if (receipt.phase === 'rebasing' && receipt.observedHeadSha === head) {
|
|
571
|
+
assertOwnedResult(operation, receipt, head);
|
|
572
|
+
receipt = { ...receipt, phase: 'completed', resultHeadSha: head, rebaseResultSha: head };
|
|
573
|
+
recordReceipt(operation, receipt);
|
|
574
|
+
}
|
|
575
|
+
if (receipt.phase !== 'completed' || !receipt.resultHeadSha)
|
|
576
|
+
refuse('REBASE_RESULT_UNVERIFIED');
|
|
577
|
+
if (!ancestor(repo, receipt.resultHeadSha, head) ||
|
|
578
|
+
git(repo, ['rev-list', '--merges', `${receipt.resultHeadSha}..${head}`]))
|
|
579
|
+
refuse('LOCAL_RESULT_CHANGED');
|
|
580
|
+
const continued = { ...receipt, resultHeadSha: head };
|
|
581
|
+
assertOwnedResult(operation, continued, head);
|
|
582
|
+
// Apply only the recorded target-to-child delta onto the old verified
|
|
583
|
+
// comparison. Inherited target bytes disappear; child work appears once.
|
|
584
|
+
const guardedHead = receipt.rebaseResultSha ?? receipt.resultHeadSha;
|
|
585
|
+
const tree = cleanMergeTree(repo, operation.comparisonBaseSha, guardedHead, operation.targetSha);
|
|
586
|
+
if (tree !== originalTree) {
|
|
587
|
+
const signing = git(repo, [
|
|
588
|
+
'config',
|
|
589
|
+
'--type=bool',
|
|
590
|
+
'--default=false',
|
|
591
|
+
'--get',
|
|
592
|
+
'commit.gpgsign',
|
|
593
|
+
]).trim() === 'true';
|
|
594
|
+
recoveredHeadSha = sha(git(repo, ['commit-tree', tree, '-p', receipt.sourceHeadSha, ...(signing ? ['-S'] : [])], 'fix: retain child resolutions while retiring stale branch maintenance\n').trim());
|
|
595
|
+
}
|
|
596
|
+
}
|
|
597
|
+
if (!unstartedReplay) {
|
|
598
|
+
const guardedHead = receipt.rebaseResultSha ?? receipt.resultHeadSha;
|
|
599
|
+
for (const commit of git(repo, ['rev-list', '--reverse', `${guardedHead}..${head}`])
|
|
600
|
+
.split('\n')
|
|
601
|
+
.filter(Boolean)) {
|
|
602
|
+
const parent = sha(git(repo, ['rev-parse', `${commit}^`]).trim());
|
|
603
|
+
const tree = cleanMergeTree(repo, recoveredHeadSha, commit, parent);
|
|
604
|
+
const [name, email, date] = git(repo, [
|
|
605
|
+
'show',
|
|
606
|
+
'-s',
|
|
607
|
+
'--format=%an%x00%ae%x00%aI',
|
|
608
|
+
commit,
|
|
609
|
+
]).split('\0');
|
|
610
|
+
const signing = git(repo, [
|
|
611
|
+
'config',
|
|
612
|
+
'--type=bool',
|
|
613
|
+
'--default=false',
|
|
614
|
+
'--get',
|
|
615
|
+
'commit.gpgsign',
|
|
616
|
+
]).trim() === 'true';
|
|
617
|
+
recoveredHeadSha = sha(git(repo, ['commit-tree', tree, '-p', recoveredHeadSha, ...(signing ? ['-S'] : [])], git(repo, ['show', '-s', '--format=%B', commit]) + '\n', { GIT_AUTHOR_NAME: name, GIT_AUTHOR_EMAIL: email, GIT_AUTHOR_DATE: date }).trim());
|
|
618
|
+
}
|
|
619
|
+
}
|
|
620
|
+
recovery = {
|
|
621
|
+
previousHeadSha: head,
|
|
622
|
+
recoveredHeadSha,
|
|
623
|
+
comparisonBaseSha: operation.comparisonBaseSha,
|
|
624
|
+
targetSha: operation.targetSha,
|
|
625
|
+
};
|
|
626
|
+
const prefix = `refs/farmslot/branch-maintenance/${operationHash(operation)}`;
|
|
627
|
+
git(repo, ['update-ref', `${prefix}/source`, receipt.sourceHeadSha]);
|
|
628
|
+
git(repo, ['update-ref', `${prefix}/result`, head]);
|
|
629
|
+
git(repo, ['update-ref', `${prefix}/recovered`, recoveredHeadSha]);
|
|
630
|
+
receipt = { ...receipt, recovery };
|
|
631
|
+
recordReceipt(operation, receipt);
|
|
632
|
+
}
|
|
633
|
+
fetchHeads(repo, operation.branch, operation.baseRef);
|
|
634
|
+
if (ref(repo, operation.branch) !== operation.remoteHeadSha)
|
|
635
|
+
refuse('REMOTE_CHILD_CHANGED');
|
|
636
|
+
if (head !== recovery.previousHeadSha && head !== recovery.recoveredHeadSha)
|
|
637
|
+
refuse('LOCAL_RESULT_CHANGED');
|
|
638
|
+
if (head === recovery.previousHeadSha) {
|
|
639
|
+
git(repo, [
|
|
640
|
+
'update-ref',
|
|
641
|
+
`refs/heads/${operation.branch}`,
|
|
642
|
+
recovery.recoveredHeadSha,
|
|
643
|
+
recovery.previousHeadSha,
|
|
644
|
+
]);
|
|
645
|
+
// retire is the explicit recovery action; both old and new trees are retained.
|
|
646
|
+
}
|
|
647
|
+
git(repo, ['reset', '--hard', recovery.recoveredHeadSha]);
|
|
648
|
+
recordReceipt(operation, {
|
|
649
|
+
...receipt,
|
|
650
|
+
phase: 'retired',
|
|
651
|
+
retiredReason: validation.reason ?? 'OPERATION_CANCELLED',
|
|
652
|
+
});
|
|
653
|
+
return { status: 'retired', recoveredHeadSha: recovery.recoveredHeadSha };
|
|
654
|
+
}
|
|
655
|
+
function ordinaryIdentity(request) {
|
|
656
|
+
return {
|
|
657
|
+
repo: request.repo,
|
|
658
|
+
id: `ordinary-${digest(JSON.stringify([path.resolve(request.repo), normalizeMaintenanceBranch(request.branch), normalizeMaintenanceBranch(request.baseRef)]))}`,
|
|
659
|
+
};
|
|
660
|
+
}
|
|
661
|
+
export function executeOrdinaryBranchMaintenance(request) {
|
|
662
|
+
const identity = ordinaryIdentity(request);
|
|
663
|
+
const file = receiptPath(identity);
|
|
664
|
+
if (existsSync(file)) {
|
|
665
|
+
const saved = JSON.parse(readFileSync(file, 'utf8'));
|
|
666
|
+
if (saved.operation.id !== identity.id || saved.operation.repo !== identity.repo)
|
|
667
|
+
refuse('OPERATION_CHANGED');
|
|
668
|
+
fetchHeads(request.repo, saved.operation.branch, saved.operation.baseRef);
|
|
669
|
+
const remote = ref(request.repo, saved.operation.branch);
|
|
670
|
+
const head = sha(git(request.repo, ['rev-parse', 'HEAD']).trim());
|
|
671
|
+
const published = saved.phase === 'completed' &&
|
|
672
|
+
!!saved.resultHeadSha &&
|
|
673
|
+
(saved.pushedHeadSha === saved.resultHeadSha ||
|
|
674
|
+
(remote === saved.resultHeadSha && remote !== saved.operation.remoteHeadSha));
|
|
675
|
+
if (published) {
|
|
676
|
+
retainReceiptHeads(saved.operation, saved);
|
|
677
|
+
if (!ancestor(request.repo, remote, head))
|
|
678
|
+
refuse('REMOTE_CHILD_COMMITS_MISSING');
|
|
679
|
+
if (remote === saved.resultHeadSha &&
|
|
680
|
+
head === remote &&
|
|
681
|
+
ref(request.repo, saved.operation.baseRef) === saved.operation.targetSha)
|
|
682
|
+
return executeBranchMaintenance(saved.operation);
|
|
683
|
+
// A completed published attempt no longer binds a later child's lease.
|
|
684
|
+
}
|
|
685
|
+
else if (saved.phase !== 'retired') {
|
|
686
|
+
const validation = validateBranchMaintenance(saved.operation);
|
|
687
|
+
if (validation.status === 'pending' &&
|
|
688
|
+
!(saved.phase === 'completed' && head === remote && head !== saved.resultHeadSha))
|
|
689
|
+
return executeBranchMaintenance(saved.operation);
|
|
690
|
+
if (validation.status === 'pushed')
|
|
691
|
+
return saved.resultHeadSha;
|
|
692
|
+
retireBranchMaintenance(saved.operation, true);
|
|
693
|
+
}
|
|
694
|
+
}
|
|
695
|
+
const branch = normalizeMaintenanceBranch(request.branch);
|
|
696
|
+
const baseRef = normalizeMaintenanceBranch(request.baseRef);
|
|
697
|
+
fetchHeads(request.repo, branch, baseRef);
|
|
698
|
+
const head = sha(git(request.repo, ['rev-parse', 'HEAD']).trim());
|
|
699
|
+
const boundary = sha(git(request.repo, ['merge-base', ref(request.repo, baseRef), head]).trim());
|
|
700
|
+
const operation = inspectBranchMaintenance({
|
|
701
|
+
...identity,
|
|
702
|
+
ownerRunId: 'ordinary',
|
|
703
|
+
project: '',
|
|
704
|
+
branch: request.branch,
|
|
705
|
+
baseRef: request.baseRef,
|
|
706
|
+
kind: 'rebase',
|
|
707
|
+
authority: {
|
|
708
|
+
headSha: ref(request.repo, branch),
|
|
709
|
+
comparisonBaseSha: boundary,
|
|
710
|
+
replayBoundarySha: boundary,
|
|
711
|
+
},
|
|
712
|
+
});
|
|
713
|
+
operation.sourceHeadSha = head;
|
|
714
|
+
assertCheckout(operation);
|
|
715
|
+
assertSource(operation, head);
|
|
716
|
+
prepareReceipt(operation, head);
|
|
717
|
+
return executeBranchMaintenance(operation);
|
|
718
|
+
}
|
|
719
|
+
export function pushOrdinaryBranchMaintenance(request) {
|
|
720
|
+
const file = receiptPath(ordinaryIdentity(request));
|
|
721
|
+
if (!existsSync(file))
|
|
722
|
+
refuse('GUARDED_RESULT_MISSING');
|
|
723
|
+
const saved = JSON.parse(readFileSync(file, 'utf8'));
|
|
724
|
+
if (saved.operation.id !== ordinaryIdentity(request).id || saved.operation.repo !== request.repo)
|
|
725
|
+
refuse('OPERATION_CHANGED');
|
|
726
|
+
pushBranchMaintenance(saved.operation);
|
|
727
|
+
}
|
|
728
|
+
//# sourceMappingURL=branch-update.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"branch-update.js","sourceRoot":"","sources":["../../src/task-init/branch-update.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { type ExecutionTemplateReference, type ExecutionTemplateRunMode, type Te
|
|
|
2
2
|
import type { ExecutionTemplateSource } from '../execution-template/types.js';
|
|
3
3
|
import { type HandoffExecutionTemplate, type HandoffMetadata, type HandoffSourceKind } from './task-document.js';
|
|
4
4
|
import { type WrittenTaskDir } from './write.js';
|
|
5
|
+
export * from './branch-update.js';
|
|
5
6
|
export * from './discover.js';
|
|
6
7
|
export * from './task-document.js';
|
|
7
8
|
export * from './write.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/task-init/index.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,wBAAwB,EAE7B,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACpC,MAAM,oBAAoB,CAAC;AAO5B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAG9E,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/task-init/index.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,wBAAwB,EAE7B,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACpC,MAAM,oBAAoB,CAAC;AAO5B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAG9E,OAAO,EAML,KAAK,wBAAwB,EAC7B,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAE/D,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAE3B,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAUhE,mGAAmG;AACnG,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAC5C,8BAA8B,CAMhC;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAChB,4GAA4G;IAC5G,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,OAAO,CAAC,EAAE,wBAAwB,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,yBAAyB,CAAC;IACpC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,kBAAkB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;QAC3C,UAAU,EAAE,iBAAiB,CAAC;QAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,uEAAuE;IACvE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6GAA6G;IAC7G,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,8BAA8B,CAAC;IAClD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,eAAe,EAAE,eAAe,CAAC;CAClC;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CA+F1E;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,CAAC,EAAE,wBAAwB,GAAG,0BAA0B,CAAC;IAC1E,kBAAkB,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;CACpE;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAgBzE"}
|
package/dist/task-init/index.js
CHANGED
|
@@ -12,8 +12,9 @@ import { renderTemplatePlaceholders, } from '@farmslot/protocol';
|
|
|
12
12
|
import { selectExecutionTemplate } from '../execution-template/select.js';
|
|
13
13
|
import { executionTemplateReference, readExecutionTemplateSnapshot, } from '../execution-template/snapshot.js';
|
|
14
14
|
import { installedTaskCommands } from './runtime-command.js';
|
|
15
|
-
import { buildBranchUpdateInstructions, buildHandoffMetadata, buildTaskDocument, HANDOFF_INPUT, } from './task-document.js';
|
|
15
|
+
import { buildBranchUpdateGuardCommand, buildBranchUpdateInstructions, buildHandoffMetadata, buildTaskDocument, HANDOFF_INPUT, } from './task-document.js';
|
|
16
16
|
import { writeTaskDir } from './write.js';
|
|
17
|
+
export * from './branch-update.js';
|
|
17
18
|
export * from './discover.js';
|
|
18
19
|
export * from './task-document.js';
|
|
19
20
|
export * from './write.js';
|
|
@@ -56,7 +57,9 @@ export async function taskInit(spec) {
|
|
|
56
57
|
...(spec.vars ?? {}),
|
|
57
58
|
};
|
|
58
59
|
if (vars.PUBLICATION_BASE?.trim()) {
|
|
59
|
-
vars.
|
|
60
|
+
vars.BRANCH_UPDATE_GUARD_CMD = buildBranchUpdateGuardCommand(vars);
|
|
61
|
+
vars.BRANCH_UPDATE_PUSH_CMD = buildBranchUpdateGuardCommand(vars, 'push');
|
|
62
|
+
vars.BRANCH_UPDATE_INSTRUCTIONS = buildBranchUpdateInstructions(vars.PUBLICATION_BASE, vars.BRANCH_UPDATE_GUARD_CMD, vars.BRANCH_UPDATE_PUSH_CMD);
|
|
60
63
|
}
|
|
61
64
|
const source = `Execution template ${selected.entry.id} (${selected.entry.sourceId})`;
|
|
62
65
|
const checklistMarkdown = renderTemplatePlaceholders(readExecutionTemplateSnapshot(selected.entry).markdown, vars, source);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/task-init/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/task-init/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,9 @@ export declare const BUG_INPUT = "inputs/bug-input.json";
|
|
|
4
4
|
/** Optional project-owned addendum rendered into TASK.md (relative to `templates/`). */
|
|
5
5
|
export declare const TASK_DOCUMENT_ADDENDUM_TEMPLATE = "task-document.md";
|
|
6
6
|
/** Shared instructions for a maintenance task and an inline CI-fix checklist. */
|
|
7
|
-
export declare function buildBranchUpdateInstructions(publicationBase: string): string;
|
|
7
|
+
export declare function buildBranchUpdateInstructions(publicationBase: string, guardCommand?: string, pushCommand?: string): string;
|
|
8
|
+
/** The supplying runtime executes the captured operation, never a pack-owned ancestry parser. */
|
|
9
|
+
export declare function buildBranchUpdateGuardCommand(vars: Record<string, string>, phase?: 'execute' | 'push'): string;
|
|
8
10
|
/**
|
|
9
11
|
* Acceptance criteria arrive as plain strings, but ticket adapters keep the
|
|
10
12
|
* author's list markers. Strip them and drop empty entries, so one input entry
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-document.d.ts","sourceRoot":"","sources":["../../src/task-init/task-document.ts"],"names":[],"mappings":"AAYA,OAAO,
|
|
1
|
+
{"version":3,"file":"task-document.d.ts","sourceRoot":"","sources":["../../src/task-init/task-document.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,21 +8,61 @@
|
|
|
8
8
|
import { existsSync } from 'node:fs';
|
|
9
9
|
import { readFile } from 'node:fs/promises';
|
|
10
10
|
import path from 'node:path';
|
|
11
|
-
import { EXECUTION_CHECKLIST_DOCUMENT, } from '@farmslot/protocol';
|
|
12
|
-
import {
|
|
11
|
+
import { DEFAULT_BRANCH, EXECUTION_CHECKLIST_DOCUMENT, } from '@farmslot/protocol';
|
|
12
|
+
import { normalizeMaintenanceBranch } from './branch-update.js';
|
|
13
|
+
import { installedRuntimeScriptCommand, installedTaskCommands } from './runtime-command.js';
|
|
13
14
|
export const HANDOFF_INPUT = 'inputs/handoff.json';
|
|
14
15
|
export const BUG_INPUT = 'inputs/bug-input.json';
|
|
15
16
|
/** Optional project-owned addendum rendered into TASK.md (relative to `templates/`). */
|
|
16
17
|
export const TASK_DOCUMENT_ADDENDUM_TEMPLATE = 'task-document.md';
|
|
17
18
|
/** Shared instructions for a maintenance task and an inline CI-fix checklist. */
|
|
18
|
-
export function buildBranchUpdateInstructions(publicationBase) {
|
|
19
|
+
export function buildBranchUpdateInstructions(publicationBase, guardCommand, pushCommand) {
|
|
19
20
|
return [
|
|
20
21
|
'## Branch update base',
|
|
21
22
|
'',
|
|
22
23
|
`The publication base is \`${publicationBase}\`. Branch updates target \`origin/${publicationBase}\`; follow the update method in the selected checklist. Follow-up runs use their contribution family's base; after retargeting they use the recorded retarget branch. Keep default-branch freshness checks separate.`,
|
|
23
24
|
'For a rebase, first fetch the PR head and record its exact remote SHA in `artifacts/pre-rebase-remote-sha.txt` under this task. Refuse an update if local HEAD omits remote commits. After conflict resolution and the required checks, push the rebased branch with an explicit lease against that recorded SHA. Never infer the update base from a PR body or replace it with the default branch while the upstream PR remains open.',
|
|
25
|
+
...(guardCommand
|
|
26
|
+
? [
|
|
27
|
+
'',
|
|
28
|
+
'Run this shared operation before any rebase or up-to-date shortcut. It performs the verified rebase; do not run an additional rebase:',
|
|
29
|
+
'',
|
|
30
|
+
'```bash',
|
|
31
|
+
guardCommand,
|
|
32
|
+
'```',
|
|
33
|
+
]
|
|
34
|
+
: []),
|
|
35
|
+
...(pushCommand
|
|
36
|
+
? [
|
|
37
|
+
'',
|
|
38
|
+
'After conflict resolution, required checks and any fix commits, use this shared leased push:',
|
|
39
|
+
'',
|
|
40
|
+
'```bash',
|
|
41
|
+
pushCommand,
|
|
42
|
+
'```',
|
|
43
|
+
]
|
|
44
|
+
: []),
|
|
24
45
|
].join('\n');
|
|
25
46
|
}
|
|
47
|
+
/** The supplying runtime executes the captured operation, never a pack-owned ancestry parser. */
|
|
48
|
+
export function buildBranchUpdateGuardCommand(vars, phase = 'execute') {
|
|
49
|
+
if (!vars.BRANCH_UPDATE_CONTEXT &&
|
|
50
|
+
normalizeMaintenanceBranch(vars.PUBLICATION_BASE || '') !==
|
|
51
|
+
normalizeMaintenanceBranch(vars.DEFAULT_BRANCH || DEFAULT_BRANCH))
|
|
52
|
+
return "printf '%s\\n' 'PARENT_BOUNDARY_MISSING' >&2; exit 2";
|
|
53
|
+
const quote = (value) => "'" + value.replaceAll("'", "'\"'\"'") + "'";
|
|
54
|
+
const script = vars.BRANCH_UPDATE_SCRIPT
|
|
55
|
+
? `node ${quote(vars.BRANCH_UPDATE_SCRIPT)}`
|
|
56
|
+
: installedRuntimeScriptCommand('branch-update.mjs');
|
|
57
|
+
const context = vars.BRANCH_UPDATE_CONTEXT ||
|
|
58
|
+
JSON.stringify({
|
|
59
|
+
kind: 'ordinary',
|
|
60
|
+
repo: vars.REPO || '.',
|
|
61
|
+
branch: vars.PR_BRANCH || vars.BRANCH,
|
|
62
|
+
baseRef: vars.PUBLICATION_BASE,
|
|
63
|
+
});
|
|
64
|
+
return `${script} ${phase} ${quote(context)}`;
|
|
65
|
+
}
|
|
26
66
|
/**
|
|
27
67
|
* Ordered keys of the `## Task` block. A key renders only when the caller set
|
|
28
68
|
* it, except the four every surface knows. Farmslot sets its slot facts; a
|
|
@@ -104,7 +144,7 @@ export function buildTaskDocument(input) {
|
|
|
104
144
|
sections.push(input.modePreamble, '');
|
|
105
145
|
sections.push('## Task', '', '```text', taskBlock, '```', '', '## Description', '', input.description || '_No description_', '', '## Acceptance Criteria', '', renderAcceptanceCriteria(input.acceptanceCriteria));
|
|
106
146
|
if (vars.PUBLICATION_BASE?.trim()) {
|
|
107
|
-
sections.push('', buildBranchUpdateInstructions(vars.PUBLICATION_BASE));
|
|
147
|
+
sections.push('', buildBranchUpdateInstructions(vars.PUBLICATION_BASE, vars.BRANCH_UPDATE_GUARD_CMD || buildBranchUpdateGuardCommand(vars), vars.BRANCH_UPDATE_PUSH_CMD || buildBranchUpdateGuardCommand(vars, 'push')));
|
|
108
148
|
}
|
|
109
149
|
if (normalizeAcceptanceCriteria(input.acceptanceCriteria).length > 0) {
|
|
110
150
|
const defaults = installedTaskCommands();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-document.js","sourceRoot":"","sources":["../../src/task-init/task-document.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-document.js","sourceRoot":"","sources":["../../src/task-init/task-document.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,EAAE;AACF,iFAAiF;AACjF,+EAA+E;AAC/E,8EAA8E;AAC9E,kFAAkF;AAClF,qEAAqE;AAErE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,cAAc,EACd,4BAA4B,GAI7B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE5F,MAAM,CAAC,MAAM,aAAa,GAAG,qBAAqB,CAAC;AACnD,MAAM,CAAC,MAAM,SAAS,GAAG,uBAAuB,CAAC;AACjD,wFAAwF;AACxF,MAAM,CAAC,MAAM,+BAA+B,GAAG,kBAAkB,CAAC;AAElE,iFAAiF;AACjF,MAAM,UAAU,6BAA6B,CAC3C,eAAuB,EACvB,YAAqB,EACrB,WAAoB;IAEpB,OAAO;QACL,uBAAuB;QACvB,EAAE;QACF,6BAA6B,eAAe,sCAAsC,eAAe,sNAAsN;QACvT,waAAwa;QACxa,GAAG,CAAC,YAAY;YACd,CAAC,CAAC;gBACE,EAAE;gBACF,uIAAuI;gBACvI,EAAE;gBACF,SAAS;gBACT,YAAY;gBACZ,KAAK;aACN;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,WAAW;YACb,CAAC,CAAC;gBACE,EAAE;gBACF,8FAA8F;gBAC9F,EAAE;gBACF,SAAS;gBACT,WAAW;gBACX,KAAK;aACN;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,iGAAiG;AACjG,MAAM,UAAU,6BAA6B,CAC3C,IAA4B,EAC5B,QAA4B,SAAS;IAErC,IACE,CAAC,IAAI,CAAC,qBAAqB;QAC3B,0BAA0B,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC;YACrD,0BAA0B,CAAC,IAAI,CAAC,cAAc,IAAI,cAAc,CAAC;QAEnE,OAAO,sDAAsD,CAAC;IAChE,MAAM,KAAK,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,GAAG,CAAC;IACtF,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB;QACtC,CAAC,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE;QAC5C,CAAC,CAAC,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IACvD,MAAM,OAAO,GACX,IAAI,CAAC,qBAAqB;QAC1B,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,GAAG;YACtB,MAAM,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM;YACrC,OAAO,EAAE,IAAI,CAAC,gBAAgB;SAC/B,CAAC,CAAC;IACL,OAAO,GAAG,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,eAAe,GAAuE;IAC1F,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;IACjC,EAAE,GAAG,EAAE,YAAY,EAAE;IACrB,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;IAChC,EAAE,GAAG,EAAE,MAAM,EAAE;IACf,EAAE,GAAG,EAAE,MAAM,EAAE;IACf,EAAE,GAAG,EAAE,QAAQ,EAAE;IACjB,EAAE,GAAG,EAAE,WAAW,EAAE;IACpB,EAAE,GAAG,EAAE,QAAQ,EAAE;IACjB,EAAE,GAAG,EAAE,WAAW,EAAE;IACpB,EAAE,GAAG,EAAE,QAAQ,EAAE;IACjB,EAAE,GAAG,EAAE,WAAW,EAAE;IACpB,EAAE,GAAG,EAAE,SAAS,EAAE;IAClB,EAAE,GAAG,EAAE,qBAAqB,EAAE,KAAK,EAAE,gBAAgB,EAAE;IACvD,EAAE,GAAG,EAAE,aAAa,EAAE;IACtB,EAAE,GAAG,EAAE,iBAAiB,EAAE;IAC1B,EAAE,GAAG,EAAE,wBAAwB,EAAE;IACjC,EAAE,GAAG,EAAE,kBAAkB,EAAE;IAC3B,EAAE,GAAG,EAAE,YAAY,EAAE;IACrB,EAAE,GAAG,EAAE,eAAe,EAAE;IACxB,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE;IACnC,EAAE,GAAG,EAAE,SAAS,EAAE;IAClB,EAAE,GAAG,EAAE,MAAM,EAAE;IACf,EAAE,GAAG,EAAE,UAAU,EAAE;IACnB,EAAE,GAAG,EAAE,QAAQ,EAAE;IACjB,EAAE,GAAG,EAAE,UAAU,EAAE;IACnB,EAAE,GAAG,EAAE,SAAS,EAAE;IAClB,EAAE,GAAG,EAAE,aAAa,EAAE;IACtB,EAAE,GAAG,EAAE,cAAc,EAAE;IACvB,EAAE,GAAG,EAAE,UAAU,EAAE;IACnB,EAAE,GAAG,EAAE,eAAe,EAAE;IACxB,EAAE,GAAG,EAAE,YAAY,EAAE;CACtB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,2BAA2B,CAAC,KAA4B;IACtE,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI;SACD,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI;SACD,IAAI,EAAE;SACN,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;SAChC,IAAI,EAAE,CACV;SACA,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CACd;SACA,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,KAA4B;IACnE,MAAM,UAAU,GAAG,2BAA2B,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QACtE,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/C,mEAAmE;QACnE,OAAO,CAAC,KAAK,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC;AAC3E,CAAC;AAqBD,MAAM,UAAU,iBAAiB,CAAC,KAAwB;IACxD,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACvB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC;IAClE,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC;SAC3F,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;SAC9D,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,MAAM,QAAQ,GAAa,CAAC,KAAK,KAAK,CAAC,QAAQ,KAAK,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IACjE,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACrE,QAAQ,CAAC,IAAI,CACX,SAAS,EACT,EAAE,EACF,SAAS,EACT,SAAS,EACT,KAAK,EACL,EAAE,EACF,gBAAgB,EAChB,EAAE,EACF,KAAK,CAAC,WAAW,IAAI,kBAAkB,EACvC,EAAE,EACF,wBAAwB,EACxB,EAAE,EACF,wBAAwB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CACnD,CAAC;IACF,IAAI,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,EAAE,CAAC;QAClC,QAAQ,CAAC,IAAI,CACX,EAAE,EACF,6BAA6B,CAC3B,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,uBAAuB,IAAI,6BAA6B,CAAC,IAAI,CAAC,EACnE,IAAI,CAAC,sBAAsB,IAAI,6BAA6B,CAAC,IAAI,EAAE,MAAM,CAAC,CAC3E,CACF,CAAC;IACJ,CAAC;IACD,IAAI,2BAA2B,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrE,MAAM,QAAQ,GAAG,qBAAqB,EAAE,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,QAAQ,CAAC,MAAM,CAAC;QAC1D,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,QAAQ,CAAC,kBAAkB,CAAC;QACrF,QAAQ,CAAC,IAAI,CACX,EAAE,EACF,qCAAqC,EACrC,EAAE,EACF,oEAAoE,OAAO,2LAA2L,OAAO,6IAA6I,EAC1Z,sCAAsC,UAAU,qBAAqB,OAAO,kiBAAkiB,EAC9mB,+EAA+E,UAAU,uBAAuB,OAAO,gHAAgH,aAAa,KAAK,OAAO,iBAAiB,OAAO,oYAAoY,CAC7pB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,KAAK,iBAAiB,EAAE,CAAC;QACnE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,KAAK,CAAC,mBAAmB,IAAI,KAAK,CAAC,mBAAmB,KAAK,kBAAkB,EAAE,CAAC;QAClF,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,gBAAgB,KAAK,eAAe,EAAE,CAAC;QACzE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,KAAK,CAAC,qBAAqB,IAAI,KAAK,CAAC,qBAAqB,KAAK,qBAAqB,EAAE,CAAC;QACzF,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC1E,CAAC;IACD,IACE,KAAK,CAAC,0BAA0B;QAChC,KAAK,CAAC,0BAA0B,KAAK,qBAAqB,EAC1D,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,+BAA+B,EAAE,EAAE,EAAE,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC3F,CAAC;IACD,IAAI,KAAK,CAAC,sBAAsB,EAAE,IAAI,EAAE,EAAE,CAAC;QACzC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAoB,EAAE,EAAE,EAAE,KAAK,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC,CAAC;IACnF,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;QAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,QAAQ,CAAC,IAAI,CACX,EAAE,EACF,cAAc,EACd,EAAE,EACF,YAAY,OAAO,IAAI,4BAA4B,gEAAgE,EACnH,aAAa,OAAO,oOAAoO,EACxP,gIAAgI,EAChI,EAAE,EACF,WAAW,EACX,EAAE,EACF,WAAW,OAAO,aAAa,EAC/B,EAAE,EACF,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,6EAA6E,EAChH,+EAA+E,CAChF,CAAC;IACF,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,kCAAkC,CAAC,CAAC;IACnF,CAAC;IACD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClB,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,mBAA2B;IAE3B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;IACrF,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3C,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;AAChF,CAAC;AA4CD,MAAM,UAAU,oBAAoB,CAAC,KAiBpC;IACC,MAAM,QAAQ,GAAG,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAC1D,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;IACpC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IAC1C,MAAM,kBAAkB,GAAG,2BAA2B,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;IACvF,OAAO;QACL,aAAa,EAAE,CAAC;QAChB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;QAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACtD,IAAI,EAAE;YACJ,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnC,GAAG,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjE;QACD,YAAY,EAAE,SAAS;QACvB,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,qBAAqB;QACjD,SAAS,EAAE,wBAAwB;QACnC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACtF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,OAAO,SAAS,CAAC;QAClF,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACxD,IAAI,GAAG;YAAE,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;aACtB,IAAI,0CAA0C,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,QAAQ,GAAG,GAAG,CAAC;;YACzE,OAAO,SAAS,CAAC;IACxB,CAAC;IACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC7E,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,QAAQ,GACZ,QAAQ,CAAC,MAAM,GAAG,CAAC;QACnB,QAAQ,CAAC,KAAK,CACZ,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,IAAI,IAAI,+BAA+B,CAAC,IAAI,CAAC,OAAO,CAAC,CACvF,CAAC;IACJ,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAGnC;IACC,MAAM,UAAU,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,MAAM,CACpE,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CACjF,CAAC;IACF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QACxD,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;IAChC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@farmslot/agent-runtime",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.22.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -34,7 +34,8 @@
|
|
|
34
34
|
"./native/*": {
|
|
35
35
|
"types": "./dist/native/*.d.ts",
|
|
36
36
|
"import": "./dist/native/*.js"
|
|
37
|
-
}
|
|
37
|
+
},
|
|
38
|
+
"./scripts/branch-update.mjs": "./scripts/branch-update.mjs"
|
|
38
39
|
},
|
|
39
40
|
"scripts": {
|
|
40
41
|
"typecheck": "yarn workspace @farmslot/protocol build && tsc --noEmit --project tsconfig.json",
|
|
@@ -47,11 +48,12 @@
|
|
|
47
48
|
"build": "yarn workspace @farmslot/protocol build && rm -rf dist && tsc --project tsconfig.build.json",
|
|
48
49
|
"prepack": "cd ../.. && node scripts/quality/check-farmslot-package-readiness.mjs --require-changelog --packages @farmslot/agent-runtime && yarn workspace @farmslot/agent-runtime build",
|
|
49
50
|
"prepublishOnly": "node ../../scripts/quality/check-farmslot-package-readiness.mjs --publish --packages @farmslot/agent-runtime",
|
|
50
|
-
"test:acceptance-live": "node --import tsx ../../scripts/e2e-acceptance-ledger.mts"
|
|
51
|
+
"test:acceptance-live": "node --import tsx ../../scripts/e2e-acceptance-ledger.mts",
|
|
52
|
+
"test:branch-maintenance-live": "node --import tsx --test test/branch-maintenance-live.mts"
|
|
51
53
|
},
|
|
52
54
|
"dependencies": {
|
|
53
|
-
"@farmslot/adapter-sdk": "0.13.
|
|
54
|
-
"@farmslot/protocol": "0.
|
|
55
|
+
"@farmslot/adapter-sdk": "0.13.2",
|
|
56
|
+
"@farmslot/protocol": "0.44.0"
|
|
55
57
|
},
|
|
56
58
|
"devDependencies": {
|
|
57
59
|
"@types/node": "^22.0.0",
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
// The task runtime owns inspection, guarded replay, leased push and result verification.
|
|
2
|
+
import { existsSync } from 'node:fs';
|
|
3
|
+
import { fileURLToPath } from 'node:url';
|
|
4
|
+
|
|
5
|
+
const compiled = new URL('../dist/task-init/branch-update.js', import.meta.url);
|
|
6
|
+
if (!existsSync(fileURLToPath(compiled))) {
|
|
7
|
+
throw new Error('Build the supplying agent runtime before branch maintenance.');
|
|
8
|
+
}
|
|
9
|
+
const sdk = await import(compiled.href);
|
|
10
|
+
const [phase, encoded] = process.argv.slice(2);
|
|
11
|
+
try {
|
|
12
|
+
const value = JSON.parse(encoded);
|
|
13
|
+
let result;
|
|
14
|
+
if (phase === 'inspect') result = sdk.inspectBranchMaintenance(value);
|
|
15
|
+
else if (phase === 'execute')
|
|
16
|
+
result =
|
|
17
|
+
value.kind === 'ordinary'
|
|
18
|
+
? sdk.executeOrdinaryBranchMaintenance(value)
|
|
19
|
+
: sdk.executeBranchMaintenance(value);
|
|
20
|
+
else if (phase === 'push')
|
|
21
|
+
result =
|
|
22
|
+
value.kind === 'ordinary'
|
|
23
|
+
? sdk.pushOrdinaryBranchMaintenance(value)
|
|
24
|
+
: sdk.pushBranchMaintenance(value);
|
|
25
|
+
else if (phase === 'verify') result = sdk.verifyBranchMaintenance(value);
|
|
26
|
+
else if (phase === 'validate') result = sdk.validateBranchMaintenance(value);
|
|
27
|
+
else if (phase === 'retire')
|
|
28
|
+
result = sdk.retireBranchMaintenance(value.operation ?? value, value.recoverLocal === true);
|
|
29
|
+
else throw new Error('Unknown internal branch-maintenance operation.');
|
|
30
|
+
process.stdout.write(JSON.stringify(result ?? null) + '\n');
|
|
31
|
+
} catch (error) {
|
|
32
|
+
if (!(error instanceof sdk.BranchMaintenanceRefusal)) throw error;
|
|
33
|
+
process.stderr.write(JSON.stringify({ code: error.code, message: error.message }) + '\n');
|
|
34
|
+
process.exitCode = 2;
|
|
35
|
+
}
|