Add Steam UI for prefix-managed integration

6 files changed, 156 insertions, 202 deletions

diff --git a/src/components/ClipboardCommands.tsx b/src/components/ClipboardCommands.tsx
index 5a6f38f..5344a6b 100644
--- a/src/components/ClipboardCommands.tsx
+++ b/src/components/ClipboardCommands.tsx
@@ -9,14 +9,14 @@ export function ClipboardCommands({ pathExists }: ClipboardCommandsProps) {
 
   return (
     <>
-      <SmartClipboardButton 
-        command="~/fgmod/fgmod %command%"
-        buttonText="Copy Patch Command"
+      <SmartClipboardButton
+        command='OPTISCALER_PROXY=winmm ~/fgmod/fgmod %command%'
+        buttonText="Copy enable launch command"
       />
-      
-      <SmartClipboardButton 
+
+      <SmartClipboardButton
         command="~/fgmod/fgmod-uninstaller.sh %command%"
-        buttonText="Copy Unpatch Command"
+        buttonText="Copy cleanup launch command"
       />
     </>
   );
diff --git a/src/components/InstalledGamesSection.tsx b/src/components/InstalledGamesSection.tsx
index 71278d7..eb750c8 100644
--- a/src/components/InstalledGamesSection.tsx
+++ b/src/components/InstalledGamesSection.tsx
@@ -1,122 +1,166 @@
-import { useState, useEffect } from "react";
-import { PanelSection, PanelSectionRow, ButtonItem, DropdownItem, ConfirmModal, showModal } from "@decky/ui";
-import { listInstalledGames, logError } from "../api";
+import { useEffect, useState } from "react";
+import {
+  ButtonItem,
+  ConfirmModal,
+  DropdownItem,
+  PanelSection,
+  PanelSectionRow,
+  showModal,
+} from "@decky/ui";
+import { cleanupManagedGame, listInstalledGames, logError } from "../api";
 import { safeAsyncOperation } from "../utils";
-import { STYLES } from "../utils/constants";
 import { GameInfo } from "../types/index";
+import { STYLES } from "../utils/constants";
+
+const DEFAULT_LAUNCH_COMMAND = 'OPTISCALER_PROXY=winmm ~/fgmod/fgmod %COMMAND%';
 
-export function InstalledGamesSection() {
+interface InstalledGamesSectionProps {
+  isAvailable: boolean;
+}
+
+export function InstalledGamesSection({ isAvailable }: InstalledGamesSectionProps) {
   const [games, setGames] = useState<GameInfo[]>([]);
   const [selectedGame, setSelectedGame] = useState<GameInfo | null>(null);
-  const [result, setResult] = useState<string>('');
+  const [result, setResult] = useState<string>("");
+  const [loadingGames, setLoadingGames] = useState(false);
+  const [enabling, setEnabling] = useState(false);
+  const [disabling, setDisabling] = useState(false);
 
   useEffect(() => {
+    if (!isAvailable) return;
+
+    let cancelled = false;
+
     const fetchGames = async () => {
-      const response = await safeAsyncOperation(
-        async () => await listInstalledGames(),
-        'fetchGames'
-      );
-      
-      if (response?.status === "success") {
+      setLoadingGames(true);
+      const response = await safeAsyncOperation(async () => await listInstalledGames(), "InstalledGamesSection.fetchGames");
+
+      if (cancelled || !response) {
+        setLoadingGames(false);
+        return;
+      }
+
+      if (response.status === "success") {
         const sortedGames = [...response.games]
-          .map(game => ({
+          .map((game) => ({
             ...game,
-            appid: parseInt(game.appid, 10),
+            appid: parseInt(String(game.appid), 10),
           }))
           .sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()));
         setGames(sortedGames);
-      } else if (response) {
-        logError('fetchGames: ' + JSON.stringify(response));
-        console.error('fetchGames: ' + JSON.stringify(response));
+      } else {
+        logError(`InstalledGamesSection.fetchGames: ${JSON.stringify(response)}`);
       }
+
+      setLoadingGames(false);
     };
-    
+
     fetchGames();
-  }, []);
 
-  const handlePatchClick = async () => {
+    return () => {
+      cancelled = true;
+    };
+  }, [isAvailable]);
+
+  const handleEnable = async () => {
     if (!selectedGame) return;
 
-    // Show confirmation modal
     showModal(
-      <ConfirmModal 
-        strTitle={`Enable Frame Generation for ${selectedGame.name}?`}
+      <ConfirmModal
+        strTitle={`Enable prefix-managed OptiScaler for ${selectedGame.name}?`}
         strDescription={
-          "⚠️ Important: This plugin does not automatically unpatch games when uninstalled. If you uninstall this plugin or experience game issues, use the 'Disable Frame Generation' option or verify game file integrity through Steam."
+          "This only changes the Steam launch option for the selected game. OptiScaler itself is staged into compatdata/pfx/system32 at launch time and does not write into the game install directory."
         }
-        strOKButtonText="Enable Frame Generation"
+        strOKButtonText="Enable"
         strCancelButtonText="Cancel"
         onOK={async () => {
+          setEnabling(true);
           try {
-            await SteamClient.Apps.SetAppLaunchOptions(selectedGame.appid, '~/fgmod/fgmod %COMMAND%');
-            setResult(`✓ Frame generation enabled for ${selectedGame.name}. Launch the game, enable DLSS in graphics settings, then press Insert to access OptiScaler options.`);
+            await SteamClient.Apps.SetAppLaunchOptions(selectedGame.appid, DEFAULT_LAUNCH_COMMAND);
+            setResult(`✓ Enabled prefix-managed OptiScaler for ${selectedGame.name}. Launch the game, enable DLSS if needed, then press Insert for the OptiScaler menu.`);
           } catch (error) {
-            logError('handlePatchClick: ' + String(error));
-            setResult(error instanceof Error ? `Error: ${error.message}` : 'Error enabling frame generation');
+            logError(`InstalledGamesSection.handleEnable: ${String(error)}`);
+            setResult(error instanceof Error ? `Error: ${error.message}` : "Error enabling prefix-managed OptiScaler");
+          } finally {
+            setEnabling(false);
           }
         }}
       />
     );
   };
 
-  const handleUnpatchClick = async () => {
+  const handleDisable = async () => {
     if (!selectedGame) return;
 
+    setDisabling(true);
     try {
-      await SteamClient.Apps.SetAppLaunchOptions(selectedGame.appid, '~/fgmod/fgmod-uninstaller.sh %COMMAND%');
-      setResult(`✓ Frame generation will be disabled on next launch of ${selectedGame.name}.`);
+      const cleanupResult = await cleanupManagedGame(String(selectedGame.appid));
+      if (cleanupResult?.status !== "success") {
+        setResult(`Error: ${cleanupResult?.message || cleanupResult?.output || "Failed to clean managed compatdata prefix"}`);
+        return;
+      }
+
+      await SteamClient.Apps.SetAppLaunchOptions(selectedGame.appid, "");
+      setResult(`✓ Cleared launch options and cleaned the managed compatdata prefix for ${selectedGame.name}.`);
     } catch (error) {
-      logError('handleUnpatchClick: ' + String(error));
-      setResult(error instanceof Error ? `Error: ${error.message}` : 'Error disabling frame generation');
+      logError(`InstalledGamesSection.handleDisable: ${String(error)}`);
+      setResult(error instanceof Error ? `Error: ${error.message}` : "Error disabling prefix-managed OptiScaler");
+    } finally {
+      setDisabling(false);
     }
   };
 
+  if (!isAvailable) return null;
+
   return (
-    <PanelSection title="Select a Game to Patch:">
+    <PanelSection title="Steam game integration">
       <PanelSectionRow>
         <DropdownItem
-          rgOptions={games.map(game => ({
+          rgOptions={games.map((game) => ({
             data: game.appid,
-            label: game.name
+            label: game.name,
           }))}
           selectedOption={selectedGame?.appid}
           onChange={(option) => {
-            const game = games.find(g => g.appid === option.data);
+            const game = games.find((entry) => entry.appid === option.data);
             setSelectedGame(game || null);
-            setResult('');
+            setResult("");
           }}
-          strDefaultLabel="Choose a game"
-          menuLabel="Installed Games"
+          strDefaultLabel={loadingGames ? "Loading installed games..." : "Choose a game"}
+          menuLabel="Installed Steam games"
+          disabled={loadingGames || games.length === 0}
         />
       </PanelSectionRow>
 
+      <PanelSectionRow>
+        <div style={STYLES.instructionCard}>
+          Enable writes the launch option automatically. Disable clears launch options and removes staged files from the selected game's compatdata prefix.
+        </div>
+      </PanelSectionRow>
+
       {result ? (
         <PanelSectionRow>
-          <div style={{
-            ...STYLES.preWrap,
-            ...(result.includes('Error') ? STYLES.statusNotInstalled : STYLES.statusInstalled)
-          }}>
-            {result.includes('Error') ? '❌' : '✅'} {result}
+          <div
+            style={{
+              ...STYLES.preWrap,
+              ...(result.startsWith("Error") ? STYLES.statusNotInstalled : STYLES.statusInstalled),
+            }}
+          >
+            {result.startsWith("Error") ? "❌" : "✅"} {result}
           </div>
         </PanelSectionRow>
       ) : null}
-      
+
       {selectedGame ? (
         <>
           <PanelSectionRow>
-            <ButtonItem
-              layout="below"
-              onClick={handlePatchClick}
-            >
-              Enable Frame Generation
+            <ButtonItem layout="below" onClick={handleEnable} disabled={enabling || disabling}>
+              {enabling ? "Enabling..." : "Enable for selected game"}
             </ButtonItem>
           </PanelSectionRow>
           <PanelSectionRow>
-            <ButtonItem
-              layout="below"
-              onClick={handleUnpatchClick}
-            >
-              Disable Frame Generation
+            <ButtonItem layout="below" onClick={handleDisable} disabled={enabling || disabling}>
+              {disabling ? "Cleaning..." : "Disable and clean selected game"}
             </ButtonItem>
           </PanelSectionRow>
         </>
diff --git a/src/components/InstructionCard.tsx b/src/components/InstructionCard.tsx
index fdf6755..392c782 100644
--- a/src/components/InstructionCard.tsx
+++ b/src/components/InstructionCard.tsx
@@ -11,12 +11,10 @@ export function InstructionCard({ pathExists }: InstructionCardProps) {
   return (
     <PanelSectionRow>
       <div style={STYLES.instructionCard}>
-        <div style={{ fontWeight: 'bold', marginBottom: '8px', color: 'var(--decky-accent-text)' }}>
+        <div style={{ fontWeight: "bold", marginBottom: "8px", color: "var(--decky-accent-text)" }}>
           {MESSAGES.instructionTitle}
         </div>
-        <div style={{ whiteSpace: 'pre-line' }}>
-          {MESSAGES.instructionText}
-        </div>
+        <div style={{ whiteSpace: "pre-line" }}>{MESSAGES.instructionText}</div>
       </div>
     </PanelSectionRow>
   );
diff --git a/src/components/OptiScalerControls.tsx b/src/components/OptiScalerControls.tsx
index 468683c..4a33b58 100644
--- a/src/components/OptiScalerControls.tsx
+++ b/src/components/OptiScalerControls.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from "react";
+import { useEffect, useState } from "react";
 import { PanelSection } from "@decky/ui";
 import { runInstallFGMod, runUninstallFGMod } from "../api";
 import { OperationResult } from "./ResultDisplay";
@@ -10,7 +10,7 @@ import { ClipboardCommands } from "./ClipboardCommands";
 import { InstructionCard } from "./InstructionCard";
 import { OptiScalerWiki } from "./OptiScalerWiki";
 import { UninstallButton } from "./UninstallButton";
-import { ManualPatchControls } from "./CustomPathOverride";
+import { InstalledGamesSection } from "./InstalledGamesSection";
 
 interface OptiScalerControlsProps {
   pathExists: boolean | null;
@@ -22,19 +22,15 @@ export function OptiScalerControls({ pathExists, setPathExists }: OptiScalerCont
   const [uninstalling, setUninstalling] = useState(false);
   const [installResult, setInstallResult] = useState<OperationResult | null>(null);
   const [uninstallResult, setUninstallResult] = useState<OperationResult | null>(null);
-  const [manualModeEnabled, setManualModeEnabled] = useState(false);
+
   useEffect(() => {
-    if (installResult) {
-      return createAutoCleanupTimer(() => setInstallResult(null), TIMEOUTS.resultDisplay);
-    }
-    return () => {}; // Ensure a cleanup function is always returned
+    if (!installResult) return () => {};
+    return createAutoCleanupTimer(() => setInstallResult(null), TIMEOUTS.resultDisplay);
   }, [installResult]);
 
   useEffect(() => {
-    if (uninstallResult) {
-      return createAutoCleanupTimer(() => setUninstallResult(null), TIMEOUTS.resultDisplay);
-    }
-    return () => {}; // Ensure a cleanup function is always returned
+    if (!uninstallResult) return () => {};
+    return createAutoCleanupTimer(() => setUninstallResult(null), TIMEOUTS.resultDisplay);
   }, [uninstallResult]);
 
   const handleInstallClick = async () => {
@@ -45,8 +41,8 @@ export function OptiScalerControls({ pathExists, setPathExists }: OptiScalerCont
       if (result.status === "success") {
         setPathExists(true);
       }
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
     } finally {
       setInstalling(false);
     }
@@ -60,8 +56,8 @@ export function OptiScalerControls({ pathExists, setPathExists }: OptiScalerCont
       if (result.status === "success") {
         setPathExists(false);
       }
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
     } finally {
       setUninstalling(false);
     }
@@ -69,33 +65,13 @@ export function OptiScalerControls({ pathExists, setPathExists }: OptiScalerCont
 
   return (
     <PanelSection>
-      <InstallationStatus 
-        pathExists={pathExists}
-        installing={installing}
-        onInstallClick={handleInstallClick}
-      />
-      
+      <InstallationStatus pathExists={pathExists} installing={installing} onInstallClick={handleInstallClick} />
       <OptiScalerHeader pathExists={pathExists} />
-      
-      <ManualPatchControls
-        isAvailable={pathExists === true}
-        onManualModeChange={setManualModeEnabled}
-      />
-
-      {!manualModeEnabled && (
-        <>
-          <ClipboardCommands pathExists={pathExists} />
-          
-          <InstructionCard pathExists={pathExists} />
-        </>
-      )}
+      <InstalledGamesSection isAvailable={pathExists === true} />
+      <ClipboardCommands pathExists={pathExists} />
+      <InstructionCard pathExists={pathExists} />
       <OptiScalerWiki pathExists={pathExists} />
-      
-      <UninstallButton 
-        pathExists={pathExists}
-        uninstalling={uninstalling}
-        onUninstallClick={handleUninstallClick}
-      />
+      <UninstallButton pathExists={pathExists} uninstalling={uninstalling} onUninstallClick={handleUninstallClick} />
     </PanelSection>
   );
 }
diff --git a/src/components/SmartClipboardButton.tsx b/src/components/SmartClipboardButton.tsx
index d88a58a..8cc52b1 100644
--- a/src/components/SmartClipboardButton.tsx
+++ b/src/components/SmartClipboardButton.tsx
@@ -1,119 +1,68 @@
-import { useState, useEffect } from "react";
-import { PanelSectionRow, ButtonItem, ConfirmModal, showModal } from "@decky/ui";
-import { FaClipboard, FaCheck } from "react-icons/fa";
+import { useEffect, useState } from "react";
+import { ButtonItem, PanelSectionRow } from "@decky/ui";
 import { toaster } from "@decky/api";
+import { FaCheck, FaClipboard } from "react-icons/fa";
 
 interface SmartClipboardButtonProps {
   command?: string;
   buttonText?: string;
 }
 
-export function SmartClipboardButton({ 
-  command = "~/fgmod/fgmod %command%",
-  buttonText = "Copy Launch Command"
+export function SmartClipboardButton({
+  command = 'OPTISCALER_PROXY=winmm ~/fgmod/fgmod %command%',
+  buttonText = 'Copy Launch Command',
 }: SmartClipboardButtonProps) {
   const [isLoading, setIsLoading] = useState(false);
   const [showSuccess, setShowSuccess] = useState(false);
 
-  // Reset success state after 3 seconds
   useEffect(() => {
-    if (showSuccess) {
-      const timer = setTimeout(() => {
-        setShowSuccess(false);
-      }, 3000);
-      return () => clearTimeout(timer);
-    }
-    return undefined;
+    if (!showSuccess) return undefined;
+    const timer = setTimeout(() => setShowSuccess(false), 3000);
+    return () => clearTimeout(timer);
   }, [showSuccess]);
 
-  const copyToClipboard = async () => {
-    if (isLoading || showSuccess) return;
-    
-    const isPatchCommand = command.includes("fgmod %command%") && !command.includes("uninstaller");
-    
-    if (isPatchCommand) {
-      showModal(
-        <ConfirmModal 
-          strTitle={`Patch Game with OptiScaler?`}
-          strDescription={
-            "WARNING: Decky Framegen does not unpatch games when uninstalled. Be sure to unpatch the game or run the OptiScaler uninstall script inside the game files if you choose to uninstall the plugin or the game has issues."
-          }
-          strOKButtonText="Copy Patch Command"
-          strCancelButtonText="Cancel"
-          onOK={async () => {
-            await performCopy();
-          }}
-        />
-      );
-      return;
-    }
-    
-    // For non-patch commands, copy directly
-    await performCopy();
-  };
-
   const performCopy = async () => {
     if (isLoading || showSuccess) return;
-    
+
     setIsLoading(true);
     try {
-      const text = command;
-      
-      // Use the proven input simulation method
-      const tempInput = document.createElement('input');
-      tempInput.value = text;
-      tempInput.style.position = 'absolute';
-      tempInput.style.left = '-9999px';
+      const tempInput = document.createElement("input");
+      tempInput.value = command;
+      tempInput.style.position = "absolute";
+      tempInput.style.left = "-9999px";
       document.body.appendChild(tempInput);
-      
-      // Focus and select the text
       tempInput.focus();
       tempInput.select();
-      
-      // Try copying using execCommand first (most reliable in gaming mode)
+
       let copySuccess = false;
       try {
-        if (document.execCommand('copy')) {
+        if (document.execCommand("copy")) {
           copySuccess = true;
         }
-      } catch (e) {
-        // If execCommand fails, try navigator.clipboard as fallback
+      } catch (execError) {
         try {
-          await navigator.clipboard.writeText(text);
+          await navigator.clipboard.writeText(command);
           copySuccess = true;
         } catch (clipboardError) {
-          console.error('Both copy methods failed:', e, clipboardError);
+          console.error("Clipboard copy failed", execError, clipboardError);
         }
       }
-      
-      // Clean up
+
       document.body.removeChild(tempInput);
-      
-      if (copySuccess) {
-        // Show success feedback in the button instead of toast
-        setShowSuccess(true);
-        // Verify the copy worked by reading back
-        try {
-          const readBack = await navigator.clipboard.readText();
-          if (readBack !== text) {
-            // Copy worked but verification failed - still show success
-            console.log('Copy verification failed but copy likely worked');
-          }
-        } catch (e) {
-          // Verification failed but copy likely worked
-          console.log('Copy verification unavailable but copy likely worked');
-        }
-      } else {
+
+      if (!copySuccess) {
         toaster.toast({
           title: "Copy Failed",
-          body: "Unable to copy to clipboard"
+          body: "Unable to copy to clipboard",
         });
+        return;
       }
 
+      setShowSuccess(true);
     } catch (error) {
       toaster.toast({
         title: "Copy Failed",
-        body: `Error: ${String(error)}`
+        body: `Error: ${String(error)}`,
       });
     } finally {
       setIsLoading(false);
@@ -122,28 +71,16 @@ export function SmartClipboardButton({
 
   return (
     <PanelSectionRow>
-      <ButtonItem
-        layout="below"
-        onClick={copyToClipboard}
-        disabled={isLoading || showSuccess}
-      >
+      <ButtonItem layout="below" onClick={performCopy} disabled={isLoading || showSuccess}>
         <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
           {showSuccess ? (
-            <FaCheck style={{ 
-              color: "#4CAF50" // Green color for success
-            }} />
+            <FaCheck style={{ color: "#4CAF50" }} />
           ) : isLoading ? (
-            <FaClipboard style={{ 
-              animation: "pulse 1s ease-in-out infinite",
-              opacity: 0.7 
-            }} />
+            <FaClipboard style={{ animation: "pulse 1s ease-in-out infinite", opacity: 0.7 }} />
           ) : (
             <FaClipboard />
           )}
-          <div style={{ 
-            color: showSuccess ? "#4CAF50" : "inherit",
-            fontWeight: showSuccess ? "bold" : "normal"
-          }}>
+          <div style={{ color: showSuccess ? "#4CAF50" : "inherit", fontWeight: showSuccess ? "bold" : "normal" }}>
             {showSuccess ? "Copied to clipboard" : isLoading ? "Copying..." : buttonText}
           </div>
         </div>
diff --git a/src/components/index.ts b/src/components/index.ts
index cd599ba..18ca2b4 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -1,4 +1,3 @@
-// Component exports for cleaner imports
 export { OptiScalerControls } from './OptiScalerControls';
 export { InstallationStatus } from './InstallationStatus';
 export { OptiScalerHeader } from './OptiScalerHeader';
@@ -8,4 +7,4 @@ export { OptiScalerWiki } from './OptiScalerWiki';
 export { UninstallButton } from './UninstallButton';
 export { SmartClipboardButton } from './SmartClipboardButton';
 export { ResultDisplay } from './ResultDisplay';
-export { ManualPatchControls } from './CustomPathOverride';
+export { InstalledGamesSection } from './InstalledGamesSection';