@nonbot/cli 0.9.4 → 0.9.5

package/dist/lib/choir/coordinated-set.js

@@ -7,6 +7,7 @@ import { addWorktree as defaultAddWorktree } from './worktree.js';
 import { createHub as defaultCreateHub } from './hub.js';
 import { PROVIDER_PROFILES } from '../command-builders.js';
 import { validateRepoPath } from '../payload-validator.js';
+import { resolveBaseBranch as defaultResolveBaseBranch } from './isolated-session.js';
 const defaultFs = {
     mkdirSync: (p, opts) => nodeFs.mkdirSync(p, opts),
     writeFileSync: (p, data, opts) => nodeFs.writeFileSync(p, data, opts),
@@ -122,7 +123,8 @@ export async function launchCoordinatedSet(args) {
         throw new Error('coordinated set token minting produced an empty token');
     }
     const sessionId = `choir_${sessionName}_${token.slice(0, 8)}`;
-    const baseBranch = 'HEAD';
+    const resolveBaseBranchFn = deps.resolveBaseBranchImpl ?? defaultResolveBaseBranch;
+    const baseBranch = resolveBaseBranchFn(repoRoot);
     const hub = createHubImpl({
         sessionId,
         repoRoot,

package/dist/lib/choir/isolated-session.js

@@ -74,7 +74,7 @@ export function reconcileAndCleanup(session, deps = {}) {
     if (!reconcile.blocked) {
         for (const p of session.panes) {
             try {
-                removeWorktreeImpl({ repoRoot: session.repoRoot, worktreePath: p.worktreePath });
+                removeWorktreeImpl({ repoRoot: session.repoRoot, worktreePath: p.worktreePath, force: true });
                 removed.push(p.worktreePath);
             }
             catch {

package/dist/lib/choir/worktree.js

@@ -84,8 +84,9 @@ export function listWorktrees(repoRoot, spawnImpl = nodeSpawnSync) {
     return entries;
 }
 export function removeWorktree(args) {
-    const { repoRoot, worktreePath, spawnImpl = nodeSpawnSync } = args;
-    const r = runGit(spawnImpl, repoRoot, ['worktree', 'remove', worktreePath]);
+    const { repoRoot, worktreePath, spawnImpl = nodeSpawnSync, force = false } = args;
+    const flags = force ? ['--force'] : [];
+    const r = runGit(spawnImpl, repoRoot, ['worktree', 'remove', ...flags, worktreePath]);
     assertOk(r, 'worktree remove');
 }
 export function ensureChoirGitignored(repoRoot, fsImpl = defaultFs) {

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '0.9.4';
+export const VERSION = '0.9.5';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nonbot/cli",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "type": "module",
   "description": "The local host for non.bot ▶ Run — opens a terminal on your machine and starts the work in your linked repo.",
   "license": "UNLICENSED",