mirror of
https://github.com/hanzoai/dev.git
synced 2026-10-25 03:32:32 +00:00
zeekayandHanzo Dev
6cbbea2d03
Our history is just-every's with author emails rewritten, so the graphs are
disjoint and git finds no merge base. Supplied one by hand: d1f1f51a41, the
just-every commit matching our Oct-2025 fork point (22 files apart). 9618
upstream commits, 7004 files, +1.81M/-159k, 37 conflicts.
Resolution:
- Upstream code where our side was the Oct-2025 prototype of a feature they
have since reimplemented 3-5x larger (agent_runs, browser_sessions,
history_cell/{agent,browser}, the vt100 harness and its snapshots).
- Upstream's config.rs module split (builder/defaults/sources/validation)
kept; zen5-coder and the provider-follows-model rule re-applied on top.
- Ours where the file IS the identity: README, package.json, postinstall,
release notes pipeline, integration-zed.
- Hybrid where upstream improved a file we had branded: updates.rs (their
release-repo migration, our hanzoai/dev), release.yml (their fail-fast npm
auth check, our package name), chatwidget.rs (their turn handling, our
HANZO_USER_KEY hint), exec human output (their 237 lines, our banner).
Superseded and dropped deliberately: our resume_command_name() coder-alias
hack — upstream's derive_resume_command_name() reads the invocation basename
generically, which yields "dev" for us.
LLM.md now records the real topology and the sync point; AGENTS.md and
CLAUDE.md are symlinks to it again. Single parent on purpose: adopting
jecode/main as a second parent would re-import 13,742 commits carrying the
upstream author emails a prior rewrite deliberately removed.
Version 0.2.188 -> 0.2.189.
Co-authored-by: Hanzo Dev <[email protected]>
47 lines
1.6 KiB
Rust
47 lines
1.6 KiB
Rust
//! Test support for running the Windows exec-server under Wine.
|
|
|
|
use std::future::Future;
|
|
use std::path::PathBuf;
|
|
|
|
use anyhow::Context;
|
|
use anyhow::Result;
|
|
use tokio::io::AsyncBufReadExt;
|
|
use tokio::io::BufReader;
|
|
use wine_test_support::WineTestCommand;
|
|
|
|
/// Runs the Windows exec-server under Wine for the duration of a scoped operation.
|
|
pub struct WineExecServer;
|
|
|
|
impl WineExecServer {
|
|
/// Starts the server, passes its WebSocket URL and Wine prefix to `operation`, and tears it
|
|
/// down afterward.
|
|
pub async fn scope<T, F, Fut>(self, operation: F) -> Result<T>
|
|
where
|
|
F: FnOnce(String, PathBuf) -> Fut,
|
|
Fut: Future<Output = Result<T>>,
|
|
{
|
|
let executable = codex_utils_cargo_bin::cargo_bin("wine-windows-exec-server")?;
|
|
let mut exec_server = WineTestCommand::new(executable)
|
|
.env("CODEX_HOME", r"C:\codex-home")
|
|
.spawn()?;
|
|
let wine_prefix = exec_server.prefix_path().to_path_buf();
|
|
let stdout = exec_server.take_stdout();
|
|
|
|
exec_server
|
|
.scope(async move {
|
|
let mut lines = BufReader::new(stdout).lines();
|
|
let exec_server_url = loop {
|
|
let line = lines
|
|
.next_line()
|
|
.await?
|
|
.context("Wine exec-server exited before reporting its URL")?;
|
|
if line.starts_with("ws://") {
|
|
break line;
|
|
}
|
|
};
|
|
operation(exec_server_url, wine_prefix).await
|
|
})
|
|
.await
|
|
}
|
|
}
|