@senad-d/branchme 0.3.5 → 0.3.6

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## 0.3.5 - Unreleased
+## 0.3.6 - Unreleased
+
+- Resolved Sonar maintainability findings by using a set for integration-branch membership and non-mutating sorting for changed worktree paths.
+
+- `create_branch`, `change_branch`, `pull_branch` and `push_branch` receipts carry the resulting full HEAD (`head`); `push_branch` also names the remote-tracking ref it updated (`remoteTrackingRef`) and its commit after the push (`remoteHead`), and the text result says whether it matches the local HEAD. A caller no longer needs `branch_status` after these calls to learn or prove the HEAD.
+## 0.3.5 - Released
 
 - `push_branch` never pushes onto a differently named integration branch: when the current branch's upstream is `main`, `master`, `trunk`, `develop`, or the origin default branch under another name (a feature branch created from `origin/main` with tracking), it publishes to the same-named branch on that remote with `--set-upstream`, reports `mode: "publish"`, and keeps the previous upstream in `upstream`. Previously such a branch was pushed straight onto the integration branch. Other differently named upstreams keep their explicit `HEAD:<upstream-ref>` push.
 - Added optional `remove_worktree.discardChanges` (default `false`, unchanged behavior). When `true`, the user's explicit authorization, a worktree with staged, unstaged, untracked, or unmerged changes is removed with `git worktree remove --force` and the result lists every discarded path in `discardedPaths`; without it a dirty worktree is still refused, now naming the option. Locked, detached, main, current, prunable, missing, and foreign worktrees stay rejected, and the local branch is retained.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@senad-d/branchme",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "type": "module",
   "description": "Pi extension for verified Git repository initialization, branch, worktree, integration, retirement, push, and pull request workflows.",
   "license": "MIT",

package/src/git.ts

@@ -563,7 +563,7 @@ async function resolvePushTarget(
   };
 }
 
-const INTEGRATION_BRANCH_NAMES = ["main", "master", "trunk", "develop"];
+const INTEGRATION_BRANCH_NAMES = new Set(["main", "master", "trunk", "develop"]);
 
 async function isIntegrationBranch(
   pi: Pick<ExtensionAPI, "exec">,
@@ -573,7 +573,7 @@ async function isIntegrationBranch(
   signal?: AbortSignal,
 ): Promise<boolean> {
   const branch = remoteRef.slice("refs/heads/".length);
-  if (INTEGRATION_BRANCH_NAMES.includes(branch)) return true;
+  if (INTEGRATION_BRANCH_NAMES.has(branch)) return true;
   return remote === "origin" && branch === await getOriginDefaultBranch(pi, ctx, signal);
 }
 
@@ -1828,7 +1828,7 @@ function parseWorktreeRemovalStatus(output: string): WorktreeRemovalStatus {
   return {
     workingTree: parseWorkingTreeStatus(output).workingTree,
     ignoredPaths: [...ignoredPaths].sort(compareIgnoredPaths),
-    changedPaths: changedPaths.sort(compareIgnoredPaths),
+    changedPaths: [...changedPaths].sort(compareIgnoredPaths),
   };
 }
 
@@ -2687,8 +2687,9 @@ export async function createLocalBranch(
       signal,
       timeout: GIT_MUTATION_TIMEOUT_MS,
     });
+    const head = await getVerifiedRefCommit(pi, rootCtx, "HEAD", "HEAD", signal);
 
-    return { repoRoot, previousBranch: safeDetail(previousBranch), newBranch: safeDetail(branchName) };
+    return { repoRoot, previousBranch: safeDetail(previousBranch), newBranch: safeDetail(branchName), head };
   });
 }
 
@@ -2726,6 +2727,7 @@ export async function changeExistingLocalBranch(
     if (current.detached || current.currentBranch !== branchName) {
       throw new Error(`git switch did not end on branch '${redactSecrets(branchName)}'.`);
     }
+    const head = await getVerifiedRefCommit(pi, rootCtx, "HEAD", "HEAD", signal);
 
     return {
       repoRoot,
@@ -2733,6 +2735,7 @@ export async function changeExistingLocalBranch(
       previousDetached: previous.detached,
       currentBranch: safeDetail(current.currentBranch),
       hasChangesBeforeSwitch: false,
+      head,
     };
   });
 }
@@ -2882,6 +2885,7 @@ export async function pullCurrentBranch(
       signal,
       timeout: GIT_PULL_TIMEOUT_MS,
     });
+    const head = await getVerifiedRefCommit(pi, rootCtx, "HEAD", "HEAD", signal);
 
     return {
       repoRoot,
@@ -2890,6 +2894,7 @@ export async function pullCurrentBranch(
       remote: safeDetail(target.remote),
       remoteRef: safeDetail(target.remoteRef),
       output: safeOutput(result.stdout || result.stderr),
+      head,
     };
   });
 }
