@indigoai-us/hq-cloud 6.18.59-alpha.0 → 6.18.60

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/dist/bin/sync-runner-watch-loop.d.ts.map +1 -1
  2. package/dist/bin/sync-runner-watch-loop.js +5 -2
  3. package/dist/bin/sync-runner-watch-loop.js.map +1 -1
  4. package/dist/bin/sync-runner.d.ts.map +1 -1
  5. package/dist/bin/sync-runner.js +8 -1
  6. package/dist/bin/sync-runner.js.map +1 -1
  7. package/dist/cli/share.d.ts.map +1 -1
  8. package/dist/cli/share.js +88 -9
  9. package/dist/cli/share.js.map +1 -1
  10. package/dist/cli/sync.d.ts.map +1 -1
  11. package/dist/cli/sync.js +46 -8
  12. package/dist/cli/sync.js.map +1 -1
  13. package/dist/conflict-notices.d.ts +18 -1
  14. package/dist/conflict-notices.d.ts.map +1 -1
  15. package/dist/conflict-notices.js +27 -2
  16. package/dist/conflict-notices.js.map +1 -1
  17. package/dist/hq-root-recovery.d.ts +57 -5
  18. package/dist/hq-root-recovery.d.ts.map +1 -1
  19. package/dist/hq-root-recovery.js +172 -3
  20. package/dist/hq-root-recovery.js.map +1 -1
  21. package/dist/ignore.d.ts +29 -1
  22. package/dist/ignore.d.ts.map +1 -1
  23. package/dist/ignore.js +46 -5
  24. package/dist/ignore.js.map +1 -1
  25. package/dist/index.d.ts +1 -1
  26. package/dist/index.d.ts.map +1 -1
  27. package/dist/index.js +1 -1
  28. package/dist/index.js.map +1 -1
  29. package/dist/lib/conflict-index.d.ts +22 -0
  30. package/dist/lib/conflict-index.d.ts.map +1 -1
  31. package/dist/lib/conflict-index.js +62 -1
  32. package/dist/lib/conflict-index.js.map +1 -1
  33. package/dist/personal-vault.d.ts.map +1 -1
  34. package/dist/personal-vault.js +2 -1
  35. package/dist/personal-vault.js.map +1 -1
  36. package/dist/session-log-capture.d.ts +10 -0
  37. package/dist/session-log-capture.d.ts.map +1 -1
  38. package/dist/session-log-capture.js +140 -14
  39. package/dist/session-log-capture.js.map +1 -1
  40. package/dist/sync-decision-log.d.ts +1 -1
  41. package/dist/sync-decision-log.d.ts.map +1 -1
  42. package/dist/sync-decision-log.js.map +1 -1
  43. package/dist/watch-owner-lease.d.ts +14 -0
  44. package/dist/watch-owner-lease.d.ts.map +1 -1
  45. package/dist/watch-owner-lease.js +17 -0
  46. package/dist/watch-owner-lease.js.map +1 -1
  47. package/package.json +1 -1
@@ -11,8 +11,25 @@ export interface ConflictParkedNotice {
11
11
  sideKept: ConflictKeptSide;
12
12
  parkedAt: string;
13
13
  }
14
- export type RecordConflictParkedInput = Omit<ConflictParkedNotice, "id">;
14
+ export type RecordConflictParkedInput = Omit<ConflictParkedNotice, "id"> & {
15
+ /**
16
+ * Hash of the local body and normalized etag of the remote version at park
17
+ * time. With scope and path they identify one divergence and derive the
18
+ * notice id. They are inputs only: the stored notice stays content-free.
19
+ */
20
+ localHash?: string;
21
+ remoteEtag?: string;
22
+ };
15
23
  export declare function conflictNoticeId(scope: "company" | "personal", companySlug: string | null, backupPath: string): string;
24
+ /**
25
+ * Id of the divergence a notice reports: (scope, company, path, local hash,
26
+ * remote etag). The backup path carries a timestamp, so ids derived from it
27
+ * made every re-park of an unchanged file a new notice; 29 of the 50 queued
28
+ * notices on 2026-10-10 were repeats of 3 INDEX.md files and evicted real
29
+ * conflicts from the bounded queue. Repeats of one divergence now share an
30
+ * id, so they neither re-queue nor re-announce after an acknowledgement.
31
+ */
32
+ export declare function conflictDivergenceNoticeId(scope: "company" | "personal", companySlug: string | null, relativePath: string, localHash: string, remoteEtag: string): string;
16
33
  /** Record only after the caller has confirmed that the backup was written. */
17
34
  export declare function recordConflictParked(input: RecordConflictParkedInput): ConflictParkedNotice;
18
35
  /** Append a tombstone in a separate O_APPEND file; it never rewrites runner data. */
