lintcn 0.2.0 → 0.3.0

package/dist/commands/add.js

@@ -6,32 +6,48 @@ import path from 'node:path';
 import { getLintcnDir } from "../paths.js";
 import { generateEditorGoFiles } from "../codegen.js";
 import { ensureTsgolintSource, DEFAULT_TSGOLINT_VERSION } from "../cache.js";
+/** Convert GitHub blob URLs to raw.githubusercontent.com.
+ *  Handles branch names containing slashes (e.g. feature/x) by splitting
+ *  on /blob/ then finding the file path from the end (must end in .go). */
 function normalizeGithubUrl(url) {
-    // Convert github.com/user/repo/blob/branch/path to raw.githubusercontent.com
-    const blobMatch = url.match(/^https?:\/\/github\.com\/([^/]+)\/([^/]+)\/blob\/([^/]+)\/(.+)$/);
-    if (blobMatch) {
-        const [, owner, repo, branch, filePath] = blobMatch;
-        return `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${filePath}`;
+    const blobSplit = url.match(/^(https?:\/\/github\.com\/[^/]+\/[^/]+)\/blob\/(.+)$/);
+    if (!blobSplit) {
+        return url;
     }
-    return url;
+    const [, repoUrl, refAndPath] = blobSplit;
+    // repoUrl = "https://github.com/owner/repo"
+    // refAndPath = "feature/x/rules/my_rule.go" or "main/rules/my_rule.go"
+    // Extract owner/repo from repoUrl
+    const repoMatch = repoUrl.match(/github\.com\/([^/]+)\/([^/]+)$/);
+    if (!repoMatch) {
+        return url;
+    }
+    const [, owner, repo] = repoMatch;
+    // For raw.githubusercontent.com, the format is owner/repo/ref/path.
+    // We can pass refAndPath directly since GitHub resolves it.
+    return `https://raw.githubusercontent.com/${owner}/${repo}/${refAndPath}`;
 }
 function deriveTestUrl(rawUrl) {
     return rawUrl.replace(/\.go$/, '_test.go');
 }
 async function fetchFile(url) {
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(`Failed to fetch ${url}: ${response.status} ${response.statusText}`);
+    }
+    return response.text();
+}
+async function tryFetchFile(url) {
     try {
-        const response = await fetch(url);
-        if (!response.ok) {
-            return null;
-        }
-        return await response.text();
+        return await fetchFile(url);
     }
     catch {
         return null;
     }
 }
 function rewritePackageName(content) {
-    // Rewrite first package declaration to package lintcn
+    // Rewrite first package declaration to package lintcn.
+    // Only matches before the first import or func to avoid touching comments.
     return content.replace(/^package\s+\w+/m, 'package lintcn');
 }
 function ensureSourceComment(content, sourceUrl) {
@@ -56,9 +72,6 @@ export async function addRule(url) {
     const rawUrl = normalizeGithubUrl(url);
     console.log(`Fetching ${rawUrl}...`);
     const content = await fetchFile(rawUrl);
-    if (!content) {
-        throw new Error(`Could not fetch rule from ${rawUrl}`);
-    }
     // validate it looks like a Go file with a rule
     if (!content.includes('rule.Rule')) {
         console.warn('Warning: no rule.Rule reference found in this file. Are you sure this is a tsgolint rule?');
@@ -82,7 +95,7 @@ export async function addRule(url) {
     console.log(`Added ${fileName}`);
     // try to fetch matching test file
     const testUrl = deriveTestUrl(rawUrl);
-    const testContent = await fetchFile(testUrl);
+    const testContent = await tryFetchFile(testUrl);
     if (testContent) {
         const testFileName = fileName.replace(/\.go$/, '_test.go');
         const testProcessed = rewritePackageName(testContent);

package/dist/commands/lint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"AAuBA,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,eAAe,GAChB,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoDlB;AAED,wBAAsB,IAAI,CAAC,EACzB,OAAO,EACP,eAAe,EACf,eAAe,GAChB,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,MAAM,EAAE,CAAA;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBlB"}
+{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"AAuBA,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,eAAe,GAChB,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiDlB;AAED,wBAAsB,IAAI,CAAC,EACzB,OAAO,EACP,eAAe,EACf,eAAe,GAChB,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,MAAM,EAAE,CAAA;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAkBlB"}

package/dist/commands/lint.js

@@ -2,7 +2,7 @@
 // Handles Go workspace generation, compilation with caching, and execution.
 import fs from 'node:fs';
 import { spawn } from 'node:child_process';
-import { getLintcnDir } from "../paths.js";
+import { requireLintcnDir } from "../paths.js";
 import { discoverRules } from "../discover.js";
 import { generateBuildWorkspace } from "../codegen.js";
 import { ensureTsgolintSource, cachedBinaryExists, getBinaryPath, getBuildDir, getBinDir } from "../cache.js";
@@ -19,10 +19,7 @@ async function checkGoInstalled() {
 }
 export async function buildBinary({ rebuild, tsgolintVersion, }) {
     await checkGoInstalled();
-    const lintcnDir = getLintcnDir();
-    if (!fs.existsSync(lintcnDir)) {
-        throw new Error('No .lintcn/ directory found. Run `lintcn add <url>` first.');
-    }
+    const lintcnDir = requireLintcnDir();
     const rules = discoverRules(lintcnDir);
     if (rules.length === 0) {
         throw new Error('No rules found in .lintcn/. Run `lintcn add <url>` to add rules.');

package/dist/commands/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"AAMA,wBAAgB,SAAS,IAAI,IAAI,CA0BhC"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"AAKA,wBAAgB,SAAS,IAAI,IAAI,CA0BhC"}

package/dist/commands/list.js

@@ -1,10 +1,9 @@
 // lintcn list — list installed rules with metadata from .lintcn/
-import fs from 'node:fs';
-import { getLintcnDir } from "../paths.js";
+import { findLintcnDir } from "../paths.js";
 import { discoverRules } from "../discover.js";
 export function listRules() {
-    const lintcnDir = getLintcnDir();
-    if (!fs.existsSync(lintcnDir)) {
+    const lintcnDir = findLintcnDir();
+    if (!lintcnDir) {
         console.log('No .lintcn/ directory found. Run `lintcn add <url>` to add rules.');
         return;
     }

package/dist/commands/remove.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../src/commands/remove.ts"],"names":[],"mappings":"AAOA,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAiC7C"}
+{"version":3,"file":"remove.d.ts","sourceRoot":"","sources":["../../src/commands/remove.ts"],"names":[],"mappings":"AAOA,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CA6B7C"}

package/dist/commands/remove.js

@@ -1,13 +1,10 @@
 // lintcn remove <name> — delete a rule and its test file from .lintcn/
 import fs from 'node:fs';
 import path from 'node:path';
-import { getLintcnDir } from "../paths.js";
+import { requireLintcnDir } from "../paths.js";
 import { discoverRules } from "../discover.js";
 export function removeRule(name) {
-    const lintcnDir = getLintcnDir();
-    if (!fs.existsSync(lintcnDir)) {
-        throw new Error('No .lintcn/ directory found.');
-    }
+    const lintcnDir = requireLintcnDir();
     // match by lintcn:name metadata or by filename
     const rules = discoverRules(lintcnDir);
     const normalizedName = name.replace(/-/g, '_');

package/dist/discover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discover.d.ts","sourceRoot":"","sources":["../src/discover.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,YAAY;IAC3B,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAA;IACZ,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAA;IACnB,gDAAgD;IAChD,MAAM,EAAE,MAAM,CAAA;IACd,4DAA4D;IAC5D,OAAO,EAAE,MAAM,CAAA;IACf,oCAAoC;IACpC,QAAQ,EAAE,MAAM,CAAA;CACjB;AAKD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMrE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGhE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE,CAiC/D"}
+{"version":3,"file":"discover.d.ts","sourceRoot":"","sources":["../src/discover.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,YAAY;IAC3B,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAA;IACZ,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAA;IACnB,gDAAgD;IAChD,MAAM,EAAE,MAAM,CAAA;IACd,4DAA4D;IAC5D,OAAO,EAAE,MAAM,CAAA;IACf,oCAAoC;IACpC,QAAQ,EAAE,MAAM,CAAA;CACjB;AAOD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMrE;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGhE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE,CAwC/D"}

package/dist/discover.js

@@ -2,7 +2,9 @@
 // Returns structured info about each discovered rule for codegen and list display.
 import fs from 'node:fs';
 import path from 'node:path';
-const RULE_VAR_RE = /^var\s+(\w+)\s*=\s*rule\.Rule\s*\{/m;
+// Matches `var XxxRule = rule.Rule{` with optional leading whitespace
+// and optional import alias (e.g. `r.Rule{` if imported as `r "...rule"`)
+const RULE_VAR_RE = /^\s*var\s+(\w+)\s*=\s*\w*\.?Rule\s*\{/m;
 const METADATA_RE = /^\/\/\s*lintcn:(\w+)\s+(.+)$/gm;
 export function parseMetadata(content) {
     const meta = {};
@@ -28,6 +30,11 @@ export function discoverRules(lintcnDir) {
         const content = fs.readFileSync(filePath, 'utf-8');
         const varName = parseRuleVar(content);
         if (!varName) {
+            // warn if file contains rule.Rule but we couldn't parse the var name
+            if (content.includes('rule.Rule')) {
+                console.warn(`Warning: ${fileName} contains rule.Rule but no exported var was found. ` +
+                    `Expected pattern: var XxxRule = rule.Rule{`);
+            }
             continue;
         }
         const meta = parseMetadata(content);

package/dist/hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":"AASA,wBAAsB,kBAAkB,CAAC,EACvC,SAAS,EACT,eAAe,GAChB,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,CAAA;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CA6BlB"}
+{"version":3,"file":"hash.d.ts","sourceRoot":"","sources":["../src/hash.ts"],"names":[],"mappings":"AAaA,wBAAsB,kBAAkB,CAAC,EACvC,SAAS,EACT,eAAe,GAChB,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,CAAA;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CA8BlB"}

package/dist/hash.js

@@ -1,12 +1,16 @@
 // Content hash for binary caching.
-// Combines tsgolint version, rule file contents, Go version, and platform
-// into a single SHA-256 hash used as the cached binary filename.
+// Combines cache schema version, tsgolint version, rule file contents,
+// Go version, and platform into a single SHA-256 hash.
+// Bump CACHE_SCHEMA_VERSION when codegen logic changes to invalidate
+// stale binaries built by older lintcn versions.
 import crypto from 'node:crypto';
 import fs from 'node:fs';
 import path from 'node:path';
 import { execAsync } from "./exec.js";
+const CACHE_SCHEMA_VERSION = '2';
 export async function computeContentHash({ lintcnDir, tsgolintVersion, }) {
     const hash = crypto.createHash('sha256');
+    hash.update(`cache-schema:${CACHE_SCHEMA_VERSION}\n`);
     hash.update(`tsgolint:${tsgolintVersion}\n`);
     hash.update(`platform:${process.platform}-${process.arch}\n`);
     // add Go version

package/dist/index.d.ts

@@ -5,4 +5,5 @@ export { lint, buildBinary } from './commands/lint.ts';
 export { listRules } from './commands/list.ts';
 export { removeRule } from './commands/remove.ts';
 export { DEFAULT_TSGOLINT_VERSION } from './cache.ts';
+export { findLintcnDir, getLintcnDir, requireLintcnDir } from './paths.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC1E,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC1E,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA"}

package/dist/index.js

@@ -4,3 +4,4 @@ export { lint, buildBinary } from "./commands/lint.js";
 export { listRules } from "./commands/list.js";
 export { removeRule } from "./commands/remove.js";
 export { DEFAULT_TSGOLINT_VERSION } from "./cache.js";
+export { findLintcnDir, getLintcnDir, requireLintcnDir } from "./paths.js";

package/dist/paths.d.ts

@@ -1,2 +1,8 @@
+/** Find the nearest .lintcn/ directory by walking up from cwd.
+ *  Returns the absolute path to the directory, or null if not found. */
+export declare function findLintcnDir(): string | null;
+/** Find .lintcn/ or throw with a helpful error. */
 export declare function getLintcnDir(): string;
+/** Find .lintcn/ or throw — for commands that require it to exist. */
+export declare function requireLintcnDir(): string;
 //# sourceMappingURL=paths.d.ts.map

package/dist/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAIA,wBAAgB,YAAY,IAAI,MAAM,CAErC"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAMA;wEACwE;AACxE,wBAAgB,aAAa,IAAI,MAAM,GAAG,IAAI,CAG7C;AAED,mDAAmD;AACnD,wBAAgB,YAAY,IAAI,MAAM,CAOrC;AAED,sEAAsE;AACtE,wBAAgB,gBAAgB,IAAI,MAAM,CAMzC"}

package/dist/paths.js

@@ -1,5 +1,27 @@
-// Resolve the .lintcn/ directory path relative to cwd.
+// Resolve the .lintcn/ directory by walking up from cwd.
+// This lets users run `lintcn lint` from any subdirectory of their project.
+import { findUpSync } from 'find-up';
 import path from 'node:path';
+/** Find the nearest .lintcn/ directory by walking up from cwd.
+ *  Returns the absolute path to the directory, or null if not found. */
+export function findLintcnDir() {
+    const found = findUpSync('.lintcn', { type: 'directory' });
+    return found ?? null;
+}
+/** Find .lintcn/ or throw with a helpful error. */
 export function getLintcnDir() {
+    const dir = findLintcnDir();
+    if (dir) {
+        return dir;
+    }
+    // fall back to cwd/.lintcn for `lintcn add` (creates the directory)
     return path.resolve(process.cwd(), '.lintcn');
 }
+/** Find .lintcn/ or throw — for commands that require it to exist. */
+export function requireLintcnDir() {
+    const dir = findLintcnDir();
+    if (!dir) {
+        throw new Error('No .lintcn/ directory found in current or parent directories. Run `lintcn add <url>` first.');
+    }
+    return dir;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lintcn",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "description": "The shadcn for type-aware TypeScript lint rules. Browse, pick, and copy rules into your project.",
   "bin": "dist/cli.js",
@@ -54,6 +54,7 @@
     "typescript": "5.8.2"
   },
   "dependencies": {
+    "find-up": "^8.0.0",
     "goke": "^6.3.0"
   },
   "scripts": {

package/src/cache.ts

@@ -1,11 +1,16 @@
-// Manage cached tsgolint source clone and compiled binaries.
-// Cache lives in ~/.cache/lintcn/ with structure:
-//   tsgolint/<version>/   — cloned tsgolint source (read-only)
-//   bin/<content-hash>    — compiled binaries
+// Manage cached tsgolint source and compiled binaries.
+// Downloads tsgolint + typescript-go as tarballs from GitHub (no git required),
+// applies patches with `patch -p1`, and copies internal/collections.
+//
+// Cache layout:
+//   ~/.cache/lintcn/tsgolint/<version>/   — extracted source (read-only)
+//   ~/.cache/lintcn/bin/<content-hash>    — compiled binaries
 
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
+import { pipeline } from 'node:stream/promises'
+import { createGunzip } from 'node:zlib'
 import { execAsync } from './exec.ts'
 
 // Pinned tsgolint version — updated with each lintcn release.
@@ -14,6 +19,11 @@ import { execAsync } from './exec.ts'
 // decision — tsgolint API changes can break user rules.
 export const DEFAULT_TSGOLINT_VERSION = 'v0.9.2'
 
+// Pinned typescript-go commit that tsgolint v0.9.2 depends on.
+// Found via `git ls-tree HEAD typescript-go` in the tsgolint repo.
+// Must be updated when DEFAULT_TSGOLINT_VERSION changes.
+const TYPESCRIPT_GO_COMMIT = '2437fa43e85103d2a18e8e41e1a2a994d0708ccf'
+
 export function getCacheDir(): string {
   return path.join(os.homedir(), '.cache', 'lintcn')
 }
@@ -34,6 +44,43 @@ export function getBuildDir(): string {
   return path.join(getCacheDir(), 'build')
 }
 
+/** Download a tarball from URL and extract it to targetDir.
+ *  GitHub tarballs have a top-level directory like `repo-ref/`,
+ *  so we strip the first path component during extraction. */
+async function downloadAndExtract(url: string, targetDir: string): Promise<void> {
+  const response = await fetch(url)
+  if (!response.ok || !response.body) {
+    throw new Error(`Failed to download ${url}: ${response.status} ${response.statusText}`)
+  }
+
+  fs.mkdirSync(targetDir, { recursive: true })
+
+  // pipe through gunzip, then extract with tar (strip top-level directory)
+  const tmpTarGz = path.join(os.tmpdir(), `lintcn-${Date.now()}.tar.gz`)
+  const fileStream = fs.createWriteStream(tmpTarGz)
+  // @ts-ignore ReadableStream vs NodeJS.ReadableStream mismatch
+  await pipeline(response.body, fileStream)
+
+  await execAsync('tar', ['xzf', tmpTarGz, '--strip-components=1', '-C', targetDir])
+  fs.rmSync(tmpTarGz, { force: true })
+}
+
+/** Apply git-format patches using `patch -p1` (no git required).
+ *  Patches are standard unified diff format, `patch` ignores the git metadata. */
+async function applyPatches(patchesDir: string, targetDir: string): Promise<number> {
+  const patches = fs.readdirSync(patchesDir)
+    .filter((f) => { return f.endsWith('.patch') })
+    .sort()
+
+  for (const patchFile of patches) {
+    const patchPath = path.join(patchesDir, patchFile)
+    // --batch silences interactive prompts, -f forces application
+    await execAsync('patch', ['-p1', '--batch', '-i', patchPath], { cwd: targetDir })
+  }
+
+  return patches.length
+}
+
 export async function ensureTsgolintSource(version: string): Promise<string> {
   const sourceDir = getTsgolintSourceDir(version)
   const readyMarker = path.join(sourceDir, '.lintcn-ready')
@@ -42,56 +89,56 @@ export async function ensureTsgolintSource(version: string): Promise<string> {
     return sourceDir
   }
 
-  console.log(`Cloning tsgolint@${version}...`)
-
-  fs.mkdirSync(sourceDir, { recursive: true })
-
-  // clone with depth 1 for speed — --branch works with tags and branches
-  const cloneArgs = [
-    'clone', '--depth', '1',
-    '--branch', version,
-    '--recurse-submodules', '--shallow-submodules',
-    'https://github.com/oxc-project/tsgolint.git', sourceDir,
-  ]
-
-  await execAsync('git', cloneArgs)
+  // clean up any partial previous attempt so we start fresh
+  if (fs.existsSync(sourceDir)) {
+    fs.rmSync(sourceDir, { recursive: true })
+  }
 
-  // apply patches if they exist
-  const patchesDir = path.join(sourceDir, 'patches')
-  if (fs.existsSync(patchesDir)) {
-    const patches = fs.readdirSync(patchesDir).filter((f) => {
-      return f.endsWith('.patch')
-    }).sort()
+  try {
+    // download tsgolint source tarball
+    console.log(`Downloading tsgolint@${version}...`)
+    const tsgolintUrl = `https://github.com/oxc-project/tsgolint/archive/refs/tags/${version}.tar.gz`
+    await downloadAndExtract(tsgolintUrl, sourceDir)
+
+    // download typescript-go source tarball into tsgolint/typescript-go/
+    const tsGoDir = path.join(sourceDir, 'typescript-go')
+    console.log('Downloading typescript-go...')
+    const tsGoUrl = `https://github.com/microsoft/typescript-go/archive/${TYPESCRIPT_GO_COMMIT}.tar.gz`
+    await downloadAndExtract(tsGoUrl, tsGoDir)
+
+    // apply patches to typescript-go
+    const patchesDir = path.join(sourceDir, 'patches')
+    if (fs.existsSync(patchesDir)) {
+      const count = await applyPatches(patchesDir, tsGoDir)
+      if (count > 0) {
+        console.log(`Applied ${count} patches`)
+      }
+    }
 
-    if (patches.length > 0) {
-      console.log(`Applying ${patches.length} patches...`)
-      const patchPaths = patches.map((p) => {
-        return path.join('..', 'patches', p)
-      })
-      await execAsync('git', ['am', '--3way', '--no-gpg-sign', ...patchPaths], {
-        cwd: path.join(sourceDir, 'typescript-go'),
+    // copy internal/collections from typescript-go (required by tsgolint, done by `just init`)
+    const collectionsDir = path.join(sourceDir, 'internal', 'collections')
+    const tsGoCollections = path.join(tsGoDir, 'internal', 'collections')
+    if (fs.existsSync(tsGoCollections)) {
+      fs.mkdirSync(collectionsDir, { recursive: true })
+      const files = fs.readdirSync(tsGoCollections).filter((f) => {
+        return f.endsWith('.go') && !f.endsWith('_test.go')
       })
+      for (const file of files) {
+        fs.copyFileSync(path.join(tsGoCollections, file), path.join(collectionsDir, file))
+      }
     }
-  }
 
-  // copy internal/collections from typescript-go (required by tsgolint, done by `just init`)
-  const collectionsDir = path.join(sourceDir, 'internal', 'collections')
-  const tsGoCollections = path.join(sourceDir, 'typescript-go', 'internal', 'collections')
-  if (!fs.existsSync(collectionsDir) && fs.existsSync(tsGoCollections)) {
-    fs.mkdirSync(collectionsDir, { recursive: true })
-    const files = fs.readdirSync(tsGoCollections).filter((f) => {
-      return f.endsWith('.go') && !f.endsWith('_test.go')
-    })
-    for (const file of files) {
-      fs.copyFileSync(path.join(tsGoCollections, file), path.join(collectionsDir, file))
+    // write ready marker
+    fs.writeFileSync(readyMarker, new Date().toISOString())
+    console.log('tsgolint source ready')
+  } catch (err) {
+    // clean up partial download so next run starts fresh
+    if (fs.existsSync(sourceDir)) {
+      fs.rmSync(sourceDir, { recursive: true })
     }
-    console.log(`Copied ${files.length} collection files`)
+    throw err
   }
 
-  // write ready marker
-  fs.writeFileSync(readyMarker, new Date().toISOString())
-  console.log('tsgolint source ready')
-
   return sourceDir
 }