Skip to content

fix: preserve sibling session metadata namespace fields - #718

Merged
benbrandt merged 1 commit into
mainfrom
fix/session-metadata-writers
Nov 1, 2026
Merged

benbrandt merged 1 commit into
mainfrom
fix/session-metadata-writers

Conversation

@benbrandt

Copy link
Copy Markdown
Member

Summary

  • Compose complete v2 codex and jetbrains.air values in their owned writers, using the serialized session metadata owner from fix: resynchronize current session metadata on ACP v2 resume #717. A status/goal/failure/report/archive update no longer drops sibling fields merely because v2 replaces the whole top-level namespace value.
  • Keep composition after event routing, so child-view facts read and update the child's metadata rather than the parent's.
  • Generalize the existing AIR metadata builder for multiple owned fields and reuse it for event-handler facts, goal publication, file-change reports, and archive updates. Raw transport metadata still follows shallow replacement semantics; this does not introduce a generic deep merge.
  • Retain metadata through nested close/archive operations until the final publication fence is sealed. Foreground teardown still happens at runtime close, but archive can compose its final metadata with the current sibling values before disposal. Late publication remains fenced.
  • Preserve accompanying session info fields in the same composed update. Keep all v1 payloads unchanged.

Checked against ACP a965f1f1, docs/protocol/v2/extensibility.mdx:103-150: each top-level metadata value is replaced whole, and nested nulls are ordinary data. Producers that share a namespace therefore need to construct its current complete value, rather than relying on clients to deep-merge their partial objects.

Scope and cost

This preserves the current namespace layout and extension contract. Complete namespace updates may repeat unchanged values, including file-change reports and failure revisions. Splitting metadata keys or moving request-scoped report data to a different notification location would be a separate compatibility decision. Native setup seeding and newer upstream schema additions are not redesigned here. No review/checklist Markdown file is added.

Validation

  • npm run typecheck
  • npm run build
  • npm test: 2,365 passed, 39 skipped
  • npm run test:integration: all 19 passed
  • npm run codex-test -- -p "Reply with exactly OK. Do not use tools or modify any files." -o summary: completed with end_turn
  • git diff --check
  • Opt-in E2E tests were not run.

New wire tests exercise the actual goal, local-command file-report, typed-failure, goal-clear, and archive sequence on both protocol versions, including post-archive suppression. They also cover independent Codex fields, concurrent AIR writers, unrelated JetBrains/root fields, nested nulls, and routed child isolation. A metadata-owner test covers accompanying title/activity fields. All existing snapshots, including v1 snapshots, remain unchanged.

@benbrandt
benbrandt merged commit 3720341 into main Nov 1, 2026
6 checks passed
@benbrandt
benbrandt deleted the fix/session-metadata-writers branch November 1, 2026 19:42
nyssance added a commit to nyssance/codex-acp that referenced this pull request Nov 2, 2026
…otocol#720, agentclientprotocol#722, agentclientprotocol#723

Conflicts came almost entirely from the fork's bun fmt reformatting. They
were resolved by formatting the merge base and upstream side with the
repository's bun fmt settings and re-running the three-way merge, then
resolving the remaining semantic hunks by hand:

- CodexEventHandler: keep the fork's live _meta.codex.turnId tagging and
  publish the tagged update through upstream's composing publishUpdate.
- ThreadGoalSnapshot: publishGoalSessionInfo now composes both the fork's
  v2 _meta.codex.goal and the AIR goal against current session metadata,
  so v2 goal updates keep sibling codex and jetbrains.air fields. v1 still
  emits the AIR-only update via goalSessionInfoUpdate.
- CodexAcpClient/AcpAgentRouter: take upstream's cancellable, serialized
  login and initialize-response auth publication; keep the fork's boolean
  return types and its mutable v1 router used for ALwith extensions.
- SessionIndexService: archive publication uses publishAirSessionMetadata;
  withAirMeta stays imported for setArchived.
- v2-prompt-harness: close() aborts the new transport fence and keeps the
  fork's transport and CODEX_HOME cleanup.

Test adjustments for fork behaviour:
- cancel-v2 interrupt-fencing matrix forces turn/steer to fail, because the
  fork steers a second prompt into the active turn instead of queueing it.
- session-batch-get-wire mock account includes workspaceRouting.
- session-metadata-writers @ts-expect-error moved onto the private access
  line after formatting.
- live-core-v2-ownership-owned.json regenerated with vitest -u; it gains
  the verified child cwd subagent_update from agentclientprotocol#722.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_01RaizxxJBbHnYoG9L4g1u5b
EugeneTheDev pushed a commit that referenced this pull request Nov 8, 2026
🤖 I have created a release *beep* *boop*
---


##
[2.6.0](v2.5.0...v2.6.0)
(2026-11-06)


