@@ -13,6 +13,11 @@ Read / Grep results as `graph: …` lines.
 
 **Trust the answer, and know what it is.** A `[resolved]` / `[sound]` row has already been looked up again in the graph (the `verified:` line): do not re-derive it by grepping. Each answer ends with `next:` — the one step to take. For a CHANGE (who calls it, what breaks, which tests), read only the lines you will cite or change. To EXPLAIN how something works, the graph gives the reading order, not the explanation: read each step's body, and continue through every `⚠` (a call the graph lost). `[by name]` / `[text]` rows are leads, not facts.
 
+**A list of sites comes the way grep prints it.** The MCP `impact`, `path`, `test_impact` and `context` (without
+`source` / `explain` / `from_`) answer one site per line: `path:line: <the code on that line>  [resolved · hop 2 · test …]`,
+surest first, capped with a count of the rest; `limit=N` lists more, `full=True` gives the sectioned answer with `next:`.
+From the shell the same shape is `--grep` (`--grep-limit N`); without it the answer is the prose.
+
 ## Start here
 
 | the question in front of you | the call |
 
@@ -673,6 +673,7 @@ def mark_answer(out, stale, as_json):
 def query_names(verb, args, repo):
     """the names a query asks about (impact's targets, path's endpoints, context's --from), as written"""
     names, i, pos = [], 0, []
+    if '--' in args: args = args[args.index('--') + 1:]  # --grep runs the verb under ax_grep.py <verb> <repo> … --: not names
     while i < len(args):
         a = args[i]
         if a in _FLAG_VALUE:
 
@@ -3,7 +3,7 @@
 #
 #   axiomcode index [<repo>] [--lang java|typescript|python|javascript|csharp] [--src <subdir>] [--library <root>[,<root>…]]
 #       the pipeline: parser → engine → .axiomcode/out/graph.sqlite (+ index). <repo> defaults to the current directory.
-#   axiomcode context "<the task, in your own words>" [<repo>] [--in <path>[,<path>…]]… [--budget N] [--source] [--json] [--fresh]
+#   axiomcode context "<the task, in your own words>" [<repo>] [--in <path>[,<path>…]]… [--budget N] [--source] [--json] [--fresh] [--grep]
 #       THE FRONT DOOR: the files and callables a task touches, from the problem statement — when there is no name
 #       to ask about yet. Deterministic: task terms scored against the graph's vocabulary by inverse document
 #       frequency, tests demoted, the closure walked from the best seed per term and ranked by nearest hop.
@@ -16,15 +16,15 @@
 #       and --library it was indexed with, never for a language the index left out; indexed first when there is none.
 #       Prints what it drew and the page's absolute path: <repo>/.axiomcode/graph/graph.html, or --out (a folder gets
 #       <folder>/<repo>.html, a .html path is used as given). The page embeds the sources, so a node opens its code.
-#   axiomcode path <from> <to> [<repo>] [--every | --paths N] [--all] [--limit N] [--in <path fragment>] [--json] [--fresh]
+#   axiomcode path <from> <to> [<repo>] [--every | --paths N] [--all] [--limit N] [--in <path fragment>] [--json] [--fresh] [--grep]
 #       the shortest chain of calls from A to B per reached target, and with --every all the routes; through what?
 #       '*' as one endpoint: path '*' X = everything that can reach X, with the entry points among them; path X '*' = everything X reaches. Endpoints exactly as written in the code: Owner.method,
 #       method (free function or any owner), Type (all its methods), file.ts:123, file.py. Datalog over the graph; every
 #       printed hop re-checked against graph.sqlite. `axiomcode path --selftest <lang>` replays the engine's expected edges.
 #       Every hop carries the LINE THE CALL IS WRITTEN ON, how certain the edge is, and what kind of call it is —
 #       an invocation, a construction, a constructor chain, a super call, a decorator, a property access, a method
 #       reference — in one vocabulary across all five languages. A hop that is not a call is marked and not counted.
-#   axiomcode impact <target> [<target>…] [<repo>] [--tests] [--depth N] [--in <path>] [--limit N] [--json] [--kind k] [--fresh]
+#   axiomcode impact <target> [<target>…] [<repo>] [--tests] [--depth N] [--in <path>] [--limit N] [--json] [--kind k] [--fresh] [--grep]
 #       what has to be looked at again when a declaration changes: a method, a field / constant / enum member, a type, a
 #       parameter (Owner.m(p)), a type parameter (Type<T>), a local (Owner.m:v), Type.<init> / Type.<clinit>. Prints what
 #       must change with it (overrides, subtypes), what directly touches it with WHY and how sure ([resolved] / [in scope] /
