feat: make task mode sticky to task

packages/types/src/history.ts

@@ -16,6 +16,7 @@ export const historyItemSchema = z.object({
 	totalCost: z.number(),
 	size: z.number().optional(),
 	workspace: z.string().optional(),
+	mode: z.string().optional(),
 })
 
 export type HistoryItem = z.infer<typeof historyItemSchema>

src/core/task-persistence/taskMetadata.ts

@@ -18,6 +18,7 @@ export type TaskMetadataOptions = {
 	taskNumber: number
 	globalStoragePath: string
 	workspace: string
+	mode?: string
 }
 
 export async function taskMetadata({
@@ -26,6 +27,7 @@ export async function taskMetadata({
 	taskNumber,
 	globalStoragePath,
 	workspace,
+	mode,
 }: TaskMetadataOptions) {
 	const taskDir = await getTaskDirectoryPath(globalStoragePath, taskId)
 
@@ -92,6 +94,7 @@ export async function taskMetadata({
 		totalCost: tokenUsage.totalCost,
 		size: taskDirSize,
 		workspace,
+		mode,
 	}
 
 	return { historyItem, tokenUsage }

src/core/task/Task.ts

@@ -137,6 +137,7 @@ export class Task extends EventEmitter<ClineEvents> {
 	readonly parentTask: Task | undefined = undefined
 	readonly taskNumber: number
 	readonly workspacePath: string
+	taskMode: string
 
 	providerRef: WeakRef<ClineProvider>
 	private readonly globalStoragePath: string
@@ -268,12 +269,34 @@ export class Task extends EventEmitter<ClineEvents> {
 		this.parentTask = parentTask
 		this.taskNumber = taskNumber
 
+		// Store the task's mode when it's created
+		// For history items, use the stored mode; for new tasks, we'll set it after getting state
+		this.taskMode = historyItem?.mode || defaultModeSlug
+
 		if (historyItem) {
 			TelemetryService.instance.captureTaskRestarted(this.taskId)
 		} else {
 			TelemetryService.instance.captureTaskCreated(this.taskId)
 		}
 
+		// If no historyItem, get the current mode from provider
+		if (!historyItem && provider.getState) {
+			const statePromise = provider.getState()
+			// Check if getState() returns a Promise
+			if (statePromise && typeof statePromise.then === "function") {
+				statePromise
+					.then((state) => {
+						if (state?.mode) {
+							this.taskMode = state.mode
+						}
+					})
+					.catch((error) => {
+						// If there's an error getting state, keep the default mode
+						console.error("Failed to get mode from provider state:", error)
+					})
+			}
+		}
+
 		// Only set up diff strategy if diff is enabled
 		if (this.diffEnabled) {
 			// Default to old strategy, will be updated if experiment is enabled
@@ -411,6 +434,7 @@ export class Task extends EventEmitter<ClineEvents> {
 				taskNumber: this.taskNumber,
 				globalStoragePath: this.globalStoragePath,
 				workspace: this.cwd,
+				mode: this.taskMode, // Use the task's own mode, not the current provider mode
 			})
 
 			this.emit("taskTokenUsageUpdated", this.taskId, tokenUsage)