@tested/cli 0.1.6 → 0.1.7

package/README.md

@@ -25,7 +25,7 @@ CI uses the composite Action (`tested-hq/cli/action@main`). It installs `@tested
 ```yaml
 - uses: tested-hq/cli/action@main
   with:
-    version: 0.1.6
+    version: 0.1.7
     token: ${{ secrets.TESTED_TOKEN }}
 ```
 
@@ -135,7 +135,7 @@ If `thresholds` is missing from `.tested.yaml`, `tested check` prints a notice o
 ```yaml
 - uses: tested-hq/cli/action@main
   with:
-    version: 0.1.6
+    version: 0.1.7
     push: true
     pr-number: ${{ github.event.pull_request.number }}
     token: ${{ secrets.TESTED_TOKEN }}

package/dist/td.js

@@ -631,6 +631,25 @@ import { resolve as resolve3 } from "path";
 
 // src/git.ts
 import { simpleGit as simpleGit2 } from "simple-git";
+
+// src/git-ref.ts
+var SAFE_GIT_REF_RE = /^[A-Za-z0-9_./@~^-]{1,256}$/;
+function assertSafeGitRef(ref) {
+  if (!ref) {
+    throw new Error("git ref must not be empty");
+  }
+  if (ref.startsWith("-")) {
+    throw new Error(`git ref must not start with '-': ${ref}`);
+  }
+  if (!SAFE_GIT_REF_RE.test(ref)) {
+    throw new Error(
+      `git ref contains invalid characters or is too long (max 256): ${ref}`
+    );
+  }
+  return ref;
+}
+
+// src/git.ts
 async function openRepo(cwd) {
   const git = simpleGit2({ baseDir: cwd });
   const repoRoot = (await git.revparse(["--show-toplevel"])).trim();
@@ -669,6 +688,28 @@ async function resolveEffectiveBase(ctx, requested) {
 async function headSha(ctx) {
   return (await ctx.git.revparse(["HEAD"])).trim();
 }
+async function fetchOriginRef(ctx, ref) {
+  const spec = ref.startsWith("origin/") ? ref.slice("origin/".length) : ref;
+  try {
+    assertSafeGitRef(spec);
+  } catch {
+    return false;
+  }
+  try {
+    await ctx.git.raw(["fetch", "--depth=1", "origin", spec]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function resolveAfterFetch(ctx, ref) {
+  if (await tryRevparse(ctx, ref)) return ref;
+  if (!ref.startsWith("origin/")) {
+    const originRef = `origin/${ref}`;
+    if (await tryRevparse(ctx, originRef)) return originRef;
+  }
+  return tryRevparse(ctx, "FETCH_HEAD");
+}
 async function unifiedDiff(ctx, base) {
   try {
     const mergeBase = (await ctx.git.raw(["merge-base", base, "HEAD"])).trim();
@@ -699,23 +740,6 @@ async function gitUserName(ctx) {
   }
 }
 
-// src/git-ref.ts
-var SAFE_GIT_REF_RE = /^[A-Za-z0-9_./@~^-]{1,256}$/;
-function assertSafeGitRef(ref) {
-  if (!ref) {
-    throw new Error("git ref must not be empty");
-  }
-  if (ref.startsWith("-")) {
-    throw new Error(`git ref must not start with '-': ${ref}`);
-  }
-  if (!SAFE_GIT_REF_RE.test(ref)) {
-    throw new Error(
-      `git ref contains invalid characters or is too long (max 256): ${ref}`
-    );
-  }
-  return ref;
-}
-
 // src/core/istanbul.ts
 import { readFile as readFile2 } from "fs/promises";
 import { isAbsolute, relative, resolve } from "path";
@@ -1170,6 +1194,125 @@ function sanitizeAuthor(name) {
 function toBranchName(ref) {
   return ref.replace(/^refs\/heads\//, "").replace(/^refs\/remotes\//, "").replace(/^origin\//, "");
 }
+var GITHUB_COMMIT_SHA_RE = /^[0-9a-f]{40,64}$/i;
+function githubApiToken(env) {
+  const raw = env.GITHUB_TOKEN ?? env.GH_TOKEN;
+  if (raw === void 0 || raw === "") return null;
+  return raw;
+}
+function parseGitHubPullBase(parsed) {
+  if (!parsed || typeof parsed !== "object" || !("base" in parsed)) return null;
+  const base = parsed.base;
+  if (!base || typeof base !== "object") return null;
+  const ref = "ref" in base ? base.ref : void 0;
+  const sha = "sha" in base ? base.sha : void 0;
+  if (typeof ref !== "string" || typeof sha !== "string") return null;
+  if (!GITHUB_COMMIT_SHA_RE.test(sha)) return null;
+  try {
+    return { ref: assertSafeGitRef(ref), sha: assertSafeGitRef(sha) };
+  } catch {
+    return null;
+  }
+}
+async function fetchGitHubPullBase(opts) {
+  if (!parseGitHubRepository(`${opts.owner}/${opts.name}`)) return null;
+  if (!Number.isInteger(opts.prNumber) || opts.prNumber <= 0) return null;
+  const fetchFn = opts.fetchFn ?? globalThis.fetch;
+  const url = `https://api.github.com/repos/${opts.owner}/${opts.name}/pulls/${opts.prNumber}`;
+  const headers = {
+    Accept: "application/vnd.github+json",
+    "X-GitHub-Api-Version": "2022-11-28",
+    "User-Agent": "tested-cli"
+  };
+  const token = githubApiToken(opts.env ?? process.env);
+  if (token) headers.Authorization = `Bearer ${token}`;
+  let res;
+  try {
+    res = await fetchFn(url, { method: "GET", redirect: "manual", headers });
+  } catch {
+    return null;
+  }
+  if (res.status !== 200) return null;
+  try {
+    return parseGitHubPullBase(JSON.parse(await res.text()));
+  } catch {
+    return null;
+  }
+}
+async function resolvePrPushBase(opts) {
+  let requested;
+  try {
+    requested = assertSafeGitRef(opts.requested);
+  } catch {
+    return void 0;
+  }
+  if (await tryRevparse(opts.ctx, requested)) return requested;
+  const branch = toBranchName(requested) || "main";
+  const originRef = `origin/${branch}`;
+  if (originRef !== requested && await tryRevparse(opts.ctx, originRef)) {
+    return originRef;
+  }
+  let prBase = null;
+  if (opts.owner && opts.name) {
+    prBase = await fetchGitHubPullBase({
+      owner: opts.owner,
+      name: opts.name,
+      prNumber: opts.prNumber,
+      ...opts.fetchFn ? { fetchFn: opts.fetchFn } : {},
+      ...opts.env ? { env: opts.env } : {}
+    });
+  }
+  if (prBase && await tryRevparse(opts.ctx, prBase.sha)) return prBase.sha;
+  const fetchTargets = [];
+  if (prBase) {
+    fetchTargets.push(prBase.sha, prBase.ref);
+  }
+  fetchTargets.push(branch);
+  let announced = false;
+  const seen = /* @__PURE__ */ new Set();
+  for (const target of fetchTargets) {
+    if (seen.has(target)) continue;
+    seen.add(target);
+    let spec;
+    try {
+      spec = assertSafeGitRef(target);
+    } catch {
+      continue;
+    }
+    if (!announced) {
+      announced = true;
+      opts.onProgress?.("fetching base\u2026");
+    }
+    if (!await fetchOriginRef(opts.ctx, spec)) continue;
+    const resolved = await resolveAfterFetch(opts.ctx, spec);
+    if (resolved) return resolved;
+    if (prBase && await tryRevparse(opts.ctx, prBase.sha)) return prBase.sha;
+  }
+  return void 0;
+}
+async function peekRepoIdentity(opts) {
+  let owner = opts.owner;
+  let name = opts.name;
+  if (!owner || !name) {
+    const fromActions = parseGitHubRepository(opts.env.GITHUB_REPOSITORY);
+    if (fromActions) {
+      owner = owner ?? fromActions.owner;
+      name = name ?? fromActions.name;
+    }
+  }
+  if (!owner || !name) {
+    try {
+      const origin = await remoteUrl(opts.ctx, "origin");
+      const parsed = parseGitHubRemote(origin);
+      if (parsed) {
+        owner = owner ?? parsed.owner;
+        name = name ?? parsed.name;
+      }
+    } catch {
+    }
+  }
+  return { owner: owner ?? null, name: name ?? null };
+}
 function buildIngestBody(input) {
   const baseRefName = toBranchName(input.baseRef);
   return {
@@ -1362,16 +1505,16 @@ function formatMissingTokenError(opts) {
     "or pass --token <token> (avoid on shared hosts: visible in ps)"
   ]);
 }
-function formatPushError(status, message, code) {
+function formatPushError(status, message, code, identity) {
   if (status === 0) {
     return errorBlock(message);
   }
   const normalized = (code ?? message).toLowerCase();
-  if (normalized.includes("token_required") || normalized.includes("invalid token") || normalized.includes("unauthorized") || status === 401) {
+  if (normalized.includes("token_required") || normalized.includes("invalid token") || normalized.includes("unauthorized") || normalized.includes("invalid credentials") || status === 401) {
     return errorBlock("ingest auth failed", [
       message,
       "",
-      ...tokenMintGuidance(),
+      ...tokenMintGuidance(identity),
       "or --token"
     ]);
   }
@@ -1460,21 +1603,41 @@ async function executePush(cli, deps) {
   }
   const config = await loadConfigFn({ cwd: deps.cwd });
   const ctx = await openRepoFn(deps.cwd);
-  onProgress("computing diff\u2026");
+  const peeked = await peekRepoIdentity({
+    ...cli.owner !== void 0 ? { owner: cli.owner } : {},
+    ...cli.name !== void 0 ? { name: cli.name } : {},
+    env,
+    ctx
+  });
   let diff;
   try {
+    let baseOverride = cli.base;
+    if (baseOverride === void 0 && prNumber !== null) {
+      const resolved = await resolvePrPushBase({
+        ctx,
+        requested: config.base,
+        prNumber,
+        ...peeked.owner != null ? { owner: peeked.owner } : {},
+        ...peeked.name != null ? { name: peeked.name } : {},
+        fetchFn,
+        env,
+        onProgress
+      });
+      if (resolved !== void 0) baseOverride = resolved;
+    }
+    onProgress("computing diff\u2026");
     diff = await computeDiffFn({
       cwd: deps.cwd,
       config,
-      ...cli.base !== void 0 ? { baseRef: cli.base } : {},
+      ...baseOverride !== void 0 ? { baseRef: baseOverride } : {},
       ctx
     });
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     return { exitCode: 1, stdout: "", stderr: errorBlock(message) };
   }
-  let owner = cli.owner;
-  let name = cli.name;
+  let owner = cli.owner ?? peeked.owner ?? void 0;
+  let name = cli.name ?? peeked.name ?? void 0;
   if (!owner || !name) {
     const fromActions = parseGitHubRepository(env.GITHUB_REPOSITORY);
     if (fromActions) {
@@ -1562,7 +1725,10 @@ async function executePush(cli, deps) {
     return {
       exitCode: 1,
       stdout: "",
-      stderr: formatPushError(result.status, result.message, result.code)
+      stderr: formatPushError(result.status, result.message, result.code, {
+        owner,
+        name
+      })
     };
   }
   const formatted = formatPushSuccess(result.data, cli.json);
@@ -1961,7 +2127,7 @@ import pc3 from "picocolors";
 // package.json
 var package_default = {
   name: "@tested/cli",
-  version: "0.1.6",
+  version: "0.1.7",
   description: "Coverage your agent can use. CLI for patch + project coverage with agent-readable JSON output.",
   license: "MIT",
   homepage: "https://tested.dev",

package/dist/tested.js

@@ -631,6 +631,25 @@ import { resolve as resolve3 } from "path";
 
 // src/git.ts
 import { simpleGit as simpleGit2 } from "simple-git";
+
+// src/git-ref.ts
+var SAFE_GIT_REF_RE = /^[A-Za-z0-9_./@~^-]{1,256}$/;
+function assertSafeGitRef(ref) {
+  if (!ref) {
+    throw new Error("git ref must not be empty");
+  }
+  if (ref.startsWith("-")) {
+    throw new Error(`git ref must not start with '-': ${ref}`);
+  }
+  if (!SAFE_GIT_REF_RE.test(ref)) {
+    throw new Error(
+      `git ref contains invalid characters or is too long (max 256): ${ref}`
+    );
+  }
+  return ref;
+}
+
+// src/git.ts
 async function openRepo(cwd) {
   const git = simpleGit2({ baseDir: cwd });
   const repoRoot = (await git.revparse(["--show-toplevel"])).trim();
@@ -669,6 +688,28 @@ async function resolveEffectiveBase(ctx, requested) {
 async function headSha(ctx) {
   return (await ctx.git.revparse(["HEAD"])).trim();
 }
+async function fetchOriginRef(ctx, ref) {
+  const spec = ref.startsWith("origin/") ? ref.slice("origin/".length) : ref;
+  try {
+    assertSafeGitRef(spec);
+  } catch {
+    return false;
+  }
+  try {
+    await ctx.git.raw(["fetch", "--depth=1", "origin", spec]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function resolveAfterFetch(ctx, ref) {
+  if (await tryRevparse(ctx, ref)) return ref;
+  if (!ref.startsWith("origin/")) {
+    const originRef = `origin/${ref}`;
+    if (await tryRevparse(ctx, originRef)) return originRef;
+  }
+  return tryRevparse(ctx, "FETCH_HEAD");
+}
 async function unifiedDiff(ctx, base) {
   try {
     const mergeBase = (await ctx.git.raw(["merge-base", base, "HEAD"])).trim();
@@ -699,23 +740,6 @@ async function gitUserName(ctx) {
   }
 }
 
-// src/git-ref.ts
-var SAFE_GIT_REF_RE = /^[A-Za-z0-9_./@~^-]{1,256}$/;
-function assertSafeGitRef(ref) {
-  if (!ref) {
-    throw new Error("git ref must not be empty");
-  }
-  if (ref.startsWith("-")) {
-    throw new Error(`git ref must not start with '-': ${ref}`);
-  }
-  if (!SAFE_GIT_REF_RE.test(ref)) {
-    throw new Error(
-      `git ref contains invalid characters or is too long (max 256): ${ref}`
-    );
-  }
-  return ref;
-}
-
 // src/core/istanbul.ts
 import { readFile as readFile2 } from "fs/promises";
 import { isAbsolute, relative, resolve } from "path";
@@ -1170,6 +1194,125 @@ function sanitizeAuthor(name) {
 function toBranchName(ref) {
   return ref.replace(/^refs\/heads\//, "").replace(/^refs\/remotes\//, "").replace(/^origin\//, "");
 }
+var GITHUB_COMMIT_SHA_RE = /^[0-9a-f]{40,64}$/i;
+function githubApiToken(env) {
+  const raw = env.GITHUB_TOKEN ?? env.GH_TOKEN;
+  if (raw === void 0 || raw === "") return null;
+  return raw;
+}
+function parseGitHubPullBase(parsed) {
+  if (!parsed || typeof parsed !== "object" || !("base" in parsed)) return null;
+  const base = parsed.base;
+  if (!base || typeof base !== "object") return null;
+  const ref = "ref" in base ? base.ref : void 0;
+  const sha = "sha" in base ? base.sha : void 0;
+  if (typeof ref !== "string" || typeof sha !== "string") return null;
+  if (!GITHUB_COMMIT_SHA_RE.test(sha)) return null;
+  try {
+    return { ref: assertSafeGitRef(ref), sha: assertSafeGitRef(sha) };
+  } catch {
+    return null;
+  }
+}
+async function fetchGitHubPullBase(opts) {
+  if (!parseGitHubRepository(`${opts.owner}/${opts.name}`)) return null;
+  if (!Number.isInteger(opts.prNumber) || opts.prNumber <= 0) return null;
+  const fetchFn = opts.fetchFn ?? globalThis.fetch;
+  const url = `https://api.github.com/repos/${opts.owner}/${opts.name}/pulls/${opts.prNumber}`;
+  const headers = {
+    Accept: "application/vnd.github+json",
+    "X-GitHub-Api-Version": "2022-11-28",
+    "User-Agent": "tested-cli"
+  };
+  const token = githubApiToken(opts.env ?? process.env);
+  if (token) headers.Authorization = `Bearer ${token}`;
+  let res;
+  try {
+    res = await fetchFn(url, { method: "GET", redirect: "manual", headers });
+  } catch {
+    return null;
+  }
+  if (res.status !== 200) return null;
+  try {
+    return parseGitHubPullBase(JSON.parse(await res.text()));
+  } catch {
+    return null;
+  }
+}
+async function resolvePrPushBase(opts) {
+  let requested;
+  try {
+    requested = assertSafeGitRef(opts.requested);
+  } catch {
+    return void 0;
+  }
+  if (await tryRevparse(opts.ctx, requested)) return requested;
+  const branch = toBranchName(requested) || "main";
+  const originRef = `origin/${branch}`;
+  if (originRef !== requested && await tryRevparse(opts.ctx, originRef)) {
+    return originRef;
+  }
+  let prBase = null;
+  if (opts.owner && opts.name) {
+    prBase = await fetchGitHubPullBase({
+      owner: opts.owner,
+      name: opts.name,
+      prNumber: opts.prNumber,
+      ...opts.fetchFn ? { fetchFn: opts.fetchFn } : {},
+      ...opts.env ? { env: opts.env } : {}
+    });
+  }
+  if (prBase && await tryRevparse(opts.ctx, prBase.sha)) return prBase.sha;
+  const fetchTargets = [];
+  if (prBase) {
+    fetchTargets.push(prBase.sha, prBase.ref);
+  }
+  fetchTargets.push(branch);
+  let announced = false;
+  const seen = /* @__PURE__ */ new Set();
+  for (const target of fetchTargets) {
+    if (seen.has(target)) continue;
+    seen.add(target);
+    let spec;
+    try {
+      spec = assertSafeGitRef(target);
+    } catch {
+      continue;
+    }
+    if (!announced) {
+      announced = true;
+      opts.onProgress?.("fetching base\u2026");
+    }
+    if (!await fetchOriginRef(opts.ctx, spec)) continue;
+    const resolved = await resolveAfterFetch(opts.ctx, spec);
+    if (resolved) return resolved;
+    if (prBase && await tryRevparse(opts.ctx, prBase.sha)) return prBase.sha;
+  }
+  return void 0;
+}
+async function peekRepoIdentity(opts) {
+  let owner = opts.owner;
+  let name = opts.name;
+  if (!owner || !name) {
+    const fromActions = parseGitHubRepository(opts.env.GITHUB_REPOSITORY);
+    if (fromActions) {
+      owner = owner ?? fromActions.owner;
+      name = name ?? fromActions.name;
+    }
+  }
+  if (!owner || !name) {
+    try {
+      const origin = await remoteUrl(opts.ctx, "origin");
+      const parsed = parseGitHubRemote(origin);
+      if (parsed) {
+        owner = owner ?? parsed.owner;
+        name = name ?? parsed.name;
+      }
+    } catch {
+    }
+  }
+  return { owner: owner ?? null, name: name ?? null };
+}
 function buildIngestBody(input) {
   const baseRefName = toBranchName(input.baseRef);
   return {
@@ -1362,16 +1505,16 @@ function formatMissingTokenError(opts) {
     "or pass --token <token> (avoid on shared hosts: visible in ps)"
   ]);
 }
-function formatPushError(status, message, code) {
+function formatPushError(status, message, code, identity) {
   if (status === 0) {
     return errorBlock(message);
   }
   const normalized = (code ?? message).toLowerCase();
-  if (normalized.includes("token_required") || normalized.includes("invalid token") || normalized.includes("unauthorized") || status === 401) {
+  if (normalized.includes("token_required") || normalized.includes("invalid token") || normalized.includes("unauthorized") || normalized.includes("invalid credentials") || status === 401) {
     return errorBlock("ingest auth failed", [
       message,
       "",
-      ...tokenMintGuidance(),
+      ...tokenMintGuidance(identity),
       "or --token"
     ]);
   }
@@ -1460,21 +1603,41 @@ async function executePush(cli, deps) {
   }
   const config = await loadConfigFn({ cwd: deps.cwd });
   const ctx = await openRepoFn(deps.cwd);
-  onProgress("computing diff\u2026");
+  const peeked = await peekRepoIdentity({
+    ...cli.owner !== void 0 ? { owner: cli.owner } : {},
+    ...cli.name !== void 0 ? { name: cli.name } : {},
+    env,
+    ctx
+  });
   let diff;
   try {
+    let baseOverride = cli.base;
+    if (baseOverride === void 0 && prNumber !== null) {
+      const resolved = await resolvePrPushBase({
+        ctx,
+        requested: config.base,
+        prNumber,
+        ...peeked.owner != null ? { owner: peeked.owner } : {},
+        ...peeked.name != null ? { name: peeked.name } : {},
+        fetchFn,
+        env,
+        onProgress
+      });
+      if (resolved !== void 0) baseOverride = resolved;
+    }
+    onProgress("computing diff\u2026");
     diff = await computeDiffFn({
       cwd: deps.cwd,
       config,
-      ...cli.base !== void 0 ? { baseRef: cli.base } : {},
+      ...baseOverride !== void 0 ? { baseRef: baseOverride } : {},
       ctx
     });
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     return { exitCode: 1, stdout: "", stderr: errorBlock(message) };
   }
-  let owner = cli.owner;
-  let name = cli.name;
+  let owner = cli.owner ?? peeked.owner ?? void 0;
+  let name = cli.name ?? peeked.name ?? void 0;
   if (!owner || !name) {
     const fromActions = parseGitHubRepository(env.GITHUB_REPOSITORY);
     if (fromActions) {
@@ -1562,7 +1725,10 @@ async function executePush(cli, deps) {
     return {
       exitCode: 1,
       stdout: "",
-      stderr: formatPushError(result.status, result.message, result.code)
+      stderr: formatPushError(result.status, result.message, result.code, {
+        owner,
+        name
+      })
     };
   }
   const formatted = formatPushSuccess(result.data, cli.json);
@@ -1961,7 +2127,7 @@ import pc3 from "picocolors";
 // package.json
 var package_default = {
   name: "@tested/cli",
-  version: "0.1.6",
+  version: "0.1.7",
   description: "Coverage your agent can use. CLI for patch + project coverage with agent-readable JSON output.",
   license: "MIT",
   homepage: "https://tested.dev",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tested/cli",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Coverage your agent can use. CLI for patch + project coverage with agent-readable JSON output.",
   "license": "MIT",
   "homepage": "https://tested.dev",