From 1cad3a7d495ea99138db3a7f11d66f1dacd36662 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Tue, 17 Nov 2026 17:20:14 +0000 Subject: [PATCH 1/2] docs: record PRs #33 to #37 as merged in the implementation plan The baseline still listed the desktop interface and Phases D2 to D6 as unmerged branches with no pull request, and did not mention the Testing build workflow. Record the merges, note that the workflow's first runs were still queued with no latest release, and update the resume step, Phase E, and Phase G to match. Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 6 +++ IMPLEMENTATION_PLAN.md | 88 ++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02ea313..49262e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -882,6 +882,12 @@ Changes are recorded here before a release version is assigned. ### Changed +- The implementation plan's baseline now records PRs #33, #34, #36, and #37 + as merged. It had still listed the desktop interface and Phases D2 to D6 as + unmerged branches with no pull request, and it did not mention the Testing + build workflow. The plan now notes that the workflow's first runs were still + queued on 2026-11-17 and that no `latest` release existed yet. + Documentation only. - Package-network destination enforcement is defined as a contract only in ADR-0034. No run accepts a package-network profile, and `--network` remains all-or-nothing. An advisory proxy or proxy environment variables are diff --git a/IMPLEMENTATION_PLAN.md b/IMPLEMENTATION_PLAN.md index ecdec74..45f7cf0 100644 --- a/IMPLEMENTATION_PLAN.md +++ b/IMPLEMENTATION_PLAN.md @@ -77,39 +77,43 @@ This is a resume guide, not a replacement for the owning contracts in - **Phase C17**, version **0.28.0**, the approval-gated model edit tool (ADR-0043). It writes only through the checkpointed apply after an approved, writers-stopped decision. -- Branch `codex/desktop-interface`: **Phase E**, version **0.29.0**, the - desktop interface and session tree (ADR-0044, ADR-0045, ADR-0046). Unlike - the entries above, it is **not merged and has no pull request yet**. It is a - prototype whose windows have run only on Windows; on Linux it builds and its - tests pass. See [the desktop interface guide](docs/desktop-interface.md). -- Same branch, after the Phase E commit `cbbec85`: **Phase D2**, version - **0.30.0**, which lets the local LM Studio adapter read its token from a - stored credential through an operator-selected profile (ADR-0047). It is - **not merged and has no pull request**. -- Same branch, after the Phase D2 commit `b9f7d11`: **Phase D3**, version - **0.31.0**, which binds a stored credential to its profile's endpoint - (ADR-0048). A profile can record a loopback endpoint, and a selected profile - supplies both the endpoint and the token. It is **not merged and has no pull - request**. -- Same branch, after the Phase D3 commit `19b3747`: **Phase D4 and E6**, version - **0.32.0**, which streams the local model's reply and pushes chat events to - the desktop window (ADR-0049). It is **not merged and has no pull request**. -- Same branch, after the Phase D4 and E6 commit `02221e9`: **Phase D5**, version - **0.33.0**, which interrupts a streamed model request when a turn is - cancelled (ADR-0050). A cancelled turn is recorded with the failure reason - `cancelled`, and the desktop exit no longer abandons a streamed turn. It is - **not merged and has no pull request**. -- Branch `codex/request-cancellation`, stacked on `codex/desktop-interface` - (open PR #33): **Phase D6**, version **0.34.0**, which lets a cancel request - stop every model request, streamed or not, and the compaction requests, and - lets Ctrl-C cancel a CLI `chat` turn or `session compact` (ADR-0051). It is - **not committed, not merged, and has no pull request**. +- **PR #33** merged at `9c9f606` on 2026-11-17, from + `codex/desktop-interface`. **PR #34**, from `codex/request-cancellation`, + was stacked on it and merged into that branch first, so both landed in the + same merge commit. The merges were verified through GitHub. Together they + carried: + - **Phase E**, version **0.29.0**, the prototype desktop interface and + session tree (ADR-0044, ADR-0045, ADR-0046). Its windows have run only on + Windows; on Linux it builds and its tests pass. See + [the desktop interface guide](docs/desktop-interface.md). + - **Phase D2**, version **0.30.0**: the local LM Studio adapter reads its + token from a stored credential through an operator-selected profile + (ADR-0047). + - **Phase D3**, version **0.31.0**: a stored credential is bound to its + profile's loopback endpoint, and a selected profile supplies both the + endpoint and the token (ADR-0048). + - **Phases D4 and E6**, version **0.32.0**: the local model's reply streams, + and chat events are pushed to the desktop window (ADR-0049). + - **Phase D5**, version **0.33.0**: a cancelled turn interrupts a streamed + request and is recorded with the failure reason `cancelled` (ADR-0050). + - **Phase D6**, version **0.34.0** (PR #34): a cancel request stops every + model request, streamed or not, and the compaction requests, and Ctrl-C + cancels a CLI `chat` turn or `session compact` (ADR-0051). +- **PR #36** merged at `b58f3f7` on 2026-11-17, from `codex/testing-builds`: + the Testing build workflow, which tests each push to `main`, packages + unsigned Windows, Ubuntu, and Fedora 44 archives with no installer, and + publishes them as the rolling `latest` prerelease (ADR-0052). No + application change; the version stays 0.34.0. On 2026-11-17 its first two + runs, for `b58f3f7` and `4f94774`, were still queued and no `latest` + release existed, so the workflow has not yet completed on GitHub. +- **PR #37** merged at `4f94774` on 2026-11-17: chat-turn cancellation tests + in `omgcode-app` measure their timing from the cancel rather than from the + turn start. Tests and documentation only. Implemented today: - Pinned Rust 1.99.1 workspace with `omgcode-core`, `omgcode-cli`, - `omgcode-platform`, `omgcode-app`, and `omgcode-desktop`. The last two exist - only on the unmerged Phase E branch. + `omgcode-platform`, `omgcode-app`, and `omgcode-desktop`. - Compiled, versioned base prompt `0.1.4` with a visible digest. - Workspace settings, native directory identity, process-local bindings, and a separate settings/audit journal. @@ -246,9 +250,10 @@ Not implemented: provider-native compaction, and caches. Nothing calls the unconfined process runner. - Desktop development panels (terminal tabs, task logs, and diffs), a settings - interface, a recovery interface, packaging and installers, and a + interface, a recovery interface, signed packages and installers, and a Linux run of the desktop shell's windows. The prototype shell, session tree, - search, chat, and approvals window exist on the Phase E branch only. + search, chat, and approvals window are on `main`. The only packaging is the + unsigned rolling testing archives (ADR-0052). - Cloud provider adapters and subscription/API-key login. Only the local LM Studio adapter reads a stored credential, and only at the loopback endpoint recorded with its profile. No endpoint rule exists for a non-loopback @@ -270,9 +275,9 @@ Not implemented: git status --porcelain ``` -2. Verify that the preceding phase's PR is merged. A2b and its review fixes - are merged as PRs #13 and #14. Verify the A2c PR before starting another - increment. Preserve its feature branch while it is under review. +2. Verify that the preceding phase's PR is merged. Every phase listed in the + current baseline is merged as of PR #37. Preserve a feature branch while its + PR is under review. Do not merge a PR without the user's authorization. 3. Re-read the owning contracts for the selected phase. Do not infer authority from this plan, prompts, journals, or model output. @@ -1103,8 +1108,8 @@ credentials, or unrestricted host capabilities. Follow the session, permission, context, and security contracts. Follow the [desktop interface guide](docs/desktop-interface.md). -Version 0.29.0 builds a prototype on branch `codex/desktop-interface`. It is -not merged, and no pull request exists yet. +Version 0.29.0 built the prototype on branch `codex/desktop-interface`. It +merged to `main` in PR #33 with Phases D2 to D6. - **E1 (ADR-0044):** lock-free journal inspection. `SessionInspection::inspect` reads one journal with no lock call, no link following, and the writer's @@ -1162,7 +1167,8 @@ Still open for the desktop: - Git, MCP, skills, and memory interfaces; - a native confirmation dialog for approvals, which would remove the webview from the final decision; -- packaging, signing, and installers (Phase G); +- signing and installers (Phase G); the unsigned testing archives of + ADR-0052 are the only packaging; - automatic repair of a corrupt index behind a valid header, and a protection against two versions sharing one data root and rebuilding each other's index. @@ -1186,6 +1192,14 @@ Mediated Git workflows need controlled credentials, hooks/helpers, network policy, and push approval. Platform qualification, security testing, and release readiness remain separate gates. +PR #36 added the first packaging step: a Testing build workflow publishes +unsigned Windows, Ubuntu, and Fedora 44 archives of each push to `main` as the +rolling `latest` prerelease, with no installer +([ADR-0052](docs/adr/0052-publish-rolling-testing-builds-from-main.md)). The +workspace tests do not run on Fedora. The workflow had not completed a run +when this plan was last verified. Signing, installers, Git workflows, +platform qualification, and release readiness remain open. + ## Known cautions - Build `crates/omgcode-desktop/ui/dist` before any Cargo command that includes From 981f216aed728e70fd8007aa4a54bb137acbbab5 Mon Sep 17 00:00:00 2001 From: James Chapman Date: Tue, 17 Nov 2026 22:20:29 +0000 Subject: [PATCH 2/2] docs: correct merge status and testing-build coverage claims The unreleased entries for 0.29.0 to 0.34.0 still called the desktop interface and cancellation work unmerged; they were merged by PR #33 (PR #34 reached main in the same merge commit). The plan, contributor guide, and platform support table said every push or merge to main is tested and published, but the Testing build group keeps only the newest waiting run, so an intermediate push can be superseded. Co-Authored-By: Claude Opus 5.5 --- AGENTS.md | 4 ++-- CHANGELOG.md | 38 ++++++++++++++++++++++---------------- IMPLEMENTATION_PLAN.md | 16 ++++++++++------ docs/platform-support.md | 2 +- 4 files changed, 35 insertions(+), 25 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index cf5eac1..889407e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -65,8 +65,8 @@ edit tool call in progress is not interruptible On the CLI, Ctrl-C during `chat` or `session compact` cancels instead of ending the process. The desktop shell has no settings interface, development panels, installer, or -recovery interface. CI publishes unsigned archives of each merge to `main` under -the rolling `latest` tag ([ADR-0052](docs/adr/0052-publish-rolling-testing-builds-from-main.md)). Most other planned features are not +recovery interface. CI publishes unsigned archives of the newest tested merge to +`main` under the rolling `latest` tag ([ADR-0052](docs/adr/0052-publish-rolling-testing-builds-from-main.md)). Most other planned features are not implemented. The core validates replacement records and can prepare protected checkpoints on Linux and Windows through a live authorized binding. The CLI provides diff --git a/CHANGELOG.md b/CHANGELOG.md index 49262e7..3de8b7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,9 +29,10 @@ Changes are recorded here before a release version is assigned. [cancelling every request](docs/provider-authentication.md#cancelling-every-request-0340). Until now a non-streamed request and every compaction request ran to their end or to the thirty-second deadline, a non-streamed text-only turn had no - cancel token, and Ctrl-C ended the CLI and left an open turn. It is a - prototype on branch `codex/request-cancellation`, stacked on - `codex/desktop-interface`; it is not merged. It adds no dependency and + cancel token, and Ctrl-C ended the CLI and left an open turn. It was + developed on branch `codex/request-cancellation` (PR #34), stacked on + `codex/desktop-interface`, and reached `main` with PR #33 in merge commit + `9c9f606` on 2026-11-17. It adds no dependency and removes reqwest's `blocking` feature, which drops `futures-channel` and `futures-sink` from two dependency lists in `Cargo.lock`. - **Adapter:** `complete` and `complete_with_tools` take a `CancelToken`, like @@ -90,8 +91,8 @@ Changes are recorded here before a release version is assigned. cancellation was checked only between model rounds and tool calls, a request in flight ran to its end or to the thirty-second deadline, a text-only turn had no cancellation point, and on exit the desktop abandoned a turn still - waiting on the model, leaving an open turn. It is a prototype on branch - `codex/desktop-interface`; it is not merged. It adds no dependency and no + waiting on the model, leaving an open turn. It was developed on branch + `codex/desktop-interface` and merged by PR #33 on 2026-11-17. It adds no dependency and no cargo feature. - **Adapter:** `complete_streaming` and `complete_with_tools_streaming` take a `CancelToken`. The streamed request runs on an async HTTP client inside a @@ -146,8 +147,8 @@ Changes are recorded here before a release version is assigned. desktop window (Phases D4 and E6). See ADR-0049 and [streamed replies](docs/provider-authentication.md#streamed-replies-0320). Until now the adapter sent one non-streaming request, and the desktop - learned that a turn had ended by calling `chat_status` every 750 ms. It is a - prototype on branch `codex/desktop-interface`; it is not merged. It adds no + learned that a turn had ended by calling `chat_status` every 750 ms. It was + developed on branch `codex/desktop-interface` and merged by PR #33. It adds no dependency. - **Adapter:** `LocalModelClient::complete_streaming` and `complete_with_tools_streaming` send the same body as the non-streaming @@ -241,9 +242,10 @@ Changes are recorded here before a release version is assigned. D3). See ADR-0048 and [endpoint binding](docs/provider-authentication.md#endpoint-binding-0310). In 0.30.0 a stored token went to whichever literal loopback endpoint the - operator named with `--endpoint`. It is a prototype on branch - `codex/desktop-interface`; it is not merged. It tightens the 0.30.0 - behaviour, which was never merged or released, and adds no dependency. + operator named with `--endpoint`. It was developed on branch + `codex/desktop-interface` and merged by PR #33. It tightens the 0.30.0 + behaviour, which reached `main` only in the same merge and was never + released, and adds no dependency. - **Profile endpoint:** `workspace provider-profile-add ... --endpoint ` records one endpoint on a profile. `provider-profile-show` and `status` print `"endpoint"` only when one is recorded; a profile without @@ -304,8 +306,8 @@ Changes are recorded here before a release version is assigned. (Phase D2). See ADR-0047 and [stored credential use](docs/provider-authentication.md#stored-credential-use-0300). Until now nothing read a stored credential, and the adapter took its optional - server token only from `OMGCODE_LM_TOKEN`. It is a prototype on branch - `codex/desktop-interface`; it is not merged. It adds no dependency outside + server token only from `OMGCODE_LM_TOKEN`. It was developed on branch + `codex/desktop-interface` and merged by PR #33. It adds no dependency outside the existing workspace set (`omgcode-app` now uses `zeroize`). - **Selection:** `omgcode chat --provider-profile ` and `omgcode session compact --provider-profile ` read the token from the @@ -364,8 +366,8 @@ Changes are recorded here before a release version is assigned. account lifecycle exists. - Version 0.29.0 adds the desktop interface and session tree (Phase E). See ADR-0044, ADR-0045, and ADR-0046, and the - [desktop interface guide](docs/desktop-interface.md). It is a prototype on - branch `codex/desktop-interface`; it has no installer and has run only on + [desktop interface guide](docs/desktop-interface.md). It is a prototype, + merged from branch `codex/desktop-interface` by PR #33; it has no installer and has run only on Windows. No CLI command changed behaviour: every existing CLI test suite passes unmodified, and `model_tools.rs` and `context_cli.rs` moved from `omgcode-cli` into the new `omgcode-app` crate. @@ -886,8 +888,12 @@ Changes are recorded here before a release version is assigned. as merged. It had still listed the desktop interface and Phases D2 to D6 as unmerged branches with no pull request, and it did not mention the Testing build workflow. The plan now notes that the workflow's first runs were still - queued on 2026-11-17 and that no `latest` release existed yet. - Documentation only. + queued on 2026-11-17 and that no `latest` release existed yet. The older + unreleased entries for versions 0.29.0 to 0.34.0 no longer call that work + unmerged. The plan, the contributor guide, and the platform support table + no longer say that every push or merge to `main` is tested and published: + while a Testing build run is active, GitHub keeps only the newest waiting + run, so an intermediate push can be superseded. Documentation only. - Package-network destination enforcement is defined as a contract only in ADR-0034. No run accepts a package-network profile, and `--network` remains all-or-nothing. An advisory proxy or proxy environment variables are diff --git a/IMPLEMENTATION_PLAN.md b/IMPLEMENTATION_PLAN.md index 45f7cf0..4ab5143 100644 --- a/IMPLEMENTATION_PLAN.md +++ b/IMPLEMENTATION_PLAN.md @@ -100,9 +100,11 @@ This is a resume guide, not a replacement for the owning contracts in model request, streamed or not, and the compaction requests, and Ctrl-C cancels a CLI `chat` turn or `session compact` (ADR-0051). - **PR #36** merged at `b58f3f7` on 2026-11-17, from `codex/testing-builds`: - the Testing build workflow, which tests each push to `main`, packages - unsigned Windows, Ubuntu, and Fedora 44 archives with no installer, and - publishes them as the rolling `latest` prerelease (ADR-0052). No + the Testing build workflow, which runs on pushes to `main`, tests the + commit, packages unsigned Windows, Ubuntu, and Fedora 44 archives with no + installer, and publishes them as the rolling `latest` prerelease + (ADR-0052). While a run is active, GitHub keeps only the newest waiting + run, so a push that a later push supersedes is never tested or published. No application change; the version stays 0.34.0. On 2026-11-17 its first two runs, for `b58f3f7` and `4f94774`, were still queued and no `latest` release existed, so the workflow has not yet completed on GitHub. @@ -1193,9 +1195,11 @@ policy, and push approval. Platform qualification, security testing, and release readiness remain separate gates. PR #36 added the first packaging step: a Testing build workflow publishes -unsigned Windows, Ubuntu, and Fedora 44 archives of each push to `main` as the -rolling `latest` prerelease, with no installer -([ADR-0052](docs/adr/0052-publish-rolling-testing-builds-from-main.md)). The +unsigned Windows, Ubuntu, and Fedora 44 archives of the newest tested `main` +commit as the rolling `latest` prerelease, with no installer +([ADR-0052](docs/adr/0052-publish-rolling-testing-builds-from-main.md)). Only +the newest waiting push is guaranteed a run; a push that arrives while a run is +active can be superseded by a later one and never be tested or published. The workspace tests do not run on Fedora. The workflow had not completed a run when this plan was last verified. Signing, installers, Git workflows, platform qualification, and release readiness remain open. diff --git a/docs/platform-support.md b/docs/platform-support.md index ffc5f27..d1fe694 100644 --- a/docs/platform-support.md +++ b/docs/platform-support.md @@ -13,7 +13,7 @@ containment. | --- | --- | | Windows versions and architectures | CI tests and packages on Windows Server 2025 x86_64; supported client versions and architectures are not selected | | Linux distributions, kernels, and architectures | CI tests on Ubuntu 24.04 and `ubuntu-latest`, packages on `ubuntu-latest`, and builds a Fedora 44 archive in a container without running the tests there. All x86_64. Supported distributions, kernels, and architectures are not selected | -| Testing archives | Unsigned `.zip`/`.tar.gz` archives of `omgcode` and `omgcode-desktop` for each merge to main, published as the rolling `latest` prerelease ([testing build](repository-checks.md#testing-build-workflow)). No installer. Not a release or a support claim | +| Testing archives | Unsigned `.zip`/`.tar.gz` archives of `omgcode` and `omgcode-desktop` for the newest tested merge to main, published as the rolling `latest` prerelease; a merge that arrives while a run is active can be superseded ([testing build](repository-checks.md#testing-build-workflow)). No installer. Not a release or a support claim | | Rust edition and minimum version | Edition 2024; workspace `rust-version` is 1.99.1 | | Pinned development toolchain | Rust 1.99.1 in `rust-toolchain.toml`, with rustfmt and Clippy | | Webview and frontend prerequisites | Windows needs the WebView2 runtime. Linux needs the WebKitGTK 4.1 development packages to build ([Desktop shell](#desktop-shell)). The frontend build needs Node 24. No other version is qualified |