@quantiya/codevibe-core 2.0.73 → 2.0.75

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;
@@ -10084,9 +10078,7 @@ function createPromptRetentionJournal(store) {
         await fence(), receipt2.status === "RERAISE_REQUIRED" && (row3.entries.push({ ...receipt2, reRaiseToken: (0, import_node_crypto12.randomUUID)() }), await save(), await settle(promptId2));
       }
     });
-  }, remove: () => store.runExclusive(async (fence) => {
-    await fence(), await store.remove(), await fence();
-  }) });
+  }, remove: () => store.remove() });
 }
 
 // src/appsync/sync-prompt-publication.ts
@@ -10534,19 +10526,10 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
     let scope = this.sessionScope;
     if (!scope) return invalid7();
     let id5 = stableUuid("codevibe-sync-desktop-registration-v1\0", [scope.sessionId, scope.sessionGenerationId]);
-    this.options.assertAccount(), await this.ensureDirectory();
-    let owner = await this.lock(`registration-${id5}.lockdir`).acquire();
-    try {
-      return await this.withStore(async (key) => {
-        let row3 = await this.readValue(id5, key, ".desktop", (value) => decodeDesktopSyncRegistration(value, invalid7));
-        if (!row3) return !1;
-        if (row3.operationId !== id5) return invalid7();
-        if (this.requireScope(row3), this.options.assertAccount(), !await owner.reassertOwnership()) throw new SyncJournalError("SYNC_JOURNAL_LOCK_LOST");
-        return await import_node_fs5.promises.unlink(this.file(id5, ".desktop")), await this.syncDirectory(this.directory), !0;
-      });
-    } finally {
-      await owner.release();
-    }
+    return this.removeBookkeepingRecord(id5, ".desktop", [`registration-${id5}.lockdir`], async (key) => {
+      let row3 = await this.readValue(id5, key, ".desktop", (value) => decodeDesktopSyncRegistration(value, invalid7));
+      return row3 ? row3.operationId !== id5 ? invalid7() : (this.requireScope(row3), !0) : !1;
+    });
   }
   /** Provider queues share the existing encrypted/account-fenced capacity.
    * Native identity and generation are immutable: no automatic re-homing. */
@@ -10839,13 +10822,12 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
         let sealed = this.seal(row3, key);
         await this.checkCapacity(Buffer.byteLength(sealed), id5 + ".retention"), await this.write(id5, sealed, ".retention");
       }),
