Skip to content

gather: deterministic context-pack tool (aft_gather)#152

Open
iceteaSA wants to merge 1 commit into
cortexkit:mainfrom
iceteaSA:gather-context-pack
Open

gather: deterministic context-pack tool (aft_gather)#152
iceteaSA wants to merge 1 commit into
cortexkit:mainfrom
iceteaSA:gather-context-pack

Conversation

@iceteaSA

@iceteaSA iceteaSA commented Jul 7, 2026

Copy link
Copy Markdown

gather: deterministic context-pack tool (aft_gather)

What

One new tool — aft_gather — assembles a bounded "context pack" (ranked, deduped, budgeted verbatim code evidence) in a single call. It replaces the multi-turn search → outline → zoom → callgraph read chain an agent otherwise runs to build context around a question or a symbol.

Two modes (mutually exclusive):

  • question: "how does X work?" — seeds from handle_semantic_search (same pipeline as aft_search, all lanes/fallbacks)
  • symbol + filePath — seeds from the callgraph (impact depth-1 callers + call_tree depth-1 callees)

Seeds expand one hop through the callgraph, dedupe by canonicalized (file, symbol) with seeds winning, and render via render_symbol_within_budget until a hard line budget (default 400, cap 800) is spent. Everything past the cut appears as one-line stubs under ## Beyond budget (zoom to expand) — nothing is silently dropped.

Why

Agents burn serial turns assembling context: search, then outline the hits, then zoom the symbols, then chase callers. Each turn round-trips through the model. A pack returns evidence (verbatim bodies with file:line headers), not conclusions — the agent reasons over it directly, ready to attach to a subagent dispatch.

Measured on a real config repo (3 questions, one call each vs. the manual chain):

  • "how does the lane-verdict cache flow end-to-end" → complete 4-file chain (cache shapes, verdict logic, write/read, plugin deny hook) in one pack, used=283/400. Manual baseline: 5-6 tool calls.
  • "how does score-tap decide when to write an executor row" → the full decision chain (event filter → dedup → context sources → verdict parse → DB insert) in one pack at budget=200.
  • An unrehearsed cross-file question → correct core symbols plus their docstrings, first try.

Independently reproduced on the aft codebase itself: question: "how does bash output compression dispatch pick a compressor"seeds=15, used=226/400, one pack assembling the full dispatch chain (compress → gate → compress_with_registry_exit_code 20-compressor array → Compressor trait → install path → subc mirror) that otherwise takes a 4–5-call search→zoom chain.

Honest degradation

The pack never lies about its own quality:

  • While the semantic index is building, long NL queries degrade to lexical-only file-level hits. The pack renders them as visible file:line (no containing symbol) stubs and flags the header with degraded=semantic-index-building (partial results — retry when index ready) — detected via the response's semantic_status field, cleared as soon as one real seed resolves. No blocking or retry inside the tool.
  • Grep-fallback hits ({file, line_text, line}, no symbol name) resolve to their containing symbol by line containment — definitions, call sites, and comment hits all upgrade to the enclosing symbol. Hits with no containing symbol stay visible as stubs.
  • Unresolved external/stdlib callees collapse to one summary line ((N unresolved external calls omitted)) instead of drowning the stub list; unresolved seeds and callers are never suppressed.

Implementation

  • crates/aft/src/commands/gather.rs — Rust-side composition: calls handle_semantic_search / impact_result / call_tree_result / render_symbol_within_budget directly (shared &AppContext, no bridge round-trips, no parallel reimplementation of search).
  • Wiring: main.rs dispatch arm, subc_translate.rs mapping, TS factory packages/opencode-plugin/src/tools/gather.ts + registration (same tier as aft_callgraph — depends on the callgraph store).
  • No new dependencies, no config surface beyond the tool args, no LLM calls, no caching.
  • Follows the tri-state honest-reporting convention (protocol.rs Response doc-comment): success:false+code for un-performable calls (e.g. invalid_request on a bad mode combo), success:true with a visible degraded/stub pack for partial results — never a bare empty success.

