@dboio/cli 0.20.6 → 0.20.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dboio/cli",
-  "version": "0.20.6",
+  "version": "0.20.8",
   "description": "CLI for the DBO.io framework",
   "type": "module",
   "bin": {

package/plugins/claude/dbo/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "dbo",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "description": "DBO.io CLI integration for Claude Code",
   "author": {
     "name": "DBO.io"

package/plugins/claude/track/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "track",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Changelog and Track API logging for Claude Code — automatically logs changes to changelog.md and the remote Track task_log on every session",
   "author": {
     "name": "DBO.io"

package/src/commands/clone.js

@@ -1284,6 +1284,14 @@ export async function performClone(source, options = {}) {
   // Step 2: Load the app JSON — retry loop with fallback prompt on failure.
   // This runs BEFORE schema/dependency sync so that the login prompt fires
   // here if the session is expired (not buried inside a silent dependency clone).
+
+  // In pull mode without --force, pass UpdatedAfter from the last successful fetch
+  // so the server only returns records modified since then (delta fetch).
+  if (options.pullMode && !options.force && !options.updatedAfter) {
+    const syncData = await loadSynchronize();
+    if (syncData._LastGet) options.updatedAfter = syncData._LastGet;
+  }
+
   let activeSource = source;
   while (true) {
     try {
@@ -1667,6 +1675,13 @@ export async function performClone(source, options = {}) {
   // Step 10: Tag project files with sync status (best-effort, non-blocking)
   tagProjectFiles({ verbose: false }).catch(() => {});
 
+  // Record the time of this fetch for delta tracking on subsequent pulls
+  try {
+    const syncData = await loadSynchronize();
+    syncData._LastGet = new Date().toISOString();
+    await saveSynchronize(syncData);
+  } catch { /* non-critical */ }
+
   log.plain('');
   const verb = options.pullMode ? 'Pull' : 'Clone';
   log.success(entityFilter ? `${verb} complete! (filtered: ${options.entity})` : `${verb} complete!`);
@@ -1752,7 +1767,8 @@ async function fetchAppFromServer(appShortName, options, config) {
 
   let result;
   try {
-    result = await client.get(`/api/app/object/${appShortName}`);
+    const params = options.updatedAfter ? { UpdatedAfter: options.updatedAfter } : {};
+    result = await client.get(`/api/app/object/${appShortName}`, params);
   } catch (err) {
     spinner.fail(`Failed to fetch app "${appShortName}"`);
     throw err;

package/src/commands/diff.js

@@ -3,7 +3,7 @@ import { readFile, stat } from 'fs/promises';
 import { join, dirname, basename, extname } from 'path';
 import chalk from 'chalk';
 import { DboClient } from '../lib/client.js';
-import { loadConfig, loadAppConfig, loadAppJsonBaseline } from '../lib/config.js';
+import { loadConfig, loadAppConfig } from '../lib/config.js';
 import { formatError } from '../lib/formatter.js';
 import { log } from '../lib/logger.js';
 import {
@@ -13,7 +13,6 @@ import {
   applyServerChanges,
 } from '../lib/diff.js';
 import { fetchServerRecordsBatch } from '../lib/toe-stepping.js';
-import { findBaselineEntry } from '../lib/delta.js';
 import { isMetadataFile, parseMetaFilename, findMetadataForCompanion } from '../lib/filenames.js';
 import { runPendingMigrations } from '../lib/migrations.js';
 
@@ -42,36 +41,17 @@ export const diffCommand = new Command('diff')
 
       log.info(`Comparing ${metaFiles.length} record(s) against server...`);
 
-      // Batch-fetch server records via /api/app/object/ with UpdatedAfter
+      // Batch-fetch server records via /api/object/{appUid}
       const ora = (await import('ora')).default;
       let serverRecordsMap = new Map();
       const appConfig = await loadAppConfig();
-      if (appConfig?.AppShortName) {
-        // Find oldest baseline _LastUpdated across all files to diff
-        const baseline = await loadAppJsonBaseline();
-        let oldestDate = null;
-        for (const metaPath of metaFiles) {
-          try {
-            const meta = JSON.parse(await readFile(metaPath, 'utf8'));
-            const uid = meta.UID || meta._id;
-            const entity = meta._entity;
-            if (!uid || !entity || !baseline) continue;
-            const entry = findBaselineEntry(baseline, entity, uid);
-            if (!entry?._LastUpdated) continue;
-            const d = new Date(entry._LastUpdated);
-            if (!isNaN(d) && (!oldestDate || d < oldestDate)) oldestDate = d;
-          } catch { /* skip unreadable */ }
-        }
-
-        if (oldestDate) {
-          const updatedAfter = oldestDate.toISOString();
-          const spinner = ora('Fetching server state for comparison...').start();
-          serverRecordsMap = await fetchServerRecordsBatch(client, appConfig.AppShortName, updatedAfter);
-          if (serverRecordsMap.size > 0) {
-            spinner.succeed(`Fetched ${serverRecordsMap.size} record(s) from server`);
-          } else {
-            spinner.warn('No server records returned');
-          }
+      if (appConfig?.AppUID) {
+        const spinner = ora('Fetching server state for comparison...').start();
+        serverRecordsMap = await fetchServerRecordsBatch(client, appConfig.AppUID);
+        if (serverRecordsMap.size > 0) {
+          spinner.succeed(`Fetched ${serverRecordsMap.size} record(s) from server`);
+        } else {
+          spinner.warn('No server records returned');
         }
       }
 

package/src/commands/pull.js

@@ -3,7 +3,7 @@ import { access } from 'fs/promises';
 import { join } from 'path';
 import chalk from 'chalk';
 import { performClone, resolveRecordPaths, resolveMediaPaths, resolveEntityDirPaths, resolveEntityFilter, buildOutputFilename } from './clone.js';
-import { loadConfig, loadClonePlacement } from '../lib/config.js';
+import { loadConfig, loadClonePlacement, loadSynchronize } from '../lib/config.js';
 import { loadStructureFile, resolveBinPath, BINS_DIR, EXTENSION_DESCRIPTORS_DIR, EXTENSION_UNSUPPORTED_DIR, resolveEntityDirPath } from '../lib/structure.js';
 import { log } from '../lib/logger.js';
 import { formatError } from '../lib/formatter.js';
@@ -31,7 +31,9 @@ async function fetchAppJson(config, options) {
 
   let result;
   try {
-    result = await client.get(`/api/app/object/${appShortName}`);
+    const syncData = await loadSynchronize();
+    const params = (!options.force && syncData._LastGet) ? { UpdatedAfter: syncData._LastGet } : {};
+    result = await client.get(`/api/app/object/${appShortName}`, params);
   } catch (err) {
     spinner.fail(`Failed to fetch app "${appShortName}"`);
     throw err;

package/src/commands/push.js

@@ -6,7 +6,7 @@ import { buildInputBody, checkSubmitErrors, getSessionUserOverride } from '../li
 import { formatResponse, formatError } from '../lib/formatter.js';
 import { log } from '../lib/logger.js';
 import { shouldSkipColumn } from '../lib/columns.js';
-import { loadConfig, loadAppConfig, loadSynchronize, saveSynchronize, loadAppJsonBaseline, saveAppJsonBaseline, hasBaseline, loadScripts, loadScriptsLocal, addDeleteEntry, loadRootContentFiles, loadRepositoryIntegrationID } from '../lib/config.js';
+import { loadConfig, loadAppConfig, loadSynchronize, saveSynchronize, loadAppJsonBaseline, saveAppJsonBaseline, hasBaseline, loadScripts, loadScriptsLocal, addDeleteEntry, loadRepositoryIntegrationID } from '../lib/config.js';
 import { mergeScriptsConfig, resolveHooks, buildHookEnv, runBuildLifecycle, runPushLifecycle } from '../lib/scripts.js';
 import { checkStoredTicket, applyStoredTicketToSubmission, clearRecordTicket, clearGlobalTicket, fetchAndCacheRepositoryIntegration } from '../lib/ticketing.js';
 import { checkModifyKey, isModifyKeyError, handleModifyKeyError } from '../lib/modify-key.js';
@@ -150,6 +150,11 @@ export const pushCommand = new Command('push')
       } else {
         await pushSingleFile(targetPath, client, options, modifyKey, transactionKey);
       }
+
+      // Record the time of this push attempt for toe-stepping and delta tracking
+      const syncData = await loadSynchronize();
+      syncData._LastPost = new Date().toISOString();
+      await saveSynchronize(syncData);
     } catch (err) {
       formatError(err);
       process.exit(1);
@@ -272,20 +277,20 @@ async function moveWillDeleteToTrash(entry) {
     for (const col of (deletedMeta._companionReferenceColumns || deletedMeta._contentColumns || [])) {
       const ref = deletedMeta[col];
       if (ref && String(ref).startsWith('@')) {
-        const refFile = String(ref).substring(1);
-        const willDeleteContent = join(metaDir, `__WILL_DELETE__${refFile}`);
+        const companionAbs = resolveReferencePath(String(ref), join(process.cwd(), metaDir));
+        const willDeleteContent = join(dirname(companionAbs), `__WILL_DELETE__${basename(companionAbs)}`);
         try {
           await stat(willDeleteContent);
-          filesToMove.push({ from: willDeleteContent, to: join(trashDir, refFile) });
+          filesToMove.push({ from: willDeleteContent, to: join(trashDir, basename(companionAbs)) });
         } catch {}
       }
     }
     if (deletedMeta._mediaFile && String(deletedMeta._mediaFile).startsWith('@')) {
-      const refFile = String(deletedMeta._mediaFile).substring(1);
-      const willDeleteMedia = join(metaDir, `__WILL_DELETE__${refFile}`);
+      const mediaAbs = resolveReferencePath(String(deletedMeta._mediaFile), join(process.cwd(), metaDir));
+      const willDeleteMedia = join(dirname(mediaAbs), `__WILL_DELETE__${basename(mediaAbs)}`);
       try {
         await stat(willDeleteMedia);
-        filesToMove.push({ from: willDeleteMedia, to: join(trashDir, refFile) });
+        filesToMove.push({ from: willDeleteMedia, to: join(trashDir, basename(mediaAbs)) });
       } catch {}
     }
   } catch {
@@ -386,7 +391,7 @@ async function pushSingleFile(filePath, client, options, modifyKey = null, trans
     if (baseline) {
       const appConfig = await loadAppConfig();
       const cfg = await loadConfig();
-      const result = await checkToeStepping([{ meta, metaPath }], client, baseline, options, appConfig?.AppShortName, cfg.ServerTimezone);
+      const result = await checkToeStepping([{ meta, metaPath }], client, baseline, options, appConfig?.AppUID, cfg.ServerTimezone);
       if (result === false || result instanceof Set) return;
     }
   }
@@ -441,115 +446,6 @@ async function pushSingleFile(filePath, client, options, modifyKey = null, trans
   }
   return success;
 }
-/**
- * Metadata templates for known root content files.
- * Keyed by filename (case-sensitive). Unknown files in rootContentFiles
- * get a sensible derived template (extension from name, Public: 0).
- */
-const ROOT_FILE_TEMPLATES = {
-  'manifest.json': {
-    _entity: 'content',
-    _companionReferenceColumns: ['Content'],
-    Extension: 'JSON',
-    Public: 1,
-    Active: 1,
-    Title: 'PWA Manifest',
-  },
-  'CLAUDE.md': {
-    _entity: 'content',
-    _companionReferenceColumns: ['Content'],
-    Extension: 'MD',
-    Public: 0,
-    Active: 1,
-    Title: 'Claude Code Instructions',
-  },
-  'README.md': {
-    _entity: 'content',
-    _companionReferenceColumns: ['Content'],
-    Extension: 'MD',
-    Public: 1,
-    Active: 1,
-    Title: 'README',
-  },
-};
-
-/**
- * For each filename in rootContentFiles, ensure a companion metadata file
- * exists in lib/bins/app/. Skips if the file is absent at root or if metadata
- * already tracks it. Creates metadata with Content: "@/<filename>" so push
- * always reads from the project root.
- */
-async function ensureRootContentFiles() {
-  const rootFiles = await loadRootContentFiles();
-  if (!rootFiles.length) return;
-
-  const ig = await loadIgnore();
-  const allMeta = await findMetadataFiles(process.cwd(), ig);
-
-  // Build a set of already-tracked filenames from existing metadata (lowercase for case-insensitive match).
-  // Also strip stale fields (e.g. Descriptor) from content-entity root file metadata.
-  const tracked = new Set();
-  for (const metaPath of allMeta) {
-    try {
-      const raw = await readFile(metaPath, 'utf8');
-      const parsed = JSON.parse(raw);
-      const content = parsed.Content || '';
-      const path = parsed.Path || '';
-      // Detect both @/filename (root-relative) and @filename (local) references
-      const refName = content.startsWith('@/') ? content.slice(2)
-        : content.startsWith('@') ? content.slice(1)
-        : null;
-      if (refName) tracked.add(refName.toLowerCase());
-      if (path) tracked.add(path.replace(/^\//, '').toLowerCase());
-
-      // Clean up stale Descriptor field: content entities never have Descriptor.
-      // This fixes metadata written by an earlier buggy version of the tool.
-      if (parsed._entity === 'content' && parsed.Descriptor !== undefined) {
-        const cleaned = { ...parsed };
-        delete cleaned.Descriptor;
-        await writeFile(metaPath, JSON.stringify(cleaned, null, 2) + '\n');
-        log.dim(`  Removed stale Descriptor field from ${basename(metaPath)}`);
-      }
-    } catch { /* skip unreadable */ }
-  }
-
-  const appConfig = await loadAppConfig();
-  const structure = await loadStructureFile();
-  const appBin = findBinByPath('app', structure);
-  const binsAppDir = join(process.cwd(), BINS_DIR, 'app');
-
-  for (const filename of rootFiles) {
-    // Skip if file doesn't exist at project root
-    try { await access(join(process.cwd(), filename)); } catch { continue; }
-    // Skip if already tracked by existing metadata (case-insensitive)
-    if (tracked.has(filename.toLowerCase())) continue;
-
-    const tmplKey = Object.keys(ROOT_FILE_TEMPLATES).find(k => k.toLowerCase() === filename.toLowerCase());
-    const tmpl = (tmplKey ? ROOT_FILE_TEMPLATES[tmplKey] : null) || {
-      _entity: 'content',
-      _companionReferenceColumns: ['Content'],
-      Extension: (filename.includes('.') ? filename.split('.').pop().toUpperCase() : 'TXT'),
-      Public: 0,
-      Active: 1,
-      Title: filename,
-    };
-
-    const meta = {
-      ...tmpl,
-      Content: `@/${filename}`,
-      Path: filename,
-      Name: filename,
-    };
-    if (appBin) meta.BinID = appBin.binId;
-    if (appConfig.AppID) meta.AppID = appConfig.AppID;
-
-    await mkdir(binsAppDir, { recursive: true });
-    const stem = filename.replace(/\.[^.]+$/, '');
-    const metaFilename = `${stem}.metadata.json`;
-    await writeFile(join(binsAppDir, metaFilename), JSON.stringify(meta, null, 2) + '\n');
-    log.info(`Auto-created ${metaFilename} for ${filename}`);
-  }
-}
 
 /**
  * Collect all non-metadata file absolute paths from a directory (recursive).
@@ -611,9 +507,6 @@ async function findCrossDirectoryMetadata(dirPath, ig) {
  * Push all records found in a directory (recursive)
  */
 async function pushDirectory(dirPath, client, options, modifyKey = null, transactionKey = 'RowUID', deletedCount = 0) {
-  // Auto-create metadata for root content files (manifest.json, CLAUDE.md, README.md, etc.)
-  await ensureRootContentFiles();
-
   // AUTO-ADD DISABLED: local-file-first approach is being replaced by server-first workflow.
   // New records should be created via the DBO REST API first, then `dbo pull` to populate locally.
   // The auto-add code (findUnaddedFiles + detectBinFile + submitAdd) has been commented out.
@@ -815,7 +708,7 @@ async function pushDirectory(dirPath, client, options, modifyKey = null, transac
     if (toCheck.length > 0) {
       const appConfig = await loadAppConfig();
       const cfg = await loadConfig();
-      const result = await checkToeStepping(toCheck, client, baseline, options, appConfig?.AppShortName, cfg.ServerTimezone);
+      const result = await checkToeStepping(toCheck, client, baseline, options, appConfig?.AppUID, cfg.ServerTimezone);
       if (result === false) return; // user cancelled entirely
       if (result instanceof Set) {
         // Filter out skipped UIDs
@@ -1162,7 +1055,7 @@ async function pushByUIDs(uids, client, options, modifyKey = null, transactionKe
     if (toCheck.length > 0) {
       const appConfig = await loadAppConfig();
       const cfg3 = await loadConfig();
-      const result = await checkToeStepping(toCheck, client, baseline, options, appConfig?.AppShortName, cfg3.ServerTimezone);
+      const result = await checkToeStepping(toCheck, client, baseline, options, appConfig?.AppUID, cfg3.ServerTimezone);
       if (result === false) return; // user cancelled entirely
       if (result instanceof Set) {
         // Filter out skipped UIDs from matches

package/src/commands/rm.js

@@ -9,6 +9,7 @@ import { isMetadataFile, parseMetaFilename, findMetadataForCompanion } from '../
 import { loadStructureFile, findBinByPath, findChildBins, BINS_DIR } from '../lib/structure.js';
 import { runPendingMigrations } from '../lib/migrations.js';
 import { removeDeployEntry } from '../lib/deploy-config.js';
+import { resolveReferencePath } from '../lib/delta.js';
 
 export const rmCommand = new Command('rm')
   .description('Remove a file or directory locally and stage server deletions for the next dbo push')
@@ -94,12 +95,12 @@ async function rmFileRecord(metaPath, options, { skipPrompt = false } = {}) {
   for (const col of (meta._companionReferenceColumns || meta._contentColumns || [])) {
     const ref = meta[col];
     if (ref && String(ref).startsWith('@')) {
-      localFiles.push(join(metaDir, String(ref).substring(1)));
+      localFiles.push(resolveReferencePath(String(ref), join(process.cwd(), metaDir)));
     }
   }
 
   if (meta._mediaFile && String(meta._mediaFile).startsWith('@')) {
-    localFiles.push(join(metaDir, String(meta._mediaFile).substring(1)));
+    localFiles.push(resolveReferencePath(String(meta._mediaFile), join(process.cwd(), metaDir)));
   }
 
   const displayName = parseMetaFilename(basename(metaPath))?.naturalBase ?? basename(metaPath, '.metadata.json');

package/src/lib/config.js

@@ -456,9 +456,13 @@ export async function loadUserProfile() {
 export async function loadSynchronize() {
   try {
     const raw = await readFile(synchronizePath(), 'utf8');
-    return JSON.parse(raw);
+    const data = JSON.parse(raw);
+    // Ensure timestamp fields are present for older files
+    if (!('_LastGet' in data)) data._LastGet = null;
+    if (!('_LastPost' in data)) data._LastPost = null;
+    return data;
   } catch {
-    return { delete: [], edit: [], add: [] };
+    return { delete: [], edit: [], add: [], _LastGet: null, _LastPost: null };
   }
 }
 

package/src/lib/dependencies.js

@@ -208,6 +208,11 @@ export function execDboInDir(dir, args, options = {}) {
 
 /**
  * Returns true if the dependency needs a fresh clone.
+ *
+ * Uses the direct /api/object/{appUid} endpoint when the dependency checkout
+ * already has a .app/config.json with AppUID (faster, no UpdatedAfter param
+ * needed). Falls back to /api/app/object/{shortname}?UpdatedAfter={date} when
+ * the checkout hasn't been cloned yet or the config is unreadable.
  */
 export async function checkDependencyStaleness(shortname, options = {}) {
   const stored = await getDependencyLastUpdated(shortname);
@@ -217,10 +222,24 @@ export async function checkDependencyStaleness(shortname, options = {}) {
   const effectiveDomain = options.domain || domain;
   const client = new DboClient({ domain: effectiveDomain, verbose: options.verbose });
 
-  const dateStr = stored.substring(0, 10); // YYYY-MM-DD from ISO string
-  const result = await client.get(
-    `/api/app/object/${encodeURIComponent(shortname)}?UpdatedAfter=${dateStr}`
-  );
+  // Try to read AppUID from the dependency's own .app/config.json
+  let appUid = null;
+  try {
+    const depConfigPath = join(process.cwd(), 'app_dependencies', shortname, '.app', 'config.json');
+    const raw = await readFile(depConfigPath, 'utf8');
+    appUid = JSON.parse(raw).AppUID || null;
+  } catch { /* checkout missing or config unreadable — fall back */ }
+
+  let result;
+  if (appUid) {
+    result = await client.get(`/api/object/${appUid}`);
+  } else {
+    const dateStr = stored.substring(0, 10); // YYYY-MM-DD from ISO string
+    result = await client.get(
+      `/api/app/object/${encodeURIComponent(shortname)}?UpdatedAfter=${dateStr}`
+    );
+  }
+
   if (!result.ok || !result.data) return false; // Can't determine — assume fresh
 
   const serverTs = result.data._LastUpdated;

package/src/lib/toe-stepping.js

@@ -82,29 +82,24 @@ export async function fetchServerRecords(client, requests) {
 }
 
 /**
- * Fetch server records in bulk using the app object endpoint with UpdatedAfter
- * filtering. This is far more efficient than per-record fetches because it
- * makes a single HTTP request and the server only returns records modified
- * after the given date.
+ * Fetch server records in bulk using the direct app object endpoint by UID.
+ * Makes a single HTTP request and returns all records for the app.
  *
  * The response is used ONLY for comparison — it must NOT replace the metadata
  * or baseline files.
  *
  * @param {DboClient} client
- * @param {string} appShortName - App short name for the /api/app/object/ endpoint
- * @param {string} updatedAfter - ISO date string (oldest _LastUpdated among records to push)
+ * @param {string} appUid - App UID for the /api/object/ endpoint
  * @returns {Promise<Map<string, Object>>} - Map of uid → server record (across all entities)
  */
-export async function fetchServerRecordsBatch(client, appShortName, updatedAfter) {
+export async function fetchServerRecordsBatch(client, appUid) {
   const map = new Map();
 
   try {
     // Void cache first so the app object response reflects the latest server state
     await client.voidCache();
 
-    const result = await client.get(`/api/app/object/${appShortName}`, {
-      UpdatedAfter: updatedAfter,
-    });
+    const result = await client.get(`/api/object/${appUid}`);
 
     if (!result.ok && !result.successful) return map;
 
@@ -245,34 +240,12 @@ export function displayConflict(label, serverUser, serverTimestamp, diffColumns)
   }
 }
 
-/**
- * Find the oldest _LastUpdated date among the baseline entries for the
- * records about to be pushed. This is used as the UpdatedAfter parameter
- * to limit the app object response to only recently modified records.
- *
- * @param {Array<{ meta: Object }>} records
- * @param {Object} baseline
- * @returns {string|null} - ISO date string or null if no baseline dates found
- */
-function findOldestBaselineDate(records, baseline) {
-  let oldest = null;
-  for (const { meta } of records) {
-    if (!meta.UID || !meta._entity) continue;
-    const entry = findBaselineEntry(baseline, meta._entity, meta.UID);
-    if (!entry?._LastUpdated) continue;
-    const d = new Date(entry._LastUpdated);
-    if (isNaN(d)) continue;
-    if (!oldest || d < oldest) oldest = d;
-  }
-  return oldest ? oldest.toISOString() : null;
-}
-
 /**
  * Main toe-stepping check. Compares each record being pushed against the
  * live server state.
  *
- * When appShortName is provided, uses a single bulk fetch via
- *   GET /api/app/object/{appShortName}?UpdatedAfter={date}
+ * When appUid is provided, uses a single bulk fetch via
+ *   GET /api/object/{appUid}
  * which is far more efficient than per-record fetches. Falls back to
  * per-record GET /api/o/e/{entity}/{uid} when the bulk endpoint is
  * unavailable or returns no data.
@@ -285,12 +258,12 @@ function findOldestBaselineDate(records, baseline) {
  * @param {DboClient} client
  * @param {Object} baseline - Loaded baseline from .app/<shortName>.json (baseline)
  * @param {Object} options  - Commander options (options.yes used for auto-accept)
- * @param {string} [appShortName] - App short name for bulk fetch (optional)
+ * @param {string} [appUid] - App UID for bulk fetch via /api/object/ (optional)
  * @param {string} [serverTz] - Server timezone from config (e.g. "America/Chicago")
  * @returns {Promise<boolean|Set<string>>} - true = proceed with all,
  *   false = user cancelled entirely, Set<string> = UIDs to skip (proceed with rest)
  */
-export async function checkToeStepping(records, client, baseline, options, appShortName, serverTz) {
+export async function checkToeStepping(records, client, baseline, options, appUid, serverTz) {
   // Build list of records to check (skip new records without UID)
   const requests = [];
   for (const { meta } of records) {
@@ -304,20 +277,17 @@ export async function checkToeStepping(records, client, baseline, options, appSh
   const ora = (await import('ora')).default;
   const spinner = ora(`Checking ${requests.length} record(s) for server conflicts...`).start();
 
-  // Try bulk fetch via /api/app/object/ with UpdatedAfter when possible
+  // Try bulk fetch via /api/object/{appUid} when possible
   let serverRecords;
-  if (appShortName) {
-    const updatedAfter = findOldestBaselineDate(records, baseline);
-    if (updatedAfter) {
-      spinner.text = `Fetching server state (UpdatedAfter: ${updatedAfter})...`;
-      serverRecords = await fetchServerRecordsBatch(client, appShortName, updatedAfter);
-    }
+  if (appUid) {
+    spinner.text = `Fetching server state via /api/object/${appUid}...`;
+    serverRecords = await fetchServerRecordsBatch(client, appUid);
   }
 
   // Fall back to per-record fetches if batch returned nothing or wasn't available
   if (!serverRecords || serverRecords.size === 0) {
     // Void cache if batch path was skipped (batch already calls voidCache internally)
-    if (!appShortName) await client.voidCache();
+    if (!appUid) await client.voidCache();
     spinner.text = `Fetching ${requests.length} record(s) from server...`;
     serverRecords = await fetchServerRecords(client, requests);
   }