Single-home staged session-user writes (I1)

Task 8804 · Done · Coder · created · updated

## Original requirement (epic 8783, verbatim) > Review implementation of model provider interfaces: > > - Claude, Codex, Antigravity, Pi, ACP, > > Identify opportunity to unify, move more code from specific to common, make it more industry standard, more reliable. Do web research to potentially adopt a better architecture. > > Implement top ideas. Settled inputs: PRD (BA task 8784) and architecture (task 8785) — read them with `task_read` 8784 / 8785 and their `prd` / `architecture` artifacts. Decisions there are settled; realize them, do not reopen them. **Quality bar (PRD, verbatim).** A change that passes AC5 by moving code into a grab-bag module with vendor `if` branches inside it FAILS. Common code must be vendor-neutral, and vendor facts stay as data on the adapter or catalogue row. A review artifact that lists ideas without evidence or ranking FAILS AC1/AC2. ## Scope — idea I1 (architecture §3 rank 1, child 1) Route every staged write + `os.replace` done as the session user through the existing single home `session_user.replace_file_as_session_user` (`apps/jaahd/session_user.py:951`). Sites (architecture rank 1): `apps/jaahd/agents/antigravity_runner.py:249-273`; `apps/jaahd/agents/codex.py:562,611`; `apps/jaahd/agents/subagents.py:262-272`; `apps/jaahd/agents/sdk_events.py:128`. Codex's `write_hooks` (`codex.py:931-969`) goes through `base.write_rendered_hooks` (`apps/jaahd/agents/base.py:612`), keeping its account-uid merge as a pre-render step; this removes Codex's private rewrite fallback. Excluded, with reasons (record them in the PR): `pi_rpc.py:127` — runs as `python3 -I`, stdlib only, cannot import `session_user`; `agent_layer.py:234` — an atomic symlink swap, not a file write; `agent_layer.py:150` — a line in a script string run as the account's uid (`run_provider_cli`), moving it would change identity (PRD S2). **Fence:** an AST test, modelled on `apps/jaahd/tests/test_agent_adapters.py:316-356`, fails on any `os.replace`/`os.rename` call in `apps/jaahd/agents/**` except an allowlist that carries reasons (`pi_rpc.py`: `python3 -I`, stdlib only; `agent_layer.py` symlink swap). String constants are not calls, so `agent_layer.py:150` is outside the AST fence and is recorded as such in the PR. **PR body:** cite copies 5 → 1 and the LOC delta (about −100 LOC expected); name any residual copy as a follow-up. **Docs:** name the helper in `apps/jaahd/README.md`'s adapter-seam section (about `:482`). `python3 tools/check_context.py` passes. Credentials & reach: AC1–AC3, AC5, AC7, AC9, AC10 (repo tests, `./dc check full`, `check_context.py`) — Nothing beyond the worktree — verified (worktree present). Out of scope: From PRD §6 (verbatim) — do NOT touch: - **Do NOT** move Claude subscription (oauth) runs onto ACP, or change `Capabilities.runtime` for `claude` oauth (ADR-0167). - **Do NOT** delete the legacy terminal launch path (`fleet_launch`/`fleet_dispatch` exec lines, `answer_delivery` tmux paste, `ComposerTui`). It still serves Claude subscriptions and non-Linux nodes. - **Do NOT** replace or wrap ACP with A2A, an LLM gateway, LiteLLM-style proxies or direct vendor SDKs (D3). - **Do NOT** rename agent verbs, MCP tool names or ACP extension methods (ADR-0166 table), lifecycle states, `terminal_type` values or DB columns. - **Do NOT** drive `agy`'s TUI (S1, ADR-0165 anti-pattern), and do not fork an upstream ACP adapter unless no option closes the gap (ADR-0167 rule). - **Do NOT** add a new provider, or bump any vendor CLI pin other than `agy` (and only if S1 requires it). - **Do NOT** touch the cloud compute "provider" work of epic 8760 (AWS/GCP/Azure node providers, `NodeLink` storage adapters). That is a different "provider". - **Do NOT** redesign console pages (Settings › Providers, Brains roster, task page, Audit › Sessions). The only console delta is Antigravity runs gaining ACP chat/live-control views and their catalogue gap text. - **Do NOT** make ACP available on Windows or macOS nodes (`acp_runtime.py:75` Linux gate stays). - **Do NOT** build ideas ranked below the top 3–5. File them (AC6). - **Do NOT** change the API key handling invariant: no model key in an engine's environment or `launch.json` (ADR-0165 self-check). - Do NOT change ownership, mode or file content semantics of any written file: behaviour-preserving refactor (PRD S2). - Your mechanism's diff must not touch the other unification children's mechanisms (I1–I5 are separate PRs; file overlap is fine, scope overlap is not). Done means: **AC5 — Top 3–5 ideas built, each single-homed and fenced (R5)** (PRD, verbatim). Pass per built idea: - (i) the mechanism has exactly one implementation; - (ii) every former copy calls it; - (iii) a test (census or fence) fails when a second copy or a vendor literal is re-added at the guarded sites; - (iv) the merged PR cites before/after copy count and LOC. A built idea that leaves a residual copy names it in its PR body as a follow-up. → verify, per idea: 1. Grep the repo for the old mechanism's signature (e.g. the per-adapter staged-write pattern): one definition remains. 2. Add a scratch copy at a guarded site locally and run the fence test: it fails. Revert the scratch copy. 3. Read the PR: before/after figures are present. **AC7 — Behaviour preserved, by test (R7, S2)** (PRD, verbatim). Pass, all green on the merged develop: - `apps/jaahd/tests/test_agent_adapters.py` (Claude launch.sh + settings byte-identical to the goldens); - the ACP replay fixtures under `apps/jaahd/tests/acp_replay/`; - `tools/tests/test_provider_capabilities.py`; - every provider's adapter tests; - `./dc check full`. → verify: the merge lane's `./dc check full` GATE_RESULT `status=pass` on each PR. Any golden that had to be regenerated is called out in that PR with the reason. A golden change for any lane other than Antigravity is a failure unless it is byte-neutral in behaviour. **AC9 — No new vendor branches (R5)** (PRD, verbatim). Pass: - No new `provider ==` / vendor-literal branch is introduced in launch sites, `apps/jaahd/acp/` or `apps/jaahd/provider_health.py` dispatch. - The existing census still passes. - Vendor literals in `acp/` (C9) are either removed or kept with a recorded reason. → verify: `git diff develop...<merge> -- apps/jaahd/acp apps/jaahd/fleet_launch.py apps/jaahd/fleet_dispatch.py` shows no added vendor names. `./dc test apps/jaahd/tests/test_agent_adapters.py` is green. **AC10 — Docs current (R8)**, this child's part (the README `:551/:552` "No ACP host exists yet" line and the Antigravity section are owned by the Antigravity ACP child — do not edit them here): - `apps/jaahd/README.md` describes the present; the new common helper is named in the adapter-seam section. - `python3 tools/check_context.py` passes. → verify: run `python3 tools/check_context.py`, which prints no failure; grep the adapter-seam section for the helper name. - Every listed site calls `replace_file_as_session_user` (or `base.write_rendered_hooks` for Codex hooks); no `os.replace`/`os.rename` remains in `apps/jaahd/agents/**` outside the reasoned allowlist — grep + the new AST fence test, cited. - The fence fails on a scratch `os.replace` added to an adapter (AC5 verify step 2), output cited. - Codex, Antigravity, subagent and SDK-v2 adapter tests green; written files keep the same owner/mode as before (assert in a test, not just by reading).

Outcome

I1: Antigravity hooks and Codex fallback now use replace_file_as_session_user / write_rendered_hooks; AST fence on os.replace/rename with reasoned allowlist; owner/mode tested; quick gate green; PR #6562 queued. Residual account-uid script copies → draft 8820. Memory: none applied.

Pull request

Artifacts

Activity

  • Draft
  • Ready
  • Runner started
  • Runner ended (done)