Skip to content

Commit 25fe6ba

Browse files
github-actions[bot]finalfantasiapkx07CopilotCopilot
committed
chore(sync): feat/hot-reload-smooth onto upstream/dev (#8)
* 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
1 parent 57db4b7 commit 25fe6ba

File tree

2 files changed

+6
-2
lines changed
  • packages

2 files changed

+6
-2
lines changed

packages/desktop/src-tauri/src/cli.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,9 @@ pub fn spawn_command(
391391
let _ = tx.send(CommandEvent::Error(err.to_string())).await;
392392
}
393393
}
394-
395394
stdout.abort();
396395
stderr.abort();
396+
397397
});
398398

399399
let event_stream = ReceiverStream::new(rx);

packages/web/src/content/docs/zh-cn/zen.mdx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,11 @@ Zen 也非常适合团队使用。你可以邀请队友、分配角色、管理
201201

202202
你可以邀请团队成员加入你的工作区并分配角色:
203203

204-
- **管理员**:管理模型、成员、API 密钥和账单
204+
<<<<<<< HEAD
205+
206+
- # **管理员**:管理模型、成员、API 密钥和账单
207+
- **管理员**:管理模型、成员、API 密钥和计费/账单
208+
> > > > > > > 2b53ac320 (chore(sync): feat/hot-reload-smooth onto upstream/dev (#8))
205209
- **成员**:仅管理自己的 API 密钥
206210

207211
管理员还可以为每个成员设置月度支出限额,以控制成本。

0 commit comments

Comments
 (0)