-      remove: () => this.withStore(async (key) => {
-        let row3 = await this.readValue(id5, key, ".retention", decodePromptRetention);
-        if (row3) {
-          if (row3.operationId !== id5 || !this.matchesScope(row3)) return invalid7();
-          this.options.assertAccount(), await import_node_fs5.promises.unlink(this.file(id5, ".retention")), await this.syncDirectory(this.directory);
-        }
-      })
+      remove: async () => {
+        await this.removeBookkeepingRecord(id5, ".retention", ["prompt-retention-" + id5 + ".lockdir"], async (key) => {
+          let row3 = await this.readValue(id5, key, ".retention", decodePromptRetention);
+          return row3 ? row3.operationId !== id5 || !this.matchesScope(row3) ? invalid7() : !0 : !1;
+        });
+      }
     });
   }
   /** Canonical INACTIVE proof and joined publication owners are prerequisites.
@@ -10909,23 +10891,11 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
       }
       return ids2.sort();
     }), removed = 0;
-    for (let id5 of ids) {
-      let owner = await this.lock("deferred-dispatch-" + id5 + ".lockdir").acquire();
-      try {
-        await this.withStore(async (key) => {
-          let row3 = await read(id5, key);
-          if (row3) {
-            if (!deferredScopeMatches(row3, scope)) return invalid7();
-            if (!row3.entries.some((entry5) => entry5.notice)) {
-              if (this.options.assertAccount(), !await owner.reassertOwnership()) throw new SyncJournalError("SYNC_JOURNAL_LOCK_LOST");
-              await import_node_fs5.promises.unlink(this.file(id5, ".deferred")), await this.syncDirectory(this.directory), removed++;
-            }
-          }
-        });
-      } finally {
-        await owner.release();
-      }
-    }
+    for (let id5 of ids)
+      await this.removeBookkeepingRecord(id5, ".deferred", ["deferred-dispatch-" + id5 + ".lockdir"], async (key) => {
+        let row3 = await read(id5, key);
+        return row3 ? deferredScopeMatches(row3, scope) ? !row3.entries.some((entry5) => entry5.notice) : invalid7() : !1;
+      }) && removed++;
     return removed;
   }
   /** One small encrypted row for unresolved inbound inputs. Completed cloud
@@ -10975,23 +10945,30 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
     let scope = this.sessionScope;
     if (!scope) return invalid7();
     let id5 = stableUuid("codevibe-sync-inbound-v1\0", [scope.sessionId, scope.sessionGenerationId]);
+    return this.removeBookkeepingRecord(id5, ".inbox", [`inbound-dispatch-${id5}.lockdir`, `inbound-record-${id5}.lockdir`], async (key) => {
+      let row3 = await this.readValue(id5, key, ".inbox", decodeDesktopInbound);
+      return row3 ? row3.operationId !== id5 ? invalid7() : (this.requireScope(row3), !0) : !1;
+    });
+  }
+  /** The encrypted record is also the recovery index for these outer locks.
+   * Release them strictly BEFORE unlinking it, while the store stays fenced.
+   * A failed release preserves the record and the caller's retirement intent. */
+  async removeBookkeepingRecord(id5, suffix, names, removable) {
     this.options.assertAccount(), await this.ensureDirectory();
-    let dispatch = await this.lock(`inbound-dispatch-${id5}.lockdir`).acquire();
+    let owners = [], release = async () => {
+      let failed = (await Promise.allSettled(owners.splice(0).reverse().map((owner) => owner.release()))).find((result) => result.status === "rejected");
+      if (failed?.status === "rejected") throw failed.reason;
+    };
     try {
-      let record2 = await this.lock(`inbound-record-${id5}.lockdir`).acquire();
-      try {
-        return await this.withStore(async (key) => {
-          let row3 = await this.readValue(id5, key, ".inbox", decodeDesktopInbound);
-          if (!row3) return !1;
-          if (row3.operationId !== id5) return invalid7();
-          if (this.requireScope(row3), this.options.assertAccount(), !await dispatch.reassertOwnership() || !await record2.reassertOwnership()) throw new SyncJournalError("SYNC_JOURNAL_LOCK_LOST");
-          return await import_node_fs5.promises.unlink(this.file(id5, ".inbox")), await this.syncDirectory(this.directory), !0;
-        });
-      } finally {
-        await record2.release();
-      }
+      for (let name of names) owners.push(await this.lock(name, !0).acquire());
+      return await this.withStore(async (key, storeFence) => {
+        let remove = await removable(key);
+        this.options.assertAccount();
+        for (let owner of owners) if (!await owner.reassertOwnership()) throw new SyncJournalError("SYNC_JOURNAL_LOCK_LOST");
+        return await release(), await storeFence(), remove ? (await import_node_fs5.promises.unlink(this.file(id5, suffix)), await this.syncDirectory(this.directory), await storeFence(), !0) : !1;
+      });
     } finally {
-      await dispatch.release();
+      await release();
     }
   }
   /** Exact empty-source GC only after the owner has joined all its emitters
@@ -11050,7 +11027,34 @@ var sourceCursorId = (scope, stream) => stableUuid("codevibe-sync-source-cursor-
       if (errorCode(error) !== "ENOENT") throw error;
       return this.options.assertAccount(), !1;
     }
-    return this.withStore(async (key) => (await this.retiredSourcePlan(key, expectedSessionKeyGen)).sources.length > 0);
+    return await this.withStore(async (key) => (await this.retiredSourcePlan(key, expectedSessionKeyGen)).sources.length > 0) ? !0 : this.hasSessionRegistrationState();
+  }
+  /** Presence is not deletion authority. Callers still need their joined
+   * terminal owner and fresh retirement confirmation before cleanup. */
+  async hasSessionRegistrationState() {
+    if (!this.sessionScope) return invalid7();
+    this.options.assertAccount();
+    try {
+      await import_node_fs5.promises.lstat(this.directory);
+    } catch (error) {
+      if (errorCode(error) !== "ENOENT") throw error;
+      return this.options.assertAccount(), !1;
+    }
+    return this.withStore(async (key) => {
+      let records = [
+        [".desktop", (value) => decodeDesktopSyncRegistration(value, invalid7)],
+        [".inbox", decodeDesktopInbound],
+        [".retention", decodePromptRetention],
+        [".echo", decodeMobileEcho],
+        [".deferred", decodeDeferredInputs]
+      ];
+      for (let [suffix, decode] of records) for (let name of await this.recordNames(suffix)) {
+        let row3 = await this.readValue(name.slice(0, -suffix.length), key, suffix, decode);
+        if (!row3) return invalid7();
+        if (this.matchesScope(row3)) return !0;
+      }
+      return !1;
+    });
   }
   /** Durable stop/join intent -> confirmed source cleanup -> control ACKs ->
    * intent removal. Network I/O never holds the account-store lock. */
