@indigoai-us/hq-cloud 6.14.16 → 6.14.18

package/dist/manifest-reconcile.d.ts

@@ -5,23 +5,136 @@
  * only after the complete fanout has settled. That makes the locally
  * materialized cloud companies authoritative for their own manifest entries
  * without discarding entries the personal vault already had.
+ *
+ * Two layers live here on purpose:
+ *
+ * - `reconcileManifest(hqRoot, targets)` is the pure reconciler. It takes
+ *   already-resolved targets and does nothing but validate slugs, merge the
+ *   fields it owns, and (only when something would actually change) write the
+ *   manifest.
+ * - `reconcileCompanyManifest(options)` is the sync-runner adapter. It decides
+ *   WHICH targets are eligible (personal mode, fanout completion, on-disk
+ *   materialization, and — only when an entity resolver is injected — live
+ *   entity resolution) and then delegates the mutation.
+ *
+ * The adapter keeps its name and options-object shape because `sync-runner`
+ * injects it through `deps.reconcileManifest`. That injection seam is an
+ * options-object callback with a different shape from the pure reconciler and
+ * must not be conflated with it — renaming the adapter would break the seam.
  */
-import type { EntityInfo } from "./vault-client.js";
+import { type EntityInfo } from "./vault-client.js";
 export interface ManifestReconcileTarget {
     uid: string;
     slug: string;
+    /**
+     * Carried by the fanout plan, which already resolved the entity to build the
+     * target. Present so the adapter can write a manifest entry with zero extra
+     * API calls; still optional because a plan built from a degraded lookup keeps
+     * the uid as its only identifier.
+     */
+    name?: string;
+    bucketName?: string;
+    /**
+     * Entity type/status as captured AT PLAN TIME. These are the liveness
+     * evidence for the no-`getEntity` path and are checked with exactly the same
+     * predicate the `getEntity` path applies to a freshly fetched entity. Both
+     * are optional in the type and REQUIRED in practice: a target that carries
+     * neither is "unknown", and unknown is rejected.
+     */
+    entityType?: string;
+    entityStatus?: string;
     personalMode?: boolean;
 }
+/**
+ * Reported when the injected entity resolver fails in a way that is NOT an
+ * ordinary "this entity is gone" lookup outcome. The target is skipped either
+ * way; this exists so a systematic resolver failure cannot present as the
+ * silent "joiners never get manifest entries" bug this module was written to
+ * fix.
+ */
+export interface ManifestReconcileDiagnostic {
+    event: string;
+    message: string;
+    err: unknown;
+    context: Record<string, unknown>;
+}
 export interface ManifestReconcileOptions {
     hqRoot: string;
     targets: readonly ManifestReconcileTarget[];
     completedCompanySlugs: ReadonlySet<string>;
-    getEntity: (uid: string) => Promise<EntityInfo>;
+    /**
+     * OPTIONAL entity resolver.
+     *
+     * When supplied, every eligible target is re-verified against a freshly
+     * fetched entity ({@link isLiveCompany}) before it may contribute an entry.
+     *
+     * When omitted — the sync-runner path — each eligible target's entry is
+     * resolved from the plan-carried `uid`/`slug`/`name`/`bucketName`, costing
+     * zero API calls. This does NOT discharge the liveness requirement: the same
+     * type/status assertion still runs, against `entityType`/`entityStatus`
+     * captured by `buildFanoutPlan` at the moment it fetched the entity (see
+     * {@link isLiveTargetSnapshot}). The only thing given up is freshness — the
+     * evidence is from earlier in the same run rather than from a second fetch.
+     *
+     * A target carrying no liveness fields is REJECTED. Absence is treated as
+     * "unknown", never as "fine": the degraded lookup path in `buildFanoutPlan`
+     * produces exactly that shape, and admitting it would let an unverified
+     * entity into a vault-synced file.
+     */
+    getEntity?: (uid: string) => Promise<EntityInfo>;
+    /**
+     * Optional sink for non-fatal problems. Never affects control flow.
+     */
+    reportDiagnostic?: (diagnostic: ManifestReconcileDiagnostic) => void;
 }
