@indigoai-us/hq-cloud 6.15.79 → 6.15.81

package/dist/cli/share.d.ts

@@ -12,6 +12,7 @@ import { type CompanyTombstone } from "./tombstones.js";
 import { type ScopePrefixInput } from "../prefix-coalesce.js";
 import { type TransferSemaphore } from "../sync-core.js";
 import { type RegisterCompanySkillResult } from "../vault-client.js";
+import { type ReconcileApplyCheckpoint } from "../sync/reconcile-cursor.js";
 /**
  * Local-only ephemeral artifacts: conflict-side files written whenever a
  * 3-way merge preserves the displaced side for inspection. Depending on the
@@ -446,6 +447,11 @@ export interface ShareOptions {
      * the network. See the consult in the Stage-2 classification pass.
      */
     fileTombstones?: ReadonlyMap<string, CompanyTombstone>;
+    /**
+     * Opt-in bounded reconcile apply checkpoint. It is recorded only after
+     * `finalizeShareJournal()` has durably committed this slice's outcomes.
+     */
+    reconcileApply?: ReconcileApplyCheckpoint;
     /**
      * What to do when a path the caller EXPLICITLY named cannot be shipped —
      * it does not resolve under any base, or it resolves outside the company
@@ -481,6 +487,8 @@ export interface CompanySkillRegistrationRequest {
     companySlug: string;
     path: string;
     content: string;
+    /** These exact bytes have successfully landed in the company vault. */
+    landed?: boolean;
 }
 export type CompanySkillRegistrar = (input: CompanySkillRegistrationRequest) => Promise<RegisterCompanySkillResult>;
 export declare class UnregisteredCompanySkillError extends Error {

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

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

package/dist/cli/share.js

@@ -10,7 +10,7 @@ import * as path from "path";
 import { resolveEntityContext, isExpiringSoon, refreshEntityContext } from "../context.js";
 import { createSyncProgressRecorder } from "../sync-progress.js";
 import { localPathForVaultKey, vaultKeyForLocalPath } from "../local-path-codec.js";
-import { uploadFile, uploadSymlink, toPosixKey, headRemoteFile, readVerifiedRemoteSymlinkTarget, deleteRemoteFile, downloadFile, primeObjectTransport, primeUploads, WindowsSymlinkPrivilegeError, WINDOWS_SYMLINK_PRIVILEGE_REMEDY, } from "../s3.js";
+import { uploadFile, uploadSymlink, toPosixKey, headRemoteFile, readVerifiedRemoteSymlinkTarget, deleteRemoteFile, downloadFile, primeObjectTransport, primeUploads, WindowsSymlinkPrivilegeError, WINDOWS_SYMLINK_PRIVILEGE_REMEDY, WindowsRenameBlockedError, WINDOWS_RENAME_BLOCKED_REMEDY, renameOrRaiseWindowsBlocked, } from "../s3.js";
 import * as crypto from "crypto";
 import { readJournal, writeJournal, hashFile, hashSymlinkTarget, updateEntry, removeEntry, isTombstone, normalizeEtag, PERSONAL_VAULT_JOURNAL_SLUG, migratePersonalVaultJournal, migrateToV2, } from "../journal.js";
 import { createIgnoreFilter, hasControlCharacters, isExpectedIgnore, isWithinSizeLimit, } from "../ignore.js";
@@ -26,6 +26,7 @@ import { isCloudAuthoritative } from "../lib/cloud-authoritative.js";
 import { VaultAuthError, VaultClient, } from "../vault-client.js";
 import { describeError } from "../lib/describe-error.js";
 import { readlinkOrNull } from "../lib/readlink-safe.js";
+import { checkpointReconcileApply } from "../sync/reconcile-cursor.js";
 /**
  * Push-side fresh-collision convergence probe.
  *
@@ -686,6 +687,20 @@ export async function share(options) {
     await executeDeletes(run, plans.deletePlan, plans.decommissionPlan, counters, filesRefusedStalePaths, pathResults, !uploadResult.hadUploadFailure && uploadResult.workerErrors.length === 0);
     finalizeShareJournal(run);
     throwUploadWorkerErrors(uploadResult.workerErrors);
+    // A reconcile cursor is an all-or-nothing boundary for this bounded apply
+    // slice. Upload and delete errors are intentionally reported per-path so an
+    // ordinary runner can continue, but none of those retryable outcomes may
+    // move the cursor beyond the failed mutation.
+    if (!uploadResult.hadUploadFailure &&
+        uploadResult.workerErrors.length === 0 &&
+        !pathResults.some((result) => result.status === "refused")) {
+        checkpointReconcileApply(options.reconcileApply, [
+            ...plans.pushPlan.items.map((item) => item.relativePath),
+            ...plans.deletePlan.toDelete.map((item) => item.key),
+            ...plans.deletePlan.toTombstone,
+            ...plans.decommissionPlan,
+        ]);
+    }
     return buildShareResult(run, counters, filesRefusedStalePaths, conflictPaths, pathResults, false);
 }
 /**
@@ -899,7 +914,11 @@ function skillRegistrarForRun(run) {
     if (!run.vaultConfig)
         return undefined;
     const client = new VaultClient(run.vaultConfig);
-    return ({ companySlug, path: skillPath, content }) => client.registerCompanySkill(companySlug, { path: skillPath, content });
+    return ({ companySlug, path: skillPath, content, landed }) => client.registerCompanySkill(companySlug, {
+        path: skillPath,
+        content,
+        ...(landed === true ? { landed: true } : {}),
+    });
 }
 function assertValidSkillRegistration(result, expectedPath) {
     const stampedUid = parseRegisteredCompanySkillUid(result.content);
@@ -943,18 +962,106 @@ async function registerOneCompanySkill(run, entry, registrar) {
 async function preflightCompanySkillIdentities(run, entries) {
     if (run.options.personalMode === true || run.ctx.uid.startsWith("prs_"))
         return;
-    const unstamped = entries.filter((entry) => entry.kind === "file" &&
-        CANONICAL_COMPANY_SKILL_RE.test(entry.relativePath) &&
-        !parseRegisteredCompanySkillUid(fs.readFileSync(entry.absolutePath, "utf8")));
-    if (unstamped.length === 0)
+    const canonical = entries.filter((entry) => entry.kind === "file" &&
+        CANONICAL_COMPANY_SKILL_RE.test(entry.relativePath));
+    const unstamped = canonical.filter((entry) => !parseRegisteredCompanySkillUid(fs.readFileSync(entry.absolutePath, "utf8")));
+    const pending = canonical.filter((entry) => {
+        const journalEntry = run.journal.files[entry.relativePath];
+        return (journalEntry?.skillMetadataPending === true &&
+            journalEntry.hash === hashFile(entry.absolutePath));
+    });
+    if (unstamped.length === 0 && pending.length === 0)
         return;
     const registrar = skillRegistrarForRun(run);
     if (!registrar) {
-        throw new UnregisteredCompanySkillError(unstamped.map((entry) => entry.relativePath));
+        if (unstamped.length > 0) {
+            throw new UnregisteredCompanySkillError(unstamped.map((entry) => entry.relativePath));
+        }
+        return;
     }
     for (const entry of unstamped) {
         await registerOneCompanySkill(run, entry, registrar);
     }
+    for (const entry of pending) {
+        const journalEntry = run.journal.files[entry.relativePath];
+        run.options.onHeartbeat?.();
+        const remote = await headRemoteFile(run.ctx, entry.relativePath);
+        if (!remote) {
+            // The upload this marker referred to no longer exists. Drop the stale
+            // baseline so the normal planner cannot skip the local file as unchanged
+            // and will upload it again on this pass.
+            delete run.journal.files[entry.relativePath];
+            flushShareJournal(run);
+            continue;
+        }
+        if (!journalEntry?.remoteEtag ||
+            normalizeEtag(remote.etag) !== normalizeEtag(journalEntry.remoteEtag)) {
+            // The successful PUT this marker describes is no longer the live remote
+            // object. Reconcile the current remote bytes instead of stranding the old
+            // marker behind skipUnchanged; the backend independently revalidates this
+            // exact content against S3 before accepting its metadata.
+            // Invalidate the stale baseline before any network work. If recovery
+            // fails, the next pass must still see a real divergence rather than
+            // classifying the local file as unchanged forever.
+            delete run.journal.files[entry.relativePath];
+            flushShareJournal(run);
+            const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "hq-skill-metadata-"));
+            const tempFile = path.join(tempDir, "SKILL.md");
+            try {
+                await downloadFile(run.ctx, entry.relativePath, tempFile);
+                await reconcileLandedCompanySkill(run, entry.relativePath, fs.readFileSync(tempFile, "utf8"));
+            }
+            finally {
+                fs.rmSync(tempDir, { recursive: true, force: true });
+            }
+            continue;
+        }
+        const landedBytes = fs.readFileSync(entry.absolutePath);
+        const landedHash = crypto
+            .createHash("sha256")
+            .update(landedBytes)
+            .digest("hex");
+        if (landedHash !== journalEntry.hash) {
+            // The editor saved after this entry was classified but before the
+            // remote proof returned. Reconcile only the single local snapshot that
+            // produced the journaled upload; the newer edit belongs to the planner.
+            continue;
+        }
+        await reconcileLandedCompanySkill(run, entry.relativePath, landedBytes.toString("utf8"));
+        delete run.journal.files[entry.relativePath]?.skillMetadataPending;
+        checkpointShareJournal(run);
+    }
+}
+/**
+ * Reconcile metadata only after the canonical bytes have landed. Identity
+ * reservation happens before upload; tags and other source-authored metadata
+ * must not become authoritative until the S3 write succeeds.
+ */
+async function reconcileLandedCompanySkill(run, relativePath, content) {
+    if (run.options.personalMode === true ||
+        run.ctx.uid.startsWith("prs_") ||
+        !CANONICAL_COMPANY_SKILL_RE.test(relativePath)) {
+        return;
+    }
+    const registrar = skillRegistrarForRun(run);
+    if (!registrar) {
+        return;
+    }
+    const localUid = parseRegisteredCompanySkillUid(content);
+    if (!localUid) {
+        throw new UnregisteredCompanySkillError([relativePath]);
+    }
+    run.options.onHeartbeat?.();
+    const result = await registrar({
+        companySlug: run.ctx.slug,
+        path: relativePath,
+        content,
+        landed: true,
+    });
+    assertValidSkillRegistration(result, relativePath);
+    if (result.skillUid !== localUid) {
+        throw new Error(`Skill registration returned identity '${result.skillUid}' for '${relativePath}', but the landed file is stamped '${localUid}'.`);
+    }
 }
 async function buildSharePlans(run) {
     const collected = collectFiles(run.paths, run.hqRoot, run.syncRoot, run.shouldSync, {
@@ -1324,12 +1431,41 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
                 }
             }
             if (freshContentConverged) {
+                // The equality probe is an await boundary. Confirm that the local body
+                // still matches the bytes we proved are already remote before recording
+                // convergence or reconciling source-authored metadata.
+                const afterProbe = refreshUploadItem();
+                if (afterProbe === null)
+                    return;
+                if (!uploadBodyMatchesPlan(item, afterProbe)) {
+                    await restartForChangedBody(afterProbe);
+                    return;
+                }
+                const shouldReconcileSkill = item.kind === "file" &&
+                    CANONICAL_COMPANY_SKILL_RE.test(relativePath) &&
+                    skillRegistrarForRun(run) !== undefined;
+                const skillBytes = shouldReconcileSkill
+                    ? fs.readFileSync(absolutePath)
+                    : undefined;
+                if (skillBytes !== undefined &&
+                    crypto.createHash("sha256").update(skillBytes).digest("hex") !== localHash) {
+                    // The editor saved after the equality proof. Re-run the normal
+                    // remote decision for those new bytes rather than claiming they have
+                    // already landed and letting their metadata get ahead of S3.
+                    const afterSkillRead = refreshUploadItem();
+                    if (afterSkillRead === null)
+                        return;
+                    await restartForChangedBody(afterSkillRead);
+                    return;
+                }
+                const skillContent = skillBytes?.toString("utf8");
                 const lstat = fs.lstatSync(absolutePath);
                 updateEntry(run.journal, relativePath, localHash, lstat.size, "up", absolutePath, {
                     remoteEtag: remoteMeta.etag,
                     mtimeMs: lstat.mtimeMs,
                     ctimeMs: ctimeToStamp(item.kind === "file" ? item.statAtHash : undefined, lstat),
                     kind: item.kind,
+                    skillMetadataPending: skillContent !== undefined,
                 });
                 // Same checkpoint contract as an actual upload. After repeated
                 // interrupted passes most of a large vault is already present remotely
@@ -1337,6 +1473,14 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
                 // through performUpload. Without this, that pass could reconcile
                 // hundreds of thousands of entries purely in memory, be interrupted,
                 // and persist none of them — the exact loop this change exists to end.
+                if (skillContent !== undefined) {
+                    // This is the crash-recovery path for a PUT that completed before its
+                    // journal row was persisted. Make the retry marker durable before the
+                    // registry call so another interruption remains recoverable.
+                    flushShareJournal(run);
+                    await reconcileLandedCompanySkill(run, relativePath, skillContent);
+                    delete run.journal.files[relativePath]?.skillMetadataPending;
+                }
                 checkpointShareJournal(run);
                 run.emit({ type: "reconciled", path: relativePath, direction: "push" });
                 counters.filesSkipped++;
@@ -1437,10 +1581,24 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
             const size = isSymlinkUpload ? 0 : lstat.size;
             const mtimeMs = lstat.mtimeMs;
             const ctimeMs = ctimeToStamp(item.kind === "file" ? item.statAtHash : undefined, lstat);
+            // Capture the candidate metadata bytes immediately before uploadFile's
+            // own synchronous read. If an editor saves while the network request is
+            // in flight, the comparison below suppresses reconciliation; that newer
+            // version will upload and reconcile on the next pass.
+            const skillContentAtPut = !isSymlinkUpload && CANONICAL_COMPANY_SKILL_RE.test(relativePath)
+                ? fs.readFileSync(absolutePath, "utf8")
+                : undefined;
             const { etag } = isSymlinkUpload
                 ? await uploadSymlink(run.ctx, item.target, relativePath, run.options.author, pc)
                 : await uploadFile(run.ctx, absolutePath, relativePath, run.options.author, pc);
-            updateEntry(run.journal, relativePath, localHash, size, "up", absolutePath, { remoteEtag: etag, mtimeMs, ctimeMs, kind: item.kind });
+            updateEntry(run.journal, relativePath, localHash, size, "up", absolutePath, {
+                remoteEtag: etag,
+                mtimeMs,
+                ctimeMs,
+                kind: item.kind,
+                skillMetadataPending: skillContentAtPut !== undefined &&
+                    skillRegistrarForRun(run) !== undefined,
+            });
             if (run.message) {
                 run.journal.files[relativePath] = {
                     ...run.journal.files[relativePath],
@@ -1449,9 +1607,25 @@ async function executeUploads(run, pushPlan, counters, conflictPaths) {
             }
             counters.filesUploaded++;
             counters.bytesUploaded += size;
-            // Strictly after the PUT returned and the entry was applied, so an
-            // interrupted pass can only ever re-upload a file, never skip one.
-            checkpointShareJournal(run);
+            // A landed company skill needs a durable retry marker before the registry
+            // call. The ordinary cadence is intentionally sparse for large vaults,
+            // but losing this row can strand tags after a crash between PUT and
+            // reconciliation.
+            if (run.journal.files[relativePath]?.skillMetadataPending === true) {
+                flushShareJournal(run);
+            }
+            else {
+                // Strictly after the PUT returned and the entry was applied, so an
+                // interrupted pass can only ever re-upload a file, never skip one.
+                checkpointShareJournal(run);
+            }
+            if (skillContentAtPut !== undefined &&
+                skillRegistrarForRun(run) !== undefined &&
+                fs.readFileSync(absolutePath, "utf8") === skillContentAtPut) {
+                await reconcileLandedCompanySkill(run, relativePath, skillContentAtPut);
+                delete run.journal.files[relativePath]?.skillMetadataPending;
+                checkpointShareJournal(run);
+            }
             run.emit({
                 type: "progress",
                 path: relativePath,
@@ -1635,8 +1809,12 @@ async function writePushConflictMirror(run, item, remoteHash, preserved) {
                 // `keep` has one meaning in both directions: cloud wins the working
                 // name while the displaced local body remains recoverable beside it.
                 // Rename first, then reuse the ordinary tested download path for the
-                // replacement instead of hand-rolling a swap around an ad-hoc GET.
-                fs.renameSync(item.absolutePath, conflictAbs);
+                // replacement instead of hand-rolling a swap around an ad-hoc GET. A
+                // transient Windows sharing violation on the move-aside surfaces as
+                // WindowsRenameBlockedError so the catch below downgrades it to a
+                // deliberate skip; nothing has moved yet, so the skip strands nothing
+                // (Sentry HQ-DESKTOP-54).
+                renameOrRaiseWindowsBlocked(item.absolutePath, conflictAbs);
                 localMovedAside = true;
                 const downloaded = await downloadFile(run.ctx, item.relativePath, item.absolutePath);
                 remoteAdopted = true;
@@ -1691,6 +1869,11 @@ async function writePushConflictMirror(run, item, remoteHash, preserved) {
                 localMovedAside = false;
             }
             catch (rollbackErr) {
+                // A rollback failure is NOT a benign skip even when the underlying
+                // rename refusal is transient: the local body has already been moved to
+                // `conflictAbs` and could not be restored, so the original working path
+                // is now absent. Reporting success here would let a later pass read that
+                // absence as a deletion. Keep it on the error channel (Codex PR #436).
                 run.emit({
                     type: "error",
                     path: item.relativePath,
@@ -1702,7 +1885,19 @@ async function writePushConflictMirror(run, item, remoteHash, preserved) {
             throw mirrorErr;
         if (mirrorErr instanceof JournalCheckpointError)
             throw mirrorErr;
-        if (mirrorErr instanceof WindowsSymlinkPrivilegeError) {
+        if (mirrorErr instanceof WindowsRenameBlockedError) {
+            // The local move-aside could not complete because a program is holding
+            // the file open. Emit the deliberate skip (never type:"error") so the
+            // push stays complete and the one-shot runner exits 0; nothing was moved
+            // (localMovedAside is false when the preserve rename threw), so the
+            // conflict simply re-fires next pass (Sentry HQ-DESKTOP-54, second path).
+            run.emit({
+                type: "skip-rename-blocked",
+                path: item.relativePath,
+                remedy: WINDOWS_RENAME_BLOCKED_REMEDY,
+            });
+        }
+        else if (mirrorErr instanceof WindowsSymlinkPrivilegeError) {
             // The remote symlink record cannot be materialized to a conflict mirror
             // on this unprivileged Windows host. Emit the deliberate skip (never
             // type:"error") so the push stays complete and the runner exits 0
@@ -1876,7 +2071,7 @@ async function executeDeletes(run, deletePlan, decommissionPlan, counters, files
                 run.emit({
                     type: "error",
                     path: relativePath,
-                    message: `tombstone unlink failed: ${err instanceof Error ? err.message : String(err)}`,
+                    message: `tombstone unlink failed: ${describeError(err)}`,
                 });
                 continue;
             }
@@ -2295,6 +2490,9 @@ function defaultConsoleLogger(event) {
     else if (event.type === "skip-symlink-privilege") {
         console.warn(`  ! ${event.path} skipped — could not create the symbolic link on this Windows host (missing privilege). ${event.remedy}`);
     }
+    else if (event.type === "skip-rename-blocked") {
+        console.warn(`  ! ${event.path} skipped — another program on this PC is holding the file open, so HQ could not replace it yet. ${event.remedy}`);
+    }
     else if (event.type === "ignore-excluded") {
         // The "not silent" surface: an ignore rule dropped content that doesn't
         // look like expected build/VCS/cache noise, so it never reached the vault.