@indigoai-us/hq-cloud 6.14.22 → 6.14.24

package/src/bin/sync-runner.ts

@@ -144,9 +144,12 @@ import {
   buildFanoutPlan,
   emitFanoutPlan,
   resolveMembershipsForRun,
+  resolveSkipCompanies,
   type RunnerTarget,
   type SetupNeededReason,
 } from "./sync-runner-planning.js";
+
+export { resolveSkipCompanies } from "./sync-runner-planning.js";
 import {
   seedActiveCompany,
   type SeedActiveCompanyOptions,
@@ -385,11 +388,19 @@ export type RunnerEvent =
   | ({ type: "conflict"; company: string } & Omit<Extract<SyncProgressEvent, { type: "conflict" }>, "type">)
   | { type: "new-files"; company: string; files: Array<{ path: string; bytes: number; addedBy: string | null }> }
   | { type: "scope-excluded"; company: string; count: number; samplePaths: string[] }
+  | ({ type: "scope-materialization-gap"; company: string } & Omit<
+      Extract<SyncProgressEvent, { type: "scope-materialization-gap" }>,
+      "type"
+    >)
   | { type: "ignore-excluded"; company: string; count: number; totalExcluded: number; samplePaths: string[] }
   | ({ type: "skip-invalid-scoped-key"; company: string } & Omit<
       Extract<SyncProgressEvent, { type: "skip-invalid-scoped-key" }>,
       "type"
     >)
+  | ({ type: "skip-junk-key-spelling"; company: string } & Omit<
+      Extract<SyncProgressEvent, { type: "skip-junk-key-spelling" }>,
+      "type"
+    >)
   | ({
       type: "complete";
       company: string;
@@ -465,6 +476,28 @@ export type RunnerEvent =
         filesUploaded: number;
         bytesUploaded: number;
       }>;
+    }
+  | {
+      /**
+       * Emitted at most ONCE per fanout, AFTER `all-complete`, when the
+       * post-sync conflict-ledger prune leaves one or more PRESERVED conflict
+       * variants that a human still has to resolve (`kept > 0`). The prune
+       * self-heals the ledger (drops orphaned + byte-identical false-positive
+       * rows), but genuine divergences are conservatively KEPT — and pre-fix
+       * that residual set was silent, so the reporter of feedback_d2082110
+       * finished a full sync with "20 older preserved conflict entries" still
+       * on disk and no signal they were there. This event reconciles and
+       * surfaces the remaining count so the operator knows to run
+       * `/resolve-conflicts`. Ledger-global (not per-company — the index lives
+       * at the HQ root). Not emitted when the ledger is clean (`kept === 0`).
+       *
+       * `count` is the number of preserved conflict rows still awaiting
+       * resolution; `samplePaths` carries up to 10 original (non-mirror) paths
+       * for display.
+       */
+      type: "conflicts-remaining";
+      count: number;
+      samplePaths: string[];
     };
 
 /**
@@ -1415,6 +1448,7 @@ export async function runRunner(
       client,
       claims,
       resolveSkipPersonal,
+      skipCompanies: resolveSkipCompanies(),
     });
   } catch (err) {
     if (err instanceof VaultAuthError) {
@@ -1435,6 +1469,7 @@ export async function runRunner(
     return 0;
   }
   const plan = targetPlan.plan;
+  const deferredUnresolved = targetPlan.deferredUnresolved;
 
   emitFanoutPlan(emit, plan);
 
@@ -1784,7 +1819,20 @@ export async function runRunner(
   // HQ_CONFLICT_PRUNE_ON_SYNC=0.
   if (process.env.HQ_CONFLICT_PRUNE_ON_SYNC !== "0") {
     try {
-      pruneConflictIndex(parsed.hqRoot);
+      const pruneResult = pruneConflictIndex(parsed.hqRoot);
+      // Reconcile + surface the residual preserved conflict variants a human
+      // still has to resolve. Pre-fix this set was silent — the reporter of
+      // feedback_d2082110 finished a full sync with 20 preserved conflict
+      // entries still on disk and no signal. Emitting after the prune means the
+      // count reflects the self-healed (orphan/false-positive-dropped) ledger,
+      // never the inflated raw one. Ledger-global; silent on a clean ledger.
+      if (pruneResult.kept > 0) {
+        emit({
+          type: "conflicts-remaining",
+          count: pruneResult.kept,
+          samplePaths: pruneResult.keptSamplePaths,
+        });
+      }
     } catch (err) {
       reportDiagnostic({
         component: "conflict-index",
@@ -1843,7 +1891,14 @@ export async function runRunner(
   // otherwise fire for normal user-policy outcomes. Consumers that want to
   // flag any non-clean outcome (clean-abort + thrown-error) read `partial`
   // from the JSON. The watch loop stays alive on this code (see exit-codes.ts).
-  return errors.length > 0 ? PARTIAL_SYNC_EXIT : 0;
+  //
+  // deferredUnresolved: a slug denylist was active but entity discovery blipped
+  // for one or more memberships we could not prove were paused. Fail closed on
+  // the plan (they were omitted) and return TRANSIENT so watch scoped drain
+  // does not publish without a successful upload pass.
+  if (errors.length > 0) return PARTIAL_SYNC_EXIT;
+  if (deferredUnresolved > 0) return TRANSIENT_NETWORK_EXIT;
+  return 0;
 }
 
 // ---------------------------------------------------------------------------