agor-live 0.14.2 → 0.14.3

package/bin/version-check.js

@@ -1,19 +1,21 @@
 /**
  * Node.js version check utility
- * Used by CLI and daemon entry points to ensure Node 20+ requirement
+ * Used by CLI and daemon entry points to ensure Node 22+ requirement
  */
 
 import chalk from 'chalk';
 
 export function checkNodeVersion() {
   const nodeVersion = process.versions.node;
-  const majorVersion = parseInt(nodeVersion.split('.')[0], 10);
+  const [majorStr, minorStr] = nodeVersion.split('.');
+  const major = parseInt(majorStr, 10);
+  const minor = parseInt(minorStr, 10);
 
-  if (majorVersion < 20) {
-    console.error(chalk.red('✖ Error: Agor requires Node.js v20.0.0 or higher'));
+  if (major < 22 || (major === 22 && minor < 12)) {
+    console.error(chalk.red('✖ Error: Agor requires Node.js v22.12.0 or higher'));
     console.error(chalk.yellow(`  Current version: v${nodeVersion}\n`));
     console.error('Please upgrade Node.js:');
-    console.error(`  • Using nvm: ${chalk.cyan('nvm install 20 && nvm use 20')}`);
+    console.error(`  • Using nvm: ${chalk.cyan('nvm install 22 && nvm use 22')}`);
     console.error(`  • Download: ${chalk.cyan('https://nodejs.org/')}\n`);
     process.exit(1);
   }

package/dist/core/api/index.d.cts

@@ -1,11 +1,11 @@
 import { i as Message } from '../message-kDoxvdzV.cjs';
 import { e as Board, f as BoardExportBlob } from '../board-HBLXfsPa.cjs';
 import { a as ContextFileListItem, b as ContextFileDetail } from '../context-ByxGjp5l.cjs';
-import { b as AuthenticationResult } from '../feathers-B78IxAoi.cjs';
+import { b as AuthenticationResult } from '../feathers-5DsXBqOW.cjs';
 import { f as Session } from '../session-DmaExlXI.cjs';
 import { d as User } from '../user-D8Z4aURB.cjs';
 import { i as MCPServer } from '../mcp-DhSSHDnR.cjs';
-import { b as Repo, d as Worktree } from '../worktree-BUhwPBvP.cjs';
+import { b as Repo, d as Worktree } from '../worktree-CvakJ5w4.cjs';
 import { c as Task } from '../task-Cw2N74jk.cjs';
 import { Params, Paginated, Application } from '@feathersjs/feathers';
 import { Socket } from 'socket.io-client';

package/dist/core/api/index.d.ts

@@ -1,11 +1,11 @@
 import { i as Message } from '../message-C9XTt2nM.js';
 import { e as Board, f as BoardExportBlob } from '../board-CD258gWW.js';
 import { a as ContextFileListItem, b as ContextFileDetail } from '../context-ByxGjp5l.js';
-import { b as AuthenticationResult } from '../feathers-MlqnVpas.js';
+import { b as AuthenticationResult } from '../feathers-qrz_9jSJ.js';
 import { f as Session } from '../session-0b_yCNQr.js';
 import { d as User } from '../user-BpflK7uR.js';
 import { i as MCPServer } from '../mcp-Db0cL7Xc.js';
-import { b as Repo, d as Worktree } from '../worktree-z5k683z2.js';
+import { b as Repo, d as Worktree } from '../worktree-Dr_m10w8.js';
 import { c as Task } from '../task-C2jNGWSt.js';
 import { Params, Paginated, Application } from '@feathersjs/feathers';
 import { Socket } from 'socket.io-client';

package/dist/core/config/browser.d.cts

@@ -1,6 +1,6 @@
-import { R as RepoSlug, W as WorktreeName, b as Repo, d as Worktree } from '../worktree-BUhwPBvP.cjs';
+import { R as RepoSlug, W as WorktreeName, b as Repo, d as Worktree } from '../worktree-CvakJ5w4.cjs';
 import { U as UUID } from '../id-BwPJtWxW.cjs';
-export { f as AgorCodexSettings, k as AgorConfig, i as AgorCredentials, b as AgorDaemonSettings, e as AgorDatabaseSettings, A as AgorDefaults, a as AgorDisplaySettings, g as AgorExecutionSettings, j as AgorOnboardingSettings, d as AgorOpenCodeSettings, h as AgorPathSettings, c as AgorUISettings, l as ConfigKey, C as CredentialKey, U as UnknownJson } from '../types-D7s9-Y1x.cjs';
+export { f as AgorCodexSettings, k as AgorConfig, i as AgorCredentials, b as AgorDaemonSettings, e as AgorDatabaseSettings, A as AgorDefaults, a as AgorDisplaySettings, g as AgorExecutionSettings, j as AgorOnboardingSettings, d as AgorOpenCodeSettings, h as AgorPathSettings, c as AgorUISettings, l as ConfigKey, C as CredentialKey, U as UnknownJson } from '../types-Cox7HmbB.cjs';
 
 /**
  * App-level constants for Agor

package/dist/core/config/browser.d.ts

@@ -1,6 +1,6 @@
-import { R as RepoSlug, W as WorktreeName, b as Repo, d as Worktree } from '../worktree-z5k683z2.js';
+import { R as RepoSlug, W as WorktreeName, b as Repo, d as Worktree } from '../worktree-Dr_m10w8.js';
 import { U as UUID } from '../id-BwPJtWxW.js';
-export { f as AgorCodexSettings, k as AgorConfig, i as AgorCredentials, b as AgorDaemonSettings, e as AgorDatabaseSettings, A as AgorDefaults, a as AgorDisplaySettings, g as AgorExecutionSettings, j as AgorOnboardingSettings, d as AgorOpenCodeSettings, h as AgorPathSettings, c as AgorUISettings, l as ConfigKey, C as CredentialKey, U as UnknownJson } from '../types-D7s9-Y1x.js';
+export { f as AgorCodexSettings, k as AgorConfig, i as AgorCredentials, b as AgorDaemonSettings, e as AgorDatabaseSettings, A as AgorDefaults, a as AgorDisplaySettings, g as AgorExecutionSettings, j as AgorOnboardingSettings, d as AgorOpenCodeSettings, h as AgorPathSettings, c as AgorUISettings, l as ConfigKey, C as CredentialKey, U as UnknownJson } from '../types-Cox7HmbB.js';
 
 /**
  * App-level constants for Agor

package/dist/core/config/index.d.cts

@@ -1,9 +1,9 @@
-import { h as RepoEnvironmentConfig } from '../worktree-BUhwPBvP.cjs';
-export { c as ensureCodexHome, e as expandHomePath, g as getAgorHome, j as getBaseUrl, a as getConfigPath, d as getConfigValue, m as getCredential, h as getDaemonUrl, n as getDaemonUser, t as getDataHome, y as getDataHomeAsync, b as getDefaultConfig, v as getReposDir, z as getReposDirAsync, x as getWorktreePath, w as getWorktreesDir, A as getWorktreesDirAsync, i as initConfig, q as isUnixImpersonationEnabled, p as isWorktreeRbacEnabled, l as loadConfig, k as loadConfigSync, o as requireDaemonUser, r as resolveCodexHome, s as saveConfig, f as setConfigValue, u as unsetConfigValue } from '../config-manager-4zF2cWdg.cjs';
+import { h as RepoEnvironmentConfig } from '../worktree-CvakJ5w4.cjs';
+export { c as ensureCodexHome, e as expandHomePath, g as getAgorHome, j as getBaseUrl, a as getConfigPath, d as getConfigValue, m as getCredential, h as getDaemonUrl, n as getDaemonUser, t as getDataHome, y as getDataHomeAsync, b as getDefaultConfig, v as getReposDir, z as getReposDirAsync, x as getWorktreePath, w as getWorktreesDir, A as getWorktreesDirAsync, i as initConfig, q as isUnixImpersonationEnabled, p as isWorktreeRbacEnabled, l as loadConfig, k as loadConfigSync, o as requireDaemonUser, r as resolveCodexHome, s as saveConfig, f as setConfigValue, u as unsetConfigValue } from '../config-manager-Dw2LXbKq.cjs';
 export { DAEMON, DATABASE, ENVIRONMENT, GIT, PAGINATION, RepoReference, RepoReferenceOption, SESSION, WEBSOCKET, extractSlugFromUrl, formatRepoReference, getDefaultRepoReference, getGroupedRepoReferenceOptions, getRepoReferenceOptions, isValidGitUrl, isValidSlug, parseRepoReference, resolveRepoReference } from './browser.cjs';
 import { d as Database } from '../client-uz0_yQFy.cjs';
 import { b as UserID } from '../id-BwPJtWxW.cjs';
-export { f as AgorCodexSettings, k as AgorConfig, i as AgorCredentials, b as AgorDaemonSettings, e as AgorDatabaseSettings, A as AgorDefaults, a as AgorDisplaySettings, g as AgorExecutionSettings, j as AgorOnboardingSettings, d as AgorOpenCodeSettings, h as AgorPathSettings, c as AgorUISettings, l as ConfigKey, C as CredentialKey, U as UnknownJson } from '../types-D7s9-Y1x.cjs';
+export { f as AgorCodexSettings, k as AgorConfig, i as AgorCredentials, b as AgorDaemonSettings, e as AgorDatabaseSettings, A as AgorDefaults, a as AgorDisplaySettings, g as AgorExecutionSettings, j as AgorOnboardingSettings, d as AgorOpenCodeSettings, h as AgorPathSettings, c as AgorUISettings, l as ConfigKey, C as CredentialKey, U as UnknownJson } from '../types-Cox7HmbB.cjs';
 import 'drizzle-orm/libsql';
 import 'drizzle-orm/postgres-js';
 import 'drizzle-orm';

package/dist/core/config/index.d.ts

@@ -1,9 +1,9 @@
-import { h as RepoEnvironmentConfig } from '../worktree-z5k683z2.js';
-export { c as ensureCodexHome, e as expandHomePath, g as getAgorHome, j as getBaseUrl, a as getConfigPath, d as getConfigValue, m as getCredential, h as getDaemonUrl, n as getDaemonUser, t as getDataHome, y as getDataHomeAsync, b as getDefaultConfig, v as getReposDir, z as getReposDirAsync, x as getWorktreePath, w as getWorktreesDir, A as getWorktreesDirAsync, i as initConfig, q as isUnixImpersonationEnabled, p as isWorktreeRbacEnabled, l as loadConfig, k as loadConfigSync, o as requireDaemonUser, r as resolveCodexHome, s as saveConfig, f as setConfigValue, u as unsetConfigValue } from '../config-manager-DdwPsKTh.js';
+import { h as RepoEnvironmentConfig } from '../worktree-Dr_m10w8.js';
+export { c as ensureCodexHome, e as expandHomePath, g as getAgorHome, j as getBaseUrl, a as getConfigPath, d as getConfigValue, m as getCredential, h as getDaemonUrl, n as getDaemonUser, t as getDataHome, y as getDataHomeAsync, b as getDefaultConfig, v as getReposDir, z as getReposDirAsync, x as getWorktreePath, w as getWorktreesDir, A as getWorktreesDirAsync, i as initConfig, q as isUnixImpersonationEnabled, p as isWorktreeRbacEnabled, l as loadConfig, k as loadConfigSync, o as requireDaemonUser, r as resolveCodexHome, s as saveConfig, f as setConfigValue, u as unsetConfigValue } from '../config-manager-BDJG7HPR.js';
 export { DAEMON, DATABASE, ENVIRONMENT, GIT, PAGINATION, RepoReference, RepoReferenceOption, SESSION, WEBSOCKET, extractSlugFromUrl, formatRepoReference, getDefaultRepoReference, getGroupedRepoReferenceOptions, getRepoReferenceOptions, isValidGitUrl, isValidSlug, parseRepoReference, resolveRepoReference } from './browser.js';
 import { d as Database } from '../client-BOtnEgnk.js';
 import { b as UserID } from '../id-BwPJtWxW.js';
-export { f as AgorCodexSettings, k as AgorConfig, i as AgorCredentials, b as AgorDaemonSettings, e as AgorDatabaseSettings, A as AgorDefaults, a as AgorDisplaySettings, g as AgorExecutionSettings, j as AgorOnboardingSettings, d as AgorOpenCodeSettings, h as AgorPathSettings, c as AgorUISettings, l as ConfigKey, C as CredentialKey, U as UnknownJson } from '../types-D7s9-Y1x.js';
+export { f as AgorCodexSettings, k as AgorConfig, i as AgorCredentials, b as AgorDaemonSettings, e as AgorDatabaseSettings, A as AgorDefaults, a as AgorDisplaySettings, g as AgorExecutionSettings, j as AgorOnboardingSettings, d as AgorOpenCodeSettings, h as AgorPathSettings, c as AgorUISettings, l as ConfigKey, C as CredentialKey, U as UnknownJson } from '../types-Cox7HmbB.js';
 import 'drizzle-orm/libsql';
 import 'drizzle-orm/postgres-js';
 import 'drizzle-orm';

package/dist/core/{config-manager-DdwPsKTh.d.ts → config-manager-BDJG7HPR.d.ts}

@@ -1,4 +1,4 @@
-import { k as AgorConfig } from './types-D7s9-Y1x.js';
+import { k as AgorConfig } from './types-Cox7HmbB.js';
 
 /**
  * Agor Config Manager

package/dist/core/{config-manager-4zF2cWdg.d.cts → config-manager-Dw2LXbKq.d.cts}

@@ -1,4 +1,4 @@
-import { k as AgorConfig } from './types-D7s9-Y1x.cjs';
+import { k as AgorConfig } from './types-Cox7HmbB.cjs';
 
 /**
  * Agor Config Manager

package/dist/core/db/index.cjs

@@ -4918,12 +4918,9 @@ var SessionRepository = class {
         const current = this.rowToSession(currentRow, boardId, boardSlug, baseUrl);
         const merged = deepMerge(current, updates);
         const insertData = this.sessionToInsert(merged);
-        await update(tx, sessions3).set({
-          status: insertData.status,
-          updated_at: /* @__PURE__ */ new Date(),
-          ready_for_prompt: insertData.ready_for_prompt,
-          data: insertData.data
-        }).where((0, import_drizzle_orm12.eq)(sessions3.session_id, fullId)).run();
+        insertData.updated_at = /* @__PURE__ */ new Date();
+        await update(tx, sessions3).set(insertData).where((0, import_drizzle_orm12.eq)(sessions3.session_id, fullId)).run();
+        merged.last_updated = insertData.updated_at.toISOString();
         return merged;
       });
       return result;

