FCO: resolve conflicts, integrate types + UI, and fix provider.getCurrentTask usage

Author: hannesrudolph

packages/types/src/file-changes.ts

@@ -0,0 +1,21 @@
+export type FileChangeType = "create" | "delete" | "edit"
+
+export interface FileChange {
+	uri: string
+	type: FileChangeType
+	// Note: Checkpoint hashes are for backend use, but can be included
+	fromCheckpoint: string
+	toCheckpoint: string
+	// Line count information for display
+	linesAdded?: number
+	linesRemoved?: number
+}
+
+/**
+ * Represents the set of file changes for the webview.
+ * The `files` property is an array for easy serialization.
+ */
+export interface FileChangeset {
+	baseCheckpoint: string
+	files: FileChange[]
+}

packages/types/src/global-settings.ts

@@ -148,6 +148,7 @@ export const globalSettingsSchema = z.object({
 	hasOpenedModeSelector: z.boolean().optional(),
 	lastModeExportPath: z.string().optional(),
 	lastModeImportPath: z.string().optional(),
+	filesChangedEnabled: z.boolean().optional(),
 })
 
 export type GlobalSettings = z.infer<typeof globalSettingsSchema>

packages/types/src/index.ts

@@ -20,5 +20,5 @@ export * from "./terminal.js"
 export * from "./tool.js"
 export * from "./type-fu.js"
 export * from "./vscode.js"
-
 export * from "./providers/index.js"
+export * from "./file-changes.js"