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]>
65 lines
2.0 KiB
Python
65 lines
2.0 KiB
Python
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import time
|
|
|
|
from codex_app_server.async_client import AsyncAppServerClient
|
|
|
|
|
|
def test_async_client_serializes_transport_calls() -> None:
|
|
async def scenario() -> int:
|
|
client = AsyncAppServerClient()
|
|
active = 0
|
|
max_active = 0
|
|
|
|
def fake_model_list(include_hidden: bool = False) -> bool:
|
|
nonlocal active, max_active
|
|
active += 1
|
|
max_active = max(max_active, active)
|
|
time.sleep(0.05)
|
|
active -= 1
|
|
return include_hidden
|
|
|
|
client._sync.model_list = fake_model_list # type: ignore[method-assign]
|
|
await asyncio.gather(client.model_list(), client.model_list())
|
|
return max_active
|
|
|
|
assert asyncio.run(scenario()) == 1
|
|
|
|
|
|
def test_async_stream_text_is_incremental_and_blocks_parallel_calls() -> None:
|
|
async def scenario() -> tuple[str, list[str], bool]:
|
|
client = AsyncAppServerClient()
|
|
|
|
def fake_stream_text(thread_id: str, text: str, params=None): # type: ignore[no-untyped-def]
|
|
yield "first"
|
|
time.sleep(0.03)
|
|
yield "second"
|
|
yield "third"
|
|
|
|
def fake_model_list(include_hidden: bool = False) -> str:
|
|
return "done"
|
|
|
|
client._sync.stream_text = fake_stream_text # type: ignore[method-assign]
|
|
client._sync.model_list = fake_model_list # type: ignore[method-assign]
|
|
|
|
stream = client.stream_text("thread-1", "hello")
|
|
first = await anext(stream)
|
|
|
|
blocked_before_stream_done = False
|
|
competing_call = asyncio.create_task(client.model_list())
|
|
await asyncio.sleep(0.01)
|
|
blocked_before_stream_done = not competing_call.done()
|
|
|
|
remaining: list[str] = []
|
|
async for item in stream:
|
|
remaining.append(item)
|
|
|
|
await competing_call
|
|
return first, remaining, blocked_before_stream_done
|
|
|
|
first, remaining, blocked = asyncio.run(scenario())
|
|
assert first == "first"
|
|
assert remaining == ["second", "third"]
|
|
assert blocked
|