@senad-d/branchme 0.1.8 → 0.2.0

package/src/types.ts

@@ -20,6 +20,27 @@ export interface WorkingTreeDetails {
   untracked: number;
 }
 
+export interface BranchStatusAncestryQuery {
+  sourceBranch: string;
+  targetBranch: string;
+}
+
+export interface BranchStatusToolInput {
+  ancestry?: BranchStatusAncestryQuery;
+}
+
+export interface IntegrateBranchToolInput {
+  sourceBranch: string;
+  targetBranch: string;
+}
+
+export interface RetireBranchToolInput {
+  branchName: string;
+  expectedHead: string;
+  targetBranch: string;
+  force: boolean;
+}
+
 export type CreateWorktreeMode = "new" | "existing";
 
 export type ListWorktreesToolInput = Record<string, never>;
@@ -165,6 +186,12 @@ export type RelatedPullRequest =
   | { status: "none" }
   | { status: "unavailable"; reason: string };
 
+export interface BranchAncestryDetails extends BranchStatusAncestryQuery {
+  sourceHead: string;
+  targetHead: string;
+  isAncestor: boolean;
+}
+
 export interface BranchStatusDetails {
   repoRoot: string;
   currentBranch: string | null;
@@ -173,6 +200,7 @@ export interface BranchStatusDetails {
   hasChanges: boolean;
   ahead: number | null;
   behind: number | null;
+  ancestry?: BranchAncestryDetails;
   warnings?: string[];
   githubRepository?: GitHubRepository;
 }
@@ -239,6 +267,169 @@ export interface PushBranchDetails {
   output: string;
 }
 
+export type IntegrateBranchStatus = "already_integrated" | "fast_forward" | "merge_commit" | "conflict";
+
+export interface IntegrateBranchHeads {
+  sourceHead: string;
+  targetHead: string;
+}
+
+export interface IntegrateBranchRepositoryVerification {
+  worktreeRoot: string;
+  canonicalCommonGitDirectory: string;
+  identityPreserved: true;
+}
+
+export interface IntegrateBranchControlWorktreeVerification {
+  targetBranch: string;
+  currentBranchPreserved: true;
+  cleanBefore: true;
+  cleanAfter: true;
+  operationStateAbsentBefore: true;
+  operationStateAbsentAfter: true;
+}
+
+export interface IntegrateBranchFinalAncestryProof {
+  sourceHead: string;
+  previousTargetHead: string;
+  targetHead: string;
+  sourceIsAncestorOfTarget: boolean;
+  previousTargetIsAncestorOfTarget: boolean;
+}
+
+export interface IntegrateBranchVerification {
+  repository: IntegrateBranchRepositoryVerification;
+  controlWorktree: IntegrateBranchControlWorktreeVerification;
+  heads: {
+    before: IntegrateBranchHeads;
+    after: IntegrateBranchHeads;
+  };
+  finalAncestry: IntegrateBranchFinalAncestryProof;
+}
+
+export interface IntegrateBranchDetailsBase {
+  action: "integrate_branch";
+  request: IntegrateBranchToolInput;
+  verified: IntegrateBranchVerification;
+}
+
+export interface IntegrateBranchAlreadyIntegratedDetails extends IntegrateBranchDetailsBase {
+  status: "already_integrated";
+  mergeExecuted: false;
+}
+
+export interface IntegrateBranchFastForwardDetails extends IntegrateBranchDetailsBase {
+  status: "fast_forward";
+  mergeExecuted: true;
+}
+
+export interface IntegrateBranchMergeCommitDetails extends IntegrateBranchDetailsBase {
+  status: "merge_commit";
+  mergeExecuted: true;
+}
+
+export interface IntegrateBranchConflictPathEntry {
+  /** Exact repository-relative identity; human-readable renderers must sanitize a separate display copy. */
+  path: string;
+}
+
+export interface IntegrateBranchConflictDetails extends IntegrateBranchDetailsBase {
+  status: "conflict";
+  mergeExecuted: true;
+  conflict: {
+    paths: IntegrateBranchConflictPathEntry[];
+    omitted: number;
+    abort: {
+      attempted: true;
+      succeeded: true;
+    };
+    restoration: {
+      verified: true;
+      repositoryIdentityPreserved: true;
+      controlWorktreeBranchPreserved: true;
+      sourceHeadPreserved: true;
+      targetHeadRestored: true;
+      operationStateCleared: true;
+      cleanControlWorktree: true;
+    };
+  };
+}
+
+export type IntegrateBranchDetails =
+  | IntegrateBranchAlreadyIntegratedDetails
+  | IntegrateBranchFastForwardDetails
+  | IntegrateBranchMergeCommitDetails
+  | IntegrateBranchConflictDetails;
+
+export type RetireBranchMode = "merged" | "forced_unmerged";
+
+export interface RetireBranchRepositoryIdentity {
+  worktreeRoot: string;
+  canonicalCommonGitDirectory: string;
+}
+
+export interface RetireBranchRefIdentity {
+  branchName: string;
+  fullRef: string;
+  head: string;
+}
+
+export interface RetireBranchAbsentRefProof {
+  branchName: string;
+  fullRef: string;
+  absent: true;
+}
+
+export interface RetireBranchWorktreeOccupancyProof {
+  branchName: string;
+  completeInventoryInspected: true;
+  occupied: false;
+  matchingWorktreeCount: 0;
+}
+
+export interface RetireBranchDetails {
+  action: "retire_branch";
+  status: "retired";
+  mode: RetireBranchMode;
+  /** Exact normalized request values used for the verified retirement. */
+  request: RetireBranchToolInput;
+  verified: {
+    repository: {
+      before: RetireBranchRepositoryIdentity;
+      after: RetireBranchRepositoryIdentity;
+      identityPreserved: true;
+    };
+    refs: {
+      before: {
+        retiring: RetireBranchRefIdentity;
+        target: RetireBranchRefIdentity;
+        expectedHead: string;
+        expectedHeadMatches: true;
+      };
+      after: {
+        retiring: RetireBranchAbsentRefProof;
+        target: RetireBranchRefIdentity;
+        targetHeadPreserved: true;
+      };
+    };
+    ancestry: {
+      retiringHead: string;
+      targetHead: string;
+      retiringIsAncestorOfTarget: boolean;
+    };
+    worktreeOccupancy: {
+      before: RetireBranchWorktreeOccupancyProof;
+      after: RetireBranchWorktreeOccupancyProof;
+    };
+    mutation: {
+      exactLocalRefDeletionAttempted: true;
+      localBranchAbsentAfterDeletion: true;
+      directRemoteDeletionAttempted: false;
+      remoteTrackingRefDeletionAttempted: false;
+    };
+  };
+}
+
 export interface PullRequestDetails {
   repository: GitHubRepository;
   number: number;

package/src/ui/branchme-panel.ts

@@ -24,14 +24,14 @@ type PanelCell =
       preserveLeading?: boolean;
     };
 
-export type BranchMePanelSection = "status" | "workflow" | "worktrees";
+export type BranchMePanelSection = "status" | "workflow" | "integration" | "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", "worktrees"];
+const PANEL_SECTIONS: BranchMePanelSection[] = ["status", "workflow", "integration", "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(16, " ")}-> ${sanitize(description)}`);
+  return layoutCell(`  ${tool.padEnd(17, " ")}-> ${sanitize(description)}`);
 }
 
 function sectionTitle(section: BranchMePanelSection): string {
@@ -153,6 +153,8 @@ function sectionTitle(section: BranchMePanelSection): string {
       return "STATUS";
     case "workflow":
       return "WORKFLOW";
+    case "integration":
+      return "LIFECYCLE";
     case "worktrees":
       return "WORKTREES";
   }
@@ -180,6 +182,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 "integration":
+      return "lifecycle • integrate → remove worktree separately → retire local ref";
     case "worktrees":
       return "worktrees • create → handoff cwd → next session • remove retains branch";
   }
@@ -208,6 +212,18 @@ function sectionRows(section: BranchMePanelSection, data: BranchMePanelData): Pa
         workflowDetailRow("push_branch", "current branch"),
         workflowDetailRow("pull_request", "after push"),
       ];
+    case "integration":
+      return [
+        heading("LIFECYCLE"),
+        workflowDetailRow("integrate_branch", "exact local source -> target"),
+        workflowDetailRow("control target", "checked out + clean"),
+        workflowDetailRow("conflict", "automatic verified abort"),
+        workflowDetailRow("semantic intent", "separate developer workflow"),
+        workflowDetailRow("remove_worktree", "separate; branch retained"),
+        workflowDetailRow("retire_branch", "leased local ref deletion"),
+        workflowDetailRow("retirement guard", "unoccupied + target ancestry"),
+        workflowDetailRow("remote effects", "never delete remote refs"),
+      ];
     case "worktrees":
       return [
         heading("WORKTREES"),