atris 3.34.0 → 3.36.0

package/commands/push.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
+const readline = require('readline');
 const { loadCredentials } = require('../utils/auth');
 const { apiRequestJson } = require('../utils/api');
 const { loadBusinesses, saveBusinesses, businessMatchesSlug } = require('./business');
@@ -54,6 +55,102 @@ function pathInScope(filePath, onlyPrefixes) {
   return onlyPrefixes.some(prefix => filePath.startsWith(prefix));
 }
 
+const PUSH_VALUE_FLAGS = new Set(['--from', '--only', '--timeout']);
+
+function looksLikePushPath(token) {
+  const value = String(token || '');
+  if (!value || value.startsWith('-')) return false;
+  if (value.includes('/') || value.includes('\\')) return true;
+  return value.includes('.');
+}
+
+function normalizePushScopePath(raw) {
+  const wikiPrefix = normalizeWikiOnlyPrefix(raw);
+  if (wikiPrefix) return `/${wikiPrefix.replace(/^\//, '')}`;
+  let n = '/' + String(raw || '').replace(/^\//, '').replace(/\\/g, '/');
+  if (!n.endsWith('/') && !n.includes('.')) n += '/';
+  return n;
+}
+
+/**
+ * Parse push argv into optional business slug, positional file paths, and --changed.
+ * `atris push [business] [file...] [--changed] [--only <prefix>]`
+ */
+function parsePushArgv(argv = process.argv) {
+  const args = argv.slice(3);
+  const flags = new Set();
+  const values = {};
+  const positionals = [];
+
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (!a.startsWith('-')) {
+      positionals.push(a);
+      continue;
+    }
+    const eq = a.indexOf('=');
+    if (eq !== -1) {
+      values[a.slice(0, eq)] = a.slice(eq + 1);
+      continue;
+    }
+    if (PUSH_VALUE_FLAGS.has(a) && args[i + 1] && !args[i + 1].startsWith('-')) {
+      values[a] = args[++i];
+      continue;
+    }
+    flags.add(a);
+  }
+
+  let slug = null;
+  const pathArgs = [];
+  for (const token of positionals) {
+    if (!slug && !looksLikePushPath(token)) slug = token;
+    else pathArgs.push(token);
+  }
+
+  return {
+    slug,
+    pathArgs,
+    changed: flags.has('--changed'),
+    onlyRaw: values['--only'] || null,
+  };
+}
+
+/** Local files whose hash differs from (or is absent in) the last-synced manifest. */
+function resolveChangedScopePaths(localFiles = {}, baseFiles = {}) {
+  const paths = [];
+  for (const [filePath, info] of Object.entries(localFiles || {})) {
+    const base = baseFiles[filePath];
+    if (!base || base.hash !== info.hash) paths.push(filePath.startsWith('/') ? filePath : `/${filePath}`);
+  }
+  return paths.sort();
+}
+
+/**
+ * Merge --only, positional paths, and --changed into onlyPrefixes for buildPushChangePlan.
+ * Returns null when nothing scopes the push (full workspace plan).
+ * `--changed` with no diffs returns [] so the plan stays empty instead of widening.
+ */
+function mergePushScopes({ onlyRaw = null, pathArgs = [], changed = false, localFiles = {}, baseFiles = {} } = {}) {
+  const scopes = [];
+  if (onlyRaw) {
+    for (const part of String(onlyRaw).split(',')) {
+      const trimmed = part.trim();
+      if (trimmed) scopes.push(normalizePushScopePath(trimmed));
+    }
+  }
+  for (const raw of pathArgs || []) {
+    const trimmed = String(raw || '').trim();
+    if (trimmed) scopes.push(normalizePushScopePath(trimmed));
+  }
+  if (changed) {
+    for (const filePath of resolveChangedScopePaths(localFiles, baseFiles)) {
+      scopes.push(filePath.startsWith('/') ? filePath : `/${filePath}`);
+    }
+  }
+  if (scopes.length === 0) return changed ? [] : null;
+  return [...new Set(scopes)];
+}
+
 function buildPushChangePlan({
   localFiles = {},
   baseFiles = {},
@@ -98,6 +195,34 @@ function shouldRetrySyncIndividually(result, filesToPush) {
   return result.status !== 403 && result.status !== 409;
 }
 
+function buildPushUploadBatches(filesToPush = [], { maxBatchBytes = 256 * 1024 } = {}) {
+  const batches = [];
+  let current = [];
+  let currentBytes = 0;
+  const limit = Number.isFinite(maxBatchBytes) && maxBatchBytes > 0 ? maxBatchBytes : 256 * 1024;
+
+  const flush = () => {
+    if (current.length > 0) batches.push(current);
+    current = [];
+    currentBytes = 0;
+  };
+
+  for (const file of filesToPush) {
+    const bytes = Buffer.byteLength(file && file.content ? String(file.content) : '', 'utf8');
+    if (bytes > limit) {
+      flush();
+      batches.push([file]);
+      continue;
+    }
+    if (current.length > 0 && currentBytes + bytes > limit) flush();
+    current.push(file);
+    currentBytes += bytes;
+  }
+
+  flush();
+  return batches;
+}
+
 function isMassDeletePlan({ deletedPaths = [], filesToPush = [], unchangedCount = 0 } = {}) {
   const deleteCount = deletedPaths.length;
   if (deleteCount === 0) return false;
@@ -217,6 +342,36 @@ function renderPushSafetyBlock(report, slug) {
   return `${lines.join('\n')}\n`;
 }
 
+function renderDriftBlock(driftFiles) {
+  const lines = [];
+  const count = driftFiles.length;
+  lines.push('');
+  lines.push(`  ${count} file${count === 1 ? '' : 's'} conflict. run atris sync --review to pick local/cloud/merge, or atris push --only <path> to ship just what changed.`);
+  lines.push('');
+  lines.push('    Files that differ on cloud:');
+  driftFiles.slice(0, 8).forEach((p) => lines.push(`      ~ ${p.replace(/^\//, '')}`));
+  if (driftFiles.length > 8) lines.push(`      ... +${driftFiles.length - 8} more`);
+  lines.push('');
+  lines.push('    To override (force-push, may clobber cloud edits): atris push --force');
+  lines.push('');
+  return `${lines.join('\n')}\n`;
+}
+
+function needsForceBroadWorkspaceConfirm({ force = false, allowBroadWorkspace = false, yes = false, dryRun = false } = {}) {
+  return force && allowBroadWorkspace && !yes && !dryRun;
+}
+
+async function promptConfirm(message, { input = process.stdin, output = process.stdout } = {}) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({ input, output });
+    rl.question(message, (answer) => {
+      rl.close();
+      const normalized = String(answer).trim().toLowerCase();
+      resolve(normalized === 'y' || normalized === 'yes');
+    });
+  });
+}
+
 function parsePushTimeoutSec(argv = process.argv, defaultSec = 120) {
   let raw = null;
   const eqArg = argv.find(a => a.startsWith('--timeout='));
@@ -233,17 +388,20 @@ function parsePushTimeoutSec(argv = process.argv, defaultSec = 120) {
 
 async function pushAtris() {
   const elapsedMs = startTimer();
-  let slug = process.argv[3];
+  const parsed = parsePushArgv(process.argv);
+  let slug = parsed.slug;
   let _coldWake = false;
 
   if (process.argv.includes('--help') || process.argv.includes('-h') || slug === 'help') {
-    console.log('Usage: atris push [business] [--from <path>] [--only <prefix>] [--force] [--delete] [--delete-all]');
+    console.log('Usage: atris push [business] [file...] [--changed] [--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 example-co            Push example-co/ or atris/example-co/');
+    console.log('  atris push atris/now.md      Push only the named file(s)');
+    console.log('  atris push --changed         Push only files that differ from the last-synced manifest');
     console.log('  atris push example-co --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');
@@ -251,6 +409,7 @@ async function pushAtris() {
     console.log('  --allow-broad-workspace      Publish a large unscoped workspace plan after review');
     console.log('  --allow-nested-workspace     Explicitly allow nested <slug>/ paths');
     console.log('  --allow-sync-artifacts       Explicitly allow *.remote/*.local/*.base/*.cloud files');
+    console.log('  --yes                        Skip interactive confirmation (e.g. force broad workspace)');
     process.exit(0);
   }
 
@@ -267,13 +426,15 @@ async function pushAtris() {
   }
 
   if (!slug || slug === '--help') {
-    console.log('Usage: atris push [business] [--from <path>] [--only <prefix>] [--force] [--delete] [--delete-all]');
+    console.log('Usage: atris push [business] [file...] [--changed] [--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 example-co            Push example-co/ or atris/example-co/');
+    console.log('  atris push atris/now.md      Push only the named file(s)');
+    console.log('  atris push --changed         Push only files that differ from the last-synced manifest');
     console.log('  atris push example-co --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');
@@ -281,11 +442,13 @@ async function pushAtris() {
     console.log('  --allow-broad-workspace      Publish a large unscoped workspace plan after review');
     console.log('  --allow-nested-workspace     Explicitly allow nested <slug>/ paths');
     console.log('  --allow-sync-artifacts       Explicitly allow *.remote/*.local/*.base/*.cloud files');
+    console.log('  --yes                        Skip interactive confirmation (e.g. force broad workspace)');
     process.exit(0);
   }
 
   const force = process.argv.includes('--force');
   const dryRun = process.argv.includes('--dry-run');
+  const yes = process.argv.includes('--yes');
   const allowDelete = process.argv.includes('--delete');
   const allowMassDelete = process.argv.includes('--delete-all');
   const allowBroadWorkspace = process.argv.includes('--allow-broad-workspace');
@@ -293,24 +456,7 @@ async function pushAtris() {
   const allowSyncArtifacts = process.argv.includes('--allow-sync-artifacts');
   const allowCrossRootManifest = process.argv.includes('--allow-cross-root-manifest');
   const timeoutSec = parsePushTimeoutSec(process.argv);
-
-  // Parse --only
-  let onlyRaw = null;
-  const onlyEq = process.argv.find(a => a.startsWith('--only='));
-  if (onlyEq) onlyRaw = onlyEq.slice(7);
-  else {
-    const oi = process.argv.indexOf('--only');
-    if (oi !== -1 && process.argv[oi + 1] && !process.argv[oi + 1].startsWith('-')) onlyRaw = process.argv[oi + 1];
-  }
-  let onlyPrefixes = onlyRaw
-    ? onlyRaw.split(',').map(p => {
-        const wikiPrefix = normalizeWikiOnlyPrefix(p);
-        if (wikiPrefix) return `/${wikiPrefix.replace(/^\//, '')}`;
-        let n = '/' + p.replace(/^\//, '');
-        if (!n.endsWith('/') && !n.includes('.')) n += '/';
-        return n;
-      })
-    : null;
+  let onlyPrefixes = null;
 
   const creds = loadCredentials();
   if (!creds || !creds.token) { console.error('Not logged in. Run: atris login'); process.exit(1); }
@@ -328,6 +474,20 @@ async function pushAtris() {
   // Refuse to walk/upload dangerous paths ($HOME, /, /Users, system dirs).
   assertSafeWorkspaceRoot(sourceDir, { slug, op: 'push from' });
 
+  // Force-pushing a broad workspace is the most destructive push combo.
+  // Require an interactive y/N confirm unless the caller passed --yes.
+  if (needsForceBroadWorkspaceConfirm({ force, allowBroadWorkspace, yes, dryRun })) {
+    if (!process.stdin.isTTY) {
+      console.log('  --force --allow-broad-workspace requires an interactive terminal or --yes');
+      process.exit(1);
+    }
+    const ok = await promptConfirm('This will force push a broad workspace. Continue? (y/N) ');
+    if (!ok) {
+      console.log('  aborted');
+      process.exit(1);
+    }
+  }
+
   // Push the whole business workspace by default. Brain-only sync must be
   // explicit with --only atris/ so root workspace files cannot be missed.
 
@@ -412,6 +572,17 @@ async function pushAtris() {
     return;
   }
 
+  // Resolve scoped push filters before freshness so drift checks honor
+  // positional paths / --changed the same way --only already did.
+  const baseFiles = filterSyncFiles((manifest && manifest.files) ? manifest.files : {});
+  onlyPrefixes = mergePushScopes({
+    onlyRaw: parsed.onlyRaw,
+    pathArgs: parsed.pathArgs,
+    changed: parsed.changed,
+    localFiles,
+    baseFiles,
+  });
+
   console.log('');
   console.log(`Pushing to ${businessName}...`);
 
@@ -466,16 +637,7 @@ async function pushAtris() {
         }
       }
       if (driftFiles.length > 0) {
-        console.log(`drift detected (${driftFiles.length} file${driftFiles.length === 1 ? '' : 's'})`);
-        console.log('');
-        console.log(`  ✗ Cloud has changed since your last pull. Refusing to push stale state.`);
-        console.log('');
-        console.log('    Files that differ on cloud:');
-        driftFiles.slice(0, 8).forEach((p) => console.log(`      ~ ${p.replace(/^\//, '')}`));
-        if (driftFiles.length > 8) console.log(`      ... +${driftFiles.length - 8} more`);
-        console.log('');
-        console.log('    Run `atris pull` first, then push your changes.');
-        console.log('    To override (force-push, may clobber cloud edits): atris push --force');
+        process.stdout.write(renderDriftBlock(driftFiles));
         await emit('drift', { error_detail: `${driftFiles.length} file(s) drifted` });
         process.exit(1);
       }
@@ -498,7 +660,11 @@ async function pushAtris() {
 
   // Compare local hashes to manifest — NO server call needed
   // Files where local hash differs from manifest = changed locally
-  const baseFiles = filterSyncFiles((manifest && manifest.files) ? manifest.files : {});
+  if (parsed.changed && Array.isArray(onlyPrefixes) && onlyPrefixes.length === 0 && (!parsed.pathArgs || parsed.pathArgs.length === 0) && !parsed.onlyRaw) {
+    console.log('\n  Already up to date.\n');
+    await emit('success', { files_unchanged: Object.keys(localFiles).length });
+    return;
+  }
   const { filesToPush, deletedPaths, unchangedCount } = buildPushChangePlan({
     localFiles,
     baseFiles,
@@ -667,64 +833,68 @@ async function pushAtris() {
 
   if (filesToPush.length > 0) {
     // Push files to server (strip leading slash — server requires workspace-relative paths)
-    result = await syncFiles(filesToPush);
-
-    if (!result.ok) {
-      if (result.status === 403) {
-        const detail = result.errorMessage || result.error || (result.data && result.data.detail) || '';
-        if (detail && /plan required|business, max, or enterprise/i.test(detail)) {
-          console.error(`\n  Access denied: ${detail}`);
-          await emit('access_denied', { error_detail: detail });
-          process.exit(1);
-        }
-        // Permission denied — retry with only team/ and journal/ files
-        const allowed = filesToPush.filter(f => f.path.startsWith('/team/') || f.path.startsWith('/journal/'));
-        skipped = filesToPush.filter(f => !f.path.startsWith('/team/') && !f.path.startsWith('/journal/'));
-
-        if (allowed.length > 0) {
-          const retry = await syncFiles(allowed);
-          if (retry.ok) {
-            recordSyncResults(allowed, retry);
-            pushed = landedPaths.size;
+    const uploadBatches = buildPushUploadBatches(filesToPush);
+    for (const batch of uploadBatches) {
+      result = await syncFiles(batch);
+
+      if (!result.ok) {
+        if (result.status === 403) {
+          const detail = result.errorMessage || result.error || (result.data && result.data.detail) || '';
+          if (detail && /plan required|business, max, or enterprise/i.test(detail)) {
+            console.error(`\n  Access denied: ${detail}`);
+            await emit('access_denied', { error_detail: detail });
+            process.exit(1);
+          }
+          // Permission denied — retry with only team/ and journal/ files
+          const allowed = filesToPush.filter(f => f.path.startsWith('/team/') || f.path.startsWith('/journal/'));
+          skipped = filesToPush.filter(f => !f.path.startsWith('/team/') && !f.path.startsWith('/journal/'));
+
+          if (allowed.length > 0) {
+            const retry = await syncFiles(allowed);
+            if (retry.ok) {
+              recordSyncResults(allowed, retry);
+              pushed = landedPaths.size;
+              break;
+            } else {
+              console.error(`\n  Push failed: ${retry.errorMessage || retry.error || retry.status}`);
+              await emit('access_denied', { error_detail: `403 retry failed: ${retry.status}` });
+              process.exit(1);
+            }
           } else {
-            console.error(`\n  Push failed: ${retry.errorMessage || retry.error || retry.status}`);
-            await emit('access_denied', { error_detail: `403 retry failed: ${retry.status}` });
+            console.error('\n  Access denied: you can only push to your team/ folder.');
+            await emit('access_denied');
             process.exit(1);
           }
-        } else {
-          console.error('\n  Access denied: you can only push to your team/ folder.');
-          await emit('access_denied');
+        } else if (result.status === 409) {
+          console.error('\n  Computer is sleeping. Wake it first.');
+          await emit('cold_wake', { error_detail: 'computer sleeping (409)' });
           process.exit(1);
-        }
-      } else if (result.status === 409) {
-        console.error('\n  Computer is sleeping. Wake it first.');
-        await emit('cold_wake', { error_detail: 'computer sleeping (409)' });
-        process.exit(1);
-      } else if (shouldRetrySyncIndividually(result, filesToPush)) {
-        batchFailureDetail = `${result.status || 'unknown'}: ${result.errorMessage || result.error || 'batch sync failed'}`;
-        console.log('');
-        console.log(`  Batch push failed (${result.errorMessage || result.error || result.status}). Retrying one file at a time...`);
-        for (const f of filesToPush) {
-          const single = await syncFiles([f]);
-          if (single.ok) {
-            recordSyncResults([f], single);
-          } else {
-            failedToLand.push({
-              path: f.path,
-              status: single.status || 'error',
-              error: single.errorMessage || single.error || '',
-            });
+        } else if (shouldRetrySyncIndividually(result, batch)) {
+          batchFailureDetail = `${result.status || 'unknown'}: ${result.errorMessage || result.error || 'batch sync failed'}`;
+          console.log('');
+          console.log(`  Batch push failed (${result.errorMessage || result.error || result.status}). Retrying one file at a time...`);
+          for (const f of batch) {
+            const single = await syncFiles([f]);
+            if (single.ok) {
+              recordSyncResults([f], single);
+            } else {
+              failedToLand.push({
+                path: f.path,
+                status: single.status || 'error',
+                error: single.errorMessage || single.error || '',
+              });
+            }
           }
+          pushed = landedPaths.size;
+        } else {
+          console.error(`\n  Push failed: ${result.errorMessage || result.error || result.status}`);
+          await emit('status_unknown', { error_detail: `sync status ${result.status}` });
+          process.exit(1);
         }
-        pushed = landedPaths.size;
       } else {
-        console.error(`\n  Push failed: ${result.errorMessage || result.error || result.status}`);
-        await emit('status_unknown', { error_detail: `sync status ${result.status}` });
-        process.exit(1);
+        recordSyncResults(batch, result);
+        pushed = landedPaths.size;
       }
-    } else {
-      recordSyncResults(filesToPush, result);
-      pushed = landedPaths.size;
     }
   }
 
@@ -882,6 +1052,7 @@ async function pushAtris() {
 module.exports = {
   pushAtris,
   buildPushChangePlan,
+  buildPushUploadBatches,
   shouldRetrySyncIndividually,
   resolvePushSourceDir,
   canonicalWorkspaceRoot,
@@ -890,8 +1061,15 @@ module.exports = {
   isBusinessWorkspaceRoot,
   isMassDeletePlan,
   parsePushTimeoutSec,
+  parsePushArgv,
+  normalizePushScopePath,
+  resolveChangedScopePaths,
+  mergePushScopes,
   analyzePushSafety,
   isNestedWorkspacePollutionPath,
   isSyncReviewArtifactPath,
   renderPushSafetyBlock,
+  renderDriftBlock,
+  needsForceBroadWorkspaceConfirm,
+  promptConfirm,
 };