Tests

22 unit tests in gather.rs, including red-checked regressions (each confirmed to fail against pre-fix code): mid-codepoint truncation panic, duplicate-symbol line-anchored resolution, abs/rel path dedupe, containing-symbol resolution via a real TreeSitterProvider, callee-only stub suppression driven through the production build_pack path, and degradation-flag presence/absence/mixed cases.

Limitations (deliberate scope)

  • 1-hop expansion only — multi-hop was deliberately excluded: the budget math and ranking get harder and the packs get noisier.
  • Callgraph-dependent by design: neighbor expansion quality follows the callgraph store's freshness, same as aft_callgraph.
  • Budget counted in lines, not tokens — matches aft's existing budget idiom across zoom/outline.

View with Codesmith Autofix with Codesmith
Need help on this PR? Tag /codesmith with what you need. Autofix is disabled.


Summary by cubic

Adds aft_gather, a one-call, deterministic context-pack builder that returns ranked, deduped, verbatim code within a fixed line budget, replacing the multi-step search→outline→zoom→callgraph chain. Exposed as gather in Rust and aft_gather in @opencode (surface: "all").

  • New Features

    • Two modes: question (semantic seeds) or symbol + filePath (impact callers + call-tree callees), with 1‑hop expansion and (file, symbol) dedupe (seeds win).
    • Hard line budget (default 400, max 800); overflow goes under “Beyond budget” as stubs. External unresolved callees collapse to a single summary line; seeds/callers remain visible.
    • Grep‑fallback hits resolve to containing symbols; hits without one render as visible stubs.
    • Header flags degraded=semantic-index-building (suppressed once any symbol seed resolves) and neighbors=skipped(callgraph-unavailable) when the callgraph store is down.
    • Robustness: repo‑relative paths resolve against project root (incl. filePath in translate); abs/rel path normalization for dedupe; Unicode‑safe query truncation. No new deps. 22 tests. README adds aft_gather. Tool gated in ALL_ONLY_TOOLS.
  • Migration

    • Call with { question: "how does X work?" } or { symbol, filePath }; optional budget 1–800 (default 400).
    • Neighbor expansion requires the callgraph store in symbol mode; in question mode, neighbors are skipped with a header notice if unavailable.

Written for commit 5364eac. Summary will update on new commits.

Review in cubic

Greptile Summary

This PR adds aft_gather, a single-call deterministic context-pack tool that replaces a multi-turn search→outline→zoom→callgraph read chain. It supports two mutually exclusive modes — question (semantic-search-seeded) and symbol+filePath (callgraph-seeded) — with 1-hop neighbor expansion, dedup, and a hard line budget.

  • New gather.rs: Full Rust implementation with seed collection, callgraph neighbor expansion, budget-enforced rendering with render_symbol_within_budget, visible stubs for unresolvable symbols (callee-only suppression for external symbols), and honest degradation reporting in the pack header.
  • Wiring: commands/mod.rs module declaration, main.rs dispatch arm, subc_translate.rs translation with per-field mode validation and filePath project-root resolution, and TypeScript factory/registration in gather.ts/index.ts (gated to the "all" tier).
  • Tests: 22 unit tests covering truncation, dedup, ranking, path normalization, containment resolution via a real TreeSitterProvider, budget accounting, and the callee-suppression path driven through the production build_pack.

Confidence Score: 5/5

Safe to merge — the new tool is well-isolated, additive-only, and backed by 22 unit tests covering the specific edge cases most likely to cause runtime failures.

The implementation is thorough: path normalization, budget accounting, dedup, degradation reporting, and callee suppression all have direct test coverage. Previous review findings were addressed in f8e7fa9. The remaining observations are minor documentation and defensive-coding notes that don’t affect correctness.

No files require special attention. gather.rs is the only substantive new file and its logic is well-exercised by the included tests.

Important Files Changed

