@indigoai-us/hq-cloud 5.3.0 → 5.4.1

package/src/cli/share.ts

@@ -52,6 +52,12 @@ export interface ShareResult {
   filesUploaded: number;
   bytesUploaded: number;
   filesSkipped: number;
+  /**
+   * Paths (company-relative) that were detected as push conflicts. Mirrors
+   * `SyncResult.conflictPaths` so push and pull surface conflicts the same
+   * way to runner/UI consumers.
+   */
+  conflictPaths: string[];
   aborted: boolean;
 }
 
@@ -83,6 +89,7 @@ export async function share(options: ShareOptions): Promise<ShareResult> {
   let filesUploaded = 0;
   let bytesUploaded = 0;
   let filesSkipped = 0;
+  const conflictPaths: string[] = [];
 
   // Collect all files to share
   const filesToShare = collectFiles(paths, hqRoot, syncRoot, shouldSync);
@@ -123,6 +130,8 @@ export async function share(options: ShareOptions): Promise<ShareResult> {
 
       // If remote has changed since our last sync, it's a conflict
       if (journalEntry && journalEntry.hash !== localHash) {
+        conflictPaths.push(relativePath);
+
         // Local has changes — check if remote also changed
         const resolution = await resolveConflict(
           {
@@ -134,8 +143,21 @@ export async function share(options: ShareOptions): Promise<ShareResult> {
           onConflict,
         );
 
+        emit({
+          type: "conflict",
+          path: relativePath,
+          direction: "push",
+          resolution,
+        });
+
         if (resolution === "abort") {
-          return { filesUploaded, bytesUploaded, filesSkipped, aborted: true };
+          return {
+            filesUploaded,
+            bytesUploaded,
+            filesSkipped,
+            conflictPaths,
+            aborted: true,
+          };
         }
         if (resolution === "keep" || resolution === "skip") {
           filesSkipped++;
@@ -179,7 +201,13 @@ export async function share(options: ShareOptions): Promise<ShareResult> {
 
   writeJournal(ctx.slug, journal);
 
-  return { filesUploaded, bytesUploaded, filesSkipped, aborted: false };
+  return {
+    filesUploaded,
+    bytesUploaded,
+    filesSkipped,
+    conflictPaths,
+    aborted: false,
+  };
 }
 
 /**
@@ -193,6 +221,10 @@ function defaultConsoleLogger(event: SyncProgressEvent): void {
     } else {
       console.log(`  ✓ ${event.path}`);
     }
+  } else if (event.type === "conflict") {
+    console.error(
+      `  ⚠ conflict (${event.direction}): ${event.path} — ${event.resolution}`,
+    );
   } else {
     console.error(`  ✗ ${event.path} — ${event.message}`);
   }

package/src/cli/sync.test.ts

@@ -176,10 +176,54 @@ describe("sync", () => {
     });
 
     expect(result.conflicts).toBe(1);
+    expect(result.conflictPaths).toEqual(["docs/handoff.md"]);
     expect(result.filesSkipped).toBeGreaterThanOrEqual(1);
     expect(fs.readFileSync(path.join(companyDocs, "handoff.md"), "utf-8")).toBe("local version");
   });
 
+  it("emits a conflict event with path + resolution on hash mismatch", async () => {
+    const companyDocs = path.join(tmpDir, "companies", "acme", "docs");
+    fs.mkdirSync(companyDocs, { recursive: true });
+    fs.writeFileSync(path.join(companyDocs, "handoff.md"), "local version");
+
+    fs.writeFileSync(
+      journalPath,
+      JSON.stringify({
+        version: "1",
+        lastSync: new Date().toISOString(),
+        files: {
+          "docs/handoff.md": {
+            hash: "stale-hash",
+            size: 20,
+            syncedAt: new Date(Date.now() - 3600000).toISOString(),
+            direction: "down",
+          },
+        },
+      }),
+    );
+
+    const events: unknown[] = [];
+    await sync({
+      company: "acme",
+      onConflict: "keep",
+      vaultConfig: mockConfig,
+      hqRoot: tmpDir,
+      onEvent: (e) => events.push(e),
+    });
+
+    const conflicts = events.filter(
+      (e): e is { type: "conflict"; path: string; direction: "pull"; resolution: string } =>
+        typeof e === "object" && e !== null && (e as { type?: string }).type === "conflict",
+    );
+    expect(conflicts).toHaveLength(1);
+    expect(conflicts[0]).toMatchObject({
+      type: "conflict",
+      path: "docs/handoff.md",
+      direction: "pull",
+      resolution: "keep",
+    });
+  });
+
   it("aborts on --on-conflict abort", async () => {
     const companyDocs = path.join(tmpDir, "companies", "acme", "docs");
     fs.mkdirSync(companyDocs, { recursive: true });

package/src/cli/sync.ts

@@ -13,7 +13,7 @@ import { downloadFile, listRemoteFiles } from "../s3.js";
 import { readJournal, writeJournal, hashFile, updateEntry, getEntry } from "../journal.js";
 import { createIgnoreFilter } from "../ignore.js";
 import { resolveConflict } from "./conflict.js";
-import type { ConflictStrategy } from "./conflict.js";
+import type { ConflictStrategy, ConflictResolution } from "./conflict.js";
 
 /**
  * Per-file events emitted by `sync()` as it progresses.
@@ -28,7 +28,13 @@ import type { ConflictStrategy } from "./conflict.js";
  */
 export type SyncProgressEvent =
   | { type: "progress"; path: string; bytes: number; message?: string }
-  | { type: "error"; path: string; message: string };
+  | { type: "error"; path: string; message: string }
+  | {
+      type: "conflict";
+      path: string;
+      direction: "pull" | "push";
+      resolution: ConflictResolution;
+    };
 
 export interface SyncOptions {
   /** Company slug or UID (defaults to active company from config) */
@@ -66,6 +72,12 @@ export interface SyncResult {
   bytesDownloaded: number;
   filesSkipped: number;
   conflicts: number;
+  /**
+   * Paths (remote keys) that were detected as conflicts during this run.
+   * Always populated when `conflicts > 0` so callers can surface them in UI
+   * or logs without re-streaming the per-file events.
+   */
+  conflictPaths: string[];
   aborted: boolean;
 }
 
@@ -106,6 +118,7 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
   let bytesDownloaded = 0;
   let filesSkipped = 0;
   let conflicts = 0;
+  const conflictPaths: string[] = [];
 
   // List all remote files (IAM session policy filters at the AWS layer)
   const remoteFiles = await listRemoteFiles(ctx);
@@ -138,6 +151,7 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
       // If local file has changed since last sync, it's a conflict
       if (journalEntry && journalEntry.hash !== localHash) {
         conflicts++;
+        conflictPaths.push(remoteFile.key);
 
         const resolution = await resolveConflict(
           {
@@ -150,9 +164,23 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
           onConflict,
         );
 
+        emit({
+          type: "conflict",
+          path: remoteFile.key,
+          direction: "pull",
+          resolution,
+        });
+
         if (resolution === "abort") {
           writeJournal(journalSlug, journal);
-          return { filesDownloaded, bytesDownloaded, filesSkipped, conflicts, aborted: true };
+          return {
+            filesDownloaded,
+            bytesDownloaded,
+            filesSkipped,
+            conflicts,
+            conflictPaths,
+            aborted: true,
+          };
         }
         if (resolution === "keep" || resolution === "skip") {
           filesSkipped++;
@@ -208,7 +236,14 @@ export async function sync(options: SyncOptions): Promise<SyncResult> {
 
   writeJournal(journalSlug, journal);
 
-  return { filesDownloaded, bytesDownloaded, filesSkipped, conflicts, aborted: false };
+  return {
+    filesDownloaded,
+    bytesDownloaded,
+    filesSkipped,
+    conflicts,
+    conflictPaths,
+    aborted: false,
+  };
 }
 
 /**
@@ -251,5 +286,9 @@ function defaultConsoleLogger(event: SyncProgressEvent): void {
     }
   } else if (event.type === "error") {
     console.error(`  ✗ ${event.path} — ${event.message}`);
+  } else if (event.type === "conflict") {
+    console.error(
+      `  ⚠ conflict (${event.direction}): ${event.path} — ${event.resolution}`,
+    );
   }
 }

package/src/ignore.test.ts

@@ -38,6 +38,22 @@ describe("createIgnoreFilter", () => {
     expect(shouldSync(path.join(hqRoot, "companies/indigo/notes.md"))).toBe(true);
   });
 
+  it("permissive mode: .hq-* internal state is ignored, .hqignore family + .hq/ still sync", () => {
+    const shouldSync = createIgnoreFilter(hqRoot);
+    // Internal state files that must never round-trip through the bucket.
+    expect(shouldSync(path.join(hqRoot, ".hq-sync.pid"))).toBe(false);
+    expect(shouldSync(path.join(hqRoot, ".hq-sync-journal.json"))).toBe(false);
+    expect(shouldSync(path.join(hqRoot, ".hq-sync-state.json"))).toBe(false);
+    expect(shouldSync(path.join(hqRoot, ".hq-embeddings-pending.json"))).toBe(false);
+    expect(shouldSync(path.join(hqRoot, "companies/indigo/.hq-foo.json"))).toBe(false);
+    expect(shouldSync(path.join(hqRoot, ".hq-cache/blob.bin"))).toBe(false);
+    // Sync-config files and the .hq/ directory still sync.
+    expect(shouldSync(path.join(hqRoot, ".hqignore"))).toBe(true);
+    expect(shouldSync(path.join(hqRoot, ".hqsyncignore"))).toBe(true);
+    expect(shouldSync(path.join(hqRoot, ".hqinclude"))).toBe(true);
+    expect(shouldSync(path.join(hqRoot, "companies/indigo/.hq/config.json"))).toBe(true);
+  });
+
   it("allowlist mode: presence of .hqinclude switches to opt-in", () => {
     fs.writeFileSync(
       path.join(hqRoot, ".hqinclude"),

package/src/ignore.ts

@@ -67,11 +67,13 @@ export const DEFAULT_IGNORES = [
   "tmp/",
   ".tmp/",
 
-  // HQ sync internal state (never round-trip these)
+  // HQ sync internal state (never round-trip these). The `.hq-*` wildcard
+  // covers `.hq-sync.pid`, `.hq-sync-journal.json`, `.hq-sync-state.json`,
+  // `.hq-embeddings-pending.json`, and any future internal-state file. The
+  // `.hqignore` / `.hqsyncignore` / `.hqinclude` config files don't match
+  // (no hyphen) and the `.hq/` directory is unaffected.
   "*.pid",
-  ".hq-sync.pid",
-  ".hq-sync-journal.json",
-  ".hq-sync-state.json",
+  ".hq-*",
   "modules.lock",
 
   // HQ repos directory (managed separately, not synced)