fix: address review feedback - VBS quoting, error handling, tests

Zhiyuan Li · Zhiyuan Li · commit 538f310fe4f7 · 2026-03-25T09:46:58.000+08:00
diff --git a/src/cli/update-cli/restart-helper.test.ts b/src/cli/update-cli/restart-helper.test.ts
@@ -306,6 +306,9 @@ describe("restart-helper", () => {
       expect(vbsPath).toBe("C:\\Temp\\fake-script.vbs");
       expect(vbsContent).toContain("WScript.Shell");
       expect(vbsContent).toContain("cmd.exe");
+      // VBScript should NOT double backslashes (VBS treats \ literally)
+      expect(vbsContent).toContain("C:\\Temp\\fake-script.bat");
+      expect(vbsContent).not.toContain("C:\\\\Temp");
 
       // Should spawn wscript.exe with the VBS wrapper
       expect(spawn).toHaveBeenCalledWith("wscript.exe", [vbsPath], {
@@ -316,5 +319,40 @@ describe("restart-helper", () => {
       expect(mockChild.unref).toHaveBeenCalled();
       writeFileSpy.mockRestore();
     });
+
+    it("handles paths with spaces and special characters on Windows", async () => {
+      Object.defineProperty(process, "platform", { value: "win32" });
+      const scriptPath = "C:\\Users\\My User\\AppData\\Local\\Temp\\openclaw-restart-123.bat";
+      const mockChild = { unref: vi.fn() };
+      vi.mocked(spawn).mockReturnValue(mockChild as unknown as ChildProcess);
+      const writeFileSpy = vi.spyOn(fs, "writeFile").mockResolvedValueOnce(undefined);
+
+      await runRestartScript(scriptPath);
+
+      const [, vbsContent] = writeFileSpy.mock.calls[0] as [string, string, string];
+      // Path with spaces should be preserved as-is (no backslash doubling)
+      expect(vbsContent).toContain("C:\\Users\\My User\\AppData");
+      expect(vbsContent).not.toContain("\\\\");
+      writeFileSpy.mockRestore();
+    });
+
+    it("falls back to cmd.exe when VBS file write fails on Windows", async () => {
+      Object.defineProperty(process, "platform", { value: "win32" });
+      const scriptPath = "C:\\Temp\\fake-script.bat";
+      const mockChild = { unref: vi.fn() };
+      vi.mocked(spawn).mockReturnValue(mockChild as unknown as ChildProcess);
+      const writeFileSpy = vi.spyOn(fs, "writeFile").mockRejectedValueOnce(new Error("disk full"));
+
+      await runRestartScript(scriptPath);
+
+      // Should fall back to direct cmd.exe spawn
+      expect(spawn).toHaveBeenCalledWith("cmd.exe", ["/d", "/s", "/c", scriptPath], {
+        detached: true,
+        stdio: "ignore",
+        windowsHide: true,
+      });
+      expect(mockChild.unref).toHaveBeenCalled();
+      writeFileSpy.mockRestore();
+    });
   });
 });
diff --git a/src/cli/update-cli/restart-helper.ts b/src/cli/update-cli/restart-helper.ts
@@ -170,16 +170,31 @@ del "%~f0"
 export async function runRestartScript(scriptPath: string): Promise<void> {
   if (process.platform === "win32") {
     // Write a VBScript wrapper that runs the batch script fully hidden.
+    // VBScript does not use \ as an escape character, so only quotes need doubling.
     const vbsPath = scriptPath.replace(/\.bat$/i, ".vbs");
-    const quotedBat = scriptPath.replace(/\\/g, "\\\\").replace(/"/g, '""');
+    const quotedBat = scriptPath.replace(/"/g, '""');
+    // Quote scheme: 4 quotes before + 5 after the path.
+    // VBScript decodes "" → " so ws.Run receives: cmd.exe /d /s /c ""<path>""
+    // cmd.exe /s /c strips the outer pair, leaving "<path>" as the argument.
     const vbsContent = [
       'Set ws = CreateObject("WScript.Shell")',
-      `ws.Run "cmd.exe /d /s /c """"${quotedBat}""""""", 0, False`,
+      `ws.Run "cmd.exe /d /s /c """"${quotedBat}""""", 0, False`,
       // Self-cleanup: delete the VBScript wrapper.
       'Set fso = CreateObject("Scripting.FileSystemObject")',
       "fso.DeleteFile WScript.ScriptFullName",
     ].join("\r\n");
-    await fs.writeFile(vbsPath, vbsContent, "utf8");
+    try {
+      await fs.writeFile(vbsPath, vbsContent, "utf8");
+    } catch {
+      // Fall back: run the bat directly (console flash may be visible but restart succeeds).
+      const child = spawn("cmd.exe", ["/d", "/s", "/c", scriptPath], {
+        detached: true,
+        stdio: "ignore",
+        windowsHide: true,
+      });
+      child.unref();
+      return;
+    }
     const child = spawn("wscript.exe", [vbsPath], {
       detached: true,
       stdio: "ignore",
