@senad-d/branchme 0.1.5 → 0.1.7

package/src/tools/branchme-tools.ts

@@ -4,18 +4,25 @@ import {
   BRANCH_STATUS_TOOL_NAME,
   CHANGE_BRANCH_TOOL_NAME,
   CREATE_BRANCH_TOOL_NAME,
+  FETCH_BRANCH_TOOL_NAME,
   PULL_BRANCH_TOOL_NAME,
   PULL_REQUEST_TOOL_NAME,
   PUSH_BRANCH_TOOL_NAME,
+  REBASE_BRANCH_TOOL_NAME,
 } from "../constants.ts";
 import {
   changeExistingLocalBranch,
   createLocalBranch,
+  fetchCurrentBranch,
   getGitRoot,
   getLocalBranchCommit,
+  getPullRequestCommitSubjects,
+  inferPullRequestBaseBranch,
   localBranchExists,
   pullCurrentBranch,
   pushCurrentBranch,
+  rebaseCurrentBranch,
+  requireCurrentBranch,
   validateBranchName,
   withRepositoryMutationQueue,
 } from "../git.ts";
@@ -27,9 +34,18 @@ import {
   repositoryLabel,
   resolveGitHubRepository,
   resolveGitHubToken,
+  resolvePullRequestAutofill,
   validatePullRequestBranchRef,
 } from "../github.ts";
-import type { ChangeBranchDetails, GitContextDetails, PullRequestDetails } from "../types.ts";
+import type {
+  ChangeBranchDetails,
+  GitContextDetails,
+  PullRequestDetails,
+  PullRequestInput,
+  PullRequestInputField,
+  PullRequestToolDetails,
+  PullRequestToolInput,
+} from "../types.ts";
 
 const EmptyParametersSchema = Type.Object({}, { additionalProperties: false });
 
