@remnic/core 10.0.39 → 10.0.41

package/src/orchestration/recall-search-pipeline.ts

@@ -27,7 +27,7 @@ import { inferIntentFromText, intentCompatibilityScore } from "../intent.js";
 import { log } from "../logger.js";
 import { NamespaceStorageRouter } from "../namespaces/storage.js";
 import { NegativeExampleStore } from "../negative.js";
-import { qmdCollectionPathParts } from "./qmd-result-resolver.js";
+import { normalizeFlatQmdResults, qmdCollectionPathParts } from "./qmd-result-resolver.js";
 import type { RecallRerankCoordinator, RecallResultPartitionSink } from "./recall-rerank-coordinator.js";
 import type { GraphRecallExpansionOptions, GraphRecallExpansionResult } from "./graph-recall-coordinator.js";
 import { RelevanceStore } from "../relevance.js";
@@ -394,7 +394,7 @@ export class RecallSearchPipelineCoordinator {
         break;
       }
 
-      const primaryResults = options.collection
+      let primaryResults = options.collection
         ? options.abortSignal
           ? await this.deps.qmd.search(
               prompt,
@@ -426,6 +426,7 @@ export class RecallSearchPipelineCoordinator {
               onDegradation: options.onDegradation,
             },
           });
+      primaryResults = normalizeFlatQmdResults(primaryResults, this.deps.config, options.collection);
       lastPrimaryResultCount = primaryResults.length;
       lastHybridResultCount = 0;
       lastHybridTopUpUsed = false;
@@ -452,7 +453,7 @@ export class RecallSearchPipelineCoordinator {
           // uniform across primary + top-up (gotcha #39). Issue #1335 (codex review #1422).
           lastHybridTopUpSkippedReason = "lex_strategy";
         } else {
-          const hybridResults = options.collection
+          let hybridResults = options.collection
             ? await this.deps.qmd.hybridSearch(
                 prompt,
                 options.collection,
@@ -474,6 +475,7 @@ export class RecallSearchPipelineCoordinator {
                   onDegradation: options.onDegradation,
                 },
               });
+          hybridResults = normalizeFlatQmdResults(hybridResults, this.deps.config, options.collection);
           lastHybridResultCount = hybridResults.length;
           lastHybridTopUpUsed = hybridResults.length > 0;
           if (hybridResults.length > 0) {
@@ -740,9 +742,7 @@ export class RecallSearchPipelineCoordinator {
         // limps home later cannot mutate a recorded recall's collector.
         coldQmdObserverActive = false;
         if (longTerm.length > 0) {
-          log.debug(
-            `cold-tier recall source=cold-qmd collection=${coldCollection} hits=${longTerm.length}`,
-          );
+          log.debug(`cold-tier recall source=cold-qmd collection=${coldCollection} hits=${longTerm.length}`);
         }
       }
     }
