You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Upstream 0.23.1 shipped tiann#1088 (native Codex import/resume from runners), which reworked the inlineCodexSessionSyncDialog + hub codexDesktop routes. This architecturally collides with the fork's codex/claude session-import cluster in the soup.
To rematerialize the soup green on the 0.23.1 base, meta temporarily parked these 3 layers (reversible manifest comments in config/driver-manifest.yaml, commit 35cd8665a):
Re-add Claude import (unique fork feature) on top of the upstream dialog.
Re-extract the shared SessionImportPicker from the new upstream dialog if still desired (Codex + Cursor + Claude tabs).
Restore the parked heals when re-adding: 10's runCodex importCodexSessionHistory effort hunk, 50's listCodexSessionsForMachine rpcGateway hunk, 51-codex-rpc-list-export.patch.parked, and reverse the parked-cluster reconciliation in 53-park-import-cluster-signature-heal.patch.
Budget core (agentBudget, codexUsage, AgentBudgetIndicator, codexBudgetAdapter) has no refs to the sessions surface and separates cleanly — a budget-only thin branch is the fast first re-add.
Context
Upstream
0.23.1shipped tiann#1088 (native Codex import/resume from runners), which reworked the inlineCodexSessionSyncDialog+ hubcodexDesktoproutes. This architecturally collides with the fork's codex/claude session-import cluster in the soup.To rematerialize the soup green on the
0.23.1base, meta temporarily parked these 3 layers (reversible manifest comments inconfig/driver-manifest.yaml, commit35cd8665a):feat/codex-usage-indicator-rebased— bundles a redundantListCodexSessionsRPC superseded by feat(codex): import and resume sessions from runners tiann/hapi#1088feat/claude-session-import— refactored the Codex dialog into a shared<SessionImportPicker>; feat(codex): import and resume sessions from runners tiann/hapi#1088 evolved the inline dialog instead (add/add onCodexSessionSyncDialog.tsx,codexDesktop.ts/.test.ts)feat/agent-session-import-picker— stacks onfeat/claude-session-import, same surfaceNo branches were edited — only manifest-parked.
Temporarily dark on :3006
Re-thin required (owner)
Rebase the cluster onto
0.23.1:ListCodexSessionsRPC surface.SessionImportPickerfrom the new upstream dialog if still desired (Codex + Cursor + Claude tabs).10's runCodeximportCodexSessionHistoryeffort hunk,50'slistCodexSessionsForMachinerpcGateway hunk,51-codex-rpc-list-export.patch.parked, and reverse the parked-cluster reconciliation in53-park-import-cluster-signature-heal.patch.Budget core (
agentBudget,codexUsage,AgentBudgetIndicator,codexBudgetAdapter) has no refs to the sessions surface and separates cleanly — a budget-only thin branch is the fast first re-add.Refs: tiann#1088, tiann#942, tiann#732/tiann#945, tiann#846/tiann#847