@sideboard-ai/core 0.1.191 → 0.1.193

package/dist/{chunk-J7LQVLFQ.js → chunk-BWRS6GAS.js}

@@ -1,6 +1,9 @@
 import {
   stripNestedElectronEnv
 } from "./chunk-4TR3HZFT.js";
+import {
+  sanitizeGitBranchPrefix
+} from "./chunk-7SNJMKD6.js";
 import {
   chmodOwnerOnly,
   writePrivateFile
@@ -10,7 +13,7 @@ import {
 } from "./chunk-77WWLBCI.js";
 import {
   appDataDir
-} from "./chunk-EFVFB2AH.js";
+} from "./chunk-WFUDY6PC.js";
 
 // src/store/app-settings.ts
 import { randomUUID } from "crypto";
@@ -723,6 +726,10 @@ function normalizeAdvanced(raw) {
   if (typeof source.autoRenameBranch === "boolean") {
     out.autoRenameBranch = source.autoRenameBranch;
   }
+  if (typeof source.branchPrefix === "string") {
+    const prefix = sanitizeGitBranchPrefix(source.branchPrefix);
+    if (prefix) out.branchPrefix = prefix;
+  }
   if (typeof source.autoRunAfterSetup === "boolean") {
     out.autoRunAfterSetup = source.autoRunAfterSetup;
   }
@@ -1589,6 +1596,13 @@ function updateAdvancedSettings(patch) {
   if (typeof patch.autoRenameBranch === "boolean") {
     advanced.autoRenameBranch = patch.autoRenameBranch;
   }
+  if (patch.branchPrefix === null || patch.branchPrefix === "") {
+    delete advanced.branchPrefix;
+  } else if (typeof patch.branchPrefix === "string") {
+    const prefix = sanitizeGitBranchPrefix(patch.branchPrefix);
+    if (prefix) advanced.branchPrefix = prefix;
+    else delete advanced.branchPrefix;
+  }
   if (typeof patch.autoRunAfterSetup === "boolean") {
     advanced.autoRunAfterSetup = patch.autoRunAfterSetup;
   }
@@ -1649,6 +1663,9 @@ function updateAdvancedSettings(patch) {
 function autoRenameBranchEnabled(settings = loadAppSettings()) {
   return settings.advanced.autoRenameBranch !== false;
 }
+function gitBranchPrefixSetting(settings = loadAppSettings()) {
+  return sanitizeGitBranchPrefix(settings.advanced.branchPrefix);
+}
 function autoRunAfterSetupEnabled(settings = loadAppSettings()) {
   return Boolean(settings.advanced.autoRunAfterSetup);
 }
@@ -1862,6 +1879,7 @@ export {
   brightsyCloudConnectAgent,
   updateAdvancedSettings,
   autoRenameBranchEnabled,
+  gitBranchPrefixSetting,
   autoRunAfterSetupEnabled,
   caffeinateWhileRunningEnabled,
   caffeinateWhileSlackListenEnabled,

package/dist/{chunk-GOZ6T3AG.js → chunk-CJFBSQIB.js}

@@ -7,7 +7,7 @@ import {
   threadFilePath,
   threadLockPath,
   threadsDir
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
 
 // src/store/thread-store.ts
 import { randomUUID } from "crypto";

package/dist/{chunk-GBWKMWUQ.js → chunk-EBPBGQ4P.js}

@@ -1,23 +1,23 @@
 #!/usr/bin/env node
 
+import {
+  isOrchestratorThread
+} from "./chunk-HIX2VDRE.js";
+import {
+  codexUnattendedGitConfigArgs,
+  mergeAgentGitAuthEnv,
+  resolveAgentGitAuthEnv,
+  resolveCodexGitWritableRoots
+} from "./chunk-XPKKCFRT.js";
 import {
   applyConnectedTeamToCli,
   brightsyMcpServerName,
   ensureCliTeamTracked,
   ensureConnectedBrightsyTeamTokens
-} from "./chunk-HVIEYTUK.js";
+} from "./chunk-3OHR73VK.js";
 import {
   loadBrightsyConfig
 } from "./chunk-Y4MIXGPA.js";
-import {
-  isOrchestratorThread
-} from "./chunk-XXEIF2IL.js";
-import {
-  codexUnattendedGitConfigArgs,
-  mergeAgentGitAuthEnv,
-  resolveAgentGitAuthEnv,
-  resolveCodexGitWritableRoots
-} from "./chunk-XBLN52RZ.js";
 import {
   enrichPathWithNpmGlobalBin,
   isConductorBundledCli,
@@ -35,10 +35,10 @@ import {
   resolveClaudeExecutable,
   unwrapStrippedElectronLaunch,
   wrapElectronAsNodeLaunch
-} from "./chunk-OKZFTOM2.js";
+} from "./chunk-KORE4WOF.js";
 import {
   appDataDir
-} from "./chunk-JTJHOYCU.js";
+} from "./chunk-EQNRWDLN.js";
 
 // src/agents/brightsy.ts
 import { existsSync } from "fs";
@@ -2390,7 +2390,7 @@ var claudeAdapter = {
       );
     }
     const mode = permissionMode(thread);
-    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-6G5JJH2E.js");
+    const { isOrchestratorThread: isOrchestratorThread2 } = await import("./global-workspace-BZ6V6TEX.js");
     const isOrchestrator = isOrchestratorThread2(thread);
     const injectedServers = await buildInjectedMcpServers({
       includeSideboard: true,

package/dist/{chunk-JTJHOYCU.js → chunk-EQNRWDLN.js}

@@ -187,9 +187,12 @@ function parseSettingsFile(path, source) {
   const prompts = {
     renameBranch: typeof promptsRaw.rename_branch === "string" ? promptsRaw.rename_branch : void 0,
     createPr: typeof promptsRaw.create_pr === "string" ? promptsRaw.create_pr : void 0,
-    general: typeof promptsRaw.general === "string" ? promptsRaw.general : void 0
+    general: typeof promptsRaw.general === "string" ? promptsRaw.general : void 0,
+    resolveMergeConflicts: typeof promptsRaw.resolve_merge_conflicts === "string" ? promptsRaw.resolve_merge_conflicts : void 0
   };
-  const hasPrompts = Boolean(prompts.renameBranch || prompts.createPr || prompts.general);
+  const hasPrompts = Boolean(
+    prompts.renameBranch || prompts.createPr || prompts.general || prompts.resolveMergeConflicts
+  );
   return {
     source,
     setup,
@@ -215,9 +218,12 @@ function mergeSettings(base, overlay) {
   const prompts = {
     renameBranch: overlay.prompts?.renameBranch ?? base.prompts?.renameBranch,
     createPr: overlay.prompts?.createPr ?? base.prompts?.createPr,
-    general: overlay.prompts?.general ?? base.prompts?.general
+    general: overlay.prompts?.general ?? base.prompts?.general,
+    resolveMergeConflicts: overlay.prompts?.resolveMergeConflicts ?? base.prompts?.resolveMergeConflicts
   };
-  const hasPrompts = Boolean(prompts.renameBranch || prompts.createPr || prompts.general);
+  const hasPrompts = Boolean(
+    prompts.renameBranch || prompts.createPr || prompts.general || prompts.resolveMergeConflicts
+  );
   return {
     source: overlay.source,
     setup: overlay.setup ?? base.setup,