@quantiya/codevibe-core 2.0.74 → 2.0.76

package/dist/orchestration-shell/cli.js

@@ -8605,15 +8605,9 @@ function parseCompanionSyncState(value, environment, now = Date.now()) {
     let date = new Date(value.observedAtEpochMs), resetAt = Date.UTC(date.getUTCFullYear(), date.getUTCMonth() + 1, 1);
     (value.periodId !== date.toISOString().slice(0, 7) || value.resetAtEpochMs !== resetAt || value.validUntilEpochMs > resetAt) && invalid2(), count(value.usage.usageRevision);
     let gap2 = count(value.usage.gapStartedAtEpochMs), periodStart = Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), 1);
-    gap2 !== 0n && (gap2 < BigInt(periodStart) || gap2 > BigInt(value.observedAtEpochMs)) && invalid2();
-    let state = "ACTIVE";
-    for (let meter of METERS) {
-      let committed = count(value.usage[`${meter}Committed`]);
-      count(value.usage[`${meter}Reserved`]);
-      let limit = count(value.usage[`${meter}Limit`]), pausedAtLimit = count(value.usage[`${meter}PauseLimit`]);
-      pausedAtLimit > 0n && gap2 === 0n && invalid2(), value.usage[`${meter}Limit`] !== value.limits[meter] && invalid2(), meter === "syncUnits" && (committed >= limit || pausedAtLimit >= limit) ? state = "PAUSED" : committed * 5n >= limit * 4n && state !== "PAUSED" && (state = "WARNING");
-    }
-    value.usage.syncState !== state && invalid2();
+    gap2 !== 0n && (gap2 < BigInt(periodStart) || gap2 > BigInt(value.observedAtEpochMs)) && invalid2(), ["ACTIVE", "WARNING", "PAUSED"].includes(value.usage.syncState) || invalid2();
+    for (let meter of METERS)
+      count(value.usage[`${meter}Committed`]), count(value.usage[`${meter}Reserved`]), count(value.usage[`${meter}Limit`]), count(value.usage[`${meter}PauseLimit`]) > 0n && gap2 === 0n && invalid2(), value.usage[`${meter}Limit`] !== value.limits[meter] && invalid2();
   } else (value.protocol === "SYNC_V2" && value.mode !== "SHADOW" || value.mode === "ROLLBACK_FREEZE" && value.protocol !== "FROZEN" || value.usage !== null || value.periodId !== null || value.resetAtEpochMs !== null) && invalid2();
   if (value.accountingGeneration === null && (value.mode !== "LEGACY" || value.controlGeneration !== 0) && invalid2(), value.accountingGeneration !== null && value.controlGeneration < 1 && invalid2(), value.usage?.syncState === "PAUSED") {
     let notice2 = value.quotaNotice;
@@ -10300,7 +10294,7 @@ var SyncJournalError = class extends Error {
     this.code = code;
     this.name = "SyncJournalError";
   }
-}, UUID8 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i, MAX_RECORD_BYTES = 1024 * 1024, MAX_ENVELOPE_BYTES = 2 * MAX_RECORD_BYTES, MAX_FILES = 256, MAX_STORE_BYTES = 32 * 1024 * 1024, MAX_RETIREMENT_INTENTS = 16, MAX_RETIREMENT_BYTES = 32 * 1024, invalid7 = () => {
+}, UUID8 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i, MAX_RECORD_BYTES = 1024 * 1024, MAX_ENVELOPE_BYTES = 2 * MAX_RECORD_BYTES, MAX_FILES = 256, MAX_STORE_BYTES = 32 * 1024 * 1024, MAX_RETIREMENT_INTENTS = 16, MAX_RETIREMENT_BYTES = 32 * 1024, MAX_INVENTORY_FILES = MAX_FILES * 4 + MAX_RETIREMENT_INTENTS * 2 + 8, MAX_DIRECTORY_ENTRIES = MAX_INVENTORY_FILES * 4 + MAX_FILES + MAX_RETIREMENT_INTENTS * 2 + 8, invalid7 = () => {
   throw new SyncJournalError("SYNC_JOURNAL_INVALID");
 }, errorCode = (error) => error?.code;
 function operationId(value) {
@@ -10493,7 +10487,7 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
     }) : (this.options.assertAccount(), []);
   }
   /** One encrypted intent/credential record per original desktop incarnation.
-   * This uses the account journal's existing 256-file / 32-MiB total bound. */
+   * Bookkeeping shares the 32-MiB bound, but not outbound-operation slots. */
   desktopRegistration(register, now = Date.now) {
     let scope = this.sessionScope;
     if (!scope || typeof register != "function") return invalid7();
@@ -11129,6 +11123,14 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
     let plan = await this.withStore((key) => this.retiredSourcePlan(key, input.expectedSessionKeyGen));
     if (!plan.sources.length) return { sourcesRemoved: 0, operationsRemoved: 0 };
     parseSyncSessionRetirementReceipt(await confirm(input), input), this.options.assertAccount();
+    let total = { sourcesRemoved: 0, operationsRemoved: 0 };
+    for (let page = 0; page < MAX_INVENTORY_FILES; page++) {
+      let removed = await this.removeRetiredSourceBatch(plan, input.expectedSessionKeyGen);
+      if (total.sourcesRemoved += removed.sourcesRemoved, total.operationsRemoved += removed.operationsRemoved, plan = await this.withStore((key) => this.retiredSourcePlan(key, input.expectedSessionKeyGen)), !plan.sources.length) return total;
+    }
+    throw new SyncJournalError("SYNC_OPERATION_PENDING");
+  }
+  async removeRetiredSourceBatch(plan, expectedSessionKeyGen) {
     let owners = [], fence = async () => {
       this.options.assertAccount();
       for (let owner of owners) if (!await owner.reassertOwnership()) throw new SyncJournalError("SYNC_JOURNAL_LOCK_LOST");
@@ -11143,7 +11145,7 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
         if (owners.push(owner), this.options.assertAccount(), !await owner.reassertOwnership()) throw new SyncJournalError("SYNC_JOURNAL_LOCK_LOST");
       }
       return await this.withStore(async (key, storeFence) => {
-        let current = await this.retiredSourcePlan(key, input.expectedSessionKeyGen);
+        let current = await this.retiredSourcePlan(key, expectedSessionKeyGen);
         if (current.digest !== plan.digest) throw new SyncJournalError("SYNC_OPERATION_PENDING");
         await fence();
         for (let name of current.operations)
@@ -11202,15 +11204,20 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
   }
   async retiredSourcePlan(key, expectedSessionKeyGen) {
     if (!this.sessionScope) return invalid7();
-    let sources = [], operations = [], images = [], linked = /* @__PURE__ */ new Set(), outer = /* @__PURE__ */ new Set(), inner = /* @__PURE__ */ new Set(), expectedInputs = /* @__PURE__ */ new Map(), bind = (value) => {
+    let sources = [], operations = [], images = [], linked = /* @__PURE__ */ new Set(), outer = /* @__PURE__ */ new Set(), inner = /* @__PURE__ */ new Set(), selectedLinks = /* @__PURE__ */ new Set(), sourceCount = 0, linkedOperationCount = 0, expectedInputs = /* @__PURE__ */ new Map(), bind = (value) => {
       let input = request2("CREATE_EVENT", value), digest2 = fingerprint("CREATE_EVENT", input), prior = expectedInputs.get(input.clientOperationId);
       if (prior !== void 0 && prior !== digest2) return invalid7();
       expectedInputs.set(input.clientOperationId, digest2);
     }, add = (name, row3, links, locks, innerLocks = []) => {
-      if (this.matchesScope(row3)) {
-        sources.push(name), images.push([name, row3]);
-        for (let id5 of links) linked.add(id5);
-        if (sources.length > MAX_FILES || linked.size > MAX_FILES) throw new SyncJournalError("SYNC_JOURNAL_FULL");
+      if (!this.matchesScope(row3)) return;
+      sourceCount++, images.push([name, row3]);
+      for (let id5 of links) linked.add(id5);
+      if (sourceCount > MAX_INVENTORY_FILES || linked.size > MAX_INVENTORY_FILES * MAX_FILES)
+        throw new SyncJournalError("SYNC_JOURNAL_FULL");
+      let additionalLinks = links.filter((id5) => !selectedLinks.has(id5));
+      if (!(sources.length >= MAX_FILES || selectedLinks.size + additionalLinks.length > MAX_FILES)) {
+        sources.push(name);
+        for (let id5 of links) selectedLinks.add(id5);
         for (let lock of locks) outer.add(lock);
         for (let lock of innerLocks) inner.add(lock);
       }
@@ -11261,16 +11268,16 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
       let row3 = await this.read(id5, key);
       if (row3) {
         if (this.requireScope(row3), row3.action !== "CREATE_EVENT" || row3.state === "PENDING" && row3.input.expectedSessionKeyGen !== expectedSessionKeyGen || expectedInputs.has(id5) && expectedInputs.get(id5) !== row3.fingerprint) return invalid7();
-        operations.push(id5 + ".json"), images.push([id5 + ".json", row3]);
+        linkedOperationCount++, images.push([id5 + ".json", row3]), selectedLinks.has(id5) && operations.push(id5 + ".json");
       }
     }
-    if (sources.length + operations.length > MAX_FILES) throw new SyncJournalError("SYNC_JOURNAL_FULL");
+    if (linkedOperationCount > MAX_FILES) throw new SyncJournalError("SYNC_JOURNAL_FULL");
     return {
       sources: sources.sort(),
       operations,
       // Even a missing operation may retain its dead sender/GC lock after an
       // interrupted unlink. The source's complete link set owns reclamation.
-      locks: [...[...outer].sort(), ...[...inner].sort(), ...[...linked].sort().map((id5) => `send-${id5}.lockdir`)],
+      locks: [...[...outer].sort(), ...[...inner].sort(), ...[...selectedLinks].sort().map((id5) => `send-${id5}.lockdir`)],
       digest: (0, import_node_crypto14.createHash)("sha256").update((0, import_json_freeze12.canonicalize)(images)).digest("hex")
     };
   }
@@ -11529,21 +11536,21 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
   async recordNames(suffix = ".json") {
     let names = [], entries = 0, directory = await import_node_fs5.promises.opendir(this.directory);
     for await (let entry5 of directory) {
-      if (++entries > MAX_FILES * 4 + MAX_RETIREMENT_INTENTS * 2 + 8) throw new SyncJournalError("SYNC_JOURNAL_FULL");
-      if (entry5.name.endsWith(suffix) && ((!entry5.isFile() || !UUID8.test(entry5.name.slice(0, -suffix.length))) && invalid7(), names.push(entry5.name), names.length > MAX_FILES))
+      if (++entries > MAX_DIRECTORY_ENTRIES) throw new SyncJournalError("SYNC_JOURNAL_FULL");
+      if (entry5.name.endsWith(suffix) && ((!entry5.isFile() || !UUID8.test(entry5.name.slice(0, -suffix.length))) && invalid7(), names.push(entry5.name), names.length > (suffix === ".json" ? MAX_FILES : MAX_INVENTORY_FILES)))
         throw new SyncJournalError("SYNC_JOURNAL_FULL");
     }
     return names;
   }
   async checkCapacity(additionalBytes, replacedName, retirement = !1) {
-    let count4 = 0, bytes = additionalBytes, entries = 0, retirements = 0, directory = await import_node_fs5.promises.opendir(this.directory);
+    let operations = 0, bookkeeping = 0, bytes = additionalBytes, entries = 0, retirements = 0, allocatesOperation = replacedName === void 0 || replacedName.endsWith(".json"), directory = await import_node_fs5.promises.opendir(this.directory);
     for await (let entry5 of directory)
-      if ((++entries > MAX_FILES * 4 + MAX_RETIREMENT_INTENTS * 2 + 8 || entry5.isSymbolicLink()) && invalid7(), entry5.isFile()) {
+      if ((++entries > MAX_DIRECTORY_ENTRIES || entry5.isSymbolicLink()) && invalid7(), entry5.isFile()) {
         let stat13 = await import_node_fs5.promises.lstat(path18.join(this.directory, entry5.name));
         if ((!stat13.isFile() || stat13.nlink !== 1) && invalid7(), entry5.name === replacedName) continue;
-        entry5.name.endsWith(".retirement") && retirements++, bytes += stat13.size, count4++;
+        bytes += stat13.size, entry5.name.endsWith(".json") ? operations++ : entry5.name.endsWith(".retirement") ? retirements++ : bookkeeping++;
       }
-    if (count4 >= MAX_FILES + (retirement ? MAX_RETIREMENT_INTENTS : 0) || bytes > MAX_STORE_BYTES + (retirement ? MAX_RETIREMENT_INTENTS * MAX_RETIREMENT_BYTES : 0) || retirement && retirements >= MAX_RETIREMENT_INTENTS) throw new SyncJournalError("SYNC_JOURNAL_FULL");
+    if (allocatesOperation && operations >= MAX_FILES || !allocatesOperation && !retirement && bookkeeping >= MAX_INVENTORY_FILES || bytes > MAX_STORE_BYTES + (retirement ? MAX_RETIREMENT_INTENTS * MAX_RETIREMENT_BYTES : 0) || retirement && retirements >= MAX_RETIREMENT_INTENTS) throw new SyncJournalError("SYNC_JOURNAL_FULL");
   }
   async ensureDirectory() {
     let current = path18.parse(this.directory).root;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quantiya/codevibe-core",
-  "version": "2.0.74",
+  "version": "2.0.76",
   "description": "Core library for CodeVibe plugins - shared keychain, crypto, AppSync, and auth functionality",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",