@limrun/api 0.22.1 → 0.23.0

package/sandbox-client.mjs

@@ -1,5 +1,9 @@
-import { syncApp as syncFolderImpl } from "./folder-sync.mjs";
+import os from 'os';
+import path from 'path';
+import { syncFolder as syncFolderImpl } from "./folder-sync.mjs";
 import { exec } from "./exec-client.mjs";
+import { createIgnoreFn } from "./folder-sync-ignore.mjs";
+import crypto from 'crypto';
 /**
  * Creates a client for interacting with a sandboxed Xcode build service.
  *
@@ -46,7 +50,7 @@ export async function createXCodeSandboxClient(options) {
                 console.error('[XCodeSandbox]', ...args);
         },
     };
-    const logFn = (level, msg) => {
+    const log = (level, msg) => {
         switch (level) {
             case 'debug':
                 logger.debug(msg);
@@ -86,47 +90,51 @@ export async function createXCodeSandboxClient(options) {
     }
     return {
         async sync(localCodePath, opts) {
+            // Use folder name and hash of absolute path to scope basisCacheDir uniquely for each sync root
+            const resolvedPath = path.resolve(localCodePath);
+            const folderName = path.basename(resolvedPath);
+            const hash = crypto.createHash('sha1').update(resolvedPath).digest('hex').slice(0, 8);
+            const cacheKey = `limsync-cache-${folderName}-${hash}`;
+            const basisCacheDir = opts?.basisCacheDir ?? path.join(os.tmpdir(), cacheKey);
             const codeSyncOpts = {
                 apiUrl: options.apiUrl,
                 token: options.token,
-                udid: opts?.cacheKey ?? 'xcode-sandbox',
-                install: false,
-                filter: (relativePath) => {
-                    if (relativePath.startsWith('build/') ||
-                        relativePath.startsWith('.build/') ||
-                        relativePath.startsWith('DerivedData/') ||
-                        relativePath.startsWith('Index.noindex/') ||
-                        relativePath.startsWith('ModuleCache.noindex/') ||
-                        relativePath.startsWith('.index-build/')) {
+                udid: cacheKey,
+                install: opts?.install ?? true,
+                ignoreFn: await createIgnoreFn(localCodePath, {
+                    basisCacheDir,
+                    additional: (relativePath) => {
+                        if (relativePath.startsWith('build/') ||
+                            relativePath.startsWith('.build/') ||
+                            relativePath.startsWith('DerivedData/') ||
+                            relativePath.startsWith('Index.noindex/') ||
+                            relativePath.startsWith('ModuleCache.noindex/') ||
+                            relativePath.startsWith('.index-build/')) {
+                            return true;
+                        }
+                        if (relativePath.startsWith('.swiftpm/') ||
+                            relativePath.startsWith('Pods/') ||
+                            relativePath.startsWith('Carthage/Build/')) {
+                            return true;
+                        }
+                        if (relativePath.includes('/xcuserdata/')) {
+                            return true;
+                        }
+                        if (relativePath.includes('.dSYM/')) {
+                            return true;
+                        }
+                        // User-provided ignores
+                        if (opts?.ignore?.(relativePath)) {
+                            return true;
+                        }
                         return false;
-                    }
-                    if (relativePath.startsWith('.swiftpm/') ||
-                        relativePath.startsWith('Pods/') ||
-                        relativePath.startsWith('Carthage/Build/')) {
-                        return false;
-                    }
-                    if (relativePath.startsWith('.git/') ||
-                        relativePath.startsWith('.limsync-cache/') ||
-                        relativePath === '.DS_Store' ||
-                        relativePath.endsWith('/.DS_Store')) {
-                        return false;
-                    }
-                    if (relativePath.includes('/xcuserdata/')) {
-                        return false;
-                    }
-                    if (relativePath.includes('.dSYM/')) {
-                        return false;
-                    }
-                    // User-provided filter
-                    if (opts?.filter && !opts.filter(relativePath)) {
-                        return false;
-                    }
-                    return true;
-                },
-                ...(opts?.basisCacheDir ? { basisCacheDir: opts.basisCacheDir } : {}),
-                ...(opts?.maxPatchBytes !== undefined ? { maxPatchBytes: opts.maxPatchBytes } : {}),
-                ...(opts?.watch !== undefined ? { watch: opts.watch } : {}),
-                log: opts?.log ?? logFn,
+                    },
+                }),
+                basisCacheDir,
+                watch: opts?.watch ?? true,
+                maxPatchBytes: opts?.maxPatchBytes ?? 4 * 1024 * 1024,
+                launchMode: 'ForegroundIfRunning',
+                log,
             };
             const result = await syncFolderImpl(localCodePath, codeSyncOpts);
             if (result.stopWatching) {
@@ -138,7 +146,7 @@ export async function createXCodeSandboxClient(options) {
             return exec({ command: 'xcodebuild', ...(opts && { xcodebuild: opts }) }, {
                 apiUrl: options.apiUrl,
                 token: options.token,
-                log: logFn,
+                log,
             });
         },
     };

package/sandbox-client.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox-client.mjs","sourceRoot":"","sources":["src/sandbox-client.ts"],"names":[],"mappings":"OAAO,EAAE,OAAO,IAAI,cAAc,EAA0B;OACrD,EAAE,IAAI,EAAoB;AAyGjC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,OAAwC;IAExC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC;IAC5C,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;YAC5B,IAAI,QAAQ,KAAK,OAAO;gBAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;YAC3B,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,OAAO;gBAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1F,CAAC;QACD,IAAI,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;YAC3B,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,OAAO;gBACpE,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,CAAC;QAC5C,CAAC;QACD,KAAK,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;YAC5B,IAAI,QAAQ,KAAK,MAAM;gBAAE,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,CAAC;QACpE,CAAC;KACF,CAAC;IAEF,MAAM,KAAK,GAAG,CAAC,KAA0C,EAAE,GAAW,EAAE,EAAE;QACxE,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,OAAO;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAClB,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjB,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjB,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAClB,MAAM;YACR;gBACE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjB,MAAM;QACV,CAAC;IACH,CAAC,CAAC;IAEF,iDAAiD;IACjD,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,GAAG,GAGL;YACF,eAAe,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM;YACzC,cAAc,EAAE,OAAO,CAAC,SAAS,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK;SACzD,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,CAAC,MAAM,YAAY,EAAE;YACrD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,OAAO,CAAC,KAAK,EAAE;aACzC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC;SAC1B,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,aAAqB,EAAE,IAAkB;YAClD,MAAM,YAAY,GAAsB;gBACtC,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,IAAI,EAAE,IAAI,EAAE,QAAQ,IAAI,eAAe;gBACvC,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,CAAC,YAAoB,EAAE,EAAE;oBAC/B,IACE,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC;wBACjC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC;wBAClC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC;wBACvC,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC;wBACzC,YAAY,CAAC,UAAU,CAAC,sBAAsB,CAAC;wBAC/C,YAAY,CAAC,UAAU,CAAC,eAAe,CAAC,EACxC,CAAC;wBACD,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,IACE,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC;wBACpC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC;wBAChC,YAAY,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAC1C,CAAC;wBACD,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,IACE,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC;wBAChC,YAAY,CAAC,UAAU,CAAC,iBAAiB,CAAC;wBAC1C,YAAY,KAAK,WAAW;wBAC5B,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EACnC,CAAC;wBACD,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,IAAI,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;wBAC1C,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,IAAI,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACpC,OAAO,KAAK,CAAC;oBACf,CAAC;oBAED,uBAAuB;oBACvB,IAAI,IAAI,EAAE,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;wBAC/C,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrE,GAAG,CAAC,IAAI,EAAE,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnF,GAAG,CAAC,IAAI,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3D,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,KAAK;aACxB,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;YACjE,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACxB,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC;YAC/C,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,UAAU,CAAC,IAAuB;YAChC,OAAO,IAAI,CACT,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,EAC5D;gBACE,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,GAAG,EAAE,KAAK;aACX,CACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"sandbox-client.mjs","sourceRoot":"","sources":["src/sandbox-client.ts"],"names":[],"mappings":"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"}

package/src/exec-client.ts

@@ -166,7 +166,6 @@ export class ExecChildProcess implements PromiseLike<ExecResult> {
     const { apiUrl, token } = this.options;
 
     // 1. Trigger the build via POST /exec
-    log('debug', `POST ${apiUrl}/exec`);
     let execRes: Response;
     try {
       execRes = await fetch(`${apiUrl}/exec`, {
@@ -197,11 +196,10 @@ export class ExecChildProcess implements PromiseLike<ExecResult> {
 
     const execData = (await execRes.json()) as { execId: string };
     this.execId = execData.execId;
-    log('info', `Build started: ${this.execId}`);
+    log('debug', `Build started: ${this.execId}`);
 
     // 2. Stream logs via SSE and wait for exit code
     const eventsUrl = `${apiUrl}/exec/${this.execId}/events`;
-    log('debug', `GET ${eventsUrl} (SSE)`);
 
     const timeoutMs = 3600 * 1000; // 1 hour max
     let exitCode: number;
@@ -215,7 +213,7 @@ export class ExecChildProcess implements PromiseLike<ExecResult> {
       ]);
     } catch {
       if (this.killed) {
-        log('info', 'Build killed');
+        log('debug', 'Build killed');
         exitCode = -1;
       } else {
         log('warn', 'SSE completion timeout');
@@ -250,7 +248,7 @@ export class ExecChildProcess implements PromiseLike<ExecResult> {
       status,
     };
 
-    this.log('info', `Build finished: ${result.status} (exit ${result.exitCode})`);
+    this.log('debug', `Build finished: ${result.status} (exit ${result.exitCode})`);
     return result;
   }
 

package/src/folder-sync-ignore.ts

@@ -0,0 +1,65 @@
+import fs from 'fs';
+import path from 'path';
+import ignorePkg from 'ignore';
+
+export type IgnoreFn = (relativePath: string) => boolean;
+
+export type IgnoreFnOptions = {
+  additional?: IgnoreFn;
+  basisCacheDir: string;
+};
+
+function normalizeRelativePath(relativePath: string): string {
+  return relativePath
+    .split(path.sep)
+    .join('/')
+    .replace(/^\.\/+/, '')
+    .replace(/\/+/g, '/');
+}
+
+export async function createIgnoreFn(rootDir: string, options: IgnoreFnOptions): Promise<IgnoreFn> {
+  const rootResolved = path.resolve(rootDir);
+  const ig = ignorePkg();
+  const gitignorePath = path.join(rootResolved, '.gitignore');
+  try {
+    const content = await fs.promises.readFile(gitignorePath, 'utf-8');
+    ig.add(content);
+  } catch {
+    // No .gitignore file, return empty ignore instance
+  }
+  const basisCacheRelative = normalizeRelativePath(
+    path.relative(rootResolved, options.basisCacheDir),
+  ).replace(/\/+$/, '');
+  const shouldIgnoreBasisCache =
+    basisCacheRelative &&
+    basisCacheRelative !== '.' &&
+    basisCacheRelative !== '..' &&
+    !basisCacheRelative.startsWith('../');
+
+  return (relativePath: string) => {
+    const normalized = normalizeRelativePath(relativePath);
+    if (!normalized) return false;
+    const withoutTrailingSlash = normalized.replace(/\/+$/, '');
+
+    if (
+      withoutTrailingSlash === '.git' ||
+      withoutTrailingSlash.startsWith('.git/') ||
+      withoutTrailingSlash.endsWith('/.git') ||
+      withoutTrailingSlash.includes('/.git/') ||
+      withoutTrailingSlash === '.DS_Store' ||
+      withoutTrailingSlash.endsWith('/.DS_Store')
+    ) {
+      return true;
+    }
+    if (
+      shouldIgnoreBasisCache &&
+      (withoutTrailingSlash === basisCacheRelative ||
+        withoutTrailingSlash.startsWith(`${basisCacheRelative}/`))
+    ) {
+      return true;
+    }
+    if (ig.ignores(normalized)) return true;
+    if (options.additional?.(normalized)) return true;
+    return false;
+  };
+}

package/src/folder-sync-watcher.ts

@@ -1,9 +1,11 @@
 import fs from 'fs';
 import path from 'path';
+import { IgnoreFn } from './folder-sync-ignore';
 
 export type FolderSyncWatcherOptions = {
   rootPath: string;
   log?: (level: 'debug' | 'info' | 'warn' | 'error', msg: string) => void;
+  ignoreFn: IgnoreFn;
   onChange: (reason: string) => void;
 };
 
@@ -11,27 +13,6 @@ type WatcherHandle = { close: () => void };
 
 const noopLogger = (_level: 'debug' | 'info' | 'warn' | 'error', _msg: string) => {};
 
-async function listDirsRecursive(root: string): Promise<string[]> {
-  const dirs: string[] = [root];
-  const queue: string[] = [root];
-  while (queue.length) {
-    const dir = queue.pop()!;
-    let entries: fs.Dirent[];
-    try {
-      entries = await fs.promises.readdir(dir, { withFileTypes: true });
-    } catch {
-      continue;
-    }
-    for (const ent of entries) {
-      if (!ent.isDirectory()) continue;
-      const full = path.join(dir, ent.name);
-      dirs.push(full);
-      queue.push(full);
-    }
-  }
-  return dirs;
-}
-
 /**
  * Watch a folder tree for changes. Uses recursive watch when supported (macOS),
  * otherwise falls back to watching each directory. Debounced.
@@ -42,58 +23,22 @@ export async function watchFolderTree(opts: FolderSyncWatcherOptions): Promise<W
   const log = opts.log ?? noopLogger;
   const debounceMs = 500;
   const rootPath = opts.rootPath;
-
   if (!fs.existsSync(rootPath)) {
     throw new Error(`watchFolderTree root does not exist: ${rootPath}`);
   }
-
   let timer: NodeJS.Timeout | undefined;
   const schedule = (reason: string) => {
     if (timer) clearTimeout(timer);
     timer = setTimeout(() => opts.onChange(reason), debounceMs);
   };
-
-  // Preferred: recursive watch
-  try {
-    const watcher = fs.watch(rootPath, { recursive: true }, (_eventType, filename) => {
-      schedule(filename ? `change:${filename.toString()}` : 'change');
-    });
-    log('info', `watchFolderTree(recursive): ${rootPath}`);
-    return { close: () => watcher.close() };
-  } catch (err) {
-    log(
-      'warn',
-      `watchFolderTree: recursive unsupported, using per-directory watches: ${(err as Error).message}`,
-    );
-  }
-
-  // Fallback: watch every directory. Also re-scan on any event to pick up newly-created dirs.
-  const watchers = new Map<string, fs.FSWatcher>();
-
-  const ensureWatched = async () => {
-    const dirs = await listDirsRecursive(rootPath);
-    for (const d of dirs) {
-      if (watchers.has(d)) continue;
-      try {
-        const w = fs.watch(d, (_eventType, filename) => {
-          schedule(filename ? `change:${filename.toString()}` : 'change');
-          void ensureWatched();
-        });
-        watchers.set(d, w);
-      } catch {
-        // ignore dirs we can't watch
-      }
+  const watcher = fs.watch(rootPath, { recursive: true }, (_eventType, filename) => {
+    if (!filename) return;
+    const relativePath = filename.split(path.sep).join('/');
+    if (opts.ignoreFn(relativePath)) {
+      return;
     }
-  };
-
-  await ensureWatched();
-  log('info', `watchFolderTree(per-dir): ${rootPath} dirs=${watchers.size}`);
-
-  return {
-    close: () => {
-      if (timer) clearTimeout(timer);
-      for (const w of watchers.values()) w.close();
-      watchers.clear();
-    },
-  };
+    schedule(relativePath ? `change:${relativePath}` : 'change');
+  });
+  log('debug', `watchFolderTree(recursive): ${rootPath}`);
+  return { close: () => watcher.close() };
 }

package/src/folder-sync.ts

@@ -4,9 +4,9 @@ import os from 'os';
 import crypto from 'crypto';
 import { spawn } from 'child_process';
 import { watchFolderTree } from './folder-sync-watcher';
+import { type IgnoreFn } from './folder-sync-ignore';
 import { Readable } from 'stream';
 import * as zlib from 'zlib';
-import ignore, { type Ignore } from 'ignore';
 
 // =============================================================================
 // Folder Sync (HTTP batch)
@@ -21,32 +21,32 @@ export type FolderSyncOptions = {
    * Used to store the last-synced “basis” copies of files (and related sync metadata) so we can compute xdelta patches
    * on subsequent syncs without re-downloading server state.
    *
-   * Can be absolute or relative to process.cwd(). Defaults to `.limsync-cache/`.
+   * Defaults to a temporary directory under the OS temp directory.
    */