package/dist/core/db/index.d.cts

@@ -17,7 +17,7 @@ import { a as BoardEntityObject, e as Board, d as BoardObject, f as BoardExportB
 import { c as GatewayChannel, G as GatewayChannelID, d as ThreadSessionMap, a as ThreadStatus, T as ThreadSessionMapID } from '../gateway-DmSEDGAS.cjs';
 import { i as MCPServer, C as CreateMCPServerInput, U as UpdateMCPServerInput, j as MCPServerFilters, M as MCPServerID, S as SessionMCPServer } from '../mcp-DhSSHDnR.cjs';
 import { i as Message } from '../message-kDoxvdzV.cjs';
-import { b as Repo, d as Worktree } from '../worktree-BUhwPBvP.cjs';
+import { b as Repo, d as Worktree } from '../worktree-CvakJ5w4.cjs';
 import { c as Task } from '../task-Cw2N74jk.cjs';
 import { d as User } from '../user-D8Z4aURB.cjs';
 import { S as SessionStatus, A as AgenticToolName, f as Session, P as PermissionMode, c as CodexSandboxMode, d as CodexApprovalPolicy } from '../session-DmaExlXI.cjs';

package/dist/core/db/index.d.ts

@@ -17,7 +17,7 @@ import { a as BoardEntityObject, e as Board, d as BoardObject, f as BoardExportB
 import { c as GatewayChannel, G as GatewayChannelID, d as ThreadSessionMap, a as ThreadStatus, T as ThreadSessionMapID } from '../gateway-BlmPS6ee.js';
 import { i as MCPServer, C as CreateMCPServerInput, U as UpdateMCPServerInput, j as MCPServerFilters, M as MCPServerID, S as SessionMCPServer } from '../mcp-Db0cL7Xc.js';
 import { i as Message } from '../message-C9XTt2nM.js';
-import { b as Repo, d as Worktree } from '../worktree-z5k683z2.js';
+import { b as Repo, d as Worktree } from '../worktree-Dr_m10w8.js';
 import { c as Task } from '../task-C2jNGWSt.js';
 import { d as User } from '../user-BpflK7uR.js';
 import { S as SessionStatus, A as AgenticToolName, f as Session, P as PermissionMode, c as CodexSandboxMode, d as CodexApprovalPolicy } from '../session-0b_yCNQr.js';

package/dist/core/db/index.js

@@ -4824,12 +4824,9 @@ var SessionRepository = class {
         const current = this.rowToSession(currentRow, boardId, boardSlug, baseUrl);
         const merged = deepMerge(current, updates);
         const insertData = this.sessionToInsert(merged);
-        await update(tx, sessions3).set({
-          status: insertData.status,
-          updated_at: /* @__PURE__ */ new Date(),
-          ready_for_prompt: insertData.ready_for_prompt,
-          data: insertData.data
-        }).where(eq9(sessions3.session_id, fullId)).run();
+        insertData.updated_at = /* @__PURE__ */ new Date();
+        await update(tx, sessions3).set(insertData).where(eq9(sessions3.session_id, fullId)).run();
+        merged.last_updated = insertData.updated_at.toISOString();
         return merged;
       });
       return result;

package/dist/core/environment/variable-resolver.d.cts

@@ -1,4 +1,4 @@
-import { g as WorktreeEnvironmentInstance } from '../worktree-BUhwPBvP.cjs';
+import { g as WorktreeEnvironmentInstance } from '../worktree-CvakJ5w4.cjs';
 import '../id-BwPJtWxW.cjs';
 
 /**

package/dist/core/environment/variable-resolver.d.ts

@@ -1,4 +1,4 @@
-import { g as WorktreeEnvironmentInstance } from '../worktree-z5k683z2.js';
+import { g as WorktreeEnvironmentInstance } from '../worktree-Dr_m10w8.js';
 import '../id-BwPJtWxW.js';
 
 /**

package/dist/core/{feathers-B78IxAoi.d.cts → feathers-5DsXBqOW.d.cts}

@@ -1,5 +1,5 @@
 import { f as Session } from './session-DmaExlXI.cjs';
-import { d as Worktree } from './worktree-BUhwPBvP.cjs';
+import { d as Worktree } from './worktree-CvakJ5w4.cjs';
 import { Params, HookContext as HookContext$1, Paginated } from '@feathersjs/feathers';
 
 /**
@@ -15,6 +15,8 @@ interface AuthenticatedUser {
     email: string;
     /** User role (for authorization) - always defined, defaults to 'member' */
     role: string;
+    /** True for service accounts (executor) — bypasses RBAC checks */
+    _isServiceAccount?: boolean;
 }
 /**
  * Extended params with authentication context

package/dist/core/{feathers-MlqnVpas.d.ts → feathers-qrz_9jSJ.d.ts}

@@ -1,5 +1,5 @@
 import { f as Session } from './session-0b_yCNQr.js';
-import { d as Worktree } from './worktree-z5k683z2.js';
+import { d as Worktree } from './worktree-Dr_m10w8.js';
 import { Params, HookContext as HookContext$1, Paginated } from '@feathersjs/feathers';
 
 /**
@@ -15,6 +15,8 @@ interface AuthenticatedUser {
     email: string;
     /** User role (for authorization) - always defined, defaults to 'member' */
     role: string;