Filename Overview
crates/aft/src/commands/gather.rs New 1460-line implementation of the gather tool: seed collection, callgraph expansion, budget-enforced rendering, dedup, and degradation reporting. Well-tested with 22 unit tests.
crates/aft/src/subc_translate.rs Adds translate_gather with proper per-field mode validation and project-root resolution of filePath.
packages/opencode-plugin/src/tools/gather.ts TypeScript tool definition with Zod schema validation and standard callToolCall dispatch.
packages/opencode-plugin/src/index.ts Registers aft_gather in ALL_ONLY_TOOLS and includes gatherTools. Minimal, correct integration.
crates/aft/src/main.rs Single dispatch arm addition for gather. No issues.
crates/aft/src/commands/mod.rs Adds pub mod gather in alphabetical position. No issues.

Reviews (8): Last reviewed commit: "gather: deterministic context-pack tool ..." | Re-trigger Greptile

@iceteaSA
iceteaSA marked this pull request as ready for review July 7, 2026 00:13

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 issues found across 7 files

Reply with feedback, questions, or to request a fix.

Re-trigger cubic

Comment thread crates/aft/src/commands/gather.rs Outdated
Comment thread crates/aft/src/subc_translate.rs Outdated
Comment thread crates/aft/src/commands/gather.rs
Comment thread crates/aft/src/commands/gather.rs Outdated
Comment thread crates/aft/src/commands/gather.rs Outdated
Comment thread crates/aft/src/commands/gather.rs Outdated
Comment thread crates/aft/src/commands/gather.rs
@iceteaSA
iceteaSA force-pushed the gather-context-pack branch 2 times, most recently from f8e7fa9 to cf09b9b Compare July 7, 2026 11:33
@iceteaSA

iceteaSA commented Jul 7, 2026

Copy link
Copy Markdown
Author

Follow-up on the two maintainability notes from the Greptile summary (they weren't separate review threads, so noting here) — both addressed in cf09b9b9:

  • degraded expression flagged as always-false in the non-empty-seeds path — intentional: degraded only applies when zero symbol-level seeds resolve (a building index yields no seeds; a ready index with seeds is never degraded). Logic unchanged; added a comment on the why so it doesn't read as dead code.
  • callee-suppression string-match coupling — extracted UNRESOLVED_MARKER ("(symbol not resolved)") and CALLEE_PROVENANCE_PREFIX ("callee-of-") consts, referenced by both the producer (render_symbol_section err arm / collect_callees_for_seed) and the consumer (build_pack suppression guard) so the match can't silently drift. Only test-site literals remain, intentionally — a test pointing at the const couldn't catch const drift.

Matched/rendered text is byte-identical; 23/23 gather tests green.

@iceteaSA
iceteaSA force-pushed the gather-context-pack branch 2 times, most recently from 1d068c9 to d2e15e6 Compare July 11, 2026 10:52
@iceteaSA
iceteaSA force-pushed the gather-context-pack branch 2 times, most recently from 5f897fc to 48424b4 Compare July 16, 2026 19:48
One call assembles a bounded context pack — ranked, deduped, budgeted verbatim code evidence — replacing the serial search → outline → zoom → callgraph read chain.

- Two modes (XOR): question (seeds via handle_semantic_search, same pipeline as aft_search) or symbol+filePath (callgraph impact depth-1 callers + call_tree depth-1 callees)
- 1-hop neighbor expansion; dedupe by canonicalized (file, symbol), seeds win
- Hard line budget (default 400, cap 800) via render_symbol_within_budget; over-budget candidates emit as visible stubs — nothing silently dropped
- Grep-fallback hits resolve to their containing symbol by line containment; no-symbol hits stay visible stubs
- Semantic-index-building degradation flagged in the pack header (semantic_status), suppressed when any symbol-level seed resolves
- Unresolved external callees collapse to one summary line; unresolved seeds/callers never suppressed
- Follows the tri-state honest-reporting convention (protocol.rs Response doc-comment)
- 22 unit tests incl. red-checked regressions; no new dependencies, no LLM calls, no caching
@iceteaSA
iceteaSA force-pushed the gather-context-pack branch from 48424b4 to 5364eac Compare July 19, 2026 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant