Skip to content

sync: catch-up batch 001 (first 200 upstream commits)#2

Merged
pRizz merged 1179 commits intodevfrom
sync/catchup-001
Feb 6, 2026
Merged

sync: catch-up batch 001 (first 200 upstream commits)#2
pRizz merged 1179 commits intodevfrom
sync/catchup-001

Conversation

@pRizz
Copy link
Owner

@pRizz pRizz commented Feb 5, 2026

Scope:\n- Merge upstream first-parent boundary commit anomalyco#200 into fork dev lineage\n- Re-baseline docs/upstream-sync merge metadata from fresh refs\n- Resolve this batch conflict set\n\nValidation:\n- bun turbo typecheck: failing (app/desktop API drift remains after this boundary)\n- packages/opencode bun dev smoke: starts; local run reaches runtime and returns Not authenticated in this environment\n\nNotes:\n- parent-dev is force-mirrored to upstream/dev\n- Additional reconciliation is required on this PR before merge

opencode and others added 30 commits January 29, 2026 05:59
Co-authored-by: Brendan Allan <git@brendonovich.dev>
…omalyco#11118)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
…ow it as autocomplete option (this is already a respected setting)
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: opencode <opencode@sst.dev>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
fwang and others added 14 commits February 1, 2026 21:39
Added a workaround to fix Pulumi version conflict in the deployment workflow.
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
…chup-001

# Conflicts:
#	AGENTS.md
#	bun.lock
#	package.json
#	packages/app/index.html
#	packages/app/package.json
#	packages/app/src/app.tsx
#	packages/app/src/components/dialog-select-directory.tsx
#	packages/app/src/components/dialog-select-model.tsx
#	packages/app/src/components/dialog-select-provider.tsx
#	packages/app/src/components/session/session-header.tsx
#	packages/app/src/components/session/session-new-view.tsx
#	packages/app/src/components/session/session-sortable-terminal-tab.tsx
#	packages/app/src/components/terminal.tsx
#	packages/app/src/context/file.tsx
#	packages/app/src/context/terminal.tsx
#	packages/app/src/index.css
#	packages/app/src/pages/home.tsx
#	packages/app/src/pages/layout.tsx
#	packages/app/src/pages/session.tsx
#	packages/opencode/src/config/config.ts
#	packages/opencode/src/pty/index.ts
#	packages/opencode/src/server/server.ts
#	packages/sdk/js/src/v2/gen/sdk.gen.ts
#	packages/sdk/js/src/v2/gen/types.gen.ts
#	packages/sdk/openapi.json
#	packages/ui/src/components/icon.tsx
@pRizz pRizz added the sync Upstream sync batches label Feb 5, 2026
@github-actions
Copy link

github-actions bot commented Feb 5, 2026

Hey! Your PR title sync: catch-up batch 001 (first 200 upstream commits) doesn't follow conventional commit format.

Please update it to start with one of:

  • feat: or feat(scope): new feature
  • fix: or fix(scope): bug fix
  • docs: or docs(scope): documentation changes
  • chore: or chore(scope): maintenance tasks
  • refactor: or refactor(scope): code refactoring
  • test: or test(scope): adding or updating tests

Where scope is the package name (e.g., app, desktop, opencode).

See CONTRIBUTING.md for details.

@pRizz pRizz merged commit d77458a into dev Feb 6, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs:title sync Upstream sync batches

Projects

None yet

Development

Successfully merging this pull request may close these issues.