fix: require meaningful branch names before PR creation

Author: LIU9293

packages/agents/shared.ts

@@ -22,6 +22,9 @@ export function buildSystemPrompt(slack?: SlackContext): string {
     "- If GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL are set, use them explicitly in commit commands.",
     "- Prefer: git commit --author=\"$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>\" -m \"...\"",
     "- Use GH_TOKEN for gh commands when available; fall back to git commands when GH_TOKEN is not set.",
+    "- Before creating any pull request, make sure the current branch name is meaningful.",
+    "- If the branch looks like a thread/worktree ID (for example `ode_<threadId>`), rename it first.",
+    "- Preferred branch format before PR: `feat/<short-slug>-<threadShortId>` (slug from the PR topic, short thread suffix for uniqueness).",
     "",
   ];
 

packages/agents/test/cli-command.test.ts

@@ -47,6 +47,17 @@ describe("agent cli command formatting", () => {
     expect(systemPrompt).not.toContain("CHANNEL SYSTEM MESSAGE:");
   });
 
+  it("includes branch rename guidance before creating pull requests", () => {
+    const systemPrompt = buildSystemPrompt({
+      channelId: "C123",
+      threadId: "1770543888.045599",
+      userId: "U789",
+    });
+
+    expect(systemPrompt).toContain("Before creating any pull request, make sure the current branch name is meaningful.");
+    expect(systemPrompt).toContain("Preferred branch format before PR: `feat/<short-slug>-<threadShortId>`");
+  });
+
   it("builds the OpenCode curl command", () => {
     const command = buildOpenCodeCommand("http://127.0.0.1:8080", "session-2", {
       directory: "/tmp/project",