fix(desktop): validate consent rechecks and exact folder identities

Author: waleedlatif1

apps/desktop/e2e/background-executor.spec.ts

@@ -4,6 +4,7 @@ import {
   mkdtempSync,
   readFileSync,
   renameSync,
+  rmSync,
   writeFileSync,
 } from 'node:fs'
 import { tmpdir } from 'node:os'
@@ -307,16 +308,28 @@ test.describe('background executor', () => {
     if (existsSync(settings)) renameSync(settings, `${settings}.backup`)
     mkdirSync(settings)
 
-    await check('failed settings persistence does not skip independent grant cleanup', async () => {
-      await launched.app.evaluate(({ Menu }) => {
-        const item = Menu.getApplicationMenu()
-          ?.items.flatMap((entry) => entry.submenu?.items ?? [])
-          .find((entry) => entry.label === 'Sign Out')
-        if (!item) throw new Error('Missing Sign Out menu item')
-        item.click()
-      })
-      await expect.poll(() => existsSync(grants)).toBe(false)
-    })
+    try {
+      await check(
+        'failed settings persistence does not skip independent grant cleanup',
+        async () => {
+          const failedSignOut = launched.app.waitForEvent('window')
+          await launched.app.evaluate(({ Menu }) => {
+            const item = Menu.getApplicationMenu()
+              ?.items.flatMap((entry) => entry.submenu?.items ?? [])
+              .find((entry) => entry.label === 'Sign Out')
+            if (!item) throw new Error('Missing Sign Out menu item')
+            item.click()
+          })
+          const failure = await failedSignOut
+          await failure.getByRole('button', { name: 'OK', exact: true }).click()
+          expect(existsSync(join(userData, 'account-data-teardown-required.json'))).toBe(true)
+          await expect.poll(() => existsSync(grants)).toBe(false)
+        }
+      )
+    } finally {
+      rmSync(settings, { recursive: true, force: true })
+      if (existsSync(`${settings}.backup`)) renameSync(`${settings}.backup`, settings)
+    }
   })
 
   test('B: a result produced while the network is cut is delivered once after reconnecting', async () => {

apps/desktop/e2e/browser-focus.spec.ts

@@ -308,6 +308,33 @@ test('browser focus and shortcuts stay with the surface the user is using', asyn
       await clickMenu('New Tab')
       await expect.poll(tabCount).toBe(before + 1)
     })
+    await check(
+      'a revealed page resumes throttling in its own chat after switching chats',
+      async () => {
+        await panelAction({ action: 'switch-tab', tabId: '1' })
+        await shell.evaluate(async (scope) => {
+          const api = (globalThis as Bridge).simDesktop.browserAgent
+          api.setPanelBounds(
+            { x: 0, y: 120, width: innerWidth, height: innerHeight - 120 },
+            null,
+            scope
+          )
+          await api.activateScope('browser-focus-other-chat')
+        }, SCOPE)
+        await expect
+          .poll(() =>
+            shellApp.evaluate(
+              ({ webContents }, url) =>
+                webContents
+                  .getAllWebContents()
+                  .find((contents) => contents.getURL() === url)
+                  ?.getBackgroundThrottling(),
+              `${site}/five`
+            )
+          )
+          .toBe(true)
+      }
+    )
     passed = true
   } finally {
     mkdirSync(dirname(reportPath), { recursive: true })

apps/desktop/e2e/local-files.spec.ts

@@ -232,6 +232,9 @@ createRoot(document.getElementById('settings')).render(
     const folderConsent = await folderPrompt
     const queuedRead = invoke({ operation: 'read', toolCallId: 'text' })
     void queuedRead.catch(() => {})
+    await expect(
+      folderConsent.getByRole('button', { name: 'Allow folder', exact: true })
+    ).toBeVisible()
     expect(
       await folderConsent.evaluate(() => typeof (globalThis as { simDesktop?: unknown }).simDesktop)
     ).toBe('undefined')
@@ -432,12 +435,12 @@ createRoot(document.getElementById('settings')).render(
               openApproved(
                 root: string,
                 relative: string,
-                dev: number,
-                ino: number,
+                dev: bigint,
+                ino: bigint,
                 directory: boolean
               ): Promise<number>
             }
-            const root = await stat(paths.source)
+            const root = await stat(paths.source, { bigint: true })
             const denied = async (path: string, ino = root.ino) => {
               try {
                 const fd = await native.openApproved(paths.source, path, root.dev, ino, false)
@@ -460,12 +463,19 @@ createRoot(document.getElementById('settings')).render(
               text,
               ancestor: await denied('native-link/private.txt'),
               traversal: await denied('../Reports-other/private.txt'),
-              replaced: await denied('native-parent/inside.txt', root.ino + 1),
+              replaced: await denied('native-parent/inside.txt', root.ino + 1n),
+              overflow: await denied('native-parent/inside.txt', root.ino + (1n << 64n)),
             }
           },
           { source: realpathSync(source) }
         )
-        expect(result).toEqual({ text: 'inside', ancestor: true, traversal: true, replaced: true })
+        expect(result).toEqual({
+          text: 'inside',
+          ancestor: true,
+          traversal: true,
+          replaced: true,
+          overflow: true,
+        })
       } finally {
         rmSync(linked)
         rmSync(parent, { recursive: true })

apps/desktop/native/directory.cc

@@ -8,6 +8,7 @@
 #include <cerrno>
 #include <climits>
 #include <cmath>
+#include <cstdint>
 #include <cstring>
 #include <string>
 #include <vector>
@@ -150,8 +151,8 @@ struct ApprovedOpen {
   napi_deferred deferred = nullptr;
   std::string root;
   std::string relative;
-  double dev = 0;
-  double ino = 0;
+  uint64_t dev = 0;
+  uint64_t ino = 0;
   bool directory = false;
   int descriptor = -1;
   std::string error;
@@ -162,8 +163,8 @@ static void OpenApprovedPath(napi_env, void* data) {
   int descriptor = open(request->root.c_str(), O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
   struct stat metadata;
   if (descriptor < 0 || fstat(descriptor, &metadata) != 0 ||
-      static_cast<double>(metadata.st_dev) != request->dev ||
-      static_cast<double>(metadata.st_ino) != request->ino) {
+      static_cast<uint64_t>(metadata.st_dev) != request->dev ||
+      static_cast<uint64_t>(metadata.st_ino) != request->ino) {
     if (descriptor >= 0) close(descriptor);
     request->error = "The approved folder changed. Request access again.";
     return;
@@ -232,13 +233,15 @@ static napi_value OpenApproved(napi_env env, napi_callback_info info) {
   size_t count = 5;
   napi_value arguments[5];
   auto* request = new ApprovedOpen();
+  bool devLossless = false;
+  bool inoLossless = false;
   if (napi_get_cb_info(env, info, &count, arguments, nullptr, nullptr) != napi_ok || count != 5 ||
       !ReadPath(env, arguments[0], request->root) || request->root.empty() || request->root[0] != '/' ||
       !ReadPath(env, arguments[1], request->relative) ||
       (!request->relative.empty() && (request->relative.front() == '/' || request->relative.back() == '/')) ||
-      napi_get_value_double(env, arguments[2], &request->dev) != napi_ok ||
-      napi_get_value_double(env, arguments[3], &request->ino) != napi_ok ||
-      !std::isfinite(request->dev) || !std::isfinite(request->ino) ||
+      napi_get_value_bigint_uint64(env, arguments[2], &request->dev, &devLossless) != napi_ok ||
+      napi_get_value_bigint_uint64(env, arguments[3], &request->ino, &inoLossless) != napi_ok ||
+      !devLossless || !inoLossless ||
       napi_get_value_bool(env, arguments[4], &request->directory) != napi_ok) {
     delete request;
     napi_throw_type_error(env, nullptr, "Expected a granted root, relative path, identity, and path kind.");

apps/desktop/src/main/browser-agent/panel.ts

@@ -20,7 +20,6 @@ import { getErrorMessage } from '@sim/utils/errors'
 import type { BrowserWindow, WebContentsView } from 'electron'
 import { zoomPercentOf } from '@/main/browser-agent/context-menu'
 import type { AgentTab } from '@/main/browser-agent/session'
-import { reassertTabThrottling } from '@/main/browser-agent/session'
 
 const logger = createLogger('BrowserAgentPanel')
 
@@ -49,6 +48,8 @@ export interface PanelHost {
   onGeometryChanged?: () => void
   /** Runs after each layout that leaves the active view attached and visible. */
   onViewShown?: (view: WebContentsView) => void
+  /** Restores a revealed view's own chat policy after its initial paint. */
+  restoreTabThrottling?: (view: WebContentsView) => void
 }
 
 let host: PanelHost = {
@@ -547,7 +548,7 @@ export function layout(): void {
       contents.setBackgroundThrottling(false)
       contents.invalidate()
       setTimeout(() => {
-        if (!contents.isDestroyed()) reassertTabThrottling()
+        if (!contents.isDestroyed()) host.restoreTabThrottling?.(active.view)
       }, 1_000)
     }
   }

apps/desktop/src/main/browser-agent/session.ts

@@ -1083,6 +1083,10 @@ export function initSession(
       const scopeId = browserScopeIdForView(view)
       if (scopeId) withBrowserScope(scopeId, () => applyPendingUserFocus(view))
     },
+    restoreTabThrottling: (view) => {
+      const scopeId = browserScopeIdForView(view)
+      if (scopeId) withBrowserScope(scopeId, applyAutomationTabPolicy)
+    },
     onViewDetached: (view) => {
       if (!view) return
       const scopeId = browserScopeIdForView(view)
@@ -2808,15 +2812,6 @@ export function setAutomationNeedsAttention(needsAttention: boolean): void {
   events?.onTabsChanged()
 }
 
-/**
- * Re-applies the tab throttling policy after a caller temporarily suspended it
- * (the panel's reveal pulse). Exempts the automation-active tab exactly as the
- * internal policy does.
- */
-export function reassertTabThrottling(): void {
-  applyAutomationTabPolicy()
-}
-
 /**
  * Unthrottles the automation tab while automation is active, throttles every other tab, and
  * keeps the automation tab composited while no panel shows it. Call after anything that changes

apps/desktop/src/main/desktop-executor/runner.test.ts

@@ -52,7 +52,12 @@ function runner(overrides: Partial<DesktopToolRunnerDeps> = {}) {
             resolve: realpath,
             open: async (path, directory = false) => {
               const root = await realpath(dirname(String(call.args.path)))
-              return openNativeFile(root, relative(root, path), await stat(root), directory)
+              return openNativeFile(
+                root,
+                relative(root, path),
+                await stat(root, { bigint: true }),
+                directory
+              )
             },
           }
         ),

apps/desktop/src/main/desktop-executor/service.ts

@@ -35,6 +35,7 @@ import {
 } from '@/main/desktop-executor/executor'
 import { createExecutorJournal } from '@/main/desktop-executor/journal'
 import {
+  type ClaimedDesktopCall,
   DESKTOP_EXECUTOR_PROTOCOL_VERSION,
   type DesktopExecutorTiming,
   type DesktopImportEntryRequest,
@@ -79,6 +80,8 @@ export interface DesktopExecutorService {
    * journal, whenever it is asked; empty when the journal cannot be read.
    */
   pendingResults(): Promise<Set<string>>
+  /** Confirms that Sim still authorizes this device to execute the claimed call. */
+  revalidateCall(call: ClaimedDesktopCall): Promise<boolean>
   /** Stores one entry of a claimed import, as this device's registered session. */
   importEntry(
     request: DesktopImportEntryRequest,
@@ -487,6 +490,12 @@ export function createDesktopExecutorService(
     pendingResults() {
       return pendingResultsSnapshot()
     },
+    async revalidateCall(call) {
+      const current = client
+      if (!current || !deps.accountDataAvailable()) return false
+      await current.renewLease(call.toolCallId, call.executionToken)
+      return client === current && deps.accountDataAvailable()
+    },
     importEntry(request, signal) {
       if (!client) throw new Error('The Sim desktop app is not signed in to Sim.')
       return client.importEntry(request, signal)

apps/desktop/src/main/index.ts

@@ -176,8 +176,9 @@ function main(): void {
   )
   const clearLocalFileAccess = async () => {
     config.set('fullFileAccess', false)
-    if (!config.flush()) throw new Error('Full file access could not be disabled')
+    const saved = config.flush()
     await localFilesystem.forgetAll()
+    if (!saved) throw new Error('Full file access could not be disabled')
   }
   const scopeEvents = new ScopedEventRouter()
   const terminal = new TerminalRegistry(
@@ -645,15 +646,15 @@ function main(): void {
           const authorization = { toolName: call.toolName, args: call.args }
           try {
             const access = await localFilePermissions.authorize(authorization, {
-              parent: ensureMainWindow,
+              parent: async () => getMainWindow(),
               origin,
               generation,
               signal,
               isCurrent: () =>
                 isAccountDataGenerationCurrent(generation) &&
                 accountDataAvailable() &&
                 appOrigin() === origin,
-              revalidate: async () => !signal.aborted,
+              revalidate: () => desktopExecutor.revalidateCall(call),
             })
             return await executeLocalFileRequest(request, authorization, access)
           } catch (error) {

apps/desktop/src/main/local-file-permissions.ts

@@ -11,7 +11,7 @@ import { openNativeFile } from '@/main/native-directory'
 const MAX_PENDING_REQUESTS = 32
 
 interface LocalFilePermissionContext {
-  parent: () => Promise<BrowserWindow>
+  parent: () => Promise<BrowserWindow | null>
   origin: string
   generation: number
   signal: AbortSignal
@@ -73,7 +73,7 @@ export class LocalFilePermissions {
     if (this.fullFileAccess()) {
       const info = await stat(path)
       const folder = info.isDirectory() ? path : dirname(path)
-      const identity = await stat(folder)
+      const identity = await stat(folder, { bigint: true })
       return this.authorizedAccess(
         {
           path,
@@ -171,7 +171,7 @@ export class LocalFilePermissions {
   ): Promise<void> {
     const context = await this.currentContext(contexts, signal)
     if (await this.filesystem.nativeAccess(folder)) return
-    const root = await lstat(folder)
+    const root = await lstat(folder, { bigint: true })
     if (!root.isDirectory()) throw new Error('The folder is no longer available.')
     const displayedPath = JSON.stringify(folder).replace(
       /\p{Bidi_Control}/gu,
@@ -180,15 +180,16 @@ export class LocalFilePermissions {
     signal.throwIfAborted()
     const parent = await context.parent()
     await this.currentContext(contexts, signal)
-    const result = await showShellDialog(parent, {
+    const options = {
       signal,
       title: 'Allow access to this folder?',
       message: displayedPath,
       detail: `Sim can read files in this folder and its subfolders, use them across chats, and import them into your workspaces on ${context.origin}.\n\nManage or remove access in File → Folder Access.`,
       buttons: ['Allow folder', "Don't allow"],
       defaultId: 1,
       cancelId: 1,
-    })
+    }
+    const result = await (parent ? showShellDialog(parent, options) : showShellDialog(options))
     signal.throwIfAborted()
     if (result.response !== 0) throw new Error('The user did not allow this local file access.')
     const current = await this.currentContext(contexts, signal)