+/**
+ * A target that has already been resolved to the values the manifest should
+ * carry. `name` and `bucketName` are optional: a company that lacks either is
+ * still a real, routable company and must get its `cloud_uid` entry.
+ */
+export interface ManifestReconcileEntryTarget {
+    slug: string;
+    uid: string;
+    bucketName?: string;
+    name?: string;
+}
+/**
+ * `added` — slugs newly inserted into `companies:`.
+ * `updated` — slugs whose pre-existing entry had a field changed.
+ * `skipped` — slugs rejected outright (unsafe slug, non-record existing entry).
+ * `written` — whether the manifest file was actually rewritten.
+ */
+export interface ManifestReconcileResult {
+    written: boolean;
+    added: string[];
+    updated: string[];
+    skipped: string[];
+}
+/**
+ * Merge resolved targets into `companies/manifest.yaml` and report what moved.
+ *
+ * Only the three fields this module owns are considered: `cloud_uid` (always
+ * written — it is the routing key), plus `name` and `bucket_name` when the
+ * target carries them. Omitting a field means "do not set this key"; it never
+ * means "delete it", so a manifest value already on disk survives a target that
+ * has nothing to say about it.
+ *
+ * The skip-if-unchanged comparison is load-bearing rather than an optimization.
+ * `yaml.dump` cannot round-trip comments, so an unconditional rewrite strips the
+ * manifest header — and because `manifest.yaml` rides the personal vault, that
+ * rewrite propagates to every machine and drives a recurring sync conflict loop.
+ * When nothing would change, the file is left byte-for-byte identical and its
+ * mtime untouched.
+ */
+export declare function reconcileManifest(hqRoot: string, targets: readonly ManifestReconcileEntryTarget[]): ManifestReconcileResult;
 /**
  * Atomically merge live, successfully pulled company targets into
- * `companies/manifest.yaml`. Targets that are personal, incomplete, deleted,
- * no longer resolvable, or not materialized on disk are intentionally ignored.
+ * `companies/manifest.yaml`. Targets that are personal, incomplete, not
+ * materialized on disk, or not a verifiably active company are ignored.
+ *
+ * Every one of those filters applies on BOTH paths. The paths differ only in
+ * where the liveness evidence comes from: a fresh `getEntity` fetch when one is
+ * injected, or the type/status the fanout plan captured when it is not.
  */
-export declare function reconcileCompanyManifest(options: ManifestReconcileOptions): Promise<void>;
+export declare function reconcileCompanyManifest(options: ManifestReconcileOptions): Promise<ManifestReconcileResult>;
 //# sourceMappingURL=manifest-reconcile.d.ts.map

