Skip to content

soup: re-thin codex/claude import cluster against upstream 0.23.1 #1088 #83

Description

@heavygee

Context

Upstream 0.23.1 shipped tiann#1088 (native Codex import/resume from runners), which reworked the inline CodexSessionSyncDialog + 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):

No branches were edited — only manifest-parked.

Temporarily dark on :3006

Re-thin required (owner)

Rebase the cluster onto 0.23.1:

  1. Adopt upstream's native Codex import/resume (feat(codex): import and resume sessions from runners tiann/hapi#1088) — drop the bundled fork ListCodexSessions RPC surface.
  2. Re-add Claude import (unique fork feature) on top of the upstream dialog.
  3. Re-extract the shared SessionImportPicker from the new upstream dialog if still desired (Codex + Cursor + Claude tabs).
  4. 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.

Refs: tiann#1088, tiann#942, tiann#732/tiann#945, tiann#846/tiann#847

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions