@indigoai-us/hq-cloud 6.18.49 → 6.18.50-alpha.0

package/dist/symlink-target-policy.js

@@ -4,6 +4,86 @@ import fs from "node:fs";
 export function personalSymlinkTargetLinkPath(relativePath) {
     return relativePath;
 }
+/** Inspect a local link without relying on a previous push pass to resolve policy. */
+export function inspectLocalSymlinkScope(input) {
+    let stat;
+    try {
+        stat = fs.lstatSync(input.absoluteLinkPath);
+    }
+    catch {
+        return { isSymlink: false, classification: "in-scope", refused: false, shape: "missing" };
+    }
+    if (!stat.isSymbolicLink()) {
+        return { isSymlink: false, classification: "in-scope", refused: false, shape: "regular" };
+    }
+    const refuse = (classification, shape) => ({
+        isSymlink: true,
+        classification,
+        refused: true,
+        shape,
+    });
+    let target;
+    try {
+        target = fs.readlinkSync(input.absoluteLinkPath);
+    }
+    catch {
+        return refuse("escapes-scope", "unreadable-link");
+    }
+    const targetIsAbsolute = path.isAbsolute(target) || path.win32.isAbsolute(target);
+    let lexicalClassification;
+    if (targetIsAbsolute && isLegacyAbsoluteKnowledgeLink(input.linkPath, target, input.scopeRoot, input.scope)) {
+        return { isSymlink: true, classification: "allowlisted-legacy", refused: false, shape: "allowlisted-legacy" };
+    }
+    if (!targetIsAbsolute) {
+        const lexical = inspectSymlinkTarget({
+            linkPath: input.linkPath,
+            target,
+            scope: input.scope,
+            refuse: true,
+            emit: () => undefined,
+        });
+        if (lexical.refused) {
+            return refuse(lexical.classification, redactShape(target, lexical.classification));
+        }
+        if (lexical.classification === "allowlisted-legacy") {
+            return { isSymlink: true, classification: lexical.classification, refused: false, shape: "allowlisted-legacy" };
+        }
+        lexicalClassification = lexical.classification;
+    }
+    let canonicalScope;
+    try {
+        canonicalScope = fs.realpathSync.native(input.scopeRoot);
+    }
+    catch {
+        return refuse("escapes-scope", "realpath-unavailable");
+    }
+    let canonicalTarget;
+    try {
+        canonicalTarget = fs.realpathSync.native(input.absoluteLinkPath);
+    }
+    catch (error) {
+        if (error.code === "ENOENT" &&
+            lexicalClassification === "in-scope") {
+            return { isSymlink: true, classification: "in-scope", refused: false, shape: "in-scope-dangling" };
+        }
+        return refuse("escapes-scope", "realpath-unavailable");
+    }
+    const relative = path.relative(canonicalScope, canonicalTarget);
+    if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
+        return refuse("escapes-scope", targetIsAbsolute ? "absolute-outside-scope" : "realpath-outside-scope");
+    }
+    return { isSymlink: true, classification: "in-scope", refused: false, shape: "in-scope" };
+}
+function isLegacyAbsoluteKnowledgeLink(linkPath, target, scopeRoot, scope) {
+    if (scope.kind !== "company")
+        return false;
+    const normalizedLink = normalizeVaultPath(linkPath);
+    if (normalizedLink !== `companies/${scope.companySlug}/knowledge`)
+        return false;
+    const hqRoot = path.resolve(scopeRoot, "..", "..");
+    const expectedTarget = path.resolve(hqRoot, "repos", "private", `knowledge-${scope.companySlug}`);
+    return path.resolve(target) === expectedTarget;
+}
 /** Compare a materialized path with the portable wire target across Windows aliases. */
 export function materializedTargetMatchesWire(linkPath, localTarget, wireTarget, platform = process.platform) {
     const paths = platform === "win32" ? path.win32 : path;

package/dist/symlink-target-policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"symlink-target-policy.js","sourceRoot":"","sources":["../src/symlink-target-policy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"symlink-target-policy.js","sourceRoot":"","sources":["../src/symlink-target-policy.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAazB,yEAAyE;AACzE,MAAM,UAAU,6BAA6B,CAAC,YAAoB;IAChE,OAAO,YAAY,CAAC;AACtB,CAAC;AA2BD,sFAAsF;AACtF,MAAM,UAAU,wBAAwB,CAAC,KAKxC;IACC,IAAI,IAAc,CAAC;IACnB,IAAI,CAAC;QACH,IAAI,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC5F,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;QAC3B,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC5F,CAAC;IAED,MAAM,MAAM,GAAG,CAAC,cAAkC,EAAE,KAAa,EAA+B,EAAE,CAAC,CAAC;QAClG,SAAS,EAAE,IAAI;QACf,cAAc;QACd,OAAO,EAAE,IAAI;QACb,KAAK;KACN,CAAC,CAAC;IACH,IAAI,MAAc,CAAC;IACnB,IAAI,CAAC;QACH,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAClF,IAAI,qBAAkE,CAAC;IACvE,IAAI,gBAAgB,IAAI,6BAA6B,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5G,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAChH,CAAC;IACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,OAAO,GAAG,oBAAoB,CAAC;YACnC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,MAAM;YACN,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS;SACtB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,OAAO,CAAC,cAAoC,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,cAAoC,CAAC,CAAC,CAAC;QACjI,CAAC;QACD,IAAI,OAAO,CAAC,cAAc,KAAK,oBAAoB,EAAE,CAAC;YACpD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC;QAClH,CAAC;QACD,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC;IACjD,CAAC;IAED,IAAI,cAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;IACzD,CAAC;IACD,IAAI,eAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACnE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IACG,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAClD,qBAAqB,KAAK,UAAU,EACpC,CAAC;YACD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC;QACrG,CAAC;QACD,OAAO,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IAChE,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3F,OAAO,MAAM,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;IACzG,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AAC5F,CAAC;AAED,SAAS,6BAA6B,CACpC,QAAgB,EAChB,MAAc,EACd,SAAiB,EACjB,KAAyB;IAEzB,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC3C,MAAM,cAAc,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACpD,IAAI,cAAc,KAAK,aAAa,KAAK,CAAC,WAAW,YAAY;QAAE,OAAO,KAAK,CAAC;IAChF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACnD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IAClG,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,cAAc,CAAC;AACjD,CAAC;AAED,wFAAwF;AACxF,MAAM,UAAU,6BAA6B,CAC3C,QAAgB,EAChB,WAAmB,EACnB,UAAkB,EAClB,WAA4B,OAAO,CAAC,QAAQ;IAE5C,MAAM,KAAK,GAAG,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACvD,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC;IACxE,MAAM,cAAc,GAAG,aAAa,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC9D,MAAM,aAAa,GAAG,aAAa,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC5D,OAAO,cAAc,KAAK,IAAI,IAAI,aAAa,KAAK,IAAI,IAAI,cAAc,KAAK,aAAa,CAAC;AAC/F,CAAC;AAED,SAAS,aAAa,CAAC,KAAa,EAAE,QAAyB;IAC7D,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,CAAC;QACH,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,uEAAuE;YACvE,kEAAkE;YAClE,mDAAmD;YACnD,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,SAAS,CAAC;gBACR,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAI,MAAM,KAAK,QAAQ;oBAAE,OAAO,IAAI,CAAC;gBACrC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9C,QAAQ,GAAG,MAAM,CAAC;gBAClB,IAAI,CAAC;oBACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;oBACtE,MAAM;gBACR,CAAC;gBAAC,MAAM,CAAC;oBACP,+DAA+D;oBAC/D,8DAA8D;gBAChE,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACtD,OAAO,MAAM;SACV,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;SACxB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC;SACrB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,iBAAiB,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,gBAAgB,GAAG,0CAA0C,CAAC;AAEpE,4EAA4E;AAC5E,MAAM,UAAU,oBAAoB,CAAC,KAAgC;IACnE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAC1C,IAAI,cAA+C,CAAC;IACpD,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,cAAc,GAAG,gBAAgB,CAAC;IACpC,CAAC;SAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,cAAc,GAAG,kBAAkB,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,cAAc,GAAG,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,cAAc,KAAK,UAAU,EAAE,CAAC;QAClC,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,OAAO;QACL,cAAc;QACd,OAAO,EAAE,KAAK,CAAC,MAAM,IAAI,cAAc,KAAK,UAAU,IAAI,cAAc,KAAK,oBAAoB;KAClG,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,QAAgB,EAChB,MAAc,EACd,KAAyB;IAEzB,MAAM,cAAc,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAC7G,IAAI,qBAAqB,CAAC,cAAc,EAAE,QAAQ,EAAE,KAAK,CAAC;QAAE,OAAO,oBAAoB,CAAC;IACxF,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,cAAc,KAAK,aAAa,KAAK,CAAC,WAAW,YAAY;QAC3F,mCAAmC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,eAAe,CAAC;IAC7E,IAAI,gBAAgB,CAAC,cAAc,EAAE,QAAQ,CAAC;QAAE,OAAO,UAAU,CAAC;IAElE,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9B,qEAAqE;QACrE,0EAA0E;QAC1E,2EAA2E;QAC3E,wBAAwB;QACxB,IAAI,cAAc,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC3C,IAAI,QAAQ,KAAK,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;gBAAE,OAAO,UAAU,CAAC;YACnF,IAAI,QAAQ,KAAK,WAAW,IAAI,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;gBAAE,OAAO,eAAe,CAAC;YAC1F,OAAO,eAAe,CAAC;QACzB,CAAC;QACD,IAAI,QAAQ,KAAK,WAAW,IAAI,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;YAAE,OAAO,eAAe,CAAC;QAC1F,IAAI,0CAA0C,CAAC,IAAI,CAAC,QAAQ,CAAC;YAAE,OAAO,eAAe,CAAC;QACtF,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvF,OAAO,eAAe,CAAC;QACzB,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,SAAS,GAAG,aAAa,KAAK,CAAC,WAAW,EAAE,CAAC;IACnD,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAEtF,IAAI,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACtC,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,IAAI,aAAa,KAAK,KAAK,CAAC,WAAW;YAAE,OAAO,eAAe,CAAC;IAClE,CAAC;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAAgB,EAChB,QAAgB,EAChB,KAAyB;IAEzB,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC3C,uDAAuD;IACvD,4EAA4E;IAC5E,OAAO,QAAQ,KAAK,aAAa,KAAK,CAAC,WAAW,YAAY;QAC5D,QAAQ,KAAK,2BAA2B,KAAK,CAAC,WAAW,EAAE,CAAC;AAChE,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;IAC1D,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1D,OAAO,yDAAyD,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAClF,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa;IACvC,OAAO,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,WAAW,CAAC,MAAc,EAAE,cAAkC;IACrE,IAAI,cAAc,KAAK,kBAAkB,EAAE,CAAC;QAC1C,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,OAAO,cAAc,CAAC;QACrD,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;YAAE,OAAO,eAAe,CAAC;QACvD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,IAAI,cAAc,KAAK,gBAAgB;QAAE,OAAO,cAAc,CAAC;IAC/D,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC;IAC/F,OAAO,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,mBAAmB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;AACnF,CAAC"}

package/dist/sync/parallel-sync-coordinator.d.ts

@@ -22,7 +22,27 @@ export type CoordinatorSnapshot = {
     realtimeQueued: number;
     choreQueued: number;
     realtimeRunning: boolean;
+    realtimeLanes: {
+        fast: {
+            direction?: "push" | "pull";
+            source?: string;
+            paths: number;
+        } | null;
+        slow: {
+            direction?: "push" | "pull";
+            source?: string;
+            paths: number;
+        } | null;
+        overflowPush: {
+            direction?: "push" | "pull";
+            source?: string;
+            paths: number;
+        } | null;
+    };
     choreRunning: boolean;
+    retainedPullYieldStates: number;
+    lastRealtimeAdmissionAt: number | null;
+    lastChoreAdmissionAt: number | null;
     leases: ReturnType<PathLeaseManager["inspect"]>;
     now: number;
 };
@@ -48,12 +68,17 @@ export declare class DefaultParallelSyncCoordinator implements ParallelSyncCoord
     private nextId;
     private nextEpoch;
     private readonly realtimeRunningByLane;
+    private realtimeOverflowPush?;
+    private readonly pullYieldStates;
+    private lastRealtimeAdmissionAt;
+    private lastChoreAdmissionAt;
     private choreRunning?;
     private stopping;
     private shutdownPromise?;
     constructor(options: ParallelSyncCoordinatorOptions);
     submit(work: SyncWork): Promise<WorkOutcome>;
     inspect(): CoordinatorSnapshot;
+    private snapshotRealtimeLane;
     shutdown(): Promise<void>;
     private createSubmission;
     private pathsFor;
@@ -61,6 +86,8 @@ export declare class DefaultParallelSyncCoordinator implements ParallelSyncCoord
     private hasInternallyConflictingPaths;
     private preemptForRealtime;
     private drain;
+    /** A single bounded push slot keeps disjoint watcher work moving under two held lanes. */
+    private startNextOverflowPush;
     private startNext;
     private requestsFor;
     private execute;
@@ -68,6 +95,8 @@ export declare class DefaultParallelSyncCoordinator implements ParallelSyncCoord
     private isStale;
     private completeAfterWorkerFailure;
     private setResult;
+    private expireInactivePullYieldStates;
+    private touchPullYieldStates;
     private completeRemaining;
     private finishIfEmpty;
     private pruneEpochs;

package/dist/sync/parallel-sync-coordinator.d.ts.map

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

package/dist/sync/parallel-sync-coordinator.js

@@ -1,4 +1,7 @@
 import { assertCanonicalPath, PathLeaseManager, pathsConflict } from "./path-leases.js";
+const MAX_REALTIME_PULL_YIELDS = 3;
+const MAX_REALTIME_PULL_YIELD_MS = 60_000;
+const REALTIME_PULL_YIELD_STATE_TTL_MS = 10 * 60_000;
 function identityKey(path) {
     return `${path.targetUid}\u0000${path.areaId}\u0000${path.canonicalPath}`;
 }
@@ -28,8 +31,13 @@ export class DefaultParallelSyncCoordinator {
     planChorePaths;
     nextId = 1;
     nextEpoch = 1;
-    // Each lane owns one slot. Path leases retain the cross-lane mutation fence.
+    // Fast and slow realtime lanes retain separate slots. Pulls use both when
+    // possible; a queued push can preempt them at the next worker boundary.
     realtimeRunningByLane = {};
+    realtimeOverflowPush;
+    pullYieldStates = new Map();
+    lastRealtimeAdmissionAt = null;
+    lastChoreAdmissionAt = null;
     choreRunning;
     stopping = false;
     shutdownPromise;
@@ -60,6 +68,8 @@ export class DefaultParallelSyncCoordinator {
                 });
                 return;
             }
+            this.touchPullYieldStates(submission);
+            this.expireInactivePullYieldStates();
             if (work.class === "chore" &&
                 work.cursor?.phase !== undefined &&
                 work.cursor.phase !== "apply" &&
@@ -85,12 +95,30 @@ export class DefaultParallelSyncCoordinator {
         return {
             realtimeQueued: this.realtimeQueue.filter((submission) => !submission.finished).length,
             choreQueued: this.choreQueue.filter((submission) => !submission.finished).length,
-            realtimeRunning: this.realtimeRunningByLane.fast !== undefined || this.realtimeRunningByLane.slow !== undefined,
+            realtimeRunning: this.realtimeRunningByLane.fast !== undefined ||
+                this.realtimeRunningByLane.slow !== undefined || this.realtimeOverflowPush !== undefined,
+            realtimeLanes: {
+                fast: this.snapshotRealtimeLane(this.realtimeRunningByLane.fast),
+                slow: this.snapshotRealtimeLane(this.realtimeRunningByLane.slow),
+                overflowPush: this.snapshotRealtimeLane(this.realtimeOverflowPush),
+            },
             choreRunning: this.choreRunning !== undefined,
+            retainedPullYieldStates: this.pullYieldStates.size,
+            lastRealtimeAdmissionAt: this.lastRealtimeAdmissionAt,
+            lastChoreAdmissionAt: this.lastChoreAdmissionAt,
             leases: this.leases.inspect(),
             now: this.clock.now(),
         };
     }
+    snapshotRealtimeLane(submission) {
+        return submission
+            ? {
+                direction: submission.work.class === "realtime" ? submission.work.direction : undefined,
+                source: submission.work.class === "realtime" ? submission.work.source : undefined,
+                paths: submission.paths.length,
+            }
+            : null;
+    }
     shutdown() {
         if (this.shutdownPromise)
             return this.shutdownPromise;
@@ -102,10 +130,13 @@ export class DefaultParallelSyncCoordinator {
         this.choreQueue.length = 0;
         this.realtimeRunningByLane.fast?.controller.abort();
         this.realtimeRunningByLane.slow?.controller.abort();
+        this.realtimeOverflowPush?.controller.abort();
         this.choreRunning?.controller.abort();
+        this.pullYieldStates.clear();
         const executions = [
             this.realtimeRunningByLane.fast?.execution,
             this.realtimeRunningByLane.slow?.execution,
+            this.realtimeOverflowPush?.execution,
             this.choreRunning?.execution,
         ]
             .filter((execution) => execution !== undefined);
@@ -125,6 +156,8 @@ export class DefaultParallelSyncCoordinator {
             results: new Map(),
             resolve,
             controller: new AbortController(),
+            supersededPaths: new Set(),
+            yieldedToPush: false,
             running: false,
             finished: false,
         };
@@ -174,14 +207,81 @@ export class DefaultParallelSyncCoordinator {
             queued.paths = queued.paths.filter((path) => !revoked.includes(path));
             this.finishIfEmpty(queued);
         }
+        if (direction === "push" &&
+            this.realtimeRunningByLane.fast &&
+            this.realtimeRunningByLane.slow &&
+            this.realtimeRunningByLane.fast.work.class === "realtime" &&
+            this.realtimeRunningByLane.slow.work.class === "realtime" &&
+            this.realtimeRunningByLane.fast.work.direction === "pull" &&
+            this.realtimeRunningByLane.slow.work.direction === "pull") {
+            const pullToYield = ["slow", "fast"]
+                .map((lane) => this.realtimeRunningByLane[lane])
+                .find((running) => running?.work.class === "realtime" &&
+                running.work.direction === "pull" &&
+                !running.paths.some((path) => incoming.paths.some((candidate) => overlaps(path, candidate))));
+            if (pullToYield) {
+                const pathKeys = pullToYield.paths.map(identityKey);
+                const existingStates = pathKeys.map((key) => this.pullYieldStates.get(key)).filter((state) => state !== undefined);
+                const now = this.clock.now();
+                const state = {
+                    yields: existingStates.reduce((max, item) => Math.max(max, item.yields), 0),
+                    startedAt: existingStates.reduce((min, item) => Math.min(min, item.startedAt), now),
+                    lastSeenAt: now,
+                    capLogged: existingStates.some((item) => item.capLogged),
+                };
+                const cumulativeMs = Math.max(0, now - state.startedAt);
+                const cap = state.yields >= MAX_REALTIME_PULL_YIELDS
+                    ? "yield-count"
+                    : cumulativeMs >= MAX_REALTIME_PULL_YIELD_MS
+                        ? "cumulative-time"
+                        : undefined;
+                if (cap) {
+                    for (const key of pathKeys)
+                        this.pullYieldStates.set(key, { ...state, capLogged: true });
+                    if (!state.capLogged) {
+                        process.stderr.write(`hq-sync: realtime pull yield cap reached ${JSON.stringify({
+                            pullId: pullToYield.id,
+                            pathCount: pullToYield.paths.length,
+                            yields: state.yields,
+                            cumulativeMs,
+                            cap,
+                        })}\n`);
+                    }
+                }
+                else {
+                    state.yields += 1;
+                    for (const key of pathKeys)
+                        this.pullYieldStates.set(key, state);
+                    pullToYield.yieldedToPush = true;
+                    pullToYield.controller.abort();
+                    if (state.yields === MAX_REALTIME_PULL_YIELDS && !state.capLogged) {
+                        for (const key of pathKeys)
+                            this.pullYieldStates.set(key, { ...state, capLogged: true });
+                        process.stderr.write(`hq-sync: realtime pull yield cap reached ${JSON.stringify({
+                            pullId: pullToYield.id,
+                            pathCount: pullToYield.paths.length,
+                            yields: state.yields,
+                            cumulativeMs,
+                            cap: "yield-count",
+                        })}\n`);
+                    }
+                }
+            }
+        }
         for (const running of [
             this.realtimeRunningByLane.fast,
             this.realtimeRunningByLane.slow,
+            this.realtimeOverflowPush,
             this.choreRunning,
         ]) {
             if (running &&
                 (running.work.class === "chore" || running.work.direction === direction) &&
                 running.paths.some((path) => incoming.paths.some((candidate) => overlaps(path, candidate)))) {
+                for (const path of running.paths) {
+                    if (incoming.paths.some((candidate) => overlaps(path, candidate))) {
+                        running.supersededPaths.add(identityKey(path));
+                    }
+                }
                 running.controller.abort();
             }
         }
@@ -193,27 +293,103 @@ export class DefaultParallelSyncCoordinator {
             this.startNext("realtime", "fast");
         if (!this.realtimeRunningByLane.slow)
             this.startNext("realtime", "slow");
+        if (this.realtimeRunningByLane.fast &&
+            this.realtimeRunningByLane.slow &&
+            !this.realtimeOverflowPush)
+            this.startNextOverflowPush();
         if (!this.choreRunning)
             this.startNext("chore");
     }
+    /** A single bounded push slot keeps disjoint watcher work moving under two held lanes. */
+    startNextOverflowPush() {
+        if (this.stopping || this.realtimeOverflowPush)
+            return;
+        const cappedActivePull = [
+            this.realtimeRunningByLane.fast,
+            this.realtimeRunningByLane.slow,
+        ].some((submission) => submission?.work.class === "realtime" &&
+            submission.work.direction === "pull" &&
+            submission.paths.some((path) => this.pullYieldStates.get(identityKey(path))?.capLogged));
+        if (cappedActivePull)
+            return;
+        for (const submission of this.realtimeQueue) {
+            if (submission.finished || submission.work.class !== "realtime" || submission.work.direction !== "push") {
+                continue;
+            }
+            const lease = this.leases.tryAcquire(submission.id, this.requestsFor(submission));
+            if (!lease)
+                continue;
+            const selectedQueueIndex = this.realtimeQueue.indexOf(submission);
+            if (selectedQueueIndex < 0) {
+                lease.release();
+                continue;
+            }
+            this.realtimeQueue.splice(selectedQueueIndex, 1);
+            submission.lease = lease;
+            submission.running = true;
+            submission.runningLane = "overflow-push";
+            this.realtimeOverflowPush = submission;
+            this.lastRealtimeAdmissionAt = this.clock.now();
+            submission.execution = this.execute("realtime", submission);
+            return;
+        }
+    }
     startNext(kind, lane) {
         const queue = kind === "realtime" ? this.realtimeQueue : this.choreQueue;
-        for (let index = 0; index < queue.length; index += 1) {
-            const submission = queue[index];
-            if (submission.finished)
+        const entries = queue.map((candidate, queueIndex) => ({ candidate, queueIndex }));
+        const protectedPulls = new Set();
+        for (const push of entries) {
+            if (push.candidate.work.class !== "realtime" || push.candidate.work.direction !== "push")
                 continue;
-            if (kind === "realtime" && this.realtimeLane(submission) !== lane)
+            for (const earlier of entries) {
+                if (earlier.queueIndex >= push.queueIndex)
+                    break;
+                if (earlier.candidate.work.class === "realtime" &&
+                    earlier.candidate.work.direction === "pull" &&
+                    earlier.candidate.paths.some((pullPath) => push.candidate.paths.some((pushPath) => overlaps(pullPath, pushPath))))
+                    protectedPulls.add(earlier.queueIndex);
+            }
+        }
+        const ordered = [
+            ...entries.filter((entry) => protectedPulls.has(entry.queueIndex)),
+            ...entries.filter((entry) => !protectedPulls.has(entry.queueIndex) && entry.candidate.work.class === "realtime" && entry.candidate.work.direction === "push"),
+            ...entries.filter((entry) => !protectedPulls.has(entry.queueIndex) && !(entry.candidate.work.class === "realtime" && entry.candidate.work.direction === "push")),
+        ];
+        for (const selected of ordered) {
+            const submission = selected.candidate;
+            if (submission.finished)
                 continue;
+            let assignedLane;
+            if (kind === "realtime") {
+                const preferredLane = this.realtimeLane(submission);
+                const pushMayUseFreeLane = submission.work.class === "realtime" &&
+                    submission.work.direction === "push" && preferredLane !== lane &&
+                    this.realtimeRunningByLane[preferredLane]?.work.class === "realtime" &&
+                    this.realtimeRunningByLane[preferredLane]?.work.direction === "pull";
+                assignedLane = pushMayUseFreeLane ? lane : preferredLane;
+                if (assignedLane !== lane)
+                    continue;
+            }
             const lease = this.leases.tryAcquire(submission.id, this.requestsFor(submission));
             if (!lease)
                 continue;
-            queue.splice(index, 1);
+            const selectedQueueIndex = queue.indexOf(submission);
+            if (selectedQueueIndex === -1)
+                continue;
+            queue.splice(selectedQueueIndex, 1);
             submission.lease = lease;
             submission.running = true;
-            if (kind === "realtime")
-                this.realtimeRunningByLane[this.realtimeLane(submission)] = submission;
-            else
+            if (kind === "realtime") {
+                submission.runningLane = assignedLane;
+                // Keep the original work object as the execution registry key. The
+                // physical lane is tracked separately in runningLane.
+                this.realtimeRunningByLane[assignedLane] = submission;
+                this.lastRealtimeAdmissionAt = this.clock.now();
+            }
+            else {
                 this.choreRunning = submission;
+                this.lastChoreAdmissionAt = this.clock.now();
+            }
             submission.execution = this.execute(kind, submission);
             return;
         }
@@ -245,8 +421,13 @@ export class DefaultParallelSyncCoordinator {
         finally {
             submission.lease?.release();
             submission.running = false;
-            if (kind === "realtime")
-                this.realtimeRunningByLane[this.realtimeLane(submission)] = undefined;
+            if (kind === "realtime") {
+                if (submission.runningLane === "overflow-push")
+                    this.realtimeOverflowPush = undefined;
+                else
+                    this.realtimeRunningByLane[submission.runningLane ?? this.realtimeLane(submission)] = undefined;
+                submission.runningLane = undefined;
+            }
             else
                 this.choreRunning = undefined;
             this.finishIfEmpty(submission);
@@ -260,7 +441,8 @@ export class DefaultParallelSyncCoordinator {
         }
         const byPath = new Map(outcome.paths.map((result) => [result.path, result]));
         for (const path of submission.paths) {
-            if (this.isStale(path, submission.work.class === "realtime" ? submission.work.direction : undefined)) {
+            if (submission.supersededPaths.has(identityKey(path)) ||
+                this.isStale(path, submission.work.class === "realtime" ? submission.work.direction : undefined)) {
                 this.setResult(submission, path, "refused", "stale path epoch");
                 continue;
             }
@@ -269,7 +451,9 @@ export class DefaultParallelSyncCoordinator {
                 this.setResult(submission, path, "retryable", outcome.error ?? "worker omitted or mismatched a path outcome");
                 continue;
             }
-            this.setResult(submission, path, result.status, result.reason);
+            this.setResult(submission, path, result.status, submission.yieldedToPush && result.status === "retryable"
+                ? "yielded to queued watcher push"
+                : result.reason);
         }
     }
     isStale(path, direction) {
@@ -284,16 +468,45 @@ export class DefaultParallelSyncCoordinator {
         for (const path of submission.paths) {
             if (submission.results.has(identityKey(path)))
                 continue;
-            if (this.isStale(path, submission.work.class === "realtime" ? submission.work.direction : undefined)) {
+            if (submission.supersededPaths.has(identityKey(path)) ||
+                this.isStale(path, submission.work.class === "realtime" ? submission.work.direction : undefined)) {
                 this.setResult(submission, path, "refused", "stale path epoch");
             }
             else
-                this.setResult(submission, path, "retryable", reason);
+                this.setResult(submission, path, "retryable", submission.yieldedToPush ? "yielded to queued watcher push" : reason);
         }
         this.finishIfEmpty(submission);
     }
     setResult(submission, path, status, reason) {
         submission.results.set(identityKey(path), { path: path.canonicalPath, status, epoch: path.epoch, ...(reason ? { reason } : {}) });
+        if (submission.work.class === "realtime" &&
+            submission.work.direction === "pull" &&
+            (status !== "retryable" || reason !== "yielded to queued watcher push")) {
+            for (const path of submission.paths)
+                this.pullYieldStates.delete(identityKey(path));
+        }
+    }
+    expireInactivePullYieldStates() {
+        const activePaths = new Set([
+            this.realtimeRunningByLane.fast,
+            this.realtimeRunningByLane.slow,
+            this.realtimeOverflowPush,
+        ].flatMap((submission) => submission?.paths.map(identityKey) ?? []));
+        const now = this.clock.now();
+        for (const [key, state] of this.pullYieldStates) {
+            if (!activePaths.has(key) && now - state.lastSeenAt >= REALTIME_PULL_YIELD_STATE_TTL_MS) {
+                this.pullYieldStates.delete(key);
+            }
+        }
+    }
+    touchPullYieldStates(submission) {
+        const now = this.clock.now();
+        for (const path of submission.paths) {
+            const key = identityKey(path);
+            const state = this.pullYieldStates.get(key);
+            if (state)
+                this.pullYieldStates.set(key, { ...state, lastSeenAt: now });
+        }
     }
     completeRemaining(submission, status, reason) {
         for (const path of submission.paths) {