fix: address self-review findings — type safety, validation, error handling

hannesrudolph · hannesrudolph · commit 1d050aed84af · 2026-02-10T21:58:01.000-07:00
diff --git a/src/core/task-persistence/delegationMeta.ts b/src/core/task-persistence/delegationMeta.ts
@@ -78,6 +78,29 @@ export async function readDelegationMeta({
 			}
 		}
 
+		// Validate value types to prevent corrupted files from propagating invalid data
+		if (
+			meta.status !== undefined &&
+			meta.status !== null &&
+			!["active", "delegated", "completed"].includes(meta.status as string)
+		) {
+			delete (meta as Record<string, unknown>).status
+		}
+		if (meta.childIds !== undefined && meta.childIds !== null && !Array.isArray(meta.childIds)) {
+			delete (meta as Record<string, unknown>).childIds
+		}
+		for (const key of [
+			"delegatedToId",
+			"awaitingChildId",
+			"completedByChildId",
+			"completionResultSummary",
+		] as const) {
+			const val = meta[key]
+			if (val !== undefined && val !== null && typeof val !== "string") {
+				delete (meta as Record<string, unknown>)[key]
+			}
+		}
+
 		return meta
 	} catch (error) {
 		console.warn(
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
@@ -3434,32 +3434,29 @@ export class ClineProvider
 			})
 
 			// 4b) Persist child's initial status in globalState (saveClineMessages no longer writes status)
-			await this.updateTaskHistory({ id: child.taskId, status: "active" } as HistoryItem, { broadcast: false })
+			const { historyItem: childHistory } = await this.getTaskWithId(child.taskId)
+			await this.updateTaskHistory({ ...childHistory, status: "active" }, { broadcast: false })
 
 			// 5) Persist parent delegation metadata BEFORE the child starts writing.
-			try {
-				const { historyItem } = await this.getTaskWithId(parentTaskId)
-				const childIds = Array.from(new Set([...(historyItem.childIds ?? []), child.taskId]))
-				const updatedHistory: typeof historyItem = {
-					...historyItem,
-					status: "delegated",
-					delegatedToId: child.taskId,
-					awaitingChildId: child.taskId,
-					childIds,
-				}
-				await this.updateTaskHistory(updatedHistory)
+			// updateTaskHistory (globalState) is critical — without it, parent won't show as delegated
+			const { historyItem } = await this.getTaskWithId(parentTaskId)
+			const childIds = Array.from(new Set([...(historyItem.childIds ?? []), child.taskId]))
+			const updatedHistory = {
+				...historyItem,
+				status: "delegated" as const,
+				delegatedToId: child.taskId,
+				awaitingChildId: child.taskId,
+				childIds,
+			}
+			await this.updateTaskHistory(updatedHistory)
 
-				// Write delegation metadata to per-task file (cross-process-safe source of truth)
+			// Per-task file backup is non-critical — globalState is the primary source
+			try {
 				const globalStoragePath = this.contextProxy.globalStorageUri.fsPath
 				await saveDelegationMeta({
 					taskId: parentTaskId,
 					globalStoragePath,
-					meta: {
-						status: "delegated",
-						delegatedToId: child.taskId,
-						awaitingChildId: child.taskId,
-						childIds,
-					},
+					meta: { status: "delegated", delegatedToId: child.taskId, awaitingChildId: child.taskId, childIds },
 				})
 				await saveDelegationMeta({
 					taskId: child.taskId,
@@ -3468,9 +3465,7 @@ export class ClineProvider
 				})
 			} catch (err) {
 				this.log(
-					`[delegateParentAndOpenChild] Failed to persist parent metadata for ${parentTaskId} -> ${child.taskId}: ${
-						(err as Error)?.message ?? String(err)
-					}`,
+					`[delegateParentAndOpenChild] Non-critical: Failed to write delegation metadata files for ${parentTaskId} -> ${child.taskId}: ${(err as Error)?.message ?? String(err)}`,
 				)
 			}
 