@@ -1 +1 @@
1
- {"version":3,"file":"conflict-notices.d.ts","sourceRoot":"","sources":["../src/conflict-notices.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAE/C,MAAM,MAAM,oBAAoB,GAC5B,aAAa,GACb,cAAc,GACd,8BAA8B,CAAC;AACnC,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,QAAQ,CAAC;AAElD,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,SAAS,GAAG,UAAU,CAAC;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,oBAAoB,CAAC;IACnC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;AAiCzE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEtH;AA+FD,8EAA8E;AAC9E,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,oBAAoB,CAkB3F;AAGD,qFAAqF;AACrF,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,SAA2B,GAAG,IAAI,CAarG;AAED,wBAAgB,0BAA0B,IAAI,oBAAoB,EAAE,CAKnE"}
1
+ {"version":3,"file":"conflict-notices.d.ts","sourceRoot":"","sources":["../src/conflict-notices.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAE/C,MAAM,MAAM,oBAAoB,GAC5B,aAAa,GACb,cAAc,GACd,8BAA8B,CAAC;AACnC,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,QAAQ,CAAC;AAElD,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,SAAS,GAAG,UAAU,CAAC;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,oBAAoB,CAAC;IACnC,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,GAAG;IACzE;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAiCF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEtH;AAED;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,SAAS,GAAG,UAAU,EAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,MAAM,CASR;AA4GD,8EAA8E;AAC9E,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,GAAG,oBAAoB,CAmB3F;AAGD,qFAAqF;AACrF,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,SAA2B,GAAG,IAAI,CAarG;AAED,wBAAgB,0BAA0B,IAAI,oBAAoB,EAAE,CAKnE"}
@@ -25,6 +25,30 @@ function lockRoot() {
25
25
  export function conflictNoticeId(scope, companySlug, backupPath) {
26
26
  return createHash("sha256").update(scope).update("\0").update(companySlug ?? "").update("\0").update(backupPath).digest("hex");
27
27
  }
28
+ /**
29
+ * Id of the divergence a notice reports: (scope, company, path, local hash,
30
+ * remote etag). The backup path carries a timestamp, so ids derived from it
31
+ * made every re-park of an unchanged file a new notice; 29 of the 50 queued
32
+ * notices on 2026-10-10 were repeats of 3 INDEX.md files and evicted real
33
+ * conflicts from the bounded queue. Repeats of one divergence now share an
34
+ * id, so they neither re-queue nor re-announce after an acknowledgement.
35
+ */
36
+ export function conflictDivergenceNoticeId(scope, companySlug, relativePath, localHash, remoteEtag) {
37
+ return createHash("sha256")
38
+ .update("divergence-v1")
39
+ .update("\0").update(scope)
40
+ .update("\0").update(companySlug ?? "")
41
+ .update("\0").update(relativePath)
42
+ .update("\0").update(localHash)
43
+ .update("\0").update(remoteEtag)
44
+ .digest("hex");
45
+ }
46
+ function noticeIdFor(input) {
47
+ if (input.localHash && input.remoteEtag) {
48
+ return conflictDivergenceNoticeId(input.scope, input.companySlug, input.relativePath, input.localHash, input.remoteEtag);
49
+ }
50
+ return conflictNoticeId(input.scope, input.companySlug, input.backupPath);
51
+ }
28
52
  function readNotices() {
29
53
  try {
30
54
  const parsed = JSON.parse(fs.readFileSync(noticesPath(), "utf8"));
@@ -127,9 +151,10 @@ function validateInput(input) {
127
151
  /** Record only after the caller has confirmed that the backup was written. */
128
152
  export function recordConflictParked(input) {
129
153
  validateInput(input);
154
+ const { localHash: _localHash, remoteEtag: _remoteEtag, ...stored } = input;
130
155
  const notice = {
131
- ...input,
132
- id: conflictNoticeId(input.scope, input.companySlug, input.backupPath),
156
+ ...stored,
157
+ id: noticeIdFor(input),
133
158
  };
134
159
  return withOperationLockSync(lockRoot(), "conflict-notices", () => {
135
160
  const acknowledged = readAcknowledgedIds();
@@ -1 +1 @@
1
- {"version":3,"file":"conflict-notices.js","sourceRoot":"","sources":["../src/conflict-notices.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,CAAC;AA+B/C,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,uBAAuB,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,4BAA4B,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,QAAQ;IACf,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAA6B,EAAE,WAA0B,EAAE,UAAkB;IAC5G,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACjI,CAAC;AAED,SAAS,WAAW;IAClB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,MAAM,CAAC,CAAe,CAAC;QAChF,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,MAAM,CAAC,OAAO,CAAC;IACxB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QAClE,kBAAkB,CAAC,YAAY,EAAE,sCAAsC,EAAE,KAAK,EAAE;YAC9E,cAAc,EAAE,KAAK;SACtB,CAAC,CAAC;QACH,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB;IAC1B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;QAC9B,IAAI,kBAAkB,GAAG,CAAC,CAAC;QAC3B,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAsB,CAAC;gBACrD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,OAAO,MAAM,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;oBACnF,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;gBACxE,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrB,CAAC;YAAC,MAAM,CAAC;gBACP,kBAAkB,IAAI,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QACD,IAAI,kBAAkB,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;YAC3E,KAAK,CAAC,IAAI,GAAG,kCAAkC,kBAAkB,EAAE,CAAC;YACpE,kBAAkB,CAAC,YAAY,EAAE,wCAAwC,EAAE,KAAK,EAAE;gBAChF,cAAc,EAAE,KAAK;aACtB,CAAC,CAAC;QACL,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,GAAG,EAAE,CAAC;QACzE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,OAA+B;IACzD,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;IAC3B,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC;IACvD,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACxC,IAAI,CAAC;QACH,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAuB,CAAC,CAAC,CAAC;QAClF,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC;IACD,IAAI,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO;YAAE,MAAM,KAAK,CAAC;QACnG,2EAA2E;QAC3E,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QACjE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QACnD,IAAI,CAAC;YACH,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;gBAAS,CAAC;YACT,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,KAAgC;IACrD,MAAM,YAAY,GAAG,CAAC,KAAa,EAAW,EAAE,CAC9C,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAC3C,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,CAAC,CAAC;IACzF,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;QAC3G,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IACD,IAAI,KAAK,CAAC,KAAK,KAAK,UAAU,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IACzI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC;QACpE,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAChF,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IAC/E,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,oBAAoB,CAAC,KAAgC;IACnE,aAAa,CAAC,KAAK,CAAC,CAAC;IACrB,MAAM,MAAM,GAAyB;QACnC,GAAG,KAAK;QACR,EAAE,EAAE,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC;KACvE,CAAC;IACF,OAAO,qBAAqB,CAAC,QAAQ,EAAE,EAAE,kBAAkB,EAAE,GAAG,EAAE;QAChE,MAAM,YAAY,GAAG,mBAAmB,EAAE,CAAC;QAC3C,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;QAChE,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9B,2EAA2E;QAC3E,4EAA4E;QAC5E,IAAI,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAAE,OAAO,MAAM,CAAC;QAC/C,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACtE,kBAAkB,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAC9E,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC;AAGD,qFAAqF;AACrF,MAAM,UAAU,yBAAyB,CAAC,EAAU,EAAE,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;IAC7F,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACvF,MAAM,KAAK,GAAG,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,mBAAmB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC5F,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;IACxB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACzC,IAAI,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,cAAc,EAA8B,CAAC,IAAI,CAAC,CAAC;QAC5F,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,0BAA0B;IACxC,MAAM,YAAY,GAAG,mBAAmB,EAAE,CAAC;IAC3C,OAAO,WAAW,EAAE;SACjB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SAChD,KAAK,CAAC,CAAC,4BAA4B,CAAC,CAAC;AAC1C,CAAC"}
1
+ {"version":3,"file":"conflict-notices.js","sourceRoot":"","sources":["../src/conflict-notices.ts"],"names":[],"mappings":"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"}
@@ -10,20 +10,72 @@
10
10
  * which survived the 2026-09-18 wipe that removed `core/`, `personal/`, and
11
11
  * `.git` while leaving the sync daemon running.
12
12
  */
13
- export type GitSidecarAction = "restored" | "snapshotted" | "unchanged" | "absent";
13
+ import * as fs from "fs";
14
+ export type GitSidecarAction = "restored" | "snapshotted" | "unchanged" | "absent"
15
+ /** A background snapshot failed; the error was logged. */
16
+ | "failed"
17
+ /** A background snapshot was skipped because a recent attempt failed. */
18
+ | "deferred"
19
+ /** A background snapshot was skipped: the copy would not leave the free-space reserve. */
20
+ | "insufficient-space";
14
21
  export declare function gitSidecarDir(hqRoot: string, homeDir?: string): string;
15
22
  export declare function shouldCopyGitSidecarEntry(src: string): boolean;
23
+ /**
24
+ * Only regular files, directories, and symlinks belong in the sidecar. Git's
25
+ * builtin fsmonitor leaves a Unix socket named `fsmonitor--daemon.ipc` in
26
+ * `.git`; Node 22's `fs.cpSync` hits an internal "Unreachable code" assertion
27
+ * on a socket, and FIFOs and device nodes are refused too, so one such entry
28
+ * made every snapshot fail. An entry that vanished mid-copy is skipped too.
29
+ */
30
+ export declare function isCopyableGitSidecarStats(stats: fs.Stats): boolean;
16
31
  export declare function snapshotHqGit(hqRoot: string, opts?: {
17
32
  homeDir?: string;
18
33
  }): GitSidecarAction;
34
+ /** Wait this long before retrying a background snapshot that failed. */
35
+ export declare const GIT_SIDECAR_RETRY_AFTER_MS: number;
36
+ /**
37
+ * Free space the sidecar copy must leave on the destination volume. The HQ
38
+ * `.git` can be larger than the disk's remaining space; filling the disk
39
+ * stops sync itself (ENOSPC on its own lock and state files).
40
+ */
41
+ export declare const GIT_SIDECAR_MIN_FREE_BYTES: number;
42
+ export interface GitSidecarSnapshotOptions {
43
+ homeDir?: string;
44
+ /** Test seam; production uses Date.now. */
45
+ now?: () => number;
46
+ retryAfterMs?: number;
47
+ /** Test seam; production reads `fs.promises.statfs` for the destination volume. */
48
+ freeBytes?: (dir: string) => Promise<number>;
49
+ minFreeBytes?: number;
50
+ }
51
+ /**
52
+ * Snapshot `.git` without blocking the caller's event loop. The HQ `.git` can
53
+ * be many gigabytes, and the watch runner calls this at startup and on every
54
+ * pass, so the copy runs on libuv's threadpool through `fs.promises.cp`.
55
+ * Concurrent calls for one sidecar share a single copy, and after a failed
56
+ * copy the next attempt waits `retryAfterMs` instead of recopying every pass.
57
+ * The copy is skipped when it would leave less than `minFreeBytes` free on
58
+ * the destination volume.
59
+ * The returned promise never rejects.
60
+ */
61
+ export declare function snapshotHqGitInBackground(hqRoot: string, opts?: GitSidecarSnapshotOptions): Promise<GitSidecarAction>;
19
62
  export declare function restoreHqGitIfMissing(hqRoot: string, opts?: {
20
63
  homeDir?: string;
21
64
  }): GitSidecarAction;
22
65
  export declare function ensureLocalLayoutDirs(hqRoot: string): number;
66
+ export interface HqRootRecoveryResult {
67
+ layoutCreated: number;
68
+ /** "restored" when `.git` came back from the sidecar; otherwise "scheduled". */
69
+ git: GitSidecarAction | "scheduled";
70
+ /** Settles when the background `.git` snapshot finishes; never rejects. */
71
+ snapshot?: Promise<GitSidecarAction>;
72
+ }
73
+ /**
74
+ * Restore `.git` and the empty layout dirs synchronously (sync must see them),
75
+ * then refresh the `.git` sidecar in the background so a large repository
76
+ * never stalls the watch runner's event loop.
77
+ */
23
78
  export declare function recoverHqRootLocalState(hqRoot: string, opts?: {
24
79
  homeDir?: string;
25
- }): {
26
- layoutCreated: number;
27
- git: GitSidecarAction;
28
- };
80
+ }): HqRootRecoveryResult;
29
81
  //# sourceMappingURL=hq-root-recovery.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"hq-root-recovery.d.ts","sourceRoot":"","sources":["../src/hq-root-recovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAUH,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,CAAC;AAEnF,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,MAAqB,GAAG,MAAM,CAEpF;AAMD,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE9D;AAkBD,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9B,gBAAgB,CA4BlB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9B,gBAAgB,CAkBlB;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAmB5D;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9B;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,gBAAgB,CAAA;CAAE,CAQlD"}
1
+ {"version":3,"file":"hq-root-recovery.d.ts","sourceRoot":"","sources":["../src/hq-root-recovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAQzB,MAAM,MAAM,gBAAgB,GACxB,UAAU,GACV,aAAa,GACb,WAAW,GACX,QAAQ;AACV,0DAA0D;GACxD,QAAQ;AACV,yEAAyE;GACvE,UAAU;AACZ,0FAA0F;GACxF,oBAAoB,CAAC;AAEzB,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,MAAqB,GAAG,MAAM,CAEpF;AAMD,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,GAAG,OAAO,CAElE;AAoCD,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9B,gBAAgB,CA4BlB;AAED,wEAAwE;AACxE,eAAO,MAAM,0BAA0B,QAAc,CAAC;AAEtD;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,QAAgB,CAAC;AAExD,MAAM,WAAW,yBAAyB;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2CAA2C;IAC3C,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mFAAmF;IACnF,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AA8FD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,yBAA8B,GACnC,OAAO,CAAC,gBAAgB,CAAC,CAuB3B;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9B,gBAAgB,CAkBlB;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAmB5D;AAED,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,gFAAgF;IAChF,GAAG,EAAE,gBAAgB,GAAG,WAAW,CAAC;IACpC,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACtC;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC9B,oBAAoB,CAStB"}
@@ -24,6 +24,36 @@ function isGitLockName(name) {
24
24
  export function shouldCopyGitSidecarEntry(src) {
25
25
  return !isGitLockName(path.basename(src));
26
26
  }
27
+ /**
28
+ * Only regular files, directories, and symlinks belong in the sidecar. Git's
29
+ * builtin fsmonitor leaves a Unix socket named `fsmonitor--daemon.ipc` in
30
+ * `.git`; Node 22's `fs.cpSync` hits an internal "Unreachable code" assertion
31
+ * on a socket, and FIFOs and device nodes are refused too, so one such entry
32
+ * made every snapshot fail. An entry that vanished mid-copy is skipped too.
33
+ */
34
+ export function isCopyableGitSidecarStats(stats) {
35
+ return stats.isFile() || stats.isDirectory() || stats.isSymbolicLink();
36
+ }
37
+ function gitSidecarCopyFilterSync(src) {
38
+ if (!shouldCopyGitSidecarEntry(src))
39
+ return false;
40
+ try {
41
+ return isCopyableGitSidecarStats(fs.lstatSync(src));
42
+ }
43
+ catch {
44
+ return false;
45
+ }
46
+ }
47
+ async function gitSidecarCopyFilter(src) {
48
+ if (!shouldCopyGitSidecarEntry(src))
49
+ return false;
50
+ try {
51
+ return isCopyableGitSidecarStats(await fs.promises.lstat(src));
52
+ }
53
+ catch {
54
+ return false;
55
+ }
56
+ }
27
57
  function readHead(gitDir) {
28
58
  try {
29
59
  return fs.readFileSync(path.join(gitDir, "HEAD"), "utf8");
@@ -55,7 +85,7 @@ export function snapshotHqGit(hqRoot, opts = {}) {
55
85
  fs.mkdirSync(path.dirname(dest), { recursive: true });
56
86
  fs.cpSync(gitDir, staging, {
57
87
  recursive: true,
58
- filter: shouldCopyGitSidecarEntry,
88
+ filter: gitSidecarCopyFilterSync,
59
89
  });
60
90
  fs.rmSync(dest, { recursive: true, force: true });
61
91
  fs.renameSync(staging, dest);
@@ -72,6 +102,139 @@ export function snapshotHqGit(hqRoot, opts = {}) {
72
102
  return "absent";
73
103
  }
74
104
  }
105
+ /** Wait this long before retrying a background snapshot that failed. */
106
+ export const GIT_SIDECAR_RETRY_AFTER_MS = 30 * 60_000;
107
+ /**
108
+ * Free space the sidecar copy must leave on the destination volume. The HQ
109
+ * `.git` can be larger than the disk's remaining space; filling the disk
110
+ * stops sync itself (ENOSPC on its own lock and state files).
111
+ */
112
+ export const GIT_SIDECAR_MIN_FREE_BYTES = 2 * 1024 ** 3;
113
+ async function defaultFreeBytes(dir) {
114
+ const stats = await fs.promises.statfs(dir);
115
+ return Number(stats.bavail) * Number(stats.bsize);
116
+ }
117
+ /** Bytes the filtered copy of `dir` would write (regular files only). */
118
+ async function copyableSizeBytes(dir) {
119
+ let total = 0;
120
+ const pending = [dir];
121
+ while (pending.length > 0) {
122
+ const current = pending.pop();
123
+ let entries;
124
+ try {
125
+ entries = await fs.promises.readdir(current, { withFileTypes: true });
126
+ }
127
+ catch {
128
+ continue;
129
+ }
130
+ for (const entry of entries) {
131
+ const full = path.join(current, entry.name);
132
+ if (!shouldCopyGitSidecarEntry(full))
133
+ continue;
134
+ if (entry.isDirectory()) {
135
+ pending.push(full);
136
+ }
137
+ else if (entry.isFile()) {
138
+ try {
139
+ total += (await fs.promises.lstat(full)).size;
140
+ }
141
+ catch {
142
+ /* vanished mid-walk */
143
+ }
144
+ }
145
+ }
146
+ }
147
+ return total;
148
+ }
149
+ const inFlightSnapshots = new Map();
150
+ const failedSnapshotAt = new Map();
151
+ async function readHeadAsync(gitDir) {
152
+ try {
153
+ return await fs.promises.readFile(path.join(gitDir, "HEAD"), "utf8");
154
+ }
155
+ catch {
156
+ return null;
157
+ }
158
+ }
159
+ async function snapshotHqGitAsync(hqRoot, dest, opts) {
160
+ const gitDir = path.join(hqRoot, ".git");
161
+ try {
162
+ if (!(await fs.promises.lstat(gitDir)).isDirectory())
163
+ return "absent";
164
+ }
165
+ catch {
166
+ return "absent";
167
+ }
168
+ const currentHead = await readHeadAsync(gitDir);
169
+ if (currentHead !== null && currentHead === (await readHeadAsync(dest))) {
170
+ return "unchanged";
171
+ }
172
+ const staging = `${dest}.tmp`;
173
+ try {
174
+ await fs.promises.rm(staging, { recursive: true, force: true });
175
+ await fs.promises.mkdir(path.dirname(dest), { recursive: true });
176
+ const needed = await copyableSizeBytes(gitDir);
177
+ const free = await (opts.freeBytes ?? defaultFreeBytes)(path.dirname(dest));
178
+ const reserve = opts.minFreeBytes ?? GIT_SIDECAR_MIN_FREE_BYTES;
179
+ if (free - needed < reserve) {
180
+ console.warn(`hq-root-recovery: git sidecar snapshot skipped: needs ${needed} bytes and would leave ` +
181
+ `${Math.max(0, free - needed)} of the ${reserve}-byte free-space reserve`);
182
+ return "insufficient-space";
183
+ }
184
+ await fs.promises.cp(gitDir, staging, {
185
+ recursive: true,
186
+ filter: gitSidecarCopyFilter,
187
+ });
188
+ await fs.promises.rm(dest, { recursive: true, force: true });
189
+ await fs.promises.rename(staging, dest);
190
+ return "snapshotted";
191
+ }
192
+ catch (err) {
193
+ try {
194
+ await fs.promises.rm(staging, { recursive: true, force: true });
195
+ }
196
+ catch {
197
+ /* staging is best-effort */
198
+ }
199
+ console.warn("hq-root-recovery: git sidecar snapshot failed:", err);
200
+ return "failed";
201
+ }
202
+ }
203
+ /**
204
+ * Snapshot `.git` without blocking the caller's event loop. The HQ `.git` can
205
+ * be many gigabytes, and the watch runner calls this at startup and on every
206
+ * pass, so the copy runs on libuv's threadpool through `fs.promises.cp`.
207
+ * Concurrent calls for one sidecar share a single copy, and after a failed
208
+ * copy the next attempt waits `retryAfterMs` instead of recopying every pass.
209
+ * The copy is skipped when it would leave less than `minFreeBytes` free on
210
+ * the destination volume.
211
+ * The returned promise never rejects.
212
+ */
213
+ export function snapshotHqGitInBackground(hqRoot, opts = {}) {
214
+ const dest = gitSidecarDir(hqRoot, opts.homeDir ?? os.homedir());
215
+ const existing = inFlightSnapshots.get(dest);
216
+ if (existing)
217
+ return existing;
218
+ const now = opts.now ?? Date.now;
219
+ const failedAt = failedSnapshotAt.get(dest);
220
+ if (failedAt !== undefined &&
221
+ now() - failedAt < (opts.retryAfterMs ?? GIT_SIDECAR_RETRY_AFTER_MS)) {
222
+ return Promise.resolve("deferred");
223
+ }
224
+ const task = snapshotHqGitAsync(hqRoot, dest, opts)
225
+ .then((action) => {
226
+ if (action === "failed" || action === "insufficient-space")
227
+ failedSnapshotAt.set(dest, now());
228
+ else
229
+ failedSnapshotAt.delete(dest);
230
+ return action;
231
+ })
232
+ .finally(() => {
233
+ inFlightSnapshots.delete(dest);
234
+ });
235
+ inFlightSnapshots.set(dest, task);
236
+ return task;
237
+ }
75
238
  export function restoreHqGitIfMissing(hqRoot, opts = {}) {
76
239
  const gitDir = path.join(hqRoot, ".git");
77
240
  if (isGitDirectory(gitDir))
@@ -119,13 +282,19 @@ export function ensureLocalLayoutDirs(hqRoot) {
119
282
  }
120
283
  return created;
121
284
  }
285
+ /**
286
+ * Restore `.git` and the empty layout dirs synchronously (sync must see them),
287
+ * then refresh the `.git` sidecar in the background so a large repository
288
+ * never stalls the watch runner's event loop.
289
+ */
122
290
  export function recoverHqRootLocalState(hqRoot, opts = {}) {
123
291
  const git = restoreHqGitIfMissing(hqRoot, opts);
124
292
  const layoutCreated = ensureLocalLayoutDirs(hqRoot);
125
- const snap = snapshotHqGit(hqRoot, opts);
293
+ const snapshot = snapshotHqGitInBackground(hqRoot, opts);
126
294
  return {
127
295
  layoutCreated,
128
- git: git === "restored" ? "restored" : snap,
296
+ git: git === "restored" ? "restored" : "scheduled",
297
+ snapshot,
129
298
  };
130
299
  }
131
300
  //# sourceMappingURL=hq-root-recovery.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"hq-root-recovery.js","sourceRoot":"","sources":["../src/hq-root-recovery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hq-root-recovery.js","sourceRoot":"","sources":["../src/hq-root-recovery.ts"],"names":[],"mappings":"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"}
package/dist/ignore.d.ts CHANGED
@@ -81,11 +81,39 @@ export declare function isIndexMarkdownBasename(name: string): boolean;
81
81
  * True when `absPath` is an HQ-generated INDEX.md / index.md (the
82
82
  * `> Auto-generated.` marker from index-md-spec). Hand-authored files of the
83
83
  * same name — common in imported knowledge bases — return false so they sync.
84
+ * The check applies to a file of that name at any depth, not only under
85
+ * `companies/<slug>/`; the content marker is what limits it to HQ output.
86
+ *
87
+ * The verdict comes from the object on disk, never from the caller's kind
88
+ * hint. The pull planner cannot know a remote key's kind from LIST, so it
89
+ * probes the filter with BOTH `isDir=false` and `isDir=true` and syncs the key
90
+ * when either passes. This used to return false for every `isDir=true` probe,
91
+ * which let a generated `companies/<slug>/INDEX.md` through the pull side
92
+ * while the push walker (which knows the kind) excluded it. The pull then
93
+ * parked the never-uploaded local copy against a stale remote, the watcher
94
+ * warm-up retired the journal row as ignored, and the next pull parked it
95
+ * again (66 parks of 5 distinct files on 2026-10-09/10). A real directory
96
+ * named INDEX.md is not a regular file and still returns false.
84
97
  *
85
98
  * Read is bounded (512 bytes) and only runs for that basename. Unreadable
86
99
  * files fail open (sync) so a permission error cannot silently drop content.
100
+ * Absent paths (a remote-only key) and directories are quietly not generated.
101
+ */
102
+ export declare function isHqGeneratedIndexFile(absPath: string, _isDir?: boolean): boolean;
103
+ /**
104
+ * The single "is this path out of sync scope?" verdict for callers that do
105
+ * not know the object's kind: the pull planner (LIST has no kind), the watcher
106
+ * warm-up journal sweep, and the personal-vault ignored-row purge. A path is
107
+ * excluded only when the filter rejects it under BOTH kind hints, which is the
108
+ * same rule the pull planner has always used so that a symlink record at a
109
+ * dir-only allowlisted path still pulls. The push walker knows each object's
110
+ * kind and probes the filter with it directly; for a regular file both forms
111
+ * agree because `isHqGeneratedIndexFile` ignores the hint.
112
+ *
113
+ * Keeping every kind-agnostic caller on this one function is what stops pull,
114
+ * warm-up and purge from disagreeing about a path that push already skips.
87
115
  */
88
- export declare function isHqGeneratedIndexFile(absPath: string, isDir?: boolean): boolean;
116
+ export declare function isPathExcludedFromSync(shouldSync: (filePath: string, isDir?: boolean, knownRelativePath?: string) => boolean, absPath: string, knownRelativePath?: string): boolean;
89
117
  export declare const EXPECTED_IGNORE_SEGMENTS: Set<string>;
90
118
  /**
91
119
  * Classify a base-ignore rejection as expected noise vs noteworthy content.
@@ -1 +1 @@
1
- {"version":3,"file":"ignore.d.ts","sourceRoot":"","sources":["../src/ignore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAGH,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAkB7B,eAAO,MAAM,eAAe,UA4N3B,CAAC;AAEF,sEAAsE;AACtE,MAAM,WAAW,2BAA2B;IAC1C,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IACtC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;CACxC;AA0FD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAG5D;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAG7D;AAKD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,UAAQ,GAAG,OAAO,CAgB9E;AAED,eAAO,MAAM,wBAAwB,aA8BnC,CAAC;AAEH;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAmDzD;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAW9D;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,wBAAwB,SAAU,CAAC;AAEhD;;;;;;;GAOG;AACH,eAAO,MAAM,+BAA+B,QAAS,CAAC;AAEtD,4EAA4E;AAC5E,MAAM,WAAW,iBAAiB;IAChC,kCAAkC;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,+DAA+D;IAC/D,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,kBAAkB,EAAE,MAAM,CAAC;IAC3B,oFAAoF;IACpF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,8EAA8E;IAC9E,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,4EAA4E;AAC5E,MAAM,WAAW,yBAAyB;IACxC,+FAA+F;IAC/F,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sEAAsE;IACtE,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,2DAA2D;IAC3D,cAAc,CAAC,EAAE,2BAA2B,CAAC;IAC7C,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,IAAI,CAAC,QAAQ,CAAC;CACrC;AAED,yEAAyE;AACzE,MAAM,WAAW,YAAY;IAC3B,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACzE,UAAU,IAAI,MAAM,CAAC;CACtB;AA4JD;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,IAAI,CAAC,yBAAyB,EAAE,cAAc,GAAG,gBAAgB,CAAM,GAC/E,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAYhD;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,yBAA8B,GACtC,YAAY,CAiGd;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,QAAQ,SAAmB,GAC1B,OAAO,CAQT"}
1
+ {"version":3,"file":"ignore.d.ts","sourceRoot":"","sources":["../src/ignore.ts"],"names":[],"mappings":"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"}
package/dist/ignore.js CHANGED
@@ -385,8 +385,15 @@ export function hasControlCharacters(relPath) {
385
385
  // eslint-disable-next-line no-control-regex
386
386
  return /[\x00-\x1F\x7F]/.test(relPath);
387
387
  }
388
- /** HQ's own generated INDEX.md files open with this blockquote (index-md-spec). */
389
- const HQ_GENERATED_INDEX_MARK = />\s*Auto-generated\./;
388
+ /**
389
+ * HQ's own generated INDEX.md files carry this markdown blockquote line near
390
+ * the top (index-md-spec): `> Auto-generated.` on its own, or the older
391
+ * `> Auto-generated. Updated: YYYY-MM-DD`. The marker must open a line (up to
392
+ * three spaces of indent, as a markdown blockquote allows). An unanchored
393
+ * `>` also matched HTML such as `<em>Auto-generated.</em>` in a hand-authored
394
+ * file, which then stopped syncing in both directions.
395
+ */
396
+ const HQ_GENERATED_INDEX_MARK = /^ {0,3}>[ \t]*Auto-generated\./m;
390
397
  export function isIndexMarkdownBasename(name) {
391
398
  return name.toLowerCase() === "index.md";
392
399
  }
@@ -394,18 +401,32 @@ export function isIndexMarkdownBasename(name) {
394
401
  * True when `absPath` is an HQ-generated INDEX.md / index.md (the
395
402
  * `> Auto-generated.` marker from index-md-spec). Hand-authored files of the
396
403
  * same name — common in imported knowledge bases — return false so they sync.
404
+ * The check applies to a file of that name at any depth, not only under
405
+ * `companies/<slug>/`; the content marker is what limits it to HQ output.
406
+ *
407
+ * The verdict comes from the object on disk, never from the caller's kind
408
+ * hint. The pull planner cannot know a remote key's kind from LIST, so it
409
+ * probes the filter with BOTH `isDir=false` and `isDir=true` and syncs the key
410
+ * when either passes. This used to return false for every `isDir=true` probe,
411
+ * which let a generated `companies/<slug>/INDEX.md` through the pull side
412
+ * while the push walker (which knows the kind) excluded it. The pull then
413
+ * parked the never-uploaded local copy against a stale remote, the watcher
414
+ * warm-up retired the journal row as ignored, and the next pull parked it
415
+ * again (66 parks of 5 distinct files on 2026-10-09/10). A real directory
416
+ * named INDEX.md is not a regular file and still returns false.
397
417
  *
398
418
  * Read is bounded (512 bytes) and only runs for that basename. Unreadable
399
419
  * files fail open (sync) so a permission error cannot silently drop content.
420
+ * Absent paths (a remote-only key) and directories are quietly not generated.
400
421
  */
401
- export function isHqGeneratedIndexFile(absPath, isDir = false) {
402
- if (isDir)
403
- return false;
422
+ export function isHqGeneratedIndexFile(absPath, _isDir = false) {
404
423
  if (!isIndexMarkdownBasename(path.basename(absPath)))
405
424
  return false;
406
425
  try {
407
426
  const fd = fs.openSync(absPath, "r");
408
427
  try {
428
+ if (!fs.fstatSync(fd).isFile())
429
+ return false;
409
430
  const buf = Buffer.alloc(512);
410
431
  const n = fs.readSync(fd, buf, 0, 512, 0);
411
432
  return HQ_GENERATED_INDEX_MARK.test(buf.toString("utf8", 0, n));
@@ -415,10 +436,30 @@ export function isHqGeneratedIndexFile(absPath, isDir = false) {
415
436
  }
416
437
  }
417
438
  catch (error) {
439
+ const code = error?.code;
440
+ if (code === "ENOENT" || code === "ENOTDIR" || code === "EISDIR")
441
+ return false;
418
442
  noteSwallowedError(logSwallowed, "hq-cloud.ignore_index_read_failed", error);
419
443
  return false;
420
444
  }
421
445
  }
446
+ /**
447
+ * The single "is this path out of sync scope?" verdict for callers that do
448
+ * not know the object's kind: the pull planner (LIST has no kind), the watcher
449
+ * warm-up journal sweep, and the personal-vault ignored-row purge. A path is
450
+ * excluded only when the filter rejects it under BOTH kind hints, which is the
451
+ * same rule the pull planner has always used so that a symlink record at a
452
+ * dir-only allowlisted path still pulls. The push walker knows each object's
453
+ * kind and probes the filter with it directly; for a regular file both forms
454
+ * agree because `isHqGeneratedIndexFile` ignores the hint.
455
+ *
456
+ * Keeping every kind-agnostic caller on this one function is what stops pull,
457
+ * warm-up and purge from disagreeing about a path that push already skips.
458
+ */
459
+ export function isPathExcludedFromSync(shouldSync, absPath, knownRelativePath) {
460
+ return (!shouldSync(absPath, false, knownRelativePath) &&
461
+ !shouldSync(absPath, true, knownRelativePath));
462
+ }
422
463
  export const EXPECTED_IGNORE_SEGMENTS = new Set([
423
464
  ".git",
424
465
  "node_modules",