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]>
51 lines
1.3 KiB
Diff
51 lines
1.3 KiB
Diff
# What: provide MinGW compatibility archives required by Windows gnullvm links.
|
|
# Why: clang and prebuilt MSVC archives can request these names even though the
|
|
# hermetic MinGW runtime does not publish them by default.
|
|
|
|
diff --git a/runtimes/mingw/BUILD.bazel b/runtimes/mingw/BUILD.bazel
|
|
--- a/runtimes/mingw/BUILD.bazel
|
|
+++ b/runtimes/mingw/BUILD.bazel
|
|
@@ -386,14 +386,42 @@ stub_library(
|
|
name = "stdc++",
|
|
)
|
|
|
|
+# Clang may inject -lssp and -lssp_nonshared for windows-gnu links.
|
|
+# Provide compatibility archives in the MinGW runtime search directory.
|
|
+stub_library(
|
|
+ name = "ssp",
|
|
+)
|
|
+
|
|
+stub_library(
|
|
+ name = "ssp_nonshared",
|
|
+)
|
|
+
|
|
+# Prebuilt MSVC archives can carry /DEFAULTLIB:libcmt.lib and
|
|
+# /DEFAULTLIB:oldnames.lib directives. Provide MinGW-compatible stand-ins so
|
|
+# lld can satisfy the lookup under windows-gnullvm.
|
|
+stub_library(
|
|
+ name = "libcmt",
|
|
+)
|
|
+
|
|
+copy_file(
|
|
+ name = "oldnames",
|
|
+ src = ":moldname",
|
|
+ out = "liboldnames.a",
|
|
+ visibility = ["//visibility:public"],
|
|
+)
|
|
+
|
|
copy_to_directory(
|
|
name = "mingw_crt_library_search_directory",
|
|
srcs = [
|
|
+ ":libcmt",
|
|
":m",
|
|
":mingw32",
|
|
":mingwex",
|
|
":moldname",
|
|
+ ":oldnames",
|
|
":pthread",
|
|
+ ":ssp",
|
|
+ ":ssp_nonshared",
|
|
":stdc++",
|
|
":uuid",
|
|
":winpthread",
|