chore(sync): feat/hot-reload-smooth onto upstream/dev#11
Open
github-actions[bot] wants to merge 15 commits intodevfrom
Open
chore(sync): feat/hot-reload-smooth onto upstream/dev#11github-actions[bot] wants to merge 15 commits intodevfrom
github-actions[bot] wants to merge 15 commits intodevfrom
Conversation
github-actions
bot
added
fork-sync
Author
|
Automated sync hit conflicts while rebasing onto upstream/dev. Janitor will attempt a repair pass. |
# Conflicts: # packages/opencode/src/flag/flag.ts
# Conflicts: # packages/opencode/src/flag/flag.ts
This reverts commit 7f1c77f.
* feat(opencode): add `cljfmt` formatter support for Clojure files (anomalyco#13426) * fix(website): correct zh-CN translation of proprietary terms in zen.mdx (anomalyco#13734) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> * chore: generate * desktop: use process-wrap instead of manual job object (anomalyco#13431) * feat(opencode): Add Venice support in temperature, topP, topK and smallOption (anomalyco#13553) * feat(opencode): add conservative workspace hot reload * fix(opencode): reset caches and emit hot reload event * feat(experimental): add hot reload API trigger * chore(sdk): regenerate OpenAPI for hot reload * test(hotreload): gate darwin path alias on macOS * chore(flags): simplify hot reload gating * chore(flags): align hot reload env with experimental * feat(hotreload): emit change events and support manual mode * feat(hotreload): make reload userland-driven * chore(sdk): include hot reload changed event * feat(hotreload): reset plugins, tools, and mcp on apply * fix(cli): allow --agent with --attach * Revert "fix(cli): allow --agent with --attach" This reverts commit 7f1c77f. * fix(hotreload): apply within instance context --------- Co-authored-by: Salam Elbilig <finalfantasia@users.noreply.github.com> Co-authored-by: Pan Kaixin <pan_kaixin@qq.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: Brendan Allan <brendonovich@outlook.com> Co-authored-by: dpuyosa <dpuyosa@users.noreply.github.com> Co-authored-by: Benjamin Shafii <benjamin.shafii@gmail.com> # Conflicts: # packages/desktop/src-tauri/src/cli.rs # packages/opencode/src/format/formatter.ts # packages/web/src/content/docs/formatters.mdx # packages/web/src/content/docs/zh-cn/zen.mdx
github-actions
bot
force-pushed
the
sync/feat-hot-reload-smooth-onto-dev
branch
from
9dcb11d to
25fe6ba
Compare
Author
|
Janitor repair pass completed and pushed updates to sync/feat-hot-reload-smooth-onto-dev. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Conflict Details