Merge branch 'develop' into docs/homepage-and-nav-refresh

jayhack · web-flow · commit bab3c68c3b13 · 2026-06-23T08:35:46.000-07:00
diff --git a/.github/workflows/ty.yml b/.github/workflows/ty.yml
@@ -1,4 +1,4 @@
-name: Mypy Checks
+name: Ty Checks
 
 on:
   pull_request:
@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  mypy:
+  ty:
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -32,23 +32,20 @@ jobs:
         run: |
           python_files=()
           for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
-            if [[ $file == *.py ]]; then
+            if [[ $file == src/graph_sitter/*.py || $file == src/codemods/*.py || $file == src/gsbuild/*.py ]]; then
               python_files+=("${file}")
             fi
           done
           echo "python_files=${python_files[*]}" >> $GITHUB_ENV
 
-      - name: Add MyPy annotator
-        uses: pr-annotators/mypy-pr-annotator@v1.0.0
-
       - name: Skip rust rewrite baseline type debt
         if: ${{ env.python_files != '' && github.event.pull_request.head.ref == 'rust-rewrite' }}
         run: |
-          echo "Skipping PR-wide mypy for the rust-rewrite baseline merge."
+          echo "Skipping PR-wide ty for the rust-rewrite baseline merge."
           echo "Known type debt is documented in rust-rewrite/agent-handoff.md."
 
-      - name: Run mypy
+      - name: Run ty
         if: ${{ env.python_files != '' && github.event.pull_request.head.ref != 'rust-rewrite' }}
         run: |
-          echo "Running mypy on changed files: ${{ env.python_files }}"
-          uv run mypy --no-pretty --show-absolute-path ${{ env.python_files }}
+          echo "Running ty on changed files: ${{ env.python_files }}"
+          uv run ty check --output-format=github ${{ env.python_files }}
diff --git a/AGENTS.md b/AGENTS.md
@@ -3,6 +3,7 @@
 ## Frontend
 
 - The Vercel app lives in `site/`.
+- Vercel is configured by `site/vercel.json`; preview builds skip full docs prerendering, and the ignored build step skips builds unless `site/` or `docs/` changed.
 - Use Aura Dark from `daltonmenezes/aura-theme` for frontend dark mode and code surfaces. Core palette: background `#15141b`, foreground `#edecee`, muted `#6d6d6d`, purple `#a277ff`, green `#61ffca`, orange `#ffca85`, pink `#f694ff`, blue `#82e2ff`, red `#ff6767`.
 - Keep docs syntax highlighting aligned with the Aura Dark palette.
 - Use Node 22 for local site commands: `PATH="$HOME/.nvm/versions/node/v22.19.0/bin:$PATH" npm --prefix site run build`.
diff --git a/mypy.ini b/mypy.ini
diff --git a/pyproject.toml b/pyproject.toml
@@ -130,7 +130,6 @@ dev-dependencies = [
   "pytest>=8.3.3",
   "pytest-cov>=6.3.0,<6.3.1",
   "ruff>=0.6.8",
-  "mypy[mypyc,faster-cache]>=1.13.0",
   "pre-commit>=4.0.1",
   "pytest-xdist>=3.6.1,<4.0.0",
   "pytest-mock<4.0.0,>=3.14.0",
@@ -162,6 +161,7 @@ dev-dependencies = [
   "pytest-lsp>=1.0.0b1",
   "cython>=3.0.11",
   "pytest-split>=0.10.0",
+  "ty>=0.0.51",
 ]
 
 [tool.uv.workspace]
@@ -202,6 +202,23 @@ show_contexts = true
 [tool.pyright]
 pythonVersion = "3.12"
 enableExperimentalFeatures = true
+
+[tool.ty.environment]
+python-version = "3.12"
+
+[tool.ty.src]
+include = ["src/graph_sitter", "src/codemods", "src/gsbuild"]
+exclude = [
+  ".idea/**",
+  ".vscode/**",
+  "**/codegen_tests/**",
+  "tests/**",
+  "scripts/**",
+  "**/codemods/**/test_*/**",
+  "expected/**",
+  "tests/unit/skills/snapshots/**",
+]
+
 [tool.pytest.ini_options]
 # addopts = -v
 pythonpath = "."
diff --git a/rust-rewrite/agent-handoff.md b/rust-rewrite/agent-handoff.md
@@ -58,7 +58,7 @@ Hosted checks on the current branch are the stronger merge signal for large-repo
 - Complete mutable expression object parity.
 - Promise-chain async conversion parity.
 - Rust backend readiness as a default backend for production without explicit rollout gates.
-- Clean branch-wide mypy. The rust-rewrite baseline PR intentionally skips PR-wide mypy because the branch changes a large Python surface with known type debt; future focused PRs should restore normal mypy expectations for the files they touch.
+- Clean branch-wide ty. The rust-rewrite baseline PR intentionally skips PR-wide ty because the branch changes a large Python surface with known type debt; future focused PRs should restore normal ty expectations for the files they touch.
 
 ## High-Value Fanout Lanes
 
diff --git a/rust-rewrite/future-agent-brief.md b/rust-rewrite/future-agent-brief.md
@@ -10,7 +10,7 @@ This branch is intended to become the new development baseline, not the final Ru
 - Public API stance: keep the Python shell for users and codemods.
 - Backend stance: Rust compact mode is opt-in and covers the supported subset documented in `supported-subset.json`.
 - Python backend stance: keep it after this merge. Delete it only after the deletion gates below pass.
-- CI stance: fast Rust checks, extension builds, wheel smokes, docs/site checks, and large-repo opt-in checks are the meaningful signal for this baseline. Branch-wide mypy is intentionally skipped for the baseline PR because the branch carries known type debt across a large changed Python surface. The legacy GitHub fixture-push integration tests are also skipped only for the `rust-rewrite` baseline PR because they push branches to an external fixture repo and require a writable PAT; restore or replace that lane after merge. Current `pull_request_target` runs get this through test-level `GITHUB_HEAD_REF == "rust-rewrite"` skips because workflow edits in this PR are not used until they land on `develop`. General release wheels still build `macos-13` on tags/workflow calls, but PRs skip that queue-heavy duplicate and rely on `macos-latest` for macOS smoke.
+- CI stance: fast Rust checks, extension builds, wheel smokes, docs/site checks, and large-repo opt-in checks are the meaningful signal for this baseline. Branch-wide ty is intentionally skipped for the baseline PR because the branch carries known type debt across a large changed Python surface. The legacy GitHub fixture-push integration tests are also skipped only for the `rust-rewrite` baseline PR because they push branches to an external fixture repo and require a writable PAT; restore or replace that lane after merge. Current `pull_request_target` runs get this through test-level `GITHUB_HEAD_REF == "rust-rewrite"` skips because workflow edits in this PR are not used until they land on `develop`. General release wheels still build `macos-13` on tags/workflow calls, but PRs skip that queue-heavy duplicate and rely on `macos-latest` for macOS smoke.
 
 ## What Future Agents Should Trust
 
@@ -27,7 +27,7 @@ This branch is intended to become the new development baseline, not the final Ru
 - Full TypeScript type-system, namespace, JSX prop, and mutable expression-object parity.
 - Python backend deletion readiness.
 - Published-package `uvx graph-sitter ...` claims until a real released artifact is validated.
-- Branch-wide mypy cleanliness.
+- Branch-wide ty cleanliness.
 - Legacy GitHub push integration coverage on the baseline PR; the Rust merge signal comes from unit, fast, extension, wheel, docs/site, and large-repo proof lanes.
 
 ## Python Backend Deletion Gates
@@ -40,7 +40,7 @@ The Python backend can be removed only after these are complete:
 - [ ] Add full graph-wide parity harnesses for pinned Airflow and Next.js. Evidence: file, import, export, reference, dependency, external-reference, subclass, and deterministic ordering comparisons.
 - [ ] Expand codemod parity beyond smoke flows. Evidence: real codemods on pinned large repos assert exact file-byte diffs, changed-file sets, wall time, and RSS.
 - [ ] Replace or remove Python-only graph internals. Evidence: no required public path depends on `rustworkx.PyDiGraph`, eager `SourceFile._nodes`, persistent `tree_sitter.Node` wrappers, or Python object graph traversal.
-- [ ] Restore normal mypy and external integration expectations. Evidence: remove the `rust-rewrite` PR skip in `.github/workflows/mypy.yml`, remove the baseline-only `integration-tests` skip in `.github/workflows/test.yml`, or replace the fixture-push tests with hermetic/local equivalents.
+- [ ] Restore normal ty and external integration expectations. Evidence: remove the `rust-rewrite` PR skip in `.github/workflows/ty.yml`, remove the baseline-only `integration-tests` skip in `.github/workflows/test.yml`, or replace the fixture-push tests with hermetic/local equivalents.
 - [ ] Validate released `uvx graph-sitter ...` package behavior. Evidence: `uvx graph-sitter doctor`, `parse`, `run`, and `transform` work from a clean environment with a published version.
 
 ## Highest-Value Fanout Work
diff --git a/site/README.md b/site/README.md
@@ -57,12 +57,23 @@ Recommended project settings:
 ```text
 Framework Preset: Next.js
 Root Directory: site
-Build Command: default
+Build Command: checked in via `site/vercel.json`
 Output Directory: default
 Install Command: default
+Ignored Build Step: node scripts/ignore-build.mjs
 Production Branch: the integrator-approved trunk branch
 ```
 
+The Vercel build command is checked in via `site/vercel.json`. Preview builds
+set `GRAPH_SITTER_PRERENDER_DOCS=0`, so the docs route renders pages on demand
+instead of prerendering every MD/MDX page during deployment. Production and
+local `npm run build` builds still prerender the full docs tree.
+
+The ignored build step is also checked in via `site/vercel.json`. It skips
+Vercel builds when a commit does not change `site/` or `docs/`, using
+`VERCEL_GIT_PREVIOUS_SHA` when Vercel exposes system environment variables and
+falling back to `HEAD^` otherwise.
+
 From an authenticated Vercel CLI session:
 
 ```bash
diff --git a/site/app/docs/[[...slug]]/page.tsx b/site/app/docs/[[...slug]]/page.tsx
@@ -35,10 +35,10 @@ type DocsPageProps = {
 	}>;
 };
 
-export const dynamicParams = false;
+const shouldPrerenderDocs = process.env.GRAPH_SITTER_PRERENDER_DOCS !== "0";
 
 export function generateStaticParams() {
-	return getDocsStaticParams();
+	return shouldPrerenderDocs ? getDocsStaticParams() : [];
 }
 
 export async function generateMetadata({
diff --git a/site/next.config.mjs b/site/next.config.mjs
@@ -6,6 +6,9 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 /** @type {import('next').NextConfig} */
 const nextConfig = {
 	outputFileTracingRoot: path.join(__dirname, ".."),
+	outputFileTracingIncludes: {
+		"/docs/\\[\\[\\.\\.\\.slug\\]\\]": ["../docs/**/*"],
+	},
 };
 
 export default nextConfig;
diff --git a/site/scripts/ignore-build.mjs b/site/scripts/ignore-build.mjs
@@ -0,0 +1,57 @@
+import { spawnSync } from "node:child_process";
+
+const watchedPaths = [":/site", ":/docs"];
+const currentRef = process.env.VERCEL_GIT_COMMIT_SHA || "HEAD";
+const previousRef = process.env.VERCEL_GIT_PREVIOUS_SHA;
+
+if (isTruthy(process.env.VERCEL_FORCE_BUILD)) {
+	console.log("Vercel build forced by VERCEL_FORCE_BUILD.");
+	process.exit(1);
+}
+
+const baseRef = pickBaseRef(previousRef);
+if (!baseRef) {
+	console.log("No previous git ref found; running the Vercel build.");
+	process.exit(1);
+}
+
+const diff = spawnSync(
+	"git",
+	["diff", "--quiet", baseRef, currentRef, "--", ...watchedPaths],
+	{ stdio: "inherit" },
+);
+
+if (diff.status === 0) {
+	console.log(`No site/docs changes since ${baseRef}; skipping Vercel build.`);
+	process.exit(0);
+}
+
+if (diff.status === 1) {
+	console.log(
+		`Detected site/docs changes since ${baseRef}; running Vercel build.`,
+	);
+	process.exit(1);
+}
+
+console.log("Could not evaluate site/docs diff; running Vercel build.");
+process.exit(1);
+
+function pickBaseRef(ref) {
+	if (ref && hasCommit(ref)) {
+		return ref;
+	}
+
+	return hasCommit("HEAD^") ? "HEAD^" : undefined;
+}
+
+function hasCommit(ref) {
+	const result = spawnSync("git", ["cat-file", "-e", `${ref}^{commit}`], {
+		stdio: "ignore",
+	});
+
+	return result.status === 0;
+}
+
+function isTruthy(value) {
+	return /^(1|true|yes)$/iu.test(value ?? "");
+}
diff --git a/site/vercel.json b/site/vercel.json
@@ -1,5 +1,6 @@
 {
 	"$schema": "https://openapi.vercel.sh/vercel.json",
+	"buildCommand": "if [ \"$VERCEL_ENV\" = \"production\" ]; then npm run build; else GRAPH_SITTER_PRERENDER_DOCS=0 npm run build; fi",
 	"framework": "nextjs",
-	"ignoreCommand": "git diff --quiet HEAD^ HEAD -- :/site :/docs"
+	"ignoreCommand": "node scripts/ignore-build.mjs"
 }
diff --git a/src/graph_sitter/compiled/resolution.pyi b/src/graph_sitter/compiled/resolution.pyi
@@ -1,18 +1,18 @@
 from dataclasses import dataclass, field
 from functools import cached_property as cached_property
-from typing import Generic
 
 from typing_extensions import TypeVar
 
 from graph_sitter.codebase.codebase_context import CodebaseContext
-from graph_sitter.core.dataclasses.usage import UsageKind, UsageType
+from graph_sitter.core.dataclasses.usage import UsageKind as UsageKind
+from graph_sitter.core.dataclasses.usage import UsageType
 from graph_sitter.core.interfaces.editable import Editable
 from graph_sitter.core.interfaces.has_name import HasName
 
 NodeType = TypeVar("NodeType")
 
 @dataclass
-class ResolutionStack(Generic[NodeType]):
+class ResolutionStack[NodeType]:
     """Represents the resolution stack from a symbol to a usage
 
     Symbol
diff --git a/src/graph_sitter/compiled/sort.pyi b/src/graph_sitter/compiled/sort.pyi
@@ -0,0 +1,19 @@
+from collections.abc import Iterable
+
+from tree_sitter import Node as TSNode
+from typing_extensions import TypeVar
+
+from graph_sitter.core.interfaces.editable import Editable
+
+E = TypeVar("E", bound=Editable)
+
+def sort_editables(
+    nodes: Iterable[E | None] | Iterable[E],
+    *,
+    reverse: bool = False,
+    dedupe: bool = True,
+    alphabetical: bool = False,
+    by_file: bool = False,
+    by_id: bool = False,
+) -> list[E]: ...
+def sort_nodes(nodes: Iterable[TSNode | None] | Iterable[TSNode], *, reverse: bool = False, dedupe: bool = True) -> list[TSNode]: ...
diff --git a/src/graph_sitter/compiled/utils.pyi b/src/graph_sitter/compiled/utils.pyi
@@ -4,6 +4,8 @@ from functools import lru_cache as functools_lru_cache
 
 from tree_sitter import Node as TSNode
 
+TSNode = TSNode
+
 def get_all_identifiers(node: TSNode) -> list[TSNode]:
     """Get all the identifiers in a tree-sitter node. Recursive implementation"""
 
diff --git a/src/graph_sitter/core/autocommit/decorators.py b/src/graph_sitter/core/autocommit/decorators.py
diff --git a/uv.lock b/uv.lock
