complete the "restore file" feature for Wave AI write file tools...

Author: sawka

.roo/rules/rules.md

@@ -35,6 +35,7 @@ It has a TypeScript/React frontend and a Go backend. They talk together over `ws
     - Import the "cn" function from "@/util/util" to do classname / clsx class merge (it uses twMerge underneath)
     - For element variants use class-variance-authority
     - Do NOT create private fields in classes (they are impossible to inspect)
+    - Use PascalCase for global consts at the top of files
   - **Component Practices**:
     - Make sure to add cursor-pointer to buttons/links and clickable items
     - NEVER use cursor-help (it looks terrible)
@@ -48,6 +49,12 @@ It has a TypeScript/React frontend and a Go backend. They talk together over `ws
 - _never_ use cursor-help, or cursor-not-allowed (it looks terrible)
 - We have custom CSS setup as well, so it is a hybrid system. For new code we prefer tailwind, and are working to migrate code to all use tailwind.
 
+### RPC System
+
+To define a new RPC call, add the new definition to `pkg/wshrpc/wshrpctypes.go` including any input/output data that is required. After modifying wshrpctypes.go run `task generate` to generate the client APIs.
+
+For normal "server" RPCs (where a frontend client is calling the main server) you should implement the RPC call in `pkg/wshrpc/wshserver.go`.
+
 ### Code Generation
 
 - **TypeScript Types**: TypeScript types are automatically generated from Go types. After modifying Go types in `pkg/wshrpc/wshrpctypes.go`, run `task generate` to update the TypeScript type definitions in `frontend/types/gotypes.d.ts`.

frontend/app/aipanel/aitooluse.tsx

@@ -9,6 +9,9 @@ import { memo, useEffect, useRef, useState } from "react";
 import { WaveUIMessagePart } from "./aitypes";
 import { WaveAIModel } from "./waveai-model";
 
+// matches pkg/filebackup/filebackup.go
+const BackupRetentionDays = 5;
+
 function getEffectiveApprovalStatus(baseApproval: string, isStreaming: boolean): string {
     return !isStreaming && baseApproval === "needs-approval" ? "timeout" : baseApproval;
 }
