@mrpatronz/nexusflow 0.2.5 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/core/worktree.d.ts.map +1 -1
  2. package/dist/core/worktree.js +21 -13
  3. package/dist/core/worktree.js.map +1 -1
  4. package/package.json +1 -1
  5. package/src/core/worktree.ts +21 -12
package/dist/core/worktree.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/core/worktree.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CA+Df;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CAOf"}
1
+ {"version":3,"file":"worktree.d.ts","sourceRoot":"","sources":["../../src/core/worktree.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAwEf;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,KAAK,UAAQ,GACZ,OAAO,CAAC,IAAI,CAAC,CAOf"}
package/dist/core/worktree.js CHANGED
@@ -25,22 +25,30 @@ export async function createWorktree(repoPath, targetPath, branchName, baseBranc
25
25
  catch {
26
26
  // Silently ignore fetch failures (e.g., offline or no remote origin)
27
27
  }
28
- // Update local baseBranch to keep it in sync with remote before branching
28
+ // Update local base branch, main, and master to keep them in sync with remote before branching
29
29
  if (fetched) {
30
30
  try {
31
- // Find out if the main repo currently has baseBranch checked out
32
- const { stdout: currentBranch } = await execa('git', ['branch', '--show-current'], { cwd: repoPath });
33
- if (currentBranch.trim() === baseBranch) {
34
- // Safe fast-forward pull
35
- await execa('git', ['pull', '--ff-only'], { cwd: repoPath });
36
- }
37
- else {
38
- // Fast-forward local ref from remote ref without checkout
39
- await execa('git', ['fetch', 'origin', `${baseBranch}:${baseBranch}`], { cwd: repoPath });
31
+ const { stdout: currentBranchRaw } = await execa('git', ['branch', '--show-current'], { cwd: repoPath });
32
+ const currentBranch = currentBranchRaw.trim();
33
+ const branchesToUpdate = Array.from(new Set([baseBranch, 'main', 'master']));
34
+ for (const branch of branchesToUpdate) {
35
+ try {
36
+ if (currentBranch === branch) {
37
+ // Safe fast-forward pull for the currently checked-out branch
38
+ await execa('git', ['pull', '--ff-only'], { cwd: repoPath });
39
+ }
40
+ else {
41
+ // Fast-forward local ref from remote ref without checkout
42
+ await execa('git', ['fetch', 'origin', `${branch}:${branch}`], { cwd: repoPath });
43
+ }
44
+ }
45
+ catch {
46
+ // Ignore individual branch update failures
47
+ }
40
48
  }
41
49
  }
42
50
  catch {
43
- // Ignore failures (e.g. non-fast-forward, uncommitted changes, or no upstream tracking branch)
51
+ // Ignore failures
44
52
  }
45
53
  }
46
54
  // Determine starting point: remote branch if fetched successfully and exists, else local branch.
@@ -69,8 +77,8 @@ export async function createWorktree(repoPath, targetPath, branchName, baseBranc
69
77
  await execa('git', ['worktree', 'add', targetPath, branchName], { cwd: repoPath });
70
78
  }
71
79
  else {
72
- // If the branch does not exist, create a new branch based on the start point
73
- await execa('git', ['worktree', 'add', targetPath, '-b', branchName, startPoint], { cwd: repoPath });
80
+ // If the branch does not exist, create a new branch based on the start point without tracking it
81
+ await execa('git', ['worktree', 'add', '--no-track', targetPath, '-b', branchName, startPoint], { cwd: repoPath });
74
82
  }
75
83
  }
76
84
  /**
package/dist/core/worktree.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/core/worktree.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,QAAgB,EAChB,UAAkB,EAClB,UAAkB,EAClB,UAAkB;IAElB,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,6BAA6B;IAC7B,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC;IAAC,MAAM,CAAC;QACP,qEAAqE;IACvE,CAAC;IAED,0EAA0E;IAC1E,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,iEAAiE;YACjE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;YACtG,IAAI,aAAa,CAAC,IAAI,EAAE,KAAK,UAAU,EAAE,CAAC;gBACxC,yBAAyB;gBACzB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBACN,0DAA0D;gBAC1D,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,UAAU,IAAI,UAAU,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5F,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,+FAA+F;QACjG,CAAC;IACH,CAAC;IAED,iGAAiG;IACjG,IAAI,UAAU,GAAG,UAAU,CAAC;IAC5B,IAAI,OAAO,EAAE,CAAC;QACZ,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,UAAU,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;YACzF,UAAU,GAAG,UAAU,UAAU,EAAE,CAAC;QACtC,CAAC;QAAC,MAAM,CAAC;YACP,kEAAkE;QACpE,CAAC;IACH,CAAC;IAED,oDAAoD;IACpD,IAAI,YAAY,GAAG,KAAK,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7E,YAAY,GAAG,IAAI,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC;QACP,gCAAgC;IAClC,CAAC;IAED,sBAAsB;IACtB,IAAI,YAAY,EAAE,CAAC;QACjB,6DAA6D;QAC7D,MAAM,KAAK,CACT,KAAK,EACL,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,EAC3C,EAAE,GAAG,EAAE,QAAQ,EAAE,CAClB,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,6EAA6E;QAC7E,MAAM,KAAK,CACT,KAAK,EACL,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,EAC7D,EAAE,GAAG,EAAE,QAAQ,EAAE,CAClB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,QAAgB,EAChB,YAAoB,EACpB,KAAK,GAAG,KAAK;IAEb,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACpC,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACxB,MAAM,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC9C,CAAC"}
1
+ {"version":3,"file":"worktree.js","sourceRoot":"","sources":["../../src/core/worktree.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mrpatronz/nexusflow",
3
- "version": "0.2.5",
3
+ "version": "0.2.7",
4
4
  "description": "Combine multiple repos into a workspace with rich AI assistant context",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/src/core/worktree.ts CHANGED
@@ -32,20 +32,29 @@ export async function createWorktree(
32
32
  // Silently ignore fetch failures (e.g., offline or no remote origin)
33
33
  }
34
34
 
35
- // Update local baseBranch to keep it in sync with remote before branching
35
+ // Update local base branch, main, and master to keep them in sync with remote before branching
36
36
  if (fetched) {
37
37
  try {
38
- // Find out if the main repo currently has baseBranch checked out
39
- const { stdout: currentBranch } = await execa('git', ['branch', '--show-current'], { cwd: repoPath });
40
- if (currentBranch.trim() === baseBranch) {
41
- // Safe fast-forward pull
42
- await execa('git', ['pull', '--ff-only'], { cwd: repoPath });
43
- } else {
44
- // Fast-forward local ref from remote ref without checkout
45
- await execa('git', ['fetch', 'origin', `${baseBranch}:${baseBranch}`], { cwd: repoPath });
38
+ const { stdout: currentBranchRaw } = await execa('git', ['branch', '--show-current'], { cwd: repoPath });
39
+ const currentBranch = currentBranchRaw.trim();
40
+
41
+ const branchesToUpdate = Array.from(new Set([baseBranch, 'main', 'master']));
42
+
43
+ for (const branch of branchesToUpdate) {
44
+ try {
45
+ if (currentBranch === branch) {
46
+ // Safe fast-forward pull for the currently checked-out branch
47
+ await execa('git', ['pull', '--ff-only'], { cwd: repoPath });
48
+ } else {
49
+ // Fast-forward local ref from remote ref without checkout
50
+ await execa('git', ['fetch', 'origin', `${branch}:${branch}`], { cwd: repoPath });
51
+ }
52
+ } catch {
53
+ // Ignore individual branch update failures
54
+ }
46
55
  }
47
56
  } catch {
48
- // Ignore failures (e.g. non-fast-forward, uncommitted changes, or no upstream tracking branch)
57
+ // Ignore failures
49
58
  }
50
59
  }
51
60
 
@@ -78,10 +87,10 @@ export async function createWorktree(
78
87
  { cwd: repoPath },
79
88
  );
80
89
  } else {
81
- // If the branch does not exist, create a new branch based on the start point
90
+ // If the branch does not exist, create a new branch based on the start point without tracking it
82
91
  await execa(
83
92
  'git',
84
- ['worktree', 'add', targetPath, '-b', branchName, startPoint],
93
+ ['worktree', 'add', '--no-track', targetPath, '-b', branchName, startPoint],
85
94
  { cwd: repoPath },
86
95
  );
87
96
  }