[Upstream Sync] Merge conflict with v1.0.150 #126
Description
Upstream Sync Conflict Report
Trigger: Upstream sync at 2025-12-11T20:10:54.902Z
Upstream Tag: v1.0.150
Upstream SHA: 5ffcde9
Conflicting Files
.github/workflows/publish.yml
bun.lock
packages/console/app/package.json
packages/console/app/src/component/header.tsx
packages/console/app/src/routes/index.css
packages/console/core/package.json
packages/console/function/package.json
packages/console/mail/package.json
packages/desktop/package.json
packages/desktop/src/components/prompt-input.tsx
packages/desktop/src/context/global-sync.tsx
packages/desktop/src/context/layout.tsx
packages/desktop/src/context/local.tsx
packages/desktop/src/context/sync.tsx
packages/desktop/src/hooks/use-providers.ts
packages/desktop/src/pages/layout.tsx
packages/enterprise/package.json
packages/extensions/zed/extension.toml
packages/function/package.json
packages/opencode/package.json
packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
packages/opencode/src/config/config.ts
packages/plugin/package.json
packages/sdk/js/package.json
packages/sdk/openapi.json
packages/slack/package.json
packages/tauri/package.json
packages/ui/package.json
packages/ui/src/components/input.css
packages/ui/src/components/input.tsx
packages/ui/src/components/select-dialog.tsx
packages/ui/src/styles/theme.css
packages/util/package.json
packages/web/package.json
packages/web/src/content/docs/keybinds.mdx
script/publish.ts
sdks/vscode/package.json
Recommended Actions
- Checkout integration branch locally
- Run:
git fetch upstream && git merge v1.0.150 - Resolve conflicts manually
- Run validation:
bun install && bun turbo typecheck && bun turbo test - Push resolved integration branch
- Close this issue
Manual Sync Commands
git remote add upstream https://github.com/sst/opencode.git 2>/dev/null || true
git fetch upstream --tags
git checkout integration
git merge v1.0.150
# Resolve conflicts...
bun install
bun turbo typecheck
bun turbo test
git push origin integration