@graphrefly/graphrefly 0.14.0 → 0.15.0

package/dist/compat/nestjs/index.js

@@ -32,14 +32,14 @@ import {
   observeSSE,
   observeSubscription
 } from "../../chunk-2ZICUAUJ.js";
+import "../../chunk-ZHTHUX5D.js";
+import "../../chunk-YW6LFCFS.js";
 import {
   observeGraph$,
   observeNode$,
   toMessages$,
   toObservable
 } from "../../chunk-QVYZD65U.js";
-import "../../chunk-ZHTHUX5D.js";
-import "../../chunk-YW6LFCFS.js";
 import "../../chunk-WZ2Z2CRV.js";
 import "../../chunk-CRACCCJY.js";
 import "../../chunk-XQ4UMAU7.js";

package/dist/index.cjs

@@ -4645,7 +4645,7 @@ var Graph = class _Graph {
   _createObserveResult(path, target, options) {
     const timeline = options.timeline === true;
     const causal = options.causal === true;
-    const derived3 = options.derived === true;
+    const derived2 = options.derived === true;
     const minimal = options.detail === "minimal";
     const result = {
       values: {},
@@ -4658,14 +4658,14 @@ var Graph = class _Graph {
     let lastTriggerDepIndex;
     let lastRunDepValues;
     let detachInspectorHook;
-    if ((causal || derived3) && target instanceof NodeImpl) {
+    if ((causal || derived2) && target instanceof NodeImpl) {
       detachInspectorHook = target._setInspectorHook((event) => {
         if (event.kind === "dep_message") {
           lastTriggerDepIndex = event.depIndex;
           return;
         }
         lastRunDepValues = [...event.depValues];
-        if (derived3) {
+        if (derived2) {
           result.events.push({
             type: "derived",
             path,
@@ -13523,7 +13523,9 @@ function promptNode(adapter, deps, prompt, opts) {
   const messagesNode = derived(
     deps,
     (values) => {
+      if (values.some((v) => v == null)) return [];
       const text = typeof prompt === "string" ? prompt : prompt(...values);
+      if (!text) return [];
       const msgs = [];
       if (opts?.systemPrompt) msgs.push({ role: "system", content: opts.systemPrompt });
       msgs.push({ role: "user", content: text });
@@ -18428,6 +18430,9 @@ function priorityScore(item, strategy, lastInteractionNs, urgency, signals) {
 }
 
 // src/patterns/harness/loop.ts
+function baseSummary(summary) {
+  return summary.replace(/^\[RETRY \d+\/\d+\]\s*/, "");
+}
 var DEFAULT_TRIAGE_PROMPT = `You are a triage classifier for a reactive collaboration harness.
 
 Given an intake item, classify it and output JSON:
@@ -18489,13 +18494,19 @@ var HarnessGraph = class extends Graph {
   strategy;
   /** Verify results topic — subscribe to see verification outcomes. */
   verifyResults;
-  constructor(name, intake, queues, gates, strategy, verifyResults) {
+  /** Per-item fast-retry counts (keyed by base summary). */
+  retryTracker;
+  /** Per-item reingestion counts (keyed by base summary). */
+  reingestionTracker;
+  constructor(name, intake, queues, gates, strategy, verifyResults, retryTracker, reingestionTracker) {
     super(name);
     this.intake = intake;
     this.queues = queues;
     this.gates = gates;
     this.strategy = strategy;
     this.verifyResults = verifyResults;
+    this.retryTracker = retryTracker;
+    this.reingestionTracker = reingestionTracker;
   }
 };
 function harnessLoop(name, opts) {
@@ -18512,14 +18523,20 @@ function harnessLoop(name, opts) {
   }
   const intake = new TopicGraph("intake", { retainedLimit });
   const strategy = strategyModel();
+  const triageInput = withLatestFrom(
+    intake.latest,
+    strategy.node
+  );
   const triageNode = promptNode(
     adapter,
-    [intake.latest, strategy.node],
-    opts.triagePrompt ?? ((item, strat) => {
-      return DEFAULT_TRIAGE_PROMPT.replace("{{strategy}}", JSON.stringify(strat)).replace(
-        "{{item}}",
-        JSON.stringify(item)
-      );
+    [triageInput],
+    opts.triagePrompt ?? ((pair) => {
+      const [item, strat] = pair;
+      if (!item) return "";
+      return DEFAULT_TRIAGE_PROMPT.replace(
+        "{{strategy}}",
+        JSON.stringify(Array.from(strat.entries()))
+      ).replace("{{item}}", JSON.stringify(item));
     }),
     {
       name: "triage",
@@ -18531,12 +18548,14 @@ function harnessLoop(name, opts) {
   for (const route of QUEUE_NAMES) {
     queueTopics.set(route, new TopicGraph(`queue/${route}`, { retainedLimit }));
   }
-  const _router = effect([triageNode], ([triaged]) => {
+  const router = effect([triageNode], ([triaged]) => {
     const item = triaged;
     if (!item || !item.route) return;
     const topic2 = queueTopics.get(item.route);
     if (topic2) topic2.publish(item);
   });
+  router.subscribe(() => {
+  });
   const gateGraph = new Graph("gates");
   const gateControllers = /* @__PURE__ */ new Map();
   for (const route of QUEUE_NAMES) {
@@ -18566,9 +18585,7 @@ function harnessLoop(name, opts) {
   const executeNode = promptNode(
     adapter,
     [executeInput],
-    opts.executePrompt ?? ((item) => {
-      return DEFAULT_EXECUTE_PROMPT.replace("{{item}}", JSON.stringify(item));
-    }),
+    opts.executePrompt ?? ((item) => DEFAULT_EXECUTE_PROMPT.replace("{{item}}", JSON.stringify(item))),
     {
       name: "execute",
       format: "json",
@@ -18579,66 +18596,87 @@ function harnessLoop(name, opts) {
   const verifyNode = promptNode(
     adapter,
     [executeNode, executeInput],
-    opts.verifyPrompt ?? ((execution, item) => {
-      return DEFAULT_VERIFY_PROMPT.replace("{{execution}}", JSON.stringify(execution)).replace(
-        "{{item}}",
-        JSON.stringify(item)
-      );
-    }),
+    opts.verifyPrompt ?? ((execution, item) => DEFAULT_VERIFY_PROMPT.replace("{{execution}}", JSON.stringify(execution)).replace(
+      "{{item}}",
+      JSON.stringify(item)
+    )),
     {
       name: "verify",
       format: "json",
       retries: 1
     }
   );
+  const verifyWithExec = withLatestFrom(verifyNode, executeNode);
+  const verifyContext = withLatestFrom(
+    verifyWithExec,
+    executeInput
+  );
   const maxReingestions = opts.maxReingestions ?? 1;
-  let reingestionCount = 0;
-  const _fastRetry = effect([verifyNode], ([result]) => {
-    const vr = result;
-    if (!vr) return;
+  const retryTracker = /* @__PURE__ */ new Map();
+  const reingestionTracker = /* @__PURE__ */ new Map();
+  const fastRetry = effect([verifyContext], ([ctx]) => {
+    const [[vo, execRaw], item] = ctx;
+    if (!vo || !item) return;
+    const exec = {
+      item,
+      outcome: execRaw?.outcome ?? "failure",
+      detail: execRaw?.detail ?? "unknown"
+    };
+    const vr = {
+      item,
+      execution: exec,
+      verified: vo.verified,
+      findings: vo.findings ?? [],
+      errorClass: vo.errorClass
+    };
     if (vr.verified) {
-      strategy.record(vr.item.rootCause, vr.item.intervention, true);
+      strategy.record(item.rootCause, item.intervention, true);
       verifyResults.publish(vr);
       return;
     }
     const errClass = vr.errorClass ?? errorClassifier({
-      item: vr.item,
+      item,
       outcome: "failure",
-      detail: vr.findings.join("; "),
-      retryCount: 0
+      detail: vr.findings.join("; ")
     });
-    const exec = vr.execution;
-    const retryCount = exec?.retryCount ?? 0;
+    const key = baseSummary(item.summary);
+    const retryCount = retryTracker.get(key) ?? 0;
     if (errClass === "self-correctable" && retryCount < maxRetries) {
+      retryTracker.set(key, retryCount + 1);
       const retryItem = {
-        ...vr.item,
-        summary: `[RETRY ${retryCount + 1}/${maxRetries}] ${vr.item.summary} \u2014 Previous attempt failed: ${vr.findings.join("; ")}`
+        ...item,
+        summary: `[RETRY ${retryCount + 1}/${maxRetries}] ${baseSummary(item.summary)} \u2014 Previous attempt failed: ${vr.findings.join("; ")}`
       };
       retryTopic.publish(retryItem);
     } else {
-      strategy.record(vr.item.rootCause, vr.item.intervention, false);
+      strategy.record(item.rootCause, item.intervention, false);
       verifyResults.publish(vr);
-      if (reingestionCount < maxReingestions) {
-        reingestionCount++;
+      const itemReingestions = reingestionTracker.get(key) ?? 0;
+      if (itemReingestions < maxReingestions) {
+        reingestionTracker.set(key, itemReingestions + 1);
         intake.publish({
           source: "eval",
-          summary: `Verification failed for: ${vr.item.summary}`,
+          summary: `Verification failed for: ${baseSummary(item.summary)}`,
           evidence: vr.findings.join("\n"),
-          affectsAreas: vr.item.affectsAreas,
-          affectsEvalTasks: vr.item.affectsEvalTasks,
+          affectsAreas: item.affectsAreas,
+          affectsEvalTasks: item.affectsEvalTasks,
           severity: "high",
-          relatedTo: [vr.item.summary]
+          relatedTo: [baseSummary(item.summary)]
         });
       }
     }
   });
+  fastRetry.subscribe(() => {
+  });
   const harness = new HarnessGraph(
     name,
     intake,
     queueTopics,
     gateControllers,
     strategy,
-    verifyResults
+    verifyResults,
+    retryTracker,
+    reingestionTracker
   );
   harness.mount("intake", intake);
   for (const [route, topic2] of queueTopics) {