Upstream ancestry sync: resolve commit divergence

[aaditagrawal]

Summary

Merge upstream/main into our fork to establish shared commit ancestry. This resolves the "7 commits behind" indicator on GitHub caused by cherry-picked commits having different SHAs than their upstream originals.

All conflicts resolved by keeping our version (--ours), since our code already contains all upstream changes from the previous cherry-pick integration (PR #26) plus our multi-provider enhancements.

No functional changes — this is purely an ancestry fix.

Test plan

• bun typecheck — 7/7 packages pass
• CI passes

Summary by CodeRabbit

• Tests
  • Enhanced test coverage for provider routing to verify correct session handling.

---

Note: This is a test-only change with no impact on end-user functionality.

[coderabbitai]

📝 Walkthrough

Walkthrough

A new test case was added to verify that explicit claudeAgent startSession calls are correctly routed to the routing.claude.startSession mock, with assertions on the returned provider and invocation parameters.

Changes

Cohort / File(s)	Summary
Test Case Addition apps/server/src/provider/Layers/ProviderService.test.ts	Added it.effect test case for ProviderServiceLive routing to verify claudeAgent session routing behavior, including provider validation and mock invocation assertions.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Suggested labels

vouch:trusted

Poem

🐰 A test for Claude's path so clear,
Routes and hops bring verification near,
With assertions checked and mocks in place,
The agent finds its routing space! ✨

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title describes a merge operation for commit ancestry synchronization, which is relevant to the PR's objective of resolving divergence with upstream.
Description check	✅ Passed	The description covers the main change (ancestry fix), rationale (resolving divergence), and test plan. It aligns with the required template sections.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch upstream-ancestry-sync

📝 Coding Plan

• Generate coding plan for human review comments

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[coderabbitai]

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@apps/server/src/provider/Layers/ProviderService.test.ts`:
- Around line 587-609: Duplicate test "routes explicit claudeAgent provider
session starts to the claude adapter" should be removed to avoid redundant
assertions and flaky mock count checks; locate the duplicate block referencing
ProviderService and routing.claude.startSession (the second occurrence around
the later lines) and delete that redundant it.effect test so only the original
test remains, or alternatively reset routing.claude.startSession.mock (e.g.,
mockClear) at the start of the duplicate test if you prefer keeping it; ensure
only one test asserts routing.claude.startSession.mock.calls.length === 1 and
that ProviderService.startSession assertions remain in the single canonical
test.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 68077711-8fd7-4e5e-bd30-054f30569d67

📥 Commits

Reviewing files that changed from the base of the PR and between 51df3f9 and 1863052.

📒 Files selected for processing (1)

• apps/server/src/provider/Layers/ProviderService.test.ts