atris 3.15.12 → 3.15.14

package/commands/pull.js

@@ -566,11 +566,35 @@ async function pullBusiness(slug) {
   // Compute local file hashes
   const localFiles = localFilesBeforePull;
 
+  function isPullPathInScope(filePath) {
+    if (!onlyPrefixes) return true;
+    const rel = filePath.replace(/^\//, '');
+    return onlyPrefixes.some((pref) => rel.startsWith(pref));
+  }
+
+  function filterFilesToPullScope(filesMap = {}) {
+    if (!onlyPrefixes) return filesMap;
+    return Object.fromEntries(
+      Object.entries(filesMap).filter(([p]) => isPullPathInScope(p))
+    );
+  }
+
+  function filterManifestToPullScope(existingManifest) {
+    if (!onlyPrefixes || !existingManifest || !existingManifest.files) return existingManifest;
+    return {
+      ...existingManifest,
+      files: filterFilesToPullScope(existingManifest.files),
+    };
+  }
+
   // If output dir is empty (fresh clone) or --force, treat as first sync — pull everything
-  const effectiveManifest = (Object.keys(localFiles).length === 0 || force) ? null : manifest;
+  const scopedLocalFiles = filterFilesToPullScope(localFiles);
+  const scopedRemoteFiles = filterFilesToPullScope(remoteFiles);
+  const scopedManifest = filterManifestToPullScope(manifest);
+  const effectiveManifest = (Object.keys(scopedLocalFiles).length === 0 || force) ? null : scopedManifest;
 
   // Three-way compare
-  const diff = threeWayCompare(localFiles, remoteFiles, effectiveManifest);
+  const diff = threeWayCompare(scopedLocalFiles, scopedRemoteFiles, effectiveManifest);
 
   if (dryRun) {
     console.log('');

package/commands/push.js

@@ -95,11 +95,49 @@ function shouldRetrySyncIndividually(result, filesToPush) {
   return result.status !== 403 && result.status !== 409;
 }
 
+function isMassDeletePlan({ deletedPaths = [], filesToPush = [], unchangedCount = 0 } = {}) {
+  const deleteCount = deletedPaths.length;
+  if (deleteCount === 0) return false;
+  const survivingCount = filesToPush.length + unchangedCount;
+  if (deleteCount >= 10 && survivingCount === 0) return true;
+  if (deleteCount >= 25) return true;
+  return deleteCount >= 10 && deleteCount > survivingCount;
+}
+
+function parsePushTimeoutSec(argv = process.argv, defaultSec = 120) {
+  let raw = null;
+  const eqArg = argv.find(a => a.startsWith('--timeout='));
+  if (eqArg) raw = eqArg.slice('--timeout='.length);
+  else {
+    const idx = argv.indexOf('--timeout');
+    if (idx !== -1 && argv[idx + 1]) raw = argv[idx + 1];
+  }
+
+  const parsed = raw == null ? defaultSec : Number.parseInt(raw, 10);
+  if (!Number.isFinite(parsed)) return defaultSec;
+  return Math.max(5, Math.min(300, parsed));
+}
+
 async function pushAtris() {
   const elapsedMs = startTimer();
   let slug = process.argv[3];
   let _coldWake = false;
 
+  if (process.argv.includes('--help') || process.argv.includes('-h')) {
+    console.log('Usage: atris push [business] [--from <path>] [--only <prefix>] [--force] [--delete] [--delete-all]');
+    console.log('');
+    console.log('  Push requires a fresh pull. If cloud has changed since your last pull,');
+    console.log('  the push will be blocked until you run `atris pull`. Use --force to override.');
+    console.log('');
+    console.log('  atris push                   Push from current folder (auto-detect business)');
+    console.log('  atris push pallet            Push pallet/ or atris/pallet/');
+    console.log('  atris push pallet --only team/nate   Only push files in team/nate/');
+    console.log('  atris push --force           Bypass freshness check (force-push, may overwrite cloud changes)');
+    console.log('  atris push --delete          Allow small cloud deletes shown by --dry-run');
+    console.log('  atris push --delete-all      Extra confirmation for mass-delete recovery');
+    process.exit(0);
+  }
+
   // Auto-detect business from .atris/business.json in current dir
   if (!slug || slug.startsWith('-')) {
     const bizFile = path.join(process.cwd(), '.atris', 'business.json');
@@ -113,7 +151,7 @@ async function pushAtris() {
   }
 
   if (!slug || slug === '--help') {
-    console.log('Usage: atris push [business] [--from <path>] [--only <prefix>] [--force] [--delete]');
+    console.log('Usage: atris push [business] [--from <path>] [--only <prefix>] [--force] [--delete] [--delete-all]');
     console.log('');
     console.log('  Push requires a fresh pull. If cloud has changed since your last pull,');
     console.log('  the push will be blocked until you run `atris pull`. Use --force to override.');
@@ -122,14 +160,17 @@ async function pushAtris() {
     console.log('  atris push pallet            Push pallet/ or atris/pallet/');
     console.log('  atris push pallet --only team/nate   Only push files in team/nate/');
     console.log('  atris push --force           Bypass freshness check (force-push, may overwrite cloud changes)');
-    console.log('  atris push --delete          Allow cloud deletes shown by --dry-run');
+    console.log('  atris push --delete          Allow small cloud deletes shown by --dry-run');
+    console.log('  atris push --delete-all      Extra confirmation for mass-delete recovery');
     process.exit(0);
   }
 
   const force = process.argv.includes('--force');
   const dryRun = process.argv.includes('--dry-run');
   const allowDelete = process.argv.includes('--delete');
+  const allowMassDelete = process.argv.includes('--delete-all');
   const allowCrossRootManifest = process.argv.includes('--allow-cross-root-manifest');
+  const timeoutSec = parsePushTimeoutSec(process.argv);
 
   // Parse --only
   let onlyRaw = null;
@@ -390,6 +431,24 @@ async function pushAtris() {
     process.exit(1);
   }
 
+  if (deletedPaths.length > 0 && allowDelete && !allowMassDelete && isMassDeletePlan({ deletedPaths, filesToPush, unchangedCount })) {
+    console.log('');
+    console.log(`  ✗ Refusing mass delete of ${deletedPaths.length} cloud files with --delete alone.`);
+    console.log('');
+    console.log('    This looks like a missing local folder or wrong source root.');
+    console.log('    No cloud files were deleted.');
+    console.log('');
+    console.log('    First inspect the plan:');
+    console.log(`      atris push ${resolvedSlug || slug} --dry-run`);
+    console.log('');
+    console.log('    If this is truly an intentional full cleanup, rerun with both flags:');
+    console.log(`      atris push ${resolvedSlug || slug} --delete --delete-all`);
+    console.log('');
+    console.log('    If this is surprising, pull cloud truth first:');
+    console.log(`      atris pull ${resolvedSlug || slug} --keep-local --timeout 120`);
+    process.exit(1);
+  }
+
   let pushed = 0;
   let deleted = 0;
   let skipped = [];
@@ -418,8 +477,14 @@ async function pushAtris() {
   };
   const wireFiles = (files) => files.map((f) => ({ path: toWirePath(f.path), content: f.content }));
   const syncFiles = (files) => apiRequestJson(
-    `/business/${businessId}/workspaces/${workspaceId}/sync`,
-    { method: 'POST', token: creds.token, body: { files: wireFiles(files) }, headers: { 'X-Atris-Actor-Source': 'cli' } }
+    `/business/${businessId}/workspaces/${workspaceId}/sync?timeout=${timeoutSec}`,
+    {
+      method: 'POST',
+      token: creds.token,
+      body: { files: wireFiles(files) },
+      headers: { 'X-Atris-Actor-Source': 'cli' },
+      timeoutMs: (timeoutSec + 15) * 1000,
+    }
   );
 
   // Inspect per-file results from a /sync response. Treat "written" and
@@ -682,4 +747,6 @@ module.exports = {
   canonicalWorkspaceRoot,
   basenameOfManifestPath,
   isBusinessWorkspaceRoot,
+  isMassDeletePlan,
+  parsePushTimeoutSec,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.15.12",
+  "version": "3.15.14",
   "description": "Atris — an operating system for intelligence. Integrates with any agent.",
   "main": "bin/atris.js",
   "bin": {