feat: Auto-rename workspace branches before pushing to origin (#610)

Author: jonathanlab

packages/agent/src/adapters/claude/agent.ts

@@ -313,20 +313,28 @@ export class ClaudeAcpAgent extends BaseAcpAgent implements Agent {
       addAcpMcpServer(mcpServers, this, sessionId, this.clientCapabilities);
     }
 
+    const branchNamingInstructions = `
+# Branch Naming
+
+Before pushing a "workspace-*" branch to origin, rename it to something descriptive based on the work done. Do this automatically without asking the user.
+`;
+
     let systemPrompt: Options["systemPrompt"] = {
       type: "preset",
       preset: "claude_code",
+      append: branchNamingInstructions,
     };
+
     if (params._meta?.systemPrompt) {
       const customPrompt = params._meta.systemPrompt;
       if (typeof customPrompt === "string") {
-        systemPrompt = customPrompt;
+        systemPrompt = customPrompt + branchNamingInstructions;
       } else if (
         typeof customPrompt === "object" &&
         "append" in customPrompt &&
         typeof customPrompt.append === "string"
       ) {
-        systemPrompt.append = customPrompt.append;
+        systemPrompt.append = customPrompt.append + branchNamingInstructions;
       }
     }
 

packages/agent/src/adapters/claude/session-helpers.ts

@@ -74,12 +74,21 @@ export interface BuildOptionsParams {
   additionalDirectories?: string[];
 }
 
+const BRANCH_NAMING_INSTRUCTIONS = `
+# Branch Naming
+
+Before pushing a "workspace-*" branch to origin, rename it to something descriptive based on the work done. Do this automatically without asking the user.
+`;
+
 function buildBaseOptions(params: BuildOptionsParams): Options {
+  const defaultSystemPrompt: Options["systemPrompt"] = {
+    type: "preset",
+    preset: "claude_code",
+    append: BRANCH_NAMING_INSTRUCTIONS,
+  };
+
   return {
-    systemPrompt: params.systemPrompt ?? {
-      type: "preset",
-      preset: "claude_code",
-    },
+    systemPrompt: params.systemPrompt ?? defaultSystemPrompt,
     settingSources: ["user", "project", "local"],
     stderr: (err) => params.logger.error(err),
     cwd: params.cwd,