Skip to content

DRAFT chore(sync): upstream v1.18.3 → 1.18.3-dev_ttk - #18

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

DRAFT chore(sync): upstream v1.18.3 → 1.18.3-dev_ttk#18
github-actions[bot] wants to merge 2774 commits into
devfrom
auto-sync/upstream-v1.18.3

Conversation

@github-actions

Copy link
Copy Markdown

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

Files needing manual resolution

.github/workflows/close-stale-prs.yml
.github/workflows/deploy.yml
.opencode/opencode.jsonc
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.3"
git checkout "auto-sync/upstream-v1.18.3"# 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.3"

Once resolved, mark this PR ready for review.

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

StarpTechand others added 30 commits July 7, 2026 16:23
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: Kit Langton <kit.langton@gmail.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
jerome-benoitand others added 28 commits July 18, 2026 10:41
Co-authored-by: Test User <test@test.com>
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Jay <53023+jayair@users.noreply.github.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
anomalyco#37696)
Co-authored-by: liqiping <liqiping@msh.team>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>
Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Co-authored-by: Jay <53023+jayair@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
@github-actionsgithub-actionsBot added auto-sync Automated upstream sync PR needs-manual-merge Sync left conflicts needing human resolution labels Jul 20, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-syncAutomated upstream sync PRneeds-manual-mergeSync left conflicts needing human resolution

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@StarpTech@fengjikui@adamdotdevin@Brendonovich@Hona@fwang@rekram1-node@iamdavidhill@usrnk1@arvsrn@nabilfreeman@vglafirov@geraint0923@BB-84C@MrMushrooooom@kommander@jerome-benoit@simonklee@ProdigyRahul@chouqin