vouchington-tooling 0.8.0 → 0.8.1

package/dist/gh-cli/index.d.mts

@@ -1,5 +1,5 @@
 export { createCommandRunner, runGh, runGit } from './exec.mts';
 export type { ExecFileText, RunTextCommand } from './exec.mts';
 export { getDiffAgainstBase } from './diff.mts';
-export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, resolveHeadBranch, } from './pr-create.mts';
+export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, HeadOutOfDateError, resolveHeadBranch, } from './pr-create.mts';
 export type { AssertHeadPushedOptions, BuildGhPrCreateArgsOptions, CreatePullRequestExecutors, CreatePullRequestOptions, } from './pr-create.mts';

package/dist/gh-cli/index.mjs

@@ -1,3 +1,3 @@
 export { createCommandRunner, runGh, runGit } from './exec.mjs';
 export { getDiffAgainstBase } from './diff.mjs';
-export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, resolveHeadBranch, } from './pr-create.mjs';
+export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, HeadOutOfDateError, resolveHeadBranch, } from './pr-create.mjs';

package/dist/gh-cli/pr-create.d.mts

@@ -7,6 +7,13 @@ export declare class DetachedHeadError extends Error {
 export declare class HeadNotPushedError extends Error {
     constructor(branch: string, remote: string);
 }
+/**
+ * Thrown by {@link assertHeadPushed} when `branch` exists on `remote` but at a different commit
+ * than the local branch — creating the pull request now would silently use the stale remote tip.
+ */
+export declare class HeadOutOfDateError extends Error {
+    constructor(branch: string, remote: string);
+}
 /** Resolves the current branch via `git branch --show-current`, trimmed. */
 export declare function resolveHeadBranch(runGit: RunTextCommand): Promise<string>;
 export type AssertHeadPushedOptions = {
@@ -14,9 +21,16 @@ export type AssertHeadPushedOptions = {
     remote?: string;
 };
 /**
- * Confirms `branch` has a matching ref on `remote` (default `origin`) via
- * `git ls-remote --heads`. `ls-remote --heads` exits `0` with empty stdout when there is no
- * match, so this checks stdout rather than the exit code.
+ * Confirms `branch` has a matching, up-to-date ref on `remote` (default `origin`) via
+ * `git ls-remote --heads` and `git rev-parse`. Both use the full `refs/heads/<branch>` path
+ * rather than the bare branch name: `ls-remote`'s pattern otherwise matches any ref whose name
+ * ends with `branch` (not just an exact `refs/heads/<branch>`), and bare `rev-parse <branch>`
+ * resolves `refs/tags/<branch>` before `refs/heads/<branch>` when a same-named tag exists, either
+ * of which could compare the wrong commit. `ls-remote --heads` exits `0` with empty stdout when
+ * there is no match, so a missing branch is checked via stdout rather than the exit code. A
+ * remote ref that exists but points at a different commit than the local branch means local HEAD
+ * has commits the remote does not — that fails with {@link HeadOutOfDateError} rather than
+ * silently creating the pull request from the stale remote tip.
  */
 export declare function assertHeadPushed(runGit: RunTextCommand, { branch, remote }: AssertHeadPushedOptions): Promise<void>;
 export type BuildGhPrCreateArgsOptions = {

package/dist/gh-cli/pr-create.mjs

@@ -12,6 +12,16 @@ export class HeadNotPushedError extends Error {
         this.name = 'HeadNotPushedError';
     }
 }
+/**
+ * Thrown by {@link assertHeadPushed} when `branch` exists on `remote` but at a different commit
+ * than the local branch — creating the pull request now would silently use the stale remote tip.
+ */
+export class HeadOutOfDateError extends Error {
+    constructor(branch, remote) {
+        super(`branch "${branch}" on remote "${remote}" does not match the local branch — push the latest commits before creating the pull request`);
+        this.name = 'HeadOutOfDateError';
+    }
+}
 /** Resolves the current branch via `git branch --show-current`, trimmed. */
 export async function resolveHeadBranch(runGit) {
     const branch = (await runGit(['branch', '--show-current'])).trim();
@@ -20,14 +30,26 @@ export async function resolveHeadBranch(runGit) {
     return branch;
 }
 /**
- * Confirms `branch` has a matching ref on `remote` (default `origin`) via
- * `git ls-remote --heads`. `ls-remote --heads` exits `0` with empty stdout when there is no
- * match, so this checks stdout rather than the exit code.
+ * Confirms `branch` has a matching, up-to-date ref on `remote` (default `origin`) via
+ * `git ls-remote --heads` and `git rev-parse`. Both use the full `refs/heads/<branch>` path
+ * rather than the bare branch name: `ls-remote`'s pattern otherwise matches any ref whose name
+ * ends with `branch` (not just an exact `refs/heads/<branch>`), and bare `rev-parse <branch>`
+ * resolves `refs/tags/<branch>` before `refs/heads/<branch>` when a same-named tag exists, either
+ * of which could compare the wrong commit. `ls-remote --heads` exits `0` with empty stdout when
+ * there is no match, so a missing branch is checked via stdout rather than the exit code. A
+ * remote ref that exists but points at a different commit than the local branch means local HEAD
+ * has commits the remote does not — that fails with {@link HeadOutOfDateError} rather than
+ * silently creating the pull request from the stale remote tip.
  */
 export async function assertHeadPushed(runGit, { branch, remote = 'origin' }) {
-    const stdout = await runGit(['ls-remote', '--heads', remote, branch]);
-    if (stdout.trim() === '')
+    const ref = `refs/heads/${branch}`;
+    const remoteLine = (await runGit(['ls-remote', '--heads', remote, ref])).trim();
+    if (remoteLine === '')
         throw new HeadNotPushedError(branch, remote);
+    const [remoteSha] = remoteLine.split(/\s+/);
+    const localSha = (await runGit(['rev-parse', ref])).trim();
+    if (localSha !== remoteSha)
+        throw new HeadOutOfDateError(branch, remote);
 }
 /** Pure argv builder for `gh pr create`. `head` is always passed explicitly (never omitted). */
 export function buildGhPrCreateArgs(options) {

package/dist/index.d.mts

@@ -87,5 +87,5 @@ export type { DiagnosticReportLimitOptions, DiagnosticReportSummary, } from './v
 export { createCommandRunner, runGh, runGit } from './gh-cli/index.mts';
 export type { ExecFileText, RunTextCommand } from './gh-cli/index.mts';
 export { getDiffAgainstBase } from './gh-cli/index.mts';
-export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, resolveHeadBranch, } from './gh-cli/index.mts';
+export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, HeadOutOfDateError, resolveHeadBranch, } from './gh-cli/index.mts';
 export type { AssertHeadPushedOptions, BuildGhPrCreateArgsOptions, CreatePullRequestExecutors, CreatePullRequestOptions, } from './gh-cli/index.mts';

package/dist/index.mjs

@@ -49,4 +49,4 @@ export { validateResolvedPinDelta } from './swift-resolved-pin-delta/index.mjs';
 export { DEFAULT_MAX_DIAGNOSTIC_REPORTS, DEFAULT_MAX_FORMATTED_DIAGNOSTIC_REPORTS, formatDiagnosticReportSummaries, HARD_MAX_DIAGNOSTIC_REPORTS, readDiagnosticReportSummaries, summarizeDiagnosticReport, } from './vitest-diagnostics/index.mjs';
 export { createCommandRunner, runGh, runGit } from './gh-cli/index.mjs';
 export { getDiffAgainstBase } from './gh-cli/index.mjs';
-export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, resolveHeadBranch, } from './gh-cli/index.mjs';
+export { assertHeadPushed, buildGhPrCreateArgs, createPullRequest, DetachedHeadError, HeadNotPushedError, HeadOutOfDateError, resolveHeadBranch, } from './gh-cli/index.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vouchington-tooling",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Vouchington CLI and extractable tooling libraries.",
   "homepage": "https://github.com/vouchington/vouchington-tooling/tree/main/packages/vouchington-tooling#readme",
   "bugs": {