@senad-d/branchme 0.3.17 → 0.3.18

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.18 - Unreleased
+
+- Made the real-Git commit lock-retry regression deterministic by releasing the fixture lock after staging encounters it, rather than on a fixed timer.
+- `integrate_branch` refuses only staged, unstaged or unmerged tracked changes in the control worktree, like `update_from_base`. Before, one untracked file refused every local merge, and no BranchMe tool can move a file.
+
 ## 0.3.17 - Unreleased
 
 - `revert_changes` refuses only ignored files at the paths the reverted commit touches, which Git could overwrite. Before, any ignored file in the checkout (`.env`, `.pi/`, `node_modules`) refused the revert, and in a repository with installed dependencies the whole-checkout listing passed the 4 MiB read cap first ("Local Git inspection exceeded the 4 MiB safety limit"), so the tool could not run in a working project.

package/README.md

@@ -421,7 +421,7 @@ If pull request field autofill is enabled, after push_branch completes create a
 
 ### Verified local branch integration
 
-`integrate_branch` requires explicit intent and exactly two distinct existing local branch names: `sourceBranch` and `targetBranch`. The active Pi worktree is the control worktree; it must be clean, have no merge/rebase/cherry-pick/revert/sequencer operation in progress, and already have `targetBranch` checked out. BranchMe never switches to the target or infers one. A source checked out in another dirty linked worktree is allowed because integration reads only its committed local ref. Remote-only refs, commit IDs, paths, repositories, remotes, and owner-prefixed refs are rejected. Optional `worktreePath` makes another worktree of the same repository the control worktree: it must be the absolute root of the primary checkout or a registered linked worktree with the same Git common directory; relative paths, subdirectories, missing, bare, and foreign paths are refused before integration starts.
+`integrate_branch` requires explicit intent and exactly two distinct existing local branch names: `sourceBranch` and `targetBranch`. The active Pi worktree is the control worktree; it must have no staged, unstaged, or unmerged tracked changes (untracked files do not block), have no merge/rebase/cherry-pick/revert/sequencer operation in progress, and already have `targetBranch` checked out. BranchMe never switches to the target or infers one. A source checked out in another dirty linked worktree is allowed because integration reads only its committed local ref. Remote-only refs, commit IDs, paths, repositories, remotes, and owner-prefixed refs are rejected. Optional `worktreePath` makes another worktree of the same repository the control worktree: it must be the absolute root of the primary checkout or a registered linked worktree with the same Git common directory; relative paths, subdirectories, missing, bare, and foreign paths are refused before integration starts.
 
 For a source not already reachable from the target, BranchMe runs this fixed normal-merge policy from the verified worktree root:
 

package/package.json

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

package/src/git-integration.ts

@@ -217,10 +217,9 @@ async function integrationSourceHead(
   return head;
 }
 
-function integrationWorkingTreeIsClean(workingTree: WorkingTreeDetails, allowUntracked: boolean): boolean {
-  return allowUntracked
-    ? workingTree.staged + workingTree.unstaged === 0
-    : workingTree.state === "clean";
+// Untracked files never block: git itself refuses a merge that would overwrite one.
+function integrationWorkingTreeIsClean(workingTree: WorkingTreeDetails): boolean {
+  return workingTree.staged + workingTree.unstaged === 0;
 }
 
 async function inspectIntegrationState(
@@ -242,7 +241,7 @@ async function inspectIntegrationState(
     timeout: GIT_STATUS_TIMEOUT_MS,
   });
   const workingTree = parseWorkingTreeStatus(statusResult.stdout).workingTree;
-  const clean = integrationWorkingTreeIsClean(workingTree, prepared.remoteSource === true || prepared.sourceHeadFixed === true);
+  const clean = integrationWorkingTreeIsClean(workingTree);
   const sourceIsAncestorOfTarget = await isCommitAncestor(
     pi,
     rootCtx,
@@ -776,9 +775,9 @@ export async function prepareBranchIntegration(
     timeout: GIT_STATUS_TIMEOUT_MS,
   });
   const workingTree = parseWorkingTreeStatus(statusResult.stdout).workingTree;
-  if (!integrationWorkingTreeIsClean(workingTree, remoteSource)) {
+  if (!integrationWorkingTreeIsClean(workingTree)) {
     throw new Error(
-      "The control worktree must be clean, with no staged, unstaged, untracked, or unmerged changes, before integration.",
+      "The control worktree must be clean, with no staged, unstaged, or unmerged tracked changes, before integration.",
     );
   }