Skip to content

Commit 0d6d137

Browse files
committed
Merge upstream through b64cc80 into wellington
Resolves seven conflicts: - cli server-connection: keep the configurable OPENCODE_SERVER_USERNAME while adopting the merged --server flag resolution - cli server-connection tests: keep all three tests (username + both upstream flag-position tests) - client pty-handoff: use the shared headers() helper with the configurable username - server authorization: union of imports; router-level ticketed() now includes the MCP client ticket so ticketed MCP requests reach their handler - server process: keep the Wellington boot gate (the upstream ticket exemption is a no-op behind the early ready return) - services/www openapi.json copies: deleted per upstream
2 parents 0946c0a + b64cc80 commit 0d6d137

939 files changed

Lines changed: 19695 additions & 54201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
packages/core/migration/**/snapshot.json linguist-generated
22
packages/core/src/database/migration.gen.ts linguist-generated
33
packages/core/src/models-dev/snapshot.txt linguist-generated
4+
packages/core/src/database/schema.gen.ts linguist-generated
5+
packages/desktop/src/main/storage/migration.gen.ts linguist-generated
6+
packages/protocol/openapi.json linguist-generated
7+
packages/client/src/promise/generated/** linguist-generated
8+
packages/client/src/effect/generated/** linguist-generated
9+
packages/client/src/effect/api/** linguist-generated
410
packages/core/src/**/*.txt text eol=lf
511
packages/httpapi-codegen/test/generated/*.ts text eol=lf

‎.github/workflows/check.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ jobs:
2525
- name: Setup Bun
2626
uses: ./.github/actions/setup-bun
2727

28-
- name: Run checks
29-
run: bun run check
28+
- name: Lint
29+
run: bun run lint
30+
31+
# Local `bun run check` uses `bun check`; CI keeps the official TypeScript compiler as the source of truth.
32+
- name: Typecheck (TypeScript 7.1)
33+
run: bun run typecheck:tsc
3034

3135
# Every GUI package file (app, desktop, gui-extensions, ui, session-ui) a pull request adds or edits must be free of
3236
# oxlint problems, warn-level rules (anti-slop) included. Other packages are not affected.

‎.github/workflows/deploy-changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Typecheck
2929
working-directory: services/changelog
30-
run: bun typecheck
30+
run: bun run typecheck:tsc
3131

3232
- name: Test
3333
working-directory: services/changelog

‎.github/workflows/deploy-files.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Typecheck
2727
working-directory: services/files
28-
run: bun typecheck
28+
run: bun run typecheck:tsc
2929

3030
- name: Deploy
3131
working-directory: services/files

‎.github/workflows/deploy-update.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Typecheck
2626
working-directory: services/update
27-
run: bun typecheck
27+
run: bun run typecheck:tsc
2828

2929
- name: Deploy
3030
working-directory: services/update

‎.github/workflows/docs-update.yml‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎.github/workflows/duplicate-issues.yml‎

Lines changed: 0 additions & 221 deletions
This file was deleted.

‎.github/workflows/opencode.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)