+    /** True for service accounts (executor) — bypasses RBAC checks */
+    _isServiceAccount?: boolean;
 }
 /**
  * Extended params with authentication context

package/dist/core/gateway/index.cjs

@@ -30,6 +30,7 @@ module.exports = __toCommonJS(gateway_exports);
 // src/gateway/connectors/slack.ts
 var import_socket_mode = require("@slack/socket-mode");
 var import_web_api = require("@slack/web-api");
+var import_slackify_markdown = require("slackify-markdown");
 function parseThreadId(threadId) {
   const lastHyphen = threadId.lastIndexOf("-");
   if (lastHyphen === -1) {
@@ -52,7 +53,7 @@ function hasActiveMention(text, mentionPattern) {
   return mentionPattern.test(stripped);
 }
 function markdownToMrkdwn(markdown) {
-  return markdown.replace(/\*\*(.+?)\*\*/g, "*$1*").replace(/\[([^\]]+)\]\(([^)]+)\)/g, "<$2|$1>");
+  return (0, import_slackify_markdown.slackifyMarkdown)(markdown).trim();
 }
 var SlackConnector = class _SlackConnector {
   channelType = "slack";
@@ -124,7 +125,7 @@ var SlackConnector = class _SlackConnector {
     const result = await this.web.chat.postMessage({
       channel,
       thread_ts,
-      text: this.formatMessage(req.text),
+      text: req.text,
       unfurl_links: false,
       unfurl_media: false
     });

package/dist/core/gateway/index.js

@@ -1,6 +1,7 @@
 // src/gateway/connectors/slack.ts
 import { SocketModeClient } from "@slack/socket-mode";
 import { WebClient } from "@slack/web-api";
+import { slackifyMarkdown } from "slackify-markdown";
 function parseThreadId(threadId) {
   const lastHyphen = threadId.lastIndexOf("-");
   if (lastHyphen === -1) {
@@ -23,7 +24,7 @@ function hasActiveMention(text, mentionPattern) {
   return mentionPattern.test(stripped);
 }
 function markdownToMrkdwn(markdown) {
-  return markdown.replace(/\*\*(.+?)\*\*/g, "*$1*").replace(/\[([^\]]+)\]\(([^)]+)\)/g, "<$2|$1>");
+  return slackifyMarkdown(markdown).trim();
 }
 var SlackConnector = class _SlackConnector {
   channelType = "slack";
@@ -95,7 +96,7 @@ var SlackConnector = class _SlackConnector {
     const result = await this.web.chat.postMessage({
       channel,
       thread_ts,
-      text: this.formatMessage(req.text),
+      text: req.text,
       unfurl_links: false,
       unfurl_media: false
     });

package/dist/core/git/index.cjs

@@ -33,6 +33,7 @@ __export(git_exports, {
   cleanWorktree: () => cleanWorktree,
   cloneRepo: () => cloneRepo,
   createWorktree: () => createWorktree,
+  deleteBranch: () => deleteBranch,
   deleteRepoDirectory: () => deleteRepoDirectory,
   deleteWorktreeDirectory: () => deleteWorktreeDirectory,
   extractRepoName: () => extractRepoName,
@@ -208,6 +209,9 @@ function createGit(baseDir, env) {
     baseDir,
     binary: gitBinary,
     config,
+    unsafe: {
+      allowUnsafeSshCommand: true
+    },
     spawnOptions: env ? {
       env: { ...process.env, ...env }
       // biome-ignore lint/suspicious/noExplicitAny: simple-git types don't expose env in spawnOptions
@@ -394,7 +398,29 @@ async function createWorktree(repoPath, worktreePath, ref, createBranch = false,
   } else {
     args.push(ref);
   }
-  await git.raw(["worktree", "add", ...args]);
+  try {
+    await git.raw(["worktree", "add", ...args]);
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    if (createBranch && errorMessage.includes("already exists")) {
+      console.warn(
+        `\u26A0\uFE0F  Branch '${ref}' already exists. Checking if it's orphaned (stale from a deleted worktree)...`
+      );
+      const worktrees = await listWorktrees(repoPath);
+      const branchInUse = worktrees.some((wt) => wt.ref === ref);
+      if (branchInUse) {
+        throw new Error(
+          `A branch named '${ref}' already exists and is in use by another worktree. Please choose a different name.`
+        );
+      }
+      console.log(`\u{1F9F9} Deleting orphaned branch '${ref}' and retrying worktree creation...`);
+      await git.raw(["branch", "-D", ref]);
+      await git.raw(["worktree", "add", ...args]);
+      console.log(`\u2705 Successfully created worktree after cleaning up stale branch '${ref}'`);
+    } else {
+      throw error;
+    }
+  }
   try {
     const worktreeGit = createGit(worktreePath, env);
     await worktreeGit.addConfig("safe.directory", worktreePath, true, "global");
@@ -547,11 +573,25 @@ async function deleteWorktreeDirectory(worktreePath) {
   }
   await rm(resolvedWorktreePath, { recursive: true, force: true });
 }
+async function deleteBranch(repoPath, branchName) {
+  const git = createGit(repoPath);
+  try {
+    await git.raw(["branch", "-D", branchName]);
+    return true;
+  } catch (error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    if (msg.includes("not found")) {
+      return false;
+    }
+    throw error;
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cleanWorktree,
   cloneRepo,
   createWorktree,
+  deleteBranch,
   deleteRepoDirectory,
   deleteWorktreeDirectory,
   extractRepoName,

package/dist/core/git/index.d.cts

@@ -1,6 +1,6 @@
 export { simpleGit } from 'simple-git';
-export { v as getReposDir, x as getWorktreePath, w as getWorktreesDir } from '../config-manager-4zF2cWdg.cjs';
-import '../types-D7s9-Y1x.cjs';
+export { v as getReposDir, x as getWorktreePath, w as getWorktreesDir } from '../config-manager-Dw2LXbKq.cjs';
+import '../types-Cox7HmbB.cjs';
 
 /**
  * Git Utils for Agor
@@ -171,5 +171,16 @@ declare function deleteRepoDirectory(repoPath: string): Promise<void>;
  * @throws Error if the path is not inside the configured worktrees directory (safety check)
  */
 declare function deleteWorktreeDirectory(worktreePath: string): Promise<void>;
+/**
+ * Delete a local git branch
+ *
+ * Uses -D (force delete) to handle branches that haven't been merged.
+ * Silently succeeds if the branch doesn't exist.
+ *
+ * @param repoPath - Path to the repository
+ * @param branchName - Branch name to delete
+ * @returns true if branch was deleted, false if it didn't exist
+ */
+declare function deleteBranch(repoPath: string, branchName: string): Promise<boolean>;
 
-export { type CloneOptions, type CloneProgress, type CloneResult, type WorktreeInfo, cleanWorktree, cloneRepo, createWorktree, deleteRepoDirectory, deleteWorktreeDirectory, extractRepoName, getCurrentBranch, getCurrentSha, getDefaultBranch, getGitState, getRemoteBranches, getRemoteUrl, hasRemoteBranch, isClean, isGitRepo, isValidGitRepo, listWorktrees, pruneWorktrees, removeWorktree };
+export { type CloneOptions, type CloneProgress, type CloneResult, type WorktreeInfo, cleanWorktree, cloneRepo, createWorktree, deleteBranch, deleteRepoDirectory, deleteWorktreeDirectory, extractRepoName, getCurrentBranch, getCurrentSha, getDefaultBranch, getGitState, getRemoteBranches, getRemoteUrl, hasRemoteBranch, isClean, isGitRepo, isValidGitRepo, listWorktrees, pruneWorktrees, removeWorktree };

package/dist/core/git/index.d.ts

@@ -1,6 +1,6 @@
 export { simpleGit } from 'simple-git';
-export { v as getReposDir, x as getWorktreePath, w as getWorktreesDir } from '../config-manager-DdwPsKTh.js';
-import '../types-D7s9-Y1x.js';
+export { v as getReposDir, x as getWorktreePath, w as getWorktreesDir } from '../config-manager-BDJG7HPR.js';
+import '../types-Cox7HmbB.js';
 
 /**
  * Git Utils for Agor
@@ -171,5 +171,16 @@ declare function deleteRepoDirectory(repoPath: string): Promise<void>;
  * @throws Error if the path is not inside the configured worktrees directory (safety check)
  */
 declare function deleteWorktreeDirectory(worktreePath: string): Promise<void>;
+/**
+ * Delete a local git branch
+ *
+ * Uses -D (force delete) to handle branches that haven't been merged.
+ * Silently succeeds if the branch doesn't exist.
+ *
+ * @param repoPath - Path to the repository
+ * @param branchName - Branch name to delete
+ * @returns true if branch was deleted, false if it didn't exist
+ */
+declare function deleteBranch(repoPath: string, branchName: string): Promise<boolean>;
 
-export { type CloneOptions, type CloneProgress, type CloneResult, type WorktreeInfo, cleanWorktree, cloneRepo, createWorktree, deleteRepoDirectory, deleteWorktreeDirectory, extractRepoName, getCurrentBranch, getCurrentSha, getDefaultBranch, getGitState, getRemoteBranches, getRemoteUrl, hasRemoteBranch, isClean, isGitRepo, isValidGitRepo, listWorktrees, pruneWorktrees, removeWorktree };
+export { type CloneOptions, type CloneProgress, type CloneResult, type WorktreeInfo, cleanWorktree, cloneRepo, createWorktree, deleteBranch, deleteRepoDirectory, deleteWorktreeDirectory, extractRepoName, getCurrentBranch, getCurrentSha, getDefaultBranch, getGitState, getRemoteBranches, getRemoteUrl, hasRemoteBranch, isClean, isGitRepo, isValidGitRepo, listWorktrees, pruneWorktrees, removeWorktree };

package/dist/core/git/index.js

@@ -152,6 +152,9 @@ function createGit(baseDir, env) {
     baseDir,
     binary: gitBinary,
     config,
+    unsafe: {
+      allowUnsafeSshCommand: true
+    },
     spawnOptions: env ? {
       env: { ...process.env, ...env }
       // biome-ignore lint/suspicious/noExplicitAny: simple-git types don't expose env in spawnOptions
@@ -338,7 +341,29 @@ async function createWorktree(repoPath, worktreePath, ref, createBranch = false,
   } else {
     args.push(ref);
   }
-  await git.raw(["worktree", "add", ...args]);
+  try {
+    await git.raw(["worktree", "add", ...args]);
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    if (createBranch && errorMessage.includes("already exists")) {
+      console.warn(
+        `\u26A0\uFE0F  Branch '${ref}' already exists. Checking if it's orphaned (stale from a deleted worktree)...`
+      );
+      const worktrees = await listWorktrees(repoPath);
+      const branchInUse = worktrees.some((wt) => wt.ref === ref);
+      if (branchInUse) {
+        throw new Error(
+          `A branch named '${ref}' already exists and is in use by another worktree. Please choose a different name.`
+        );
+      }
+      console.log(`\u{1F9F9} Deleting orphaned branch '${ref}' and retrying worktree creation...`);
+      await git.raw(["branch", "-D", ref]);
+      await git.raw(["worktree", "add", ...args]);
+      console.log(`\u2705 Successfully created worktree after cleaning up stale branch '${ref}'`);
+    } else {
+      throw error;
+    }
+  }
   try {
     const worktreeGit = createGit(worktreePath, env);
     await worktreeGit.addConfig("safe.directory", worktreePath, true, "global");
@@ -491,10 +516,24 @@ async function deleteWorktreeDirectory(worktreePath) {
   }
   await rm(resolvedWorktreePath, { recursive: true, force: true });
 }
+async function deleteBranch(repoPath, branchName) {
+  const git = createGit(repoPath);
+  try {
+    await git.raw(["branch", "-D", branchName]);
+    return true;
+  } catch (error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    if (msg.includes("not found")) {
+      return false;
+    }
+    throw error;
+  }
+}
 export {
   cleanWorktree,
   cloneRepo,
   createWorktree,
+  deleteBranch,
   deleteRepoDirectory,
   deleteWorktreeDirectory,
   extractRepoName,