@@ -136,6 +139,8 @@ interface RestoreBackupModalProps {
 const RestoreBackupModal = memo(({ part }: RestoreBackupModalProps) => {
     const model = WaveAIModel.getInstance();
     const toolData = part.data;
+    const status = useAtomValue(model.restoreBackupStatus);
+    const error = useAtomValue(model.restoreBackupError);
 
     const formatTimestamp = (ts: number) => {
         if (!ts) return "";
@@ -144,21 +149,57 @@ const RestoreBackupModal = memo(({ part }: RestoreBackupModalProps) => {
     };
 
     const handleConfirm = () => {
-        model.restoreBackup(toolData.toolcallid, toolData.inputfilename);
+        model.restoreBackup(toolData.toolcallid, toolData.writebackupfilename, toolData.inputfilename);
     };
 
     const handleCancel = () => {
         model.closeRestoreBackupModal();
     };
 
+    const handleClose = () => {
+        model.closeRestoreBackupModal();
+    };
+
+    if (status === "success") {
+        return (
+            <Modal className="restore-backup-modal pb-5 pr-5" onClose={handleClose} onOk={handleClose} okLabel="Close">
+                <div className="flex flex-col gap-4 pt-4 pb-4 max-w-xl">
+                    <div className="font-semibold text-lg text-green-500">Backup Successfully Restored</div>
+                    <div className="text-sm text-gray-300 leading-relaxed">
+                        The file <span className="font-mono text-white break-all">{toolData.inputfilename}</span> has
+                        been restored to its previous state.
+                    </div>
+                </div>
+            </Modal>
+        );
+    }
+
+    if (status === "error") {
+        return (
+            <Modal className="restore-backup-modal pb-5 pr-5" onClose={handleClose} onOk={handleClose} okLabel="Close">
+                <div className="flex flex-col gap-4 pt-4 pb-4 max-w-xl">
+                    <div className="font-semibold text-lg text-red-500">Failed to Restore Backup</div>
+                    <div className="text-sm text-gray-300 leading-relaxed">
+                        An error occurred while restoring the backup:
+                    </div>
+                    <div className="text-sm text-red-400 font-mono bg-gray-800 p-3 rounded break-all">{error}</div>
+                </div>
+            </Modal>
+        );
+    }
+
+    const isProcessing = status === "processing";
+
     return (
         <Modal
             className="restore-backup-modal pb-5 pr-5"
             onClose={handleCancel}
             onCancel={handleCancel}
             onOk={handleConfirm}
-            okLabel="Confirm Restore"
+            okLabel={isProcessing ? "Restoring..." : "Confirm Restore"}
             cancelLabel="Cancel"
+            okDisabled={isProcessing}
+            cancelDisabled={isProcessing}
         >
             <div className="flex flex-col gap-4 pt-4 pb-4 max-w-xl">
                 <div className="font-semibold text-lg">Restore File Backup</div>
@@ -277,16 +318,20 @@ const AIToolUse = memo(({ part, isStreaming }: AIToolUseProps) => {
                 <span className="font-bold">{statusIcon}</span>
                 <div className="font-semibold">{toolData.toolname}</div>
                 <div className="flex-1" />
-                {isFileWriteTool && toolData.inputfilename && toolData.writebackupfilename && (
-                    <button
-                        onClick={() => model.openRestoreBackupModal(toolData.toolcallid)}
-                        className="flex-shrink-0 px-1.5 py-0.5 border border-gray-600 hover:border-gray-500 hover:bg-gray-700 rounded cursor-pointer transition-colors flex items-center gap-1 text-gray-400"
-                        title="Restore backup file"
-                    >
-                        <span className="text-xs">Restore Backup</span>
-                        <i className="fa fa-clock-rotate-left text-xs"></i>
-                    </button>
-                )}
+                {isFileWriteTool &&
+                    toolData.inputfilename &&
+                    toolData.writebackupfilename &&
+                    toolData.runts &&
+                    Date.now() - toolData.runts < BackupRetentionDays * 24 * 60 * 60 * 1000 && (
+                        <button
+                            onClick={() => model.openRestoreBackupModal(toolData.toolcallid)}
+                            className="flex-shrink-0 px-1.5 py-0.5 border border-gray-600 hover:border-gray-500 hover:bg-gray-700 rounded cursor-pointer transition-colors flex items-center gap-1 text-gray-400"
+                            title="Restore backup file"
+                        >
+                            <span className="text-xs">Revert File</span>
+                            <i className="fa fa-clock-rotate-left text-xs"></i>
+                        </button>
+                    )}
                 {isFileWriteTool && toolData.inputfilename && (
                     <button
                         onClick={handleOpenDiff}

frontend/app/aipanel/waveai-model.tsx

@@ -57,6 +57,8 @@ export class WaveAIModel {
     isWaveAIFocusedAtom!: jotai.Atom<boolean>;
     panelVisibleAtom!: jotai.Atom<boolean>;
     restoreBackupModalToolCallId: jotai.PrimitiveAtom<string | null> = jotai.atom(null) as jotai.PrimitiveAtom<string | null>;
+    restoreBackupStatus: jotai.PrimitiveAtom<"idle" | "processing" | "success" | "error"> = jotai.atom("idle");
+    restoreBackupError: jotai.PrimitiveAtom<string> = jotai.atom(null) as jotai.PrimitiveAtom<string>;
 
     private constructor(orefContext: ORef, inBuilder: boolean) {
         this.orefContext = orefContext;
@@ -460,10 +462,25 @@ export class WaveAIModel {
 
     closeRestoreBackupModal() {
         globalStore.set(this.restoreBackupModalToolCallId, null);
+        globalStore.set(this.restoreBackupStatus, "idle");
+        globalStore.set(this.restoreBackupError, null);
     }
 
-    async restoreBackup(toolcallid: string, filename: string) {
-        console.log("Restore backup called for:", { toolcallid, filename });
-        this.closeRestoreBackupModal();
+    async restoreBackup(toolcallid: string, backupFilePath: string, restoreToFileName: string) {
+        globalStore.set(this.restoreBackupStatus, "processing");
+        globalStore.set(this.restoreBackupError, null);
+        try {
+            await RpcApi.FileRestoreBackupCommand(TabRpcClient, {
+                backupfilepath: backupFilePath,
+                restoretofilename: restoreToFileName,
+            });
+            console.log("Backup restored successfully:", { toolcallid, backupFilePath, restoreToFileName });
+            globalStore.set(this.restoreBackupStatus, "success");
+        } catch (error) {
+            console.error("Failed to restore backup:", error);
+            const errorMsg = error?.message || String(error);
+            globalStore.set(this.restoreBackupError, errorMsg);
+            globalStore.set(this.restoreBackupStatus, "error");
+        }
     }
 }

frontend/app/modals/modal.tsx

@@ -18,10 +18,12 @@ interface ModalProps {
     onOk?: () => void;
     onCancel?: () => void;
     onClose?: () => void;
+    okDisabled?: boolean;
+    cancelDisabled?: boolean;
 }
 
 const Modal = forwardRef<HTMLDivElement, ModalProps>(
-    ({ children, className, cancelLabel, okLabel, onCancel, onOk, onClose, onClickBackdrop }: ModalProps, ref) => {
+    ({ children, className, cancelLabel, okLabel, onCancel, onOk, onClose, onClickBackdrop, okDisabled, cancelDisabled }: ModalProps, ref) => {
         const renderBackdrop = (onClick) => <div className="modal-backdrop" onClick={onClick}></div>;
 
         const renderFooter = () => {
@@ -39,7 +41,7 @@ const Modal = forwardRef<HTMLDivElement, ModalProps>(
                         <ModalContent>{children}</ModalContent>
                     </div>
                     {renderFooter() && (
-                        <ModalFooter onCancel={onCancel} onOk={onOk} cancelLabel={cancelLabel} okLabel={okLabel} />
+                        <ModalFooter onCancel={onCancel} onOk={onOk} cancelLabel={cancelLabel} okLabel={okLabel} okDisabled={okDisabled} cancelDisabled={cancelDisabled} />
                     )}
                 </div>
             </div>
@@ -62,17 +64,19 @@ interface ModalFooterProps {
     cancelLabel?: string;
     onOk?: () => void;
     onCancel?: () => void;
+    okDisabled?: boolean;
+    cancelDisabled?: boolean;
 }
 
-const ModalFooter = ({ onCancel, onOk, cancelLabel = "Cancel", okLabel = "Ok" }: ModalFooterProps) => {
+const ModalFooter = ({ onCancel, onOk, cancelLabel = "Cancel", okLabel = "Ok", okDisabled, cancelDisabled }: ModalFooterProps) => {
     return (
         <footer className="modal-footer">
             {onCancel && (
-                <Button className="grey ghost" onClick={onCancel}>
+                <Button className="grey ghost" onClick={onCancel} disabled={cancelDisabled}>
                     {cancelLabel}
                 </Button>
             )}
-            {onOk && <Button onClick={onOk}>{okLabel}</Button>}
+            {onOk && <Button onClick={onOk} disabled={okDisabled}>{okLabel}</Button>}
         </footer>
     );
 };

frontend/app/store/wshclientapi.ts

@@ -247,6 +247,11 @@ class RpcApiType {
         return client.wshRpcStream("filereadstream", data, opts);
     }
 
+    // command "filerestorebackup" [call]
+    FileRestoreBackupCommand(client: WshClient, data: CommandFileRestoreBackupData, opts?: RpcOpts): Promise<void> {
+        return client.wshRpcCall("filerestorebackup", data, opts);
+    }
+
     // command "filesharecapability" [call]
     FileShareCapabilityCommand(client: WshClient, data: string, opts?: RpcOpts): Promise<FileShareCapability> {
         return client.wshRpcCall("filesharecapability", data, opts);

frontend/types/gotypes.d.ts

@@ -240,6 +240,12 @@ declare global {
         opts?: FileCopyOpts;
     };
 
+    // wshrpc.CommandFileRestoreBackupData
+    type CommandFileRestoreBackupData = {
+        backupfilepath: string;
+        restoretofilename: string;
+    };
+
     // wshrpc.CommandGetMetaData
     type CommandGetMetaData = {
         oref: ORef;

pkg/aiusechat/usechat.go

@@ -92,9 +92,9 @@ var SystemPromptText_OpenAI = strings.Join([]string{
 	`If a request would execute dangerous or destructive actions, warn briefly and provide a safer alternative.`,
 	`If output is very long, prefer a brief summary plus a copy-ready fenced block or offer a follow-up chunking strategy.`,
 
-	`You cannot yet execute shell commands, run code in the terminal, or directly edit files on disk. You also cannot read remote files.`,
-	`If the user asks you to do one of those things, say that these features aren’t available yet AND make sure to say that they are coming soon (stay tuned for updates).`,
-	`Instead, show them exactly what command or code they could copy-paste to perform it manually.`,
+	`You can write and edit local files on disk using available tools, but you cannot execute shell commands, run code in the terminal, or read/write remote files.`,
+	`If the user asks you to execute commands or run code, or deal with remote files say that these features aren't available yet AND make sure to say that they are coming soon (stay tuned for updates).`,
+	`Instead, show them exactly what command or code they could copy-paste to run manually.`,
 
 	// Final reminder
 	`You have NO API access to widgets or Wave unless provided via an explicit tool.`,
@@ -349,7 +349,7 @@ func processToolCallInternal(toolCall uctypes.WaveToolCall, chatOpts uctypes.Wav
 		_ = sseHandler.AiMsgData("data-tooluse", toolCall.ID, *toolCall.ToolUseData)
 		updateToolUseDataInChat(chatOpts, toolCall.ID, toolCall.ToolUseData)
 	}
-	
+
 	toolCall.ToolUseData.RunTs = time.Now().UnixMilli()
 	result := ResolveToolCall(toolCall, chatOpts)
 

pkg/filebackup/filebackup.go

@@ -87,6 +87,42 @@ func MakeFileBackup(absFilePath string) (string, error) {
 	return backupPath, nil
 }
 
+func RestoreBackup(backupFilePath string, restoreToFileName string) error {
+	backupData, err := os.ReadFile(backupFilePath)
+	if err != nil {
+		return fmt.Errorf("failed to read backup file: %w", err)
+	}
+
+	metadataPath := backupFilePath[:len(backupFilePath)-4] + ".json"
+	metadataData, err := os.ReadFile(metadataPath)
+	if err != nil {
+		return fmt.Errorf("failed to read backup metadata: %w", err)
+	}
+
+	var metadata BackupMetadata
+	err = json.Unmarshal(metadataData, &metadata)
+	if err != nil {
+		return fmt.Errorf("failed to unmarshal backup metadata: %w", err)
+	}
+
+	if metadata.FullPath != restoreToFileName {
+		return fmt.Errorf("backup metadata mismatch: expected %s, got %s", restoreToFileName, metadata.FullPath)
+	}
+
+	var perm os.FileMode
+	_, err = fmt.Sscanf(metadata.Perm, "%o", &perm)
+	if err != nil {
+		return fmt.Errorf("failed to parse file permissions: %w", err)
+	}
+
+	err = os.WriteFile(restoreToFileName, backupData, perm)
+	if err != nil {
+		return fmt.Errorf("failed to restore file: %w", err)
+	}
+
+	return nil
+}
+
 func CleanupOldBackups() error {
 	backupBaseDir := filepath.Join(wavebase.GetWaveCachesDir(), "waveai-backups")
 

pkg/wshrpc/wshclient/wshclient.go

@@ -303,6 +303,12 @@ func FileReadStreamCommand(w *wshutil.WshRpc, data wshrpc.FileData, opts *wshrpc
 	return sendRpcRequestResponseStreamHelper[wshrpc.FileData](w, "filereadstream", data, opts)
 }
 
+// command "filerestorebackup", wshserver.FileRestoreBackupCommand
+func FileRestoreBackupCommand(w *wshutil.WshRpc, data wshrpc.CommandFileRestoreBackupData, opts *wshrpc.RpcOpts) error {
+	_, err := sendRpcRequestCallHelper[any](w, "filerestorebackup", data, opts)
+	return err
+}
+
 // command "filesharecapability", wshserver.FileShareCapabilityCommand
 func FileShareCapabilityCommand(w *wshutil.WshRpc, data string, opts *wshrpc.RpcOpts) (wshrpc.FileShareCapability, error) {
 	resp, err := sendRpcRequestCallHelper[wshrpc.FileShareCapability](w, "filesharecapability", data, opts)

pkg/wshrpc/wshrpctypes.go

@@ -82,6 +82,7 @@ const (
 	Command_FileAppendIJson     = "fileappendijson"
 	Command_FileJoin            = "filejoin"
 	Command_FileShareCapability = "filesharecapability"
+	Command_FileRestoreBackup   = "filerestorebackup"
 
 	Command_EventPublish         = "eventpublish"
 	Command_EventRecv            = "eventrecv"
@@ -210,6 +211,7 @@ type WshRpcInterface interface {
 	FileListStreamCommand(ctx context.Context, data FileListData) <-chan RespOrErrorUnion[CommandRemoteListEntriesRtnData]
 
 	FileShareCapabilityCommand(ctx context.Context, path string) (FileShareCapability, error)
+	FileRestoreBackupCommand(ctx context.Context, data CommandFileRestoreBackupData) error
 	EventPublishCommand(ctx context.Context, data wps.WaveEvent) error
 	EventSubCommand(ctx context.Context, data wps.SubscriptionRequest) error
 	EventUnsubCommand(ctx context.Context, data string) error
@@ -597,6 +599,11 @@ type CommandFileCopyData struct {
 	Opts    *FileCopyOpts `json:"opts,omitempty"`
 }
 
+type CommandFileRestoreBackupData struct {
+	BackupFilePath     string `json:"backupfilepath"`
+	RestoreToFileName  string `json:"restoretofilename"`
+}
+
 type CommandRemoteStreamTarData struct {
 	Path string        `json:"path"`
 	Opts *FileCopyOpts `json:"opts,omitempty"`