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]>
48 lines
1.2 KiB
Rust
48 lines
1.2 KiB
Rust
use std::fmt;
|
|
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use ts_rs::TS;
|
|
|
|
mod errors;
|
|
mod ghost_commits;
|
|
mod operations;
|
|
mod platform;
|
|
|
|
pub use errors::GitToolingError;
|
|
pub use ghost_commits::CreateGhostCommitOptions;
|
|
pub use ghost_commits::create_ghost_commit;
|
|
pub use ghost_commits::restore_ghost_commit;
|
|
pub use ghost_commits::restore_to_commit;
|
|
pub use platform::create_symlink;
|
|
|
|
/// Details of a ghost commit created from a repository state.
|
|
#[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize, JsonSchema, TS)]
|
|
pub struct GhostCommit {
|
|
id: String,
|
|
parent: Option<String>,
|
|
}
|
|
|
|
impl GhostCommit {
|
|
/// Create a new ghost commit wrapper from a raw commit ID and optional parent.
|
|
pub fn new(id: String, parent: Option<String>) -> Self {
|
|
Self { id, parent }
|
|
}
|
|
|
|
/// Commit ID for the snapshot.
|
|
pub fn id(&self) -> &str {
|
|
&self.id
|
|
}
|
|
|
|
/// Parent commit ID, if the repository had a `HEAD` at creation time.
|
|
pub fn parent(&self) -> Option<&str> {
|
|
self.parent.as_deref()
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for GhostCommit {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{}", self.id)
|
|
}
|
|
}
|