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]>
35 lines
998 B
Diff
35 lines
998 B
Diff
diff --git a/Src/exec.c b/Src/exec.c
|
|
index 27bca11..baea760 100644
|
|
--- a/Src/exec.c
|
|
+++ b/Src/exec.c
|
|
@@ -507,7 +507,9 @@ zexecve(char *pth, char **argv, char **newenvp)
|
|
{
|
|
int eno;
|
|
static char buf[PATH_MAX * 2+1];
|
|
- char **eep;
|
|
+ char **eep, **exec_argv;
|
|
+ char *orig_pth = pth;
|
|
+ char *exec_wrapper;
|
|
|
|
unmetafy(pth, NULL);
|
|
for (eep = argv; *eep; eep++)
|
|
@@ -526,8 +528,17 @@ zexecve(char *pth, char **argv, char **newenvp)
|
|
|
|
if (newenvp == NULL)
|
|
newenvp = environ;
|
|
+ exec_argv = argv;
|
|
+ if ((exec_wrapper = getenv("EXEC_WRAPPER")) &&
|
|
+ *exec_wrapper && !inblank(*exec_wrapper)) {
|
|
+ exec_argv = argv - 2;
|
|
+ exec_argv[0] = exec_wrapper;
|
|
+ exec_argv[1] = orig_pth;
|
|
+ pth = exec_wrapper;
|
|
+ }
|
|
winch_unblock();
|
|
- execve(pth, argv, newenvp);
|
|
+ execve(pth, exec_argv, newenvp);
|
|
+ pth = orig_pth;
|
|
|
|
/* If the execve returns (which in general shouldn't happen), *
|
|
* then check for an errno equal to ENOEXEC. This errno is set *
|