@senad-d/branchme 0.1.6 → 0.1.7

package/.env.example

@@ -1,5 +1,9 @@
 # BranchMe GitHub token template.
-# Copy this file to .env only when you need pull_request support.
-# Keep committed placeholders empty; put real tokens only in your local .env file.
+# Copy this file to .env only when you need pull_request support or PR field autofill.
+# Keep committed token placeholders empty; put real tokens only in your local .env file.
 GITHUB_TOKEN=
 GH_TOKEN=
+
+# Optional: allow pull_request to fill omitted branches, title, body, and draft.
+# Explicit values always win. Disabled by default.
+BRANCHME_PR_AUTOFILL=false

package/CHANGELOG.md

@@ -6,6 +6,7 @@
 - Added strict BranchMe tools: `branch_status`, `change_branch`, `fetch_branch`, `pull_branch`, `rebase_branch`, `create_branch`, `push_branch`, and `pull_request`.
 - Added argv-style git helpers for repository status, branch validation/creation/switching, clean-worktree preflight, upstream detection, configured-upstream fetch, fast-forward-only current-branch pull, current-branch rebase with automatic abort on failure, and current-branch push/publish.
 - Added GitHub repository resolution, environment-token and local `.env` token fallback handling, REST pull request creation, response validation, and token redaction.
+- Added opt-in `BRANCHME_PR_AUTOFILL` support for omitted PR fields, including current/default branch inference, bounded, Markdown-safe, and token-redacted title/body generation from commit subjects, and a non-draft default.
 - Added bounded automatic Git context before each agent run with branch/upstream state, working-tree counts and unstaged paths, authenticated related-open-PR lookup, and recent commits.
 - Expanded `branch_status` into a shared, explicit, read-only context refresh for state that may change during a run.
 - Added unit tests with mocked `pi.exec` and `fetch` for Git context collection and prompt safety, git helpers, GitHub helpers, command behavior, tool schemas, prompt metadata, and extension registration.

package/README.md

@@ -34,7 +34,7 @@ BranchMe is a Pi extension for safe branch workflow automation. Before each agen
 - **Explicit history rewrites:** `rebase_branch` runs only when explicitly requested, requires a clean current branch with an upstream, disables autostash and multi-ref updates, and automatically attempts to abort on failure.
 - **Commit-safe:** context collection is read-only, and BranchMe never stages files, creates user-authored commits, generates commit messages, force-pushes, creates merge commits, resets, or edits files directly.
 - **Strict tools:** tool schemas reject extra properties such as `force`, `stash`, `discard`, `owner`, `repo`, `path`, or `baseRef`.
-- **PR-ready:** create GitHub pull requests from existing local branches after verifying the `headBranch` matches GitHub and the base is visible, with explicit PR fields and `GITHUB_TOKEN` or `GH_TOKEN` from the process environment or a local `.env` fallback.
+- **PR-ready:** create GitHub pull requests from existing local branches after verifying the `headBranch` matches GitHub and the base is visible. PR fields can stay explicit, or configured autofill can derive omitted fields from the current branch, default branch, and commit subjects.
 
 > **Security:** pi packages run with your full system permissions. BranchMe runs local `git` commands, may make an automatic authenticated GitHub request to find a related open pull request, can fetch remotes, switch/create/pull/rebase branches, push the current branch, and create GitHub pull requests. Read [`SECURITY.md`](SECURITY.md).
 
@@ -153,11 +153,12 @@ export GH_TOKEN=ghp_...
 pi
 ```
 
-Or copy `.env.example` to `.env` in the repository root and fill in one token value:
+Or copy `.env.example` to `.env` in the repository root, fill in one token value, and optionally enable PR field autofill:
 
 ```bash
 cp .env.example .env
 $EDITOR .env
