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
1007 B
Python
42 lines
1007 B
Python
from __future__ import annotations
|
|
|
|
import random
|
|
import time
|
|
from typing import Callable, TypeVar
|
|
|
|
from .errors import is_retryable_error
|
|
|
|
T = TypeVar("T")
|
|
|
|
|
|
def retry_on_overload(
|
|
op: Callable[[], T],
|
|
*,
|
|
max_attempts: int = 3,
|
|
initial_delay_s: float = 0.25,
|
|
max_delay_s: float = 2.0,
|
|
jitter_ratio: float = 0.2,
|
|
) -> T:
|
|
"""Retry helper for transient server-overload errors."""
|
|
|
|
if max_attempts < 1:
|
|
raise ValueError("max_attempts must be >= 1")
|
|
|
|
delay = initial_delay_s
|
|
attempt = 0
|
|
while True:
|
|
attempt += 1
|
|
try:
|
|
return op()
|
|
except Exception as exc:
|
|
if attempt >= max_attempts:
|
|
raise
|
|
if not is_retryable_error(exc):
|
|
raise
|
|
|
|
jitter = delay * jitter_ratio
|
|
sleep_for = min(max_delay_s, delay) + random.uniform(-jitter, jitter)
|
|
if sleep_for > 0:
|
|
time.sleep(sleep_for)
|
|
delay = min(max_delay_s, delay * 2)
|