@remits/remits-cli 0.1.95 → 0.1.97

package/README.md

@@ -63,7 +63,7 @@ remits-cli install --skills --overwrite true
 - `components clear` clears staged entries. Scope it with `--component-type` and/or `--component-id`. Component ids are type-local, so an id alone clears that one component when the id is staged in only one family; if the same id is staged across multiple families it returns an ambiguity error asking you to add `--component-type`. With no filter it clears every staged entry for the current branch; pass `--all` to force the full-branch wipe explicitly.
 - `components stage`, `components status`, and `components clear` print concise summaries by default. Add `--json` or `--verbose` to print the full server response. `components stage` separates local working-tree component deltas from the full materialized staging cache count.
 - `components sync` performs a server-side sync from the git remote into the Remits platform for the selected branch. It does not run local git commands. After a successful non-dry-run sync, the platform clears the branch/user staging scope so staged aliases cannot keep shadowing the newly synced DB rows.
-- On trunk, `components sync` performs the full repo-to-DB reconcile. On a non-trunk branch, it writes `ComponentVariant` overlays only and may refresh branch-local `account-info.json` for the subscribing account that initiated the sync. `--dry-run` is accepted only for non-trunk variant syncs and reports overrides/additions/tombstones without writing variants, caching the sync SHA, updating metadata, or clearing staging. Add `--summary` to dry-run output when you only need counts, removals/tombstones, errors, skipped items, and warnings. `--force-tombstones` is accepted only for non-trunk variant syncs and should be used only when missing trunk component files are intentional tombstone overrides.
+- On trunk, `components sync` performs the full repo-to-DB reconcile. On a non-trunk branch, it writes `ComponentVariant` overlays only and may refresh branch-local `account-info.json` / `account-hierarchy.json` for the subscribing account that initiated the sync. `--dry-run` is accepted only for non-trunk variant syncs and reports overrides/additions/tombstones without writing variants, caching the sync SHA, updating metadata, or clearing staging. Add `--summary` to dry-run output when you only need counts, removals/tombstones, errors, skipped items, and warnings. `--force-tombstones` is accepted only for non-trunk variant syncs and should be used only when missing trunk component files are intentional tombstone overrides.
 - `components commit` is a convenience wrapper that performs local git commit/push, then `components sync`, then local `git fetch`/`git pull --ff-only`.
 - `components sync` returns the post-sync branch SHA produced by the platform. `components commit` verifies that `origin/<branch>` and local `HEAD` both match that exact SHA after the final pull.
 - `components push` is deprecated and currently behaves the same as `components stage`.

package/index.js

