Parent: #158
Context
The full fork audit found 31 conflict-prone files where both our fork AND upstream made changes. Beyond the session/ files already addressed, these core files are modified:
Modified core files needing audit
src/agent/agent.ts — unknown changes
src/bun/index.ts — unknown changes
src/config/config.ts — unknown changes
src/flag/flag.ts — unknown changes
src/skill/skill.ts — unknown changes
src/plugin/codex.ts — unknown changes
src/plugin/copilot.ts — 1M context related
src/provider/provider.ts — 1M context headers + limit override
src/provider/transform.ts — Opus 4.6 effort parameter
src/cli/cmd/run.ts — unknown changes
src/cli/cmd/tui/app.tsx — unknown changes
src/cli/cmd/tui/routes/session/index.tsx — unknown changes (rg TUI rendering?)
src/cli/cmd/tui/util/clipboard.ts — unknown changes
Tests modified
config.test.ts, skill.test.ts
Goal
For each file:
- Classify the change (async-task / rg-tool / 1M-context / fork-improvement / unnecessary)
- Revert unnecessary changes to match upstream
- Document why each remaining change exists
Acceptance Criteria
Parent: #158
Context
The full fork audit found 31 conflict-prone files where both our fork AND upstream made changes. Beyond the session/ files already addressed, these core files are modified:
Modified core files needing audit
src/agent/agent.ts— unknown changessrc/bun/index.ts— unknown changessrc/config/config.ts— unknown changessrc/flag/flag.ts— unknown changessrc/skill/skill.ts— unknown changessrc/plugin/codex.ts— unknown changessrc/plugin/copilot.ts— 1M context relatedsrc/provider/provider.ts— 1M context headers + limit overridesrc/provider/transform.ts— Opus 4.6 effort parametersrc/cli/cmd/run.ts— unknown changessrc/cli/cmd/tui/app.tsx— unknown changessrc/cli/cmd/tui/routes/session/index.tsx— unknown changes (rg TUI rendering?)src/cli/cmd/tui/util/clipboard.ts— unknown changesTests modified
config.test.ts,skill.test.tsGoal
For each file:
Acceptance Criteria