@feng0531/dsh-code-review 0.87.0 → 0.87.2

package/src/service.mjs

@@ -1,3 +1,4 @@
+import { previewValidity } from './preview-validity.mjs';
 import { configureWireBudget } from './model-wire-budget.mjs';
 import {REVIEW_RUNTIME} from './runtime-identity.mjs';
 import { buildResumeState, validateResumeState, resumePreview } from './review-resume.mjs';
@@ -101,12 +102,15 @@ function createSessionReviewService(llm, { capture = captureSnapshot, now = Date
         prune();
         while (previews.size >= maxPreviews) previews.delete(previews.keys().next().value);
         const previewId = randomUUID();
-        previews.set(previewId, { ...current, target, options, rounds, snapshotId: snapshot.id, resumeState, sourceJobId, expires: now() + ttlMs });
+        const expires = now() + ttlMs;
+        previews.set(previewId, { ...current, target, options, rounds, snapshotId: snapshot.id, resumeState, sourceJobId, expires });
         return {
   ...(options.businessRequirement !== undefined
     ? { businessRequirement: { text: options.businessRequirement, hash: hash(options.businessRequirement), bytes: Buffer.byteLength(options.businessRequirement) } }
     : {}),
   previewId,
+  expiresAt: new Date(expires).toISOString(),
+  validForMs: ttlMs,
   ...(resumeState ? { resume: resumePreview(resumeState, sourceJobId) } : {}),
   plan,
   snapshotId: snapshot.id,
@@ -151,9 +155,10 @@ function createSessionReviewService(llm, { capture = captureSnapshot, now = Date
       if (busy) throw new Error('Review service busy');
       if (!allowModelSending) throw new Error('Model sending is disabled by plugin configuration');
       if (!args || Object.keys(args).some(k => !['previewId', 'confirmed'].includes(k)) || args.confirmed !== true || typeof args.previewId !== 'string') throw new Error('Confirmed preview is required');
-      prune();
       const current = owner(exec), preview = previews.get(args.previewId);
-      if (!preview || preview.agent !== current.agent || preview.cwd !== current.cwd || JSON.stringify(preview.route) !== JSON.stringify(current.route)) throw new Error('Preview missing, expired or owner/model/directory changed');
+      try { previewValidity(preview, current, now()); }
+      catch (error) { if (error.code === 'PREVIEW_EXPIRED') previews.delete(args.previewId); throw error; }
+      prune();
       busy = true;
       previews.delete(args.previewId);
       try {

package/src/stage-continuation.mjs

@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto';
-const KINDS = new Set(['verification', 'synthesis', 'interaction']);
+const KINDS = new Set(['primary', 'verification', 'synthesis', 'interaction']);
 const REASONS = new Set(['READER_CALL_BUDGET_EXCEEDED', 'READER_OUTPUT_BUDGET_EXCEEDED', 'STAGE_INTERRUPTED', 'STAGE_CANCELLED', 'STAGE_TIMEOUT', 'STAGE_NO_PROGRESS', 'STAGE_ATTEMPTS_EXHAUSTED', 'STAGE_FAILED']);
 const fail = code => Object.assign(new Error(code), { code });
 const canonical = value => Array.isArray(value) ? value.map(canonical) : value && typeof value === 'object' ? Object.fromEntries(Object.keys(value).sort().filter(key => value[key] !== undefined).map(key => [key, canonical(value[key])])) : value;
@@ -40,7 +40,17 @@ export function createStageContinuation(snapshot, options, { completedPrimary =
     }
   }
   const get = id => { const state=states.get(id); if (!state) throw fail('UNKNOWN_STAGE_UNIT'); return state; };
-  const dependenciesReady = state => state.fileIds.every(id => primary.includes(id)) && state.dependencies.every(dep => dep.startsWith('primary:') ? primary.includes(dep.slice(8)) : get(dep).status === 'completed');
+  // The completedPrimary baseline is immutable. A pending primary may run without
+  // belonging to it; secondary work must name a completed primary unit explicitly
+  // when relying on primary work performed by this continuation. Reserved
+  // primary:<fileId> dependencies still refer only to the completed baseline.
+  const dependencyCompleted = dep => dep.startsWith('primary:') ? primary.includes(dep.slice(8)) : get(dep).status === 'completed';
+  const primaryCompleted = (state, fileId) => primary.includes(fileId) || state.dependencies.some(dep => {
+    if (dep.startsWith('primary:')) return false;
+    const prerequisite = get(dep);
+    return prerequisite.kind === 'primary' && prerequisite.status === 'completed' && prerequisite.fileIds.includes(fileId);
+  });
+  const dependenciesReady = state => (state.kind === 'primary' || state.fileIds.every(id => primaryCompleted(state, id))) && state.dependencies.every(dependencyCompleted);
   for (const state of states.values()) {
     if (state.status === 'completed' && (!dependenciesReady(state) || state.stopped || state.pendingReason !== null)) throw fail('INVALID_STAGE_CHECKPOINT');
   }

package/src/stage-generation-cache.mjs

@@ -0,0 +1,22 @@
+import { prepareStageGenerations } from './review-stage-state.mjs';
+
+// Only host-validated generations enter this cache. Failed admission leaves the
+// last good set unchanged; imported checkpoints still fail closed in the validator.
+export function createStageGenerationCache(snapshot, records = [], { maxBytes = 8 * 1024 * 1024 } = {}) {
+  let saved = prepareStageGenerations(snapshot, records, { maxBytes });
+  return {
+    records() { return structuredClone(saved); },
+    admit(record) {
+      let normalized;
+      try { [normalized] = prepareStageGenerations(snapshot, [record]); }
+      catch { return { accepted: false, code: 'STAGE_CACHE_RECORD_REJECTED' }; }
+      const next = saved.filter(row => row.key !== normalized.key);
+      next.push(normalized);
+      let checked;
+      try { checked = prepareStageGenerations(snapshot, next, { maxBytes }); }
+      catch { return { accepted: false, code: 'STAGE_CACHE_CAPACITY_EXCEEDED' }; }
+      saved = checked;
+      return { accepted: true, record: structuredClone(normalized) };
+    },
+  };
+}