feat: add session renaming with custom titles and git branch tracking (#781)

Author: xierenyuan

src/nodeBridge.types.ts

@@ -836,6 +836,17 @@ type SessionsRemoveOutput = {
   error?: string;
 };
 
+type SessionsRenameInput = {
+  cwd: string;
+  sessionId: string;
+  title: string;
+};
+
+type SessionsRenameOutput = {
+  success: boolean;
+  error?: string;
+};
+
 // ============================================================================
 // Sessions Handlers
 // ============================================================================
@@ -851,6 +862,7 @@ type SessionsListOutput = {
       modified: Date;
       created: Date;
       messageCount: number;
+      gitBranch?: string;
       summary: string;
     }>;
   };
@@ -1730,6 +1742,10 @@ export type HandlerMap = {
     input: SessionsRemoveInput;
     output: SessionsRemoveOutput;
   };
+  'sessions.rename': {
+    input: SessionsRenameInput;
+    output: SessionsRenameOutput;
+  };
 
   // Sessions handlers
   'sessions.list': { input: SessionsListInput; output: SessionsListOutput };

src/nodeBridge/slices/session.ts

@@ -779,6 +779,36 @@ export function registerSessionHandlers(
     };
   });
 
+  messageBus.registerHandler('sessions.rename', async (data) => {
+    const { cwd, sessionId, title } = data;
+    try {
+      const context = await getContext(cwd);
+      const { appendFileSync, existsSync } = await import('fs');
+      const logPath = context.paths.getSessionLogPath(sessionId);
+
+      if (!existsSync(logPath)) {
+        return {
+          success: false,
+          error: `Session "${sessionId}" not found`,
+        };
+      }
+
+      const line = JSON.stringify({
+        type: 'custom-title',
+        customTitle: title,
+        sessionId,
+      });
+      appendFileSync(logPath, `${line}\n`);
+
+      return { success: true };
+    } catch (error: any) {
+      return {
+        success: false,
+        error: error.message || 'Failed to rename session',
+      };
+    }
+  });
+
   messageBus.registerHandler('sessions.remove', async (data) => {
     const { cwd, sessionId } = data;
     try {

src/paths.ts

@@ -76,6 +76,10 @@ export class Paths {
     const jsonlFiles = fs
       .readdirSync(this.globalProjectDir)
       .filter((file) => file.endsWith('.jsonl'))
+      .filter((file) => {
+        const sessionId = path.basename(file, '.jsonl');
+        return !sessionId.startsWith('agent-');
+      })
       .map((file) => {
         const filePath = path.join(this.globalProjectDir, file);
         const stats = fs.statSync(filePath);
@@ -84,12 +88,15 @@ export class Paths {
         // Read message count and summary
         let messageCount = 0;
         let summary = '';
+        let gitBranch: string | undefined;
+        let customTitle: string | undefined;
         try {
           const content = fs.readFileSync(filePath, 'utf-8');
           const lines = content.split('\n').filter(Boolean);
           messageCount = lines.length;
 
           // Extract summary: prioritize config.summary, fallback to first user message
+          // Also scan all lines for custom-title and gitBranch
           if (lines.length > 0) {
             try {
               const firstEntry: LogEntry = JSON.parse(lines[0]);
@@ -101,6 +108,20 @@ export class Paths {
             } catch (e) {
               summary = extractFirstUserMessageSummary(lines);
             }
+
+            for (const line of lines) {
+              try {
+                const entry = JSON.parse(line);
+                if (entry.type === 'custom-title' && entry.customTitle) {
+                  customTitle = entry.customTitle;
+                }
+                if (entry.gitBranch) {
+                  gitBranch = entry.gitBranch;
+                }
+              } catch (e) {
+                // ignore parse error
+              }
+            }
           }
         } catch (e) {
           // ignore read error, message count is 0
@@ -111,7 +132,8 @@ export class Paths {
           modified: stats.mtime,
           created: stats.birthtime,
           messageCount,
-          summary: normalizeSummary(summary),
+          gitBranch,
+          summary: normalizeSummary(customTitle ?? summary),
         };
       })
       .sort((a, b) => b.modified.getTime() - a.modified.getTime())

src/project.ts

@@ -1,6 +1,7 @@
 import { TOOL_NAMES } from './constants';
 import type { Context } from './context';
 import { JsonlLogger, RequestLogger } from './jsonl';
+import { getCurrentBranch } from './utils/git';
 import { LlmsContext } from './llmsContext';
 import { runLoop, type StreamResult, type ThinkingConfig } from './loop';
 import type { ImagePart, NormalizedMessage, UserContent } from './message';
@@ -130,6 +131,7 @@ export class Project {
     const requestLogger = new RequestLogger({
       globalProjectDir: this.context.paths.globalProjectDir,
     });
+    const gitBranch = await getCurrentBranch(this.context.cwd);
     if (message !== null) {
       message = await this.context.apply({
         hook: 'userPrompt',
@@ -185,6 +187,7 @@ export class Project {
       const userMessageWithSessionId = {
         ...userMessage,
         sessionId: this.session.id,
+        ...(gitBranch ? { gitBranch } : {}),
       };
       jsonlLogger.addMessage({
         message: userMessageWithSessionId,
@@ -263,6 +266,7 @@ export class Project {
         const normalizedMessage = {
           ...message,
           sessionId: this.session.id,
+          ...(gitBranch ? { gitBranch } : {}),
         };
         outputFormat.onMessage({
           message: normalizedMessage,