-  basisCacheDir?: string;
-  install?: boolean;
-  launchMode?: 'ForegroundIfRunning' | 'RelaunchIfRunning';
+  basisCacheDir: string;
+  install: boolean;
+  launchMode: 'ForegroundIfRunning' | 'RelaunchIfRunning';
   /** If true, watch the folder and re-sync on any changes (debounced, single-flight). */
-  watch?: boolean;
+  watch: boolean;
   /** Max patch size (bytes) to send as delta before falling back to full upload. */
-  maxPatchBytes?: number;
+  maxPatchBytes: number;
   /** Controls logging verbosity */
-  log?: (level: 'debug' | 'info' | 'warn' | 'error', msg: string) => void;
+  log: (level: 'debug' | 'info' | 'warn' | 'error', msg: string) => void;
   /**
-   * Optional filter function to include/exclude files and directories.
+   * Predicate for ignoring files and directories during sync.
    * Called with the relative path from localFolderPath (using forward slashes).
    * For directories, the path ends with '/'.
-   * Return true to include, false to exclude.
+   * Return true to ignore, false to keep.
    *
    * @example
-   * // Exclude build folder
-   * filter: (path) => !path.startsWith('build/')
+   * // Ignore build folder
+   * ignoreFn: (path) => path.startsWith('build/')
    *
    * @example
-   * // Only include source files
-   * filter: (path) => path.startsWith('src/') || path.endsWith('.json')
+   * // Ignore anything outside src/ and JSON files
+   * ignoreFn: (path) => !(path.startsWith('src/') || path.endsWith('.json'))
    */
