chore(release): merge staging into the v0.9.41 release

Author: waleedlatif1

apps/docs/content/docs/cli/files.mdx

@@ -643,7 +643,7 @@ sim files batch-delete [file-ids...] [options]
 
 | Argument | Required | Description |
 | --- | --- | --- |
-| `file-ids...` | No | File identifiers to delete. Same as --file-ids. |
+| `file-ids...` | No | Files to delete, each by identifier or by the VFS path of a live file: `files/<folder>/<name>`. Pass the id when two files in a folder have names that display alike. At most 100 entries may be paths. Same as --file-ids. |
 
 </CommandTable>
 
@@ -653,7 +653,7 @@ sim files batch-delete [file-ids...] [options]
 
 | Option | Required | Description |
 | --- | --- | --- |
-| `--file-ids <value...>` | No | File identifiers to delete. (space-separated, or @path / @- with one value per line; @@value for a literal leading @) (required, or pass the values as arguments). |
+| `--file-ids <value...>` | No | Files to delete, each by identifier or by the VFS path of a live file: `files/<folder>/<name>`. Pass the id when two files in a folder have names that display alike. At most 100 entries may be paths. (space-separated, or @path / @- with one value per line; @@value for a literal leading @) (required, or pass the values as arguments). |
 | `-y, --yes` | Yes | Confirm this operation. |
 
 </CommandTable>

apps/docs/content/docs/cli/reference.mdx

@@ -981,7 +981,7 @@ sim files batch-delete [file-ids...] [options]
 
 | Argument | Required | Description |
 | --- | --- | --- |
-| `file-ids...` | No | File identifiers to delete. Same as --file-ids. |
+| `file-ids...` | No | Files to delete, each by identifier or by the VFS path of a live file: `files/<folder>/<name>`. Pass the id when two files in a folder have names that display alike. At most 100 entries may be paths. Same as --file-ids. |
 
 </CommandTable>
 
@@ -991,7 +991,7 @@ sim files batch-delete [file-ids...] [options]
 
 | Option | Required | Description |
 | --- | --- | --- |
-| `--file-ids <value...>` | No | File identifiers to delete. (space-separated, or @path / @- with one value per line; @@value for a literal leading @) (required, or pass the values as arguments). |
+| `--file-ids <value...>` | No | Files to delete, each by identifier or by the VFS path of a live file: `files/<folder>/<name>`. Pass the id when two files in a folder have names that display alike. At most 100 entries may be paths. (space-separated, or @path / @- with one value per line; @@value for a literal leading @) (required, or pass the values as arguments). |
 | `-y, --yes` | Yes | Confirm this operation. |
 
 </CommandTable>

apps/docs/openapi-v2-files-audit.json

@@ -7369,7 +7369,7 @@
               "type": "string",
               "minLength": 1
             },
-            "description": "File identifiers to delete."
+            "description": "Files to delete, each by identifier or by the VFS path of a live file: `files/<folder>/<name>`. Pass the id when two files in a folder have names that display alike. At most 100 entries may be paths."
           }
         },
         "required": ["workspaceId", "fileIds"],

apps/sim/app/api/v2/files/bulk-delete/route.ts

@@ -13,7 +13,11 @@ export const POST = defineV2JsonRoute({
   operation: fileOperations.delete,
   rateLimit: v2RateLimits.publicApi,
   errorPolicy: v2FileErrorPolicies.default,
-  mapInput: ({ body }) => ({ workspaceId: body.workspaceId, fileIds: body.fileIds }),
+  mapInput: ({ body }) => ({
+    workspaceId: body.workspaceId,
+    fileIds: body.fileIds,
+    acceptVfsPath: true,
+  }),
   useCase: archiveWorkspaceFileItemsOperation,
   present: ({ deletedItems }) => ({ data: { deletedItems: { files: deletedItems.files } } }),
 })

apps/sim/lib/api/contracts/v2/files.ts

@@ -46,7 +46,10 @@ import { MAX_FOLDER_PATH_BYTES, MAX_FOLDER_PATH_SEGMENTS } from '@/lib/folders/p
 import { MAX_WORKSPACE_FILE_SIZE } from '@/lib/uploads/shared/types'
 import { MAX_TEXT_EXTRACTION_BYTES } from '@/lib/uploads/utils/file'
 import { isWorkspaceFileVfsPath } from '@/lib/vfs/path'
