Skip to content

Commit c2236fd

Browse files
author
luop
committed
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/72
2 parents 15bc592 + c308a3e commit c2236fd

7 files changed

Lines changed: 1050 additions & 1641 deletions

File tree

.github/workflows/backfill-pr-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Backfill PR labels
31-
uses: actions/github-script@v8
31+
uses: actions/github-script@v9
3232
with:
3333
script: |
3434
const owner = context.repo.owner;

.github/workflows/docs-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/configure-pages@v6
4646

4747
- name: Upload pages artifact
48-
uses: actions/upload-pages-artifact@v4
48+
uses: actions/upload-pages-artifact@v5
4949
with:
5050
path: docs/.vitepress/dist
5151

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
sync-labels: false
2121

2222
- name: Apply size label
23-
uses: actions/github-script@v8
23+
uses: actions/github-script@v9
2424
with:
2525
script: |
2626
const owner = context.repo.owner;

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ jobs:
277277
run: ls -la release-assets
278278

279279
- name: Upload Release Assets
280-
uses: softprops/action-gh-release@v2
280+
uses: softprops/action-gh-release@v3
281281
with:
282282
tag_name: ${{ github.ref_name }}
283283
generate_release_notes: true

0 commit comments

Comments
 (0)