+# Set BRANCHME_PR_AUTOFILL=true in .env if desired.
 pi
 ```
 
@@ -169,15 +170,26 @@ Run `pull_request` only after `push_branch` has completed; `pull_request` prefli
 
 ## Configuration
 
-BranchMe has no project config file. It reads process environment variables for automatic related-PR lookup, GitHub pull request creation, and optional repository boundary checks, with a local `.env` token fallback when no process token is set. Token lookup checks `process.env.GITHUB_TOKEN`, then `process.env.GH_TOKEN`; if neither is set, BranchMe reads `.env` from the verified git root and checks `GITHUB_TOKEN`, then `GH_TOKEN`.
+BranchMe has no separate project config file. It reads process environment variables and supported keys from a local `.env` file in the verified git root. Token lookup checks `process.env.GITHUB_TOKEN`, then `process.env.GH_TOKEN`; if neither is set, BranchMe checks the matching `.env` keys. Pull request field autofill checks `BRANCHME_PR_AUTOFILL` in the process environment first, then `.env`, and defaults to disabled.
 
 | Variable | Meaning |
 | --- | --- |
 | `GITHUB_TOKEN` | Preferred token for automatic related-PR lookup and `pull_request`; process environment first, then local `.env` fallback. |
 | `GH_TOKEN` | Fallback token for automatic related-PR lookup and `pull_request`; process environment first, then local `.env` fallback. |
+| `BRANCHME_PR_AUTOFILL=true` | Allow `pull_request` to fill omitted PR fields. Accepts `true`/`false`, `1`/`0`, `yes`/`no`, or `on`/`off`; disabled by default. |
 | `GITHUB_REPOSITORY=owner/repo` | Optional CI fallback and boundary check for the current GitHub repository; process environment only. |
 
-BranchMe reads only `GITHUB_TOKEN` and `GH_TOKEN` from a small regular `.env` file; it rejects directories, symlinks, special files, and oversized files. BranchMe does not import other `.env` keys, read shell profiles, GitHub CLI credentials, or local credential stores. Token values are redacted from automatic context, errors, tool content, and tool details.
+BranchMe reads only `GITHUB_TOKEN`, `GH_TOKEN`, and `BRANCHME_PR_AUTOFILL` from a small regular `.env` file; it rejects directories, symlinks, special files, and oversized files. BranchMe does not import other `.env` keys, read shell profiles, GitHub CLI credentials, or local credential stores. Token values are redacted from automatic context, errors, tool content, and tool details.
+
+With autofill enabled, omitted fields are resolved as follows:
+
+- `headBranch`: current local branch.
+- `baseBranch`: the branch named by `origin/HEAD` when it exists locally, falling back to an existing local `main`, `master`, `trunk`, or `develop` branch.
+- `title`: first commit subject in `baseBranch..headBranch`, falling back to a title derived from the head branch name.
+- `body`: a bounded Markdown summary of commit subjects in `baseBranch..headBranch`.
+- `draft`: `false`.
+
+Explicit tool arguments always take precedence. Autofill does not create a PR by itself: the user must still ask the agent to create one.
 
 If local `origin` and `GITHUB_REPOSITORY` both resolve but disagree, `pull_request` fails closed.
 
@@ -207,7 +219,7 @@ Commands are informational only. BranchMe actions are performed by agent-callabl
 | `rebase_branch` | `{}` | Requires a clean current branch with a configured upstream and runs `git rebase --no-autostash --no-update-refs <upstream>`; it rewrites local commits and automatically attempts `git rebase --abort` on failure. |
 | `create_branch` | `{ "branchName": string }` | Validates `branchName`, rejects existing local branches, and runs `git switch -c <branchName>` from current `HEAD`. |
 | `push_branch` | `{}` | Pushes the current branch to its configured upstream remote with an explicit `HEAD:<upstream-branch-ref>` refspec, or publishes it with `git push --set-upstream origin <currentBranch>` when no upstream exists. |
-| `pull_request` | `{ "headBranch": string, "baseBranch": string, "title": string, "body": string, "draft": boolean }` | Preflights GitHub branch visibility and verifies the GitHub `headBranch` commit matches the local branch, then creates a pull request in the resolved current repository via `POST /repos/{owner}/{repo}/pulls`; branch refs must exist locally and cannot use `owner:branch`. |
+| `pull_request` | `{ "headBranch"?: string, "baseBranch"?: string, "title"?: string, "body"?: string, "draft"?: boolean }` | Preflights GitHub branch visibility and verifies the GitHub `headBranch` commit matches the local branch, then creates a pull request in the resolved current repository. Omitted fields require `BRANCHME_PR_AUTOFILL=true`; branch refs must be distinct, exist locally, and cannot use `owner:branch`. |
 
 All schemas reject additional properties. `change_branch` never accepts `baseRef`, `force`, `stash`, `discard`, `create`, `owner`, `repo`, or path inputs. `fetch_branch`, `pull_branch`, and `rebase_branch` have strict empty schemas and never accept a branch, remote, refspec, force, autostash, or arbitrary rebase target. `pull_request` never accepts `owner`, `repo`, or owner-prefixed branch refs; BranchMe resolves the repository from local `origin` and/or matching `GITHUB_REPOSITORY`.
 
@@ -223,6 +235,7 @@ Before each agent run, BranchMe appends an **Automatic Git Context** snapshot to
 - working-tree state and staged, unstaged, and untracked counts;
 - up to 20 unstaged or untracked change entries with Git status, path, and original path for renames/copies;
 - related open PR status and, when found, its number, title, repository, head/base branches, URL, state, and draft flag;
+- whether pull request field autofill is enabled;
 - up to 5 recent commits with short hash, date, and subject.
 
 Collection defaults are a 5-second timeout per local Git command, a 4-second related-PR lookup timeout, at most 512 characters per metadata value, and at most 4,000 characters for the rendered snapshot. GitHub response bodies are limited to 64 KiB. The formatter can further shorten values or omit entries to stay within the total limit.
@@ -242,6 +255,7 @@ Fetch the current branch upstream with fetch_branch, wait for it to complete, th
 Create branch feature/docs-refresh from the updated current HEAD with create_branch.
 Push the current branch with push_branch.
 After push_branch completes, create a draft pull request from feature/docs-refresh to main titled "Refresh docs" with this body: "...".
+If pull request field autofill is enabled, after push_branch completes create a pull request and fill any details I did not provide.
 ```
 
 BranchMe operates only on the repository where pi is running:
@@ -254,7 +268,7 @@ BranchMe operates only on the repository where pi is running:
 - `rebase_branch` requires a clean worktree and configured upstream, rewrites only the current branch onto the locally available upstream with autostash and multi-ref updates disabled, and automatically attempts to abort on failure.
 - `create_branch` creates from the current `HEAD` only and has no `baseRef` input.
 - `push_branch` pushes only the current branch, uses no bare upstream `git push`, and has no `branchName` input.
-- `pull_request` creates PRs only for the resolved current GitHub repository, requires `headBranch` and `baseBranch` to exist locally, requires the GitHub `headBranch` commit to match the local branch, queues behind in-flight same-repository git mutation windows when possible, and rejects `owner:branch` head refs.
+- `pull_request` creates PRs only for the resolved current GitHub repository, requires resolved `headBranch` and `baseBranch` values to be distinct and exist locally, requires the GitHub `headBranch` commit to match the local branch, queues behind in-flight same-repository git mutation windows when possible, and rejects `owner:branch` head refs. Missing PR fields fail unless `BRANCHME_PR_AUTOFILL=true`.
 - If local `origin` and `GITHUB_REPOSITORY` both resolve but disagree, `pull_request` fails closed.
 
 BranchMe intentionally does **not** stage files, create user-authored commits, force checkout, stash changes, discard changes, force-push, create merge commits, edit files directly, or generate commit messages. Rebase-driven commit rewriting occurs only through explicit `rebase_branch` calls.
