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]>
120 lines
3.0 KiB
Rust
120 lines
3.0 KiB
Rust
use std::fs;
|
|
|
|
use assert_cmd::Command;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::json;
|
|
use tempfile::TempDir;
|
|
|
|
#[test]
|
|
fn execpolicy_check_matches_expected_json() -> Result<(), Box<dyn std::error::Error>> {
|
|
let codex_home = TempDir::new()?;
|
|
let policy_path = codex_home.path().join("rules").join("policy.rules");
|
|
fs::create_dir_all(
|
|
policy_path
|
|
.parent()
|
|
.expect("policy path should have a parent"),
|
|
)?;
|
|
fs::write(
|
|
&policy_path,
|
|
r#"
|
|
prefix_rule(
|
|
pattern = ["git", "push"],
|
|
decision = "forbidden",
|
|
)
|
|
"#,
|
|
)?;
|
|
|
|
let output = Command::new(codex_utils_cargo_bin::cargo_bin("codex")?)
|
|
.env("CODEX_HOME", codex_home.path())
|
|
.args([
|
|
"execpolicy",
|
|
"check",
|
|
"--rules",
|
|
policy_path
|
|
.to_str()
|
|
.expect("policy path should be valid UTF-8"),
|
|
"git",
|
|
"push",
|
|
"origin",
|
|
"main",
|
|
])
|
|
.output()?;
|
|
|
|
assert!(output.status.success());
|
|
let result: serde_json::Value = serde_json::from_slice(&output.stdout)?;
|
|
assert_eq!(
|
|
result,
|
|
json!({
|
|
"decision": "forbidden",
|
|
"matchedRules": [
|
|
{
|
|
"prefixRuleMatch": {
|
|
"matchedPrefix": ["git", "push"],
|
|
"decision": "forbidden"
|
|
}
|
|
}
|
|
]
|
|
})
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn execpolicy_check_includes_justification_when_present() -> Result<(), Box<dyn std::error::Error>>
|
|
{
|
|
let codex_home = TempDir::new()?;
|
|
let policy_path = codex_home.path().join("rules").join("policy.rules");
|
|
fs::create_dir_all(
|
|
policy_path
|
|
.parent()
|
|
.expect("policy path should have a parent"),
|
|
)?;
|
|
fs::write(
|
|
&policy_path,
|
|
r#"
|
|
prefix_rule(
|
|
pattern = ["git", "push"],
|
|
decision = "forbidden",
|
|
justification = "pushing is blocked in this repo",
|
|
)
|
|
"#,
|
|
)?;
|
|
|
|
let output = Command::new(codex_utils_cargo_bin::cargo_bin("codex")?)
|
|
.env("CODEX_HOME", codex_home.path())
|
|
.args([
|
|
"execpolicy",
|
|
"check",
|
|
"--rules",
|
|
policy_path
|
|
.to_str()
|
|
.expect("policy path should be valid UTF-8"),
|
|
"git",
|
|
"push",
|
|
"origin",
|
|
"main",
|
|
])
|
|
.output()?;
|
|
|
|
assert!(output.status.success());
|
|
let result: serde_json::Value = serde_json::from_slice(&output.stdout)?;
|
|
assert_eq!(
|
|
result,
|
|
json!({
|
|
"decision": "forbidden",
|
|
"matchedRules": [
|
|
{
|
|
"prefixRuleMatch": {
|
|
"matchedPrefix": ["git", "push"],
|
|
"decision": "forbidden",
|
|
"justification": "pushing is blocked in this repo"
|
|
}
|
|
}
|
|
]
|
|
})
|
|
);
|
|
|
|
Ok(())
|
|
}
|