From c572b9e9ac686eed1e434b60c7a0c2461043a1e9 Mon Sep 17 00:00:00 2001
From: Sandy Tao <sandytao520@icloud.com>
Date: Tue, 13 Jan 2026 09:12:35 +0800
Subject: [PATCH] feat(cli): cleanup activity logs alongside session files
 (#16399)

---
 packages/cli/src/utils/sessionCleanup.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/cli/src/utils/sessionCleanup.ts b/packages/cli/src/utils/sessionCleanup.ts
index 3cdce025c9..50b788d215 100644
--- a/packages/cli/src/utils/sessionCleanup.ts
+++ b/packages/cli/src/utils/sessionCleanup.ts
@@ -86,6 +86,18 @@ export async function cleanupExpiredSessions(
         const sessionPath = path.join(chatsDir, sessionToDelete.fileName);
         await fs.unlink(sessionPath);
 
+        // ALSO cleanup Activity logs in the project logs directory
+        const sessionId = sessionToDelete.sessionInfo?.id;
+        if (sessionId) {
+          const logsDir = path.join(config.storage.getProjectTempDir(), 'logs');
+          const logPath = path.join(logsDir, `session-${sessionId}.jsonl`);
+          try {
+            await fs.unlink(logPath);
+          } catch {
+            /* ignore if log doesn't exist */
+          }
+        }
+
         if (config.getDebugMode()) {
           if (sessionToDelete.sessionInfo === null) {
             debugLogger.debug(