@@ -310,6 +324,8 @@ Ensure the token and Git credentials have permission for the branch and pull req
 | Push fails | Confirm the current branch is correct and your normal Git remote credentials can push. |
 | Related PR is unavailable | Set `GITHUB_TOKEN` or `GH_TOKEN` before starting pi if related-PR context is wanted. Without a token, BranchMe keeps local context and intentionally makes no unauthenticated GitHub request. |
 | PR auth fails | Set `GITHUB_TOKEN` or `GH_TOKEN` before starting pi, or copy `.env.example` to `.env` and fill in one token. |
+| Missing PR fields | Provide all five fields, or set `BRANCHME_PR_AUTOFILL=true` in the process environment or repository `.env`. |
+| Autofill cannot infer the base | Ensure `origin/HEAD` names an existing local branch, keep a local `main`, `master`, `trunk`, or `develop` branch, or provide `baseBranch` explicitly. |
 | PR branch does not exist locally | Create or fetch/check out the local `headBranch` and `baseBranch` branches first; BranchMe does not use remote-only or cross-repository PR refs. |
 | PR branch is not visible or is stale on GitHub | Run `push_branch`, wait for it to complete, then retry `pull_request`; do not batch `push_branch` and `pull_request` in the same assistant tool call. |
 | Repository mismatch | Make `origin` and `GITHUB_REPOSITORY` refer to the same `owner/repo`. |

package/SECURITY.md

@@ -41,7 +41,7 @@ POST https://api.github.com/repos/{owner}/{repo}/pulls
 
 The first request is an automatic network boundary: it can run before each agent run and whenever `branch_status` explicitly refreshes context. It is a bounded, read-only lookup for one open pull request whose head is the current local branch (`per_page=1`), with a default 4-second timeout and a 64 KiB response-body limit. It is skipped when repository/branch resolution or authentication is unavailable, so BranchMe never makes an unauthenticated fallback request. Timeout, HTTP, network, malformed, and oversized-response failures become a safe unavailable state without exposing response bodies or raw network errors. Git alone is not used or claimed to provide PR metadata.
 
-The branch preflight requests have no body. BranchMe uses the `headBranch` preflight response to compare GitHub's branch commit with the local branch commit before creating the PR. The PR request body contains only the explicit PR fields supplied to the tool: title, head branch, base branch, body, and draft flag. All GitHub response reads are bounded.
+The branch preflight requests have no body. BranchMe uses the resolved `headBranch` preflight response to compare GitHub's branch commit with the local branch commit before creating the PR. The PR request body contains only the resolved title, head branch, base branch, body, and draft flag. By default every field must be supplied explicitly. When `BRANCHME_PR_AUTOFILL=true`, omitted fields may be derived from local branch names and bounded commit subjects before being sent to GitHub. Generated body bullets escape Markdown punctuation so commit subjects remain text rather than active mentions or formatting. All GitHub response reads are bounded.
 
 ## Repository boundary
 
@@ -54,7 +54,7 @@ BranchMe operates on the current repository only.
 - `pull_branch` accepts no parameters, updates only the clean current branch from its configured upstream, and uses fast-forward-only semantics.
 - `rebase_branch` accepts no parameters, rebases only the clean current branch onto its configured upstream, disables autostash and multi-ref updates, never pushes, and attempts to abort on failure.
 - If local `origin` and `GITHUB_REPOSITORY` both resolve but disagree, PR creation and related-PR lookup fail closed.
-- PR branch inputs are validated as existing local branch-name refs; missing local branches and cross-repository `head` values are rejected before token lookup or any GitHub request.
+- Resolved PR branches are validated as distinct, existing local branch-name refs; identical or missing local branches and cross-repository `head` values are rejected before any GitHub request.
 - PR branch inputs must also be visible on GitHub before the PR is created, and `headBranch` must match the local branch commit; unpublished or stale `headBranch` values fail with guidance to run `push_branch`, wait for it to complete, and retry `pull_request`.
 
 ## Credentials
@@ -66,7 +66,7 @@ Git fetch, pull, and push authentication is handled by the user's configured Git
 - `GITHUB_TOKEN` (preferred)
 - `GH_TOKEN` (fallback)
 
-Only these two token keys are read from `.env`; other `.env` keys are ignored. The fallback uses async file I/O, requires `.env` to be a small regular file, and rejects directories, symlinks, special files, and oversized files. BranchMe does not read shell profiles, GitHub CLI credentials, or local credential stores. Token values are redacted from thrown errors, automatic context, tool content, and tool details.
+BranchMe also reads the non-secret `BRANCHME_PR_AUTOFILL` setting from the process environment or verified-root `.env`; all other `.env` keys are ignored. The `.env` reader uses async file I/O, requires a small regular file, and rejects directories, symlinks, special files, and oversized files. BranchMe does not read shell profiles, GitHub CLI credentials, or local credential stores. Token values are redacted from thrown errors, automatic context, generated PR text, tool content, and tool details.
 
 ## System prompt boundary
 
@@ -76,7 +76,7 @@ The automatic snapshot can become stale after a Git or filesystem mutation durin
 
 ## Telemetry
 
-BranchMe does not collect telemetry. Related-PR lookup sends only the resolved repository owner/name and current branch in the authenticated GitHub API URL. PR creation sends only the explicit GitHub pull request fields described above; BranchMe does not send diff contents, filenames, commit subjects, or local file contents to GitHub during context collection.
+BranchMe does not collect telemetry. Related-PR lookup sends only the resolved repository owner/name and current branch in the authenticated GitHub API URL. PR creation sends only the resolved GitHub pull request fields described above. When autofill supplies title or body, those fields can contain bounded, redacted local commit subjects. BranchMe does not send diff contents, filenames, or local file contents to GitHub during context collection.
 
 ## Reporting vulnerabilities
 

package/docs/PROJECT_DEFINITION_BRIEF.md

@@ -26,7 +26,7 @@ Approved on 2026-06-30.
   - Push the current branch to its configured upstream, or publish it to `origin` when no upstream exists.
   - Create a PR in the current GitHub repo via REST API.
 - Non-goals:
