@indigoai-us/hq-cli 5.36.2 → 5.36.3

package/dist/commands/cloud.js

@@ -13,11 +13,11 @@
  *   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]="94a293c9-eb80-5100-a3e0-d64c93f7165c")}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]="856084be-3bbb-50cd-8e3b-1e19ea13f4fb")}catch(e){}}();
 import chalk from "chalk";
 import * as fs from "fs";
 import * as path from "path";
-import { share, sync, readJournal, getJournalPath, loadCachedTokens, VaultClient, computePersonalVaultPaths, } from "@indigoai-us/hq-cloud";
+import { share, sync, readJournal, getJournalPath, loadCachedTokens, VaultClient, computePersonalVaultPaths, PERSONAL_VAULT_JOURNAL_SLUG, } from "@indigoai-us/hq-cloud";
 import { DEFAULT_HQ_ROOT, ensureCognitoToken, buildVaultConfig, } from "../utils/cognito-session.js";
 import { emitNarrowHint, isStrictRefusal, resolveBannerLevel, } from "../lib/narrow-hint-banner.js";
 /**
@@ -89,13 +89,18 @@ export async function pullAll(options, deps) {
     }
     const personal = options.skipPersonal ? null : pickCanonicalPerson(persons);
     if (personal) {
+        // Canonical slug, NOT the literal "personal": that legacy slug is the
+        // companies/personal company's journal. hq-sync-runner moved the vault
+        // slot to PERSONAL_VAULT_JOURNAL_SLUG; hq-cli journaling the same vault
+        // under the old slug split the bookkeeping across two files — every CLI
+        // sync re-flagged the menubar's already-synced files as conflicts.
         plan.push({
             slug: "personal",
             syncOptions: {
                 company: personal.uid,
                 hqRoot: options.hqRoot,
                 personalMode: true,
-                journalSlug: "personal",
+                journalSlug: PERSONAL_VAULT_JOURNAL_SLUG,
                 ...(options.onConflict ? { onConflict: options.onConflict } : {}),
             },
         });
@@ -213,7 +218,7 @@ export async function pushAll(options, deps) {
                 hqRoot: options.hqRoot,
                 paths: computePersonalVaultPaths(options.hqRoot),
                 personalMode: true,
-                journalSlug: "personal",
+                journalSlug: PERSONAL_VAULT_JOURNAL_SLUG,
                 skipUnchanged: true,
                 propagateDeletes: true,
                 propagateDeletePolicy: resolveDeletePolicy(),
@@ -481,7 +486,7 @@ export function registerCloudCommands(program) {
                     getEntity: async () => null,
                 });
                 personalMode = true;
-                journalSlug = "personal";
+                journalSlug = PERSONAL_VAULT_JOURNAL_SLUG;
             }
             // Default paths. For `--personal` with no explicit paths, default to
             // the canonical personal-vault top-level scope so re-runs from a
@@ -833,7 +838,7 @@ async function runPullPersonal(hqRoot, onConflict) {
             vaultConfig,
             hqRoot,
             personalMode: true,
-            journalSlug: "personal",
+            journalSlug: PERSONAL_VAULT_JOURNAL_SLUG,
         });
         if (result.aborted) {
             console.log(chalk.yellow(`\n⚠ Pull aborted (${result.filesDownloaded} downloaded, ${result.filesSkipped} skipped, ${result.conflicts} conflicts)`));
@@ -954,7 +959,7 @@ async function runNowSingle(hqRoot, company, personal, message, onConflict, mode
                 getEntity: async () => null,
             });
             personalMode = true;
-            journalSlug = "personal";
+            journalSlug = PERSONAL_VAULT_JOURNAL_SLUG;
             pushPaths = computePersonalVaultPaths(hqRoot);
         }
         else {
@@ -1163,4 +1168,4 @@ function resolveUploadAuthorFromCache() {
     }
 }
 //# sourceMappingURL=cloud.js.map
-//# debugId=94a293c9-eb80-5100-a3e0-d64c93f7165c
+//# debugId=856084be-3bbb-50cd-8e3b-1e19ea13f4fb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.36.2",
+  "version": "5.36.3",
   "description": "HQ by Indigo management CLI \u2014 modules and cloud sync",
   "main": "dist/index.js",
   "bin": {
@@ -15,7 +15,7 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@indigoai-us/hq-cloud": "^6.2.2",
+    "@indigoai-us/hq-cloud": "^6.2.4",
     "@indigoai-us/hq-onboarding": "^0.1.0",
     "@sentry/node": "^10.49.0",
     "chalk": "^5.3.0",

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

@@ -140,7 +140,7 @@ describe("pullAll", () => {
     expect(sync.calls[2]).toMatchObject({
       company: "psn_alice",
       personalMode: true,
-      journalSlug: "personal",
+      journalSlug: "__hq_personal_vault__",
     });
 
     expect(result.attempted).toBe(3);
@@ -300,7 +300,7 @@ describe("pullAll", () => {
     expect(sync.calls).toHaveLength(1);
     expect(sync.calls[0].company).toBe("psn_old");
     expect(sync.calls[0].personalMode).toBe(true);
-    expect(sync.calls[0].journalSlug).toBe("personal");
+    expect(sync.calls[0].journalSlug).toBe("__hq_personal_vault__");
   });
 
   // ── 8/9/10. US-011 narrow-hint banner ─────────────────────────────────────
@@ -565,7 +565,7 @@ describe("pullAll", () => {
       "psn_alice",
     ]);
     expect(sync.calls[1].personalMode).toBe(true);
-    expect(sync.calls[1].journalSlug).toBe("personal");
+    expect(sync.calls[1].journalSlug).toBe("__hq_personal_vault__");
   });
 
   it("skipPersonal=true with empty memberships produces zero sync calls", async () => {

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

@@ -176,7 +176,7 @@ describe("pushAll", () => {
     expect(share.calls[2]).toMatchObject({
       company: "psn_alice",
       personalMode: true,
-      journalSlug: "personal",
+      journalSlug: "__hq_personal_vault__",
       skipUnchanged: true,
       propagateDeletes: true,
     });
@@ -346,7 +346,7 @@ describe("pushAll", () => {
     expect(share.calls).toHaveLength(1);
     expect(share.calls[0].company).toBe("psn_old");
     expect(share.calls[0].personalMode).toBe(true);
-    expect(share.calls[0].journalSlug).toBe("personal");
+    expect(share.calls[0].journalSlug).toBe("__hq_personal_vault__");
   });
 
   // ── 7. Aggregate counts include deletes ───────────────────────────────────
@@ -451,6 +451,6 @@ describe("pushAll", () => {
       "psn_alice",
     ]);
     expect(share.calls[1].personalMode).toBe(true);
-    expect(share.calls[1].journalSlug).toBe("personal");
+    expect(share.calls[1].journalSlug).toBe("__hq_personal_vault__");
   });
 });

package/src/commands/cloud.ts

@@ -26,6 +26,7 @@ import {
   loadCachedTokens,
   VaultClient,
   computePersonalVaultPaths,
+  PERSONAL_VAULT_JOURNAL_SLUG,
   type ConflictStrategy,
   type EntityContext,
   type MembershipSyncConfig,
@@ -301,13 +302,18 @@ export async function pullAll(
 
   const personal = options.skipPersonal ? null : pickCanonicalPerson(persons);
   if (personal) {
+    // Canonical slug, NOT the literal "personal": that legacy slug is the
+    // companies/personal company's journal. hq-sync-runner moved the vault
+    // slot to PERSONAL_VAULT_JOURNAL_SLUG; hq-cli journaling the same vault
+    // under the old slug split the bookkeeping across two files — every CLI
+    // sync re-flagged the menubar's already-synced files as conflicts.
     plan.push({
       slug: "personal",
       syncOptions: {
         company: personal.uid,
         hqRoot: options.hqRoot,
         personalMode: true,
-        journalSlug: "personal",
+        journalSlug: PERSONAL_VAULT_JOURNAL_SLUG,
         ...(options.onConflict ? { onConflict: options.onConflict } : {}),
       },
     });
@@ -442,7 +448,7 @@ export async function pushAll(
         hqRoot: options.hqRoot,
         paths: computePersonalVaultPaths(options.hqRoot),
         personalMode: true,
-        journalSlug: "personal",
+        journalSlug: PERSONAL_VAULT_JOURNAL_SLUG,
         skipUnchanged: true,
         propagateDeletes: true,
         propagateDeletePolicy: resolveDeletePolicy(),
@@ -821,7 +827,7 @@ export function registerCloudCommands(program: Command): void {
               getEntity: async () => null,
             });
             personalMode = true;
-            journalSlug = "personal";
+            journalSlug = PERSONAL_VAULT_JOURNAL_SLUG;
           }
 
           // Default paths. For `--personal` with no explicit paths, default to
@@ -1349,7 +1355,7 @@ async function runPullPersonal(
       vaultConfig,
       hqRoot,
       personalMode: true,
-      journalSlug: "personal",
+      journalSlug: PERSONAL_VAULT_JOURNAL_SLUG,
     });
 
     if (result.aborted) {
@@ -1510,7 +1516,7 @@ async function runNowSingle(
         getEntity: async () => null,
       });
       personalMode = true;
-      journalSlug = "personal";
+      journalSlug = PERSONAL_VAULT_JOURNAL_SLUG;
       pushPaths = computePersonalVaultPaths(hqRoot);
     } else {
       // For company targets we need a concrete slug to compute the push path.