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]>
42 lines
1.4 KiB
TypeScript
42 lines
1.4 KiB
TypeScript
import { selectDarwinBash, selectLinuxBash } from "../src/bashSelection";
|
|
import { DARWIN_BASH_VARIANTS, LINUX_BASH_VARIANTS } from "../src/constants";
|
|
import { OsReleaseInfo } from "../src/types";
|
|
import path from "node:path";
|
|
|
|
describe("selectLinuxBash", () => {
|
|
const bashRoot = "/vendor/bash";
|
|
|
|
it("prefers exact version match when id is present", () => {
|
|
const info: OsReleaseInfo = {
|
|
id: "ubuntu",
|
|
idLike: ["debian"],
|
|
versionId: "24.04.1",
|
|
};
|
|
const selection = selectLinuxBash(bashRoot, info);
|
|
expect(selection.variant).toBe("ubuntu-24.04");
|
|
expect(selection.path).toBe(path.join(bashRoot, "ubuntu-24.04", "bash"));
|
|
});
|
|
|
|
it("falls back to first supported variant when no matches", () => {
|
|
const info: OsReleaseInfo = { id: "unknown", idLike: [], versionId: "1.0" };
|
|
const selection = selectLinuxBash(bashRoot, info);
|
|
expect(selection.variant).toBe(LINUX_BASH_VARIANTS[0].name);
|
|
});
|
|
});
|
|
|
|
describe("selectDarwinBash", () => {
|
|
const bashRoot = "/vendor/bash";
|
|
|
|
it("selects compatible darwin version", () => {
|
|
const darwinRelease = "24.0.0";
|
|
const selection = selectDarwinBash(bashRoot, darwinRelease);
|
|
expect(selection.variant).toBe("macos-15");
|
|
});
|
|
|
|
it("falls back to first darwin variant when release too old", () => {
|
|
const darwinRelease = "20.0.0";
|
|
const selection = selectDarwinBash(bashRoot, darwinRelease);
|
|
expect(selection.variant).toBe(DARWIN_BASH_VARIANTS[0].name);
|
|
});
|
|
});
|