@@ -36,7 +36,7 @@
 #       name, initializer; type header; body only; removed; added) — the working tree against the commit the graph was built
 #       from, or a branch's commits (--range a..b reads from `git merge-base a b`) — each with the target `impact` takes;
 #       --impact runs impact on all of them as one change set. Without git, name the files.
-#   axiomcode test-impact [<repo>] [<file>…] [--range <a>..<b> | --staged] [--in <path>] [--limit N] [--json] [--why]
+#   axiomcode test-impact [<repo>] [<file>…] [--range <a>..<b> | --staged] [--in <path>] [--limit N] [--json] [--why] [--grep]
 #       which tests actually have to run for this edit: the test files that reach any changed declaration, with the
 #       chain, so a selection can be checked rather than trusted. Conservative by design — a test reached only
 #       through an edge the graph does not encode (reflection, a service loader) will NOT appear.
@@ -50,6 +50,9 @@
 # language's, the one with the most files, first). --lang restricts it to one language or a comma list, the first the main one;
 # --src limits the analysed tree (e.g. src); --library names dependency roots. --fresh (context, path, impact) waits for
 # a refresh in flight and answers from the new graph; without it an answer from a graph older than an edit marks its rows.
+# --grep (context, path, impact, test-impact) prints the answer's sites one per line, as grep does: `path:line: <the code
+# on that line>  [resolved | one of a set | by name | text | hop N | test]`, the first 30 (--grep-limit N) and a count of
+# the rest, then whether it was verified and its bound. The MCP tools answer this way by default; full=True is the prose.
 case "$0" in */*) H="${0%/*}";; *) H=.;; esac; H="$(cd "${H:-/}" && pwd)"   # no `dirname`: see bin/axiomcode
 
 # PYTHON UNDER ANOTHER NAME (#1331). Every verb runs `python3`, which a python.org install on Windows does not
@@ -101,6 +104,8 @@ while [ $# -gt 0 ]; do
     --src) export AXIOMCODE_SRC="$2"; shift 2 ;;
     --library) export AXIOMCODE_LIBRARY="$2"; shift 2 ;;
     --fresh) export AXIOMCODE_FRESH=1; shift ;;
+    --grep) GREP=1; shift ;;
+    --grep-limit) GREP=1; GREP_LIMIT="$2"; shift 2 ;;
     *) ARGS+=("$1"); shift ;;
   esac
 done
@@ -128,24 +133,29 @@ FR=.; skip=""; for a in ${ARGS[@]+"${ARGS[@]}"}; do
   case "$a" in --in|--from|--budget|--seeds|--depth|--limit|--tests-in|--kind|--range|--old|--new|--file|--page|--page-budget|--out) skip=1; continue ;; esac
   [ -d "$a" ] && FR="$a"
 done
+# --grep (context, path, impact, test-impact): the answer's sites one per line, `path:line: code  [tag]`, the way grep
+# prints them (ax_grep.py). The verb answers with --json and the sites are printed from that document, so the two
+# shapes are one answer. Without it the answer is the verb's own, unchanged.
+G=()
+case "$cmd" in context|path|impact|test-impact|tests) [ -n "${GREP:-}" ] && G=(python3 "$H/ax_grep.py" "$cmd" "$FR" --limit "${GREP_LIMIT:-30}" --) ;; esac
 # A REPOSITORY IN SEVERAL LANGUAGES has one graph per language (.axiomcode/lang/<lang> beside the main one): a query
 # asks every one of them (ax_langs.py), so no language's code is left out of an answer. A graph named in
 # AXIOMCODE_GRAPH was chosen by the caller and is asked alone.
 Q=""; [ -d "$FR/.axiomcode/lang" ] && [ -z "${AXIOMCODE_GRAPH:-}" ] && Q="$H/ax_langs.py"
 # (-L too: a pointer whose target is gone is a graph to repair — the refresher does it — not a repository without one)
 if [ -f "$FR/.axiomcode/out/graph.sqlite" ] || [ -L "$FR/.axiomcode/out/graph.sqlite" ]; then
   case "$cmd" in
-    context|path|impact) exec python3 "$H/ax_fresh.py" query "$FR" "$cmd" -- python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-$cmd" ${ARGS[@]+"${ARGS[@]}"} ;;
+    context|path|impact) exec python3 "$H/ax_fresh.py" query "$FR" "$cmd" -- ${G[@]+"${G[@]}"} python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-$cmd" ${ARGS[@]+"${ARGS[@]}"} ;;
     changed|test-impact|tests) python3 "$H/ax_fresh.py" baseline "$FR" "${AXIOMCODE_BASELINE_WAIT:-30}" || true ;;
   esac
 fi
 case "$cmd" in
   index|build) exec bash "$H/axiomcode-build" ${ARGS[@]+"${ARGS[@]}"} ;;
-  context) exec python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-context" ${ARGS[@]+"${ARGS[@]}"} ;;
-  path)   exec python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-path" ${ARGS[@]+"${ARGS[@]}"} ;;
-  impact) exec python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-impact" ${ARGS[@]+"${ARGS[@]}"} ;;
+  context) exec ${G[@]+"${G[@]}"} python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-context" ${ARGS[@]+"${ARGS[@]}"} ;;
+  path)   exec ${G[@]+"${G[@]}"} python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-path" ${ARGS[@]+"${ARGS[@]}"} ;;
+  impact) exec ${G[@]+"${G[@]}"} python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-impact" ${ARGS[@]+"${ARGS[@]}"} ;;
   changed) exec python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-changed" ${ARGS[@]+"${ARGS[@]}"} ;;
-  test-impact|tests) exec python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-test-impact" ${ARGS[@]+"${ARGS[@]}"} ;;
+  test-impact|tests) exec ${G[@]+"${G[@]}"} python3 ${Q:+"$Q" "$FR"} "$H/axiomcode-test-impact" ${ARGS[@]+"${ARGS[@]}"} ;;
   graph)  exec python3 "$H/axiomcode-graph" ${ARGS[@]+"${ARGS[@]}"} ;;
   install) exec python3 "$H/axiomcode-install" ${ARGS[@]+"${ARGS[@]}"} ;;
   --verbs) verbs ;;                      # what this dispatcher answers to; bin/axiomcode asks, so the two cannot drift
 
@@ -1129,10 +1129,12 @@ def main(argv):
         if nm not in cur or sc > cur[nm][0]:
             cur[nm] = (sc, len(matched), nm)
             if sy.get('line'): span_of[(f, nm)] = (sy['line'], sy.get('end_line') or sy['line'])
+    def decls_of(f):
+        return [nm for _sc, _m, nm in sorted(best_in_file.get(f, {}).values(), key=lambda x: (-x[0], -x[1], x[2]))[:DECLS_PER_FILE]]
+    # `declared_at` beside the names: the line each one starts on, so a site list (ax_grep.py) can point at it
     RESULT['files'] = [{'file': f, 'how': ('name only, no call path' if d == 99 else f'hop {d}'),
-                        'symbols': n, 'task_terms_matched': hit,
-                        'declarations': [nm for _sc, _m, nm in
-                                         sorted(best_in_file.get(f, {}).values(), key=lambda x: (-x[0], -x[1], x[2]))[:DECLS_PER_FILE]]}
+                        'symbols': n, 'task_terms_matched': hit, 'declarations': decls_of(f),
+                        'declared_at': [f"{f}:{span_of[(f, nm)][0]}" if (f, nm) in span_of else None for nm in decls_of(f)]}
                        for f, (d, hit, n) in shown]
     for f, (d, hit, n) in shown:
         mark = f"  [{hit} task term(s)]" if hit else ""
 
@@ -13,6 +13,11 @@ Read / Grep results as `graph: …` lines.
 
 **Trust the answer, and know what it is.** A `[resolved]` / `[sound]` row has already been looked up again in the graph (the `verified:` line): do not re-derive it by grepping. Each answer ends with `next:` — the one step to take. For a CHANGE (who calls it, what breaks, which tests), read only the lines you will cite or change. To EXPLAIN how something works, the graph gives the reading order, not the explanation: read each step's body, and continue through every `⚠` (a call the graph lost). `[by name]` / `[text]` rows are leads, not facts.
 
+**A list of sites comes the way grep prints it.** The MCP `impact`, `path`, `test_impact` and `context` (without
+`source` / `explain` / `from_`) answer one site per line: `path:line: <the code on that line>  [resolved · hop 2 · test …]`,
+surest first, capped with a count of the rest; `limit=N` lists more, `full=True` gives the sectioned answer with `next:`.
+From the shell the same shape is `--grep` (`--grep-limit N`); without it the answer is the prose.
+
 ## Start here
 
 | the question in front of you | the call |
 
@@ -0,0 +1,56 @@
+{"lang": "python", "src": ".",
+ "checks": [
+  {"why": "impact --grep: one site per line, path:line: the code on it, and what the graph knows as a trailing tag, surest first, then what reaches it by hop, then the tests; no section headers",
+   "run": ["impact", "total", "--grep"],
+   "want": ["shop/cart.py:5: return total(items)  [resolved · checkout]",
+            "shop/cart.py:8: def receipt(items):  [hop 2]",
+            "tests/test_cart.py:4: def test_receipt():  [test · resolved · hop 3]",
+            "verified: ✓"],
+   "avoid": ["reads or uses it (", "change: total", "entry points ("]},
+  {"why": "--grep-limit caps the sites and counts the rest by kind (this case.json names `total`: those are the [text] rows)",
+   "run": ["impact", "total", "--grep", "--grep-limit", "1"],
+   "want": ["shop/cart.py:5: return total(items)  [resolved · checkout]", "9 [text], 2 [test file], 1 [hop N]"],
+   "avoid": ["tests/test_cart.py:4:"]},
+  {"why": "a name written in non-source files is a lead: at most five such rows, the rest counted, and all after the code sites",
+   "run": ["impact", "total", "--grep"],
+   "want": ["tests/test_cart.py:4: def test_receipt():  [test · resolved · hop 3]\ncase.json:"],
+   "avoid": ["[text · names the method]\nshop/"]},
+  {"why": "tests come one row per test file, its nearest test first and the rest of that file counted: a file of many tests is what gets run, and listed one by one they spent the whole cap",
+   "run": ["impact", "total", "--grep"],
+   "want": ["tests/test_checkout.py:4: def test_empty():  [test · resolved · hop 2 · +2 more in this file]"],
+   "avoid": ["tests/test_checkout.py:8:", "tests/test_checkout.py:12:"]},
+  {"why": "control: a test file with one test is its row, with no count",
+   "run": ["impact", "total", "--grep"],
+   "want": ["tests/test_cart.py:4: def test_receipt():  [test · resolved · hop 3]\n"],
+   "avoid": ["test_receipt():  [test · resolved · hop 3 · +"]},
+  {"why": "test-impact --grep folds the same way (the edit named by file: every test that reaches shop/pricing.py)",
+   "run": ["test-impact", "{repo}", "shop/pricing.py", "--grep"],
+   "want": ["tests/test_checkout.py:4: def test_empty():  [test · resolved · hop 2 · +2 more in this file]",
+            "tests/test_cart.py:4: def test_receipt():  [test · resolved · hop 3]"],
+   "avoid": ["tests/test_checkout.py:8:"]},
+  {"why": "control: without --grep the answer is the verb's own, sections and all, unchanged",
+   "run": ["impact", "total"],
+   "want": ["reads or uses it (1 callable(s): 1 resolved):", "[resolved] checkout   shop/cart.py:5   — calls it"],
+   "avoid": ["shop/cart.py:5: return total(items)"]},
+  {"why": "control: --json is still one document, untouched by the grep shape",
+   "run": ["impact", "total", "--json"],
+   "want": ["\"direct\""],
+   "stdout_json": true},
+  {"why": "path --grep: each hop at the line its call is written on, caller → callee, and the hops looked up again",
+   "run": ["path", "receipt", "total", "--grep"],
+   "want": ["shop/cart.py:9: return \"paid \" + str(checkout(items))  [resolved · hop 1/2 receipt → checkout]",
+            "shop/cart.py:5: return total(items)  [resolved · hop 2/2 checkout → total]",
+            "verified: ✓ (2 edge(s) looked up again)"]},
+  {"why": "path --grep with no chain: the reason is the answer, said as the verb says it, never a JSON document",
+   "run": ["path", "unused", "checkout", "--grep"],
+   "want": ["no chain of resolved calls connects unused and checkout"],
+   "avoid": ["\"answers\""],
+   "expect_error": true},
+  {"why": "context --grep: the declarations the task lands on, one per line",
+   "run": ["context", "the total of a checkout", "--grep"],
+   "want": ["shop/pricing.py:1: def total(items):  [entry · matches 'total']", "shop/cart.py:4: def checkout(items):  [entry"],
+   "avoid": ["where this task's words land"]},
+  {"why": "a name that is not there is refused as the verb refuses it",
+   "run": ["impact", "nosuch", "--grep"],
+   "want": ["nothing named 'nosuch'"],
+   "expect_error": true}]}
@@ -0,0 +1,9 @@
+from shop.pricing import total
+
+
+def checkout(items):
+    return total(items)
+
+
+def receipt(items):
+    return "paid " + str(checkout(items))