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]>
59 lines
2.7 KiB
Diff
59 lines
2.7 KiB
Diff
# What: restore explicit build-script dependency annotations used by Codex.
|
|
# Scope: rules_rs crate-universe annotation plumbing only.
|
|
|
|
diff --git a/rs/extensions.bzl b/rs/extensions.bzl
|
|
--- a/rs/extensions.bzl
|
|
+++ b/rs/extensions.bzl
|
|
@@ -321,7 +321,7 @@ def _generate_hub_and_spokes(
|
|
kwargs = dict(
|
|
hub_name = hub_name,
|
|
gen_build_script = annotation.gen_build_script,
|
|
- build_script_deps = [],
|
|
+ build_script_deps = annotation.build_script_deps,
|
|
build_script_deps_select = _select(feature_resolutions.build_deps),
|
|
build_script_data = annotation.build_script_data,
|
|
build_script_data_select = annotation.build_script_data_select,
|
|
@@ -881,9 +881,9 @@ _annotation = tag_class(
|
|
"build_script_data_select": _label_list_dict(
|
|
doc = "Labels to add to a crate's `cargo_build_script::data` attribute, keyed by platform triplet.",
|
|
),
|
|
- # "build_script_deps": attr.label_list(
|
|
- # doc = "A list of labels to add to a crate's `cargo_build_script::deps` attribute.",
|
|
- # ),
|
|
+ "build_script_deps": attr.string_list(
|
|
+ doc = "A list of labels to add to a crate's `cargo_build_script::deps` attribute.",
|
|
+ ),
|
|
"build_script_env": attr.string_dict(
|
|
doc = "Additional environment variables to set on a crate's `cargo_build_script::env` attribute.",
|
|
),
|
|
diff --git a/rs/private/annotations.bzl b/rs/private/annotations.bzl
|
|
--- a/rs/private/annotations.bzl
|
|
+++ b/rs/private/annotations.bzl
|
|
@@ -2,6 +2,7 @@ def _crate_annotation(
|
|
additive_build_file = None,
|
|
additive_build_file_content = "",
|
|
gen_build_script = "auto",
|
|
+ build_script_deps = [],
|
|
build_script_data = [],
|
|
build_script_data_select = {},
|
|
build_script_env = {},
|
|
@@ -30,6 +31,7 @@ def _crate_annotation(
|
|
additive_build_file = additive_build_file,
|
|
additive_build_file_content = additive_build_file_content,
|
|
gen_build_script = gen_build_script,
|
|
+ build_script_deps = build_script_deps,
|
|
build_script_data = build_script_data,
|
|
build_script_data_select = build_script_data_select,
|
|
build_script_env = build_script_env,
|
|
diff --git a/rs/private/repository_utils.bzl b/rs/private/repository_utils.bzl
|
|
--- a/rs/private/repository_utils.bzl
|
|
+++ b/rs/private/repository_utils.bzl
|
|
@@ -298,6 +298,6 @@ rust_crate_attrs = {
|
|
"hub_name": attr.string(),
|
|
"gen_build_script": attr.string(),
|
|
- "build_script_deps": attr.label_list(),
|
|
+ "build_script_deps": attr.string_list(),
|
|
"build_script_deps_select": _label_list_dict(),
|
|
"build_script_data": attr.label_list(),
|
|
"build_script_data_select": _label_list_dict(),
|