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]>
213 lines
6.3 KiB
Python
213 lines
6.3 KiB
Python
#!/usr/bin/env python3
|
|
"""Format repository sources or check that they are already formatted."""
|
|
|
|
import argparse
|
|
import os
|
|
import shlex
|
|
import subprocess
|
|
import sys
|
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
|
from dataclasses import dataclass
|
|
from pathlib import Path
|
|
|
|
|
|
REPO_ROOT = Path(__file__).resolve().parents[1]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class Command:
|
|
args: tuple[str, ...]
|
|
cwd: Path = REPO_ROOT
|
|
discard_stderr: bool = False
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class FormatterGroup:
|
|
name: str
|
|
commands: tuple[Command, ...]
|
|
|
|
|
|
@dataclass(frozen=True)
|
|
class FormatterResult:
|
|
name: str
|
|
output: str
|
|
returncode: int
|
|
|
|
|
|
def just_formatter_group(*, check: bool) -> FormatterGroup:
|
|
args = ["just", "--unstable", "--fmt"]
|
|
if check:
|
|
args.append("--check")
|
|
return FormatterGroup("Just", (Command(tuple(args)),))
|
|
|
|
|
|
def rust_formatter_group(*, check: bool) -> FormatterGroup:
|
|
args = ["cargo", "fmt", "--", "--config", "imports_granularity=Item"]
|
|
if check:
|
|
args.append("--check")
|
|
# Stable rustfmt repeats a nightly-only `imports_granularity` warning
|
|
# for each crate, so suppress that expected stderr noise.
|
|
command = Command(
|
|
tuple(args),
|
|
REPO_ROOT / "codex-rs",
|
|
discard_stderr=True,
|
|
)
|
|
return FormatterGroup("Rust", (command,))
|
|
|
|
|
|
def buildifier_formatter_group(*, check: bool) -> FormatterGroup:
|
|
repository_files = subprocess.check_output(
|
|
["git", "ls-files", "-z", "--cached", "--others", "--exclude-standard"],
|
|
cwd=REPO_ROOT,
|
|
).split(b"\0")
|
|
buildifier_files: list[str] = []
|
|
for encoded_path in repository_files:
|
|
if not encoded_path:
|
|
continue
|
|
path = Path(os.fsdecode(encoded_path))
|
|
name = path.name
|
|
if (
|
|
name in {"BUILD", "WORKSPACE", "MODULE.bazel"}
|
|
or name.startswith(("BUILD.", "WORKSPACE."))
|
|
or name.endswith((".BUILD.bazel", ".MODULE.bazel", ".bzl", ".sky"))
|
|
or ".bzl." in name
|
|
or ".sky." in name
|
|
):
|
|
buildifier_files.append(path.as_posix())
|
|
buildifier_files.sort()
|
|
|
|
# Invoke DotSlash explicitly because Windows does not honor shebangs.
|
|
buildifier_args = [
|
|
"dotslash",
|
|
str(REPO_ROOT / "tools" / "buildifier"),
|
|
"-mode=check" if check else "-mode=fix",
|
|
"-lint=off",
|
|
*buildifier_files,
|
|
]
|
|
return FormatterGroup("Bazel/Starlark", (Command(tuple(buildifier_args)),))
|
|
|
|
|
|
def python_sdk_formatter_group(*, check: bool) -> FormatterGroup:
|
|
# Each `--project` retains its local dependency and Ruff configuration context.
|
|
uv_run_args = [
|
|
"uv",
|
|
"run",
|
|
"--frozen",
|
|
"--project",
|
|
"sdk/python",
|
|
"--only-group",
|
|
"format",
|
|
]
|
|
format_args = [
|
|
*uv_run_args,
|
|
"ruff",
|
|
"format",
|
|
]
|
|
if check:
|
|
format_args.append("--check")
|
|
# `ruff check --diff` reports lint-driven rewrites without changing files.
|
|
# It is the check-mode counterpart of `--fix --fix-only`, not a full lint gate.
|
|
lint_args = ["ruff", "check", "--diff"]
|
|
else:
|
|
# Ruff's lint fixer and formatter are separate passes: the first applies
|
|
# fixable lint rewrites, while the second formats source layout.
|
|
lint_args = ["ruff", "check", "--fix", "--fix-only"]
|
|
|
|
return FormatterGroup(
|
|
"Python SDK",
|
|
(
|
|
Command((*uv_run_args, *lint_args, "sdk/python")),
|
|
Command((*format_args, "sdk/python")),
|
|
),
|
|
)
|
|
|
|
|
|
def python_scripts_formatter_group(*, check: bool) -> FormatterGroup:
|
|
# The SDK and internal scripts intentionally use separate project roots so
|
|
# uv and Ruff retain each project's configuration context.
|
|
args = [
|
|
"uv",
|
|
"run",
|
|
"--frozen",
|
|
"--project",
|
|
"scripts",
|
|
"ruff",
|
|
"format",
|
|
]
|
|
if check:
|
|
args.append("--check")
|
|
args.append("scripts")
|
|
return FormatterGroup("Python scripts", (Command(tuple(args)),))
|
|
|
|
|
|
def formatter_groups(*, check: bool) -> tuple[FormatterGroup, ...]:
|
|
return (
|
|
just_formatter_group(check=check),
|
|
rust_formatter_group(check=check),
|
|
buildifier_formatter_group(check=check),
|
|
python_sdk_formatter_group(check=check),
|
|
python_scripts_formatter_group(check=check),
|
|
)
|
|
|
|
|
|
def run_formatter_group(group: FormatterGroup) -> FormatterResult:
|
|
"""Run one formatter group sequentially and return its buffered output."""
|
|
output: list[str] = []
|
|
for command in group.commands:
|
|
output.append(f"$ {shlex.join(command.args)}\n")
|
|
try:
|
|
process = subprocess.run(
|
|
command.args,
|
|
cwd=command.cwd,
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.DEVNULL
|
|
if command.discard_stderr
|
|
else subprocess.STDOUT,
|
|
text=True,
|
|
check=False,
|
|
)
|
|
except OSError as error:
|
|
output.append(f"{error}\n")
|
|
return FormatterResult(group.name, "".join(output), 1)
|
|
|
|
output.append(process.stdout)
|
|
if process.stdout and not process.stdout.endswith("\n"):
|
|
output.append("\n")
|
|
if process.returncode != 0:
|
|
return FormatterResult(group.name, "".join(output), process.returncode)
|
|
|
|
return FormatterResult(group.name, "".join(output), 0)
|
|
|
|
|
|
def main() -> int:
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument(
|
|
"--check",
|
|
action="store_true",
|
|
help="check formatting without modifying files",
|
|
)
|
|
args = parser.parse_args()
|
|
groups = formatter_groups(check=args.check)
|
|
|
|
failures: list[str] = []
|
|
with ThreadPoolExecutor(max_workers=len(groups)) as executor:
|
|
futures = {}
|
|
for group in groups:
|
|
print(f"Starting {group.name} formatter...", flush=True)
|
|
futures[executor.submit(run_formatter_group, group)] = group.name
|
|
for future in as_completed(futures):
|
|
result = future.result()
|
|
print(f"==> {result.name} formatter finished")
|
|
print(result.output, end="")
|
|
if result.returncode != 0:
|
|
failures.append(result.name)
|
|
|
|
if failures:
|
|
print(f"Formatting failed: {', '.join(failures)}", file=sys.stderr)
|
|
return 1
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|