-  - No commit, staging, diff, or message generation behavior.
+  - No commit, staging, or diff generation behavior. Optional PR title/body autofill may summarize bounded commit subjects.
   - No GitHub CLI dependency.
   - No cross-repository PR creation.
   - No labels, reviewers, projects, or issue linking in v1.
@@ -41,7 +41,7 @@ Approved on 2026-06-30.
 | Tool | `change_branch` | Switch to an existing local branch | Required `branchName`; rejects dirty worktrees |
 | Tool | `create_branch` | Create + checkout new branch from current `HEAD` | Required `branchName`; fail if exists/invalid |
 | Tool | `push_branch` | Push current branch with explicit upstream target; publish with upstream if needed | No commits/staging |
-| Tool | `pull_request` | Preflight branch visibility/commit state and create PR via GitHub REST API | Required `headBranch`, `baseBranch`, `title`, `body`, `draft`; repo inferred from current checkout |
+| Tool | `pull_request` | Preflight branch visibility/commit state and create PR via GitHub REST API | PR fields are explicit by default and may be omitted only with configured autofill; repo inferred from current checkout |
 | Event | `session_start/session_shutdown` | Optional status footer cleanup | No long-lived resources |
 | UI | TUI panel | Compact BranchMe workflow/config view | No persisted config assumed |
 | Resource | none | No skills/prompts/themes planned | Keep package minimal |
@@ -68,7 +68,7 @@ Approved on 2026-06-30.
 
 ## 6. Config, state, and persistence
 
-- Config source: no BranchMe config file; `/branchme` displays runtime status and workflow notes. GitHub tokens may come from process environment or a small regular `.env` fallback in the verified git root.
+- Config source: no separate BranchMe config file; `/branchme` displays runtime status and workflow notes. GitHub tokens and `BRANCHME_PR_AUTOFILL` may come from process environment or a small regular `.env` fallback in the verified git root.
 - Session state: none; tool results include useful `details`.
 - Files written: none by extension code, except normal git metadata changes from branch checkout/push.
 - Cleanup behavior: clear any footer/status key on `session_shutdown` if used.
@@ -111,4 +111,4 @@ Approved on 2026-06-30.
 - Decisions:
   - No commit functionality.
   - Tools perform all actions; slash commands are help/config only.
-  - PR tool requires all PR fields explicitly.
+  - PR tool requires all PR fields explicitly unless `BRANCHME_PR_AUTOFILL=true`; explicit values always take precedence.

package/docs/STRUCTURE.md

@@ -26,8 +26,8 @@ src/
 2. `src/git-context.ts` owns the shared read-only collector, escaped/bounded formatter, automatic system-prompt append, and the current-state output used by `branch_status`.
 3. `src/commands/branchme-command.ts` parses `/branchme`, `/branchme help`, `--help`, and `-h`; it never performs git or GitHub mutations and avoids raw stdout in JSON mode.
 4. `src/tools/branchme-tools.ts` owns TypeBox schemas, prompt metadata, tool content, and safe structured details. `branch_status` delegates to the shared context collector for an explicit refresh.
-5. `src/git.ts` owns current-repository git behavior: root detection, branch/upstream/ahead-behind inspection, working-tree parsing, recent-commit collection, branch validation, branch creation, existing-local-branch switching, configured-upstream fetch, clean-worktree preflight, fast-forward-only current-branch pull, current-branch rebase with automatic abort on failure, current-branch push/publish, and the per-repository workflow queue.
-6. `src/github.ts` owns GitHub `owner/repo` parsing, repository boundary checks, `GITHUB_TOKEN`/`GH_TOKEN` process-env and hardened git-root `.env` fallback resolution, authenticated related-open-PR lookup, PR branch-name syntax validation, GitHub branch visibility/commit preflight, PR REST calls, bounded response validation, and redacted errors.
+5. `src/git.ts` owns current-repository git behavior: root detection, branch/upstream/ahead-behind inspection, working-tree parsing, recent-commit collection, PR base/commit-subject inference, branch validation, branch creation, existing-local-branch switching, configured-upstream fetch, clean-worktree preflight, fast-forward-only current-branch pull, current-branch rebase with automatic abort on failure, current-branch push/publish, and the per-repository workflow queue.
+6. `src/github.ts` owns GitHub `owner/repo` parsing, repository boundary checks, `GITHUB_TOKEN`/`GH_TOKEN` and `BRANCHME_PR_AUTOFILL` process-env/hardened git-root `.env` resolution, authenticated related-open-PR lookup, PR branch-name syntax validation, GitHub branch visibility/commit preflight, PR REST calls, bounded response validation, and redacted errors.
 7. `src/redaction.ts` owns shared credential redaction for Git, GitHub, and prompt-bound metadata.
 8. `src/types.ts` keeps serializable details shared by helpers, context, and tools.
 9. `src/ui/branchme-panel.ts` renders a compact status panel and clips lines to terminal width.
@@ -56,9 +56,9 @@ src/
 - `rebase_branch` requires a clean worktree and configured upstream, then rebases only the current branch with `git rebase --no-autostash --no-update-refs <upstream>`; it rewrites local commits and automatically attempts `git rebase --abort` on failure.
 - `create_branch` mutates local branch/HEAD only with `git switch -c`.
 - `push_branch` mutates remote refs only for the current branch and uses an explicit upstream remote/refspec instead of bare `git push` when an upstream exists.
