Commit c2236fd
luop
Merge upstream cita-777/main into linuxroc/main
Brings in 8 upstream commits:
- fix: Claude anthropic model discovery fallback (cita-777#554)
- chore(deps): minor-and-patch group bumps (14 deps)
- chore(deps): marked 17 -> 18
- chore(deps-dev): electron 41 -> 42
- chore(deps-dev): react-router-dom 7.14 -> 7.15
- chore(deps): undici 6.24 -> 6.25 (runtime-http group)
- chore(deps-dev): build-tooling group
- chore(deps): github-actions group
Conflict resolution:
- src/server/services/platforms/claude.ts (content conflict)
- src/server/services/platforms/claude.test.ts (add/add conflict)
Both conflicts were resolved with --ours: the local fork's
implementation of the Claude model discovery fallback (commit 4ecf3f3,
"feat(claude-models): fall back to parent /v1/models when
/anthropic/v1/models is empty") is a strict superset of upstream PR
cita-777#554. Specifically, the local fork:
- reuses CLAUDE_DEFAULT_ANTHROPIC_VERSION from oauth/claudeProvider.js
rather than re-hardcoding the literal '2023-06-01' string (single
source of truth).
- exposes pure URL helpers (isAnthropicSuffixedBaseUrl,
stripAnthropicSuffixSegment) on standardApiProvider.ts with 34
parameterized unit tests covering case variants, trailing-slash,
query/port preservation, host-only and /anthropic-proxy negatives.
- emits two info-level diagnostic logs ([claude-models-fallback]
intent / hit) with token-free site labels for operator visibility.
- absorbs underlying errors from BOTH the standard and the fallback
call so getModels() never throws a network/HTTP error to the caller.
- carries 27 integration tests via a node:http fixture covering every
failure mode and zero cross-call state.
Verification:
- npm run typecheck:server: clean
- npm run build:server: clean
- npm run repo:drift-check: 0 new violations (5 pre-existing tracked)
- src/server/services/platforms/{claude,standardApiProvider,llmUpstream}.test.ts: 70/70
- session-stick-routing-binding-timing-fix suites: 72/727 files changed
Lines changed: 1050 additions & 1641 deletions
File tree
- .github/workflows
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
277 | 277 | | |
278 | 278 | | |
279 | 279 | | |
280 | | - | |
| 280 | + | |
281 | 281 | | |
282 | 282 | | |
283 | 283 | | |
| |||
0 commit comments