Add session support

.changeset/deep-peaches-melt.md

@@ -0,0 +1,6 @@
+---
+"@kilocode/cli": minor
+"kilo-code": minor
+---
+
+add sessions support

apps/kilocode-docs/docs/features/api-configuration-profiles.md

@@ -38,15 +38,15 @@ Note that available settings vary by provider and model. Each provider offers di
       <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-2.png" alt="Provider selection dropdown" width="550" />
     - Enter API key
 
-             <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-3.png" alt="API key entry field" width="550" />
+               <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-3.png" alt="API key entry field" width="550" />
 
     - Choose a model
 
-             <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-8.png" alt="Model selection interface" width="550" />
+               <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-8.png" alt="Model selection interface" width="550" />
 
     - Adjust model parameters
 
-             <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-5.png" alt="Model parameter adjustment controls" width="550" />
+               <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-5.png" alt="Model parameter adjustment controls" width="550" />
 
 ### Switching Profiles
 

apps/kilocode-docs/i18n/zh-CN/docusaurus-plugin-content-docs/current/features/api-configuration-profiles.md

@@ -36,19 +36,19 @@ API 配置配置文件允许您创建和切换不同的 AI 设置集。每个配
 
     - 选择您的 API 提供商
 
-                      <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-2.png" alt="提供商选择下拉菜单" width="550" />
+                        <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-2.png" alt="提供商选择下拉菜单" width="550" />
 
     - 输入 API 密钥
 
-                      <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-3.png" alt="API 密钥输入字段" width="550" />
+                        <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-3.png" alt="API 密钥输入字段" width="550" />
 
     - 选择模型
 
-                      <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-8.png" alt="模型选择界面" width="550" />
+                        <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-8.png" alt="模型选择界面" width="550" />
 
     - 调整模型参数
 
-                      <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-5.png" alt="模型参数调整控件" width="550" />
+                        <img src="/docs/img/api-configuration-profiles/api-configuration-profiles-5.png" alt="模型参数调整控件" width="550" />
 
 ### 切换配置文件
 

apps/kilocode-docs/i18n/zh-CN/docusaurus-plugin-content-docs/current/features/checkpoints.md

@@ -86,7 +86,7 @@ Kilo Code 使用一个影子 Git 仓库（独立于您的主版本控制系统
 
 - **恢复文件和任务** - 恢复工作区文件并删除所有后续对话消息。当您希望将代码和对话完全重置回检查点的时间点时使用。此选项需要在对话框中进行确认，因为它无法撤消。
 
-         <img src="/docs/img/checkpoints/checkpoints-9.png" alt="恢复文件和任务检查点的确认对话框" width="300" />
+           <img src="/docs/img/checkpoints/checkpoints-9.png" alt="恢复文件和任务检查点的确认对话框" width="300" />
 
 ### 限制和注意事项
 

cli/src/cli.ts

@@ -13,7 +13,7 @@ import { requestRouterModelsAtom } from "./state/atoms/actions.js"
 import { loadHistoryAtom } from "./state/atoms/history.js"
 import { taskHistoryDataAtom, updateTaskHistoryFiltersAtom } from "./state/atoms/taskHistory.js"
 import { sendWebviewMessageAtom } from "./state/atoms/actions.js"
-import { taskResumedViaContinueAtom } from "./state/atoms/extension.js"
+import { taskResumedViaContinueOrSessionAtom } from "./state/atoms/extension.js"
 import { getTelemetryService, getIdentityManager } from "./services/telemetry/index.js"
 import { notificationsAtom, notificationsErrorAtom, notificationsLoadingAtom } from "./state/atoms/notifications.js"
 import { fetchKilocodeNotifications } from "./utils/notifications.js"
@@ -24,6 +24,9 @@ import type { CLIOptions } from "./types/cli.js"
 import type { CLIConfig, ProviderConfig } from "./config/types.js"
 import { getModelIdKey } from "./constants/providers/models.js"
 import type { ProviderName } from "./types/messages.js"