@@ -2105,6 +2105,9 @@ async function syncComponentsCommand(flags) {
   const forceTombstones = flagEnabled(flags['force-tombstones']) || flagEnabled(flags.forceTombstones);
   const dryRun = flagEnabled(flags['dry-run']) || flagEnabled(flags.dryRun);
   const api = buildAxios(baseUrl, session.token);
+  const changedFromWorkingTree = changedComponentsFromWorkingTree(cwd);
+  const preflightRequested = syncPreflightRequested(flags);
+  const namesOnly = flagEnabled(flags['names-only']) || flagEnabled(flags.namesOnly);
 
   printProdDataBanner({
     dataMode,
@@ -2112,10 +2115,10 @@ async function syncComponentsCommand(flags) {
     baseUrl,
     operation: 'components sync (branch ' + branchName + ')',
     mutating: true,
-    dryRun
+    dryRun: dryRun || namesOnly
   });
 
-  const response = await loggedPost(api, cwd, '/cli/components', {
+  const syncPayload = {
     token: session.token,
     accountId,
     branchName,
@@ -2124,14 +2127,55 @@ async function syncComponentsCommand(flags) {
     dryRun,
     mode: 'sync',
     components: []
-  }).then((r) => r.data);
+  };
+
+  let preflightGate = null;
+  if (preflightRequested && !dryRun) {
+    const statusResponse = await loggedPost(api, cwd, '/cli/components', {
+      token: session.token,
+      accountId,
+      branchName,
+      dataMode,
+      mode: 'status'
+    }).then((r) => r.data);
+
+    const branchContext = statusResponse && statusResponse.branchContext;
+    if (!branchContext || branchContext.onTrunk) {
+      throw new Error('components sync safety preflight requires a non-trunk variant branch because trunk sync has no dry-run plan. Re-run without safety flags only if you intend a full trunk reconcile.');
+    }
+
+    const previewResponse = await loggedPost(api, cwd, '/cli/components', Object.assign({}, syncPayload, {
+      dryRun: true
+    })).then((r) => r.data);
+
+    if (!previewResponse.success) {
+      throw new Error(previewResponse.message || 'Server sync dry-run failed');
+    }
+
+    preflightGate = evaluateSyncGates(previewResponse, flags, changedFromWorkingTree);
+
+    if (namesOnly) {
+      printSessionResolutionWarning(sessionContext);
+      printResolvedBaseUrl(baseUrl);
+      console.log('Data mode:', previewResponse.dataMode || dataMode);
+      console.log('Mode:', 'sync dry-run');
+      console.log('Dry run: no variants were written and staging was not cleared.');
+      printSyncNames(previewResponse);
+      failOnSyncGate(preflightGate);
+      return previewResponse;
+    }
+
+    failOnSyncGate(preflightGate);
+  }
+
+  const response = await loggedPost(api, cwd, '/cli/components', syncPayload).then((r) => r.data);
 
   if (!response.success) {
     throw new Error(response.message || 'Server sync failed');
   }
 
   const summary = buildSyncSummary(response);
-  const gate = evaluateSyncGates(response, flags, changedComponentsFromWorkingTree(cwd));
+  const gate = preflightGate || evaluateSyncGates(response, flags, changedFromWorkingTree);
   summary.gates = gate.checks;
 
   if (flagEnabled(flags.json)) {
@@ -2147,7 +2191,7 @@ async function syncComponentsCommand(flags) {
   if (response.sync && response.sync.dryRun) {
     console.log('Dry run: no variants were written and staging was not cleared.');
   }
-  if (flagEnabled(flags['names-only']) || flagEnabled(flags.namesOnly)) {
+  if (namesOnly) {
     printSyncNames(response);
     failOnSyncGate(gate);
     return response;
@@ -2162,6 +2206,21 @@ async function syncComponentsCommand(flags) {
   return response;
 }
 
+function syncPreflightRequested(flags) {
+  return Boolean(
+    flagEnabled(flags['names-only']) ||
+    flagEnabled(flags.namesOnly) ||
+    flagEnabled(flags['changed-only']) ||
+    flagEnabled(flags.changedOnly) ||
+    flagEnabled(flags['fail-on-removed']) ||
+    flagEnabled(flags.failOnRemoved) ||
+    flagEnabled(flags['fail-on-errors']) ||
+    flagEnabled(flags.failOnErrors) ||
+    flags['expected-removed'] != null ||
+    flags.expectedRemoved != null
+  );
+}
+
 // One "type:id" / "type:name" token per planned write, so an agent can eyeball or diff the plan
 // without paging through the full server response.
 function syncPlanEntries(response) {
@@ -3809,6 +3868,7 @@ function buildRepoSnapshot(entry) {
     : null;
   const repoFiles = [
     { label: 'account-info.json', path: entry.accountInfoPath || path.join(directory, 'account-info.json'), mode: 'json' },
+    { label: 'account-hierarchy.json', path: path.join(directory, 'account-hierarchy.json'), mode: 'json' },
     { label: '.remits-cli/current-session.txt', path: localPaths.currentSessionFile, mode: 'text' },
     { label: '.remits-cli/tools/tools.json', path: path.join(localPaths.toolsDir, 'tools.json'), mode: 'json' },
     { label: '.remits-cli/session log (tail)', path: currentSessionLog, mode: 'tail' }
@@ -5371,10 +5431,10 @@ function printComponentsHelp(subcommand) {
     console.log('--summary prints compact counts, removals/tombstones, errors, skipped items, and warnings.');
     console.log('');
     console.log('Agent safety gates (each exits non-zero instead of printing a wall of JSON):');
-    console.log('  --changed-only            fail unless every planned write is a component this checkout changed');
-    console.log('  --names-only              print only "type id name" lines for the planned writes');
-    console.log('  --fail-on-removed         fail if the plan removes/tombstones anything');
-    console.log('  --fail-on-errors          fail if the server reported any per-component sync error');
+    console.log('  --changed-only            dry-run first; fail unless every planned write is a component this checkout changed');
+    console.log('  --names-only              dry-run first; print only "type id name" lines and write nothing');
+    console.log('  --fail-on-removed         dry-run first; fail if the plan removes/tombstones anything');
+    console.log('  --fail-on-errors          dry-run first; fail if the server reported any per-component sync error');
     console.log('  --expected-removed t:id   whitelist an intended removal; repeatable/comma-delimited.');
     console.log('                            Implies --fail-on-removed, so any OTHER removal fails.');
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remits/remits-cli",
-  "version": "0.1.95",
+  "version": "0.1.97",
   "description": "Local CLI for auth, component sync, and live test execution against Remits",
   "license": "MIT",
   "private": false,