-import { MAX_ZIP_DOWNLOAD_FILES } from '@/lib/workspace-files/limits'
+import {
+  MAX_WORKSPACE_FILE_BULK_REQUEST_PATHS,
+  MAX_ZIP_DOWNLOAD_FILES,
+} from '@/lib/workspace-files/limits'
 import {
   FILE_SEARCH_DEFAULT_MAX_RESULTS,
   FILE_SEARCH_MAX_QUERY_LENGTH,
@@ -527,7 +530,9 @@ export type V2MoveFileItemsResult = z.output<typeof v2MoveFileItemsResultSchema>
 export const v2BulkDeleteFilesBodySchema = z
   .object({
     workspaceId: workspaceIdSchema.describe('Workspace containing the files.'),
-    fileIds: fileIdsSchema.describe('File identifiers to delete.'),
+    fileIds: fileIdsSchema.describe(
+      `Files to delete, each by identifier or by the VFS path of a live file: \`files/<folder>/<name>\`. Pass the id when two files in a folder have names that display alike. At most ${MAX_WORKSPACE_FILE_BULK_REQUEST_PATHS} entries may be paths.`
+    ),
   })
   .strict()
 

apps/sim/lib/execution/remote-sandbox/index.ts

@@ -43,6 +43,10 @@ import {
   SANDBOX_OUTPUT_DIR_MAX_DEPTH,
   SANDBOX_OUTPUT_DIR_SENTINEL,
 } from '@/lib/execution/remote-sandbox/paths'
+import {
+  createSandboxPhaseTimer,
+  type SandboxPhaseTimer,
+} from '@/lib/execution/remote-sandbox/phase-timing'
 import { resolvePiSandboxLifetimeMs } from '@/lib/execution/remote-sandbox/pi-lifetime'
 import { resolveProvider } from '@/lib/execution/remote-sandbox/provider'
 import {
@@ -116,13 +120,16 @@ async function leaseSandbox(
   selected: ResolvedSandbox | null,
   signal: AbortSignal,
   meterUsage: boolean | undefined,
-  session: SandboxSessionRequest | undefined
+  session: SandboxSessionRequest | undefined,
+  phases: SandboxPhaseTimer
 ): Promise<SandboxLease> {
   const provider = resolveProvider()
   const sessionCapable = Boolean(session && !meterUsage && provider.findSessionSandbox)
 
   if (session && sessionCapable) {
+    const endAccess = phases.start('access')
     await prepareSandboxSessionAccess(session.key, signal)
+    endAccess()
     return withSandboxSessionLock(session.key, signal, async (leaseSignal) => {
       const { created, status } = await ensureSessionSandbox({
         provider,
@@ -132,6 +139,7 @@ async function leaseSandbox(
         session,
         signal: leaseSignal,
         bootstrapTimeoutMs: remainingSandboxBudgetMs(signal),
+        phases,
       })
       return {
         created,
@@ -214,6 +222,16 @@ function raceSandboxAbort<T>(operation: Promise<T>, signal: AbortSignal): Promis
   })
 }
 
+/** Attaches the phase breakdown to whichever result the execution returns, after its release. */
+async function withPhaseTimings(
+  execute: (phases: SandboxPhaseTimer) => Promise<SandboxExecutionResult>
+): Promise<SandboxExecutionResult> {
+  const phases = createSandboxPhaseTimer()
+  const result = await execute(phases)
+  result.phaseMs = phases.timings
+  return result
+}
+
 async function withSandboxExecutionBudget<T>(
   timeoutMs: number,
   parentSignal: AbortSignal | undefined,
@@ -864,22 +882,26 @@ async function acceptSessionOutputHistory(
 async function executeInSandboxWithinBudget(
   // The budget wrapper always injects the signal; the required-signal type states that
   // invariant instead of a cast hiding it.
-  req: SandboxExecutionRequest & { signal: AbortSignal }
+  req: SandboxExecutionRequest & { signal: AbortSignal },
+  phases: SandboxPhaseTimer
 ): Promise<SandboxExecutionResult> {
   const { code, language, signal } = req
   const kind = req.sandboxKind ?? 'code'
   throwIfAborted(signal)
 
   // Resolved before the sandbox is created so a selection that cannot be honored
   // fails without spending a provider create.
+  const endResolve = phases.start('resolve')
   const selected = await resolveWorkspaceSandbox({
     kind,
     language,
     workspaceId: req.workspaceId,
     sandboxId: req.sandboxId,
   })
+  endResolve()
   throwIfAborted(signal)
 
+  const endLease = phases.start('lease')
   const lease = await leaseSandbox(
     kind,
     {
@@ -890,8 +912,10 @@ async function executeInSandboxWithinBudget(
     selected,
     signal,
     req.meterUsage,
-    req.session
+    req.session,
+    phases
   )
+  endLease()
   const created = lease.created
   const sandbox = created.sandbox
   const sandboxId = sandbox.sandboxId
@@ -906,6 +930,7 @@ async function executeInSandboxWithinBudget(
     // the finally below. Dependencies land before the inputs so user code and its
     // mounts always see a complete environment.
     //
+    const endPrepare = phases.start('prepare')
     if (lease.session && req.session)
       await recordSessionFileInput(
         req.session.key,
@@ -926,6 +951,7 @@ async function executeInSandboxWithinBudget(
       signal,
       Boolean(lease.session)
     )
+    endPrepare()
     const executionEnvironment = {
       ...selected?.envs,
       ...req.session?.envs,
@@ -944,13 +970,15 @@ async function executeInSandboxWithinBudget(
 
     let execution: SandboxCodeResult
     try {
+      const endRun = phases.start('run')
       execution = await sandbox.runCode(code, {
         timeoutMs: codeBudgetMs(req, signal),
         javascriptPreload: buildJavaScriptRuntimeBindingsSource(req.runtimeBindings ?? []),
         maxOutputBytes: MAX_SANDBOX_PROCESS_OUTPUT_BYTES,
         signal,
         ...(hasExecutionEnvironment ? { envs: executionEnvironment } : {}),
       })
+      endRun()
     } catch (error) {
       throwIfAborted(signal)
       throw error
@@ -1009,11 +1037,13 @@ async function executeInSandboxWithinBudget(
       ...sessionField,
     }
     try {
+      const endCollect = phases.start('collect')
       const { exportedFiles, exportedFileContent, collectedFiles } = await collectExportedFiles(
         sandbox,
         req,
         { signal }
       )
+      endCollect()
       throwIfAborted(signal)
       billableResult.exportedFileContent = exportedFileContent
       billableResult.exportedFiles = exportedFiles
@@ -1044,6 +1074,7 @@ async function executeInSandboxWithinBudget(
     if (cost && billableOutputError) {
       attachTrustedSandboxOutputCost(billableOutputError, cost)
     }
+    const endRelease = phases.start('release')
     try {
       await privateInputFiles?.cleanup()
       await lease.release()
@@ -1052,6 +1083,7 @@ async function executeInSandboxWithinBudget(
         providerId: created.providerId,
         sandboxId,
       })
+      endRelease()
     }
   }
 }
@@ -1061,34 +1093,41 @@ export function executeInSandbox(req: SandboxExecutionRequest): Promise<SandboxE
     req.timeoutMs,
     req.signal,
     Boolean(req.session && !req.meterUsage),
-    (signal) => executeInSandboxWithinBudget({ ...req, signal })
+    (signal) =>
+      withPhaseTimings((phases) => executeInSandboxWithinBudget({ ...req, signal }, phases))
   )
 }
 
 async function executeShellInSandboxWithinBudget(
-  req: SandboxShellExecutionRequest & { signal: AbortSignal }
+  req: SandboxShellExecutionRequest & { signal: AbortSignal },
+  phases: SandboxPhaseTimer
 ): Promise<SandboxExecutionResult> {
   const { code, envs, signal } = req
   const kind = req.sandboxKind ?? 'shell'
   throwIfAborted(signal)
 
   // No language is passed: a shell execution runs commands rather than a language
   // runtime, so whichever language the sandbox carries is the one it installs.
+  const endResolve = phases.start('resolve')
   const selected = await resolveWorkspaceSandbox({
     kind,
     workspaceId: req.workspaceId,
     sandboxId: req.sandboxId,
   })
+  endResolve()
   throwIfAborted(signal)
 
+  const endLease = phases.start('lease')
   const lease = await leaseSandbox(
     kind,
     { imageRef: selected?.imageRef, lifetimeMs: remainingSandboxBudgetMs(signal) },
     selected,
     signal,
     req.meterUsage,
-    req.session
+    req.session,
+    phases
   )
+  endLease()
   const created = lease.created
   const sandbox = created.sandbox
   const sandboxId = sandbox.sandboxId
@@ -1102,6 +1141,7 @@ async function executeShellInSandboxWithinBudget(
     // Inside the try so a failed install or mount still releases the sandbox via
     // the finally below. The install shares the caller's budget rather than adding
     // to it — see the note in `executeInSandbox`.
+    const endPrepare = phases.start('prepare')
     if (lease.session && req.session)
       await recordSessionFileInput(
         req.session.key,
@@ -1123,9 +1163,11 @@ async function executeShellInSandboxWithinBudget(
       signal,
       Boolean(lease.session)
     )
+    endPrepare()
 
     let result: SandboxCommandResult
     try {
+      const endRun = phases.start('run')
       result = await sandbox.runCommand(code, {
         envs: {
           ...selected?.envs,
@@ -1141,6 +1183,7 @@ async function executeShellInSandboxWithinBudget(
         rootUser: !lease.session,
         atMostOnce: true,
       })
+      endRun()
     } catch (error) {
       throwIfAborted(signal)
       throw error
@@ -1185,11 +1228,13 @@ async function executeShellInSandboxWithinBudget(
       ...sessionField,
     }
     try {
+      const endCollect = phases.start('collect')
       const { exportedFiles, exportedFileContent, collectedFiles } = await collectExportedFiles(
         sandbox,
         req,
         { signal }
       )
+      endCollect()
       throwIfAborted(signal)
       billableResult.exportedFileContent = exportedFileContent
       billableResult.exportedFiles = exportedFiles
@@ -1220,6 +1265,7 @@ async function executeShellInSandboxWithinBudget(
     if (cost && billableOutputError) {
       attachTrustedSandboxOutputCost(billableOutputError, cost)
     }
+    const endRelease = phases.start('release')
     try {
       await privateInputFiles?.cleanup()
       await lease.release()
@@ -1228,6 +1274,7 @@ async function executeShellInSandboxWithinBudget(
         providerId: created.providerId,
         sandboxId,
       })
+      endRelease()
     }
   }
 }
@@ -1239,7 +1286,8 @@ export function executeShellInSandbox(
     req.timeoutMs,
     req.signal,
     Boolean(req.session && !req.meterUsage),
-    (signal) => executeShellInSandboxWithinBudget({ ...req, signal })
+    (signal) =>
+      withPhaseTimings((phases) => executeShellInSandboxWithinBudget({ ...req, signal }, phases))
   )
 }
 

apps/sim/lib/execution/remote-sandbox/phase-timing.ts

@@ -0,0 +1,39 @@
+/**
+ * Phases of one sandbox execution, in the order they run. `lease` spans the whole acquisition
+ * (session lock included); for a session, `lookup` and `cli` are the parts of it spent finding or
+ * creating the machine and verifying its deployment tooling.
+ */
+type SandboxPhase =
+  | 'resolve'
+  | 'access'
+  | 'lease'
+  | 'lookup'
+  | 'cli'
+  | 'prepare'
+  | 'run'
+  | 'collect'
+  | 'release'
+
+/** Wall-clock milliseconds per phase; a phase that did not finish is absent. */
+export type SandboxPhaseTimings = Partial<Record<SandboxPhase, number>>
+
+/** Accumulates per-phase wall time for one execution's log line. */
+export interface SandboxPhaseTimer {
+  readonly timings: SandboxPhaseTimings
+  /** Starts timing a phase; the returned function records its duration. */
+  start(phase: SandboxPhase): () => void
+}
+
+/** Creates a timer whose callbacks record rounded milliseconds; unfinished phases stay absent. */
+export function createSandboxPhaseTimer(): SandboxPhaseTimer {
+  const timings: SandboxPhaseTimings = {}
+  return {
+    timings,
+    start(phase) {
+      const startedAt = performance.now()
+      return () => {
+        timings[phase] = Math.round(performance.now() - startedAt)
+      }
+    },
+  }
+}