@senad-d/branchme 0.1.6 → 0.1.8

package/src/types.ts

@@ -20,6 +20,117 @@ export interface WorkingTreeDetails {
   untracked: number;
 }
 
+export type CreateWorktreeMode = "new" | "existing";
+
+export type ListWorktreesToolInput = Record<string, never>;
+
+export interface CreateWorktreeToolInput {
+  worktreePath: string;
+  branchName: string;
+  branchMode: CreateWorktreeMode;
+}
+
+export interface RemoveWorktreeToolInput {
+  worktreePath: string;
+}
+
+export interface WorktreeEntry {
+  path: string;
+  head: string | null;
+  branch: string | null;
+  detached: boolean;
+  bare: boolean;
+  locked: boolean;
+  lockReason: string | null;
+  prunable: boolean;
+  pruneReason: string | null;
+  main: boolean;
+  current: boolean;
+}
+
+export interface VerifiedLinkedWorktreeEntry extends Omit<WorktreeEntry, "path" | "branch"> {
+  /** Exact machine-readable identity validated to require no BranchMe display transformation. */
+  path: string;
+  head: string;
+  /** Exact machine-readable identity validated to require no BranchMe display transformation. */
+  branch: string;
+  detached: false;
+  bare: false;
+  locked: false;
+  lockReason: null;
+  prunable: false;
+  pruneReason: null;
+  main: false;
+  current: false;
+}
+
+export interface ListWorktreesDetails {
+  action: "list_worktrees";
+  repoRoot: string;
+  worktrees: WorktreeEntry[];
+  omitted: number;
+}
+
+export interface ReadyWorktreeHandoffDetails {
+  cwd: string;
+  branch: string;
+  head: string;
+  ready: true;
+  summary: string;
+}
+
+export interface RetainedBranchHandoffDetails {
+  cwd: null;
+  branch: string;
+  head: string;
+  ready: false;
+  summary: string;
+}
+
+export type WorktreeHandoffDetails = ReadyWorktreeHandoffDetails | RetainedBranchHandoffDetails;
+
+export interface CreateWorktreeDetails {
+  action: "create_worktree";
+  repoRoot: string;
+  request: CreateWorktreeToolInput;
+  verified: {
+    before: {
+      sourcePath: string;
+      sourceBranch: string | null;
+      sourceDetached: boolean;
+      sourceHead: string;
+      canonicalWorktreePath: string;
+      branchExisted: boolean;
+      destinationRegistered: false;
+    };
+    after: {
+      worktreePresent: true;
+      worktree: VerifiedLinkedWorktreeEntry;
+      workingTree: WorkingTreeDetails;
+    };
+  };
+  handoff: ReadyWorktreeHandoffDetails;
+}
+
+export interface RemoveWorktreeDetails {
+  action: "remove_worktree";
+  repoRoot: string;
+  request: RemoveWorktreeToolInput;
+  verified: {
+    before: {
+      worktree: VerifiedLinkedWorktreeEntry;
+      workingTree: WorkingTreeDetails;
+    };
+    after: {
+      worktreePresent: false;
+      branchRetained: true;
+      branch: string;
+      head: string;
+    };
+  };
+  handoff: RetainedBranchHandoffDetails;
+}
+
 export interface GitFileChange {
   status: string;
   path: string;
@@ -67,6 +178,7 @@ export interface BranchStatusDetails {
 }
 
 export interface GitContextDetails extends BranchStatusDetails {
+  pullRequestAutofill: boolean | null;
   workingTree: WorkingTreeDetails;
   unstagedChanges: GitFileChangeSummary;
   relatedPullRequest: RelatedPullRequest;
@@ -145,6 +257,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

@@ -24,14 +24,14 @@ type PanelCell =
       preserveLeading?: boolean;
     };
 
-export type BranchMePanelSection = "status" | "workflow";
+export type BranchMePanelSection = "status" | "workflow" | "worktrees";
 
 const NARROW_MIN_WIDTH = 24;
 const WIDE_MIN_WIDTH = 72;
 const MAX_PANEL_WIDTH = 96;
 const MAX_PANEL_HEIGHT = 16;
 const BODY_HEIGHT = 9;
-const PANEL_SECTIONS: BranchMePanelSection[] = ["status", "workflow"];
+const PANEL_SECTIONS: BranchMePanelSection[] = ["status", "workflow", "worktrees"];
 const ANSI_RESET = "\u001b[0m";
 
 function truncateVisible(value: string, width: number, ellipsis = "…", pad = false): string {
@@ -144,7 +144,7 @@ function statusDetailRow(label: string, value: string): PanelCell {
 }
 
 function workflowDetailRow(tool: string, description: string): PanelCell {
-  return layoutCell(`  ${tool.padEnd(15, " ")}-> ${sanitize(description)}`);
+  return layoutCell(`  ${tool.padEnd(16, " ")}-> ${sanitize(description)}`);
 }
 
 function sectionTitle(section: BranchMePanelSection): string {
@@ -153,6 +153,8 @@ function sectionTitle(section: BranchMePanelSection): string {
       return "STATUS";
     case "workflow":
       return "WORKFLOW";
+    case "worktrees":
+      return "WORKTREES";
   }
 }
 
@@ -178,6 +180,8 @@ function sectionFooter(section: BranchMePanelSection, data: BranchMePanelData):
       return "status • current repository only • tools perform actions";
     case "workflow":
       return "workflow • inspect → change → fetch/pull/rebase → create → push → PR";
+    case "worktrees":
+      return "worktrees • create → handoff cwd → next session • remove retains branch";
   }
 }
 
@@ -204,6 +208,13 @@ function sectionRows(section: BranchMePanelSection, data: BranchMePanelData): Pa
         workflowDetailRow("push_branch", "current branch"),
         workflowDetailRow("pull_request", "after push"),
       ];
+    case "worktrees":
+      return [
+        heading("WORKTREES"),
+        workflowDetailRow("list_worktrees", "inspect inventory"),
+        workflowDetailRow("create_worktree", "ready handoff.cwd"),
+        workflowDetailRow("remove_worktree", "clean linked; branch retained"),
+      ];
   }
 }