@indigoai-us/hq-cli 5.19.0 → 5.20.0

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [5.20.0] — 2026-05-21
+
+### Added
+
+- **`hq sync {push,pull,now} --all --no-personal`** — skip the
+  canonical-person leg of the `--all` fanout (companies-only sync).
+  Mirrors the upstream `hq-sync-runner --skip-personal` flag added in
+  `@indigoai-us/hq-cloud@5.25.0`. Wired so the AppBar HQ Sync menubar
+  can drop personal sync via a toggle, and so CLI users can opt out
+  one-off. Plumbed through `pullAll` / `pushAll` / `runNowAll` via a
+  new `skipPersonal` option; outside `--all` mode the flag is a no-op.
+- Bumps `@indigoai-us/hq-cloud` to `~5.25.0` (currency-gated personal-
+  vault default exclusions + skip-personal CLI/env surface).
+
 ## [5.18.3] — 2026-05-21
 
 ### Fixed

package/dist/commands/cloud.d.ts

@@ -77,6 +77,17 @@ export interface PullAllOptions {
      * legacy behavior for this run via `--mode-all`.
      */
     modeAllOverride?: boolean;
+    /**
+     * When `true`, skip the canonical-person-entity leg entirely — the
+     * fanout only visits the caller's company memberships. Mirrors the
+     * `--skip-personal` flag and `HQ_SYNC_SKIP_PERSONAL` env var that
+     * `@indigoai-us/hq-cloud`'s `sync-runner` exposes in `--companies`
+     * mode (see hq-cloud 5.25.0 `resolveSkipPersonal`). Surfaced on the
+     * CLI as `hq sync pull --all --no-personal` so the AppBar HQ Sync
+     * menubar toggle (and CLI users opting out one-off) can drop the
+     * personal vault from the run without touching the rest of the plan.
+     */
+    skipPersonal?: boolean;
 }
 export interface PullAllRow {
     slug: string;
@@ -110,6 +121,13 @@ export interface PushAllOptions {
     hqRoot: string;
     onConflict?: ConflictStrategy;
     message?: string;
+    /**
+     * When `true`, skip the canonical-person-entity leg entirely — the
+     * fanout only visits the caller's company memberships. Symmetric with
+     * `PullAllOptions.skipPersonal`; surfaced on the CLI as
+     * `hq sync push --all --no-personal`.
+     */
+    skipPersonal?: boolean;
 }
 export interface PushAllRow {
     slug: string;

package/dist/commands/cloud.js

@@ -13,7 +13,7 @@
  *   hq sync status            — show local journal summary
  */
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="f6dfc1de-3284-575a-b790-3dc10db2707c")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="bdaf154f-b17d-5482-9e4d-feaebe606a1b")}catch(e){}}();
 import chalk from "chalk";
 import * as fs from "fs";
 import * as path from "path";
@@ -60,7 +60,7 @@ export async function pullAll(options, deps) {
             },
         });
     }
-    const personal = pickCanonicalPerson(persons);
+    const personal = options.skipPersonal ? null : pickCanonicalPerson(persons);
     if (personal) {
         plan.push({
             slug: "personal",
@@ -176,7 +176,7 @@ export async function pushAll(options, deps) {
             },
         });
     }