+import { TrpcClient } from "./services/trpcClient.js"
+import { SessionService } from "./services/session.js"
+import { getKiloToken } from "./config/persistence.js"
 
 /**
  * Main application class that orchestrates the CLI lifecycle
@@ -34,6 +37,7 @@ export class CLI {
 	private ui: Instance | null = null
 	private options: CLIOptions
 	private isInitialized = false
+	private sessionService: SessionService | null = null
 
 	constructor(options: CLIOptions = {}) {
 		this.options = options
@@ -126,6 +130,31 @@ export class CLI {
 			// Track successful extension initialization
 			telemetryService.trackExtensionInitialized(true)
 
+			// Initialize services and restore session if kiloToken is available
+			// This must happen AFTER ExtensionService initialization to allow webview messages
+			const kiloToken = getKiloToken(config)
+
+			if (kiloToken) {
+				TrpcClient.init(kiloToken)
+				logs.debug("TrpcClient initialized with kiloToken", "CLI")
+
+				this.sessionService = SessionService.init(this.service, this.store, this.options.json)
+				logs.debug("SessionService initialized with ExtensionService", "CLI")
+
+				// Set workspace directory for git operations (important for parallel mode/worktrees)
+				const workspace = this.options.workspace || process.cwd()
+				this.sessionService.setWorkspaceDirectory(workspace)
+				logs.debug("SessionService workspace directory set", "CLI", { workspace })
+
+				if (this.options.session) {
+					await this.sessionService.restoreSession(this.options.session)
+				} else if (this.options.fork) {
+					logs.info("Forking session from share ID", "CLI", { shareId: this.options.fork })
+
+					await this.sessionService.forkSession(this.options.fork)
+				}
+			}
+
 			// Load command history
 			await this.store.set(loadHistoryAtom)
 			logs.debug("Command history loaded", "CLI")
@@ -273,6 +302,8 @@ export class CLI {
 		try {
 			logs.info("Disposing Kilo Code CLI...", "CLI")
 
+			await this.sessionService?.destroy()
+
 			// Signal codes take precedence over CI logic
 			if (signal === "SIGINT") {
 				exitCode = 130
@@ -432,8 +463,21 @@ export class CLI {
 		try {
 			logs.info("Attempting to resume last conversation", "CLI", { workspace })
 
+			// First, try to restore from persisted session ID if kiloToken is available
+			if (this.sessionService) {
+				const restored = await this.sessionService.restoreLastSession()
+				if (restored) {
+					return
+				}
+
+				logs.debug("Falling back to task history", "CLI")
+			}
+
+			// Fallback: Use task history approach
+			logs.debug("Using task history fallback to resume conversation", "CLI")
+
 			// Update filters to current workspace and newest sort
-			await this.store.set(updateTaskHistoryFiltersAtom, {
+			this.store.set(updateTaskHistoryFiltersAtom, {
 				workspace: "current",
 				sort: "newest",
 				favoritesOnly: false,
@@ -461,7 +505,6 @@ export class CLI {
 				logs.warn("No previous tasks found for workspace", "CLI", { workspace })
 				console.error("\nNo previous tasks found for this workspace. Please start a new conversation.\n")
 				process.exit(1)
-				return // TypeScript doesn't know process.exit stops execution
 			}
 
 			// Find the most recent task (first in the list since we sorted by newest)
@@ -471,7 +514,6 @@ export class CLI {
 				logs.warn("No valid task found in history", "CLI", { workspace })
 				console.error("\nNo valid task found to resume. Please start a new conversation.\n")
 				process.exit(1)
-				return
 			}
 
 			logs.debug("Found last task", "CLI", { taskId: lastTask.id, task: lastTask.task })
@@ -483,7 +525,7 @@ export class CLI {
 			})
 
 			// Mark that the task was resumed via --continue to prevent showing "Task ready to resume" message
-			this.store.set(taskResumedViaContinueAtom, true)
+			this.store.set(taskResumedViaContinueOrSessionAtom, true)
 
 			logs.info("Task resume initiated", "CLI", { taskId: lastTask.id, task: lastTask.task })
 		} catch (error) {

cli/src/commands/__tests__/new.test.ts

@@ -2,20 +2,36 @@
  * Tests for /new command
  */
 
-import { describe, it, expect, vi, beforeEach } from "vitest"
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"
 import { newCommand } from "../new.js"
 import type { CommandContext } from "../core/types.js"
 import { createMockContext } from "./helpers/mockContext.js"
+import { SessionService } from "../../services/session.js"
 
 describe("/new command", () => {
 	let mockContext: CommandContext
+	let mockSessionService: Partial<SessionService> & { destroy: ReturnType<typeof vi.fn> }
+
 	beforeEach(() => {
 		// Mock process.stdout.write to capture terminal clearing
 		vi.spyOn(process.stdout, "write").mockImplementation(() => true)
 
 		mockContext = createMockContext({
 			input: "/new",
 		})
+
+		// Mock SessionService
+		mockSessionService = {
+			destroy: vi.fn().mockResolvedValue(undefined),
+			sessionId: "test-session-id",
+		}
+
+		// Mock SessionService.init to return our mock
+		vi.spyOn(SessionService, "init").mockReturnValue(mockSessionService as unknown as SessionService)
+	})
+
+	afterEach(() => {
+		vi.restoreAllMocks()
 	})
 
 	describe("Command metadata", () => {
@@ -55,6 +71,27 @@ describe("/new command", () => {
 			expect(mockContext.clearTask).toHaveBeenCalledTimes(1)
 		})
 
+		it("should clear the session", async () => {
+			await newCommand.handler(mockContext)
+
+			expect(SessionService.init).toHaveBeenCalled()
+			expect(mockSessionService.destroy).toHaveBeenCalledTimes(1)
+		})
+
+		it("should continue execution even if session clearing fails", async () => {
+			const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {})
+			mockSessionService.destroy.mockRejectedValue(new Error("Session error"))
+
+			await newCommand.handler(mockContext)
+
+			// Should still clear task and replace messages despite session error
+			expect(mockContext.clearTask).toHaveBeenCalled()
+			expect(mockContext.replaceMessages).toHaveBeenCalled()
+			expect(consoleErrorSpy).toHaveBeenCalledWith("Failed to clear session:", expect.any(Error))
+
+			consoleErrorSpy.mockRestore()
+		})
+
 		it("should replace CLI messages with welcome message", async () => {
 			await newCommand.handler(mockContext)
 
@@ -84,14 +121,18 @@ describe("/new command", () => {
 				callOrder.push("clearTask")
 			})
 
+			mockSessionService.destroy = vi.fn().mockImplementation(async () => {
+				callOrder.push("sessionDestroy")
+			})
+
 			mockContext.replaceMessages = vi.fn().mockImplementation(() => {
 				callOrder.push("replaceMessages")
 			})
 
 			await newCommand.handler(mockContext)
 
 			// Operations should execute in this order
-			expect(callOrder).toEqual(["clearTask", "replaceMessages"])
+			expect(callOrder).toEqual(["clearTask", "sessionDestroy", "replaceMessages"])
 		})
 
 		it("should handle clearTask errors gracefully", async () => {
@@ -123,6 +164,7 @@ describe("/new command", () => {
 
 			// Verify all cleanup operations were performed
 			expect(mockContext.clearTask).toHaveBeenCalled()
+			expect(mockSessionService.destroy).toHaveBeenCalled()
 			expect(mockContext.replaceMessages).toHaveBeenCalled()
 
 			// Verify welcome message was replaced