[agent:sync] Upstream Conflict Hotspot: v2.49.0

[github-actions]

Upstream repository: https://github.com/lidge-jun/opencodex.git
Event: pin-updated
prepareStatus: decision-handoff
recommendedLane: daily-merge
Latest tag: v2.49.0
Latest tag SHA: 2f3f736
Upstream tag: v2.49.0
Upstream SHA: 2f3f736
Base ref: refs/heads/dev
Base SHA: 7854242
vendor/main SHA: 2f3f736
vendor/dev SHA: aff8a22
head SHA: 7854242
mergeBaseCount: 1
merge base SHAs:

• f7f890f
  Sync branch: sync/upstream-v2.49.0-2f3f736299dc-785424295fc5
  Conflict paths:
• bun.lock
• gui/src/components/provider-workspace/ProviderOverview.tsx
• gui/src/components/subagents-workspace/SubagentDelegationSection.tsx
• gui/src/pages/Models.tsx
• gui/src/pages/Subagents.tsx
• gui/src/pages/use-dashboard-data.ts
• gui/tests/subagents-ultra-mode.test.tsx
• gui/tests/usage-custom-range.test.tsx
• package.json
• scripts/test-layout/layout.json
• scripts/test.ts
• src/codex/inject.ts
• src/oauth/xai.ts
• src/server/claude-messages.ts
• src/server/management/config-routes.ts
• src/server/management/provider-routes.ts
• src/server/responses/collaboration.ts
• src/server/responses/core.ts
• src/server/responses/fetch-helpers.ts
• src/usage/log.ts
• tests/ci-workflows/test-home-guard.test.ts
• tests/codex-integration/codex-models-cache-invalidate.test.ts
• tests/codex-integration/codex-retained-root-serialization.test.ts
• tests/codex-integration/codex-routing.test.ts
• tests/codex-integration/multi-agent-compat.test.ts
• tests/fixtures/test-layout-expected.json
• tests/images/loop.test.ts
• tests/lib/process-control-graceful.test.ts
• tests/server/server-xai-responses-streaming.test.ts
  Resolutions:
• bun.lock (upstream-owned): decision-handoff: merge --abort
• gui/src/components/provider-workspace/ProviderOverview.tsx (upstream-owned): decision-handoff: merge --abort
• gui/src/components/subagents-workspace/SubagentDelegationSection.tsx (upstream-owned): decision-handoff: merge --abort
• gui/src/pages/Models.tsx (upstream-owned): decision-handoff: merge --abort
• gui/src/pages/Subagents.tsx (upstream-owned): decision-handoff: merge --abort
• gui/src/pages/use-dashboard-data.ts (upstream-owned): decision-handoff: merge --abort
• gui/tests/subagents-ultra-mode.test.tsx (upstream-owned): decision-handoff: merge --abort
• gui/tests/usage-custom-range.test.tsx (upstream-owned): decision-handoff: merge --abort
• scripts/test-layout/layout.json (upstream-owned): decision-handoff: merge --abort
• scripts/test.ts (upstream-owned): decision-handoff: merge --abort
• src/codex/inject.ts (upstream-owned): decision-handoff: merge --abort
• src/oauth/xai.ts (upstream-owned): decision-handoff: merge --abort
• src/server/claude-messages.ts (upstream-owned): decision-handoff: merge --abort
• src/server/management/config-routes.ts (upstream-owned): decision-handoff: merge --abort
• src/server/management/provider-routes.ts (upstream-owned): decision-handoff: merge --abort
• src/server/responses/collaboration.ts (upstream-owned): decision-handoff: merge --abort
• src/server/responses/core.ts (shared-hotspot): decision-handoff: merge --abort
• src/server/responses/fetch-helpers.ts (upstream-owned): decision-handoff: merge --abort
• src/usage/log.ts (upstream-owned): decision-handoff: merge --abort
• tests/ci-workflows/test-home-guard.test.ts (upstream-owned): decision-handoff: merge --abort
• tests/codex-integration/codex-models-cache-invalidate.test.ts (upstream-owned): decision-handoff: merge --abort
• tests/codex-integration/codex-retained-root-serialization.test.ts (upstream-owned): decision-handoff: merge --abort
• tests/codex-integration/codex-routing.test.ts (upstream-owned): decision-handoff: merge --abort
• tests/codex-integration/multi-agent-compat.test.ts (upstream-owned): decision-handoff: merge --abort
• tests/fixtures/test-layout-expected.json (upstream-owned): decision-handoff: merge --abort
• tests/images/loop.test.ts (upstream-owned): decision-handoff: merge --abort
• tests/lib/process-control-graceful.test.ts (upstream-owned): decision-handoff: merge --abort
• tests/server/server-xai-responses-streaming.test.ts (upstream-owned): decision-handoff: merge --abort
  Detected at: 2026-09-09T16:29:18.845Z
  Action: follow docs/fork/OWNED.md, fix the underlying hotspot on dev, then generate a new immutable successor candidate.

[github-actions]

Agent maintenance status: needs-human.
Reason: Immutable sync candidate: fix trunk (dev) and generate a new successor candidate