-- `pull_request` requires `headBranch` and `baseBranch` to exist locally, requires `headBranch` to match the GitHub-visible branch commit, queues behind already-started same-repository git mutation windows, makes GitHub REST API calls for the resolved current repository only, and rejects missing, owner-prefixed, or unsafe branch refs before token lookup or the request.
-- `pull_request` reads `GITHUB_TOKEN` or `GH_TOKEN` from process environment first; only when neither process token is set does it read those token keys from a small regular `.env` file in the verified git root as a fallback.
-- BranchMe does not force checkout, stash, stage, create user-authored commits, reset, force-push, create merge commits, directly edit files, read non-token `.env` keys, follow unsafe `.env` file types, depend on GitHub CLI, or collect telemetry. Rebase-driven commit rewriting occurs only through explicit `rebase_branch` calls.
+- `pull_request` requires resolved `headBranch` and `baseBranch` values to be distinct and exist locally, requires `headBranch` to match the GitHub-visible branch commit, queues behind already-started same-repository git mutation windows, makes GitHub REST API calls for the resolved current repository only, and rejects owner-prefixed or unsafe branch refs before the request. Omitted fields require configured autofill.
+- `pull_request` reads `GITHUB_TOKEN` or `GH_TOKEN` from process environment first; only when neither process token is set does it read those token keys from a small regular `.env` file in the verified git root as a fallback. `BRANCHME_PR_AUTOFILL` uses the same process-first, `.env`-fallback precedence and defaults off.
+- BranchMe does not force checkout, stash, stage, create user-authored commits, reset, force-push, create merge commits, directly edit files, read unsupported `.env` keys, follow unsafe `.env` file types, depend on GitHub CLI, or collect telemetry. Rebase-driven commit rewriting occurs only through explicit `rebase_branch` calls.
 
 ## Documentation
 

package/docs/TUI_CAPTURE.md

@@ -35,6 +35,7 @@ Commands only show info; BranchMe tools perform actions.
 
 - Run inside a Git repo with `git` available.
 - For PRs: GitHub `origin` and `GITHUB_TOKEN` or `GH_TOKEN` (environment or `.env`).
+- Optional: set `BRANCHME_PR_AUTOFILL=true` in the environment or `.env` to generate omitted PR fields.
 - `fetch_branch`, `pull_branch`, and `rebase_branch` require a configured upstream.
 - `pull_branch` and `rebase_branch` require a clean working tree.
 - `rebase_branch` rewrites local commits only when explicitly requested and auto-aborts on failure.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@senad-d/branchme",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "type": "module",
   "description": "Minimal Pi extension for current-repository git branch, push, and pull request workflows.",
   "license": "MIT",
@@ -70,10 +70,10 @@
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.80.2",
+    "@earendil-works/pi-coding-agent": "^0.84.1",
     "@earendil-works/pi-tui": "^0.80.2",
     "@types/node": "^26.0.1",
     "typebox": "^1.2.18",
-    "typescript": "^6.0.3"
+    "typescript": "^7.0.2"
   }
 }

package/src/commands/branchme-command.ts