### Features

* expose configured permission profiles as modes
([#395](#395))
([caf2e87](caf2e87))
* predict the follow-up prompt with thread/sample on the session thread
([#740](#740))
([f9cb470](f9cb470))
* show async Codex questions as elicitations
([#707](#707))
([cc57c7e](cc57c7e))
* update ACP SDK to 2.4 and align protocol behavior
([#727](#727))
([ab513aa](ab513aa))


### Bug Fixes

* clear stale entity metadata during ACP v2 replay
([#716](#716))
([580d8b9](580d8b9))
* defer startup interactions until session setup is delivered
([#714](#714))
([ad993bb](ad993bb))
* fence turn interrupt retries to the original prompt
([#723](#723))
([9c33f86](9c33f86))
* match vendor-prefixed gateway model ids such as OpenRouter's
([#731](#731))
([29195ec](29195ec))
* preserve sibling session metadata namespace fields
([#718](#718))
([3720341](3720341))
* publish complete configuration updates for session changes
([#715](#715))
([b7ac0bf](b7ac0bf))
* release the prompt suggestion thread and keep it minimal
([#709](#709))
([82ad58f](82ad58f))
* report verified standard subagent directories
([#722](#722))
([7d7e95a](7d7e95a))
* resynchronize current session metadata on ACP v2 resume
([#717](#717))
([927c480](927c480))
* scope authentication cancellation and initial status delivery
([#720](#720))
([e059ab7](e059ab7))
* show commands in Zed approval prompts
([#735](#735))
([cca2dca](cca2dca))
* skip the app-server restart when providers/set repeats the applied
config
([#728](#728))
([3b35338](3b35338))
* start the Codex app-server with the provider of the gateway routing
([#733](#733))
([cbcd446](cbcd446))
* suppress session messages after close
([#712](#712))
([85bf932](85bf932))
* synchronize resumed titles and reset replayed message metadata
([#713](#713))
([ef45a6d](ef45a6d))
* tear down session interactions and background processes on close
([#711](#711))
([1e89efa](1e89efa))
* update ACP SDK to 2.2 and align protocol behavior
([#710](#710))
([6f96fbe](6f96fbe))
* update codex to 0.166.0
([#734](#734))
([e53f23e](e53f23e))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: acp-release-bot[bot] <246668977+acp-release-bot[bot]@users.noreply.github.com>
mrmans0n added a commit to mrmans0n/codex-acp that referenced this pull request Nov 8, 2026
Upstream v2.6.0 (agentclientprotocol#712, agentclientprotocol#718) publishes the archive state of an open session inside the archive's
delivery fence with publishAirSessionMetadata, because a closed session's delivery is sealed when
the fence ends and v2 composes the AIR namespace. The downstream update after the fence would now
be dropped. The archive state now goes through publishArchived inside the fence: AIR keeps
upstream's composed publication and a client-neutral ACP v1 opt-in gets _meta.sessionIndex.archived
as before. Upstream also moved the app-server initialize of initializeV2 before the capability
reads; the v2 session index still configures with neutral: false. A new test (AIR and neutral)
fails both without the neutral branch and with the publication after the fence.
Adapted from a1bfcc7 (original bf6dd64).
mrmans0n added a commit to mrmans0n/codex-acp that referenced this pull request Nov 8, 2026
Upstream v2.6.0 (agentclientprotocol#718) adds tests that build CodexEventHandler with upstream's boolean typed-failure
flag and nine arguments, and SessionFailure records without the downstream kind. The patch had
replaced that flag with a required SessionFailureFormat and a required shared ledger, so the
typecheck failed and a false flag would have enabled the typed AIR lane. The event handler now
also accepts the boolean (true means air, false means none), the neutral ledger defaults to a
private one when a caller does not share one, and kind is optional on the record: the handler
still sets it on every record it builds and the AIR record still drops it. The server keeps
passing the format and the connection-wide ledger, so the client-neutral form is unchanged.

A new test (boolean flag true and false) fails without the normalisation, and npm run typecheck
fails on upstream's tests without the optional parameters.
Adapted from 2a1384e.
mrmans0n added a commit to mrmans0n/codex-acp that referenced this pull request Nov 8, 2026
Upstream v2.6.0 (agentclientprotocol#718) publishes the AIR agent file-change report with publishAirSessionMetadata,
which composes the whole jetbrains.air value on ACP v2 so sibling AIR fields survive. The patch
replaced that publication with one session_info_update for both forms. AIR now keeps upstream's
composed publication and the client-neutral opt-in (ACP v1 only) still gets the top-level
_meta.agentFileChangeReport. The existing client-neutral report tests fail with upstream's
AIR-only publication, and upstream's session-metadata-writers test fails if AIR goes through the
plain update instead.
Adapted from a680425.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant