fix: wire searchWithFallback, eliminate ephemeral DB, and harden store#4
fix: wire searchWithFallback, eliminate ephemeral DB, and harden store#4rjkaes wants to merge 1 commit into
Conversation
Wire `searchWithFallback` into all server search paths:
`searchWithFallback` (porter → trigram → fuzzy cascade) was fully
implemented and tested but never called from server.ts. All three call
sites — `intentSearch`, the `search` tool handler, and `batch_execute`
— now use it instead of bare `store.search()`. This also replaces the
broken tier-2 "boosted with all section titles" hack in `batch_execute`,
which matched everything indiscriminately.
Eliminate ephemeral `ContentStore(":memory:")` in `intentSearch`:
Every `execute`/`execute_file` call with `intent` was creating an
in-memory SQLite database, initializing 4 tables (including 2 FTS5
virtual tables), indexing all content, searching, then tearing it down
— duplicating work already done by the persistent store two lines above.
Replaced with a single `persistent.searchWithFallback(intent, limit,
source)` call.
Transaction-wrap vocabulary insertion:
`#extractAndStoreVocabulary` was inserting words one at a time via
implicit autocommit — thousands of individual SQLite transactions for
large documents. Wrapped in `this.#db.transaction()`.
Stream `getDistinctiveTerms` chunk processing:
Changed from `.all()` (loads every chunk's full text into a JS array)
to `.iterate()` (streams one row at a time), reducing memory pressure
for large indexed sources.
Adds `tests/search-fallback-integration.test.ts` (7 tests) covering
the source-scoped `searchWithFallback` path used by `intentSearch` and
`batch_execute`, including fallback cascade verification and
multi-source isolation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Add 19 tests covering all 5 fixes in PR #4: - searchWithFallback cascade (porter/trigram/fuzzy layer verification) - persistent store source-scoped isolation (ephemeral DB replacement) - batch_execute search precision (no indiscriminate title boosting) - transaction-wrapped vocabulary insertion correctness - getDistinctiveTerms .iterate() streaming consistency - Edge cases: empty store, empty query, special characters, limit param Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
Thanks for the contribution, @rjkaes. This is thorough, well-documented work. I reviewed each fix individually and added 19 QA verification tests in Tests Added (19 total, all passing)Fix 1 — searchWithFallback wiring (5 tests):
Fix 2 — Ephemeral DB elimination (2 tests):
Fix 3 — batch_execute search precision (2 tests):
Fix 4 — Transaction-wrapped vocabulary insertion (2 tests):
Fix 5 — getDistinctiveTerms
Edge cases (5 tests):
Technical AssessmentAll five fixes are real and justified:
One note: The All 97 tests pass (53 store + 7 contributor + 18 fuzzy + 19 QA). TypeScript compiles clean. |
…n store Wires the 3-layer search cascade (porter, trigram, fuzzy) that was implemented but never called. Removes wasteful ephemeral in-memory DB creation on every execute call. Transaction-wraps vocabulary insertion. Contributor: rjkaes
|
Merged into
Added 19 QA tests covering all fixes. Thanks @rjkaes! This will be included in the next release. |
|
@rjkaes Sorry about closing this instead of merging — that was a mistake on my end. Your changes have been merged into the |
## What's Changed ### Bug Fixes - fix: stream-level byte cap to prevent OOM from runaway output (#5) — @rjkaes - fix: shell $-expansion vulnerability in executeFile paths (#7) — @rjkaes - fix: wire searchWithFallback, eliminate ephemeral DB, harden store (#4) — @rjkaes - fix: pass CLAUDE_PROJECT_DIR for relative path resolution (#12) — @dunika - fix: use npx tsx in skills instead of build/cli.js (#9) — @amoslives ### New Features - feat: add Elixir language support (#8) — @ekosz ### Chore - Dynamic contributor avatars via contrib.rocks - Simplified test:all with glob pattern - Version bump 0.7.3 → 0.8.0 ## New Contributors - @rjkaes - @ekosz - @dunika - @amoslives - @InTheCloudDan
…cement (#560 slice 5) Adds src/util/db-lock.ts exposing: - DatabaseLockedError: typed exception carrying the conflicting PID + dbPath. Message mirrors the reporter's verbatim ask: "Another context-mode server is already running (PID: ...). Stop it before starting a new instance." - acquireDbLock({ dbPath }): atomic O_EXCL claim via writeFileSync(..., { flag: 'wx' }). On EEXIST: reads existing PID, runs liveness probe, throws if alive or claims-with-re-read if stale. The re-read after stale claim resolves the same-instant race between two claimers seeing the same dead PID. - releaseDbLock({ dbPath }): unlinkSync wrapped in try/catch — matches the closeDB shape so callers can always invoke from a finally path. - isProcessAlive: 6-line copy of store.ts:187 — NOT imported. db-base.ts will import this module, and store.ts already imports from db-base.ts; importing back would create a circular dep that breaks under bun:sqlite's lazy load path. (See PR-559-560-FIX-DESIGN.md regression risks #4.) - tmpdir skip-gate: per-process DBs (defaultDBPath() output) embed process.pid by construction, so cross-instance contention is impossible. acquireDbLock returns { skipped: true } and releaseDbLock is a no-op for tmpdir-prefixed paths. Tests extend tests/util/db-base-platform-gate.test.ts (no new files) covering: O_EXCL atomicity, live-PID rejection, stale-claim, double- claim from same process, tmpdir skip-gate, and idempotent release. SQLiteBase wiring lands in the next slice.
…ract test
Comprehensive audit of all 11 ctx_* MCP tool descriptions (see
TOOL-DESCRIPTIONS-AUDIT.md). Six tools rewritten per ADR-0002 verbatim
templates; the remaining 5 are unchanged (3 minimal-description
exemptions, 1 MUST-allowed post-call obligation, 1 deferred to a
probe-gated follow-up PR).
HIGH severity (audit §3): voice consistency on the ctx_execute family.
- ctx_execute (src/server.ts:1419): drop "MANDATORY:" opener,
"PREFER THIS OVER BASH", "THINK IN CODE" voice-of-trainer paragraph,
"Do NOT read raw data". Replace with role definition + WHEN: /
WHEN NOT: / RETURNS: / EXAMPLE: sections. ~1200 -> ~700 chars.
- ctx_execute_file (src/server.ts:1755): same shape; drop "PREFER
THIS OVER Read/cat" and "Don't read files into context to analyze
mentally". Probe 2 evidence: disambiguation was already strong;
this is a voice-consistency pass.
- ctx_batch_execute (src/server.ts:3109): drop "THIS IS THE PRIMARY
TOOL", "THINK IN CODE — NON-NEGOTIABLE", and the emoji-bulleted
PARALLELIZE I/O block. Replace with WHEN: / CONCURRENCY: prose.
~1700 -> ~900 chars.
MEDIUM severity (audit §3):
- ctx_search (src/server.ts:2072): drop the SESSION STATE clause
(it is a routing-block.mjs concern; semantic-equivalence proof
in GRILL-Q1-VERDICT.md Round 5). Add explicit WHEN: structure
and a one-line EXAMPLE with batched queries.
- ctx_index (src/server.ts:1900): rewrite "Do NOT use for: log
files..." as a positive WHEN NOT: clause pointing at
ctx_execute_file. Keep the existing WHEN TO USE: header
(transitional alias permitted by ADR-0002).
- ctx_fetch_and_index (src/server.ts:2865): replace
"PARALLELIZE I/O" banner + ✅/❌ emoji bullets with a positive
CONCURRENCY: prose block. ✅/❌ tokenize inconsistently across
Llama/Gemini and act as negative-example leakage (rubric #4 +
Probe 3 evidence).
Regression guard (audit §10.1, folded into existing test file per
CONTRIBUTING.md L282 "Do NOT create new test files"):
- tests/core/server.test.ts: new describe block "tool description
style contract (#683 ADR-0002)" parses every
server.registerTool() block and asserts:
* MUST NOT contain forbidden tokens (MANDATORY:, BLOCKED,
PREFER X OVER Y, Do NOT read/use/pull, Never use,
SESSION STATE, ✅, ❌)
* MUST contain a WHEN: section (WHEN TO USE: accepted)
Exemptions: ctx_stats/ctx_doctor/ctx_insight (minimal by
design), ctx_upgrade (MUST is appropriate for post-call
obligation), ctx_purge (deferred entirely — see below).
- Updated two existing tests that asserted the old wording:
concurrency-field guidance now checks prose form;
PARALLELIZE I/O test now checks CONCURRENCY: section.
Explicitly deferred — ctx_purge:
Probe 4 (5 trials x 2 variants, Haiku) showed the proposed soft
rewrite REGRESSES parameter fidelity 5/5 -> 3/5. Counter-intuitive:
the heavy negative framing (DESTRUCTIVE, REFUSAL RULES, NEVER call
with bare {confirm:true}) actually anchors small models to the
required scope discipline. A follow-up PR must run a tri-LLM probe
(Haiku/Sonnet/Opus) and gate merge on that probe before changing
this tool. Documented inline in tests/core/server.test.ts via
EXEMPT_FROM_FORBIDDEN_TOKENS with rationale.
Verification:
- npx tsc --noEmit: clean
- tests/core/server.test.ts: 361/364 pass (3 pre-existing failures
unrelated to this PR — confirmed via git stash diff)
- tests/hooks/: 438/439 pass (1 skipped, unchanged)
- tests/adapters/: 787/787 pass
PR #683 (substitutes #654). See docs/adr/0002 and docs/adr/0003.
…fusal (substitutes #654) (#683) * fix(server): replace "blocked" wording in WebFetch refusal with imperative retry hint (substitutes #654) Three redirect messages in hooks/core/routing.mjs (curl/wget, Inline HTTP, WebFetch) reframed from the negation-heavy "blocked" voice to imperative- positive "redirected (NOT a network restriction)" — and crucially append "— retry if it fails with a transient DNS error" so the next action is explicit across all model tiers. PR #654 (contributor) correctly identified Opus 4.6's "blocked → capitulate to training" failure mode under the EAI_AGAIN cascade. Our internal A/B audit (Probe 3, 6 trials Haiku) confirmed the fix on Opus but uncovered a 2/6 Haiku regression — the parenthetical "(NOT a network restriction)" landed as information without a paired action, and 2 trials concluded "since the redirect isn't a restriction either, I can just use training data." Audit recommended appending the imperative retry clause — this substitute ships exactly that. Sibling-tool consistency on ctx_fetch_and_index: - ssrfGuard pre-flight DNS path: classify EAI_AGAIN / ETIMEDOUT / ETIMEOUT / ENETUNREACH / EPERM as transient and append the same retry hint. Non-transient codes (ENOTFOUND) stay silent — retry won't help on a genuinely bad domain. - Subprocess fetch stderr path: closes the contributor's flagged "Known follow-up" (batch wrapper bypassed the single-URL hint). Same code regex on result.stderr — same retry hint surfaces in the common multi-URL batch case the original PR couldn't reach. Tests updated, no new test files (CONTRIBUTING L275): - tests/hooks/core-routing.test.ts: assert "redirected" + retry hint, explicit negative-assert .not.toContain("blocked") regression guard. - tests/hooks/cursor-hooks.test.ts, tool-naming.test.ts: wording sync. - tests/hooks/integration.test.ts: curl-warning regex relaxed to survive both old "Do NOT use curl" and new "Do NOT retry with curl". Bundles untouched — CI rebuilds on main push (project_ci_bundles). Targeted: npx vitest run tests/hooks/ → 438/438 pass. TypeScript: npx tsc --noEmit clean. Closes work on #654 (PR closed in favor of this direct-to-next commit). Audit doc: .cw/ctx-analytics/TOOL-DESCRIPTIONS-AUDIT.md §6.1 Substitute log: .cw/ctx-analytics/PR-654-SUBSTITUTE-LOG.md * docs(adr): tool description style (ADR-0002) + routing deny reasons (ADR-0003) ADR-0002 formalizes the structure every ctx_* tool description must follow (1-line role / WHEN: / WHEN NOT: / RETURNS: / EXAMPLE:), the forbidden-token list (MANDATORY:, BLOCKED, PREFER X OVER Y, Do NOT, Never use, SESSION STATE, emoji bullets), and the MUST/SHOULD/MAY hierarchy reserved for post-call obligations only. Grounded in 38 trials x 6 probes A/B evidence: heavy framing helps ctx_purge on Haiku (5/5 vs 3/5 parameter fidelity) but hurts ctx_execute selection — one size does not fit all, so rewrites are probe-gated. ADR-0003 splits routing deny reasons into CASE A (redirect — supported via alternative tool) and CASE B (true policy restriction). PR #654's finding: the bare word "blocked" in WebFetch's CASE A denial was misread by Opus 4.6 as a network restriction, triggering training-data capitulation. CASE A MUST use "redirected", state "this is NOT a network/security restriction", and end with a transient-error retry hint. CASE B keeps "denied"/"blocked by security policy". PR #683 (substitutes #654). * fix(server): apply ADR-0002 voice to 6 ctx_* tool descriptions + contract test Comprehensive audit of all 11 ctx_* MCP tool descriptions (see TOOL-DESCRIPTIONS-AUDIT.md). Six tools rewritten per ADR-0002 verbatim templates; the remaining 5 are unchanged (3 minimal-description exemptions, 1 MUST-allowed post-call obligation, 1 deferred to a probe-gated follow-up PR). HIGH severity (audit §3): voice consistency on the ctx_execute family. - ctx_execute (src/server.ts:1419): drop "MANDATORY:" opener, "PREFER THIS OVER BASH", "THINK IN CODE" voice-of-trainer paragraph, "Do NOT read raw data". Replace with role definition + WHEN: / WHEN NOT: / RETURNS: / EXAMPLE: sections. ~1200 -> ~700 chars. - ctx_execute_file (src/server.ts:1755): same shape; drop "PREFER THIS OVER Read/cat" and "Don't read files into context to analyze mentally". Probe 2 evidence: disambiguation was already strong; this is a voice-consistency pass. - ctx_batch_execute (src/server.ts:3109): drop "THIS IS THE PRIMARY TOOL", "THINK IN CODE — NON-NEGOTIABLE", and the emoji-bulleted PARALLELIZE I/O block. Replace with WHEN: / CONCURRENCY: prose. ~1700 -> ~900 chars. MEDIUM severity (audit §3): - ctx_search (src/server.ts:2072): drop the SESSION STATE clause (it is a routing-block.mjs concern; semantic-equivalence proof in GRILL-Q1-VERDICT.md Round 5). Add explicit WHEN: structure and a one-line EXAMPLE with batched queries. - ctx_index (src/server.ts:1900): rewrite "Do NOT use for: log files..." as a positive WHEN NOT: clause pointing at ctx_execute_file. Keep the existing WHEN TO USE: header (transitional alias permitted by ADR-0002). - ctx_fetch_and_index (src/server.ts:2865): replace "PARALLELIZE I/O" banner + ✅/❌ emoji bullets with a positive CONCURRENCY: prose block. ✅/❌ tokenize inconsistently across Llama/Gemini and act as negative-example leakage (rubric #4 + Probe 3 evidence). Regression guard (audit §10.1, folded into existing test file per CONTRIBUTING.md L282 "Do NOT create new test files"): - tests/core/server.test.ts: new describe block "tool description style contract (#683 ADR-0002)" parses every server.registerTool() block and asserts: * MUST NOT contain forbidden tokens (MANDATORY:, BLOCKED, PREFER X OVER Y, Do NOT read/use/pull, Never use, SESSION STATE, ✅, ❌) * MUST contain a WHEN: section (WHEN TO USE: accepted) Exemptions: ctx_stats/ctx_doctor/ctx_insight (minimal by design), ctx_upgrade (MUST is appropriate for post-call obligation), ctx_purge (deferred entirely — see below). - Updated two existing tests that asserted the old wording: concurrency-field guidance now checks prose form; PARALLELIZE I/O test now checks CONCURRENCY: section. Explicitly deferred — ctx_purge: Probe 4 (5 trials x 2 variants, Haiku) showed the proposed soft rewrite REGRESSES parameter fidelity 5/5 -> 3/5. Counter-intuitive: the heavy negative framing (DESTRUCTIVE, REFUSAL RULES, NEVER call with bare {confirm:true}) actually anchors small models to the required scope discipline. A follow-up PR must run a tri-LLM probe (Haiku/Sonnet/Opus) and gate merge on that probe before changing this tool. Documented inline in tests/core/server.test.ts via EXEMPT_FROM_FORBIDDEN_TOKENS with rationale. Verification: - npx tsc --noEmit: clean - tests/core/server.test.ts: 361/364 pass (3 pre-existing failures unrelated to this PR — confirmed via git stash diff) - tests/hooks/: 438/439 pass (1 skipped, unchanged) - tests/adapters/: 787/787 pass PR #683 (substitutes #654). See docs/adr/0002 and docs/adr/0003. * fix(hooks): apply ADR-0002 + ADR-0003 contract to routing-block.mjs + lock with regression test Extends PR #683 to the highest-blast-radius prompt surface in the project: hooks/routing-block.mjs ships into the system prompt of every session, while src/server.ts tool descriptions only fire at tool-selection time. The original PR #683 scope cleaned up the per-tool surface and the routing.mjs deny reasons but missed the system-prompt surface itself. Three forbidden-token violations rewritten per ADR-0002 rubric #2 (affirmative > negative) + #9 (cross-LLM Constitutional AI safety bias): - <forbidden_actions> XML container -> <when_not_to_use>; the container name itself is a Constitutional AI trigger on Anthropic-tier models. - "NEVER use ctx_execute ... for file writes" -> descriptive form "File writes use the native Write or Edit tool -- ctx_execute, ctx_execute_file, and Bash subprocesses do not persist edits to the host filesystem." Same operational intent, no forbidding voice. - "Write artifacts ... NEVER inline" -> "Write artifacts ... to files. Return only: file path + 1-line description." Semantic-equivalence verified by enumerating all 16 directives in the current block and mapping each to its rewrite (0 orphans, 0 additions). Net character delta: -76 chars. RFC 2119 MUST kept in <priority_instructions> per the ADR-0002 post-call-obligation carve-out. Adds a sibling contract describe block to tests/core/server.test.ts: "hook routing prompt-surface contract (#683 ADR-0002 + ADR-0003)". Folded into the same file per CONTRIBUTING.md L282 (no new test files). Scans: - hooks/routing-block.mjs and hooks/core/routing.mjs for forbidden tokens (<forbidden_actions>, NEVER, FORBIDDEN, "NO X for Y" bullets). - Every "redirected"-bearing template literal in routing.mjs for ADR-0003 CASE A compliance: MUST open with "redirected", MUST NOT contain bare uppercase BLOCKED, MUST name at least one ctx_* alternative tool. 15 assertions total. CASE B strings (Blocked by security policy: ...) correctly excluded by the extractor. This is the contract test ADR-0003 Consequences L79-82 invited as follow-up. Three tests/hooks/core-routing.test.ts assertions and one tests/core/ server.test.ts hook-injection assertion updated to match the new positive wording (same semantic coverage, new container name). Full regression sweep: 841 passing / 1 skipped / 3 pre-existing storage- roots failures (verified by git stash on the branch HEAD; out of scope per PR #683 body). * fix(server): apply ADR-0002 canonical structure to ctx_purge + 4 ctx_* tools (PR #683 WS2/WS3) WS2 — ctx_purge rewrite (audit §6.5, Probe 4 evidence preserved): - Replace negative flat framing (DESTRUCTIVE/REFUSAL RULES/NEVER) with the canonical WHEN/WHEN NOT/SCOPES/CONTRACT/RETURNS/EXAMPLE structure. - Preserve all four refusal rules verbatim under CONTRACT (confirm:false, sessionId+scope ambiguity, scope:'session' without sessionId, deprecated bare {confirm:true}) so Probe 4 parameter-fidelity discipline holds on Haiku (5/5 baseline must not regress). - Keep DESTRUCTIVE headline as accurate user-facing signaling (distinct from the cross-LLM-bias negative framing the ADR-0002 rubric forbids). - Add two EXAMPLE lines for the two valid input shapes (per-session + per-project) so the LLM has explicit parameter templates. - Add WHEN NOT clause covering the ambiguous-scope handler ("User says 'reset'/'clear'/'wipe' without naming a scope -> ask first"). WS3 — corpus-wide canonical structure pass: - ctx_index: add EXAMPLE: line (was missing); fold the path-hash sentence into the RETURNS block so the canonical four-section shape holds. - ctx_search: drop the non-canonical TIPS: header (fold into RETURNS prose); add explicit WHEN NOT clauses (empty-index redirect, single one-off question -> ctx_execute). - ctx_fetch_and_index: drop the non-canonical CONCURRENCY: header (fold the I/O-bound split into the WHEN clause; fold the SQLite single-writer note into RETURNS); add WHEN NOT clauses (local content -> ctx_index, SPA-rendered content -> headless browser). - ctx_batch_execute: drop the non-canonical CONCURRENCY: header (fold the I/O-bound guidance into WHEN; fold the CPU-bound + stateful guidance into WHEN NOT). Section order on all six routing-target tools is now strictly WHEN -> WHEN NOT -> RETURNS -> EXAMPLE per ADR-0002 §Canonical structure. Bullets are markdown '- ' only. ctx_stats/ctx_doctor/ctx_upgrade/ctx_insight remain minimal one-line diagnostic descriptions (exempt). Empirical reference: TOOL-DESCRIPTIONS-AUDIT.md §6.1 (ctx_purge Probe 4), audit §3 row-by-row standardization verdicts. * test(server): lock canonical-structure contract + amend ADR-0002 (PR #683 WS3) ADR-0002 amendment (docs/adr/0002-tool-description-style.md): - Add ### Canonical structure (locked rubric — PR #683 WS3) subsection with seven numbered rules (section order, bullet uniformity, header casing, indent, blank-line spacing, single canonical EXAMPLE per tool, per-tool carve-out allow-list). - Add ### Cross-LLM rationale subsection citing the tokenizer-uniformity argument across Claude / GPT / Gemini / Llama as the empirical basis for the UPPERCASE+colon header shape. - Update ### Exemptions and ## Consequences to reflect that ctx_purge is no longer deferred — the WS2 rewrite ships with audit-approved DESTRUCTIVE/SCOPES/CONTRACT carve-outs allow-listed in the contract test, while still meeting the canonical four-section shape. Contract test extensions (tests/core/server.test.ts): - Remove ctx_purge from EXEMPT_FROM_FORBIDDEN_TOKENS and EXEMPT_FROM_WHEN (the WS2 rewrite passes the canonical structure with the carve-outs). - Add ALLOWED_EXTRA_SECTIONS map carving out DESTRUCTIVE/SCOPES/CONTRACT on ctx_purge only, with inline rationale citing Probe 4. - Add four new per-tool assertions (run on every non-exempt ctx_* tool): 1. MUST contain RETURNS: and EXAMPLE: (mandatory presence). 2. Section order WHEN -> WHEN NOT -> RETURNS -> EXAMPLE (strictly increasing flat.indexOf() positions for canonical sections). 3. UPPERCASE+colon headers must be in the canonical set OR the per-tool carve-out list (rejects off-spec sections like CONCURRENCY: and TIPS:). 4. Bullets must be markdown '- ' only (rejects 1./1-/* /•). - Add flattenDescription() helper that collapses the literal '\n' escapes and joins the "+ \n " concat continuation so the assertions run against the shape the host LLM actually sees at tool-selection time. Two stale-test updates (folded CONCURRENCY: into WHEN: prose): - "tool description documents the concurrency field with positive guidance" — expect 'parallelize I/O-bound calls' + 'concurrency 4-8' + 'CPU-bound or stateful' + 'keep concurrency at 1' (inline now). - "PARALLELIZE I/O guidance + locked requests:[] schema in description" — expect 'requests: [{url' + 'concurrency 4-8' + 'FTS5 indexing then serializes writes' (inline now). CONTRIBUTING.md L282 compliance: all assertions folded into the existing tests/core/server.test.ts file; no new test files. Result: tests/core/server.test.ts goes from 88 to 124 contract assertions across 7 non-exempt ctx_* tools; all 124 pass. Three pre-existing baseline failures (ctx_index storage-error + 2 ctx_doctor settings.json) are environment-specific and not introduced by this PR. Empirical reference: PR-683-FINALIZE-LOG.md (WS1 verdict table, WS2 probe design, WS3 before/after section structure). * fix: skip context-mode redirect echoes in isToolError + rename forbidden_actions test anchor PR #683 CI failed across all 3 OS on two tests, both downstream of this PR's own intentional changes: 1. tests/session/continuity.test.ts:79 'outputs additionalContext with XML routing block' — Expected <forbidden_actions> tag. The PR renamed <forbidden_actions> → <when_not_to_use> in hooks/ routing-block.mjs (ADR-0002, affirmative framing — describe when NOT to reach for a tool instead of declaring it forbidden). The continuity test still asserted on the old name. Update the assertion to match the new tag + cross-reference ADR-0002 in the failure message so a future maintainer who runs `npm test` sees the rename instead of a bare diff. 2. tests/opencode-plugin.test.ts:1241 'blocked tool command is replaced before execution' — expected snapshot=="", got <session_resume events="1"> containing a fake <errors count="1"> with our own echo text. The PR rewrote the curl/wget/inline-HTTP/WebFetch redirect echo from "context-mode: curl/wget blocked. …" to user-friendlier "context-mode: curl/wget redirected … retry if it fails with a transient DNS error. …". The new copy legitimately mentions failure modes ("fails", "transient DNS error"), but `isToolError` at src/session/extract.ts:63 keyword-matches /FAIL/i and `failed/i` (case-insensitive, no word boundary), so "fails" inside "if it fails" triggered a substring match → our OWN guidance echo was captured as a session error → next chat would show a fake error in <session_resume>. Fix: gate isToolError on the unique `context-mode:` prefix. The check is defensive at the source — any future copy change to the guidance text cannot reintroduce the bug. Match BOTH sides because real shell runs report `response = "context-mode: …"` (the echo stdout), while the OpenCode plugin test path captures `response = 'echo "context-mode: …"'` (the raw command itself, never executed). Verified locally on Node 20: npx vitest run tests/session/continuity.test.ts -t "outputs additionalContext" → 1 passed npx vitest run tests/opencode-plugin.test.ts -t "blocked tool command" → 1 passed npx vitest run tests/session/ (all 28 files) → 594 passed | 4 skipped, no regressions * fix(routing): drop negation framing from CASE A deny reasons (#683) All four redirect-style deny reasons in hooks/core/routing.mjs (curl/wget, inline HTTP, build tools, WebFetch) rewritten to fully positive imperative voice per ADR-0002 + ADR-0003. - Removed "(context-window optimization, NOT a network restriction)" - Removed "Do NOT retry with curl/wget|Bash|WebFetch" - Replaced "retry if it fails" hedge with imperative "Retry the same call on a transient DNS error (EAI_AGAIN, ETIMEDOUT, ENETUNREACH)" Cross-LLM rationale: negation framing primes LLM attention on the forbidden item (ironic process theory). Positive routing intent + explicit capability affirmation + imperative next-action work uniformly across Claude/GPT/Gemini/Llama. ADR-0003 amended with §Amendment noting the empirical rationale. Contract tests in tests/core/server.test.ts gain two guards (PR #683 follow-up) that fail loud if "NOT a network" or "Do NOT retry" reappear. * test(hooks): update WebFetch + curl deny assertions for affirmative voice (#683) 77f4ec6 rewrote the CASE A deny reasons in hooks/core/routing.mjs to positive imperative voice. The two existing assertions that pinned the old "Do NOT retry" / "Think in Code" wording now need to pin the surviving affirmative anchors instead. - tests/hooks/integration.test.ts: WebFetch path asserts on the "Retry the same call on a transient DNS error" hint and the explicit "Call ctx_fetch_and_index" instruction. - tests/hooks/tool-naming.test.ts: curl redirect path asserts on "Call ctx_execute" — the imperative call instruction that absorbed the "Think in Code" trainer voice. Both keep the integration coverage of the redirect path intact while matching the new wording. * refactor(server): standardize MCP tool description source format (#683) Tool descriptions in src/server.ts used two competing source styles — template literals with embedded "\n\n" escape sequences, and multi-line string concatenation with "+". Both render identically at runtime but the inconsistency made the source hard to scan and made the canonical WHEN/WHEN NOT/RETURNS/EXAMPLE rubric (ADR-0002) harder to enforce by sight during review. All multi-section tool descriptions now use a single style: template literals with real newlines inside the literal. The runtime payload is unchanged. The forbidden-word + canonical-structure contract tests in tests/core/server.test.ts (PR #683 WS3) continue to pass against the normalized source. * fix(routing+desc): drop org-rationale + normalize RETURNS form (#683) Second-pass review of PR #683. Two visual / prompt-economy regressions the first pass missed. (1) "for context-window efficiency" — org-rationale, not action input. The first amendment replaced the bare-NOT parenthetical with the affirmative opener "redirected to <ctx_tool> for context-window efficiency". The "for X reason" preface is still post-hoc justification the agent does not need to act on. Compare HTTP 301: the response carries Location: <new-url> and the client uses it — the server never appends "for SEO efficiency". The capability affirmation "<ctx_tool> has full network access" already carries the substantive signal the rationale was double-encoding. All four CASE A sites in hooks/core/routing.mjs (curl/wget, inline HTTP, build tools, WebFetch) now open with "redirected to <ctx_tool>." flat — affirmative routing intent, no rationale preface. ADR-0003 gains §Second amendment documenting the rule and rationale. A new contract test in tests/core/server.test.ts asserts the phrase "for context-window efficiency" never reappears in any CASE A site. (2) RETURNS form inconsistency — three tools used inline form. ADR-0002 L56-57 specifies RETURNS as a header on its own line with the body indented below (matching WHEN: / WHEN NOT: shape). Three tools (ctx_execute, ctx_execute_file, ctx_purge) used inline form ("RETURNS: only your printed output.") while four tools used canonical header+body form. Mert flagged the visual inconsistency on review. All three inline tools rewritten to header+body form. EXAMPLE: stays inline per ADR-0002 L59 — the asymmetry is intentional (RETURNS prose is multi-line capable; EXAMPLE values are one-call-per-line). A new contract test asserts RETURNS: never appears in inline form on any multi-section ctx_* tool. Both new guards run alongside the existing ADR-0002 forbidden-token + canonical-structure suites. * feat(desc): surface auto-captured session memory in ctx_search + ctx_purge (#683) context-mode captures 23 categories of structured events at hook time (decisions, errors, blockers, plans, user prompts, rejected approaches, file ops, git ops, tasks, latency, MCP tool counts, etc.) and persists them across compaction. The mechanism is documented in README and the project CLAUDE.md routing block. The MCP tool descriptions themselves do not surface this — so at tool-selection time the LLM only sees "search indexed content" and misses the much larger search-session-memory capability. ctx_search description gains: - A 4th WHEN: bullet calling out session-memory queries as a valid use case alongside indexed content. - A RETURNS: note listing the common session-memory source labels (decision, error, error-resolution, blocker, plan, user-prompt, rejected-approach, compaction) and a pointer to ctx_stats for live category counts. - A second EXAMPLE: showing a timeline-sorted decision lookup — permitted under ADR-0002 L103-106 (tools with two valid input shapes MAY include two EXAMPLE lines). ctx_purge SCOPES block gains: - Per-session: clarifies "events" means auto-captured session memory so the agent knows what is being deleted. - Per-project: adds a "use ctx_stats first to preview category counts" hint to prevent destructive surprises. No structural changes: WHEN/WHEN NOT/RETURNS/EXAMPLE canonical order preserved, header-on-own-line RETURNS form preserved, no forbidden tokens introduced, no org-rationale prefaces. 131 ADR-0002 forbidden- token tests + 7 canonical-structure tests + 12 PR #683 contract tests all pass. * feat(desc): principle-first rewrite of ctx_execute/_file + truth-fix ctx_index/fetch (#683) Five maintainer critiques on tool descriptions, addressed together. Two overarching principles emerged from the review: 1. PRINCIPLE OVER HEURISTIC. The LLM picks a tool BEFORE seeing the output. "Use when output >= 20 lines" is unactionable — the LLM can't predict that. Replace with the INTENT principle: "use when you intend to derive an answer FROM the data". The LLM knows its own intent at tool-selection time. 2. TRUTHFUL RETURN DESCRIPTIONS. ctx_index handler at L2022 returns chunk count + source label + ctx_search call hint — NOT a summary. The headline "Only a brief summary is returned" was false. Same false-claim pattern existed in ctx_fetch_and_index RETURNS ("plus an indexing summary"). Reframe as "indexing metadata" and make explicit that raw content is NOT echoed back. ctx_execute (largest rewrite): - Headline + philosophy paragraph: Think-in-Code is now taught explicitly with the concrete 47-files / 700 KB → 3.6 KB example (700 KB into conversation vs 3.6 KB summary printed). The principle is the load-bearing concept, not the implementation detail. - WHEN bullets reframed around INTENT (derive / parse / aggregate) rather than predicted output size. - WHEN NOT bullets reframed around INTENT (observe vs process) rather than enumerated command shapes. - Examples replaced: 'npm test | tail -40' (naive truncate) → smart grep for failure-relevant lines; awkward 'aws' example → gh JSON query with filter+count in code. ctx_execute_file: - Same Think-in-Code framing scoped to single-file analysis. - "raw contents would flood context" reframed in LLM-native terms ("every byte you Read enters your conversation memory and costs reasoning capacity for the rest of the session"). The LLM does not necessarily know which host it is running in or what "context" means in technical terms — describe the actual cost in cognitive terms it reasons about. - Better examples: error filtering with count + tail; CSV row count with header read. ctx_index: - Headline corrected: stores raw content, returns indexing metadata + retrieval hint. Nothing is summarized. - RETURNS body lists what is actually returned: chunk counts (total, code-bearing), source label, ctx_search call shape. Makes explicit that the raw content is NOT echoed back — it lives in storage and is retrievable via ctx_search. - Added second EXAMPLE showing file-backed path (auto-refresh hash). ctx_fetch_and_index: - "raw HTML entering context" → "raw page bytes should NOT enter your conversation memory" (same LLM-native phrasing principle). - RETURNS "plus an indexing summary" → "plus indexing metadata" + explicit "Raw content is NOT echoed back" — eradicates the same false-claim pattern. 131 ADR-0002 forbidden-token tests + 7 canonical-structure tests + 12 PR #683 contract tests all pass. No structural changes — WHEN / WHEN NOT / RETURNS / EXAMPLE canonical order preserved, header-on-own-line RETURNS preserved, no forbidden tokens introduced. * feat(desc): comprehensive description batch — ranking, TTL custom, capabilities, technical depth (#683) Maintainer's third-pass review covered ten distinct critiques. Addressed together because they all stem from the same direction: surface the load-bearing mechanism the LLM needs to act correctly, in terms the LLM understands at tool-selection time. ctx_search — full rewrite. The previous headline ("BM25 over FTS5") sold the tool short. The actual ranking pipeline is BM25 + Reciprocal Rank Fusion over two parallel tokenizers (Porter stemming + trigram substring), plus a proximity rerank pass for multi-term queries, plus Levenshtein typo correction, plus window-extracted smart snippets. The knowledge base is unified: ctx_search reaches both content the user indexed AND auto-captured session memory (26 event categories). WHEN NOT bullets reframed to intent ("you have an ad-hoc question") so the tool-name references don't get lost across long conversations. contentType code|prose filter surfaced. Four EXAMPLE lines cover the four most common shapes (source-scoped batch, timeline-sorted memory, contentType-filtered, multi-source recall). ctx_fetch_and_index — custom TTL (PR #666) now first-class. Default 24h, override per-call with ttl: <ms>, ttl: 0 bypasses like force:true. Removed the "~3KB" hard preview claim — replaced with mechanism prose. RETURNS explains the FTS5 single-writer reality and net-latency math (parallel-fetch + serial-index). Concurrency guardrails kept generic (I/O-bound 4-8, lower for rate-limited hosts) — no third-party API specifics (Mert flag: not our policy to editorialize on someone else's API contract). ctx_batch_execute — Think-in-Code restored as the load-bearing concept ("concurrency parallelizes FETCH; derivation belongs in code"). Same generic concurrency guardrails as ctx_fetch_and_index. EXAMPLE shows the pattern with a summarize-step command at the end. ctx_execute — background and intent capabilities now surfaced in description (previously only in the schema field describe). background covers server/daemon detach. intent triggers auto-index of large output into the knowledge base, with title+preview return instead of raw stdout. ctx_execute_file — same intent surfacing for file-derivation output. ctx_insight — port (default 4747) and sessionDir/contentDir overrides surfaced. Useful for diagnosing multi-install setups or pointing at a sibling project's data. README.md — TTL Cache section rewritten for custom TTL. The "Fresh (<24h)" hard claim is now "Cache hit (within TTL)" with the default-and-override mechanism explained. Tools table row for ctx_fetch_and_index updated to match. Two contract tests (tests/core/server.test.ts) that pinned the old exact phrasing for batch_execute / fetch_and_index concurrency guidance now pin the LOAD-BEARING CONCEPTS via regex (4-8 window, CPU/stateful keep at 1, FTS5 serial-write) — same coverage, immune to future copy-edits. Three pre-existing PR #617 failures (ctx_doctor + ctx_index storage path e2e under CONTEXT_MODE_DIR) remain — out of scope, separate work. * feat(hooks): apply principle-first pattern to routing-block + 4 CASE A deny reasons (#683) The MCP tool descriptions in src/server.ts were rewritten over the previous PR #683 commits to follow a consistent pattern: principle over heuristic, intent over threshold, LLM-native phrasing over jargon, Think-in-Code as the load-bearing concept. The hook layer (routing-block.mjs system-prompt injection + routing.mjs CASE A deny reasons) had not yet been brought to the same standard. Two maintainer flags drove the work: - "bash with output >20 lines → use ..." — the LLM cannot predict output size BEFORE running. Threshold-based heuristic, same anti- pattern as the original ctx_execute description. - The curl/wget deny reason doesn't follow the same pattern as the description rewrites — overloaded with implementation prescription ("Write pure JS with try/catch, no npm deps"), missing principle. routing-block.mjs (system-prompt injection on every session): - <priority_instructions> reframed in cognitive-cost terms: "every byte enters your conversation memory and costs reasoning capacity for the rest of the session". Think-in-Code surfaced explicitly ("program the analysis, do not compute it by reading raw data"). - <tool_selection_hierarchy> entries enriched: ctx_search now describes the auto-captured session memory it reaches; ctx_batch_- execute explains why batching matters (round-trip cost paid once); PROCESSING entry frames around derivation intent rather than the old "API calls, log analysis, data processing" enumeration. - <when_not_to_use> intent-based, no thresholds: "intend to PROCESS the output" vs "intend to OBSERVE a short fixed output". Same shape for Read (analyze vs Edit), WebFetch, ctx_execute/_file file writes. createReadGuidance / createGrepGuidance / createBashGuidance / createExternalMcpGuidance: - All four rewritten with the same intent-based / principle-first framing. "May flood context" / "May produce large output" / "with output >20 lines" all replaced with intent triggers ("when you intend to PROCESS / count / filter / aggregate"). - LLM-native phrasing throughout: "your conversation" not "context", "your derived answer" not "your printed summary" (the latter implies a pre-shaped narrative; the former matches what code actually produces). - Bash carve-out preserved (mutating state / observational commands) but expressed as intent shapes, not enumerated commands. hooks/core/routing.mjs CASE A deny reasons (curl/wget, inline HTTP, build tool, WebFetch): - All four open with the bare "redirected" verb (no preamble), then go straight into the imperative call with the principle embedded ("derive your answer in code, and print only the result — the raw HTTP body stays in the sandbox instead of entering your conversation"). - Selection criteria added where multiple paths exist (curl: inline derivation via ctx_execute vs persist-for-later-query via ctx_fetch_and_index; WebFetch: same). - "Write pure JS with try/catch, no npm deps" preachiness removed — the LLM gets that info from the ctx_execute schema when it actually calls the tool. The deny reason stays focused on routing. - Build tool deny reason now also nudges toward smarter filtering (grep over ERROR|warning|FAIL patterns) instead of leaving the agent with naive `tail -30` as the only suggested shape. All four CASE A sites still satisfy the ADR-0003 contract: open with "redirected", name at least one ctx_* alternative, contain no bare "BLOCKED" / "NOT a network" / "Do NOT retry" / "for context-window efficiency". 635 tests pass (was 579 before this batch), zero new failures. The 3 remaining failures are pre-existing PR #617 ctx_doctor / ctx_index storage-path e2e tests — out of scope.
Closes Issues #5, #6, #7, #8 in v1.0.162 PRD. Each adds a pure-additive extractor reading the structured tool_response from one SDK tool, emitting one event with metadata-only data (privacy: no content / no full URL / no stderr text). #5 extractBashOutcome (BashOutput @ sdk-tools.d.ts:2160-2200) Captures interrupted / returnCodeInterpretation / stderr LENGTH. No exit_code field exists — anti-hallucination warning #1 in PRD. src/session/extract.ts:1109-1146 #6 extractFileReadMetadata (FileReadOutput @ sdk-tools.d.ts:107-160) Branches text vs image variant; numLines/totalLines/startLine or originalSize/dimensions(WxH). src/session/extract.ts:1148-1185 #7 extractWebFetchMetadata (WebFetchOutput @ sdk-tools.d.ts:2456-2481) Captures code / bytes / durMs / host. No redirect_url field exists — redirect-loop detection must come from temporal correlation across events (anti-hallucination warning #4 in PRD). Algorithmic URL host extraction (no regex) at extractHostFromUrl. src/session/extract.ts:1070-1107 #8 extractWorktree extended for ExitWorktree (sdk-tools.d.ts:2150/2710) Tracks discard_changes flag on programmatic worktree exit. src/session/extract.ts:1096-1107 Tests: - tests/session/extract-bash-outcome.test.ts — 8 tracers - tests/session/extract-file-read-metadata.test.ts — 9 tracers - tests/session/extract-webfetch-metadata.test.ts — 8 tracers - tests/session/extract-exit-worktree.test.ts — 7 tracers Platform-coordination: new event types (bash_outcome, file_read_metadata, webfetch_metadata, worktree_exit) must round-trip the EventEnvelopeSchema Zod gate on the platform side. Flag to EM if strict mode rejects. Test plan: - npx vitest run tests/session/extract-bash-outcome.test.ts -> 8/8 GREEN - npx vitest run tests/session/extract-file-read-metadata.test.ts -> 9/9 GREEN - npx vitest run tests/session/extract-webfetch-metadata.test.ts -> 8/8 GREEN - npx vitest run tests/session/extract-exit-worktree.test.ts -> 7/7 GREEN
Closes Issue #4 in v1.0.162 PRD — captures the 7 cost/perf fields from AgentOutput at sdk-tools.d.ts:64-75. Fires on the Task sub-agent dispatcher (tool_name === "Task"). When the tool_response carries a JSON-stringified AgentOutput with a `usage` block, emits one `agent_usage` event with `category: "cost"` and structured key:value tokens in event.data: totalTokens:NN totalDurMs:NN tokens_in:NN tokens_out:NN cache_create:NN cache_read:NN tier:standard|priority|... Architectural choice — bridge emits as event.data rather than as 4 separate DB columns. Rationale: platform Zod envelope is forward- compatible per master PRD §2 "Layer 2 — Store" — new fields ingest without a wire-side schema migration. Local SessionDB stays slim; top-level typed columns for fast platform filtering can come later. src/session/extract.ts:1192-1238 — extractAgentUsage + helpers src/session/extract.ts:1734 — wired into extractEvents router tests/session/extract-agent-usage.test.ts — 10 tracers (RED->GREEN) Privacy: no tool_input args / tool_response prose stored — counts and the standard service_tier string only. service_tier truncated at 32. Platform-coordination: new event type `agent_usage` (category=cost) must round-trip the EventEnvelopeSchema Zod gate. Flag EM if strict mode rejects. Test plan: - npx vitest run tests/session/extract-agent-usage.test.ts -> 10/10 GREEN
Closes Issues #4 (SessionStart settings + MCP servers snapshot) and Issue #6 (extractExitPlanMode metadata) per v1.0.162 PRD v3. ISSUE #4 — session_settings_snapshot Emits ONE session_settings_snapshot event from SessionStart when the envelope carries any of mcp_servers / model / permission_mode. The data field encodes key:value tokens for fast platform parsing: mcp_count:N mcp_servers:a,b,c (first 8 names only) model:NAME (capped 64 chars) permission_mode:NAME (capped 32 chars) When no setting is present, no event fires (defensive — avoids noisy empty snapshots). src/session/extract.ts:1610-1655 — extractSessionSettings extractor hooks/sessionstart.mjs:53 — loadExtract added to loader factory hooks/sessionstart.mjs:74-87 — wired into emitSessionStartLifecycle (opportunistic; never blocks lifecycle) tests/session/extract-session-settings.test.ts — 11 tracers ISSUE #6 — ExitPlanMode plan_bytes + plan_hash Extends the existing plan_exit event with two metadata tokens so the platform can dedupe identical plans across sessions and JOIN plan_mode_authorized_writes against a stable plan id: plan_bytes:NN (plan.length) plan_hash:XXXXXXXX (8-char FNV-1a hex) Plan source: tool_input.plan first (per PRD), fall back to tool_response.plan (SDK actually carries it there per ExitPlanModeOutput @ sdk-tools.d.ts:2222). FNV-1a is stable across runs and platforms; not crypto-secure but sufficient for dedup. src/session/extract.ts:580-624 — fnv1a32Hex + extractExitPlanText src/session/extract.ts:650-664 — appended to existing plan_exit data tests/session/extract-exit-plan-mode.test.ts — 10 tracers Privacy: settings snapshot truncates server names; plan_hash is one-way FNV-1a so the plan text cannot be reconstructed from the event. Platform-coordination: new event type session_settings_snapshot must round-trip the EventEnvelopeSchema. The plan_exit event itself is existing; the new tokens (plan_bytes/plan_hash) ride event.data, so no schema migration required for #6. Test plan: - npx vitest run tests/session/extract-session-settings.test.ts -> 11/11 GREEN - npx vitest run tests/session/extract-exit-plan-mode.test.ts -> 10/10 GREEN
Summary
searchWithFallbackinto all server search paths: The three-layer fallback cascade (porter → trigram → fuzzy) was fully implemented and tested but never called fromserver.ts. All three call sites —intentSearch, thesearchtool handler, andbatch_execute— now use it instead of barestore.search(). This also removes the broken tier-2 "boosted with all section titles" hack inbatch_execute, which matched everything indiscriminately.ContentStore(":memory:")inintentSearch: Everyexecute/execute_filecall withintentwas creating a throwaway in-memory SQLite database (4 tables including 2 FTS5 virtual tables), indexing all content, searching, then tearing it down — duplicating work already done by the persistent store. Replaced with a singlepersistent.searchWithFallback(intent, limit, source)call.#extractAndStoreVocabularywas inserting words one at a time via implicit autocommit — thousands of individual SQLite transactions for large documents. Wrapped inthis.#db.transaction().getDistinctiveTermschunk processing: Changed from.all()(loads every chunk's full text into a JS array) to.iterate()(streams one row at a time), reducing memory pressure for large indexed sources.Test plan
tests/search-fallback-integration.test.ts(7 tests) covers:searchWithFallbackthrough all three fallback layers (porter, trigram, fuzzy)batch_executepathgetDistinctiveTermswith.iterate()produces correct results🤖 Generated with Claude Code