Skip to content

DRAFT chore(sync): upstream v1.18.25 → 1.18.25-dev_ttk - #24

Draft
github-actions[bot] wants to merge 3304 commits into
devfrom
auto-sync/upstream-v1.18.25
Draft

github-actions[bot] wants to merge 3304 commits into
devfrom
auto-sync/upstream-v1.18.25

Conversation

@github-actions

Copy link
Copy Markdown

Auto-sync of upstream v1.18.25 → 1.18.25-dev_ttk left files in conflict that need human judgment.

Files needing manual resolution

.github/workflows/beta.yml
.github/workflows/close-stale-prs.yml
.github/workflows/deploy.yml
.opencode/opencode.jsonc
packages/app/src/context/global-sync.tsx
packages/app/src/context/global-sync/child-store.ts
packages/core/src/background.ts
packages/core/src/flag/flag.ts
packages/opencode/src/cli/bootstrap.ts
packages/opencode/src/cli/cmd/run.ts
packages/opencode/src/cli/cmd/stats.ts
packages/opencode/src/cli/cmd/tui.ts
packages/opencode/src/cli/cmd/tui/app.tsx
packages/opencode/src/config/config.ts
packages/opencode/src/index.ts
packages/opencode/src/installation/index.ts
packages/opencode/src/plugin/index.ts
packages/opencode/src/project/instance.ts
packages/opencode/src/project/with-instance.ts
packages/opencode/src/provider/error.ts
packages/opencode/src/provider/provider.ts
packages/opencode/src/server/adapter.bun.ts
packages/opencode/src/server/adapter.node.ts
packages/opencode/src/server/adapter.ts
packages/opencode/src/server/routes/instance/httpapi/groups/session.ts
packages/opencode/src/server/routes/instance/index.ts
packages/opencode/src/server/routes/instance/session.ts
packages/opencode/src/server/server.ts
packages/opencode/src/session/message-v2.ts
packages/opencode/src/session/processor.ts
packages/opencode/src/session/prompt.ts
packages/opencode/src/session/retry.ts
packages/opencode/src/tool/registry.ts
packages/opencode/src/tool/shell.ts
packages/opencode/src/tool/shell/prompt.ts
packages/opencode/src/tool/task.ts
packages/opencode/test/preload.ts
packages/opencode/test/provider/provider.test.ts
packages/opencode/test/server/httpapi-cors.test.ts
packages/opencode/test/session/prompt.test.ts
packages/opencode/test/session/snapshot-tool-race.test.ts
packages/opencode/test/tool/__snapshots__/parameters.test.ts.snap
packages/opencode/test/tool/registry.test.ts
packages/opencode/test/tool/shell.test.ts
packages/sdk/js/src/v2/gen/types.gen.ts
packages/tui/src/component/prompt/index.tsx
packages/tui/src/component/prompt/yolo.test.ts
packages/tui/src/component/prompt/yolo.ts
packages/tui/src/component/runtime-badges.tsx
packages/tui/src/component/runtime-state.ts
packages/tui/src/context/sync.tsx
packages/tui/src/feature-plugins/home/footer.tsx
packages/tui/src/feature-plugins/sidebar/context.tsx
packages/tui/src/feature-plugins/sidebar/footer.tsx
packages/tui/src/routes/session/sidebar.tsx
packages/tui/src/util/usage-stats.ts

How to finish

git fetch origin "auto-sync/upstream-v1.18.25"
git checkout "auto-sync/upstream-v1.18.25"
# Resolve conflict markers in the files above, then:
git add -A && git commit --amend --no-edit
git push --force-with-lease origin "auto-sync/upstream-v1.18.25"

Once resolved, mark this PR ready for review.

Generated by .github/workflows/sync-upstream.yml.

opencode and others added 30 commits August 7, 2026 06:49
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
…1620)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: 侯秀凯 <9627034+hoooou@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Dax Raad <d@ironbay.co>
Co-authored-by: Dax <mail@thdxr.com>
Co-authored-by: vimtor <vn4varro@gmail.com>
MrMushrooooom and others added 28 commits August 26, 2026 21:49
Co-authored-by: MrMushrooooom <19261047+MrMushrooooom@users.noreply.github.com>
Co-authored-by: jayair <53023+jayair@users.noreply.github.com>
…nomalyco#45769)

Co-authored-by: neriousy <34747899+neriousy@users.noreply.github.com>
Co-authored-by: neriousy <34747899+neriousy@users.noreply.github.com>
Co-authored-by: jlongster <17031+jlongster@users.noreply.github.com>
…lyco#45845)

Co-authored-by: Hona <10430890+Hona@users.noreply.github.com>
…lyco#45849)

Co-authored-by: Hona <10430890+Hona@users.noreply.github.com>
…#46116)

Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>
@github-actions github-actions Bot added auto-sync Automated upstream sync PR needs-manual-merge Sync left conflicts needing human resolution labels Aug 31, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-sync Automated upstream sync PR needs-manual-merge Sync left conflicts needing human resolution

Projects

None yet

Development

Successfully merging this pull request may close these issues.