@@ -940,9 +940,7 @@ export class RecallSearchPipelineCoordinator {
       }
     }
     if (caps.rerank && this.deps.config.rerankProvider === "cloud") {
-      log.debug(
-        "rerankProvider=cloud is reserved/experimental in v2.2.0; skipping rerank",
-      );
+      log.debug("rerankProvider=cloud is reserved/experimental in v2.2.0; skipping rerank");
     }
 
     if (caps.recallTrustScore && results.length > 0) {
@@ -1149,6 +1147,9 @@ export class RecallSearchPipelineCoordinator {
       : null;
     const buildRecallRow = (r: QmdSearchResult, memory: MemoryFile | undefined): QmdSearchResult => ({
       ...r,
+      // Render loaded flat memories, not QMD's front-matter/chunk preview (#3194).
+      snippet: memory && !resolveNamespaceCapabilities(this.deps.config).namespaces ? memory.content : r.snippet,
+      line: memory && !resolveNamespaceCapabilities(this.deps.config).namespaces ? undefined : r.line,
       sourceConnector: memory ? memory.frontmatter.sourceConnector : undefined,
       origin: memory ? memory.frontmatter.origin : undefined,
       // #1952: an active state view carries the chain fields the inject
@@ -1358,9 +1359,7 @@ export class RecallSearchPipelineCoordinator {
       }
     }
     if (connectorPartitionFilteredCount > 0) {
-      log.debug(
-        `connector partition filter removed ${connectorPartitionFilteredCount} tool-scoped candidates from recall`,
-      );
+      log.debug(`connector partition filter removed ${connectorPartitionFilteredCount} tool-scoped candidates from recall`);
     }
     if (supportPassportFilteredCount > 0) {
       log.debug(

package/src/runtime/daemon-health.test.ts

@@ -0,0 +1,85 @@
+import assert from "node:assert/strict";
+import { once } from "node:events";
+import test from "node:test";
+import { Worker } from "node:worker_threads";
+import { checkDaemonHealth } from "./daemon-health.js";
+
+test("checkDaemonHealth probes /live without waiting on diagnostic /health", { timeout: 30_000 }, async (t) => {
+  // The synchronous probe blocks this thread, so HTTP must run on a worker.
+  const worker = new Worker(`
+    const { parentPort } = require("node:worker_threads");
+    const { createServer } = require("node:http");
+    const paths = [];
+    const server = createServer((request, response) => {
+      paths.push(request.url);
+      if (request.url === "/engram/v1/health") return;
+      response.writeHead(request.headers.authorization === "Bearer test-token" ? 200 : 401).end();
+    });
+    server.listen(0, "127.0.0.1", () => parentPort.postMessage(server.address().port));
+    parentPort.on("message", () => parentPort.postMessage(paths));
+  `, { eval: true });
+  t.after(() => worker.terminate());
+  let port = 0;
+  [port] = await once(worker, "message");
+  assert.ok(Number.isInteger(port) && port > 0 && port <= 65535);
+  assert.equal(checkDaemonHealth("127.0.0.1", port, "test-token"), true);
+  assert.equal(checkDaemonHealth("127.0.0.1", port, "wrong-token"), false);
+  const paths = once(worker, "message");
+  worker.postMessage("paths");
+  assert.deepEqual((await paths)[0], [
+    "/engram/v1/live",
+    "/engram/v1/live",
+    "/engram/v1/live",
+  ]);
+  await worker.terminate();
+  assert.equal(checkDaemonHealth("127.0.0.1", port, "test-token"), false);
+});
+
+test("checkDaemonHealth retries legacy /health only on 404 (#3257)", { timeout: 30_000 }, async (t) => {
+  const worker = new Worker(`
+    const { parentPort } = require("node:worker_threads");
+    const { createServer } = require("node:http");
+    const paths = [];
+    const server = createServer((request, response) => {
+      paths.push(request.url);
+      if (request.url === "/engram/v1/live") return response.writeHead(404).end();
+      response.writeHead(200).end();
+    });
+    server.listen(0, "127.0.0.1", () => parentPort.postMessage(server.address().port));
+    parentPort.on("message", () => parentPort.postMessage(paths));
+  `, { eval: true });
+  t.after(() => worker.terminate());
+  let port = 0;
+  [port] = await once(worker, "message");
+  assert.equal(checkDaemonHealth("127.0.0.1", port, "test-token"), true);
+  const paths = once(worker, "message");
+  worker.postMessage("paths");
+  assert.deepEqual((await paths)[0], [
+    "/engram/v1/live",
+    "/engram/v1/health",
+  ]);
+  await worker.terminate();
+});
+
+test("checkDaemonHealth treats 503 as final with no legacy retry (#3257)", { timeout: 30_000 }, async (t) => {
+  const worker = new Worker(`
+    const { parentPort } = require("node:worker_threads");
+    const { createServer } = require("node:http");
+    const paths = [];
+    const server = createServer((request, response) => {
+      paths.push(request.url);
+      if (request.url === "/engram/v1/live") return response.writeHead(503).end();
+      response.writeHead(200).end();
+    });
+    server.listen(0, "127.0.0.1", () => parentPort.postMessage(server.address().port));
+    parentPort.on("message", () => parentPort.postMessage(paths));
+  `, { eval: true });
+  t.after(() => worker.terminate());
+  let port = 0;
+  [port] = await once(worker, "message");
+  assert.equal(checkDaemonHealth("127.0.0.1", port, "test-token"), false);
+  const paths = once(worker, "message");
+  worker.postMessage("paths");
+  assert.deepEqual((await paths)[0], ["/engram/v1/live"]);
+  await worker.terminate();
+});

package/src/runtime/daemon-health.ts

@@ -16,6 +16,9 @@ export function checkDaemonHealth(
     if (!Number.isFinite(safePort) || safePort < 1 || safePort > 65535) return false;
 
     const bareHost = host.startsWith("[") && host.endsWith("]") ? host.slice(1, -1) : host;
+    // One 3 s aggregate budget: /engram/v1/live, and only a 404 (daemon older
+    // than the live route) retries the legacy diagnostic path with the
+    // remaining time. 401/503/other statuses are final answers, never re-probed.
     const script = [
       "const env = process['env'];",
       "const protocol = env.REMNIC_HEALTH_PROTOCOL;",
@@ -23,13 +26,23 @@ export function checkDaemonHealth(
       "const transport = require(protocol);",
       "const headers = {};",
       "if (env.REMNIC_HEALTH_TOKEN) headers['authorization'] = 'Bearer ' + env.REMNIC_HEALTH_TOKEN;",
-      "const req = transport.get({",
-      "  host: env.REMNIC_HEALTH_HOST,",
-      "  port: parseInt(env.REMNIC_HEALTH_PORT, 10),",
-      "  path: '/engram/v1/health', headers, timeout: 3000,",
-      "}, (res) => { process.exit(res.statusCode === 200 ? 0 : res.statusCode === 401 ? 2 : 1); });",
-      "req.on('error', () => process.exit(1));",
-      "req.on('timeout', () => { req.destroy(); process.exit(1); });",
+      "const exitFor = (status) => process.exit(status === 200 ? 0 : status === 401 ? 2 : 1);",
+      "const attempt = (path, timeoutMs, onStatus) => {",
+      "  const req = transport.get({",
+      "    host: env.REMNIC_HEALTH_HOST,",
+      "    port: parseInt(env.REMNIC_HEALTH_PORT, 10),",
+      "    path, headers, timeout: timeoutMs,",
+      "  }, (res) => { res.resume(); onStatus(res.statusCode); });",
+      "  req.on('error', () => process.exit(1));",
+      "  req.on('timeout', () => { req.destroy(); process.exit(1); });",
+      "};",
+      "const deadline = Date.now() + 3000;",
+      "attempt('/engram/v1/live', 3000, (status) => {",
+      "  if (status !== 404) exitFor(status);",
+      "  const remaining = deadline - Date.now();",
+      "  if (remaining <= 0) process.exit(1);",
+      "  attempt('/engram/v1/health', remaining, exitFor);",
+      "});",
     ].join("\n");
     const env: NodeJS.ProcessEnv = mergeEnv({
       REMNIC_HEALTH_HOST: bareHost,