Commit 9e6a137
committed
sync: merge upstream v1.0.150 into integration
Resolved conflicts:
- packages/opencode/package.json: Updated version to 1.0.150
- packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx: Accepted upstream changes, restored double Ctrl+C exit feature (PR anomalyco#4900)
- packages/opencode/src/config/config.ts: Accepted upstream changes with super keybinds, preserved header_toggle and session_parent keybinds
- script/publish.ts: Preserved fork-specific comment
- .github/workflows/publish.yml: Removed (deleted in fork)
- packages/ui/src/components/input.css: Removed (deleted upstream)
- packages/ui/src/components/input.tsx: Removed (deleted upstream)
- bun.lock: Regenerated
- All package.json files: Accepted upstream version bumps
- Desktop, console, enterprise files: Accepted upstream
Preserved fork features:
- PR anomalyco#4900: Double Ctrl+C to exit
- PR anomalyco#4865: session_parent keybind
- Fork feature: header_toggle keybind50 files changed
Lines changed: 1395 additions & 1006 deletions
File tree
- packages
- console
- app
- src
- component
- routes
- core
- function
- mail
- desktop
- src
- components
- context
- hooks
- pages
- enterprise
- extensions/zed
- function
- opencode
- src
- cli/cmd/tui
- component
- prompt
- context
- config
- util
- test
- plugin
- sdk
- js
- slack
- tauri
- src-tauri
- ui
- src
- components
- hooks
- styles
- util
- web
- src/content/docs
- sdks/vscode
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | 172 | | |
180 | 173 | | |
181 | 174 | | |
| |||
253 | 246 | | |
254 | 247 | | |
255 | 248 | | |
256 | | - | |
| 249 | + | |
257 | 250 | | |
258 | 251 | | |
259 | 252 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
251 | 251 | | |
252 | 252 | | |
253 | 253 | | |
254 | | - | |
| 254 | + | |
255 | 255 | | |
256 | 256 | | |
257 | 257 | | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
258 | 261 | | |
259 | 262 | | |
260 | 263 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
0 commit comments