@indigoai-us/hq-cloud 6.14.22 → 6.14.24

package/dist/cli/sync.d.ts

@@ -217,6 +217,31 @@ export type SyncProgressEvent = {
     type: "scope-excluded";
     count: number;
     samplePaths: string[];
+} | {
+    /**
+     * Emitted at most ONCE per PULL leg when the leg ran under a
+     * membership-scoped `syncMode` (`"shared"` or `"custom"` — never `"all"`)
+     * AND one or more remote keys were skipped as out-of-scope
+     * (`filesOutOfScope > 0`). This turns the silent shared-vs-all gap into a
+     * VISIBLE, actionable surface. The reporter of feedback_d2082110 lost
+     * files across devices precisely because four memberships defaulted to
+     * `shared` rather than `all`, so not all vault content materialized on the
+     * second device — and nothing told them; they had to notice the gap and
+     * flip each membership to `all` by hand. This event names the gap and the
+     * lever (raise the membership's access level to `all`) so FULL
+     * materialization is a deliberate, visible choice rather than a silent
+     * omission.
+     *
+     * `count` is the number of remote keys skipped as out-of-scope on this
+     * leg; `samplePaths` carries up to 10 company-relative keys for display;
+     * `syncMode` is the active scoped mode. Distinct from the push-side
+     * `scope-excluded` (which reports what a grantee could not PUSH). Not
+     * emitted in `all` mode or when `count === 0` — no gap, no noise.
+     */
+    type: "scope-materialization-gap";
+    count: number;
+    samplePaths: string[];
+    syncMode: SyncMode;
 } | {
     /**
      * Emitted at most ONCE per `share()` push leg when the base ignore
@@ -282,6 +307,26 @@ export type SyncProgressEvent = {
     path: string;
     /** Server-compatible invalid-key code, such as INVALID_KEY_CONTROL_CHARS. */
     errorCode?: string;
+} | {
+    /**
+     * Emitted by the PULL leg once per remote key skipped because its
+     * spelling percent-decodes to the same logical path as an
+     * already-journaled key with a DIFFERENT spelling — the mixed-version
+     * amplifier (a pre-codec peer minting `%3A`/`%253A` twins of a
+     * canonical `:` key). Downloading the twin would materialize a junk
+     * local dir and fork the journal into a second key family for one
+     * logical path, so the established spelling wins and the twin is
+     * skipped. Like `skip-size-limit`, this is deliberately NOT
+     * `type: "error"` (policy hq-sync-deliberate-skip-not-fatal-error-exit2:
+     * a recurring benign per-file skip emitted as an error lands in the
+     * runner's `errors[]`, forces exit 2 on every pass, and the menubar
+     * Sentry-alerts each time). The US-003 vault doctor is the cleanup
+     * path that collapses the junk family itself.
+     */
+    type: "skip-junk-key-spelling";
+    path: string;
+    /** The already-journaled spelling that owns this logical path. */
+    journaledKey: string;
 };
 export interface SyncOptions {
     /** Company slug or UID (defaults to active company from config) */
@@ -526,4 +571,13 @@ export declare function reportNewFilesToNotify(vaultConfig: VaultServiceConfig,
  * Sync (pull) all allowed files from the entity vault.
  */
 export declare function sync(options: SyncOptions): Promise<SyncResult>;
+/**
+ * win32 only: true when an existing local symlink's TARGET exists but the
+ * link cannot be traversed as that target's type — the file-flavor-link-at-
+ * a-directory shape minted while the target was absent (or by an older
+ * client). A dangling link is NOT broken-flavored (there is nothing to
+ * repair until the target appears). POSIX links are flavorless: always
+ * false off win32.
+ */
+export declare function win32SymlinkFlavorBroken(localPath: string, win32?: boolean): boolean;
 //# sourceMappingURL=sync.d.ts.map

package/dist/cli/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/cli/sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/cli/sync.ts"],"names":[],"mappings":"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"}

package/dist/cli/sync.js

@@ -10,7 +10,8 @@ import { VaultAuthError, VaultClient } from "../vault-client.js";
 import { emitCloudTelemetry, } from "../telemetry-events.js";
 import { resolveEntityContext, isExpiringSoon, refreshEntityContext } from "../context.js";
 import { createSyncProgressRecorder } from "../sync-progress.js";
-import { localPathForVaultKey, vaultKeyForLocalPath } from "../local-path-codec.js";
+import { canonicalVaultKeySpelling, localPathForVaultKey, vaultKeyForLocalPath, } from "../local-path-codec.js";
+import { SKILLS_KEY_PREFIX } from "./doctor.js";
 import { downloadFile, listRemoteFiles, headRemoteFile, primeObjectTransport, toPosixKey, classifyVaultKey, DanglingSymlinkParentError, } from "../s3.js";
 import { readJournal, writeJournal, hashFile, hashSymlinkTarget, updateEntry, removeEntry, getEntry, normalizeEtag, migrateToV2, gcTombstones, isTombstone, tombstoneEntry, lastPullRecord, appendPullRecord, generatePullId, PERSONAL_VAULT_JOURNAL_SLUG, migratePersonalVaultJournal, } from "../journal.js";
 import { isGeneratedCoreMirrorKey, PERSONAL_VAULT_MANIFEST_KEY, } from "../personal-vault.js";
@@ -195,6 +196,7 @@ async function syncWithOperationLockHeld(options) {
     await emitAndReportNewFiles(run, plan);
     await verifyPlannedJournalTombstones(run, plan);
     executeJournalTombstoneDeletes(run, plan, counters);
+    emitScopeMaterializationGap(run, plan, counters);
     return finalizePullRun(run, plan, scopeRun, counters);
 }
 async function buildPullContext(options) {
@@ -434,7 +436,8 @@ async function executeConflictExecutor(run, plan, scopeRun, counters) {
             item.action === "skip-personal-mode" ||
             item.action === "skip-unchanged" ||
             item.action === "skip-local-only" ||
-            item.action === "skip-stale-overlay-marker") {
+            item.action === "skip-stale-overlay-marker" ||
+            item.action === "skip-overlay-marker-with-children") {
             counters.filesSkipped++;
             continue;
         }
@@ -445,6 +448,18 @@ async function executeConflictExecutor(run, plan, scopeRun, counters) {
             counters.filesOutOfScope++;
             continue;
         }
+        if (item.action === "skip-junk-key-spelling") {
+            // Deliberate, recoverable skip — counted as skipped and surfaced via a
+            // dedicated warning event, never `type: "error"` (see the event doc /
+            // policy hq-sync-deliberate-skip-not-fatal-error-exit2).
+            counters.filesSkipped++;
+            run.emit({
+                type: "skip-junk-key-spelling",
+                path: item.remoteFile.key,
+                journaledKey: item.journaledKey,
+            });
+            continue;
+        }
         if (item.action === "tombstone-delete") {
             executeFileTombstoneDelete(run, item, counters);
             continue;
@@ -971,6 +986,34 @@ function finalizePullRun(run, plan, scopeRun, counters) {
         changedPaths: [...counters.changedPaths, ...scopeRun.changedPaths],
     };
 }
+/**
+ * Surface the shared-vs-all materialization gap (feedback_d2082110). When a
+ * pull leg ran under a membership-scoped `syncMode` and skipped one or more
+ * remote keys as out-of-scope, emit a single summary event so the operator
+ * SEES that not all vault content materialized on this device and knows the
+ * lever — raise the membership's access level to `all`. Silent in `all` mode
+ * (nothing is scoped away) and when nothing fell out of scope: no gap, no
+ * noise. Deliberately AFTER the transfer executors, so `filesOutOfScope` is
+ * final; sample keys are read off the plan's `skip-out-of-scope` items (pure,
+ * no I/O). This is the visible complement to the previously-silent
+ * `SyncResult.filesOutOfScope` count.
+ */
+function emitScopeMaterializationGap(run, plan, counters) {
+    if (run.syncMode === "all")
+        return;
+    if (counters.filesOutOfScope <= 0)
+        return;
+    const samplePaths = plan.items
+        .filter((item) => item.action === "skip-out-of-scope")
+        .slice(0, 10)
+        .map((item) => item.remoteFile.key);
+    run.emit({
+        type: "scope-materialization-gap",
+        count: counters.filesOutOfScope,
+        samplePaths,
+        syncMode: run.syncMode,
+    });
+}
 /**
  * Decide whether a remote object present in the LIST is a GENUINE RE-CREATE
  * written AFTER a FILE_TOMBSTONE — in which case the tombstone is stale and the
@@ -1126,6 +1169,39 @@ class LocalSnapshotChangedError extends Error {
 // an intentional delete.
 const PULL_INTENTIONAL_DELETE_MIN_ABS = 10;
 const PULL_INTENTIONAL_DELETE_RATIO = 0.1;
+/**
+ * win32 only: true when an existing local symlink's TARGET exists but the
+ * link cannot be traversed as that target's type — the file-flavor-link-at-
+ * a-directory shape minted while the target was absent (or by an older
+ * client). A dangling link is NOT broken-flavored (there is nothing to
+ * repair until the target appears). POSIX links are flavorless: always
+ * false off win32.
+ */
+export function win32SymlinkFlavorBroken(localPath, win32 = process.platform === "win32") {
+    if (!win32)
+        return false;
+    let target;
+    try {
+        target = fs.readlinkSync(localPath);
+    }
+    catch {
+        return false;
+    }
+    const resolved = path.resolve(path.dirname(localPath), target);
+    let targetIsDir;
+    try {
+        targetIsDir = fs.statSync(resolved).isDirectory();
+    }
+    catch {
+        return false; // dangling target — nothing to repair yet
+    }
+    try {
+        return fs.statSync(localPath).isDirectory() !== targetIsDir;
+    }
+    catch {
+        return true; // target exists but the link cannot traverse: wrong flavor
+    }
+}
 function computePullPlan(remoteFiles, journal, companyRoot, shouldSync, personalMode, teamSyncedSlugs, 
 // Coalesced, company-relative prefixes the pull is scoped to (US-005).
 // `[""]` (the `all`-mode value) covers everything via `isCoveredByAny`, so
@@ -1152,6 +1228,45 @@ excludePrefixes = []) {
     // Clean/current/non-divergent files missing locally — collected here, then
     // resolved post-loop by the bulk-asymmetry decision (tombstone vs. restore).
     const intentionalDeleteCandidates = [];
+    // Junk-spelling guard (mixed-version amplifier): index every journaled key
+    // by its canonical (percent-decode fixpoint) form so a remote twin minted
+    // under a different spelling is recognized before it materializes. When
+    // several journaled spellings already share one canonical form (a
+    // pre-guard fork), the exactly-canonical spelling is preferred as the
+    // representative; entries journaled under their own exact spelling are
+    // never gated by this map (see the guard below), so pre-existing families
+    // keep syncing untouched until the vault doctor (US-003) collapses them.
+    const journaledKeyByCanonical = new Map();
+    for (const journaledKey of Object.keys(journal.files)) {
+        if (!journaledKey.startsWith(SKILLS_KEY_PREFIX))
+            continue;
+        const canonical = canonicalVaultKeySpelling(journaledKey);
+        const existing = journaledKeyByCanonical.get(canonical);
+        if (existing === undefined || journaledKey === canonical) {
+            journaledKeyByCanonical.set(canonical, journaledKey);
+        }
+    }
+    // Remote keys that ALSO appear as an ancestor of another remote key — i.e.
+    // keys that carry child objects under `${key}/…` in this same LIST. The
+    // vault stores a directory OVERLAY (a symlink into another tree, e.g. a
+    // company skill mirrored from a shared repo) as a symlink RECORD at the
+    // directory's own key AND stores the directory's contents as separate child
+    // objects beneath it. A REAL directory, by contrast, only ever syncs as
+    // those child objects — never as a single object AT its own key. So a single
+    // remote object sitting at a key that also has children is unambiguously a
+    // directory-overlay marker, not a regular file. Precomputed once (pure path
+    // derivation, no I/O — the planner is synchronous) so the dir-vs-object
+    // collision branch can tell an inert overlay marker apart from a genuine
+    // file-vs-directory structural collision. feedback_d2082110.
+    const remoteKeysWithChildren = new Set();
+    for (const rf of remoteFiles) {
+        const key = toPosixKey(rf.key);
+        let slash = key.indexOf("/");
+        while (slash !== -1) {
+            remoteKeysWithChildren.add(key.slice(0, slash));
+            slash = key.indexOf("/", slash + 1);
+        }
+    }
     for (const remoteFile of remoteFiles) {
         const invalidKey = classifyVaultKey(remoteFile.key, personalMode ? "personal" : "company");
         if (invalidKey !== null) {
@@ -1273,6 +1388,38 @@ excludePrefixes = []) {
             items.push({ action: "skip-excluded-policy", remoteFile, localPath });
             continue;
         }
+        // Junk-spelling guard — SKILL-FARM KEYS ONLY. The amplifier is specific
+        // to `.claude/skills/<ns>:<skill>` wrapper spellings; outside that prefix,
+        // keys whose percent-decode fixpoints collide (`notes/a b.md` vs a genuine
+        // `notes/a%20b.md`) are DISTINCT files that must both pull.
+        // Within the farm: a remote key that is NOT journaled under its own
+        // spelling but whose percent-decode fixpoint matches an already-journaled
+        // key with a different spelling is a mixed-version twin (`%3A`/`%253A`
+        // generations of a canonical `:` key). Materializing it would mint junk
+        // local dirs and fork the journal into a second key family for the same
+        // logical path — skip it (loudly, never fatally; see the
+        // `skip-junk-key-spelling` event doc) and leave the journaled spelling
+        // authoritative for this machine.
+        if (journalEntry === undefined &&
+            remoteFile.key.startsWith(SKILLS_KEY_PREFIX) &&
+            // Gate NON-canonical remote spellings only. A remote key that already
+            // IS the canonical spelling must always be downloadable — after the
+            // doctor collapses the vault, a machine whose journal still holds only
+            // the junk spelling would otherwise skip the canonical object forever
+            // (and the delete-resync twin protection keeps that stale junk entry),
+            // deadlocking it out of every future update.
+            canonicalVaultKeySpelling(remoteFile.key) !== remoteFile.key) {
+            const journaledTwin = journaledKeyByCanonical.get(canonicalVaultKeySpelling(remoteFile.key));
+            if (journaledTwin !== undefined && journaledTwin !== remoteFile.key) {
+                items.push({
+                    action: "skip-junk-key-spelling",
+                    remoteFile,
+                    localPath,
+                    journaledKey: journaledTwin,
+                });
+                continue;
+            }
+        }
         // ── FILE_TOMBSTONE consult (delete-resync) ───────────────────────────────
         // A remote object present in the LIST may be an intentionally-deleted key
         // (a peer re-pushed it, or its delete-marker hasn't propagated to this
@@ -1386,6 +1533,28 @@ excludePrefixes = []) {
                     });
                     continue;
                 }
+                // Directory-overlay marker vs. a locally-materialized directory:
+                // the remote object at this key carries CHILD objects under it in the
+                // same LIST (`remoteKeysWithChildren`), so it is a symlink/overlay
+                // record for a directory — e.g. the DPP vault's `skills/cody-copywriter`
+                // overlay whose 13 child objects are already materialized locally. The
+                // marker can never be renamed over the real directory, and its children
+                // carry the actual content and materialize via their own plan items, so
+                // the marker is a benign, no-action skip. The generic "rm -rf the local
+                // directory to pull" advice below would tell the operator to DELETE the
+                // materialized (and possibly locally-authored) contents to install an
+                // inert link, and it recurred on EVERY sync cycle. feedback_d2082110.
+                if (remoteKeysWithChildren.has(toPosixKey(remoteFile.key))) {
+                    console.error(`  Note: ${remoteFile.key} is a directory-overlay marker whose ` +
+                        `contents already exist locally as a directory; keeping the ` +
+                        `local directory and ignoring the marker (no action needed).`);
+                    items.push({
+                        action: "skip-overlay-marker-with-children",
+                        remoteFile,
+                        localPath,
+                    });
+                    continue;
+                }
                 console.error(`  Warning: ${remoteFile.key} exists locally as a directory; ` +
                     `cloud has a single object at this key. Skipping; manual ` +
                     `reconciliation required (rm -rf the local directory to pull).`);
@@ -1481,6 +1650,23 @@ excludePrefixes = []) {
                 continue;
             }
             if (journalEntry && !localChanged && !remoteChanged) {
+                // Flavor-health repair (win32 skill farm): a link journaled while its
+                // target was absent was minted file-flavor; once the target directory
+                // exists the hashes still match (hash = sha256(target)) so this
+                // branch would skip it forever, leaving the wrapper broken. Re-download
+                // instead — the materializer's flavor-aware path recreates it 'dir'.
+                if (isLocalSymlink &&
+                    remoteFile.key.startsWith(SKILLS_KEY_PREFIX) &&
+                    win32SymlinkFlavorBroken(localPath)) {
+                    items.push({
+                        action: "download",
+                        remoteFile,
+                        localPath,
+                        isNew: false,
+                        localSnapshot: plannedLocalSnapshot,
+                    });
+                    continue;
+                }
                 items.push({ action: "skip-unchanged", remoteFile, localPath });
                 continue;
             }
@@ -1669,8 +1855,20 @@ excludePrefixes = []) {
     // as a local delete + journal removal. Symmetric to the push side's
     // `propagateDeletes` plan in share.ts.
     const remoteKeySet = new Set();
-    for (const rf of remoteFiles)
+    // Skill-farm twin protection (companion to the junk-spelling pull guard):
+    // when the LIST holds only a junk spelling of a journaled canonical key,
+    // the logical object is still remotely present — a raw has() would class
+    // the canonical journal entry as remote-deleted, unlink the good local
+    // wrapper, and drop the journal entry (after which the next pull would
+    // materialize the junk spelling the guard just refused). Track canonical
+    // forms of listed skill keys and consult them below.
+    const remoteCanonicalSkillKeys = new Set();
+    for (const rf of remoteFiles) {
         remoteKeySet.add(rf.key);
+        if (rf.key.startsWith(SKILLS_KEY_PREFIX)) {
+            remoteCanonicalSkillKeys.add(canonicalVaultKeySpelling(rf.key));
+        }
+    }
     const tombstones = [];
     for (const key of Object.keys(journal.files)) {
         // Compare membership in POSIX space. A pre-5.47.2 Windows journal key can
@@ -1681,6 +1879,16 @@ excludePrefixes = []) {
         const posixKey = toPosixKey(key);
         if (remoteKeySet.has(posixKey))
             continue;
+        if (posixKey.startsWith(SKILLS_KEY_PREFIX) &&
+            remoteCanonicalSkillKeys.has(canonicalVaultKeySpelling(posixKey)) &&
+            // An EXACT FILE_TOMBSTONE for the journaled key is an authoritative
+            // delete and wins over the twin protection — a lingering junk
+            // spelling in the LIST must not keep a deliberately-deleted wrapper
+            // alive forever. (The key is absent from the LIST here, so there is
+            // no newer re-create to defer to.)
+            fileTombstones.get(posixKey) === undefined) {
+            continue;
+        }
         const localPath = resolveContainedVaultPath(companyRoot, key);
         if (localPath === null)
             continue;
@@ -1844,6 +2052,15 @@ function defaultConsoleLogger(event) {
             console.log(`    ... and ${event.count - event.samplePaths.length} more`);
         }
     }
+    else if (event.type === "scope-materialization-gap") {
+        console.warn(`  ! ${event.count} item${event.count === 1 ? "" : "s"} in this vault did NOT sync to this device — your access level is "${event.syncMode}", so only shared paths materialize. To pull everything you have access to, set this membership's access level to "all":`);
+        for (const p of event.samplePaths) {
+            console.warn(`    · ${p}`);
+        }
+        if (event.count > event.samplePaths.length) {
+            console.warn(`    ... and ${event.count - event.samplePaths.length} more`);
+        }
+    }
     else if (event.type === "ignore-excluded") {
         console.warn(`  ! ${event.count} path${event.count === 1 ? "" : "s"} were EXCLUDED from sync by an ignore rule and did NOT reach the vault (review in case this is unintended):`);
         for (const p of event.samplePaths) {
@@ -1860,5 +2077,8 @@ function defaultConsoleLogger(event) {
     else if (event.type === "skip-invalid-scoped-key") {
         console.warn(`  ! ${event.path} skipped — invalid vault key (${event.errorCode ?? "INVALID_KEY_COMPANIES_SCOPED"})`);
     }
+    else if (event.type === "skip-junk-key-spelling") {
+        console.warn(`  ! ${event.path} skipped — junk key spelling; this logical path is already synced as ${event.journaledKey} (mixed-version peer artifact; the vault doctor collapses the family)`);
+    }
 }
 //# sourceMappingURL=sync.js.map