@frankzhang2026/opencode-android-orchestrator 1.0.5 → 1.1.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 +67 -0
- package/README.md +76 -15
- package/dist/config/queue-policy.d.ts.map +1 -1
- package/dist/config/queue-policy.js +1 -2
- package/dist/config/queue-policy.js.map +1 -1
- package/dist/doctor/index.d.ts.map +1 -1
- package/dist/doctor/index.js +14 -3
- package/dist/doctor/index.js.map +1 -1
- package/dist/doctor/installation.d.ts +1 -1
- package/dist/doctor/installation.d.ts.map +1 -1
- package/dist/doctor/installation.js +10 -1
- package/dist/doctor/installation.js.map +1 -1
- 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/installer/adaptive-templates.d.ts +4 -1
- package/dist/installer/adaptive-templates.d.ts.map +1 -1
- package/dist/installer/adaptive-templates.js +38 -13
- package/dist/installer/adaptive-templates.js.map +1 -1
- package/dist/installer/android-project.d.ts +3 -1
- package/dist/installer/android-project.d.ts.map +1 -1
- package/dist/installer/android-project.js.map +1 -1
- package/dist/installer/capabilities-script.d.ts +2 -0
- package/dist/installer/capabilities-script.d.ts.map +1 -0
- package/dist/installer/capabilities-script.js +77 -0
- package/dist/installer/capabilities-script.js.map +1 -0
- package/dist/installer/gradle-verification.d.ts.map +1 -1
- package/dist/installer/gradle-verification.js +13 -6
- package/dist/installer/gradle-verification.js.map +1 -1
- package/dist/installer/init.d.ts.map +1 -1
- package/dist/installer/init.js +2 -1
- package/dist/installer/init.js.map +1 -1
- package/dist/installer/opencode-config.d.ts +3 -3
- package/dist/installer/opencode-config.js +1 -1
- package/dist/installer/project-capabilities.d.ts +35 -0
- package/dist/installer/project-capabilities.d.ts.map +1 -0
- package/dist/installer/project-capabilities.js +82 -0
- package/dist/installer/project-capabilities.js.map +1 -0
- package/dist/installer/upgrade.d.ts.map +1 -1
- package/dist/installer/upgrade.js +9 -1
- package/dist/installer/upgrade.js.map +1 -1
- package/dist/queue/cli.d.ts.map +1 -1
- package/dist/queue/cli.js +32 -5
- package/dist/queue/cli.js.map +1 -1
- package/dist/queue/executor.d.ts +1 -0
- package/dist/queue/executor.d.ts.map +1 -1
- package/dist/queue/executor.js +155 -11
- package/dist/queue/executor.js.map +1 -1
- package/dist/queue/process-ownership.d.ts +12 -0
- package/dist/queue/process-ownership.d.ts.map +1 -0
- package/dist/queue/process-ownership.js +58 -0
- package/dist/queue/process-ownership.js.map +1 -0
- package/dist/queue/queue.d.ts +25 -1
- package/dist/queue/queue.d.ts.map +1 -1
- package/dist/queue/queue.js +96 -11
- package/dist/queue/queue.js.map +1 -1
- package/dist/queue/service.d.ts.map +1 -1
- package/dist/queue/service.js +19 -2
- package/dist/queue/service.js.map +1 -1
- package/dist/queue/storage.d.ts +3 -1
- package/dist/queue/storage.d.ts.map +1 -1
- package/dist/queue/storage.js +25 -15
- package/dist/queue/storage.js.map +1 -1
- package/dist/queue/supervision.d.ts +38 -0
- package/dist/queue/supervision.d.ts.map +1 -0
- package/dist/queue/supervision.js +247 -0
- package/dist/queue/supervision.js.map +1 -0
- package/dist/queue/tools.d.ts.map +1 -1
- package/dist/queue/tools.js +4 -2
- package/dist/queue/tools.js.map +1 -1
- package/docs/MIGRATION.md +110 -9
- package/docs/QUEUE.md +350 -16
- package/docs/SECURITY.md +5 -2
- package/docs/TROUBLESHOOTING.md +82 -8
- package/package.json +1 -1
- package/templates/.opencode/agents/scheduled-coder.md +14 -1
- package/templates/.opencode/agents/scheduled-planner.md +64 -3
- package/templates/.opencode/skills/scheduled-quality-coder/SKILL.md +29 -3
- package/templates/.opencode/skills/scheduled-quality-orchestrator/SKILL.md +65 -4
- package/templates/.opencode/skills/scheduled-quality-reviewer/SKILL.md +19 -1
- package/templates/AGENTS.md.fragment +10 -4
- package/templates/README.md +3 -1
- package/templates/automation/config.schema.json +212 -22
- package/templates/automation/task-contract.schema.json +573 -49
- package/templates/automation/tasks/TASK-TEMPLATE.json.example +9 -4
- package/templates/automation/verification/collect.init.gradle +98 -0
- package/templates/automation/verification/contract.cjs +93 -0
- package/templates/automation/verification/inventory.cjs +433 -0
- package/templates/automation/verification/project.cjs +172 -0
- package/templates/automation/verification/recovery.cjs +426 -0
- package/templates/scripts/automation/acceptance-report.sh +17 -0
- package/templates/scripts/automation/claim-task.sh +35 -2
- package/templates/scripts/automation/integration-scope-gate.sh +3 -3
- package/templates/scripts/automation/lib.sh +61 -19
- package/templates/scripts/automation/orchestrate-task.sh +7 -1
- package/templates/scripts/automation/preflight.sh +1 -2
- package/templates/scripts/automation/quality-gate.sh +10 -1
- package/templates/scripts/automation/record-red.sh +13 -1
- package/templates/scripts/automation/resume-task.sh +3 -0
- package/templates/scripts/automation/scope-gate.sh +4 -4
- package/templates/scripts/automation/show-acceptance-review.sh +1 -0
- package/templates/scripts/automation/status.sh +32 -0
- package/templates/scripts/automation/submit-review.sh +10 -1
- package/templates/scripts/automation/validate-contract.sh +10 -1
- package/templates/scripts/automation/verify-integration.sh +3 -0
- package/templates/scripts/automation/verify-task.sh +3 -0
package/dist/queue/service.js
CHANGED
|
@@ -5,6 +5,7 @@ import { fileURLToPath } from "node:url";
|
|
|
5
5
|
import { atomicJson, fileLock, invariant, isAlive, processIdentity, readJson, recoverLock } from "./storage.js";
|
|
6
6
|
import { helper, QueueExecutor } from "./executor.js";
|
|
7
7
|
import { androidSdkCandidate } from "../config/android-sdk.js";
|
|
8
|
+
import { gradleBuildRoot } from "../installer/project-capabilities.js";
|
|
8
9
|
const entry = fileURLToPath(new URL("./cli.js", import.meta.url));
|
|
9
10
|
export function serviceStatus(queue) {
|
|
10
11
|
const path = join(queue.storage.runtime, "service.json");
|
|
@@ -58,24 +59,38 @@ export async function runWorker(queue, runId) {
|
|
|
58
59
|
let run = null;
|
|
59
60
|
queue.storage.transaction(document => {
|
|
60
61
|
invariant(document.active?.id === runId && document.active.worker === null, "Execution is missing, already started, or belongs to another worker");
|
|
62
|
+
if (document.active.supervision) {
|
|
63
|
+
invariant(document.active.supervision.state === "RUNNING" && document.active.supervision.owner && isAlive(document.active.supervision.owner), "Approved Worker supervisor is not running");
|
|
64
|
+
invariant(process.env.AUTOMATION_WORKER_TOKEN === document.active.supervision.token, "Supervised Worker ownership token is missing");
|
|
65
|
+
}
|
|
61
66
|
document.active.worker = owner;
|
|
62
67
|
run = structuredClone(document.active);
|
|
63
68
|
});
|
|
64
69
|
invariant(run, "Execution reservation is missing");
|
|
70
|
+
if (process.env.AUTOMATION_WORKER_TOKEN) {
|
|
71
|
+
// Supervised builds must not reuse or stop another task's shared daemon.
|
|
72
|
+
process.env.GRADLE_OPTS = `${process.env.GRADLE_OPTS ?? ""} -Dorg.gradle.daemon=false`.trim();
|
|
73
|
+
}
|
|
65
74
|
// Resolve on the source root before entering an isolated worktree. Its
|
|
66
75
|
// ignored local.properties is deliberately never copied into task workspaces.
|
|
67
|
-
const sdk = androidSdkCandidate(queue.storage.root);
|
|
76
|
+
const sdk = androidSdkCandidate(gradleBuildRoot(queue.config(), queue.storage.root));
|
|
68
77
|
if (sdk)
|
|
69
78
|
process.env.ANDROID_HOME = sdk.directory;
|
|
70
79
|
await new QueueExecutor(queue, run).execute();
|
|
71
80
|
}
|
|
72
81
|
/** Reconcile persisted outcomes before consuming; a wake carries no authority. */
|
|
73
82
|
export function dispatchOnce(queue) {
|
|
83
|
+
const active = queue.storage.read().active;
|
|
84
|
+
if (active?.supervision && !["EXITED", "OWNERSHIP_BLOCKED"].includes(active.supervision.state) &&
|
|
85
|
+
(!active.supervision.owner || !isAlive(active.supervision.owner))) {
|
|
86
|
+
detach(queue, ["_supervise", active.id], `supervisor-${active.id}.log`);
|
|
87
|
+
return null;
|
|
88
|
+
}
|
|
74
89
|
queue.reconcile();
|
|
75
90
|
releaseStoppedLeases(queue);
|
|
76
91
|
const run = queue.reserve();
|
|
77
92
|
if (run)
|
|
78
|
-
detach(queue, ["_worker", run.id], `executor-${run.id}.log`);
|
|
93
|
+
detach(queue, [run.supervision ? "_supervise" : "_worker", run.id], `executor-${run.id}.log`);
|
|
79
94
|
return run;
|
|
80
95
|
}
|
|
81
96
|
export function releaseStoppedLeases(queue) {
|
|
@@ -135,6 +150,8 @@ export async function serve(queue) {
|
|
|
135
150
|
if (stopped)
|
|
136
151
|
break;
|
|
137
152
|
const deadlines = queue.storage.read().items.filter(item => item.state === "QUEUED" && item.notBefore).map(item => Date.parse(item.notBefore) - Date.now()).filter(delay => delay > 0);
|
|
153
|
+
deadlines.push(...queue.storage.read().items.filter(item => item.state === "BLOCKED" && item.baselineRecovery?.nextRunAt != null)
|
|
154
|
+
.map(item => item.baselineRecovery.nextRunAt - Date.now()).filter(delay => delay > 0));
|
|
138
155
|
const delay = Math.max(50, Math.min(interval, ...deadlines));
|
|
139
156
|
await new Promise(done => {
|
|
140
157
|
const timer = setTimeout(() => { wake = null; done(); }, delay);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/queue/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAwB,MAAM,cAAc,CAAC;AACtI,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/queue/service.ts"],"names":[],"mappings":"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"}
|
package/dist/queue/storage.d.ts
CHANGED
|
@@ -17,7 +17,9 @@ export declare function processGroupAlive(pid: number): boolean;
|
|
|
17
17
|
/** Exclusive creation has no timeout takeover. Unknown/dead owners fail closed.
|
|
18
18
|
* Only a verified dead owner may be removed by explicit recovery. */
|
|
19
19
|
export declare function fileLock(path: string, waitMs?: number): () => void;
|
|
20
|
-
export declare function recoverLock(path: string
|
|
20
|
+
export declare function recoverLock(path: string, expectedOwner?: ProcessIdentity & {
|
|
21
|
+
token?: string;
|
|
22
|
+
}): boolean;
|
|
21
23
|
export declare class QueueStorage<T> {
|
|
22
24
|
private readonly initial;
|
|
23
25
|
readonly root: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/queue/storage.ts"],"names":[],"mappings":"AAQA,wBAAgB,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAEhF;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAQjF;AAED,gFAAgF;AAChF,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAOvE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAS3D;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAG3C;AAED,6EAA6E;AAC7E,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAY7D;AAED,MAAM,WAAW,eAAe;IAAG,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE;AAEjE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CASnE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAEvD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAOtD;AAED;qEACqE;AACrE,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAO,GAAG,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/queue/storage.ts"],"names":[],"mappings":"AAQA,wBAAgB,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAEhF;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAQjF;AAED,gFAAgF;AAChF,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAOvE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAS3D;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAG3C;AAED,6EAA6E;AAC7E,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAY7D;AAED,MAAM,WAAW,eAAe;IAAG,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE;AAEjE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CASnE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAEvD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAOtD;AAED;qEACqE;AACrE,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,SAAO,GAAG,MAAM,IAAI,CA6BhE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,eAAe,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAevG;AAED,qBAAa,YAAY,CAAC,CAAC;IAKM,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJvD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBACd,SAAS,EAAE,MAAM,EAAmB,OAAO,EAAE,MAAM,CAAC;IAUhE,IAAI,IAAI,CAAC;IACT,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;IAS7C,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAGtC"}
|
package/dist/queue/storage.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createHash, randomUUID } from "node:crypto";
|
|
2
2
|
import { spawnSync } from "node:child_process";
|
|
3
|
-
import { closeSync, existsSync, fsyncSync, lstatSync, mkdirSync, openSync, readFileSync, realpathSync, renameSync, unlinkSync, writeFileSync, } from "node:fs";
|
|
3
|
+
import { closeSync, existsSync, fsyncSync, linkSync, lstatSync, mkdirSync, openSync, readFileSync, realpathSync, renameSync, unlinkSync, writeFileSync, } from "node:fs";
|
|
4
4
|
import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
|
|
5
5
|
export function invariant(condition, message) {
|
|
6
6
|
if (!condition)
|
|
@@ -95,25 +95,33 @@ export function fileLock(path, waitMs = 5000) {
|
|
|
95
95
|
const identity = processIdentity(process.pid);
|
|
96
96
|
invariant(identity, "Cannot record lock owner");
|
|
97
97
|
const token = randomUUID();
|
|
98
|
-
|
|
99
|
-
|
|
98
|
+
// Publish a complete owner record atomically. A crash between exclusive
|
|
99
|
+
// creation and writing must not leave an anonymous, unrecoverable lock.
|
|
100
|
+
const pending = `${path}.pending-${token}`;
|
|
101
|
+
const descriptor = openSync(pending, "wx", 0o600);
|
|
102
|
+
try {
|
|
100
103
|
try {
|
|
101
|
-
descriptor
|
|
102
|
-
|
|
104
|
+
writeFileSync(descriptor, JSON.stringify({ ...identity, token }));
|
|
105
|
+
fsyncSync(descriptor);
|
|
106
|
+
}
|
|
107
|
+
finally {
|
|
108
|
+
closeSync(descriptor);
|
|
103
109
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
110
|
+
for (let attempt = 0;; attempt += 1) {
|
|
111
|
+
try {
|
|
112
|
+
linkSync(pending, path);
|
|
113
|
+
break;
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
if (error.code !== "EEXIST" || attempt * 20 >= waitMs) {
|
|
117
|
+
throw new Error(`Queue transaction is occupied; retry or recover its recorded owner: ${path}`, { cause: error });
|
|
118
|
+
}
|
|
119
|
+
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 20);
|
|
107
120
|
}
|
|
108
|
-
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 20);
|
|
109
121
|
}
|
|
110
122
|
}
|
|
111
|
-
try {
|
|
112
|
-
writeFileSync(descriptor, JSON.stringify({ ...identity, token }));
|
|
113
|
-
fsyncSync(descriptor);
|
|
114
|
-
}
|
|
115
123
|
finally {
|
|
116
|
-
|
|
124
|
+
unlinkSync(pending);
|
|
117
125
|
}
|
|
118
126
|
return () => {
|
|
119
127
|
const owner = readJson(path);
|
|
@@ -121,7 +129,7 @@ export function fileLock(path, waitMs = 5000) {
|
|
|
121
129
|
unlinkSync(path);
|
|
122
130
|
};
|
|
123
131
|
}
|
|
124
|
-
export function recoverLock(path) {
|
|
132
|
+
export function recoverLock(path, expectedOwner) {
|
|
125
133
|
if (!existsSync(path))
|
|
126
134
|
return false;
|
|
127
135
|
const release = fileLock(`${path}.recovery`);
|
|
@@ -130,6 +138,8 @@ export function recoverLock(path) {
|
|
|
130
138
|
return false;
|
|
131
139
|
const before = readFileSync(path, "utf8");
|
|
132
140
|
const owner = readJson(path);
|
|
141
|
+
if (expectedOwner && (owner.pid !== expectedOwner.pid || owner.started !== expectedOwner.started || owner.token !== expectedOwner.token))
|
|
142
|
+
return false;
|
|
133
143
|
invariant(!isAlive(owner), "Lock owner is still alive; refusing recovery");
|
|
134
144
|
invariant(readFileSync(path, "utf8") === before, "Lock changed during recovery");
|
|
135
145
|
// Atomic rename preserves the original record for diagnosis. Never remove a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/queue/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EACL,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/queue/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { TaskQueue } from "./queue.js";
|
|
2
|
+
import { type ProcessIdentity } from "./storage.js";
|
|
3
|
+
import { type OwnedProcess } from "./process-ownership.js";
|
|
4
|
+
export interface ExecutionPolicy {
|
|
5
|
+
version: 1;
|
|
6
|
+
maxRunMs: number;
|
|
7
|
+
maxStageMs: number;
|
|
8
|
+
terminationGraceMs: number;
|
|
9
|
+
}
|
|
10
|
+
export interface Supervision {
|
|
11
|
+
owner: ProcessIdentity | null;
|
|
12
|
+
token: string;
|
|
13
|
+
startedAt: number;
|
|
14
|
+
deadline: number;
|
|
15
|
+
stage: string;
|
|
16
|
+
stageStartedAt: number;
|
|
17
|
+
stageDeadline: number;
|
|
18
|
+
state: "RUNNING" | "TERM_SENT" | "KILL_SENT" | "OWNERSHIP_BLOCKED" | "EXITED";
|
|
19
|
+
stopReason: string | null;
|
|
20
|
+
termAt: number | null;
|
|
21
|
+
killAt: number | null;
|
|
22
|
+
known: OwnedProcess[];
|
|
23
|
+
events: Array<{
|
|
24
|
+
at: number;
|
|
25
|
+
kind: string;
|
|
26
|
+
pid?: number;
|
|
27
|
+
started?: string;
|
|
28
|
+
}>;
|
|
29
|
+
}
|
|
30
|
+
export declare function initialSupervision(policy: ExecutionPolicy, now: number): Supervision;
|
|
31
|
+
export declare function supervisionEvidence(record: Supervision): Omit<Supervision, "token"> & {
|
|
32
|
+
ownershipDigest: string;
|
|
33
|
+
};
|
|
34
|
+
export declare function deadlineReason(record: Supervision, now: number): string | null;
|
|
35
|
+
export declare function recoverOwnedTransaction(queue: TaskQueue, record: Supervision, worker: ProcessIdentity | null): void;
|
|
36
|
+
/** Independent of both Worker event-loop progress and the scheduler lifetime. */
|
|
37
|
+
export declare function supervise(queue: TaskQueue, runId: string): Promise<void>;
|
|
38
|
+
//# sourceMappingURL=supervision.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"supervision.d.ts","sourceRoot":"","sources":["../../src/queue/supervision.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAY,MAAM,YAAY,CAAC;AACtD,OAAO,EAAuF,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACzI,OAAO,EAA2C,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGpG,MAAM,WAAW,eAAe;IAAG,OAAO,EAAE,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE;AACjH,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,eAAe,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAClF,KAAK,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAC7D,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,WAAW,GAAG,mBAAmB,GAAG,QAAQ,CAAC;IAC9E,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACxE,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,MAAM,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC7E;AAGD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,GAAG,WAAW,CAIpF;AACD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAGjH;AACD,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK9E;AAmBD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI,GAAG,IAAI,CAyBnH;AAsCD,iFAAiF;AACjF,wBAAsB,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsG9E"}
|
|
@@ -0,0 +1,247 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import { randomBytes } from "node:crypto";
|
|
3
|
+
import { existsSync } from "node:fs";
|
|
4
|
+
import { join } from "node:path";
|
|
5
|
+
import { fileURLToPath } from "node:url";
|
|
6
|
+
import { atomicJson, git, invariant, isAlive, processIdentity, readJson, recoverLock, sha256 } from "./storage.js";
|
|
7
|
+
import { ownedTree, processSnapshot, signalOwned } from "./process-ownership.js";
|
|
8
|
+
import { helper } from "./executor.js";
|
|
9
|
+
const entry = fileURLToPath(new URL("./cli.js", import.meta.url));
|
|
10
|
+
const wait = (ms) => new Promise(resolve => setTimeout(resolve, ms));
|
|
11
|
+
export function initialSupervision(policy, now) {
|
|
12
|
+
return { owner: null, token: randomBytes(32).toString("hex"), startedAt: now, deadline: now + policy.maxRunMs,
|
|
13
|
+
stage: "preparation", stageStartedAt: now, stageDeadline: now + policy.maxStageMs,
|
|
14
|
+
state: "RUNNING", stopReason: null, termAt: null, killAt: null, known: [], events: [] };
|
|
15
|
+
}
|
|
16
|
+
export function supervisionEvidence(record) {
|
|
17
|
+
const { token, ...evidence } = record;
|
|
18
|
+
return { ...evidence, ownershipDigest: sha256(token) };
|
|
19
|
+
}
|
|
20
|
+
export function deadlineReason(record, now) {
|
|
21
|
+
if (now < record.startedAt || now < record.stageStartedAt)
|
|
22
|
+
return "Clock moved backwards; ownership review required";
|
|
23
|
+
if (now >= record.deadline)
|
|
24
|
+
return "Approved Worker execution deadline exceeded";
|
|
25
|
+
if (now >= record.stageDeadline)
|
|
26
|
+
return `Approved ${record.stage} stage deadline exceeded`;
|
|
27
|
+
return null;
|
|
28
|
+
}
|
|
29
|
+
function stageFor(queue, run) {
|
|
30
|
+
if (["integrate", "recover", "revalidate"].includes(run.kind))
|
|
31
|
+
return "integration";
|
|
32
|
+
if (run.kind === "abort")
|
|
33
|
+
return "abort";
|
|
34
|
+
const item = queue.item(run.key), file = join(queue.storage.runtime, "state", `${item.taskId}.json`);
|
|
35
|
+
const state = existsSync(file) ? readJson(file).state : item.state;
|
|
36
|
+
if (["READY_TO_COMMIT", "INTEGRATING", "COMPLETED"].includes(state))
|
|
37
|
+
return "integration";
|
|
38
|
+
if (["READY_FOR_REVIEW", "REVIEWING", "CHANGES_REQUESTED"].includes(state))
|
|
39
|
+
return "review";
|
|
40
|
+
if (["PENDING", "CODING"].includes(state))
|
|
41
|
+
return existsSync(join(queue.storage.runtime, "evidence", item.taskId, "baseline.json")) ? "coding" : "baseline";
|
|
42
|
+
return run.supervision.stage;
|
|
43
|
+
}
|
|
44
|
+
function update(queue, runId, owner, action) {
|
|
45
|
+
queue.storage.transaction(document => {
|
|
46
|
+
invariant(document.active?.id === runId, "Supervisor lost its execution reservation");
|
|
47
|
+
invariant(document.active.supervision?.owner?.pid === owner.pid && document.active.supervision.owner.started === owner.started, "Supervisor identity changed");
|
|
48
|
+
action(document.active);
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
export function recoverOwnedTransaction(queue, record, worker) {
|
|
52
|
+
if (!existsSync(queue.storage.lockPath))
|
|
53
|
+
return;
|
|
54
|
+
let owner;
|
|
55
|
+
try {
|
|
56
|
+
owner = readJson(queue.storage.lockPath);
|
|
57
|
+
}
|
|
58
|
+
catch (error) {
|
|
59
|
+
// A live transaction creates its lock exclusively before writing its owner
|
|
60
|
+
// and may release it between exists/read. Leave ambiguous bytes untouched;
|
|
61
|
+
// normal transaction acquisition still waits and refuses an occupied lock.
|
|
62
|
+
if (error instanceof SyntaxError || error.code === "ENOENT")
|
|
63
|
+
return;
|
|
64
|
+
throw error;
|
|
65
|
+
}
|
|
66
|
+
if (isAlive(owner))
|
|
67
|
+
return;
|
|
68
|
+
// The process probe runs outside the file read. A short-lived transaction
|
|
69
|
+
// can release its lock and exit before ps answers. Recheck the exact owner
|
|
70
|
+
// before rejecting it, and bind any recovery to this same lock generation.
|
|
71
|
+
try {
|
|
72
|
+
const current = readJson(queue.storage.lockPath);
|
|
73
|
+
if (current.pid !== owner.pid || current.started !== owner.started || current.token !== owner.token)
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
catch (error) {
|
|
77
|
+
if (error instanceof SyntaxError || error.code === "ENOENT")
|
|
78
|
+
return;
|
|
79
|
+
throw error;
|
|
80
|
+
}
|
|
81
|
+
invariant([...(worker ? [worker] : []), ...(record.owner ? [record.owner] : []), ...record.known].some(p => p.pid === owner.pid && p.started === owner.started), "Dead queue lock does not belong to the supervised execution; explicit recovery required");
|
|
82
|
+
recoverLock(queue.storage.lockPath, owner);
|
|
83
|
+
}
|
|
84
|
+
function finishStopped(queue, run) {
|
|
85
|
+
const item = queue.item(run.key), evidence = join(queue.storage.runtime, "evidence", item.taskId);
|
|
86
|
+
// A commit may already be visible. Preserve its transaction for the existing
|
|
87
|
+
// idempotent recovery route; never start integration again here.
|
|
88
|
+
const commit = existsSync(join(evidence, "commit-transaction.json"));
|
|
89
|
+
const state = commit ? "INTEGRATION_BLOCKED" : "BLOCKED";
|
|
90
|
+
const note = `${run.supervision.stopReason}; all owned processes exited; candidate retained`;
|
|
91
|
+
const statePath = join(queue.storage.runtime, "state", `${item.taskId}.json`);
|
|
92
|
+
const previous = existsSync(statePath) ? readJson(statePath) : { revision: 0 };
|
|
93
|
+
atomicJson(statePath, { taskId: item.taskId, state, revision: previous.revision + 1,
|
|
94
|
+
updatedAt: new Date().toISOString(), updatedBy: "worker-supervisor", note });
|
|
95
|
+
let diff = null, head = "";
|
|
96
|
+
const workspacePath = join(queue.storage.runtime, "workspaces", `${item.taskId}.json`);
|
|
97
|
+
if (!commit && existsSync(workspacePath)) {
|
|
98
|
+
const workspace = readJson(workspacePath);
|
|
99
|
+
invariant(git(workspace.taskRoot, ["symbolic-ref", "--short", "HEAD"]) === workspace.taskBranch, "Stopped workspace branch changed");
|
|
100
|
+
head = git(workspace.taskRoot, ["rev-parse", "HEAD"]);
|
|
101
|
+
invariant(head === workspace.baselineHead, "Stopped workspace HEAD changed; preserve lease for explicit recovery");
|
|
102
|
+
diff = helper(workspace.taskRoot, "automation_worktree_diff_sha", [workspace.taskRoot]);
|
|
103
|
+
const patch = helper(workspace.taskRoot, "automation_worktree_patch_at", [workspace.taskRoot]);
|
|
104
|
+
atomicJson(join(evidence, "queue-seal.json"), { runId: run.id, queueKey: item.key, taskRoot: workspace.taskRoot,
|
|
105
|
+
taskBranch: workspace.taskBranch, head, diffSha256: diff, patch, state, sealedAt: new Date().toISOString(), stoppedBySupervisor: true });
|
|
106
|
+
}
|
|
107
|
+
queue.storage.transaction(document => {
|
|
108
|
+
invariant(document.active?.id === run.id && document.active.supervision?.owner?.pid === run.supervision.owner.pid, "Stopped execution changed before sealing");
|
|
109
|
+
document.active.outcome = { state, error: note };
|
|
110
|
+
document.active.supervision.state = "EXITED";
|
|
111
|
+
document.active.supervision.events.push({ at: Date.now(), kind: "exit-confirmed" });
|
|
112
|
+
const current = document.items.find(candidate => candidate.key === item.key);
|
|
113
|
+
current.state = state;
|
|
114
|
+
if (current.baselineRecovery)
|
|
115
|
+
current.baselineRecovery.nextRunAt = null;
|
|
116
|
+
current.sealedDiff = diff;
|
|
117
|
+
current.sealedRunId = diff ? run.id : null;
|
|
118
|
+
current.candidateId = diff ? sha256(`${item.digest}:${head}:${diff}`) : null;
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
/** Independent of both Worker event-loop progress and the scheduler lifetime. */
|
|
122
|
+
export async function supervise(queue, runId) {
|
|
123
|
+
const owner = processIdentity(process.pid);
|
|
124
|
+
invariant(owner, "Cannot identify Worker supervisor");
|
|
125
|
+
let run = queue.storage.read().active;
|
|
126
|
+
invariant(run?.id === runId && run.supervision, "Missing approved supervision reservation");
|
|
127
|
+
const previous = run.supervision.owner;
|
|
128
|
+
if (previous && isAlive(previous))
|
|
129
|
+
return;
|
|
130
|
+
recoverOwnedTransaction(queue, run.supervision, run.worker);
|
|
131
|
+
queue.storage.transaction(document => {
|
|
132
|
+
invariant(document.active?.id === runId && document.active.supervision, "Supervision reservation changed");
|
|
133
|
+
const current = document.active.supervision.owner;
|
|
134
|
+
invariant(!current || !isAlive(current), "Supervisor already alive");
|
|
135
|
+
document.active.supervision.owner = owner;
|
|
136
|
+
document.active.supervision.events.push({ at: Date.now(), kind: previous ? "supervisor-restarted" : "supervisor-started" });
|
|
137
|
+
});
|
|
138
|
+
const policy = queue.item(run.key).contract.execution;
|
|
139
|
+
let launched = false;
|
|
140
|
+
try {
|
|
141
|
+
if (!run.worker && !previous) {
|
|
142
|
+
const env = { ...process.env, AUTOMATION_WORKER_TOKEN: run.supervision.token };
|
|
143
|
+
const child = spawn(process.execPath, [entry, "_worker", runId, queue.storage.root], { cwd: queue.storage.root, env, detached: true, stdio: "inherit" });
|
|
144
|
+
child.on("error", () => { });
|
|
145
|
+
child.unref();
|
|
146
|
+
launched = true;
|
|
147
|
+
}
|
|
148
|
+
let previousClock = Date.now(), emptySnapshots = 0;
|
|
149
|
+
for (;;) {
|
|
150
|
+
run = queue.storage.read().active;
|
|
151
|
+
invariant(run?.id === runId && run.supervision, "Supervisor reservation disappeared");
|
|
152
|
+
const record = run.supervision, now = Date.now();
|
|
153
|
+
invariant(now >= previousClock, "Clock moved backwards; retain execution slot");
|
|
154
|
+
previousClock = now;
|
|
155
|
+
if (record.state === "EXITED" || record.state === "OWNERSHIP_BLOCKED")
|
|
156
|
+
return;
|
|
157
|
+
if (!run.worker) {
|
|
158
|
+
invariant(launched && now < record.startedAt + Math.min(policy.maxRunMs, 30000), "Worker launch has no registered ownership; explicit recovery required");
|
|
159
|
+
await wait(250);
|
|
160
|
+
continue;
|
|
161
|
+
}
|
|
162
|
+
const tree = ownedTree(processSnapshot(record.token), run.worker, record.known);
|
|
163
|
+
recoverOwnedTransaction(queue, record, run.worker);
|
|
164
|
+
if (!tree.length) {
|
|
165
|
+
emptySnapshots++;
|
|
166
|
+
if (emptySnapshots < 2) {
|
|
167
|
+
await wait(250);
|
|
168
|
+
continue;
|
|
169
|
+
}
|
|
170
|
+
if (!run.outcome && !record.stopReason)
|
|
171
|
+
update(queue, runId, owner, current => {
|
|
172
|
+
current.supervision.stopReason = "Worker exited without a durable outcome";
|
|
173
|
+
});
|
|
174
|
+
run = queue.storage.read().active;
|
|
175
|
+
if (run.supervision.stopReason)
|
|
176
|
+
finishStopped(queue, run);
|
|
177
|
+
else
|
|
178
|
+
update(queue, runId, owner, current => {
|
|
179
|
+
current.supervision.state = "EXITED";
|
|
180
|
+
current.supervision.events.push({ at: Date.now(), kind: "exit-confirmed" });
|
|
181
|
+
});
|
|
182
|
+
const document = queue.storage.read();
|
|
183
|
+
const final = document.active?.id === runId ? document.active : document.runs.find(candidate => candidate.id === runId);
|
|
184
|
+
invariant(final, "Completed supervision evidence is missing");
|
|
185
|
+
atomicJson(join(queue.storage.runtime, "evidence", queue.item(final.key).taskId, `worker-stop-${runId}.json`), supervisionEvidence(final.supervision));
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
emptySnapshots = 0;
|
|
189
|
+
const stage = stageFor(queue, run);
|
|
190
|
+
const reason = record.stopReason ?? deadlineReason(record, now);
|
|
191
|
+
if (stage !== record.stage && !reason)
|
|
192
|
+
update(queue, runId, owner, current => {
|
|
193
|
+
const s = current.supervision;
|
|
194
|
+
s.stage = stage;
|
|
195
|
+
s.stageStartedAt = now;
|
|
196
|
+
s.stageDeadline = Math.min(s.deadline, now + policy.maxStageMs);
|
|
197
|
+
s.events.push({ at: now, kind: `stage:${stage}` });
|
|
198
|
+
});
|
|
199
|
+
const fresh = tree.filter(p => !record.known.some(k => k.pid === p.pid && k.started === p.started));
|
|
200
|
+
if (fresh.length)
|
|
201
|
+
update(queue, runId, owner, current => {
|
|
202
|
+
const live = new Set(tree.map(p => `${p.pid}:${p.started}`));
|
|
203
|
+
current.supervision.known = [...current.supervision.known.filter(p => !live.has(`${p.pid}:${p.started}`)).slice(-(512 - tree.length)), ...tree];
|
|
204
|
+
});
|
|
205
|
+
if (reason) {
|
|
206
|
+
const signal = record.termAt !== null && now >= record.termAt + policy.terminationGraceMs ? "SIGKILL" : "SIGTERM";
|
|
207
|
+
invariant(record.killAt === null || now < record.killAt + 10000, "Owned processes did not exit after KILL; preserve execution slot");
|
|
208
|
+
update(queue, runId, owner, current => {
|
|
209
|
+
const s = current.supervision;
|
|
210
|
+
s.stopReason = reason;
|
|
211
|
+
if (s.termAt === null)
|
|
212
|
+
s.termAt = now;
|
|
213
|
+
if (signal === "SIGKILL" && s.killAt === null)
|
|
214
|
+
s.killAt = now;
|
|
215
|
+
s.state = signal === "SIGKILL" ? "KILL_SENT" : "TERM_SENT";
|
|
216
|
+
});
|
|
217
|
+
// Stop the Worker first so it cannot start a fresh stage while children
|
|
218
|
+
// handle TERM. Never signal a process group or a name-matched daemon.
|
|
219
|
+
tree.sort((a, b) => Number(b.pid === run.worker.pid) - Number(a.pid === run.worker.pid));
|
|
220
|
+
for (const process of tree) {
|
|
221
|
+
if (record.events.some(e => (e.kind === `${signal}:sent` || e.kind === `${signal}:gone`) && e.pid === process.pid && e.started === process.started))
|
|
222
|
+
continue;
|
|
223
|
+
update(queue, runId, owner, current => current.supervision.events.push({ at: Date.now(), kind: signal, pid: process.pid, started: process.started }));
|
|
224
|
+
const sent = signalOwned(record.token, process, signal, [...record.known, ...fresh]);
|
|
225
|
+
update(queue, runId, owner, current => current.supervision.events.push({ at: Date.now(), kind: `${signal}:${sent ? "sent" : "gone"}`, pid: process.pid, started: process.started }));
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
await wait(250);
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
catch (error) {
|
|
232
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
233
|
+
// No timeout ever authorizes taking an unknown lock or killing an unknown process.
|
|
234
|
+
try {
|
|
235
|
+
update(queue, runId, owner, current => {
|
|
236
|
+
current.supervision.state = "OWNERSHIP_BLOCKED";
|
|
237
|
+
current.supervision.stopReason = message;
|
|
238
|
+
current.supervision.events.push({ at: Date.now(), kind: "ownership-blocked" });
|
|
239
|
+
});
|
|
240
|
+
queue.storage.transaction(document => { document.fault = `Worker termination requires ownership recovery: ${message}`; });
|
|
241
|
+
}
|
|
242
|
+
finally {
|
|
243
|
+
atomicJson(join(queue.storage.runtime, "evidence", queue.item(run.key).taskId, `worker-stop-${runId}-blocked.json`), { runId, reason: message, at: Date.now() });
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
//# sourceMappingURL=supervision.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"supervision.js","sourceRoot":"","sources":["../../src/queue/supervision.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/queue/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/queue/tools.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKlF,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,eAAO,MAAM,gBAAgB,yGAA0G,CAAC;AAExI,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,iBAAuB,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA4GnH;AAED;6DAC6D;AAC7D,wBAAgB,oBAAoB,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAqBjH"}
|
package/dist/queue/tools.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { tool } from "@opencode-ai/plugin";
|
|
2
2
|
import { resolve } from "node:path";
|
|
3
|
+
import { gradleBuildRoot } from "../installer/project-capabilities.js";
|
|
3
4
|
import { installationDoctorChecks } from "../doctor/index.js";
|
|
4
5
|
import { invariant } from "./storage.js";
|
|
5
6
|
import { ApprovalLedger } from "./approvals.js";
|
|
6
|
-
import { TaskQueue } from "./queue.js";
|
|
7
|
+
import { TaskQueue, publicRun } from "./queue.js";
|
|
7
8
|
import { serviceStatus, startService, stopService, wakeService } from "./service.js";
|
|
8
9
|
export const QUEUE_TOOL_NAMES = ["android_orchestrator_snapshot", "android_orchestrator_intake", "android_orchestrator_queue"];
|
|
9
10
|
export function createQueueTools(worktree, approvals = new ApprovalLedger()) {
|
|
@@ -85,7 +86,7 @@ export function createQueueTools(worktree, approvals = new ApprovalLedger()) {
|
|
|
85
86
|
if (args.key)
|
|
86
87
|
return JSON.stringify(queue.details(args.key));
|
|
87
88
|
const document = queue.storage.read();
|
|
88
|
-
return JSON.stringify({ service: serviceStatus(queue), paused: document.paused, fault: document.fault, active: document.active,
|
|
89
|
+
return JSON.stringify({ service: serviceStatus(queue), paused: document.paused, fault: document.fault, active: publicRun(document.active),
|
|
89
90
|
items: document.items.map(({ key, taskId, state, waitingReason, workspaceStrategy, commitPolicy, targetBranch, taskRoot, dependsOn, sealedDiff, candidateId, completedCommit }) => ({ key, taskId, state, waitingReason, workspaceStrategy, commitPolicy, targetBranch, taskRoot, dependsOn, sealedDiff, candidateId, completedCommit, pushed: false })),
|
|
90
91
|
notifications: document.notifications.filter(notification => !notification.acknowledged) });
|
|
91
92
|
}
|
|
@@ -141,6 +142,7 @@ export function guardExecutorCommand(input, output, directory) {
|
|
|
141
142
|
if (gradle.test(command)) {
|
|
142
143
|
invariant(directory, "Gradle execution requires the recorded project configuration");
|
|
143
144
|
const config = new TaskQueue(directory).config();
|
|
145
|
+
invariant(gradleBuildRoot(config, directory) === resolve(directory), "Nested builds must use the managed verification scripts, which select the recorded Gradle root");
|
|
144
146
|
const allowed = Object.values(config.gradleVerification).flat();
|
|
145
147
|
const arguments_ = command.slice("./gradlew ".length).split(" ");
|
|
146
148
|
for (let index = 0; index < arguments_.length; index += 1) {
|