@@ -44,6 +44,7 @@ export function getBranchMeHelpText(): string {
     "",
     "- Run inside a Git repo with `git` available.",
     "- For PRs: GitHub `origin` and `GITHUB_TOKEN` or `GH_TOKEN` (environment or `.env`).",
+    "- Optional: set `BRANCHME_PR_AUTOFILL=true` in the environment or `.env` to generate omitted PR fields.",
     "- `fetch_branch`, `pull_branch`, and `rebase_branch` require a configured upstream.",
     "- `pull_branch` and `rebase_branch` require a clean working tree.",
     "- `rebase_branch` rewrites local commits only when explicitly requested and auto-aborts on failure.",

package/src/constants.ts

@@ -9,6 +9,7 @@ export const PULL_BRANCH_TOOL_NAME = "pull_branch";
 export const REBASE_BRANCH_TOOL_NAME = "rebase_branch";
 export const PUSH_BRANCH_TOOL_NAME = "push_branch";
 export const PULL_REQUEST_TOOL_NAME = "pull_request";
+export const PULL_REQUEST_AUTOFILL_ENV_NAME = "BRANCHME_PR_AUTOFILL";
 
 export const BRANCHME_TOOL_NAMES = [
   BRANCH_STATUS_TOOL_NAME,
@@ -33,6 +34,8 @@ export const GIT_CONTEXT_RECENT_COMMIT_LIMIT = 5;
 export const GIT_CONTEXT_CHANGE_LIMIT = 20;
 export const GIT_CONTEXT_VALUE_LIMIT_CHARS = 512;
 export const GIT_CONTEXT_SUMMARY_LIMIT_CHARS = 4_000;
+export const PULL_REQUEST_AUTOFILL_COMMIT_LIMIT = 20;
+export const PULL_REQUEST_AUTOFILL_SUBJECT_LIMIT_CHARS = 256;
 
 export const GITHUB_API_BASE_URL = "https://api.github.com";
 export const GITHUB_API_VERSION = "2022-11-28";

package/src/git-context.ts

@@ -19,7 +19,7 @@ import {
   getWorkingTreeStatus,
   type GitCommandContext,
 } from "./git.ts";
-import { lookupRelatedPullRequest } from "./github.ts";
+import { lookupRelatedPullRequest, resolvePullRequestAutofill } from "./github.ts";
 import { redactSecrets } from "./redaction.ts";
 import type { GitContextDetails, GitFileChange, RecentCommit, RelatedPullRequest } from "./types.ts";
 
@@ -138,6 +138,7 @@ export async function collectGitContext(
   const recentCommits = await getRecentCommits(pi, rootCtx, options.signal);
   const upstream = current.detached ? null : await getUpstreamBranch(pi, rootCtx, options.signal);
   const warnings: string[] = [];
+  let pullRequestAutofill: boolean | null = null;
   let ahead: number | null = null;
   let behind: number | null = null;
 
@@ -152,6 +153,13 @@ export async function collectGitContext(
     }
   }
 
+  try {
+    pullRequestAutofill = await resolvePullRequestAutofill(options.env, { cwd: repoRoot, signal: options.signal });
+  } catch (error) {
+    throwIfCollectionAborted(options.signal);
+    warnings.push(`pull request autofill configuration unavailable (${safeFailureType(error)})`);
+  }
+
   const relatedPullRequest = await collectRelatedPullRequest(pi, rootCtx, options);
 
   return {
@@ -166,6 +174,7 @@ export async function collectGitContext(
     ...(relatedPullRequest.status === "found"
       ? { githubRepository: relatedPullRequest.pullRequest.repository }
       : {}),
+    pullRequestAutofill,
     workingTree: workingTreeStatus.workingTree,
     unstagedChanges: workingTreeStatus.unstagedChanges,
     relatedPullRequest,
@@ -223,6 +232,13 @@ function formatRelatedPullRequest(details: GitContextDetails, valueLimit: number
   return `- Related PR: #${safeNonNegativeInteger(pullRequest.number)} ${quoteMetadata(pullRequest.title, valueLimit)}; repository ${quoteMetadata(repository, valueLimit)}; ${quoteMetadata(pullRequest.head, valueLimit)} -> ${quoteMetadata(pullRequest.base, valueLimit)}; ${quoteMetadata(pullRequest.url, valueLimit)}; ${quoteMetadata(pullRequest.state, valueLimit)}${draft}`;
 }
 
+function formatPullRequestAutofill(details: GitContextDetails): string {
+  let state = "unavailable";
+  if (details.pullRequestAutofill === true) state = "enabled";
+  if (details.pullRequestAutofill === false) state = "disabled";
+  return `- Pull request field autofill: ${state} (BRANCHME_PR_AUTOFILL)`;
+}
+
 function appendRecentCommits(lines: string[], selection: FormatSelection): void {
   if (selection.commits.length === 0 && selection.omittedCommits === 0) {
     lines.push("- Recent commits: none");
@@ -257,7 +273,10 @@ function renderGitContext(
     formatWorkingTree(details),
   ];
   appendUnstagedChanges(lines, selection);
-  lines.push(formatRelatedPullRequest(details, selection.valueLimit));
+  lines.push(
+    formatRelatedPullRequest(details, selection.valueLimit),
+    formatPullRequestAutofill(details),
+  );
   appendRecentCommits(lines, selection);
   lines.push(
     "",
@@ -295,6 +314,7 @@ function boundedFallbackContext(mode: GitContextFormatMode): string {
     "- Working tree: unavailable",
     "- Unstaged changes: [entries omitted]",
     "- Related PR: unavailable",
+    "- Pull request field autofill: unavailable",
     "- Recent commits: [entries omitted]",
     "",
     "Call branch_status to request a current bounded snapshot.",

package/src/git.ts

@@ -10,6 +10,8 @@ import {
   GIT_REBASE_TIMEOUT_MS,
   GIT_STATUS_TIMEOUT_MS,
   MAX_SUMMARY_OUTPUT_CHARS,
+  PULL_REQUEST_AUTOFILL_COMMIT_LIMIT,
+  PULL_REQUEST_AUTOFILL_SUBJECT_LIMIT_CHARS,
 } from "./constants.ts";
 import { redactSecrets } from "./redaction.ts";
 import type {
@@ -37,6 +39,7 @@ export interface GitRunOptions {
   signal?: AbortSignal;
   timeout?: number;
   allowFailure?: boolean;
+  tokens?: readonly string[];
 }
 
 const repositoryMutationQueues = new Map<string, Promise<void>>();
@@ -114,11 +117,11 @@ export async function runGit(
   });
 
   if (result.killed) {
-    throw new Error(formatGitFailure(args, result));
+    throw new Error(formatGitFailure(args, result, options.tokens));
   }
 
   if (!options.allowFailure && result.code !== 0) {
-    throw new Error(formatGitFailure(args, result));
+    throw new Error(formatGitFailure(args, result, options.tokens));
   }
 
   return result;
@@ -568,6 +571,98 @@ export async function getRecentCommits(
   throw new Error(formatGitFailure(args, result));
 }
 
+function truncatePullRequestCommitSubject(value: string): string {
+  if (value.length <= PULL_REQUEST_AUTOFILL_SUBJECT_LIMIT_CHARS) return value;
+
+  let end = PULL_REQUEST_AUTOFILL_SUBJECT_LIMIT_CHARS - 1;
+  const lastCodePoint = value.codePointAt(end - 1);
+  if (lastCodePoint !== undefined && lastCodePoint > 0xffff) end -= 1;
+  return `${value.slice(0, end).trimEnd()}…`;
+}
+
+function safePullRequestCommitSubject(value: string, tokens: readonly string[]): string {
+  const normalized = redactSecrets(value, tokens)
+    .replace(/[\p{Cc}\p{Cf}\u2028\u2029]/gu, " ")
+    .replace(/\s+/gu, " ")
+    .trim();
+  return truncatePullRequestCommitSubject(normalized);
+}
+
+async function getOriginDefaultBranch(
+  pi: Pick<ExtensionAPI, "exec">,
+  ctx: GitCommandContext,
+  signal?: AbortSignal,
+): Promise<string | null> {
+  const args = ["symbolic-ref", "--quiet", "--short", "refs/remotes/origin/HEAD"];
+  const result = await runGit(pi, ctx, args, {
+    signal,
+    timeout: GIT_STATUS_TIMEOUT_MS,
+    allowFailure: true,
+  });
+  if (result.code !== 0) return null;
+
+  const remoteBranch = trimOutput(result.stdout);
+  const prefix = "origin/";
+  if (!remoteBranch.startsWith(prefix)) return null;
+
+  const branch = remoteBranch.slice(prefix.length);
+  try {
+    validateBranchNameInput(branch, "Default base branch");
+  } catch {
+    return null;
+  }
+  return branch;
+}
+
+export async function inferPullRequestBaseBranch(
+  pi: Pick<ExtensionAPI, "exec">,
+  ctx: GitCommandContext,
+  headBranch: string,
+  signal?: AbortSignal,
+): Promise<string> {
+  validateBranchNameInput(headBranch, "headBranch");
+  const originDefault = await getOriginDefaultBranch(pi, ctx, signal);
+  if (originDefault) {
+    if (originDefault === headBranch) {
+      throw new Error("Unable to infer baseBranch because the current branch is the origin default branch.");
+    }
+    if (await localBranchExists(pi, ctx, originDefault, signal)) return originDefault;
+  }
+
+  for (const candidate of ["main", "master", "trunk", "develop"]) {
+    if (candidate !== headBranch && await localBranchExists(pi, ctx, candidate, signal)) return candidate;
+  }
+
+  throw new Error(
+    "Unable to infer baseBranch from origin/HEAD or a local main, master, trunk, or develop branch; provide baseBranch explicitly.",
+  );
+}
+
+export async function getPullRequestCommitSubjects(
+  pi: Pick<ExtensionAPI, "exec">,
+  ctx: GitCommandContext,
+  headBranch: string,
+  baseBranch: string,
+  signal?: AbortSignal,
+  tokens: readonly string[] = [],
+): Promise<string[]> {
+  validateBranchNameInput(headBranch, "headBranch");
+  validateBranchNameInput(baseBranch, "baseBranch");
+  const revisionRange = `refs/heads/${baseBranch}..refs/heads/${headBranch}`;
+  const args = [
+    "log",
+    `--max-count=${PULL_REQUEST_AUTOFILL_COMMIT_LIMIT}`,
+    "--format=%s",
+    revisionRange,
+    "--",
+  ];
+  const result = await runGit(pi, ctx, args, { signal, timeout: GIT_STATUS_TIMEOUT_MS, tokens });
+  return result.stdout
+    .split(/\r?\n/u)
+    .map((subject) => safePullRequestCommitSubject(subject, tokens))
+    .filter(Boolean);
+}
+
 export async function getAheadBehindCount(
   pi: Pick<ExtensionAPI, "exec">,
   ctx: GitCommandContext,

package/src/github.ts

@@ -10,6 +10,7 @@ import {
   GITHUB_USER_AGENT,
   GIT_CONTEXT_VALUE_LIMIT_CHARS,
   MAX_SUMMARY_OUTPUT_CHARS,
+  PULL_REQUEST_AUTOFILL_ENV_NAME,
 } from "./constants.ts";
 import {
   getCurrentBranch,
@@ -27,6 +28,9 @@ import type {
 } from "./types.ts";
 
 type TokenEnvironmentKey = "GITHUB_TOKEN" | "GH_TOKEN";
+type PullRequestAutofillEnvironmentKey = typeof PULL_REQUEST_AUTOFILL_ENV_NAME;
+type SupportedDotEnvKey = TokenEnvironmentKey | PullRequestAutofillEnvironmentKey;
+type DotEnvReadPurpose = "GitHub token fallback" | "pull request autofill configuration";
 
 export type TokenResolutionSource = TokenEnvironmentKey | `${TokenEnvironmentKey} (.env)`;
 
@@ -149,8 +153,8 @@ function resolveProcessToken(env: NodeJS.ProcessEnv): TokenResolution | null {
   return null;
 }
 
-function isTokenEnvironmentKey(value: string): value is TokenEnvironmentKey {
-  return value === "GITHUB_TOKEN" || value === "GH_TOKEN";
+function isSupportedDotEnvKey(value: string): value is SupportedDotEnvKey {
+  return value === "GITHUB_TOKEN" || value === "GH_TOKEN" || value === PULL_REQUEST_AUTOFILL_ENV_NAME;
 }
 
 function decodeDoubleQuotedDotEnvValue(value: string): string {
@@ -182,23 +186,46 @@ function stripDotEnvInlineComment(value: string): string {
   return value;
 }
 
+function closingDotEnvQuoteIndex(value: string, quote: "\"" | "'"): number {
+  let escaped = false;
+  for (let index = 1; index < value.length; index += 1) {
+    const character = value.charAt(index);
+    if (quote === "\"" && character === "\\" && !escaped) {
+      escaped = true;
+      continue;
+    }
+    if (character === quote && !escaped) return index;
+    escaped = false;
+  }
+  return -1;
+}
+
+function parseQuotedDotEnvValue(value: string): string | null {
+  const quote = value.charAt(0);
+  if (quote !== "\"" && quote !== "'") return null;
+
+  const closingIndex = closingDotEnvQuoteIndex(value, quote);
+  if (closingIndex === -1) return null;
+
+  const remainder = value.slice(closingIndex + 1).trim();
+  if (remainder && !remainder.startsWith("#")) return null;
+
+  const quotedValue = value.slice(1, closingIndex);
+  return quote === "\"" ? decodeDoubleQuotedDotEnvValue(quotedValue).trim() : quotedValue.trim();
+}
+
 function parseDotEnvValue(rawValue: string): string {
   const value = rawValue.trim();
   if (!value) return "";
 
-  if (value.startsWith("\"") && value.endsWith("\"")) {
-    return decodeDoubleQuotedDotEnvValue(value.slice(1, -1)).trim();
-  }
-
-  if (value.startsWith("'") && value.endsWith("'")) {
-    return value.slice(1, -1).trim();
-  }
+  const quotedValue = parseQuotedDotEnvValue(value);
+  if (quotedValue !== null) return quotedValue;
 
   return stripDotEnvInlineComment(value).trim();
 }
 
-function parseDotEnvTokens(contents: string): Partial<Record<TokenEnvironmentKey, string>> {
-  const tokens: Partial<Record<TokenEnvironmentKey, string>> = {};
+function parseDotEnvValues(contents: string): Partial<Record<SupportedDotEnvKey, string>> {
+  const values: Partial<Record<SupportedDotEnvKey, string>> = {};
 
   for (const line of contents.split(/\r?\n/u)) {
     const trimmed = line.trim();
@@ -209,12 +236,12 @@ function parseDotEnvTokens(contents: string): Partial<Record<TokenEnvironmentKey
     if (separatorIndex === -1) continue;
 
     const key = assignment.slice(0, separatorIndex).trim();
-    if (!isTokenEnvironmentKey(key)) continue;
+    if (!isSupportedDotEnvKey(key)) continue;
 
-    tokens[key] = parseDotEnvValue(assignment.slice(separatorIndex + 1).trimStart());
+    values[key] = parseDotEnvValue(assignment.slice(separatorIndex + 1).trimStart());
   }
 
-  return tokens;
+  return values;
 }
 
 const MAX_DOTENV_BYTES = 64 * 1024;
@@ -223,55 +250,77 @@ function isMissingFileError(error: unknown): boolean {
   return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
 }
 
-function throwIfAborted(signal: AbortSignal | undefined): void {
-  if (signal?.aborted) throw new Error("GitHub token .env fallback was aborted.");
+function throwIfAborted(signal: AbortSignal | undefined, purpose: DotEnvReadPurpose): void {
+  if (signal?.aborted) throw new Error(`${purpose} .env read was aborted.`);
 }
 
 function errorMessage(error: unknown): string {
   return redactSecrets(error instanceof Error ? error.message : String(error));
 }
 
-async function readDotEnvTokens(
+async function readDotEnvValues(
   cwd: string | undefined,
   signal?: AbortSignal,
-): Promise<Partial<Record<TokenEnvironmentKey, string>>> {
+  purpose: DotEnvReadPurpose = "GitHub token fallback",
+): Promise<Partial<Record<SupportedDotEnvKey, string>>> {
   if (!cwd) return {};
 
   const envPath = join(cwd, ".env");
-  throwIfAborted(signal);
+  throwIfAborted(signal, purpose);
 
   let stats: Awaited<ReturnType<typeof lstat>>;
   try {
     stats = await lstat(envPath);
   } catch (error) {
     if (isMissingFileError(error)) return {};
-    throw new Error(`Unable to inspect .env file for GitHub token fallback: ${errorMessage(error)}`);
+    throw new Error(`Unable to inspect .env file for ${purpose}: ${errorMessage(error)}`);
   }
 
   if (!stats.isFile()) {
-    throw new Error("Unable to read .env file for GitHub token fallback: .env must be a small regular file.");
+    throw new Error(`Unable to read .env file for ${purpose}: .env must be a small regular file.`);
   }
   if (stats.size > MAX_DOTENV_BYTES) {
     throw new Error(
-      `Unable to read .env file for GitHub token fallback: .env is too large (${stats.size} bytes; limit ${MAX_DOTENV_BYTES} bytes).`,
+      `Unable to read .env file for ${purpose}: .env is too large (${stats.size} bytes; limit ${MAX_DOTENV_BYTES} bytes).`,
     );
   }
 
-  throwIfAborted(signal);
+  throwIfAborted(signal, purpose);
 
   let contents: string;
   try {
     contents = await readFile(envPath, { encoding: "utf8", signal });
   } catch (error) {
     if (isMissingFileError(error)) return {};
-    throw new Error(`Unable to read .env file for GitHub token fallback: ${errorMessage(error)}`);
+    throw new Error(`Unable to read .env file for ${purpose}: ${errorMessage(error)}`);
   }
 
   if (Buffer.byteLength(contents, "utf8") > MAX_DOTENV_BYTES) {
-    throw new Error(`Unable to read .env file for GitHub token fallback: .env exceeded the ${MAX_DOTENV_BYTES} byte limit.`);
+    throw new Error(`Unable to read .env file for ${purpose}: .env exceeded the ${MAX_DOTENV_BYTES} byte limit.`);
   }
 
-  return parseDotEnvTokens(contents);
+  return parseDotEnvValues(contents);
+}
+
+function parsePullRequestAutofillValue(value: string): boolean {
+  const normalized = value.trim().toLowerCase();
+  if (["1", "true", "yes", "on"].includes(normalized)) return true;
+  if (["0", "false", "no", "off"].includes(normalized)) return false;
+  throw new Error(
+    `${PULL_REQUEST_AUTOFILL_ENV_NAME} must be one of true, false, 1, 0, yes, no, on, or off.`,
+  );
+}
+
+export async function resolvePullRequestAutofill(
+  env: NodeJS.ProcessEnv = process.env,
+  options: TokenResolutionOptions = {},
+): Promise<boolean> {
+  const processValue = env[PULL_REQUEST_AUTOFILL_ENV_NAME];
+  if (processValue !== undefined) return parsePullRequestAutofillValue(processValue);
+
+  const dotEnvValues = await readDotEnvValues(options.cwd, options.signal, "pull request autofill configuration");
+  const dotEnvValue = dotEnvValues[PULL_REQUEST_AUTOFILL_ENV_NAME];
+  return dotEnvValue === undefined ? false : parsePullRequestAutofillValue(dotEnvValue);
 }
 
 export async function resolveGitHubToken(
@@ -281,7 +330,7 @@ export async function resolveGitHubToken(
   const processToken = resolveProcessToken(env);
   if (processToken) return processToken;
 
-  const dotEnvTokens = await readDotEnvTokens(options.cwd, options.signal);
+  const dotEnvTokens = await readDotEnvValues(options.cwd, options.signal);
   const githubToken = dotEnvTokens.GITHUB_TOKEN?.trim();
   if (githubToken) return { token: githubToken, source: "GITHUB_TOKEN (.env)" };
 

package/src/tools/branchme-tools.ts

@@ -16,10 +16,13 @@ import {
   fetchCurrentBranch,
   getGitRoot,
   getLocalBranchCommit,
+  getPullRequestCommitSubjects,
+  inferPullRequestBaseBranch,
   localBranchExists,
   pullCurrentBranch,
   pushCurrentBranch,
   rebaseCurrentBranch,
+  requireCurrentBranch,
   validateBranchName,
   withRepositoryMutationQueue,
 } from "../git.ts";
@@ -31,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 });
 
@@ -53,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 },
 );
@@ -77,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(
@@ -109,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);
 }
@@ -288,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.",
@@ -303,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;
@@ -145,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;