package/dist/manifest-reconcile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-reconcile.d.ts","sourceRoot":"","sources":["../src/manifest-reconcile.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,SAAS,uBAAuB,EAAE,CAAC;IAC5C,qBAAqB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3C,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CACjD;AA6DD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,IAAI,CAAC,CAgEf"}
+{"version":3,"file":"manifest-reconcile.d.ts","sourceRoot":"","sources":["../src/manifest-reconcile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAOH,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,2BAA2B;IAC1C,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,SAAS,uBAAuB,EAAE,CAAC;IAC5C,qBAAqB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3C;;;;;;;;;;;;;;;;;;OAkBG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACjD;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,UAAU,EAAE,2BAA2B,KAAK,IAAI,CAAC;CACtE;AAED;;;;GAIG;AACH,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AA6MD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,4BAA4B,EAAE,GAC/C,uBAAuB,CA4FzB;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,uBAAuB,CAAC,CA8DlC"}

package/dist/manifest-reconcile.js

@@ -5,85 +5,247 @@
  * only after the complete fanout has settled. That makes the locally
  * materialized cloud companies authoritative for their own manifest entries
  * without discarding entries the personal vault already had.
+ *
+ * Two layers live here on purpose:
+ *
+ * - `reconcileManifest(hqRoot, targets)` is the pure reconciler. It takes
+ *   already-resolved targets and does nothing but validate slugs, merge the
+ *   fields it owns, and (only when something would actually change) write the
+ *   manifest.
+ * - `reconcileCompanyManifest(options)` is the sync-runner adapter. It decides
+ *   WHICH targets are eligible (personal mode, fanout completion, on-disk
+ *   materialization, and — only when an entity resolver is injected — live
+ *   entity resolution) and then delegates the mutation.
+ *
+ * The adapter keeps its name and options-object shape because `sync-runner`
+ * injects it through `deps.reconcileManifest`. That injection seam is an
+ * options-object callback with a different shape from the pure reconciler and
+ * must not be conflated with it — renaming the adapter would break the seam.
  */
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import yaml from "js-yaml";
+import { VaultNotFoundError, VaultPermissionDeniedError, } from "./vault-client.js";
+/**
+ * A PLAIN object, not merely "typeof object". js-yaml parses timestamp scalars
+ * into `Date`, and a looser check let a `Date` masquerade as the company map (or
+ * as an entry), which both defeated the non-record skip and silently destroyed
+ * the value via object spread. Arrays, Date, RegExp, and Map are all rejected.
+ */
 function isRecord(value) {
-    return value !== null && typeof value === "object" && !Array.isArray(value);
+    if (value === null || typeof value !== "object")
+        return false;
+    const proto = Object.getPrototypeOf(value);
+    return proto === Object.prototype || proto === null;
 }
+/**
+ * Keys that would traverse or mutate the prototype chain rather than create an
+ * own property. `__proto__` in particular resolves to `Object.prototype` on read
+ * and invokes the prototype setter on write, so it never persists to YAML and
+ * therefore reported drift on every single run — an unbounded rewrite loop on a
+ * vault-synced file. None of these is ever a legitimate company directory name.
+ */
+const UNSAFE_SLUG_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+/** Own-property read; never falls through to the prototype chain. */
+function ownEntry(companies, slug) {
+    return Object.prototype.hasOwnProperty.call(companies, slug) ? companies[slug] : undefined;
+}
+/** Own-property write; never invokes an inherited setter. */
+function setEntry(companies, slug, value) {
+    Object.defineProperty(companies, slug, {
+        value,
+        enumerable: true,
+        writable: true,
+        configurable: true,
+    });
+}
+/**
+ * THE liveness rule. Both eligibility paths route through this single function
+ * so they cannot drift: an entity qualifies for a manifest entry only if it is
+ * an active company.
+ *
+ * Written to fail closed on `undefined`. That is the whole point — the
+ * plan-carried path can legitimately have no idea what the entity was (the
+ * degraded lookup branch in `buildFanoutPlan` records nothing), and "no idea"
+ * must never read as "active company".
+ */
+function isLiveCompanyDescriptor(type, status) {
+    return type === "company" && status === "active";
+}
+/**
+ * A company is live when the entity still resolves to the uid we routed on and
+ * is an active company. `name` and `bucketName` are deliberately NOT required:
+ * demanding them dropped otherwise-valid companies from the manifest entirely,
+ * which is exactly the joiner bug this module now guards against. Missing
+ * fields are omitted from the written entry instead of disqualifying it.
+ */
 function isLiveCompany(entity, uid) {
-    return (entity.uid === uid &&
-        entity.type === "company" &&
-        entity.status === "active" &&
-        typeof entity.name === "string" &&
-        entity.name.length > 0 &&
-        typeof entity.bucketName === "string" &&
-        entity.bucketName.length > 0);
+    return entity.uid === uid && isLiveCompanyDescriptor(entity.type, entity.status);
 }
-function hasCompanyDirectory(companiesDir, slug) {
+/**
+ * The same rule applied to liveness captured at plan time instead of to a
+ * freshly fetched entity. There is no uid re-check here because there is no
+ * second observation to reconcile against — the snapshot came off the very
+ * `entity.get(uid)` that produced this target.
+ */
+function isLiveTargetSnapshot(target) {
+    return isLiveCompanyDescriptor(target.entityType, target.entityStatus);
+}
+/**
+ * Is this entity-probe failure the routine kind?
+ *
+ * "The company is gone" (404) and "the caller can no longer see it" (403) are
+ * the two ordinary reasons a target stops resolving, and both correctly mean
+ * "skip, write nothing". Anything else — an auth failure, a 5xx, a network
+ * fault, or a plain programming error like a TypeError — shares the same
+ * control flow but is NOT routine, and swallowing it silently is how a broken
+ * resolver disguises itself as "joiners never get manifest entries".
+ *
+ * The duck-typed `statusCode` arm matters: `buildFanoutPlan` already classifies
+ * this same call's failures that way, so a bare `{ statusCode }` rejection is a
+ * shape this codebase genuinely produces, not a hypothetical.
+ */
+function isExpectedLookupFailure(err) {
+    if (err instanceof VaultNotFoundError)
+        return true;
+    if (err instanceof VaultPermissionDeniedError)
+        return true;
+    return (typeof err === "object" &&
+        err !== null &&
+        "statusCode" in err &&
+        typeof err.statusCode === "number");
+}
+/** Non-empty string, or undefined. Keys with no value are never written. */
+function optionalField(value) {
+    return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+/**
+ * Pure path check — a slug must name a direct child of `companies/` and nothing
+ * else. This deliberately does NOT require the directory to exist; the on-disk
+ * stat check is an eligibility concern and lives in the adapter.
+ */
+function isSafeCompanySlug(companiesDir, slug) {
+    if (slug.length === 0)
+        return false;
+    if (slug.includes("/") || slug.includes("\\"))
+        return false;
+    if (slug === "." || slug === "..")
+        return false;
+    if (UNSAFE_SLUG_KEYS.has(slug))
+        return false;
     const resolvedCompaniesDir = path.resolve(companiesDir);
     const companyDir = path.resolve(resolvedCompaniesDir, slug);
-    if (path.dirname(companyDir) !== resolvedCompaniesDir)
+    return path.dirname(companyDir) === resolvedCompaniesDir;
+}
+function hasCompanyDirectory(companiesDir, slug) {
+    if (!isSafeCompanySlug(companiesDir, slug))
         return false;
     try {
-        return fs.statSync(companyDir).isDirectory();
+        return fs.statSync(path.resolve(companiesDir, slug)).isDirectory();
     }
     catch {
         return false;
     }
 }
+/**
+ * Read the manifest, or return null when there is nothing safe to merge into.
+ * A missing manifest is a no-op, NOT an invitation to create one: this module
+ * only ever restores entries into a manifest that already exists.
+ */
 function loadManifest(manifestPath) {
     try {
-        const raw = fs.readFileSync(manifestPath, "utf8");
-        const parsed = yaml.load(raw);
+        const parsed = yaml.load(fs.readFileSync(manifestPath, "utf8"));
         return isRecord(parsed) ? parsed : null;
     }
-    catch (err) {
-        if (err.code === "ENOENT")
-            return {};
+    catch {
         return null;
     }
 }
-function writeManifestAtomically(manifestPath, document) {
-    const temporaryPath = path.join(path.dirname(manifestPath), `.manifest-${process.pid}-${randomUUID()}.yaml`);
-    fs.writeFileSync(temporaryPath, yaml.dump(document, { lineWidth: -1 }), "utf8");
-    fs.renameSync(temporaryPath, manifestPath);
+function serializeManifest(document) {
+    return yaml.dump(document, { lineWidth: -1 });
 }
 /**
- * Atomically merge live, successfully pulled company targets into
- * `companies/manifest.yaml`. Targets that are personal, incomplete, deleted,
- * no longer resolvable, or not materialized on disk are intentionally ignored.
+ * Temp-file + rename. The temp file is created in the SAME directory as the
+ * target so the rename is a true atomic same-filesystem operation.
+ *
+ * The `finally` is not cosmetic: without it, a failed write or rename stranded a
+ * uniquely-named `.manifest-*.yaml` inside `companies/`, which rides the personal
+ * vault to every machine and accumulates one file per failed run.
+ *
+ * A write failure deliberately PROPAGATES rather than being swallowed into
+ * `written: false`. The caller at `sync-runner.ts` already wraps this in a
+ * try/catch that emits a `runner.manifest_reconcile.failed` diagnostic; reporting
+ * a real I/O failure as a clean no-op would hide it. The AC's "never throws"
+ * clause covers manifest READ problems (missing/unreadable/unparseable), all of
+ * which are handled as no-ops in `loadManifest`.
  */
-export async function reconcileCompanyManifest(options) {
-    const companiesDir = path.join(options.hqRoot, "companies");
-    const candidates = [];
-    for (const target of options.targets) {
-        if (target.personalMode === true ||
-            !options.completedCompanySlugs.has(target.slug) ||
-            !hasCompanyDirectory(companiesDir, target.slug)) {
-            continue;
-        }
+function writeManifestAtomically(manifestPath, serialized) {
+    const temporaryPath = path.join(path.dirname(manifestPath), `.manifest-${process.pid}-${randomUUID()}.yaml`);
+    try {
+        fs.writeFileSync(temporaryPath, serialized, "utf8");
+        fs.renameSync(temporaryPath, manifestPath);
+    }
+    finally {
+        // After a successful rename the temp path is already gone, so this is a
+        // no-op on the happy path and a cleanup on every failure path.
         try {
-            const entity = await options.getEntity(target.uid);
-            if (isLiveCompany(entity, target.uid)) {
-                candidates.push({ slug: target.slug, entity });
-            }
+            fs.rmSync(temporaryPath, { force: true });
         }
         catch {
-            // The target is not presently a live, resolvable company. Never mint a
-            // manifest entry from stale fanout data.
+            // Best effort — never mask the original error.
+        }
+    }
+}
+function emptyResult(skipped = []) {
+    return { written: false, added: [], updated: [], skipped };
+}
+/**
+ * Merge resolved targets into `companies/manifest.yaml` and report what moved.
+ *
+ * Only the three fields this module owns are considered: `cloud_uid` (always
+ * written — it is the routing key), plus `name` and `bucket_name` when the
+ * target carries them. Omitting a field means "do not set this key"; it never
+ * means "delete it", so a manifest value already on disk survives a target that
+ * has nothing to say about it.
+ *
+ * The skip-if-unchanged comparison is load-bearing rather than an optimization.
+ * `yaml.dump` cannot round-trip comments, so an unconditional rewrite strips the
+ * manifest header — and because `manifest.yaml` rides the personal vault, that
+ * rewrite propagates to every machine and drives a recurring sync conflict loop.
+ * When nothing would change, the file is left byte-for-byte identical and its
+ * mtime untouched.
+ */
+export function reconcileManifest(hqRoot, targets) {
+    const companiesDir = path.join(hqRoot, "companies");
+    const skipped = [];
+    // Dedupe by slug, last-wins. Two targets for one slug used to flip the change
+    // flag on and then back off again, leaving it stuck true while the resulting
+    // content was identical — a write (and an mtime bump) on every single run.
+    const safeBySlug = new Map();
+    for (const target of targets) {
+        if (!isSafeCompanySlug(companiesDir, target.slug)) {
+            skipped.push(target.slug);
+            continue;
         }
+        safeBySlug.set(target.slug, target);
     }
-    if (candidates.length === 0)
-        return;
+    if (safeBySlug.size === 0)
+        return emptyResult(skipped);
     const manifestPath = path.join(companiesDir, "manifest.yaml");
     const document = loadManifest(manifestPath);
     if (!document)
-        return;
+        return emptyResult(skipped);
+    // Pre-image, in the SAME serialization the writer uses. Comparing against the
+    // raw file bytes would be wrong: raw text carries comments and formatting that
+    // `yaml.dump` cannot reproduce, so every commented manifest would look
+    // "changed" and rewrite on every single run.
+    const before = serializeManifest(document);
     let companies;
-    if (document.companies === undefined) {
+    if (document.companies === undefined || document.companies === null) {
+        // A missing `companies:` key and a bare `companies:` (which YAML parses as
+        // null) mean the same thing — an empty map. Treating them differently would
+        // silently deny a joiner their entry on one of the two shapes.
         companies = {};
         document.companies = companies;
     }
@@ -91,30 +253,125 @@ export async function reconcileCompanyManifest(options) {
         companies = document.companies;
     }
     else {
-        // A malformed `companies` key is user state; refusing to replace it is
-        // safer than losing a manifest that cannot be interpreted unambiguously.
-        return;
+        // Any other shape (array, scalar, timestamp, string) is malformed user
+        // state; refusing to replace it is safer than losing a manifest that cannot
+        // be interpreted unambiguously.
+        return emptyResult(skipped);
+    }
+    // Changes are STAGED rather than applied in place, so the pre-image can be
+    // serialized for comparison and so a pure no-op costs no serialization at all.
+    const pending = [];
+    for (const target of safeBySlug.values()) {
+        const existing = ownEntry(companies, target.slug);
+        if (existing !== undefined && !isRecord(existing)) {
+            skipped.push(target.slug);
+            continue;
+        }
+        const desired = { cloud_uid: target.uid };
+        const name = optionalField(target.name);
+        if (name !== undefined)
+            desired.name = name;
+        const bucketName = optionalField(target.bucketName);
+        if (bucketName !== undefined)
+            desired.bucket_name = bucketName;
+        if (existing === undefined) {
+            pending.push({ slug: target.slug, entry: desired, isNew: true });
+            continue;
+        }
+        // Compare ONLY the fields we would write. Everything else on the entry is
+        // someone else's state and never participates in the change decision.
+        const drifted = Object.keys(desired).some((key) => existing[key] !== desired[key]);
+        if (!drifted)
+            continue;
+        pending.push({ slug: target.slug, entry: { ...existing, ...desired }, isNew: false });
     }
-    let changed = false;
-    for (const { slug, entity } of candidates) {
-        const existing = companies[slug];
-        if (existing !== undefined && !isRecord(existing))
+    if (pending.length === 0)
+        return emptyResult(skipped);
+    // Final-state guard. The write decision rests on the document itself, not on
+    // a flag the merge loop could have toggled: apply the staged changes, then
+    // write only if the serialized result genuinely differs from the `before`
+    // snapshot taken at load time. This is the backstop that stops any
+    // order-dependent bug — duplicate targets cancelling out, a sticky flag — from
+    // ever reaching a vault-synced file.
+    for (const change of pending)
+        setEntry(companies, change.slug, change.entry);
+    const serialized = serializeManifest(document);
+    if (serialized === before)
+        return emptyResult(skipped);
+    writeManifestAtomically(manifestPath, serialized);
+    return {
+        written: true,
+        added: pending.filter((change) => change.isNew).map((change) => change.slug),
+        updated: pending.filter((change) => !change.isNew).map((change) => change.slug),
+        skipped,
+    };
+}
+/**
+ * Atomically merge live, successfully pulled company targets into
+ * `companies/manifest.yaml`. Targets that are personal, incomplete, not
+ * materialized on disk, or not a verifiably active company are ignored.
+ *
+ * Every one of those filters applies on BOTH paths. The paths differ only in
+ * where the liveness evidence comes from: a fresh `getEntity` fetch when one is
+ * injected, or the type/status the fanout plan captured when it is not.
+ */
+export async function reconcileCompanyManifest(options) {
+    const companiesDir = path.join(options.hqRoot, "companies");
+    const resolvedTargets = [];
+    const getEntity = options.getEntity;
+    for (const target of options.targets) {
+        if (target.personalMode === true ||
+            !options.completedCompanySlugs.has(target.slug) ||
+            !hasCompanyDirectory(companiesDir, target.slug)) {
             continue;
-        const entry = existing ?? {};
-        if (entry.name === entity.name &&
-            entry.cloud_uid === entity.uid &&
-            entry.bucket_name === entity.bucketName) {
+        }
+        if (getEntity === undefined) {
+            // Plan-carried path. The liveness rule is NOT relaxed here — it is
+            // applied to the type/status the plan captured off `entity.get`. A target
+            // with no such evidence fails closed and never reaches the manifest.
+            if (!isLiveTargetSnapshot(target))
+                continue;
+            resolvedTargets.push({
+                slug: target.slug,
+                uid: target.uid,
+                ...(target.name === undefined ? {} : { name: target.name }),
+                ...(target.bucketName === undefined ? {} : { bucketName: target.bucketName }),
+            });
             continue;
         }
-        companies[slug] = {
-            ...entry,
-            name: entity.name,
-            cloud_uid: entity.uid,
-            bucket_name: entity.bucketName,
-        };
-        changed = true;
+        try {
+            const entity = await getEntity(target.uid);
+            if (isLiveCompany(entity, target.uid)) {
+                resolvedTargets.push({
+                    slug: target.slug,
+                    uid: entity.uid,
+                    ...(entity.name === undefined ? {} : { name: entity.name }),
+                    ...(entity.bucketName === undefined ? {} : { bucketName: entity.bucketName }),
+                });
+            }
+        }
+        catch (err) {
+            // The target is not presently a live, resolvable company. Never mint a
+            // manifest entry from stale fanout data — so the target is skipped
+            // regardless of WHY the probe failed.
+            //
+            // But "entity is gone" and "the resolver is broken" are different
+            // stories with identical control flow, and only the first is routine.
+            // Staying silent on the second is how a systematic resolver failure
+            // disguises itself as "joiners never get manifest entries" — the exact
+            // bug class this module exists to prevent.
+            if (!isExpectedLookupFailure(err)) {
+                options.reportDiagnostic?.({
+                    event: "runner.manifest_reconcile.entity_probe_failed",
+                    message: "unexpected error resolving company entity; target skipped",
+                    err,
+                    context: { slug: target.slug, uid: target.uid },
+                });
+            }
+        }
     }
-    if (changed)
-        writeManifestAtomically(manifestPath, document);
+    if (resolvedTargets.length === 0)
+        return emptyResult();
+    return reconcileManifest(options.hqRoot, resolvedTargets);
 }
 //# sourceMappingURL=manifest-reconcile.js.map

package/dist/manifest-reconcile.js.map

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