docs: L6 issue-fix lane status (3 fixed, 1 skipped)
This commit is contained in:
@@ -55,3 +55,9 @@
|
||||
- 2026-06-05 07:43 EDT: CYCLE 6 — NO-OP / BACKLOG EXHAUSTED. Branch intact at 5b0d53c (28 commits, 23 PRs integrated). origin/main unmoved at 7f845bc. Zero code changes since cycle-5 green (only the cycle-5 docs line landed). Re-checked all 5 borderline MERGEABLE candidates against the live branch with `git apply --check`: ALL still conflict — #588 (67-file Windows, package.json + swarm-dispatch overlap w/ #579), #558 (playground-hud + claude-agent overlap w/ #540), #565 (send-stream overlap w/ #543), #549 (71-file, electron/main.cjs overlap), #571 (41-file, dashboard-aggregator overlap w/ #550). Everything else open is CONFLICTING (#503 #482 #469 #463 #461 #388 #371 #363 #351 #336 #301 #557 #551), draft (#578), Docker/judgment (#576 crawl4ai), risky major bump (#585 vitest 3→4), or out-of-scope (#563 i18n 934-strings). Re-ran `pnpm build` → GREEN (built in 4.31s). No new commits. Consolidated PR #595 stands at 23 validated PRs. SHAKEDOWN REMAINS COMPLETE pending Eric's judgment on the Needs-Eric items.
|
||||
- 2026-06-05 06:42 EDT: CYCLE 5 — NO-OP / BACKLOG EXHAUSTED. Branch intact at 7eb58ab (23 PRs integrated). Re-verified every remaining open PR against the current integration branch (not just origin/main): all remaining MERGEABLE-against-main PRs now CONFLICT with already-integrated work — #558↔#540 (claude-agent/playground-hud), #565↔#543 (send-stream streaming path), #484↔#545 (file-explorer/files route), #588↔#579 (44-file Windows overlap, package.json + swarm-dispatch + claude-agent). git apply --check confirmed conflicts for all four. Everything else open is CONFLICTING (#463 #503 #469 #388 #482 #371 #363 #336 #301), draft (#578 #557 #551 #461 #351), Docker/judgment (#576 crawl4ai), risky major bump (#585 vitest 3→4), too-large (#549 71-file, #571), or out-of-scope (#563 i18n 934-strings). Branch re-validated: pnpm build GREEN, pnpm test 33 fail/694 pass (exact cycle-4 baseline parity, ZERO regressions). No new commits this cycle — nothing safe left to integrate. Consolidated PR #595 stands at 23 validated PRs. SHAKEDOWN COMPLETE pending Eric's judgment on the Needs-Eric items.
|
||||
- 2026-06-05 06:01 EDT: CYCLE 4 complete. Integrated 2 more priority blocker-mapped PRs onto chore/overnight-pr-shakedown-20260605: #589 (native Conductor dispatch + stale terminal-state fix, Battlelamb — resolved swarm-dispatch.ts conflict vs #567 by taking buildHermesChatQueryArgs helper with correct -q prompt adjacency; +8 passing regression tests) and #543 (chat UIX/UX — thinking indicators, message dedup, streaming stability, JohnGuidry; addresses #572 double-responses + #561 stuck-Thinking; vite loadEnv→process.env SSR bearer bridge). Both: build GREEN, test 33 fail/694 pass (baseline parity, ZERO regressions, +8 from #589's tests), eslint --fix on touched files (net lint errors 1700→1588, cleaned existing debt). Pushed ef2e4ba + 5271ca9. PR #595 now lists 23 PRs. New Needs-Eric this cycle: #565 (zero-fork chat) now CONFLICTS with integrated #543 on send-stream.ts streaming path — needs human decision on streaming strategy; #588 (44-file Windows overlap w/ #579); #585 (vitest 3→4 major bump); #576 (Docker crawl4ai). Remaining mergeable backlog is again exhausted — everything else open is CONFLICTING, draft, Docker/auth-judgment, too-large (#571/#549), or out-of-scope (#563 i18n).
|
||||
- 2026-06-05 11:18 EDT: ISSUE-FIX LANE (L6). Mergeable PR backlog stayed exhausted, so wrote direct issue fixes against the same branch (no push, no PR). 3 issues FIXED, 1 SKIPPED.
|
||||
- **#583** (FIXED — 40828fc): added `'google'` to `ModelProviderOption` + `MODEL_PROVIDER_OPTIONS` in `src/screens/settings/providers-screen.tsx` (label "Google (Gemini)", value `google` to match provider-catalog/wizard/icon conventions), and added `'google'` to `KNOWN_PROVIDER_PREFIXES` so `google/gemini-2.5-pro` displays clean.
|
||||
- **#552** (FIXED — 0a6d1bc): scroll-anchor tug-of-war. `ChatContainerRoot.handleScroll` and `chat-message-list.handleUserScroll` previously only released `stickToBottomRef` when the user scrolled up AND was already >200px from bottom — so any near-bottom upward scroll left stick=true and the ResizeObserver yanked the viewport back on the next streaming chunk. Fix: ANY upward scroll releases stick immediately; re-stick only when user lands within `NEAR_BOTTOM_THRESHOLD`.
|
||||
- **#569** (FIXED — cf16f9a): added `readClaudeConfigCatalog()` to `src/routes/api/models.ts` that walks `providers.*.models`, `providers.*.model` (provider defaults), and `model_aliases` from `~/.hermes/config.yaml`, then merges them into `/api/models` via `mergeModelEntries`. Source label now appends `+config.yaml`. No overlap with #583 (different surface).
|
||||
- **#564** (SKIPPED): repro requires live Ollama. Reporter explicitly says it doesn't happen with cloud providers despite the same `workspace_context` directive being sent in both cases, so the bug is almost certainly inside the hermes-agent Ollama prompt-handling path (out of this repo's reach) — not a clean workspace-side fix. Needs human to repro against an Ollama container.
|
||||
- Build GREEN after each commit. Tests: zero new failures (pre-existing 33-fail baseline preserved — `chat-message-list.test.tsx` failures and providers-screen lint warning verified pre-existing via stash-check).
|
||||
|
||||
Reference in New Issue
Block a user