@a2f0/agent-tool 0.1.49 → 0.1.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a2f0/agent-tool",
-  "version": "0.1.49",
+  "version": "0.1.50",
   "packageManager": "bun@1.4.4",
   "type": "module",
   "description": "Portable cross-agent review, PR workflows, and shared skills",

package/src/cli.ts

@@ -88,7 +88,7 @@ Usage: agent-tool [--repo <directory>] [--config <file>] <command>
   --help | --version
 
 Legacy actions remain available: solicitClaudeCodeReview, solicitCodexReview,
-solicitOpencodeReview, openPr, squashMerge, bumpVersions, checkVersions,
+solicitOpencodeReview, openPr, bumpVersions, checkVersions,
 resolveVersionConflicts. A successful review exit means a usable review was
 returned; inspect VERDICT before shipping. Skill install previews unless --apply.
 `;

package/src/permissions/catalog.ts

@@ -37,7 +37,6 @@ export const CATALOG: CatalogEntry[] = [
   ...["checkVersions"].map(command => ({ command, class: "read" as const })),
   ...["bumpVersions", "resolveVersionConflicts", "solicitClaudeCodeReview", "solicitCodexReview", "solicitOpencodeReview"].map(command => ({ command, class: "local" as const })),
   { command: "openPr", class: "share" },
-  { command: "squashMerge", class: "release" },
 ];
 // `run`, `run-group` and `proc start` execute arbitrary commands, so they stay unclassified and keep the harness default.
 // `bun x` runs only executables that `permissions.executables` classifies; project.ts adds those.

package/src/pr/squashMerge.ts

@@ -97,7 +97,7 @@ export function parsePullRequestMergeTarget(
     recordField(pullRequest, "autoMergeRequest") !== null
   ) {
     throw new Error(
-      "Pull request already has a queued or automatic merge; cancel it before running squashMerge.",
+      "Pull request already has a queued or automatic merge; cancel it before running pr merge.",
     );
   }
   if (expectedBaseRef !== undefined && baseRefName !== expectedBaseRef) {

package/src/runAgentToolAction.ts

@@ -4,10 +4,9 @@ import { solicitCodexReview } from "./review/solicitCodexReview";
 import { solicitOpencodeReview } from "./review/solicitOpencodeReview";
 import { bumpVersions, checkVersions } from "./version/bumpVersions";
 import { resolveVersionConflicts } from "./version/resolveVersionConflicts";
-import { mergeReviewedHead } from "./workflows/pr";
 
 const AGENT_TOOL_USAGE =
-  "Usage: agent-tool <solicitClaudeCodeReview|solicitCodexReview|solicitOpencodeReview|openPr|squashMerge|bumpVersions|checkVersions|resolveVersionConflicts> [args]\n";
+  "Usage: agent-tool <solicitClaudeCodeReview|solicitCodexReview|solicitOpencodeReview|openPr|bumpVersions|checkVersions|resolveVersionConflicts> [args]\n";
 
 export interface AgentToolActions {
   readonly bumpVersions: (rootDir: string, baseOid?: string) => number;
@@ -20,12 +19,6 @@ export interface AgentToolActions {
   ) => number | Promise<number>;
   readonly solicitCodexReview: (rootDir: string, effort?: string) => number | Promise<number>;
   readonly solicitOpencodeReview: (rootDir: string, effort?: string) => number | Promise<number>;
-  readonly squashMerge: (
-    rootDir: string,
-    subject?: string,
-    expectedHeadSha?: string,
-    expectedBaseRef?: string,
-  ) => number;
 }
 
 const defaultActions: AgentToolActions = {
@@ -36,8 +29,6 @@ const defaultActions: AgentToolActions = {
   solicitClaudeCodeReview,
   solicitCodexReview,
   solicitOpencodeReview,
-  // A reviewed HEAD merges only after every preflight gate passes.
-  squashMerge: mergeReviewedHead,
 };
 
 function assertMaximumPositionals(
@@ -59,7 +50,7 @@ export function runAgentToolAction(
   actions: AgentToolActions = defaultActions,
 ): number | Promise<number> {
   const [action, ...positionals] = args;
-  const [first, second, third] = positionals;
+  const [first] = positionals;
   switch (action) {
     case "bumpVersions": {
       assertMaximumPositionals(action, positionals, 1);
@@ -89,10 +80,12 @@ export function runAgentToolAction(
       assertMaximumPositionals(action, positionals, 1);
       return actions.openPr(rootDir, first);
     }
-    case "squashMerge": {
-      assertMaximumPositionals(action, positionals, 3);
-      return actions.squashMerge(rootDir, first, second, third);
-    }
+    case "squashMerge":
+      // Removed: its optional reviewed head let a merge skip preflight.
+      process.stderr.write(
+        "squashMerge was removed; use agent-tool pr merge <subject-or-empty> <reviewed-head-oid> <base-branch>.\n",
+      );
+      return 1;
     default:
       process.stderr.write(`Unknown action: ${action ?? "(none)"}\n`);
       process.stderr.write(AGENT_TOOL_USAGE);

package/src/workflows/pr.ts

@@ -89,18 +89,17 @@ export function preflight(expectedHead: string, baseBranch: string, baseOid: str
 /**
  * Merge a reviewed HEAD only after every preflight gate passes against the
  * freshly fetched live base: a skipped, failed, or stale preflight run never
- * leads to a merge. Without a reviewed HEAD (legacy manual form) only the
- * merge helper's own checks apply.
+ * leads to a merge. The reviewed HEAD and base branch are required, so no
+ * merge path skips preflight.
  */
-export function mergeReviewedHead(rootDir: string, subject?: string, expectedHead?: string, baseBranch?: string): number {
-  if (!expectedHead) return squashMerge(rootDir, subject, expectedHead, baseBranch);
+export function mergeReviewedHead(rootDir: string, subject: string | undefined, expectedHead: string, baseBranch: string): number {
+  assert(!!expectedHead && !!baseBranch, "Merge requires a reviewed HEAD and a base branch.");
   const identity = resolvePr();
-  const branch = baseBranch ?? resolvePullRequestMergeTarget(identity).baseRefName;
-  const baseOid = resolveFreshBaseRef(identity.repo, branch);
-  try { preflight(expectedHead, branch, baseOid); }
-  catch (error) { throw new Error(`Refusing to merge: preflight failed against live ${branch} ${baseOid}: ${(error as Error).message}`); }
-  // Bind the merge to the branch that passed preflight, inferred or given, so a retarget in between is refused.
-  return squashMerge(rootDir, subject, expectedHead, branch);
+  const baseOid = resolveFreshBaseRef(identity.repo, baseBranch);
+  try { preflight(expectedHead, baseBranch, baseOid); }
+  catch (error) { throw new Error(`Refusing to merge: preflight failed against live ${baseBranch} ${baseOid}: ${(error as Error).message}`); }
+  // Bind the merge to the branch that passed preflight, so a retarget in between is refused.
+  return squashMerge(rootDir, subject, expectedHead, baseBranch);
 }
 
 interface Comment { id: string; databaseId: number; body: string; url: string; author: { login: string } | null }