@@ -49,11 +65,17 @@ const ChangeBranchParametersSchema = Type.Object(
 
 const PullRequestParametersSchema = Type.Object(
   {
-    headBranch: Type.String({ minLength: 1, description: "Existing local branch containing the pull request changes." }),
-    baseBranch: Type.String({ minLength: 1, description: "Existing local target branch for the pull request." }),
-    title: Type.String({ minLength: 1, description: "Pull request title." }),
-    body: Type.String({ description: "Pull request body. Pass an empty string only when intentionally blank." }),
-    draft: Type.Boolean({ description: "Whether to create the pull request as a draft." }),
+    headBranch: Type.Optional(
+      Type.String({ minLength: 1, description: "Existing local branch containing the pull request changes. May be omitted in PR autofill mode." }),
+    ),
+    baseBranch: Type.Optional(
+      Type.String({ minLength: 1, description: "Existing local target branch for the pull request. May be omitted in PR autofill mode." }),
+    ),
+    title: Type.Optional(Type.String({ minLength: 1, description: "Pull request title. May be omitted in PR autofill mode." })),
+    body: Type.Optional(
+      Type.String({ description: "Pull request body. Pass an empty string only when intentionally blank; may be omitted in PR autofill mode." }),
+    ),
+    draft: Type.Optional(Type.Boolean({ description: "Whether to create the pull request as a draft. Defaults to false in PR autofill mode." })),
   },
   { additionalProperties: false },
 );
@@ -73,8 +95,62 @@ export function formatChangeBranch(details: ChangeBranchDetails): string {
   return `Changed branch from ${previous} to ${details.currentBranch}.`;
 }
 
-export function formatPullRequest(details: PullRequestDetails): string {
-  return `Created pull request #${details.number} (${details.state}) for ${repositoryLabel(details.repository)}: ${details.url}`;
+export function formatPullRequest(details: PullRequestDetails, autofilledFields: PullRequestInputField[] = []): string {
+  const autofill = autofilledFields.length > 0 ? ` Autofilled fields: ${autofilledFields.join(", ")}.` : "";
+  return `Created pull request #${details.number} (${details.state}) for ${repositoryLabel(details.repository)}: ${details.url}.${autofill}`;
+}
+
+const PULL_REQUEST_INPUT_FIELDS: PullRequestInputField[] = ["headBranch", "baseBranch", "title", "body", "draft"];
+
+interface ResolvedPullRequestBranches {
+  headBranch: string;
+  baseBranch: string;
+  autofilledFields: PullRequestInputField[];
+}
+
+interface ResolvedPullRequestInput {
+  input: PullRequestInput;
+  autofilledFields: PullRequestInputField[];
+}
+
+function missingPullRequestInputFields(params: PullRequestToolInput): PullRequestInputField[] {
+  return PULL_REQUEST_INPUT_FIELDS.filter((field) => params[field] === undefined);
+}
+
+function generatedPullRequestTitle(
+  headBranch: string,
+  commitSubjects: string[],
+  tokens: readonly string[],
+): string {
+  if (commitSubjects[0]) return commitSubjects[0];
+
+  const branchSegment = headBranch.split("/").at(-1) ?? headBranch;
+  const words = redactSecrets(branchSegment, tokens).replace(/[-_]+/gu, " ").trim();
+  if (!words) return "Update project";
+  return `${words.charAt(0).toUpperCase()}${words.slice(1)}`;
+}
+
+function escapePullRequestMarkdownText(value: string): string {
+  return value.replace(/[!-/:-@[-`{-~]/gu, String.raw`\$&`);
+}
+
+function generatedPullRequestBody(commitSubjects: string[]): string {
+  if (commitSubjects.length === 0) return "";
+  const bullets = commitSubjects.map((subject) => `- ${escapePullRequestMarkdownText(subject)}`);
+  return ["## Summary", "", ...bullets, "", "_Generated by BranchMe from commit subjects._"].join("\n");
+}
+
+async function requirePullRequestAutofill(
+  missingFields: PullRequestInputField[],
+  env: NodeJS.ProcessEnv | undefined,
+  repoRoot: string,
+  signal?: AbortSignal,
+): Promise<void> {
+  if (missingFields.length === 0) return;
+  if (await resolvePullRequestAutofill(env, { cwd: repoRoot, signal })) return;
+  throw new Error(
+    `Missing pull_request fields: ${missingFields.join(", ")}. Provide them explicitly or set BRANCHME_PR_AUTOFILL=true in the process environment or repository .env file.`,
+  );
 }
 
 async function validateLocalPullRequestBranchName(
@@ -105,6 +181,60 @@ async function requireExistingValidatedLocalPullRequestBranch(
   throw new Error(`${field} local branch '${redactSecrets(branchName)}' does not exist.`);
 }
 
+async function resolvePullRequestBranches(
+  pi: Pick<ExtensionAPI, "exec">,
+  ctx: { cwd: string },
+  params: PullRequestToolInput,
+  env: NodeJS.ProcessEnv | undefined,
+  signal?: AbortSignal,
+): Promise<ResolvedPullRequestBranches> {
+  const autofilledFields = missingPullRequestInputFields(params);
+  await requirePullRequestAutofill(autofilledFields, env, ctx.cwd, signal);
+
+  const headBranch = params.headBranch ?? await requireCurrentBranch(pi, ctx, signal);
+  const baseBranch = params.baseBranch ?? await inferPullRequestBaseBranch(pi, ctx, headBranch, signal);
+  if (headBranch === baseBranch) throw new Error("headBranch and baseBranch must be different branches.");
+
+  await validateLocalPullRequestBranchName(pi, ctx, headBranch, "headBranch", signal);
+  await validateLocalPullRequestBranchName(pi, ctx, baseBranch, "baseBranch", signal);
+  await requireExistingValidatedLocalPullRequestBranch(pi, ctx, headBranch, "headBranch", signal);
+  await requireExistingValidatedLocalPullRequestBranch(pi, ctx, baseBranch, "baseBranch", signal);
+
+  return { headBranch, baseBranch, autofilledFields };
+}
+
+async function resolvePullRequestInput(
+  pi: Pick<ExtensionAPI, "exec">,
+  ctx: { cwd: string },
+  params: PullRequestToolInput,
+  branches: ResolvedPullRequestBranches,
+  tokens: readonly string[],
+  signal?: AbortSignal,
+): Promise<ResolvedPullRequestInput> {
+  const needsCommitSubjects = params.title === undefined || params.body === undefined;
+  const commitSubjects = needsCommitSubjects
+    ? await getPullRequestCommitSubjects(
+      pi,
+      ctx,
+      branches.headBranch,
+      branches.baseBranch,
+      signal,
+      tokens,
+    )
+    : [];
+
+  return {
+    input: {
+      headBranch: branches.headBranch,
+      baseBranch: branches.baseBranch,
+      title: params.title ?? generatedPullRequestTitle(branches.headBranch, commitSubjects, tokens),
+      body: params.body ?? generatedPullRequestBody(commitSubjects),
+      draft: params.draft ?? false,
+    },
+    autofilledFields: branches.autofilledFields,
+  };
+}
+
 function shortCommit(commit: string): string {
   return commit.slice(0, 12);
 }
@@ -199,6 +329,26 @@ export function registerBranchMeTools(pi: Pick<ExtensionAPI, "registerTool" | "e
     },
   });
 
+  pi.registerTool({
+    name: FETCH_BRANCH_TOOL_NAME,
+    label: "Fetch Branch",
+    description: "fetch_branch fetches the current branch's configured upstream branch into its remote-tracking ref with an explicit git fetch --no-tags --no-recurse-submodules refspec. fetch_branch does not change local branches or working-tree files and never prunes, rebases, merges, stashes, stages, commits, or pushes.",
+    promptSnippet: "fetch_branch: fetch the current branch's configured upstream into its remote-tracking ref without changing local branches or files",
+    promptGuidelines: [
+      "Use fetch_branch only when the user explicitly wants to fetch the configured upstream branch for the current branch.",
+      "Use fetch_branch only on a current branch with an upstream; fetch_branch has no branchName, remote, tags, prune, force, or refspec parameters.",
+      "Call fetch_branch and wait for it to complete before rebase_branch when the user wants the latest upstream state; do not batch fetch_branch with rebase_branch.",
+    ],
+    parameters: EmptyParametersSchema,
+    async execute(_toolCallId, _params, signal, _onUpdate, ctx) {
+      const details = await fetchCurrentBranch(pi, ctx, signal);
+      return {
+        content: [{ type: "text", text: `Fetched configured upstream remote ${details.remote} for current branch ${details.currentBranch}.` }],
+        details,
+      };
+    },
+  });
+
   pi.registerTool({
     name: PULL_BRANCH_TOOL_NAME,
     label: "Pull Branch",
@@ -219,6 +369,27 @@ export function registerBranchMeTools(pi: Pick<ExtensionAPI, "registerTool" | "e
     },
   });
 
+  pi.registerTool({
+    name: REBASE_BRANCH_TOOL_NAME,
+    label: "Rebase Branch",
+    description: "rebase_branch rebases the clean current branch onto its configured upstream with git rebase --no-autostash --no-update-refs. rebase_branch rewrites local commits, never pushes or force-pushes, and automatically attempts git rebase --abort if the rebase fails.",
+    promptSnippet: "rebase_branch: rebase the clean current branch onto its configured upstream with automatic abort on failure",
+    promptGuidelines: [
+      "Use rebase_branch only when the user explicitly requests rebasing and accepts that rebase_branch rewrites local commit history.",
+      "Use rebase_branch only on a clean current branch with an upstream; rebase_branch has no branchName, base, remote, force, autostash, continue, or abort parameters.",
+      "Call fetch_branch and wait for it to complete before rebase_branch when the latest upstream state is required; do not batch rebase_branch with fetch_branch, change_branch, pull_branch, create_branch, push_branch, or pull_request.",
+      "If rebase_branch fails or conflicts, rebase_branch automatically attempts git rebase --abort and never leaves conflict resolution to another parallel tool call.",
+    ],
+    parameters: EmptyParametersSchema,
+    async execute(_toolCallId, _params, signal, _onUpdate, ctx) {
+      const details = await rebaseCurrentBranch(pi, ctx, signal);
+      return {
+        content: [{ type: "text", text: `Rebased current branch ${details.currentBranch} onto ${details.upstream}.` }],
+        details,
+      };
+    },
+  });
+
   pi.registerTool({
     name: PUSH_BRANCH_TOOL_NAME,
     label: "Push Branch",
@@ -243,10 +414,12 @@ export function registerBranchMeTools(pi: Pick<ExtensionAPI, "registerTool" | "e
   pi.registerTool({
     name: PULL_REQUEST_TOOL_NAME,
     label: "Pull Request",
-    description: "pull_request creates a GitHub pull request in the resolved current repository. pull_request requires headBranch and baseBranch to exist as safe local branch names, requires headBranch to match the GitHub-visible branch commit, and requires baseBranch to be visible on GitHub. Owner-prefixed refs, owner, and repo are never accepted as inputs.",
-    promptSnippet: "pull_request: create a GitHub pull request in the current repository with all PR fields explicit",
+    description: "pull_request creates a GitHub pull request in the resolved current repository. PR fields are optional only when BRANCHME_PR_AUTOFILL=true; pull_request then infers branches, derives title/body from commit subjects, and defaults draft to false. Branches must exist locally and on GitHub, and headBranch must match the GitHub-visible commit. Owner-prefixed refs, owner, and repo are never accepted as inputs.",
+    promptSnippet: "pull_request: create a GitHub pull request with explicit fields or optional configured PR field autofill",
     promptGuidelines: [
-      "Use pull_request only when the user provides explicit headBranch, baseBranch, title, body, and draft values.",
+      "Use pull_request only when the user explicitly asks to create a pull request; pull_request must not create one merely because a branch was pushed.",
+      "When automatic Git context reports pull request field autofill disabled, use pull_request only with explicit headBranch, baseBranch, title, body, and draft values.",
+      "When automatic Git context reports pull request field autofill enabled, pull_request may omit fields the user did not provide; prefer the user's explicit values whenever present.",
       "Use pull_request only with existing local branches for headBranch and baseBranch; headBranch must match the GitHub-visible branch commit.",
       "Do not call push_branch and pull_request in the same tool batch; call pull_request only after push_branch has completed.",
       "Use pull_request only for the resolved current repository; pull_request never accepts owner, repo, or owner-prefixed branch refs.",
@@ -258,30 +431,31 @@ export function registerBranchMeTools(pi: Pick<ExtensionAPI, "registerTool" | "e
       const rootCtx = { cwd: repoRoot };
 
       return withRepositoryMutationQueue(repoRoot, async () => {
-        await validateLocalPullRequestBranchName(pi, rootCtx, params.headBranch, "headBranch", signal);
-        await validateLocalPullRequestBranchName(pi, rootCtx, params.baseBranch, "baseBranch", signal);
-        await requireExistingValidatedLocalPullRequestBranch(pi, rootCtx, params.headBranch, "headBranch", signal);
-        await requireExistingValidatedLocalPullRequestBranch(pi, rootCtx, params.baseBranch, "baseBranch", signal);
+        const branches = await resolvePullRequestBranches(pi, rootCtx, params, options.env, signal);
         const repository = await resolveGitHubRepository(pi, rootCtx, signal, options.env);
         const token = (await resolveGitHubToken(options.env, { cwd: repoRoot, signal })).token;
 
         try {
-          const headBranch = await ensureGitHubBranchExists(repository, params.headBranch, "headBranch", token, {
+          const resolved = await resolvePullRequestInput(pi, rootCtx, params, branches, [token], signal);
+          const headBranch = await ensureGitHubBranchExists(repository, resolved.input.headBranch, "headBranch", token, {
             fetchImpl: options.fetchImpl,
             signal,
           });
-          await requireGitHubHeadMatchesLocalBranch(pi, rootCtx, params.headBranch, headBranch.commitSha, signal);
-          await ensureGitHubBranchExists(repository, params.baseBranch, "baseBranch", token, {
+          await requireGitHubHeadMatchesLocalBranch(pi, rootCtx, resolved.input.headBranch, headBranch.commitSha, signal);
+          await ensureGitHubBranchExists(repository, resolved.input.baseBranch, "baseBranch", token, {
             fetchImpl: options.fetchImpl,
             signal,
           });
-          const details = await createGitHubPullRequest(repository, params, token, {
+          const details = await createGitHubPullRequest(repository, resolved.input, token, {
             fetchImpl: options.fetchImpl,
             signal,
           });
+          const toolDetails: PullRequestToolDetails = resolved.autofilledFields.length > 0
+            ? { ...details, autofilledFields: resolved.autofilledFields }
+            : details;
           return {
-            content: [{ type: "text", text: formatPullRequest(details) }],
-            details,
+            content: [{ type: "text", text: formatPullRequest(details, resolved.autofilledFields) }],
+            details: toolDetails,
           };
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error);

package/src/types.ts

@@ -67,6 +67,7 @@ export interface BranchStatusDetails {
 }
 
 export interface GitContextDetails extends BranchStatusDetails {
+  pullRequestAutofill: boolean | null;
   workingTree: WorkingTreeDetails;
   unstagedChanges: GitFileChangeSummary;
   relatedPullRequest: RelatedPullRequest;
@@ -87,6 +88,17 @@ export interface ChangeBranchDetails {
   hasChangesBeforeSwitch: false;
 }
 
+export interface FetchBranchDetails {
+  repoRoot: string;
+  currentBranch: string;
+  upstream: string;
+  remote: string;
+  remoteRef: string;
+  remoteTrackingRef: string;
+  refspec: string;
+  output: string;
+}
+
 export interface PullBranchDetails {
   repoRoot: string;
   currentBranch: string;
@@ -96,6 +108,15 @@ export interface PullBranchDetails {
   output: string;
 }
 
+export interface RebaseBranchDetails {
+  repoRoot: string;
+  currentBranch: string;
+  upstream: string;
+  remote: string;
+  remoteRef: string;
+  output: string;
+}
+
 export interface PushBranchDetails {
   repoRoot: string;
   currentBranch: string;
@@ -125,6 +146,14 @@ export interface PullRequestInput {
   draft: boolean;
 }
 
+export type PullRequestInputField = keyof PullRequestInput;
+
+export type PullRequestToolInput = Partial<PullRequestInput>;
+
+export interface PullRequestToolDetails extends PullRequestDetails {
+  autofilledFields?: PullRequestInputField[];
+}
+
 export interface GitExecResult {
   stdout: string;
   stderr: string;

package/src/ui/branchme-panel.ts

@@ -29,8 +29,8 @@ export type BranchMePanelSection = "status" | "workflow";
 const NARROW_MIN_WIDTH = 24;
 const WIDE_MIN_WIDTH = 72;
 const MAX_PANEL_WIDTH = 96;
-const MAX_PANEL_HEIGHT = 14;
-const BODY_HEIGHT = 7;
+const MAX_PANEL_HEIGHT = 16;
+const BODY_HEIGHT = 9;
 const PANEL_SECTIONS: BranchMePanelSection[] = ["status", "workflow"];
 const ANSI_RESET = "\u001b[0m";
 
@@ -177,7 +177,7 @@ function sectionFooter(section: BranchMePanelSection, data: BranchMePanelData):
     case "status":
       return "status • current repository only • tools perform actions";
     case "workflow":
-      return "workflow • inspect → change → pull → create → push → PR";
+      return "workflow • inspect → change → fetch/pull/rebase → create → push → PR";
   }
 }
 
@@ -197,7 +197,9 @@ function sectionRows(section: BranchMePanelSection, data: BranchMePanelData): Pa
         heading("WORKFLOW"),
         workflowDetailRow("branch_status", "inspect"),
         workflowDetailRow("change_branch", "existing local"),
+        workflowDetailRow("fetch_branch", "upstream remote"),
         workflowDetailRow("pull_branch", "fast-forward"),
+        workflowDetailRow("rebase_branch", "onto upstream"),
         workflowDetailRow("create_branch", "from HEAD"),
         workflowDetailRow("push_branch", "current branch"),
         workflowDetailRow("pull_request", "after push"),