mirror of
https://github.com/hanzoai/dev.git
synced 2026-10-25 03:32:32 +00:00
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]>
73 lines
2.1 KiB
Rust
73 lines
2.1 KiB
Rust
use code_core::protocol::{
|
|
Event,
|
|
EventMsg,
|
|
ExecCommandBeginEvent,
|
|
ExecCommandEndEvent,
|
|
OrderMeta,
|
|
};
|
|
use code_tui::test_helpers::{render_chat_widget_to_vt100, ChatWidgetHarness};
|
|
use std::path::PathBuf;
|
|
use std::time::Duration;
|
|
|
|
fn next_order_meta(request_ordinal: u64, seq: &mut u64) -> OrderMeta {
|
|
let order = OrderMeta {
|
|
request_ordinal,
|
|
output_index: Some(0),
|
|
sequence_number: Some(*seq),
|
|
};
|
|
*seq += 1;
|
|
order
|
|
}
|
|
|
|
#[test]
|
|
fn exec_command_completes_properly() {
|
|
let mut harness = ChatWidgetHarness::new();
|
|
let mut seq = 0_u64;
|
|
let call_id = "call_test";
|
|
let cwd = PathBuf::from("/tmp");
|
|
|
|
harness.handle_event(Event {
|
|
id: "exec-begin".to_string(),
|
|
event_seq: 0,
|
|
msg: EventMsg::ExecCommandBegin(ExecCommandBeginEvent {
|
|
call_id: call_id.to_string(),
|
|
command: vec!["ls".into(), "-la".into()],
|
|
cwd: cwd.clone(),
|
|
parsed_cmd: Vec::new(),
|
|
}),
|
|
order: Some(next_order_meta(1, &mut seq)),
|
|
});
|
|
|
|
let before = render_chat_widget_to_vt100(&mut harness, 80, 12);
|
|
assert!(
|
|
before.contains("Running") || before.contains("ls"),
|
|
"exec cell should show running state before end, output:\n{}",
|
|
before
|
|
);
|
|
|
|
harness.handle_event(Event {
|
|
id: "exec-end".to_string(),
|
|
event_seq: 1,
|
|
msg: EventMsg::ExecCommandEnd(ExecCommandEndEvent {
|
|
call_id: call_id.to_string(),
|
|
stdout: "total 0\ndrwxr-xr-x 2 user user 4096 Nov 28 00:00 .\n".to_string(),
|
|
stderr: String::new(),
|
|
exit_code: 0,
|
|
duration: Duration::from_millis(50),
|
|
}),
|
|
order: Some(next_order_meta(1, &mut seq)),
|
|
});
|
|
|
|
let after = render_chat_widget_to_vt100(&mut harness, 80, 14);
|
|
assert!(
|
|
!after.contains("Running..."),
|
|
"exec cell should NOT show 'Running...' after completion, output:\n{}",
|
|
after
|
|
);
|
|
assert!(
|
|
after.contains("total") || after.contains("drwx"),
|
|
"exec cell should show output after completion, output:\n{}",
|
|
after
|
|
);
|
|
}
|