@@ -11976,12 +11980,12 @@ var UUID9 = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f
   throw new SyncEventClientError("INVALID_SYNC_INPUT");
 };
 function toolWindow(scope, id5, value) {
-  let envelope = ToolActivityOutboxEnvelopeSchema.parse(value);
-  (id5 !== scope.sessionId || envelope.backendSessionId !== id5 || envelope.syncSessionGenerationId !== scope.sessionGenerationId || !/^[A-Za-z0-9_-]{1,128}$/.test(envelope.clientEventId) || !/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{3}Z$/.test(envelope.windowStart) || !Number.isFinite(Date.parse(envelope.windowStart)) || new Date(envelope.windowStart).toISOString() !== envelope.windowStart) && invalid8();
+  let envelope = ToolActivityOutboxEnvelopeSchema.parse(value), timestamp5 = /^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$/.test(envelope.windowStart) ? envelope.windowStart.slice(0, -1) + ".000Z" : envelope.windowStart;
+  (id5 !== scope.sessionId || envelope.backendSessionId !== id5 || envelope.syncSessionGenerationId !== scope.sessionGenerationId || !/^[A-Za-z0-9_-]{1,128}$/.test(envelope.clientEventId) || !/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d\.\d{3}Z$/.test(timestamp5) || !Number.isFinite(Date.parse(timestamp5)) || new Date(timestamp5).toISOString() !== timestamp5) && invalid8();
   let bytes = (0, import_node_crypto16.createHash)("sha256").update("codevibe-sync-tool-window-v1\0").update(JSON.stringify([scope.sessionId, scope.sessionGenerationId, envelope.clientEventId])).digest().subarray(0, 16);
   bytes[6] = bytes[6] & 15 | 128, bytes[8] = bytes[8] & 63 | 128;
   let hex = bytes.toString("hex"), operationId2 = [hex.slice(0, 8), hex.slice(8, 12), hex.slice(12, 16), hex.slice(16, 20), hex.slice(20)].join("-");
-  return { envelope, operationId: operationId2 };
+  return { envelope, operationId: operationId2, timestamp: timestamp5 };
 }
 async function retireToolActivityWindows(options) {
   let scope = { ...options.sessionScope };
@@ -12004,7 +12008,7 @@ function createToolActivitySyncTransport(options) {
     protocol: "SYNC_V2",
     sessionGenerationId: scope.sessionGenerationId,
     send: async (id5, value) => {
-      let { envelope, operationId: operationId2 } = window(id5, value);
+      let { envelope, operationId: operationId2, timestamp: timestamp5 } = window(id5, value);
       try {
         return await writer.retry(operationId2);
       } catch (error) {
@@ -12017,7 +12021,7 @@ function createToolActivitySyncTransport(options) {
         ...scope,
         clientOperationId: operationId2,
         type: "TOOL_ACTIVITY",
-        timestamp: envelope.windowStart,
+        timestamp: timestamp5,
         expectedSessionKeyGen: context.sessionKeyGen ?? SESSION_KEY_GEN_ABSENT_SENTINEL,
         isEncrypted: !0,
         encryptionVersion: 1,
@@ -14503,6 +14507,13 @@ var AppSyncClient = class _AppSyncClient {
   async retireDesktopSyncRegistration(options, retired) {
     let userId = this.getCurrentUserId();
     if (this.assertSyncAccount(userId), !retired || retired.userId !== userId || retired.sessionId !== options.sessionId || retired.status !== "INACTIVE" /* INACTIVE */ || retired.sessionGenerationId !== options.sessionGenerationId) throw new SyncEventClientError("SYNC_SESSION_UNAVAILABLE");
+    return this.removeDesktopSyncRegistrationState(options);
+  }
+  /** Both callers have terminal authority and have joined their read owners:
+   * the returned INACTIVE session above, or a freshly confirmed durable intent. */
+  async removeDesktopSyncRegistrationState(options) {
+    let userId = this.getCurrentUserId();
+    this.assertSyncAccount(userId);
     let writer = this.desktopSyncWriter({ root: options.root, sessionScope: options }), result = await writer.removeDesktopRegistration();
     return await writer.removeInbound(), await writer.removeDeferredInputs(), await writer.removeMobileEchoes(), await writer.promptRetention().remove(), this.assertSyncAccount(userId), result;
   }
@@ -14937,7 +14948,7 @@ var AppSyncClient = class _AppSyncClient {
     return this.resolvePromptPublication({ sessionId: input.sessionId, promptId: input.promptId }, async () => (await fence(), _AppSyncClient.throwIfAborted(signal), await this.resolveDesktopSyncPrompt(input, signal), await fence(), !0), { ...options, signal });
   }
   /** Explicit session-owned restart recovery. Inventory is bounded by the
-   * account store's 256-file cap; empty inventory does no cloud I/O. Reuses
+   * account store's file cap; empty inventory does no cloud I/O. Reuses
    * original ownership/generation, not current Session or encryption state.
    * No failure/age/quota condition deletes an outstanding intent. */
   recoverPromptResolutions(options, signal) {
@@ -15108,12 +15119,12 @@ var AppSyncClient = class _AppSyncClient {
     await work, this.assertSyncAccount(userId), _AppSyncClient.throwIfAborted(signal);
   }
   async finishRecordedSessionRetirement(record2, options, fence, signal) {
-    let { input } = record2, { root } = options, userId = this.getCurrentUserId(), writer = this.desktopSyncWriter({ root, sessionScope: input });
+    let { input } = record2, { root } = options, userId = this.getCurrentUserId(), writer = this.desktopSyncWriter({ root, sessionScope: input }), confirmed = !1, confirm = async (request3) => {
+      let receipt2 = await this.confirmDesktopSyncRetirement(request3, signal);
+      return confirmed = !0, receipt2;
+    };
     await fence(), _AppSyncClient.throwIfAborted(signal);
-    let result = await writer.removeRetiredSources(
-      input.expectedSessionKeyGen,
-      (request3) => this.confirmDesktopSyncRetirement(request3, signal)
-    ), cleanupDeferred = !1;
+    let result = await writer.removeRetiredSources(input.expectedSessionKeyGen, confirm), cleanupDeferred = !1;
     if (record2.toolOutbox) {
       await fence();
       let tools = await retireToolActivityWindows({
@@ -15121,14 +15132,14 @@ var AppSyncClient = class _AppSyncClient {
         writer,
         outbox: new ToolActivityOutbox({ ...record2.toolOutbox, logger }),
         expectedSessionKeyGen: input.expectedSessionKeyGen,
-        confirm: (input2) => this.confirmDesktopSyncRetirement(input2, signal),
+        confirm,
         deferIfPaged: options.deferOversizedTools
       });
       result.sourcesRemoved += tools.windowsRemoved, result.operationsRemoved += tools.operationsRemoved, cleanupDeferred = tools.hasMore === !0;
     }
     for (let input2 of await writer.promptResolutions())
       await fence(), this.assertSyncAccount(userId), _AppSyncClient.throwIfAborted(signal), await writer.runPromptResolution(input2, async (saved, fence2) => (await fence2(), await this.resolveDesktopSyncPrompt(saved, signal), await fence2(), !0), { existingOnly: !0 });
-    return await fence(), this.assertSyncAccount(userId), _AppSyncClient.throwIfAborted(signal), { ...result, ...cleanupDeferred && { cleanupDeferred: !0 } };
+    return await fence(), this.assertSyncAccount(userId), _AppSyncClient.throwIfAborted(signal), await writer.hasSessionRegistrationState() && (confirmed || await confirm(input), await fence(), _AppSyncClient.throwIfAborted(signal), await this.removeDesktopSyncRegistrationState({ ...input, root })), await fence(), this.assertSyncAccount(userId), _AppSyncClient.throwIfAborted(signal), { ...result, ...cleanupDeferred && { cleanupDeferred: !0 } };
   }
   /** Wire-only PROMPT_OWNERSHIP transition. It cannot create an Event. Plugin
    * preimage authority does not require the retired Session's encryption key;
@@ -69151,6 +69162,14 @@ ${section}`);
               sessionId: this.deps.session.sessionId,
               summary: summaryModel
             }
+          }).then((result) => {
+            if (result.emitted) return;
+            let code = result.error?.code;
+            logger.warn("[QuorumLoop] Companion audit summary was not acknowledged (non-fatal)", {
+              taskId,
+              reason: result.reason,
+              ...typeof code == "string" && /^[A-Z][A-Z0-9_]{0,79}$/.test(code) ? { errorCode: code } : {}
+            });
           }).catch((wErr) => {
             logger.warn("[QuorumLoop] Companion audit summary emission failed (non-fatal)", {
               taskId,
@@ -81268,9 +81287,9 @@ function createTaskProgressRelay(deps) {
   let minIntervalMs = deps.minIntervalMs ?? DEFAULT_MIN_RELAY_INTERVAL_MS, lastRelayedAt = 0, lastMessage = null, lastPhase = null, lastTaskId = null, pendingTimeout = null, pendingFlush = null, emit = async (event, message2) => {
     pendingTimeout && (clearTimeout(pendingTimeout), pendingTimeout = null), pendingFlush = null;
     let taskId = event.progressTaskId ?? ("taskId" in event && typeof event.taskId == "string" ? event.taskId : void 0);
-    lastRelayedAt = Date.now(), lastMessage = message2, lastPhase = event.phase, lastTaskId = taskId ?? null, RUNTIME_LABELLED_PHASES.has(event.phase) ? logger.info("[task-progress-relay] relayed", { phase: event.phase, message: message2 }) : logger.debug("[task-progress-relay] relayed", { phase: event.phase });
+    lastRelayedAt = Date.now(), lastMessage = message2, lastPhase = event.phase, lastTaskId = taskId ?? null;
     try {
-      return await deps.emitShellEvent({
+      let result = await deps.emitShellEvent({
         sessionId: deps.sessionId,
         type: "NOTIFICATION",
         source: "DESKTOP",
@@ -81282,7 +81301,16 @@ function createTaskProgressRelay(deps) {
           message: message2,
           ...taskId ? { taskId } : {}
         }
-      }), !0;
+      });
+      if (!result.emitted) {
+        let code = result.error?.code;
+        return logger.warn("[task-progress-relay] progress notification was not acknowledged", {
+          phase: event.phase,
+          reason: result.reason,
+          ...typeof code == "string" && /^[A-Z][A-Z0-9_]{0,79}$/.test(code) ? { errorCode: code } : {}
+        }), !1;
+      }
+      return RUNTIME_LABELLED_PHASES.has(event.phase) ? logger.info("[task-progress-relay] relayed", { phase: event.phase, message: message2 }) : logger.debug("[task-progress-relay] relayed", { phase: event.phase }), !0;
     } catch (err) {
       return logger.debug("[task-progress-relay] failed to emit progress notification (non-fatal)", {
         phase: event.phase,

package/dist/orchestration-shell/task-progress-relay.d.ts

@@ -1,7 +1,7 @@
 import type { TaskProgressEvent } from './task-progress';
-import type { ShellEventEmit } from './emit-shell-event';
+import type { ShellEventEmit, ShellEventEmitResult } from './emit-shell-event';
 export interface TaskProgressRelayDeps {
-    emitShellEvent: (args: ShellEventEmit) => Promise<unknown>;
+    emitShellEvent: (args: ShellEventEmit) => Promise<ShellEventEmitResult>;
     sessionId: string;
     minIntervalMs?: number;
 }

package/package.json

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