Skip to content

DRAFT chore(sync): upstream v1.18.21 → 1.18.21-dev_ttk - #23

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

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

Conversation

@github-actions

Copy link
Copy Markdown

Auto-sync of upstream v1.18.21 → 1.18.21-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.21"
git checkout "auto-sync/upstream-v1.18.21"
# 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.21"

Once resolved, mark this PR ready for review.

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

frederiknsgo and others added 30 commits August 3, 2026 17:42
Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
…yco#40136)

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
opencode-agent Bot and others added 28 commits August 21, 2026 10:56
Co-authored-by: thdxr <826656+thdxr@users.noreply.github.com>
Co-authored-by: Slickstef11 <98915060+Slickstef11@users.noreply.github.com>
Co-authored-by: neriousy <34747899+neriousy@users.noreply.github.com>
…tible providers (anomalyco#43915)

Co-authored-by: Joel Stucki <joel.stucki@example.com>
Co-authored-by: MrMushrooooom <MrMushrooooom@users.noreply.github.com>
Co-authored-by: Frank <frank@anoma.ly>
@github-actions github-actions Bot added auto-sync Automated upstream sync PR needs-manual-merge Sync left conflicts needing human resolution labels Aug 24, 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.