aegis-desktop 0.8.23 → 0.8.24

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aegis-desktop",
   "productName": "AEGIS Desktop",
-  "version": "0.8.23",
+  "version": "0.8.24",
   "description": "Thin Electron host for AEGIS — a local chat UI over the shared client/aegis.js transport. Ships transport + UI only; engine logic stays server-side.",
   "author": {
     "name": "AEGIS Code",

package/vendor/platform.js

@@ -493,17 +493,56 @@ function hasPosixModes(options = {}) {
   return !win32;
 }
 
+/**
+ * Windows' own answer for "where is this user's Desktop", straight from the
+ * registry key Explorer itself reads and OneDrive itself rewrites when it
+ * redirects a folder. This is the one source immune to BOTH ways `~/Desktop`
+ * guesses wrong at once: it already names the OneDrive path when redirection
+ * is active, and it already names the LOCALISED folder — Swedish "Skrivbord",
+ * French "Bureau", whatever the session's physical folder is actually called
+ * — because it is Windows' own record of a real path, not an English-language
+ * guess with a `?` for an ending. Guessing per-language folder names instead
+ * would mean enumerating every language Windows ships, forever one behind;
+ * asking Windows is both simpler and exact.
+ *
+ * "Shell Folders" (not "User Shell Folders") is the one queried, because it
+ * holds the already-expanded absolute path — "User Shell Folders" is allowed
+ * to hold `%USERPROFILE%`-relative values, and this function has no reason to
+ * carry its own copy of Windows' expansion rules when the other key already
+ * did that work.
+ *
+ * Returns `''` on anything but a clean hit: `reg.exe` missing, a non-zero
+ * exit, unparsable output, or a path the filesystem does not actually have —
+ * each of those falls through to the candidate-guessing list in desktopDir()
+ * below, which is where this function's absence has always been tolerated.
+ */
+function winShellFolderDesktop(probe, dirExists) {
+  const out = probe('reg', [
+    'query',
+    'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders',
+    '/v', 'Desktop',
+  ]);
+  if (!out) return '';
+  const m = /^\s*Desktop\s+REG_(?:EXPAND_)?SZ\s+(.+)$/im.exec(out);
+  const value = m && m[1].trim();
+  return value && dirExists(value) ? value : '';
+}
+
 /**
  * This user's real Desktop directory, or `''` when none can be found.
  *
  * `~/Desktop` is a GUESS, and it is wrong on both of the hosts this function was
  * added for:
  *
- *   - Windows with OneDrive. Folder redirection moves the live Desktop to
- *     `%USERPROFILE%\OneDrive\Desktop` and commonly leaves an empty
- *     `%USERPROFILE%\Desktop` behind, so a write to the obvious path lands in a
- *     directory the user is not looking at. `%OneDrive%` (set while OneDrive
- *     runs) is consulted first for exactly this case.
+ *   - Windows with OneDrive, or a localised session. Folder redirection moves
+ *     the live Desktop to `%USERPROFILE%\OneDrive\Desktop` (or renames it
+ *     entirely, e.g. Swedish "Skrivbord"), and commonly leaves an empty
+ *     `%USERPROFILE%\Desktop` behind, so a write to the obvious English path
+ *     lands in a directory the user is not looking at — or at a name that
+ *     does not exist on their machine at all. `winShellFolderDesktop()` above
+ *     asks Windows directly and settles both cases at once; the `%OneDrive%`-
+ *     and `home`-based guesses below only run when that lookup comes back
+ *     empty (no `reg.exe`, or the path it names no longer exists).
  *   - A localised Linux desktop. XDG translates the directory ITSELF, not just
  *     its label: a Swedish session has `~/Skrivbord` and no `~/Desktop` at all.
  *     `$XDG_DESKTOP_DIR` answers it, and `~/.config/user-dirs.dirs` is where
@@ -513,15 +552,22 @@ function hasPosixModes(options = {}) {
  *
  * Seams: `dirExists` (default: a real statSync isDirectory probe), `dirNonEmpty`
  * (default: a real readdirSync length check, used only to break the win32
- * OneDrive-vs-plain tie below) and `readText` (default: a real utf8 read,
- * `null` on any failure), so all three branches are exercised on one host.
+ * OneDrive-vs-plain guess below when the registry lookup did not settle it),
+ * `probe` (default: a real `reg.exe` spawn, `null` on any failure) and
+ * `readText` (default: a real utf8 read, `null` on any failure), so every
+ * branch is exercised on one host.
  */
 function desktopDir(options = {}) {
-  const { platform, env, win32, o } = seams(options);
+  const { platform, env, win32, probe, o } = seams(options);
   const P = win32 ? path.win32 : path.posix;
   const home = homeDir(options);
   const dirExists = typeof o.dirExists === 'function' ? o.dirExists : defaultDirExists;
   const dirNonEmpty = typeof o.dirNonEmpty === 'function' ? o.dirNonEmpty : defaultDirNonEmpty;
+
+  if (win32) {
+    const fromRegistry = winShellFolderDesktop(probe, dirExists);
+    if (fromRegistry) return fromRegistry;
+  }
   const readText = typeof o.readText === 'function' ? o.readText : defaultReadText;
 
   const candidates = [];