@@ -2981,6 +2986,11 @@ export async function pushCurrentBranch(
       signal,
       timeout: GIT_PUSH_TIMEOUT_MS,
     });
+    // The push updated the remote-tracking ref of the pushed branch; reading it
+    // back is the remote-visible HEAD the receipt proves, without another fetch.
+    const remoteTrackingRef = `${target.remote}/${target.remoteRef.replace(/^refs\/heads\//u, "")}`;
+    const head = await getVerifiedRefCommit(pi, rootCtx, "HEAD", "HEAD", signal);
+    const remoteHead = await getRemoteTrackingRefCommit(pi, rootCtx, remoteTrackingRef, signal);
 
     return {
       repoRoot,
@@ -2991,6 +3001,9 @@ export async function pushCurrentBranch(
       remoteRef: safeDetail(target.remoteRef),
       refspec: safeDetail(target.refspec),
       output: safeOutput(result.stdout || result.stderr),
+      head,
+      remoteTrackingRef: safeDetail(remoteTrackingRef),
+      remoteHead,
     };
   });
 }

package/src/tools/branchme-tools.ts

@@ -245,7 +245,7 @@ export function formatBranchStatus(details: GitContextDetails): string {
 
 export function formatChangeBranch(details: ChangeBranchDetails): string {
   const previous = details.previousDetached ? "detached HEAD" : details.previousBranch ?? "unknown branch";
-  return `Changed branch from ${previous} to ${details.currentBranch}.`;
+  return `Changed branch from ${previous} to ${details.currentBranch} at ${details.head}.`;
 }
 
 export function formatPullRequest(details: PullRequestToolDetails, autofilledFields: PullRequestInputField[] = []): string {
@@ -641,7 +641,7 @@ export function registerBranchMeTools(pi: Pick<ExtensionAPI, "registerTool" | "e
         content: [
           {
             type: "text",
-            text: `Created and checked out branch ${details.newBranch} from ${details.previousBranch}.`,
+            text: `Created and checked out branch ${details.newBranch} from ${details.previousBranch} at ${details.head}.`,
           },
         ],
         details,
@@ -735,7 +735,7 @@ export function registerBranchMeTools(pi: Pick<ExtensionAPI, "registerTool" | "e
     async execute(_toolCallId, _params, signal, _onUpdate, ctx) {
       const details = await pullCurrentBranch(pi, ctx, signal);
       return {
-        content: [{ type: "text", text: `Pulled current branch ${details.currentBranch} with fast-forward-only semantics.` }],
+        content: [{ type: "text", text: `Pulled current branch ${details.currentBranch} with fast-forward-only semantics; HEAD ${details.head}.` }],
         details,
       };
     },
@@ -846,8 +846,9 @@ export function registerBranchMeTools(pi: Pick<ExtensionAPI, "registerTool" | "e
     async execute(_toolCallId, _params, signal, _onUpdate, ctx) {
       const details = await pushCurrentBranch(pi, ctx, signal);
       const action = details.mode === "publish" ? "Published" : "Pushed";
+      const remoteState = details.remoteHead === details.head ? "matches" : `is at ${details.remoteHead}`;
       return {
-        content: [{ type: "text", text: `${action} current branch ${details.currentBranch}.` }],
+        content: [{ type: "text", text: `${action} current branch ${details.currentBranch} at ${details.head}; ${details.remoteTrackingRef} ${remoteState}.` }],
         details,
       };
     },

package/src/types.ts

@@ -280,6 +280,8 @@ export interface CreateBranchDetails {
   repoRoot: string;
   previousBranch: string;
   newBranch: string;
+  /** Full commit identity the new branch starts at (HEAD after the switch). */
+  head: string;
 }
 
 export interface ChangeBranchDetails {
@@ -288,6 +290,8 @@ export interface ChangeBranchDetails {
   previousDetached: boolean;
   currentBranch: string;
   hasChangesBeforeSwitch: false;
+  /** Full commit identity of HEAD after the switch. */
+  head: string;
 }
 
 export interface FetchBranchDetails {
@@ -318,6 +322,8 @@ export interface PullBranchDetails {
   remote: string;
   remoteRef: string;
   output: string;
+  /** Full commit identity of HEAD after the fast-forward. */
+  head: string;
 }
 
 export interface RebaseBranchDetails {
@@ -338,6 +344,12 @@ export interface PushBranchDetails {
   remoteRef: string;
   refspec: string;
   output: string;
+  /** Full commit identity of the local HEAD that was pushed. */
+  head: string;
+  /** Remote-tracking ref updated by the push, for example origin/feature/x. */
+  remoteTrackingRef: string;
+  /** Full commit identity of that remote-tracking ref after the push: the remote-visible HEAD. */
+  remoteHead: string;
 }
 
 export type IntegrateBranchStatus = "already_integrated" | "fast_forward" | "merge_commit" | "conflict" | "conflict_kept";