feat: add per-channel base branch setting

LIU9293 · LIU9293 · commit 604fd119f8ee · 2026-02-08T10:07:06.000Z
diff --git a/packages/config/dashboard-config.ts b/packages/config/dashboard-config.ts
@@ -41,6 +41,7 @@ export type DashboardConfig = {
       agentProvider?: "opencode" | "claudecode" | "codex" | "kimi";
       model: string;
       workingDirectory: string;
+      baseBranch: string;
       channelSystemMessage?: string;
     }[];
   }[];
@@ -79,6 +80,11 @@ const cloneDefaultDashboardConfig = (): DashboardConfig => structuredClone(defau
 const asString = (value: unknown, fallback = "") =>
   typeof value === "string" ? value : fallback;
 
+const asBaseBranch = (value: unknown) => {
+  const normalized = asString(value).trim();
+  return normalized.length > 0 ? normalized : "main";
+};
+
 const asNumber = (value: unknown, fallback = 0) =>
   typeof value === "number" && Number.isFinite(value) ? value : fallback;
 
@@ -124,6 +130,7 @@ const sanitizeChannelDetail = (
     agentProvider: asAgentProvider(detail.agentProvider),
     model: asString(detail.model),
     workingDirectory: asString(detail.workingDirectory),
+    baseBranch: asBaseBranch(detail.baseBranch),
     channelSystemMessage: asString(detail.channelSystemMessage),
   };
 };
diff --git a/packages/config/index.ts b/packages/config/index.ts
@@ -24,8 +24,10 @@ export {
   getGitHubInfoForUser,
   resolveChannelCwd,
   getChannelSystemMessage,
+  getChannelBaseBranch,
   setChannelCwd,
   setChannelWorkingDirectory,
+  setChannelBaseBranch,
   setChannelSystemMessage,
   setGitHubInfoForUser,
   clearGitHubInfoForUser,
diff --git a/packages/config/local/ode.ts b/packages/config/local/ode.ts
@@ -70,6 +70,7 @@ const channelDetailSchema = z.object({
   ),
   model: z.string().optional().default(""),
   workingDirectory: z.string().optional().default(""),
+  baseBranch: z.string().optional().default("main"),
   channelSystemMessage: z.string().optional().default(""),
 });
 
@@ -163,6 +164,11 @@ function ensureConfigFile(): void {
   writeFileSync(ODE_CONFIG_FILE, JSON.stringify(EMPTY_TEMPLATE, null, 2));
 }
 
+function normalizeBaseBranch(baseBranch: string | null | undefined): string {
+  const normalized = baseBranch?.trim();
+  return normalized && normalized.length > 0 ? normalized : "main";
+}
+
 function normalizeConfig(config: OdeConfig): OdeConfig {
   const { defaultMessageFrequency: _deprecatedMessageFrequency, ...normalizedUser } = config.user;
   const statusMessageFormat = config.user.defaultStatusMessageFormat
@@ -189,6 +195,13 @@ function normalizeConfig(config: OdeConfig): OdeConfig {
     .map((model) => model.trim())
     .filter(Boolean)));
   const completeOnboarding = config.completeOnboarding === true;
+  const workspaces = config.workspaces.map((workspace) => ({
+    ...workspace,
+    channelDetails: workspace.channelDetails.map((channel) => ({
+      ...channel,
+      baseBranch: normalizeBaseBranch(channel.baseBranch),
+    })),
+  }));
   return {
     ...config,
     user: {
@@ -217,6 +230,7 @@ function normalizeConfig(config: OdeConfig): OdeConfig {
       },
     },
     completeOnboarding,
+    workspaces,
   };
 }
 
@@ -482,6 +496,18 @@ export function setChannelWorkingDirectory(channelId: string, workingDirectory:
   }));
 }
 
+export function getChannelBaseBranch(channelId: string): string {
+  return normalizeBaseBranch(getChannelDetails(channelId)?.baseBranch);
+}
+
+export function setChannelBaseBranch(channelId: string, baseBranch: string | null): void {
+  const normalized = normalizeBaseBranch(baseBranch);
+  updateChannel(channelId, (channel) => ({
+    ...channel,
+    baseBranch: normalized,
+  }));
+}
+
 export function getChannelSystemMessage(channelId: string): string | null {
   return getChannelDetails(channelId)?.channelSystemMessage ?? null;
 }
diff --git a/packages/core/onboarding.ts b/packages/core/onboarding.ts
@@ -170,6 +170,7 @@ async function setupSlackWorkspaces(rl: Interface, config: OdeConfig): Promise<O
         channelDetails: discoveredWorkspace.channelDetails.map((channel) => ({
           ...channel,
           agentProvider: channel.agentProvider ?? "opencode",
+          baseBranch: channel.baseBranch?.trim() || "main",
           channelSystemMessage: channel.channelSystemMessage ?? "",
         })),
       };