-    const personal = pickCanonicalPerson(persons);
+    const personal = options.skipPersonal ? null : pickCanonicalPerson(persons);
     if (personal) {
         plan.push({
             slug: "personal",
@@ -354,6 +354,12 @@ export function registerCloudCommands(program) {
         "every top-level entry under <hq-root> minus the excluded set " +
         "(.git, companies, repos, workspace) — same scope as `--all`'s " +
         "personal slot. Mutually exclusive with --company and --all.")
+        .option("--no-personal", "In `--all` mode, skip the canonical-person leg of the fanout — " +
+        "only push to the caller's company memberships. Mirrors the " +
+        "upstream `hq-sync-runner --skip-personal` flag (hq-cloud 5.25.0); " +
+        "wired so the AppBar HQ Sync menubar can drop personal sync via " +
+        "a toggle, and so CLI users can opt out one-off. Ignored outside " +
+        "`--all`.")
         .action(async (paths, options) => {
         try {
             assertSingleSelector(options, "push");
@@ -376,7 +382,13 @@ export function registerCloudCommands(program) {
                     "target instead.");
                 process.exit(1);
             }
-            await runPushAll(options.hqRoot, options.message, options.onConflict);
+            // `options.personal === false` happens when the user passed
+            // `--no-personal` (Commander's auto-negation of the `--personal`
+            // selector). In `--all` mode that means "skip the personal leg of
+            // the fanout" — wired through to `pushAll.skipPersonal`. Outside
+            // `--all` the flag has no effect (logged above as part of the
+            // option's help text).
+            await runPushAll(options.hqRoot, options.message, options.onConflict, options.personal === false);
             return;
         }
         const jsonMode = options.json === true;
@@ -531,6 +543,10 @@ export function registerCloudCommands(program) {
         "(no companies/<slug>/ prefix). Resolves the person UID automatically " +
         "from the cached Cognito session. Mutually exclusive with --company " +
         "and --all.")
+        .option("--no-personal", "In `--all` mode, skip the canonical-person leg of the fanout — " +
+        "only pull the caller's company memberships. Mirrors the upstream " +
+        "`hq-sync-runner --skip-personal` flag (hq-cloud 5.25.0). Ignored " +
+        "outside `--all`.")
         .option("--mode-all", "US-011: opt out of the strict narrow-hint refusal for this run. " +
         "Has no effect today (default narrow-hint level is 'hint'); " +
         "wired so future hq-core-staging releases can flip the default to " +
@@ -544,7 +560,10 @@ export function registerCloudCommands(program) {
             process.exit(1);
         }
         if (options.all) {
-            await runPullAll(options.hqRoot, options.onConflict, options.modeAll === true);
+            // `options.personal === false` is Commander's auto-negation of
+            // `--personal`; in `--all` mode that means "drop the personal
+            // leg from the fanout" (see `--no-personal` option above).
+            await runPullAll(options.hqRoot, options.onConflict, options.modeAll === true, options.personal === false);
             return;
         }
         if (options.personal) {
@@ -667,6 +686,10 @@ export function registerCloudCommands(program) {
         "--personal.")
         .option("--personal", "Sync the caller's canonical personal vault bidirectionally. " +
         "Mutually exclusive with --company and --all.")
+        .option("--no-personal", "In `--all` mode, skip the canonical-person leg of both the push " +
+        "and pull fanouts — only sync the caller's company memberships. " +
+        "Mirrors the upstream `hq-sync-runner --skip-personal` flag " +
+        "(hq-cloud 5.25.0). Ignored outside `--all`.")
         .option("--mode-all", "US-011: opt out of the strict narrow-hint refusal for this run. " +
         "No-op today; wired so future hq-core-staging releases can flip " +
         "the default narrow-hint level to 'strict'.")
@@ -674,7 +697,11 @@ export function registerCloudCommands(program) {
         try {
             assertSingleSelector(options, "now");
             if (options.all) {
-                await runNowAll(options.hqRoot, options.message, options.onConflict, options.modeAll === true);
+                // `options.personal === false` is Commander's auto-negation
+                // of `--personal`; in `--all` mode that means "drop the
+                // personal leg from both legs of the bidirectional fanout"
+                // (see `--no-personal` option above).
+                await runNowAll(options.hqRoot, options.message, options.onConflict, options.modeAll === true, options.personal === false);
                 return;
             }
             await runNowSingle(options.hqRoot, options.company, options.personal === true, options.message, options.onConflict, options.modeAll === true);
@@ -685,10 +712,14 @@ export function registerCloudCommands(program) {
         }
     });
 }
-async function runPullAll(hqRoot, onConflict, modeAllOverride) {
+async function runPullAll(hqRoot, onConflict, modeAllOverride, skipPersonal) {
     console.log(chalk.bold("\nHQ Sync — Pull (all)"));
     console.log(`  HQ root:  ${hqRoot}`);
-    console.log(`  Strategy: ${onConflict ?? "(interactive)"}\n`);
+    console.log(`  Strategy: ${onConflict ?? "(interactive)"}`);
+    if (skipPersonal) {
+        console.log(`  Personal: skipped (--no-personal)`);
+    }
+    console.log("");
     let result;
     try {
         const accessToken = await ensureCognitoToken();
@@ -712,6 +743,7 @@ async function runPullAll(hqRoot, onConflict, modeAllOverride) {
             ...(onConflict ? { onConflict } : {}),
             narrowHintLevel: resolveBannerLevel(),
             ...(modeAllOverride ? { modeAllOverride: true } : {}),
+            ...(skipPersonal ? { skipPersonal: true } : {}),
         }, {
             vaultClient: adapter,
             sync: (opts) => sync({
@@ -785,10 +817,14 @@ async function runPullPersonal(hqRoot, onConflict) {
         process.exit(1);
     }
 }
-async function runPushAll(hqRoot, message, onConflict) {
+async function runPushAll(hqRoot, message, onConflict, skipPersonal) {
     console.log(chalk.bold("\nHQ Sync — Push (all)"));
     console.log(`  HQ root:  ${hqRoot}`);
-    console.log(`  Strategy: ${onConflict ?? "(interactive)"}\n`);
+    console.log(`  Strategy: ${onConflict ?? "(interactive)"}`);
+    if (skipPersonal) {
+        console.log(`  Personal: skipped (--no-personal)`);
+    }
+    console.log("");
     let result;
     try {
         const accessToken = await ensureCognitoToken();
@@ -811,6 +847,7 @@ async function runPushAll(hqRoot, message, onConflict) {
             hqRoot,
             ...(onConflict ? { onConflict } : {}),
             ...(message ? { message } : {}),
+            ...(skipPersonal ? { skipPersonal: true } : {}),
         }, {
             vaultClient: adapter,
             share: (opts) => share({
@@ -1002,20 +1039,24 @@ async function runNowSingle(hqRoot, company, personal, message, onConflict, mode
         process.exit(1);
     }
 }
-async function runNowAll(hqRoot, message, onConflict, modeAllOverride) {
+async function runNowAll(hqRoot, message, onConflict, modeAllOverride, skipPersonal) {
     console.log(chalk.bold("\nHQ Sync — Now (all)"));
     console.log(`  HQ root:  ${hqRoot}`);
-    console.log(`  Strategy: ${onConflict ?? "(interactive)"}\n`);
+    console.log(`  Strategy: ${onConflict ?? "(interactive)"}`);
+    if (skipPersonal) {
+        console.log(`  Personal: skipped (--no-personal)`);
+    }
+    console.log("");
     // Push first (matches runner), then pull. Re-uses the per-leg orchestrators
     // so the per-target rendering, error isolation, and exit codes are
     // identical to running `push --all` then `pull --all` back-to-back.
     console.log(chalk.dim("→ push --all"));
-    await runPushAll(hqRoot, message, onConflict);
+    await runPushAll(hqRoot, message, onConflict, skipPersonal);
     console.log(chalk.dim("\n→ pull --all"));
     // US-011: forward --mode-all so the strict refusal applies to the
     // pull leg (push doesn't need a narrow-hint — the narrow ritual is
     // pull-side).
-    await runPullAll(hqRoot, onConflict, modeAllOverride);
+    await runPullAll(hqRoot, onConflict, modeAllOverride, skipPersonal);
 }
 /**
  * Best-effort read of the active company slug from `<hqRoot>/.hq/config.json`.
@@ -1089,4 +1130,4 @@ function resolveUploadAuthorFromCache() {
     }
 }
 //# sourceMappingURL=cloud.js.map
-//# debugId=f6dfc1de-3284-575a-b790-3dc10db2707c
+//# debugId=bdaf154f-b17d-5482-9e4d-feaebe606a1b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.19.0",
+  "version": "5.20.0",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {
@@ -15,7 +15,7 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@indigoai-us/hq-cloud": "^5.23.0",
+    "@indigoai-us/hq-cloud": "~5.25.0",
     "@indigoai-us/hq-onboarding": "^0.1.0",
     "@sentry/node": "^10.49.0",
     "chalk": "^5.3.0",

package/src/commands/cloud.pull-all.test.ts

@@ -493,4 +493,102 @@ describe("pullAll", () => {
       expect(call.hqRoot).toBe("/Users/me/scratch/hq");
     }
   });
+
+  // ── 11. skipPersonal — fanout omits the canonical-person leg ──────────────
+  //
+  // Mirrors the upstream `hq-sync-runner --skip-personal` flag (hq-cloud
+  // 5.25.0) plumbed through to the CLI as `hq sync pull --all --no-personal`.
+  // When the option is true, `pullAll` must (a) skip the canonical-person
+  // bucket even when one exists, and (b) leave companies untouched.
+
+  it("skipPersonal=true omits the personal leg even when a person entity exists", async () => {
+    const vaultClient = makeVaultClient({
+      memberships: [
+        { companyUid: "cmp_acme" },
+        { companyUid: "cmp_globex" },
+      ],
+      persons: [
+        {
+          uid: "psn_alice",
+          type: "person",
+          slug: "alice",
+          bucketName: "hq-vault-psn-alice",
+          createdAt: "2026-01-01T00:00:00Z",
+        },
+      ],
+      entitiesBySlug: {
+        cmp_acme: { slug: "acme" },
+        cmp_globex: { slug: "globex" },
+      },
+    });
+    const sync = makeSyncSpy();
+
+    const result = await pullAll(
+      { hqRoot: "/tmp/hq", skipPersonal: true },
+      { vaultClient, sync: sync.fn },
+    );
+
+    expect(sync.calls.map((c) => c.company)).toEqual([
+      "cmp_acme",
+      "cmp_globex",
+    ]);
+    for (const call of sync.calls) {
+      expect(call.personalMode).toBeUndefined();
+      expect(call.journalSlug).toBeUndefined();
+    }
+    expect(result.attempted).toBe(2);
+    expect(result.perCompany.map((r) => r.slug)).toEqual(["acme", "globex"]);
+  });
+
+  it("skipPersonal omitted/false keeps the personal leg in the fanout (baseline)", async () => {
+    const vaultClient = makeVaultClient({
+      memberships: [{ companyUid: "cmp_acme" }],
+      persons: [
+        {
+          uid: "psn_alice",
+          type: "person",
+          slug: "alice",
+          createdAt: "2026-01-01T00:00:00Z",
+        },
+      ],
+      entitiesBySlug: { cmp_acme: { slug: "acme" } },
+    });
+    const sync = makeSyncSpy();
+
+    await pullAll(
+      { hqRoot: "/tmp/hq" },
+      { vaultClient, sync: sync.fn },
+    );
+
+    expect(sync.calls.map((c) => c.company)).toEqual([
+      "cmp_acme",
+      "psn_alice",
+    ]);
+    expect(sync.calls[1].personalMode).toBe(true);
+    expect(sync.calls[1].journalSlug).toBe("personal");
+  });
+
+  it("skipPersonal=true with empty memberships produces zero sync calls", async () => {
+    const vaultClient = makeVaultClient({
+      memberships: [],
+      persons: [
+        {
+          uid: "psn_alice",
+          type: "person",
+          slug: "alice",
+          createdAt: "2026-01-01T00:00:00Z",
+        },
+      ],
+    });
+    const sync = makeSyncSpy();
+
+    const result = await pullAll(
+      { hqRoot: "/tmp/hq", skipPersonal: true },
+      { vaultClient, sync: sync.fn },
+    );
+
+    expect(sync.calls).toEqual([]);
+    expect(result.attempted).toBe(0);
+    expect(result.perCompany).toEqual([]);
+  });
 });

package/src/commands/cloud.push-all.test.ts

@@ -378,4 +378,79 @@ describe("pushAll", () => {
     expect(result.filesUploaded).toBe(3);
     expect(result.filesDeleted).toBe(4);
   });
+
+  // ── skipPersonal — fanout omits the canonical-person leg ──────────────────
+  //
+  // Symmetric with the `pullAll` skipPersonal coverage in
+  // `cloud.pull-all.test.ts`. Wired through from `hq sync push --all
+  // --no-personal` (Commander's `--no-personal` is the auto-negation of the
+  // `--personal` single-target selector). Verifies (a) the personal leg is
+  // dropped even when a canonical person exists, and (b) the baseline
+  // behavior — no flag → personal stays in the plan.
+
+  it("skipPersonal=true omits the personal leg even when a person entity exists", async () => {
+    const hqRoot = makeHqRoot([".git", "companies", "repos", "workspace"]);
+    const vaultClient = makeVaultClient({
+      memberships: [
+        { companyUid: "cmp_acme" },
+        { companyUid: "cmp_globex" },
+      ],
+      persons: [
+        {
+          uid: "psn_alice",
+          type: "person",
+          slug: "alice",
+          bucketName: "hq-vault-psn-alice",
+          createdAt: "2026-01-01T00:00:00Z",
+        },
+      ],
+      entitiesBySlug: {
+        cmp_acme: { slug: "acme" },
+        cmp_globex: { slug: "globex" },
+      },
+    });
+    const share = makeShareSpy();
+
+    const result = await pushAll(
+      { hqRoot, skipPersonal: true },
+      { vaultClient, share: share.fn },
+    );
+
+    expect(share.calls.map((c) => c.company)).toEqual([
+      "cmp_acme",
+      "cmp_globex",
+    ]);
+    for (const call of share.calls) {
+      expect(call.personalMode).toBeUndefined();
+      expect(call.journalSlug).toBeUndefined();
+    }
+    expect(result.attempted).toBe(2);
+    expect(result.perCompany.map((r) => r.slug)).toEqual(["acme", "globex"]);
+  });
+
+  it("skipPersonal omitted keeps the personal leg in the plan (baseline)", async () => {
+    const hqRoot = makeHqRoot([".git", "companies", "repos", "workspace"]);
+    const vaultClient = makeVaultClient({
+      memberships: [{ companyUid: "cmp_acme" }],
+      persons: [
+        {
+          uid: "psn_alice",
+          type: "person",
+          slug: "alice",
+          createdAt: "2026-01-01T00:00:00Z",
+        },
+      ],
+      entitiesBySlug: { cmp_acme: { slug: "acme" } },
+    });
+    const share = makeShareSpy();
+
+    await pushAll({ hqRoot }, { vaultClient, share: share.fn });
+
+    expect(share.calls.map((c) => c.company)).toEqual([
+      "cmp_acme",
+      "psn_alice",
+    ]);
+    expect(share.calls[1].personalMode).toBe(true);
+    expect(share.calls[1].journalSlug).toBe("personal");
+  });
 });

package/src/commands/cloud.ts

@@ -125,6 +125,17 @@ export interface PullAllOptions {
    * legacy behavior for this run via `--mode-all`.
    */
   modeAllOverride?: boolean;
+  /**
+   * When `true`, skip the canonical-person-entity leg entirely — the
+   * fanout only visits the caller's company memberships. Mirrors the
+   * `--skip-personal` flag and `HQ_SYNC_SKIP_PERSONAL` env var that
+   * `@indigoai-us/hq-cloud`'s `sync-runner` exposes in `--companies`
+   * mode (see hq-cloud 5.25.0 `resolveSkipPersonal`). Surfaced on the
+   * CLI as `hq sync pull --all --no-personal` so the AppBar HQ Sync
+   * menubar toggle (and CLI users opting out one-off) can drop the
+   * personal vault from the run without touching the rest of the plan.
+   */
+  skipPersonal?: boolean;
 }
 
 export interface PullAllRow {
@@ -173,6 +184,13 @@ export interface PushAllOptions {
   hqRoot: string;
   onConflict?: ConflictStrategy;
   message?: string;
+  /**
+   * When `true`, skip the canonical-person-entity leg entirely — the
+   * fanout only visits the caller's company memberships. Symmetric with
+   * `PullAllOptions.skipPersonal`; surfaced on the CLI as
+   * `hq sync push --all --no-personal`.
+   */
+  skipPersonal?: boolean;
 }
 
 export interface PushAllRow {
@@ -252,7 +270,7 @@ export async function pullAll(
     });
   }
 
-  const personal = pickCanonicalPerson(persons);
+  const personal = options.skipPersonal ? null : pickCanonicalPerson(persons);
   if (personal) {
     plan.push({
       slug: "personal",
@@ -385,7 +403,7 @@ export async function pushAll(
     });
   }
 
-  const personal = pickCanonicalPerson(persons);
+  const personal = options.skipPersonal ? null : pickCanonicalPerson(persons);
   if (personal) {
     plan.push({
       slug: "personal",
@@ -637,6 +655,15 @@ export function registerCloudCommands(program: Command): void {
         "(.git, companies, repos, workspace) — same scope as `--all`'s " +
         "personal slot. Mutually exclusive with --company and --all.",
     )
+    .option(
+      "--no-personal",
+      "In `--all` mode, skip the canonical-person leg of the fanout — " +
+        "only push to the caller's company memberships. Mirrors the " +
+        "upstream `hq-sync-runner --skip-personal` flag (hq-cloud 5.25.0); " +
+        "wired so the AppBar HQ Sync menubar can drop personal sync via " +
+        "a toggle, and so CLI users can opt out one-off. Ignored outside " +
+        "`--all`.",
+    )
     .action(
       async (
         paths: string[],
@@ -678,10 +705,17 @@ export function registerCloudCommands(program: Command): void {
             );
             process.exit(1);
           }
+          // `options.personal === false` happens when the user passed
+          // `--no-personal` (Commander's auto-negation of the `--personal`
+          // selector). In `--all` mode that means "skip the personal leg of
+          // the fanout" — wired through to `pushAll.skipPersonal`. Outside
+          // `--all` the flag has no effect (logged above as part of the
+          // option's help text).
           await runPushAll(
             options.hqRoot,
             options.message,
             options.onConflict,
+            options.personal === false,
           );
           return;
         }
@@ -885,6 +919,13 @@ export function registerCloudCommands(program: Command): void {
         "from the cached Cognito session. Mutually exclusive with --company " +
         "and --all.",
     )
+    .option(
+      "--no-personal",
+      "In `--all` mode, skip the canonical-person leg of the fanout — " +
+        "only pull the caller's company memberships. Mirrors the upstream " +
+        "`hq-sync-runner --skip-personal` flag (hq-cloud 5.25.0). Ignored " +
+        "outside `--all`.",
+    )
     .option(
       "--mode-all",
       "US-011: opt out of the strict narrow-hint refusal for this run. " +
@@ -911,10 +952,14 @@ export function registerCloudCommands(program: Command): void {
           process.exit(1);
         }
         if (options.all) {
+          // `options.personal === false` is Commander's auto-negation of
+          // `--personal`; in `--all` mode that means "drop the personal
+          // leg from the fanout" (see `--no-personal` option above).
           await runPullAll(
             options.hqRoot,
             options.onConflict,
             options.modeAll === true,
+            options.personal === false,
           );
           return;
         }
@@ -1100,6 +1145,13 @@ export function registerCloudCommands(program: Command): void {
       "Sync the caller's canonical personal vault bidirectionally. " +
         "Mutually exclusive with --company and --all.",
     )
+    .option(
+      "--no-personal",
+      "In `--all` mode, skip the canonical-person leg of both the push " +
+        "and pull fanouts — only sync the caller's company memberships. " +
+        "Mirrors the upstream `hq-sync-runner --skip-personal` flag " +
+        "(hq-cloud 5.25.0). Ignored outside `--all`.",
+    )
     .option(
       "--mode-all",
       "US-011: opt out of the strict narrow-hint refusal for this run. " +
@@ -1119,11 +1171,16 @@ export function registerCloudCommands(program: Command): void {
         try {
           assertSingleSelector(options, "now");
           if (options.all) {
+            // `options.personal === false` is Commander's auto-negation
+            // of `--personal`; in `--all` mode that means "drop the
+            // personal leg from both legs of the bidirectional fanout"
+            // (see `--no-personal` option above).
             await runNowAll(
               options.hqRoot,
               options.message,
               options.onConflict,
               options.modeAll === true,
+              options.personal === false,
             );
             return;
           }
@@ -1150,10 +1207,15 @@ async function runPullAll(
   hqRoot: string,
   onConflict?: ConflictStrategy,
   modeAllOverride?: boolean,
+  skipPersonal?: boolean,
 ): Promise<void> {
   console.log(chalk.bold("\nHQ Sync — Pull (all)"));
   console.log(`  HQ root:  ${hqRoot}`);
-  console.log(`  Strategy: ${onConflict ?? "(interactive)"}\n`);
+  console.log(`  Strategy: ${onConflict ?? "(interactive)"}`);
+  if (skipPersonal) {
+    console.log(`  Personal: skipped (--no-personal)`);
+  }
+  console.log("");
 
   let result: PullAllResult;
   try {
@@ -1181,6 +1243,7 @@ async function runPullAll(
         ...(onConflict ? { onConflict } : {}),
         narrowHintLevel: resolveBannerLevel(),
         ...(modeAllOverride ? { modeAllOverride: true } : {}),
+        ...(skipPersonal ? { skipPersonal: true } : {}),
       },
       {
         vaultClient: adapter,
@@ -1285,10 +1348,15 @@ async function runPushAll(
   hqRoot: string,
   message?: string,
   onConflict?: ConflictStrategy,
+  skipPersonal?: boolean,
 ): Promise<void> {
   console.log(chalk.bold("\nHQ Sync — Push (all)"));
   console.log(`  HQ root:  ${hqRoot}`);
-  console.log(`  Strategy: ${onConflict ?? "(interactive)"}\n`);
+  console.log(`  Strategy: ${onConflict ?? "(interactive)"}`);
+  if (skipPersonal) {
+    console.log(`  Personal: skipped (--no-personal)`);
+  }
+  console.log("");
 
   let result: PushAllResult;
   try {
@@ -1314,6 +1382,7 @@ async function runPushAll(
         hqRoot,
         ...(onConflict ? { onConflict } : {}),
         ...(message ? { message } : {}),
+        ...(skipPersonal ? { skipPersonal: true } : {}),
       },
       {
         vaultClient: adapter,
@@ -1552,21 +1621,26 @@ async function runNowAll(
   message?: string,
   onConflict?: ConflictStrategy,
   modeAllOverride?: boolean,
+  skipPersonal?: boolean,
 ): Promise<void> {
   console.log(chalk.bold("\nHQ Sync — Now (all)"));
   console.log(`  HQ root:  ${hqRoot}`);
-  console.log(`  Strategy: ${onConflict ?? "(interactive)"}\n`);
+  console.log(`  Strategy: ${onConflict ?? "(interactive)"}`);
+  if (skipPersonal) {
+    console.log(`  Personal: skipped (--no-personal)`);
+  }
+  console.log("");
 
   // Push first (matches runner), then pull. Re-uses the per-leg orchestrators
   // so the per-target rendering, error isolation, and exit codes are
   // identical to running `push --all` then `pull --all` back-to-back.
   console.log(chalk.dim("→ push --all"));
-  await runPushAll(hqRoot, message, onConflict);
+  await runPushAll(hqRoot, message, onConflict, skipPersonal);
   console.log(chalk.dim("\n→ pull --all"));
   // US-011: forward --mode-all so the strict refusal applies to the
   // pull leg (push doesn't need a narrow-hint — the narrow ritual is
   // pull-side).
-  await runPullAll(hqRoot, onConflict, modeAllOverride);
+  await runPullAll(hqRoot, onConflict, modeAllOverride, skipPersonal);
 }
 
 /**