@lore-co/cli 0.2.18 → 0.2.20

package/dist/runtime.js

@@ -21,7 +21,7 @@ import { CONTEXT_CACHE_MAX_STALE_MS, isContextTransportFailure, selectCachedCont
 import { RUNTIME_VERSION } from "./runtime-version.js";
 import { checkLoreAccess, checkDirectory, checkWorkspaceRepository, readLocalConfig, resolveLocalConnection, bindLocalSession } from "./directory-policy.js";
 import { capturePendingImages, enqueueEventImages, flushImageAttachment, hostMessageImages, rememberImageCapture } from "./image-capture.js";
-import { guardRuleConflict, guardToolTrigger, supportedGuardRule, guardEmergencyCommand, emergencyOverrideApplies } from "@lore-co/core/guard-evaluation";
+import { guardRepositoryOverride, guardRuleConflict, guardToolTrigger, supportedGuardRule, guardEmergencyCommand, emergencyOverrideApplies } from "@lore-co/core/guard-evaluation";
 const IS_STANDALONE_RUNTIME = typeof __LORE_STANDALONE__ === "boolean" && __LORE_STANDALONE__;
 export const COMMAND_HOOK_AGENT_NAMES = [
     "codex",
@@ -1548,10 +1548,12 @@ function queuedRequest(value) {
     }
     return null;
 }
-async function flushOne(config, fetchImplementation, store) {
+async function flushOne(config, fetchImplementation, store, preferredIdempotencyKey) {
     const claimed = await store.claimNext({
         workerId: `native-hook:${process.pid}`,
         kinds: ["turn", "prompt", "guard_override"],
+        skipDeferred: true,
+        ...(preferredIdempotencyKey === undefined ? {} : { preferredIdempotencyKey }),
         eligible: async (entry) => entry.kind === "guard_override" || (await checkWorkspaceRepository(config, queuedRequest(entry.payload)?.request.scope?.repo, fetchImplementation)).allowed,
     });
     if (claimed === null || claimed.claim === undefined) {
@@ -1586,12 +1588,18 @@ async function flushOne(config, fetchImplementation, store) {
         const permission = await checkWorkspaceRepository(config, queued.request.scope?.repo, fetchImplementation);
         if (!permission.allowed)
             throw Object.assign(new Error(permission.reason), { retryable: true });
+        // A persisted capture can already be committed while response enrichment
+        // exceeds the live request budget. Give retries a bounded longer window
+        // to receive the acknowledgement instead of timing out forever.
+        const replayConfig = claimed.retry.attempts > 0
+            ? { ...config, timeoutMs: Math.min(10_000, (config.timeoutMs ?? 2_500) * 2 ** Math.min(claimed.retry.attempts, 2)) }
+            : config;
         let delivery;
         if (queued.kind === "turn") {
-            delivery = await postTurn(config, queued.request, fetchImplementation, store);
+            delivery = await postTurn(replayConfig, queued.request, fetchImplementation, store);
         }
         else {
-            await postPromptObservation(config, queued.request, fetchImplementation, store);
+            await postPromptObservation(replayConfig, queued.request, fetchImplementation, store);
         }
         await store.acknowledgeClaim(claimed.claim.id);
         return {
@@ -1877,7 +1885,7 @@ async function offlineGuard(config, store, request, now, previouslyEnforced, all
         return { offline: true, mode: "enforce", requiresConfirmation: false, items: [], conflictSummaries: ["An audited, time-limited emergency override is active for this session and repository."] };
     }
     const overrides = isObject(remembered) && Array.isArray(remembered.overrides) ? remembered.overrides : [];
-    const override = overrides.find((item) => isObject(item) && item.repo === request.repo);
+    const override = guardRepositoryOverride(overrides, request.repo);
     const knownEnforce = previouslyEnforced || (isObject(override) ? override.mode : isObject(remembered) ? remembered.mode : undefined) === "enforce";
     try {
         if (!allowCachedPolicy)
@@ -1889,7 +1897,7 @@ async function offlineGuard(config, store, request, now, previouslyEnforced, all
         const payload = verifySignedSnapshot(compactJws, {
             workspaceId: store.workspaceId, keys, kind: "guard_policy", now,
         }).payload;
-        const cachedOverride = Array.isArray(payload.overrides) ? payload.overrides.find((item) => isObject(item) && item.repo === request.repo) : undefined;
+        const cachedOverride = guardRepositoryOverride(payload.overrides, request.repo);
         const mode = isObject(cachedOverride) ? cachedOverride.mode : payload.mode;
         if (isObject(remembered) && remembered.policyVersion !== payload.policyVersion)
             throw new Error("Policy has changed");
@@ -2121,7 +2129,7 @@ export async function handleHookEvent(value, agent, options = {}) {
             const saved = await runtimeStore(config, options.home).then(store => store.readState("guard-policy-state")).catch(() => null);
             // Use the same scope as live Guard: non-Git folders have no repo override.
             const scope = await repositoryScope(stringField(input.cwd)).catch(() => undefined);
-            const override = isObject(saved) && Array.isArray(saved.overrides) ? saved.overrides.find(value => isObject(value) && value.repo === scope?.repo) : undefined;
+            const override = guardRepositoryOverride(isObject(saved) ? saved.overrides : undefined, scope?.repo);
             if (prior?.mode === "enforce" || (isObject(override) ? override.mode : isObject(saved) ? saved.mode : undefined) === "enforce") {
                 const reason = "Lore cannot verify workspace repository settings. Restore the connection before retrying.";
                 if (agent === "cursor")
@@ -2180,7 +2188,7 @@ export async function handleHookEvent(value, agent, options = {}) {
             const prior = await readGuardState(agent, sessionId, options.home, config.connectionId).catch(() => null);
             const saved = await runtimeStore(config, options.home).then((store) => store.readState("guard-policy-state")).catch(() => null);
             const scope = await repositoryScope(stringField(input.cwd)).catch(() => undefined);
-            const override = isObject(saved) && Array.isArray(saved.overrides) ? saved.overrides.find((entry) => isObject(entry) && entry.repo === scope?.repo) : undefined;
+            const override = guardRepositoryOverride(isObject(saved) ? saved.overrides : undefined, scope?.repo);
             if (prior?.mode === "enforce" || (isObject(override) ? override.mode : isObject(saved) ? saved.mode : undefined) === "enforce") {
                 const reason = "Lore Guard cannot verify its enforcement policy. Restore Lore before retrying.";
                 if (agent === "cursor")
@@ -2313,8 +2321,7 @@ async function handlePromptEvent(input, agent, sessionId, config, options, now,
     try {
         const flushed = await flushOne(config, fetchImplementation, store);
         noticeForFlush(flushed);
-        // A retained terminal failure still occupies capacity. Give the next item
-        // one upload attempt before enqueueing, including when the queue was full.
+        // Give the next item one upload attempt after a permanent failure.
         if (flushed?.state === "dead")
             noticeForFlush(await flushOne(config, fetchImplementation, store));
     }
@@ -2382,7 +2389,7 @@ async function handlePromptEvent(input, agent, sessionId, config, options, now,
         }
         if (enqueued) {
             try {
-                const flushed = await flushOne(config, fetchImplementation, store);
+                const flushed = await flushOne(config, fetchImplementation, store, request.eventId);
                 noticeForFlush(flushed);
                 if (flushed?.idempotencyKey === request.eventId &&
                     flushed.state === "acknowledged" &&
@@ -2456,7 +2463,7 @@ async function handlePromptEvent(input, agent, sessionId, config, options, now,
         }
         if (enqueued) {
             try {
-                const flushed = await flushOne(config, fetchImplementation, store);
+                const flushed = await flushOne(config, fetchImplementation, store, observation.eventId);
                 noticeForFlush(flushed);
                 if (!terminal(flushed, observation.eventId) &&
                     (flushed?.idempotencyKey !== observation.eventId || flushed.state !== "acknowledged")) {