diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 71f14c14a9..ae2c27bce7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,11 +1,11 @@ # Default reviewers -* @lidge-jun @Ingwannu @Wibias +* @lidge-jun @Ingwannu # High-impact runtime behavior -/src/adapters/ @lidge-jun @Ingwannu @Wibias -/src/providers/ @lidge-jun @Ingwannu @Wibias -/src/codex/ @lidge-jun @Ingwannu @Wibias -/src/server/ @lidge-jun @Ingwannu @Wibias +/src/adapters/ @lidge-jun @Ingwannu +/src/providers/ @lidge-jun @Ingwannu +/src/codex/ @lidge-jun @Ingwannu +/src/server/ @lidge-jun @Ingwannu # Repository automation and release security /.github/ @lidge-jun @Ingwannu diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 3214adfdf1..43377c093d 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -9,7 +9,6 @@ review and merge policy. | --- | --- | --- | | [@lidge-jun](https://github.com/lidge-jun) | Project owner | Project direction, releases, repository administration, and final governance decisions | | [@Ingwannu](https://github.com/Ingwannu) | Maintainer | Issue and pull-request triage, `dev` integration, security review, and repository maintenance | -| [@Wibias](https://github.com/Wibias) | Maintainer | Issue and pull-request triage, `dev` integration, and provider/CI maintenance | The table describes project responsibilities. Actual repository permissions remain controlled through GitHub repository settings. @@ -17,6 +16,16 @@ through GitHub repository settings. `dev` is the only integration line. The former `dev2-go` carry duty is retired; see [The retired `dev2-go` line](#the-retired-dev2-go-line). +## Former maintainers + +| GitHub account | Project role | Period | +| --- | --- | --- | +| [@Wibias](https://github.com/Wibias) | Maintainer | 2026-07-27 – 2026-08-19 | + +Former maintainers keep contributor standing and are welcome to open issues and pull requests like +anyone else. Authorship credit in git history, release notes, and code comments is not rewritten +when a maintainer steps down. + ## Review and merge policy - Pull requests target `dev`. It is the only integration line, and promotion to @@ -98,6 +107,24 @@ Adding or removing a maintainer requires: ### Change log +- 2026-08-19 — [@Wibias](https://github.com/Wibias) stepped down as a maintainer + and is now a contributor. This follows his own decision to stop developing + opencodex; it is not a disciplinary action, and it was made with the owner's + agreement (requirement 1). Requirement 2 does not apply to a maintainer's own + resignation, which needs no second maintainer to ratify it. Requirement 3 is + met by this file and `.github/CODEOWNERS`, where the default-reviewer line + and the four runtime paths that listed him (`/src/adapters/`, + `/src/providers/`, `/src/codex/`, `/src/server/`) drop back to the two + remaining maintainers. Repository permission was reduced to read access at + the same time, so the roster and the GitHub settings agree again. + + Nothing he authored is being unwound. His commits, the pull requests he + merged, the release-note attributions, and the code comments citing his + reviews stay exactly as they are, and the trust-lane gate derived from his + work in `.github/scripts/pr-sponsored-surface.cjs` keeps its attribution. + Returning to the maintainer table later would go through the same three + requirements that govern every addition. + - 2026-07-27 — [@Wibias](https://github.com/Wibias) added as a maintainer. Requirement 1 (agreement from the project owner) is met: the owner requested the addition. **Requirement 2 (review by another current maintainer) was @@ -105,10 +132,10 @@ Adding or removing a maintainer requires: carried the addition (`a2693c02`, `dc3a4ade`, `02bbd47a`) landed on `dev` as direct owner pushes with no associated pull request, so no second maintainer reviewed them. Requirement 3 is met by this file and `.github/CODEOWNERS`. - The addition is in effect regardless: @Wibias holds write access on the - repository and has been merging pull requests since 2026-07-26. This entry - records the gap rather than papering over it — a later maintainer change - should go through a reviewed pull request. + The addition took effect regardless: @Wibias held write access on the + repository and merged pull requests from 2026-07-26 until he stepped down on + 2026-08-19. This entry records the gap rather than papering over it — a later + maintainer change should go through a reviewed pull request. Scope covers issue and pull-request triage, `dev` integration, and provider/CI maintenance. (This entry originally also described carrying diff --git a/src/lab/automation/orchestrator.ts b/src/lab/automation/orchestrator.ts index aed122020e..b13cd97d12 100644 --- a/src/lab/automation/orchestrator.ts +++ b/src/lab/automation/orchestrator.ts @@ -473,8 +473,18 @@ export async function enqueueManualLabRun( return { state: next, value: run }; }); if (!created) return null; - // Manual execution is independent of automation enablement/layer toggles. - await runDispatchBatch(configDir, { manualRunId: created.runId, abortSignal }); + // Manual execution can run without activation or a scheduler, so it must own a shutdown + // hook for the lifetime of its dispatch instead of relying on either of those paths. + const detachShutdownHook = registerOptionalShutdownHook( + `lab-automation-manual:${created.runId}`, + requestLabAutomationShutdown, + ); + try { + // Manual execution is independent of automation enablement/layer toggles. + await runDispatchBatch(configDir, { manualRunId: created.runId, abortSignal }); + } finally { + detachShutdownHook(); + } return loadLabAutomationState(configDir).runs.find((row) => row.runId === created.runId) ?? created; } @@ -496,4 +506,4 @@ export function cancelLabAutomationRun(runId: string, configDir?: string): boole } return { state: next, value: true }; }); -} \ No newline at end of file +} diff --git a/tests/lab-automation-review-regressions.test.ts b/tests/lab-automation-review-regressions.test.ts index 52075bff9b..c40778bc06 100644 --- a/tests/lab-automation-review-regressions.test.ts +++ b/tests/lab-automation-review-regressions.test.ts @@ -31,6 +31,10 @@ import type { import { LabAutomationError } from "../src/lab/automation/types"; import { LAB_AUTOMATION_HARD_MAX } from "../src/lab/automation/constants"; import { createHostIssuedLabRouteExecutor } from "../src/lib/lab-live-host"; +import { + resetOptionalShutdownHooksForTests, + runOptionalShutdownHooks, +} from "../src/lib/optional-shutdown-hooks"; import { readInstallationSalt } from "../src/lab/subject/installation-salt"; import type { NormalizedObservation } from "../src/lab/conformance/types"; import { @@ -149,6 +153,7 @@ afterEach(() => { requestLabAutomationShutdown(); stopLabAutomationScheduler(); resetLabAutomationSchedulerStateForTests(); + resetOptionalShutdownHooksForTests(); setLabAutomationDispatchDeps({}); resetCompatibilityVersionCacheForTests(); delete process.env.OPENCODEX_HOME; @@ -239,6 +244,43 @@ describe("CL-08 independent review regressions", () => { expect(result?.state).not.toBe("running"); }); + test("manual run remains cancellable by shutdown after its activation lease is released", async () => { + const home = tempHome(); + prepareHome(home); + const config = providerConfig(); + const plan = planManualLabRun({ + evidenceLayer: "live_route_compatibility", + scenarioId: "responses-core.live.basic-turn", + providerName: "fixture-provider", + modelId: "fixture-model", + config, + configDir: home, + }); + let startedResolve!: () => void; + const started = new Promise((resolve) => { startedResolve = resolve; }); + const release = setLabAutomationDispatchDeps({ + configDir: home, + loadConfig: () => config, + resolve: fixtureDnsResolve(), + routeExecutor: createHostIssuedLabRouteExecutor(async (input) => { + startedResolve(); + if (!input.signal.aborted) { + await new Promise((resolve) => input.signal.addEventListener("abort", () => resolve(), { once: true })); + } + return passObservation(); + }), + }); + + const manualRun = enqueueManualLabRun(plan, home); + await started; + release(); + runOptionalShutdownHooks(); + + const result = await manualRun; + expect(result?.state).toBe("cancelled"); + expect(result?.terminalCode).toBe("cancelled"); + }); + test("disabling the live layer cancels previously queued scheduled live work", async () => { const home = tempHome(); prepareHome(home);