Revert "fix(native): guard diff prefetch results"

This reverts commit ee12094.

Author: czxtm

apps/native/src/components/widget/summaries/full-file-diff-editor.tsx

@@ -17,7 +17,7 @@ import { DiffLineStatsBadge, sumDiffLineStats } from "./diff-line-stats";
 interface FullFileDiffEditorProps {
   filename: string;
   changes: ChangeWithRichType[];
-  contents?: FileDiffContents | null;
+  contents?: FileDiffContents;
   isOpen: boolean;
   onOpenChange: (open: boolean) => void;
 }
@@ -105,10 +105,6 @@ export function FullFileDiffEditor({ filename, changes, contents, isOpen, onOpen
         ) : (
           <DiffView contents={displayContents} filename={filename} onMount={handleMount} />
         )
-      ) : contents === null ? (
-        <div className="flex items-center justify-center py-8 text-muted-foreground text-xs">
-          Unable to load diff contents.
-        </div>
       ) : (
         <div className="flex items-center justify-center py-8 text-muted-foreground text-xs">
           Loading...

apps/native/src/hooks/use-git-operations.test.ts

@@ -6,14 +6,11 @@ import { mirrorEvolveState } from "@/viewmodel/evolve";
 import { mirrorGitState } from "@/viewmodel/git";
 import { toast } from "sonner";
 
-let fileDiffContentsRequestId = 0;
-
 /**
  * Hook for git operations.
  * Provides functions for refreshing git status changes.
  */
 export const prefetchFileDiffContents = async (status: { changes: { filename: string }[] } | null) => {
-  const requestId = ++fileDiffContentsRequestId;
   const setFileDiffContents = useWidgetStore.getState().setFileDiffContents;
   if (!status) {
     setFileDiffContents({});
@@ -24,16 +21,11 @@ export const prefetchFileDiffContents = async (status: { changes: { filename: st
     setFileDiffContents({});
     return;
   }
-  setFileDiffContents({});
   try {
     const result = await tauriAPI.git.fileDiffContents(filenames);
-    if (requestId === fileDiffContentsRequestId) {
-      setFileDiffContents(result ?? {});
-    }
+    setFileDiffContents(result ?? {});
   } catch {
-    if (requestId === fileDiffContentsRequestId) {
-      setFileDiffContents(Object.fromEntries(filenames.map((filename) => [filename, null])));
-    }
+    setFileDiffContents({});
   }
 };
 

apps/native/src/hooks/use-git-operations.ts

@@ -1,15 +1,12 @@
 import { computeCurrentStep } from "@/components/widget/utils";
+import { useViewModel } from "@/stores/view-model";
 import { FeedbackType } from "@/types/feedback";
 import type {
   EvolutionTelemetry,
   EvolveEvent,
-  EvolveState,
   FileDiffContents,
-  GitStatus,
-  HistoryItem,
   PermissionsState,
   RecommendedPrompt,
-  SemanticChangeMap,
   UpdateChannel,
 } from "@/ipc/types";
 import { create } from "zustand";
@@ -34,7 +31,6 @@ export type {
 export type SettingsTab = "general" | "api-keys" | "ai-models" | "preferences" | "tuning" | "developer";
 export type WidgetStep = "permissions" | "nix-setup" | "setup" | "begin" | "evolve" | "commit" | "manualEvolve" | "manualCommit" | "history" | "filesystem";
 type ProcessingAction = "evolve" | "apply" | "merge" | "cancel" | null;
-export type FileDiffContentEntry = FileDiffContents | null;
 export type ConfirmPrefKey = "confirmBuild" | "confirmClear" | "confirmRollback";
 export type BoolPrefKey = ConfirmPrefKey | "autoSummarizeOnFocus" | "scanHomebrewOnStartup" | "defaultToDiffTab";
 
@@ -90,13 +86,8 @@ export interface WidgetState {
   darwinRebuildAvailable: boolean | null; // null = not checked yet
   darwinRebuildPrefetching: boolean;
 
-  // Evolve state derived from backend source of truth
-  evolveState: EvolveState | null;
-  externalBuildDetected: boolean;
+  fileDiffContents: Record<string, FileDiffContents>;
 
-  // Git (from backend)
-  gitStatus: GitStatus | null;
-  fileDiffContents: Record<string, FileDiffContentEntry>;
   // Evolution
   evolvePrompt: string;
   isProcessing: boolean;
@@ -106,8 +97,6 @@ export interface WidgetState {
   conversationalResponse: string | null;
   evolutionTelemetry: EvolutionTelemetry | null;
 
-  changeMap: SemanticChangeMap | null;
-
   // Commit message suggestion (generated on merge screen)
   commitMessageSuggestion: string | null;
 
@@ -117,13 +106,9 @@ export interface WidgetState {
   // Console
   consoleLogs: string;
 
-  // History
-  history: HistoryItem[];
-  historyLoading: boolean;
   analyzingHistoryForHashes: Set<string>;
 
   // UI
-  summaryAvailable: boolean;
   isSummarizing: boolean;
   isGenerating: boolean;
   settingsOpen: boolean;
@@ -192,13 +177,9 @@ interface WidgetActions {
   setNixDownloadProgress: (progress: { downloaded: number; total: number } | null) => void;
   setDarwinRebuildAvailable: (available: boolean | null) => void;
   setDarwinRebuildPrefetching: (prefetching: boolean) => void;
-  setEvolveState: (state: EvolveState | null) => void;
-  setExternalBuildDetected: (detected: boolean) => void;
-  setGitStatus: (status: GitStatus | null) => void;
-  setFileDiffContents: (contents: Record<string, FileDiffContentEntry>) => void;
+  setFileDiffContents: (contents: Record<string, FileDiffContents>) => void;
   setEvolvePrompt: (prompt: string) => void;
   setProcessing: (isProcessing: boolean, action?: ProcessingAction) => void;
-  setChangeMap: (map: SemanticChangeMap | null) => void;
   setSettingsOpen: (open: boolean, tab?: SettingsTab | null) => void;
   setPrefsLoaded: (loaded: boolean) => void;
   setShowHistory: (show: boolean) => void;
@@ -213,12 +194,9 @@ interface WidgetActions {
     details: { message: string; location?: string; backtrace?: string; timestamp: string } | null,
   ) => void;
   setPromptHistory: (history: string[]) => void;
-  setSummaryAvailable: (available: boolean) => void;
   setRecommendedPrompt: (prompt: RecommendedPrompt | null | undefined) => void;
 
   // History
-  setHistory: (history: HistoryItem[]) => void;
-  setHistoryLoading: (loading: boolean) => void;
   addAnalyzingHistoryHash: (hash: string) => void;
   removeAnalyzingHistoryHash: (hash: string) => void;
 
@@ -237,7 +215,6 @@ interface WidgetActions {
   // Client-side state (NOT from server)
   setSummarizing: (summarizing: boolean) => void;
   setGenerating: (generating: boolean) => void;
-  clearPreview: () => void;
   setFeedbackTypeOverride: (type: FeedbackType | null) => void;
   openFeedback: (type?: FeedbackType, initialText?: string) => void;
 
@@ -301,12 +278,6 @@ const initialWidgetState: WidgetState = {
   darwinRebuildAvailable: null,
   darwinRebuildPrefetching: false,
 
-  // Routing state
-  evolveState: null,
-  externalBuildDetected: false,
-
-  // Git
-  gitStatus: null,
   fileDiffContents: {},
 
   // Evolution
@@ -318,14 +289,8 @@ const initialWidgetState: WidgetState = {
   conversationalResponse: null,
   evolutionTelemetry: null,
 
-  // History
-  history: [],
-  historyLoading: false,
   analyzingHistoryForHashes: new Set<string>(),
 
-  changeMap: null,
-  summaryAvailable: false,
-
   // Commit message suggestion
   commitMessageSuggestion: null,
 
@@ -398,18 +363,13 @@ export function createWidgetStore(initialState?: Partial<WidgetState>) {
     setConfigDir: (configDir) => set({ configDir }),
     setHosts: (hosts) => set({ hosts }),
     setHost: (host) => set({ host }),
-    setEvolveState: (evolveState) => set({ evolveState: evolveState }),
-    setExternalBuildDetected: (externalBuildDetected) => set({ externalBuildDetected }),
-    setGitStatus: (gitStatus) => set({ gitStatus }),
     setFileDiffContents: (fileDiffContents) => set({ fileDiffContents }),
     setEvolvePrompt: (evolvePrompt) => set({ evolvePrompt }),
     setProcessing: (isProcessing, action = null) =>
       set({
         isProcessing,
         processingAction: isProcessing ? action : null,
       }),
-    setChangeMap: (changeMap) => set({ changeMap }),
-    setSummaryAvailable: (summaryAvailable) => set({ summaryAvailable }),
     setBoolPref: (key: BoolPrefKey, value: boolean) => set({ [key]: value }),
     initConfirmPrefs: (prefs) =>
       set({
@@ -421,8 +381,6 @@ export function createWidgetStore(initialState?: Partial<WidgetState>) {
     setDeveloperMode: (value) => set({ developerMode: value }),
     setPinnedVersion: (value) => set({ pinnedVersion: value }),
     setUpdateChannel: (value) => set({ updateChannel: value }),
-    setHistory: (history) => set({ history }),
-    setHistoryLoading: (historyLoading) => set({ historyLoading }),
     addAnalyzingHistoryHash: (hash) =>
       set((state) => ({
         analyzingHistoryForHashes: new Set([...state.analyzingHistoryForHashes, hash]),
@@ -462,11 +420,6 @@ export function createWidgetStore(initialState?: Partial<WidgetState>) {
     setDarwinRebuildPrefetching: (darwinRebuildPrefetching) => set({ darwinRebuildPrefetching }),
     setSummarizing: (isSummarizing) => set({ isSummarizing }),
     setGenerating: (isGenerating) => set({ isGenerating }),
-    clearPreview: () =>
-      set({
-        changeMap: null,
-        summaryAvailable: false,
-      }),
 
     // Console
     appendLog: (text) => set((state) => ({ consoleLogs: state.consoleLogs + text })),
@@ -554,5 +507,6 @@ export const useWidgetStore = createWidgetStore();
  * Uses a selector so components only re-render when the step actually changes.
  */
 export function useCurrentStep(): WidgetStep {
-  return useWidgetStore((state) => computeCurrentStep(state));
+  const evolveState = useViewModel((state) => state.evolve);
+  return useWidgetStore((state) => computeCurrentStep({ ...state, evolveState }));
 }