@gamaze/hicortex 0.20.7 → 0.20.9

package/dist/schema-prototypes.d.ts

@@ -121,9 +121,9 @@ export declare function computeTagWeights(db: Database.Database, memoryId: strin
  *
  * Used by the no-fit path (nofit.ts, owner amendment 07.07): when the LLM
  * says no domain fits, the memory can still earn a WEAK primary from pure
- * embedding association — provided the best cosine clears the configured
- * weakPrimaryFloor (the caller checks the floor; this function just reports
- * the argmax).
+ * embedding association — provided the best cosine clears the weak-primary
+ * floor (release-managed since #408; the caller checks the floor, this
+ * function just reports the argmax).
  *
  * Returns null when the memory has no stored vector or no configured domain
  * has a prototype (nothing to associate against). Ties resolve to the FIRST

package/dist/schema-prototypes.js

@@ -239,9 +239,9 @@ function computeTagWeights(db, memoryId, tags, prototypes) {
  *
  * Used by the no-fit path (nofit.ts, owner amendment 07.07): when the LLM
  * says no domain fits, the memory can still earn a WEAK primary from pure
- * embedding association — provided the best cosine clears the configured
- * weakPrimaryFloor (the caller checks the floor; this function just reports
- * the argmax).
+ * embedding association — provided the best cosine clears the weak-primary
+ * floor (release-managed since #408; the caller checks the floor, this
+ * function just reports the argmax).
  *
  * Returns null when the memory has no stored vector or no configured domain
  * has a prototype (nothing to associate against). Ties resolve to the FIRST

package/dist/state.d.ts

@@ -55,9 +55,8 @@ export interface HicortexState {
      * B) — highest memories.rowid whose decision/correction candidates have
      * been evaluated (or infra-skipped) this run. Absent/0 = never run. Unlike
      * relinkCursor/domainCursor (separate resumable CLI commands), this cursor
-     * advances a SMALL amount per night (config `supersessionMaxCalls`, default
-     * 30) as part of the regular nightly — the corpus is back-processed
-     * gradually over many nights.
+     * advances within the shared nightly LLM call budget as part of the regular
+     * nightly — the corpus is back-processed gradually over many nights.
      */
     supersessionCursor?: number;
     /**

package/dist/storage.d.ts

@@ -132,15 +132,15 @@ export declare function vectorSearch(db: Database.Database, queryEmbedding: Floa
     distance: number;
 }>;
 /**
- * BM25F field weights (config-driven via {@link configureBm25Fts}, called from
- * retrieval.configureScoring at boot). The order mirrors the FTS5 column
- * declaration in db.ts (content, project, domain) — `bm25(memories_fts, …)`
- * takes weights POSITIONALLY, so a new FTS column MUST be added here in the
- * same position or the weighting silently shifts. Defaults favor scope fields
- * (project/domain) over body so cross-scope noise that wins on raw token
- * frequency (the marine "battery" memory on a hardware query) is demoted
- * without excluding it — the same "graded, never binary" discipline as
- * computeScore's affinity terms.
+ * BM25F field weights (release-managed since #408 — the defaults resolve from
+ * calibration.ts; {@link configureBm25Fts} is the eval/test seam). The order
+ * mirrors the FTS5 column declaration in db.ts (content, project, domain) —
+ * `bm25(memories_fts, …)` takes weights POSITIONALLY, so a new FTS column
+ * MUST be added here in the same position or the weighting silently shifts.
+ * Defaults favor scope fields (project/domain) over body so cross-scope noise
+ * that wins on raw token frequency (the marine "battery" memory on a hardware
+ * query) is demoted without excluding it — the same "graded, never binary"
+ * discipline as computeScore's affinity terms.
  */
 export interface Bm25Weights {
     body: number;
@@ -148,14 +148,14 @@ export interface Bm25Weights {
     domain: number;
 }
 /**
- * Configure BM25F weights from config. Called by retrieval.configureScoring
- * (which itself is called at server + nightly boot) so storage and retrieval
- * rank identically. Invalid/out-of-range values keep the shipped default per
- * key. Range [0, ∞) — a 0 weight effectively drops that field from the score;
- * negative values are rejected (BM25F sign semantics break otherwise). Returns
- * the resolved set for logging/tests.
+ * Configure BM25F weights from RESOLVED overrides (the eval/test seam — #408;
+ * production calls it with no argument so storage and retrieval rank with the
+ * identical calibration defaults). Invalid/out-of-range values keep the
+ * shipped default per key. Range [0, ∞) — a 0 weight effectively drops that
+ * field from the score; negative values are rejected (BM25F sign semantics
+ * break otherwise). Returns the resolved set for logging/tests.
  */
-export declare function configureBm25Fts(config?: Record<string, unknown> | null): Bm25Weights;
+export declare function configureBm25Fts(overrides?: Partial<Bm25Weights> | null): Bm25Weights;
 /** Current resolved weights (tests + status output). */
 export declare function getBm25Weights(): Bm25Weights;
 /**

package/dist/storage.js

@@ -3,6 +3,39 @@
  * Storage layer — CRUD operations for the SQLite + sqlite-vec database.
  * Ported from hicortex/storage.py. All functions are synchronous (better-sqlite3).
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FTS_MATCH_MAX_TOKENS = void 0;
 exports.embedToBlob = embedToBlob;
@@ -38,6 +71,7 @@ exports.getAllLinkCounts = getAllLinkCounts;
 exports.getUnscoredMemories = getUnscoredMemories;
 const node_crypto_1 = require("node:crypto");
 const schema_prototypes_js_1 = require("./schema-prototypes.js");
+const CALIBRATION = __importStar(require("./calibration.js"));
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -354,28 +388,28 @@ function vectorSearch(db, queryEmbedding, limit = 10, excludeIds = []) {
     return results;
 }
 const BM25_DEFAULTS = {
-    body: 1.0,
-    project: 2.0,
-    domain: 2.0,
+    body: CALIBRATION.BM25_WEIGHT_BODY,
+    project: CALIBRATION.BM25_WEIGHT_PROJECT,
+    domain: CALIBRATION.BM25_WEIGHT_DOMAIN,
 };
 let bm25Weights = { ...BM25_DEFAULTS };
 /**
- * Configure BM25F weights from config. Called by retrieval.configureScoring
- * (which itself is called at server + nightly boot) so storage and retrieval
- * rank identically. Invalid/out-of-range values keep the shipped default per
- * key. Range [0, ∞) — a 0 weight effectively drops that field from the score;
- * negative values are rejected (BM25F sign semantics break otherwise). Returns
- * the resolved set for logging/tests.
- */
-function configureBm25Fts(config) {
-    const num = (key, dflt) => {
-        const v = Number(config?.[key]);
-        return Number.isFinite(v) && v >= 0 ? v : dflt;
+ * Configure BM25F weights from RESOLVED overrides (the eval/test seam — #408;
+ * production calls it with no argument so storage and retrieval rank with the
+ * identical calibration defaults). Invalid/out-of-range values keep the
+ * shipped default per key. Range [0, ∞) — a 0 weight effectively drops that
+ * field from the score; negative values are rejected (BM25F sign semantics
+ * break otherwise). Returns the resolved set for logging/tests.
+ */
+function configureBm25Fts(overrides) {
+    const num = (v, dflt) => {
+        const n = Number(v);
+        return Number.isFinite(n) && n >= 0 ? n : dflt;
     };
     bm25Weights = {
-        body: num("bm25WeightBody", BM25_DEFAULTS.body),
-        project: num("bm25WeightProject", BM25_DEFAULTS.project),
-        domain: num("bm25WeightDomain", BM25_DEFAULTS.domain),
+        body: num(overrides?.body, BM25_DEFAULTS.body),
+        project: num(overrides?.project, BM25_DEFAULTS.project),
+        domain: num(overrides?.domain, BM25_DEFAULTS.domain),
     };
     return { ...bm25Weights };
 }
@@ -487,14 +521,18 @@ function searchFts(db, query, limit = 10, sourceAgent) {
  * Create a link between two memories.
  */
 function addLink(db, sourceId, targetId, relationship, strength = 0.5) {
-    // Guard: superseded_by and corrected_by are the ranking-demotion /
-    // correction-resolution signals, so never let a different relationship
-    // clobber an existing one for the same pair — INSERT OR REPLACE would
-    // otherwise silently remove the resolution (corrected_by is protected
-    // exactly like superseded_by, #384 AC9).
-    if (relationship !== "superseded_by" && relationship !== "corrected_by") {
+    // Guard: superseded_by, corrected_by, and conflicts are the ranking-demotion /
+    // correction-resolution / conflict-preservation signals, so never let a
+    // different relationship clobber an existing one for the same pair — INSERT
+    // OR REPLACE would otherwise silently remove the resolution (corrected_by is
+    // protected exactly like superseded_by, #384 AC9; conflicts joins the set in
+    // #393 guard-C — a conflicts edge marks the pair as never-blendable, so it
+    // must survive arbitrary later link writes exactly the same way).
+    if (relationship !== "superseded_by" &&
+        relationship !== "corrected_by" &&
+        relationship !== "conflicts") {
         const protectedLink = db
-            .prepare("SELECT 1 FROM memory_links WHERE source_id = ? AND target_id = ? AND relationship IN ('superseded_by', 'corrected_by') LIMIT 1")
+            .prepare("SELECT 1 FROM memory_links WHERE source_id = ? AND target_id = ? AND relationship IN ('superseded_by', 'corrected_by', 'conflicts') LIMIT 1")
             .get(sourceId, targetId);
         if (protectedLink)
             return;

package/dist/telemetry.d.ts

@@ -91,17 +91,17 @@ export interface TelemetryPayload {
      * `runConsolidation`'s status: "completed" | "skipped" | "failed", plus
      * "no_llm" when consolidation was skipped because no LLM was configured,
      * "throttled" (#246) when the run was skipped because the
-     * `llmTokensPerMonth` fair-use cap was projected to be exceeded, and
-     * "endpoint_down" (#337) when the pre-consolidation readiness probe failed
-     * or the LLM circuit breaker was open after the run — a TRANSIENT state
-     * (retried next run), never reported as "completed" even though the stages
-     * fail soft.
+     * `llmTokensPerMonth` fair-use cap was projected to be exceeded,
+     * "endpoint_down" (#337) when the LLM circuit breaker was open after the
+     * run, and "deferred" (#405) when the run-wide wall-clock deadline fired —
+     * the latter two are TRANSIENT states (retried next run), never reported
+     * as "completed" even though the stages fail soft.
      * "skipped" = the built-in nothing-to-do short-circuit (no new + no unscored
      * memories → zero LLM calls), NOT a failure. Lets the fleet aggregate tell a
      * real consolidation run from a no-op without repurposing `ok` (which is the
      * capture-health signal). 0.17+.
      */
-    consolidation?: "completed" | "skipped" | "failed" | "no_llm" | "throttled" | "endpoint_down";
+    consolidation?: "completed" | "skipped" | "failed" | "no_llm" | "throttled" | "endpoint_down" | "deferred";
     /**
      * Total LLM tokens consumed by THIS nightly's consolidation (#246) — the
      * BudgetTracker total. Server-mode only (capture-only + client runs make no
@@ -111,7 +111,8 @@ export interface TelemetryPayload {
      */
     tokens_this_run?: number;
     /**
-     * True when the per-tenant consolidation budget (`consolidateMaxLlmCalls`)
+     * True when the per-tenant consolidation budget (`nightlyLlmCallBudget`,
+     * #405 — formerly consolidateMaxLlmCalls)
      * was exhausted this run (#255) — LLM-bound stages deferred remaining work.
      * A quality-degradation signal concentrated on heavy users; absent on a
      * pre-#255 ping, a capture-only/no-LLM/throttled/skipped run, or when the

package/dist/token-budget.js

@@ -105,10 +105,9 @@ function recordDistillUsage(stateDir, usage) {
     let periodStart = "";
     (0, state_js_1.updateState)((s) => {
         const prev = s.llmTokensThisPeriod;
-        // Monthly reset (year+month) — matches shouldThrottleTokens's staleness check.
-        const stale = !prev?.periodStart ||
-            new Date(prev.periodStart).getUTCFullYear() !== new Date().getUTCFullYear() ||
-            new Date(prev.periodStart).getUTCMonth() !== new Date().getUTCMonth();
+        // Monthly reset — the ONE staleness helper (#405; was a hand-rolled copy
+        // of shouldThrottleTokens's check).
+        const stale = (0, consolidate_js_1.isStaleTokenPeriod)(prev?.periodStart);
         if (stale) {
             s.llmTokensThisPeriod = {
                 prompt: usage.prompt,

package/dist/type-classify.js

@@ -151,10 +151,10 @@ async function classifyMemoryType(content, llm) {
     for (let attempt = 0; attempt < 2; attempt++) {
         let raw;
         try {
-            // No per-call cap (#391): the classify-tier ceiling (classifyMaxTokens,
-            // default 1024) resolves inside completeClassify — a hardcoded 20
-            // starved reasoning models whose thinking ate the whole output budget.
-            const r = await llm.completeClassify(prompt);
+            // No per-call cap (#391/#405): maxTokens — the ONE ceiling — resolves
+            // inside complete(); the old hardcoded 20 starved reasoning models
+            // whose thinking ate the whole output budget.
+            const r = await llm.complete(prompt);
             raw = r.text;
         }
         catch (err) {