@senad-d/branchme 0.1.6 → 0.1.8

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@senad-d/branchme",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
-  "description": "Minimal Pi extension for current-repository git branch, push, and pull request workflows.",
+  "description": "Pi extension for verified current-repository Git branch, worktree, push, and pull request workflows.",
   "license": "MIT",
   "author": "Senad Dizdarević <112484166+senad-d@users.noreply.github.com>",
   "repository": {
@@ -21,6 +21,7 @@
     "branchme",
     "git",
     "git-branch",
+    "git-worktree",
     "git-workflow",
     "github",
     "github-pr",
@@ -52,10 +53,11 @@
     "test:coverage": "mkdir -p coverage && node --test --experimental-test-coverage --test-reporter=spec --test-reporter=lcov --test-reporter-destination=stdout --test-reporter-destination=coverage/lcov.info test/*.test.mjs",
     "smoke:pi": "node scripts/smoke-pi-runtime.mjs && node scripts/smoke-pi-git-context.mjs",
     "smoke:pi:packed": "node scripts/smoke-pi-installed-package.mjs",
-    "check": "node --check scripts/check-format.mjs && node --check scripts/check-package-contents.mjs && node --check scripts/publish-npm.mjs && node --check scripts/smoke-pi-git-context.mjs && node --check scripts/smoke-pi-installed-package.mjs && node --check scripts/smoke-pi-runtime.mjs",
+    "smoke:worktree-handoff": "node scripts/smoke-worktree-handoff.mjs",
+    "check": "node --check scripts/check-format.mjs && node --check scripts/check-package-contents.mjs && node --check scripts/publish-npm.mjs && node --check scripts/smoke-pi-git-context.mjs && node --check scripts/smoke-pi-installed-package.mjs && node --check scripts/smoke-pi-runtime.mjs && node --check scripts/smoke-worktree-handoff.mjs",
     "pack:dry-run": "npm pack --dry-run --json",
     "check:pack": "node scripts/check-package-contents.mjs",
-    "validate": "npm run typecheck && npm run format:check && npm run test && npm run smoke:pi && npm run check && npm run check:pack",
+    "validate": "npm run typecheck && npm run format:check && npm run test && npm run smoke:pi && npm run check && npm run check:pack && npm run smoke:worktree-handoff",
     "release:check": "npm run validate && npm run smoke:pi:packed"
   },
   "pi": {
@@ -65,15 +67,17 @@
     "image": "https://raw.githubusercontent.com/senad-d/BranchMe/main/img/demo.gif"
   },
   "peerDependencies": {
+    "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*",
     "typebox": "*"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.80.2",
-    "@earendil-works/pi-tui": "^0.80.2",
+    "@earendil-works/pi-ai": "^0.84.1",
+    "@earendil-works/pi-coding-agent": "^0.84.1",
+    "@earendil-works/pi-tui": "^0.84.1",
     "@types/node": "^26.0.1",
     "typebox": "^1.2.18",
-    "typescript": "^6.0.3"
+    "typescript": "^7.0.2"
   }
 }

package/src/commands/branchme-command.ts

@@ -25,7 +25,7 @@ export function getBranchMeHelpText(): string {
   return [
     "# BranchMe",
     "",
-    "Current-repository branch workflow tools for Pi.",
+    "Current-repository Git workflow tools for Pi.",
     "",
     "Commands only show info; BranchMe tools perform actions.",
     "",
@@ -40,10 +40,19 @@ export function getBranchMeHelpText(): string {
     "7. `push_branch` — push the current branch.",
     "8. `pull_request` — open a PR after `push_branch` completes and GitHub sees the branches.",
     "",
+    "## Worktree handoff",
+    "",
+    "- `list_worktrees` — inspect the main and linked worktrees in the current repository.",
+    "- `create_worktree` — create a linked worktree and return a ready handoff with an absolute `handoff.cwd`.",
+    "- A separate orchestrator starts the next Pi session or subagent in `handoff.cwd`.",
+    "- `remove_worktree` — remove a verified clean linked worktree while retaining its local branch.",
+    "- BranchMe does not change cwd, start Pi, copy `.env`, or remove branches automatically.",
+    "",
     "## Requirements",
     "",
     "- 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,10 @@ 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 LIST_WORKTREES_TOOL_NAME = "list_worktrees";
+export const CREATE_WORKTREE_TOOL_NAME = "create_worktree";
+export const REMOVE_WORKTREE_TOOL_NAME = "remove_worktree";
+export const PULL_REQUEST_AUTOFILL_ENV_NAME = "BRANCHME_PR_AUTOFILL";
 
 export const BRANCHME_TOOL_NAMES = [
   BRANCH_STATUS_TOOL_NAME,
@@ -19,6 +23,9 @@ export const BRANCHME_TOOL_NAMES = [
   REBASE_BRANCH_TOOL_NAME,
   PUSH_BRANCH_TOOL_NAME,
   PULL_REQUEST_TOOL_NAME,
+  LIST_WORKTREES_TOOL_NAME,
+  CREATE_WORKTREE_TOOL_NAME,
+  REMOVE_WORKTREE_TOOL_NAME,
 ] as const;
 
 export const GIT_STATUS_TIMEOUT_MS = 5_000;
@@ -27,12 +34,20 @@ export const GIT_FETCH_TIMEOUT_MS = 120_000;
 export const GIT_PULL_TIMEOUT_MS = 120_000;
 export const GIT_REBASE_TIMEOUT_MS = 120_000;
 export const GIT_PUSH_TIMEOUT_MS = 120_000;
+export const GIT_WORKTREE_MUTATION_TIMEOUT_MS = 120_000;
 export const GITHUB_RELATED_PR_TIMEOUT_MS = 4_000;
 
 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 GIT_WORKTREE_RAW_OUTPUT_LIMIT_BYTES = 128 * 1024;
+export const GIT_WORKTREE_ENTRY_LIMIT = 100;
+export const GIT_WORKTREE_PATH_LIMIT_CHARS = 4_096;
+export const GIT_WORKTREE_REASON_LIMIT_CHARS = 512;
+export const GIT_WORKTREE_SUMMARY_LIMIT_CHARS = 4_000;
 
 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.",