-  filter?: (relativePath: string) => boolean;
+  ignoreFn: IgnoreFn;
 };
 
 export type SyncFolderResult = {
@@ -246,40 +246,30 @@ async function sha256FileHex(filePath: string): Promise<string> {
   });
 }
 
-async function walkFiles(root: string, filter?: (relativePath: string) => boolean): Promise<FileEntry[]> {
+async function walkFiles(root: string, ignoreFn: IgnoreFn): Promise<FileEntry[]> {
   const rootResolved = path.resolve(root);
 
-  // Load .gitignore if it exists
-  const ig = await loadGitignore(rootResolved);
-
   const out: FileEntry[] = [];
   const stack: string[] = [rootResolved];
   while (stack.length) {
     const dir = stack.pop()!;
     const entries = await fs.promises.readdir(dir, { withFileTypes: true });
     for (const ent of entries) {
-      // Always skip .git folder and .DS_Store
-      if (ent.name === '.DS_Store' || ent.name === '.git') continue;
-
       const abs = path.join(dir, ent.name);
       const rel = path.relative(rootResolved, abs).split(path.sep).join('/');
 
-      // Check if ignored by .gitignore
-      if (ig.ignores(rel)) continue;
-
       if (ent.isDirectory()) {
         // For directories, check with trailing slash
         const relDir = rel + '/';
-        if (ig.ignores(relDir)) continue;
-        // Check custom filter (directories have trailing slash)
-        if (filter && !filter(relDir)) continue;
+        // Check custom ignores (directories have trailing slash)
+        if (ignoreFn(relDir)) continue;
         stack.push(abs);
         continue;
       }
       if (!ent.isFile()) continue;
 
-      // Check custom filter for files
-      if (filter && !filter(rel)) continue;
+      // Check custom ignores for files
+      if (ignoreFn(rel)) continue;
 
       const st = await fs.promises.stat(abs);
       const sha256 = await sha256FileHex(abs);
@@ -292,22 +282,6 @@ async function walkFiles(root: string, filter?: (relativePath: string) => boolea
   return out;
 }
 
-/**
- * Load and parse .gitignore file if it exists.
- * Returns an Ignore instance that can be used to test paths.
- */
-async function loadGitignore(rootDir: string): Promise<Ignore> {
-  const ig = ignore();
-  const gitignorePath = path.join(rootDir, '.gitignore');
-  try {
-    const content = await fs.promises.readFile(gitignorePath, 'utf-8');
-    ig.add(content);
-  } catch {
-    // No .gitignore file, return empty ignore instance
-  }
-  return ig;
-}
-
 let xdelta3Ready: Promise<void> | null = null;
 async function ensureXdelta3(): Promise<void> {
   if (!xdelta3Ready) {
@@ -338,19 +312,6 @@ async function runXdelta3Encode(basis: string, target: string, outPatch: string)
   });
 }
 
-function localBasisCacheRoot(opts: FolderSyncOptions, localFolderPath: string): string {
-  const hostKey = opts.apiUrl.replace(/[:/]+/g, '_');
-  const resolved = path.resolve(localFolderPath);
-  const base = path.basename(resolved);
-  const hash = crypto.createHash('sha1').update(resolved).digest('hex').slice(0, 8);
-  const rootOverride =
-    opts.basisCacheDir ?
-      path.resolve(process.cwd(), opts.basisCacheDir)
-    : path.join(process.cwd(), '.limsync-cache');
-  // Include folder identity to avoid collisions between different roots.
-  return path.join(rootOverride, 'folder-sync', hostKey, opts.udid, `${base}-${hash}`);
-}
-
 async function cachePut(cacheRoot: string, relPath: string, srcFile: string): Promise<void> {
   const dst = path.join(cacheRoot, relPath.split('/').join(path.sep));
   await fs.promises.mkdir(path.dirname(dst), { recursive: true });
@@ -361,9 +322,14 @@ function cacheGet(cacheRoot: string, relPath: string): string {
   return path.join(cacheRoot, relPath.split('/').join(path.sep));
 }
 
-export type SyncAppResult = SyncFolderResult;
-
-export async function syncApp(localFolderPath: string, opts: FolderSyncOptions): Promise<SyncFolderResult> {
+export async function syncFolder(
+  localFolderPath: string,
+  opts: FolderSyncOptions,
+): Promise<SyncFolderResult> {
+  const log = (level: 'debug' | 'info' | 'warn' | 'error', msg: string) => {
+    (opts.log ?? noopLogger)(level, `syncFolder: ${msg}`);
+  };
+  log('debug', `setup ${localFolderPath} watch=${opts.watch} basisCacheDir=${opts.basisCacheDir}`);
   if (!opts.watch) {
     const result = await syncFolderOnce(localFolderPath, opts);
     return result;
@@ -389,13 +355,10 @@ export async function syncApp(localFolderPath: string, opts: FolderSyncOptions):
       }
     }
   };
-
-  const watcherLog = (level: 'debug' | 'info' | 'warn' | 'error', msg: string) => {
-    (opts.log ?? noopLogger)(level, `syncApp: ${msg}`);
-  };
   const watcher = await watchFolderTree({
     rootPath: localFolderPath,
-    log: watcherLog,
+    log,
+    ignoreFn: opts.ignoreFn,
     onChange: (reason) => {
       void run(reason);
     },
@@ -417,24 +380,18 @@ async function syncFolderOnce(
 ): Promise<SyncFolderResult> {
   const totalStart = nowMs();
   const log = opts.log ?? noopLogger;
-  const slog = (level: 'debug' | 'info' | 'warn' | 'error', msg: string) => log(level, `syncApp: ${msg}`);
+  const slog = (level: 'debug' | 'info' | 'warn' | 'error', msg: string) => log(level, `syncFolder: ${msg}`);
   const maxPatchBytes = opts.maxPatchBytes ?? 4 * 1024 * 1024;
-
-  const tEnsureStart = nowMs();
   await ensureXdelta3();
-  const tEnsureMs = nowMs() - tEnsureStart;
 
-  const tWalkStart = nowMs();
-  const files = await walkFiles(localFolderPath, opts.filter);
-  const tWalkMs = nowMs() - tWalkStart;
+  const files = await walkFiles(localFolderPath, opts.ignoreFn);
   const fileMap = new Map(files.map((f) => [f.path, f]));
 
   const syncId = genId('sync');
   const rootName = path.basename(path.resolve(localFolderPath));
   const preferredCompression = (zlib as any).createZstdCompress ? 'zstd' : 'gzip';
 
-  const cacheRoot = localBasisCacheRoot(opts, localFolderPath);
-  await fs.promises.mkdir(cacheRoot, { recursive: true });
+  await fs.promises.mkdir(opts.basisCacheDir, { recursive: true });
 
   // Track how many bytes we actually transmit to the server (single HTTP request).
   let bytesSentFull = 0;
@@ -447,7 +404,7 @@ async function syncFolderOnce(
   const encodeLimit = concurrencyLimit();
   const changed: FileEntry[] = [];
   for (const f of files) {
-    const basisPath = cacheGet(cacheRoot, f.path);
+    const basisPath = cacheGet(opts.basisCacheDir, f.path);
     if (!fs.existsSync(basisPath)) {
       changed.push(f);
       continue;
@@ -459,7 +416,7 @@ async function syncFolderOnce(
   }
 
   const encodedPayloads = await mapLimit(changed, encodeLimit, async (f): Promise<EncodedPayload> => {
-    const basisPath = cacheGet(cacheRoot, f.path);
+    const basisPath = cacheGet(opts.basisCacheDir, f.path);
     if (fs.existsSync(basisPath)) {
       const basisSha = await sha256FileHex(basisPath);
       const tmpDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'limulator-xdelta3-'));
@@ -505,7 +462,7 @@ async function syncFolderOnce(
   const meta: FolderSyncHttpMeta = {
     id: syncId,
     rootName,
-    install: opts.install ?? true,
+    install: opts.install,
     ...(opts.launchMode ? { launchMode: opts.launchMode } : {}),
     files: files.map((f) => ({ path: f.path, size: f.size, sha256: f.sha256.toLowerCase(), mode: f.mode })),
     payloads: encodedPayloads.map((p) => p.payload),
@@ -513,7 +470,7 @@ async function syncFolderOnce(
   const hasDelta = encodedPayloads.some((p) => p.payload.kind === 'delta');
   const compression: 'zstd' | 'gzip' | 'identity' = hasDelta ? 'identity' : preferredCompression;
   slog(
-    'info',
+    'debug',
     `sync started files=${files.length}${reason ? ` reason=${reason}` : ''} compression=${compression}`,
   );
 
@@ -590,18 +547,11 @@ async function syncFolderOnce(
   const tookMs = nowMs() - totalStart;
   const totalBytes = bytesSentFull + bytesSentDelta;
   slog(
-    'info',
+    'debug',
     `sync finished files=${files.length} sent=${fmtBytes(totalBytes)} syncWork=${fmtMs(
       syncWorkMs,
     )} total=${fmtMs(tookMs)}`,
   );
-  slog('debug', `sync bytes full=${fmtBytes(bytesSentFull)} delta=${fmtBytes(bytesSentDelta)}`);
-  slog(
-    'debug',
-    `timing ensureXdelta3=${fmtMs(tEnsureMs)} walk=${fmtMs(tWalkMs)} httpSend=${fmtMs(
-      httpSendMsTotal,
-    )} deltaEncode=${fmtMs(deltaEncodeMsTotal)}`,
-  );
   const out: SyncFolderResult = {};
   if (resp.installedAppPath) {
     out.installedAppPath = resp.installedAppPath;
@@ -611,7 +561,7 @@ async function syncFolderOnce(
   }
   // Update local cache optimistically: after a successful sync, cache reflects current local tree.
   for (const f of files) {
-    await cachePut(cacheRoot, f.path, f.absPath);
+    await cachePut(opts.basisCacheDir, f.path, f.absPath);
   }
   return out;
 }

package/src/instance-client.ts

@@ -79,7 +79,7 @@ export type InstanceClient = {
    * and process it (currently APK install is supported). Resolves on success,
    * rejects with an Error on failure.
    */
-  sendAsset: (url: string) => Promise<void>;
+  sendAsset: (url: string, timeoutMs?: number) => Promise<void>;
 
   /**
    * Get current connection state