git-span 1.1.1 → 1.1.7

package/README.md

@@ -4,6 +4,28 @@
 
 The primary CLI surface lives in `src/cli/mod.rs`. Run `git span --help` or `git span drift --help` for flag reference.
 
+### Exact batched context
+
+`git span context <address>... --format json` returns one schema-v1 snapshot
+for exact repository-relative paths and inclusive line ranges: normalized
+scopes, exact anchored/current overlaps, complete selected spans, why text,
+live status/source facts, and structured mutation counts. `--fix` adds
+cycle-safe positional repair; `--operation-id <uuid>` makes a delivery-unknown
+repair replayable across processes. Failures leave stdout empty, while a valid
+no-overlap query succeeds with an empty `spans` array. The complete schema,
+token, failure, service, and recovery contract is in the
+[command reference](../../plugins-claude/git-span/skills/git-span/references/command-reference.md#exact-batched-context).
+
+Linux uses an authenticated private per-worktree watcher service for warm
+queries and falls back to the same strict in-process answer whenever the
+watcher or service is unavailable. The released-binary
+[acceptance harness](./scripts/context-acceptance.py) runs 31 samples in each
+required warm cell. On the documented 2026-08-14 container run, warm context
+p50/p95 improvement over the legacy process lifecycle was at least
+78.2%/76.3% (clean) and reached 86.7%/90.0% (multi-span); cold bootstrap was 43.0 ms,
+invalidated rebuild 42.7 ms, strict fallback 34.6 ms, and a journaled repair
+136.1 ms. Root-switch and linked-worktree checks passed.
+
 ### The drift cache
 
 `git span drift` (and related resolution paths) are backed by a single persistent cache: a SQLite database at `<common_dir>/span/store.db` (plus its `-wal` and `-shm` companions), implemented in `src/resolver/store/`. This is the whole on-disk cache footprint — remove `store.db*` to reset it. Setting `GIT_SPAN_CACHE=0` disables it for a run.

package/man/git-span.1

@@ -1,6 +1,7 @@
+.\" GENERATED by gen-manpage. Do not edit by hand.
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
-.TH git-span 1  "git-span 1.1.1"
+.TH git-span 1  "git-span 1.1.7"
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
 .SH NAME
@@ -72,7 +73,9 @@ Bare invocations:
 .RS 4
 .TP
 .B git span
-List every span in the repository.
+Print the command help and exit 0. Run
+.B git span list
+with no arguments to list every span.
 .TP
 .BI git\ span\  <name>
 Show one span (anchors, why, config).
@@ -96,47 +99,53 @@ Print version
 .SH SUBCOMMANDS
 .TP
 git\-span\-show(1)
-Show the named span — its anchors, why, and config. Equivalent to the bare `git span <name>` positional form
+Show the named span — its anchors, why, and config. The bare `git span <name>` positional form is equivalent to `git span show <name>`
 .TP
 git\-span\-list(1)
 List files and anchors currently tracked by a span
 .TP
 git\-span\-drift(1)
-Report anchors whose content has drifted from their anchored state
+Report anchors whose content has drifted from their anchored state. `paths` may be file paths, globs, or span names; omit them to scan all spans
+.TP
+git\-span\-context(1)
+Return exact dependency context for repository\-relative paths or inclusive line ranges as one versioned JSON document
 .TP
 git\-span\-add(1)
-Add anchors to a span, writing the span file under the span root. Stage and commit the change with `git add .span && git commit`
+Add anchors to a span, writing the span file under the span root
 .TP
 git\-span\-remove(1)
-Remove anchors from a span, editing the span file under the span root. Stage and commit the change with `git add .span && git commit`
+Remove anchors from a span, editing the span file under the span root. Each anchor must match an existing one on the span exactly. Stage and commit the change with `git add .span && git commit`
 .TP
 git\-span\-replace(1)
-Replace one anchor on a span with another address, in a single atomic transaction: either the old identity is retired and the new identity installed together, or nothing changes
+Replace one anchor on a span with another address, in a single atomic transaction: either the old identity is retired and the new identity installed together, or nothing changes — there is never an intermediate state with both or neither. The new anchor passes the same validation as `add` (path safety, existence, gitignored/rewritten\-target rejection, line\-count extent), so a poisoned declaration is never written
 .TP
 git\-span\-why(1)
 Read or stage the span\*(Aqs why — one or two complete present\-tense clauses carrying decision\-relevant nonlocal context
 .TP
 git\-span\-delete(1)
-Delete a span
+Delete a span — removes its file under the span root. Destructive. Run `git span list` afterward to confirm it is gone, then commit the change
 .TP
 git\-span\-doctor(1)
-Audit the local span setup
+Audit the local span setup — reports span count and findings, plus a store\-size summary (bytes used). Exits 0
 .TP
 git\-span\-tree(1)
 Trace blast radius: render a clique\-grouped impact tree rooted at the files matched by the given paths/globs
 .TP
 git\-span\-merge\-driver(1)
-Resolve `.span/` merge conflicts structurally when invoked by git as a merge driver. Receives three clean blob temp files and the marker length from git. Resolves only what is structurally derivable without trusting the worktree (which may be mid\-merge); defers same\-anchor range/hash divergence by writing minimal conflict markers and exiting non\-zero so `git span drift \-\-fix` can finish authoritatively
+Resolve `.span/` merge conflicts structurally when invoked by git as a merge driver. Receives three clean blob temp files and the marker length from git. Resolves only what is structurally derivable without trusting the worktree, which may be mid\-merge. Same\-anchor range/hash divergence is deferred: minimal conflict markers are written and the command exits non\-zero so `git span drift \-\-fix` can finish authoritatively. Exits 0 when fully resolved, 1 when partial (residue markers written)
 .TP
 git\-span\-history(1)
-Show a span\*(Aqs git history as a git\-log\-style timeline: newest\-first commit entries whose patches are real unified diffs of the span declaration and of each anchor\*(Aqs content at its declared address, with the span\*(Aqs live drift rendered before the first commit as a headerless diff. That drift is not working\-tree\-only: it covers every resolver layer `git span drift` reports, and each block names its observational layers on a `drift source` line. `HEAD` identifies the comparison layer; it does not by itself prove that the declaration or content change was committed. Source order is the resolver\*(Aqs: line ranges use Worktree → Index → Head, while whole\-file anchors use Index → Worktree → Head
+Show a span\*(Aqs git history as a git\-log\-style timeline: newest\-first commit entries whose patches are real unified diffs of the span declaration and of each anchor\*(Aqs content at its declared address, rename\-aware by content similarity — a re\-anchor whose old and new content pair at ≥ 50% similarity (git\*(Aqs `\-M` default) renders as a rename, a sub\-threshold re\-anchor renders as a deleted anchor plus a new anchor, and a re\-anchor whose recorded side cannot be read (binary or unrecoverable content) renders `rename from`/`rename to` lines with no similarity claim, the move asserted by the declaration itself. The span\*(Aqs live drift is rendered before the first commit as a headerless diff. That drift is not working\-tree\-only: it covers every resolver layer `git span drift` reports, and each block names its observational layers on a `drift source` line. `HEAD` identifies the comparison layer; it does not by itself prove that the declaration or content change was committed. Source order is the resolver\*(Aqs: line ranges use Worktree → Index → Head, while whole\-file anchors use Index → Worktree → Head
+.TP
+git\-span\-resolve(1)
+Settle every residue entry in a conflict\-markered span file under one explicitly chosen side, and write a clean span
 .TP
 git\-span\-help(1)
 Print this message or the help of the given subcommand(s)
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
 .SH VERSION
-v1.1.1
+v1.1.7
 .SH EXAMPLES
 Anchor a new span alongside a code change:
 .PP

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-span",
-  "version": "1.1.1",
+  "version": "1.1.7",
   "bin": "bin/git-span.exe",
   "man": [
     "man/git-span.1"
@@ -8,13 +8,16 @@
   "scripts": {
     "postinstall": "node scripts/postinstall.js",
     "build:man": "bash scripts/with-target-lock.sh shared env CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/build\" cargo run --quiet --locked --bin gen-manpage -- man/git-span.1",
+    "build:schemas": "bash scripts/with-target-lock.sh shared env CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/build\" cargo run --quiet --locked --bin gen-schemas -- ../website",
+    "check:schemas": "bash scripts/with-target-lock.sh shared env CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/build\" cargo run --quiet --locked --bin gen-schemas -- --check ../website",
     "build": "yarn build:man",
     "build:local": "bash scripts/build-local.sh",
     "build:clean": "bash scripts/cleanup-stale-target.sh && bash scripts/clean-shared-build.sh && yarn build",
-    "test": "bash scripts/with-target-lock.sh shared env CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/build\" cargo nextest run --locked",
+    "test": "bash scripts/with-target-lock.sh exclusive env CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/build\" bash -c 'cargo run --quiet --locked --bin gen-schemas -- --check ../website && cargo nextest run --locked'",
     "lint": "bash scripts/with-target-lock.sh shared env RUSTFLAGS=\"-W unused -W dead-code\" CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/check\" cargo clippy --quiet --locked -- -D warnings",
     "typecheck": "bash scripts/with-target-lock.sh shared env RUSTFLAGS=\"-W unused -W dead-code\" CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/check\" cargo clippy --quiet --locked -- -D warnings",
     "bench:check": "bash scripts/with-target-lock.sh shared env CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/build\" cargo bench --no-run --locked --features bench-corpus",
+    "bench:context": "python3 scripts/context-acceptance.py --binary \"${GIT_SPAN_CONTEXT_BINARY:-target-cache/release/git-span}\"",
     "bench": "bash scripts/with-target-lock.sh shared env CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/build\" cargo bench --locked",
     "udeps": "bash scripts/with-target-lock.sh shared env CARGO_TARGET_DIR=\"${GIT_SPAN_CARGO_TARGET_ROOT:-/var/cache/git-span/cargo-target}/git-span/udeps\" cargo +nightly udeps"
   },
@@ -24,11 +27,11 @@
     "scripts/postinstall.js"
   ],
   "optionalDependencies": {
-    "git-span-darwin-arm64": "1.1.1",
-    "git-span-darwin-x64": "1.1.1",
-    "git-span-linux-arm64": "1.1.1",
-    "git-span-linux-x64": "1.1.1",
-    "git-span-win32-x64": "1.1.1"
+    "git-span-darwin-arm64": "1.1.7",
+    "git-span-darwin-x64": "1.1.7",
+    "git-span-linux-arm64": "1.1.7",
+    "git-span-linux-x64": "1.1.7",
+    "git-span-win32-x64": "1.1.7"
   },
   "repository": {
     "type": "git",