diff --git a/.codebuddy/github-contribute/handoff.md b/.codebuddy/github-contribute/handoff.md
index d8c3c1a24..a49021db7 100644
--- a/.codebuddy/github-contribute/handoff.md
+++ b/.codebuddy/github-contribute/handoff.md
@@ -1,12 +1,12 @@
 # Handoff — sipeed/picoclaw
 
-Last updated: 2026-06-05 08:58 UTC+8
-Run mode: resume
+Last updated: 2026-06-05 09:30 UTC+8
+Run mode: resume (fix round complete)
 
 ## Quick Resume
 - Repo: sipeed/picoclaw (fork: chengzhichao-xydt/picoclaw)
 - Upstream main: 5224b9a4
-- Open PRs: #3001, #2985
-- Active branches: codex/workspace-guard-schemeless-url, codex/context-show-summarize-threshold
-- Reviewer: afjcjsbx
-- Next: fix both PRs per review feedback
+- Open PRs: #3001, #2985 — both pushed with review fixes
+- Both waiting for afjcjsbx re-review
+- 7 merged PRs this round
+- Next: monitor CI/review, scan new candidates if desired
diff --git a/.codebuddy/github-contribute/journal.md b/.codebuddy/github-contribute/journal.md
index 81733b1c9..41389855f 100644
--- a/.codebuddy/github-contribute/journal.md
+++ b/.codebuddy/github-contribute/journal.md
@@ -1,11 +1,22 @@
 # Journal — sipeed/picoclaw
 
-## 2026-06-05 08:58 UTC+8 — Resume
+## 2026-06-05 08:58 UTC+8 — Resume + Fix round
 
-- run_mode=resume confirmed
-- 2 open PRs: #3001, #2985
-- Both CI green, both need code fixes from reviewer afjcjsbx
-- 7 recently merged PRs
+- run_mode=resume, 2 open PRs identified
+- Initialized repo-local state directory (.codebuddy/github-contribute)
 - Cleaned up merged local branches
-- Initialized state directory
-- Dispatching implementation sub-agents for both PRs
+
+## 2026-06-05 09:05 UTC+8 — #3001 fix
+- Added TestShellTool_SchemelessURLDetection to shell_test.go
+- Covers all 7 web schemes + multi-URL commands
+- Test PASS, pushed a6735517, commented on PR
+
+## 2026-06-05 09:25 UTC+8 — #2985 fix
+- Issue 1: Added comment explaining summarizeAtTokens vs UsedTokens difference
+- Issue 2: Replaced hardcoded strings with i18n keys (5 locale files)
+- Issue 3: Added SummarizeAtTokens field to pico_test.go with assertion
+- Build PASS, pico test PASS, pushed 296a8ae2, commented on PR
+
+## 2026-06-05 09:30 UTC+8 — State update
+- Both PRs now in 'wait' — awaiting afjcjsbx re-review
+- Ready for next batch of candidate scanning
diff --git a/.codebuddy/github-contribute/pr-board.md b/.codebuddy/github-contribute/pr-board.md
index f262e3c2a..bccd7a70c 100644
--- a/.codebuddy/github-contribute/pr-board.md
+++ b/.codebuddy/github-contribute/pr-board.md
@@ -1,20 +1,15 @@
 # PR Board — sipeed/picoclaw
 
-## awaiting_review_fix (2)
+## awaiting_maintainer_review (2)
 
 ### #3001 — fix(tools): allow scheme-less URLs in workspace guard
 - Branch: codex/workspace-guard-schemeless-url
-- Base: main | Created: 2026-06-04T10:06:36Z
-- CI: Tests ✅ Linter ✅ Security ✅ Integration ✅
-- Review: afjcjsbx requested unit tests
-- Next: implement unit tests → push → request re-review
+- Fix: Added TestShellTool_SchemelessURLDetection (7 schemes + multi-URL)
+- Pushed: a6735517 | Comment: https://github.com/sipeed/picoclaw/pull/3001#issuecomment-4627308317
+- Next: wait for afjcjsbx re-review
 
 ### #2985 — fix(context): show both summarize and compress thresholds in /context
 - Branch: codex/context-show-summarize-threshold
-- Base: main | Created: 2026-06-02T07:45:13Z
-- CI: Tests ✅ Linter ✅ Security ✅ Integration ✅
-- Review: afjcjsbx — 3 issues:
-  1. Logic misalignment in summarization threshold
-  2. Hardcoded i18n text in frontend
-  3. Missing test coverage
-- Next: fix all 3 → push → request re-review
+- Fix: ① Threshold alignment comment ② i18n (5 locales) ③ Test coverage for summarize_at_tokens
+- Pushed: 296a8ae2 | Comment: https://github.com/sipeed/picoclaw/pull/2985#issuecomment-4627346564
+- Next: wait for afjcjsbx re-review
diff --git a/.codebuddy/github-contribute/queue.md b/.codebuddy/github-contribute/queue.md
index a8564ca2f..a522d774c 100644
--- a/.codebuddy/github-contribute/queue.md
+++ b/.codebuddy/github-contribute/queue.md
@@ -1,11 +1,13 @@
 # Active Queue — sipeed/picoclaw
 
-## Active (2)
+## Active (0)
 
-| ID | PR | Title | Status | Action | Worker |
-|----|-----|-------|--------|--------|--------|
-| T1 | #3001 | fix(tools): allow scheme-less URLs in workspace guard | fix_in_place (add unit tests) | implement | pending |
-| T2 | #2985 | fix(context): show both summarize and compress thresholds | fix_in_place (3 review issues) | implement | pending |
+## Waiting for maintainer review (2)
+
+| ID | PR | Title | Status | Action |
+|----|-----|-------|--------|--------|
+| T1 | #3001 | fix(tools): allow scheme-less URLs in workspace guard | ✅ fix pushed (unit tests added) | wait |
+| T2 | #2985 | fix(context): show both summarize and compress thresholds | ✅ fix pushed (3 review issues) | wait |
 
 ## Merged (7)
 #3000, #2999, #2996, #2995, #2992, #2991, #2986