diff --git a/packages/core/runtime/session-bootstrap.ts b/packages/core/runtime/session-bootstrap.ts
@@ -1,5 +1,5 @@
 import { loadSession, saveSession, type PersistedSession } from "@/config/local/sessions";
-import { resolveChannelCwd, resolveGitStrategy } from "@/config";
+import { getChannelBaseBranch, resolveChannelCwd, resolveGitStrategy } from "@/config";
 import { buildSessionEnvironment, prepareSessionWorkspace } from "@/core/session";
 import { CoreStateMachine } from "@/core/state-machine";
 import { categorizeRuntimeError } from "@/core/runtime/helpers";
@@ -62,11 +62,13 @@ export async function prepareRuntimeSession(params: {
     try {
       stateMachine.transition("prepare_worktree");
       const worktreeId = `ode_${threadId}`;
+      const baseBranch = getChannelBaseBranch(channelId);
       const { cwd: resolvedCwd, worktree } = await prepareSessionWorkspace({
         channelId,
         threadId,
         cwd,
         worktreeId,
+        baseBranch,
         sessionEnv,
         gitIdentity,
       });
diff --git a/packages/core/session.ts b/packages/core/session.ts
@@ -89,11 +89,12 @@ export async function prepareSessionWorkspace(params: {
   threadId: string;
   cwd: string;
   worktreeId: string;
+  baseBranch: string;
   sessionEnv: SessionEnvironment;
   gitIdentity: GitIdentity;
 }): Promise<PreparedWorkspace> {
-  const { channelId, threadId, cwd, worktreeId, sessionEnv, gitIdentity } = params;
-  const worktree = await ensureSessionWorktree({ cwd, worktreeId, env: sessionEnv });
+  const { channelId, threadId, cwd, worktreeId, baseBranch, sessionEnv, gitIdentity } = params;
+  const worktree = await ensureSessionWorktree({ cwd, worktreeId, baseBranch, env: sessionEnv });
   let resolvedCwd = cwd;
 
   if (!worktree.skipped && worktree.worktreePath !== cwd) {
diff --git a/packages/core/web/local-settings.ts b/packages/core/web/local-settings.ts
@@ -104,6 +104,7 @@ const buildDiscoveredChannelDetails = (
     agentProvider: "opencode",
     model: fallbackModel,
     workingDirectory: "",
+    baseBranch: "main",
     channelSystemMessage: "",
   }));
 
@@ -129,6 +130,7 @@ const buildSyncedChannelDetails = (
       agentProvider,
       model: existing?.model ?? (agentProvider === "opencode" || agentProvider === "codex" ? fallbackModel : ""),
       workingDirectory: existing?.workingDirectory ?? "",
+      baseBranch: existing?.baseBranch?.trim() ? existing.baseBranch.trim() : "main",
       channelSystemMessage: existing?.channelSystemMessage ?? "",
     };
   });
diff --git a/packages/ims/slack/client.ts b/packages/ims/slack/client.ts
@@ -255,7 +255,7 @@ async function postSettingsLauncher(
         type: "section",
           text: {
             type: "mrkdwn",
-            text: "Open channel settings for agent, working directory, and optional channel system message (model appears for OpenCode and Codex).",
+            text: "Open channel settings for agent, working directory, base branch, and optional channel system message (model appears for OpenCode and Codex).",
           },
       },
       {
diff --git a/packages/ims/slack/commands.ts b/packages/ims/slack/commands.ts
@@ -11,6 +11,8 @@ import {
   setChannelAgentProvider,
   setChannelModel,
   setChannelWorkingDirectory,
+  getChannelBaseBranch,
+  setChannelBaseBranch,
   getChannelSystemMessage,
   setChannelSystemMessage,
   setGitHubInfoForUser,
@@ -34,6 +36,8 @@ const MODEL_BLOCK = "model";
 const MODEL_ACTION = "model_select";
 const WORKING_DIR_BLOCK = "working_dir";
 const WORKING_DIR_ACTION = "working_dir_input";
+const BASE_BRANCH_BLOCK = "base_branch";
+const BASE_BRANCH_ACTION = "base_branch_input";
 const CHANNEL_SYSTEM_MESSAGE_BLOCK = "channel_system_message";
 const CHANNEL_SYSTEM_MESSAGE_ACTION = "channel_system_message_input";
 
@@ -73,6 +77,7 @@ function buildSettingsModal(params: {
   selectedProvider?: AgentProvider;
   selectedModel?: string | null;
   workingDirectory?: string | null;
+  baseBranch?: string | null;
   channelSystemMessage?: string | null;
 }) {
   const {
@@ -83,6 +88,7 @@ function buildSettingsModal(params: {
     selectedProvider = "opencode",
     selectedModel,
     workingDirectory,
+    baseBranch,
     channelSystemMessage,
   } = params;
   const providerLabels: Record<AgentProvider, string> = {
@@ -115,10 +121,10 @@ function buildSettingsModal(params: {
     ? matchedSelectedModel
     : (selectedProvider === "codex" ? "__default__" : (opencodeModels[0] ?? "__none__"));
   const introText = selectedProvider === "opencode"
-    ? "Configure agent, model (OpenCode), and working directory for this channel."
+    ? "Configure agent, model (OpenCode), working directory, and base branch for this channel."
     : selectedProvider === "codex"
-      ? "Configure agent, optional Codex model, and working directory for this channel."
-      : "Configure agent and working directory for this channel.";
+      ? "Configure agent, optional Codex model, working directory, and base branch for this channel."
+      : "Configure agent, working directory, and base branch for this channel.";
 
   const blocks: any[] = [
     {
@@ -173,6 +179,19 @@ function buildSettingsModal(params: {
     },
   });
 
+  blocks.push({
+    type: "input" as const,
+    block_id: BASE_BRANCH_BLOCK,
+    optional: true,
+    label: { type: "plain_text" as const, text: "Base Branch" },
+    element: {
+      type: "plain_text_input" as const,
+      action_id: BASE_BRANCH_ACTION,
+      initial_value: baseBranch?.trim() || "main",
+      placeholder: { type: "plain_text" as const, text: "e.g., main" },
+    },
+  });
+
   blocks.push({
     type: "input" as const,
     block_id: CHANNEL_SYSTEM_MESSAGE_BLOCK,
@@ -289,6 +308,7 @@ export function setupInteractiveHandlers(): void {
       selectedProvider: toSelectableProvider(getChannelAgentProvider(channelId)),
       selectedModel: getChannelModel(channelId),
       workingDirectory: resolveChannelCwd(channelId).workingDirectory,
+      baseBranch: getChannelBaseBranch(channelId),
       channelSystemMessage: getChannelSystemMessage(channelId),
     });
 
@@ -353,6 +373,9 @@ export function setupInteractiveHandlers(): void {
       || getChannelModel(channelId)
       || undefined;
     const workingDirectory = view.state?.values?.[WORKING_DIR_BLOCK]?.[WORKING_DIR_ACTION]?.value || "";
+    const baseBranch = view.state?.values?.[BASE_BRANCH_BLOCK]?.[BASE_BRANCH_ACTION]?.value
+      || getChannelBaseBranch(channelId)
+      || "main";
     const channelSystemMessage = view.state?.values?.[CHANNEL_SYSTEM_MESSAGE_BLOCK]?.[CHANNEL_SYSTEM_MESSAGE_ACTION]?.value
       || getChannelSystemMessage(channelId)
       || "";
@@ -365,6 +388,7 @@ export function setupInteractiveHandlers(): void {
       selectedProvider,
       selectedModel,
       workingDirectory,
+      baseBranch,
       channelSystemMessage,
     });
 
@@ -388,6 +412,7 @@ export function setupInteractiveHandlers(): void {
           : "opencode";
     const selectedModel = values?.[MODEL_BLOCK]?.[MODEL_ACTION]?.selected_option?.value;
     const workingDirectory = values?.[WORKING_DIR_BLOCK]?.[WORKING_DIR_ACTION]?.value || "";
+    const baseBranch = values?.[BASE_BRANCH_BLOCK]?.[BASE_BRANCH_ACTION]?.value || "main";
     const channelSystemMessage = values?.[CHANNEL_SYSTEM_MESSAGE_BLOCK]?.[CHANNEL_SYSTEM_MESSAGE_ACTION]?.value || "";
 
     const errors: Record<string, string> = {};
@@ -438,6 +463,7 @@ export function setupInteractiveHandlers(): void {
 
       const workingDirValue = workingDirectory.trim();
       setChannelWorkingDirectory(channelId, workingDirValue.length > 0 ? workingDirValue : null);
+      setChannelBaseBranch(channelId, baseBranch);
       setChannelSystemMessage(channelId, channelSystemMessage);
     } catch (err) {
       const userId = (body as any).user?.id;
diff --git a/packages/utils/worktree.ts b/packages/utils/worktree.ts
@@ -89,6 +89,15 @@ function localBranchExists(repoRoot: string, branch: string, env?: Record<string
   }
 }
 
+function remoteBranchExists(repoRoot: string, branch: string, env?: Record<string, string>): boolean {
+  try {
+    runGit(["show-ref", "--verify", "--quiet", `refs/remotes/origin/${branch}`], repoRoot, env);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function ensureDir(path: string): void {
   if (!existsSync(path)) {
     mkdirSync(path, { recursive: true });
@@ -150,9 +159,11 @@ function ensureWorktreeConfig(repoRoot: string, env?: Record<string, string>): v
 export async function ensureSessionWorktree(params: {
   cwd: string;
   worktreeId: string;
+  baseBranch: string;
   env?: Record<string, string>;
 }): Promise<WorktreeResult> {
-  const { cwd, worktreeId, env } = params;
+  const { cwd, worktreeId, baseBranch, env } = params;
+  const normalizedBaseBranch = baseBranch.trim() || "main";
   const repoRoot = resolveRepoRoot(cwd, env);
   if (!repoRoot) {
     return { worktreePath: cwd, repoRoot: null, created: false, reused: false, skipped: true };
@@ -180,8 +191,8 @@ export async function ensureSessionWorktree(params: {
 
   const currentBranch = getCurrentBranch(repoRoot, env);
   const dirtyPaths = getDirtyPaths(repoRoot, env);
-  if (currentBranch === "main" && dirtyPaths.length > 0) {
-    const message = "Main has uncommitted changes, skipping worktree and staying on main.";
+  if (currentBranch === normalizedBaseBranch && dirtyPaths.length > 0) {
+    const message = `${normalizedBaseBranch} has uncommitted changes, skipping worktree and staying on ${normalizedBaseBranch}.`;
     log.warn(message, { repoRoot });
     return {
       worktreePath: repoRoot,
@@ -193,15 +204,52 @@ export async function ensureSessionWorktree(params: {
     };
   }
 
+  let hasLocalBaseBranch = localBranchExists(repoRoot, normalizedBaseBranch, env);
+  let hasRemoteBaseBranch = remoteBranchExists(repoRoot, normalizedBaseBranch, env);
+  if (!hasLocalBaseBranch && !hasRemoteBaseBranch) {
+    try {
+      runGit(["fetch", "origin", normalizedBaseBranch], repoRoot, env);
+    } catch {
+      // Handle branch-not-found with a user-facing message below.
+    }
+    hasLocalBaseBranch = localBranchExists(repoRoot, normalizedBaseBranch, env);
+    hasRemoteBaseBranch = remoteBranchExists(repoRoot, normalizedBaseBranch, env);
+  }
+
+  if (!hasLocalBaseBranch && !hasRemoteBaseBranch) {
+    const message = `Base branch '${normalizedBaseBranch}' not found in this repo. Open channel settings and update Base Branch.`;
+    log.warn(message, { repoRoot, baseBranch: normalizedBaseBranch });
+    return {
+      worktreePath: repoRoot,
+      repoRoot,
+      created: false,
+      reused: false,
+      skipped: true,
+      message,
+    };
+  }
+
   ensureDir(worktreeDir);
-  log.info("Pulling latest main before creating worktree", { repoRoot });
-  runGit(["pull", "origin", "main"], repoRoot, env);
+  if (currentBranch === normalizedBaseBranch) {
+    log.info("Pulling latest base branch before creating worktree", {
+      repoRoot,
+      baseBranch: normalizedBaseBranch,
+    });
+    runGit(["pull", "origin", normalizedBaseBranch], repoRoot, env);
+  } else {
+    log.info("Fetching latest base branch before creating worktree", {
+      repoRoot,
+      baseBranch: normalizedBaseBranch,
+    });
+    runGit(["fetch", "origin", normalizedBaseBranch], repoRoot, env);
+  }
 
   log.info("Creating worktree for session", { worktreePath, worktreeId });
+  const startPoint = hasLocalBaseBranch ? normalizedBaseBranch : `origin/${normalizedBaseBranch}`;
   if (localBranchExists(repoRoot, worktreeId, env)) {
     runGit(["worktree", "add", worktreePath, worktreeId], repoRoot, env);
   } else {
-    runGit(["worktree", "add", worktreePath, "-b", worktreeId, "main"], repoRoot, env);
+    runGit(["worktree", "add", worktreePath, "-b", worktreeId, startPoint], repoRoot, env);
   }
   copyEnvFile(repoRoot, worktreePath);
 
diff --git a/packages/web-ui/src/routes/local-setting/slack-bot/[workspaceName]/+page.svelte b/packages/web-ui/src/routes/local-setting/slack-bot/[workspaceName]/+page.svelte

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ async function postSettingsLauncher(`
`255`	`255`	`type: "section",`
`256`	`256`	`text: {`
`257`	`257`	`type: "mrkdwn",`
`258`		`- text: "Open channel settings for agent, working directory, and optional channel system message (model appears for OpenCode and Codex).",`
	`258`	`+ text: "Open channel settings for agent, working directory, base branch, and optional channel system message (model appears for OpenCode and Codex).",`
`259`	`259`	`},`
`260`	`260`	`},`
`261`	`261`	`{`