dsh-biocore 0.2.0 → 0.3.0

package/lib/py-bridge.js

@@ -3,6 +3,8 @@ import { execFile, spawn } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
+import { embeddingEnv } from './modules/python-env.js'
+import { WorkerUnavailable, callCoreWorker, isWorkerRunning } from './core-worker.js'
 
 export const BRIDGE_PATH = fileURLToPath(new URL('./py/bridge.py', import.meta.url))
 export const PACKAGE_ROOT = fileURLToPath(new URL('..', import.meta.url))
@@ -10,6 +12,35 @@ export const BUNDLED_PYTHON_DIR = join(PACKAGE_ROOT, 'python')
 export const DEFAULT_ADAPTER_DIR = join(BUNDLED_PYTHON_DIR, 'dsh_adapter')
 export const BRIDGE_TIMEOUT_MS = 20000
 
+let bridgeDataDir = ''
+/** Configure embedding env for all later python subprocesses. */
+export function configureBridge(dataDir) {
+  bridgeDataDir = String(dataDir || '').trim()
+}
+
+/** task-223: worker first, spawn-per-call only as a fallback. */
+async function workerOrFallback(action, payload) {
+  if (isWorkerRunning()) {
+    try {
+      return await callCoreWorker(action, payload || {})
+    } catch (error) {
+      if (!(error instanceof WorkerUnavailable)) throw error
+      try {
+        console.error('__bioWorker fallback action=' + String(action)
+          + ' reason=' + String(error.reason || error.message))
+      } catch { /* ignore */ }
+    }
+  }
+  return runBridge(['runtime_action', String(action || ''),
+    JSON.stringify(payload && typeof payload === 'object' ? payload : {})])
+}
+
+function bridgeEnv(base) {
+  let embedding = {}
+  try { embedding = bridgeDataDir ? embeddingEnv(bridgeDataDir) : {} } catch { embedding = {} }
+  return Object.assign({}, base, embedding)
+}
+
 export function adapterDir() {
   return process.env.BIOCORE_ADAPTER_DIR || DEFAULT_ADAPTER_DIR
 }
@@ -32,11 +63,11 @@ function runBridge(args, timeoutMs) {
         cwd,
         timeout: Number(timeoutMs) || BRIDGE_TIMEOUT_MS,
         maxBuffer: 1024 * 1024,
-        env: Object.assign({}, process.env, {
+        env: bridgeEnv(Object.assign({}, process.env, {
           BIOCORE_ADAPTER_DIR: cwd,
           BIOCORE_PLUGIN_DIR: pluginDir(),
           PYTHONIOENCODING: 'utf-8',
-        }),
+        })),
       },
       (error, stdout, stderr) => {
         if (error) {
@@ -82,11 +113,11 @@ export function compilePersona(profilePath, personaPath, text) {
       [BRIDGE_PATH, 'persona_compile', String(profilePath), String(personaPath)],
       {
         cwd,
-        env: Object.assign({}, process.env, {
+        env: bridgeEnv(Object.assign({}, process.env, {
           BIOCORE_ADAPTER_DIR: cwd,
           BIOCORE_PLUGIN_DIR: pluginDir(),
           PYTHONIOENCODING: 'utf-8',
-        }),
+        })),
       },
     )
     let stdout = ''
@@ -129,35 +160,70 @@ export function memoryCapture(storeRoot, sessionId, role, text, config) {
     JSON.stringify(config && typeof config === 'object' ? config : {})])
 }
 
-export function memoryInject(storeRoot, sessionId, maxChars, topK) {
+export async function memoryInject(storeRoot, sessionId, maxChars, topK, rerankConfig,
+  query, mode) {
+  const payload = {
+    session_id: String(sessionId || 'default'),
+    store: String(storeRoot),
+    max_chars: maxChars,
+    top_k: topK,
+    rerank_config: rerankConfig && typeof rerankConfig === 'object' ? rerankConfig : undefined,
+  }
+  if (query !== undefined && query !== null && String(query).trim()) {
+    payload.query = String(query).slice(0, 2000)
+  }
+  if (mode !== undefined && mode !== null && String(mode).trim()) {
+    payload.mode = String(mode).trim().toLowerCase()
+  }
+  // Query recall / rerank need the JSON action; the legacy argv form stays for
+  // the old 5-argument call so nothing else changes.
+  if (payload.rerank_config || payload.query || payload.mode) {
+    return workerOrFallback('memory_inject', payload)
+  }
   return runBridge(['memory_inject', String(storeRoot), String(sessionId || 'default'),
     maxChars === undefined ? '' : String(maxChars),
     topK === undefined ? '' : String(topK)])
 }
 
-export function memoryTool(storeRoot, sessionId, name, args) {
+export async function memoryTool(storeRoot, sessionId, name, args, rerankConfig) {
+  const merged = Object.assign({}, args && typeof args === 'object' ? args : {})
+  if (rerankConfig && typeof rerankConfig === 'object') merged.rerank_config = rerankConfig
+  if (isWorkerRunning()) {
+    try {
+      return await callCoreWorker('tool', {
+        store: String(storeRoot),
+        session_id: String(sessionId || 'default'),
+        name: String(name || ''),
+        args: merged,
+      })
+    } catch (error) {
+      if (!(error instanceof WorkerUnavailable)) throw error
+      try { console.error('__bioWorker fallback action=tool reason=' + String(error.reason)) } catch { /* ignore */ }
+    }
+  }
   return runBridge(['memory_tool', String(storeRoot), String(sessionId || 'default'),
-    String(name || ''), JSON.stringify(args && typeof args === 'object' ? args : {})])
+    String(name || ''), JSON.stringify(merged)])
 }
 
 export function runtimePrompt(payload) {
-  return runBridge(['runtime_prompt',
-    JSON.stringify(payload && typeof payload === 'object' ? payload : {})])
+  return workerOrFallback('inject', payload)
 }
 
 export function runtimeGate(payload) {
-  return runBridge(['runtime_gate',
-    JSON.stringify(payload && typeof payload === 'object' ? payload : {})])
+  return workerOrFallback('gate', payload)
+}
+
+/** task-223: whole config arrives once; the core owns every decision. */
+export function configureCore(payload) {
+  return workerOrFallback('configure', payload)
 }
 
 /** Contract entry for boot/turn_start/turn_end/state/switches_get/switches_set. */
 export function runtimeAction(action, payload) {
-  return runBridge(['runtime_action', String(action || ''),
-    JSON.stringify(payload && typeof payload === 'object' ? payload : {})])
+  return workerOrFallback(action, payload)
 }
 
 // ---- proactive (task-205): policy lives in biocore_runtime/pipeline.py ----
 export function proactiveTick(payload) {
-  return runBridge(['proactive_tick',
-    JSON.stringify(payload && typeof payload === 'object' ? payload : {})])
+  return workerOrFallback('proactive_tick', payload)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-biocore",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "description": "BioCore DSH UI: per-session state tab, standalone instrument panel, /api/biocore/state, session/event one_turn updates, /bio sync.",
   "main": "lib/index.js",

package/python/biocore_memory/core/config.py

@@ -1,127 +1,138 @@
-# -*- coding: utf-8 -*-
-"""All memory-layer thresholds/defaults in one place."""
-from __future__ import annotations
-
-SCHEMA_VERSION = 1
-MAX_VERSIONS = 8
-TOMBSTONE_LIMIT = 100
-DEFAULT_BUDGET = 3
-MAX_BUDGET = 5
-
-# recall fusion / tiers (M2)
-CUE_WEIGHT = 0.50
-SEM_WEIGHT = 0.30
-IMPORTANCE_WEIGHT = 0.10
-TIME_BONUS = 0.10
-HIGH_TIER = 0.55
-MID_TIER = 0.35
-
-# source credibility gate (separate from importance)
-SOURCE_MIN_CONFIDENCE = 0.55
-SOURCE_CONFIDENCE_DEFAULT = 0.70
-
-# memory value formula (deterministic; trust is NOT part of value)
-VALUE_BASE = 0.20
-VALUE_W_INTENSITY = 0.30
-VALUE_W_VALENCE = 0.20
-VALUE_W_SELF = 0.15
-VALUE_W_MAINLINE = 0.15
-VALUE_W_ROUTINE = 0.20
-
-# eviction weights (read-only score)
-EVICT_W_SALIENCE = 0.30
-EVICT_W_POSITION = 0.20
-EVICT_W_REDUNDANCY = 0.20
-EVICT_W_CONFIDENCE = 0.15
-EVICT_W_STALENESS = 0.15
-
-# identity write-back gate
-SAME_DIRECTION_MIN = 3
-MAX_STEP = 0.02
-MAJOR_EVENT_STEP = 0.02
-
-# thread card
-THREAD_TTL = 21600.0
-THREAD_LIMIT = 3
-
-# memory-point gate (OR): value >= MIN_VALUE or importance >= MIN_IMPORTANCE or self >= MIN_SELF
-# (event centrality / emotional intensity; self-reference effect; engineering thresholds)
-MEMORY_POINT_MIN_VALUE = 0.60
-MEMORY_POINT_MIN_SELF = 0.45
-MEMORY_POINT_MIN_IMPORTANCE = 0.75
-
-# engine wiring knobs (all read by MemoryEngine only)
-RATE_LIMIT_PER_MIN = 30
-COMPRESS_MAX_CHARS = 200
-AUDIT_TAIL = 50
-COOC_MAX_ENTRIES = 400
-# after-turn auto consolidation: every N successful remember() calls
-CONSOLIDATE_AUTO_TURNS = 10
-
-
-# Per-mechanism flags: safety/read-path filters default ON; every optional
-# mechanism defaults OFF and must keep the old code path when disabled.
-# A flags.json in the data directory overrides these booleans at engine start
-# (and MemoryEngine.set_flags(..., persist=True) rewrites it).
-FLAGS = {
-    # safety / read-path (default ON)
-    # GA-03: keep engine default ON. DSH private mode disables it per-store via
-    # <dsh store>/flags.json; the shared engine must not be relaxed globally.
-    "security": True,          # store/security.should_reject before write
-    "provenance": True,        # provenance hash tag + chained tombstones
-    "source_filter": True,     # low-confidence candidates are counted/dropped
-    "temporal_filter": True,   # honour valid_at/invalid_at on recall
-    "dedupe": True,            # remember-side L0-L3 dedupe
-    "relay": True,             # relay card
-    "thread": True,            # thread card / TTL expiry
-    "embedding": True,         # optional embedding provider
-    # attention / model features (default OFF)
-    "slots": False,
-    "boundary": False,         # slots/boundary.py event-boundary switching
-    "three_channel": False,
-    "eviction_readonly": False,
-    "identity": False,
-    "identity_writeback": False,
-    "due_hints": False,
-    # recall extensions (default OFF)
-    "bm25": False,
-    "bm25_multi": False,
-    "ppr": False,
-    "mmr": False,
-    "complexity": False,
-    "constraints": False,
-    "tiering": False,
-    "entity_boost": False,
-    "inhibition": False,
-    "retrieval_practice": False,
-    "compress": False,         # output-only summary, never mutates the store
-    "source_consistency": False,  # source-rank marking/downweight on recall
-    # eviction extension modules (default OFF)
-    "heat": False,
-    "consequence": False,
-    "tiering_exec": False,
-    "apply_evictions": False,  # tick() may really soft-delete archived entries
-    "deletion_audit": False,   # derived-data coverage audit after forget()
-    "adaptive_evict": False,   # adaptive_score replaces the tick eviction score
-
-    # write-path extensions (default OFF)
-    "consistency": False,      # old/new fact conflict annotation on remember
-    "rate_limit": False,
-    "audit": False,
-    "permissions": False,
-    "notes": False,
-    "media": False,
-    "notes_link": False,
-    "ledger": False,
-    # index / graph
-    "graph": False,
-    "cue_writeback": True,      # store cue_index fields on each new entry (index-only, no recall change)
-    # consolidation modules (default OFF)
-    "consolidate_auto": False,  # after-turn auto consolidate every CONSOLIDATE_AUTO_TURNS remembers
-    "consolidate_gated": False,
-    "consolidate_tree": False,
-    "consolidate_reflection": False,
-    "consolidate_neighbors": False,
-    "consolidate_writeback": False,
-    "narrative": False,        # identity narrative update at consolidate end
-}
+# -*- coding: utf-8 -*-
+"""All memory-layer thresholds/defaults in one place."""
+from __future__ import annotations
+
+SCHEMA_VERSION = 1
+MAX_VERSIONS = 8
+TOMBSTONE_LIMIT = 100
+DEFAULT_BUDGET = 3
+MAX_BUDGET = 5
+
+# recall fusion / tiers (M2)
+CUE_WEIGHT = 0.50
+SEM_WEIGHT = 0.30
+IMPORTANCE_WEIGHT = 0.10
+TIME_BONUS = 0.10
+HIGH_TIER = 0.55
+MID_TIER = 0.35
+
+# source credibility gate (separate from importance)
+SOURCE_MIN_CONFIDENCE = 0.55
+SOURCE_CONFIDENCE_DEFAULT = 0.70
+
+# memory value formula (deterministic; trust is NOT part of value)
+VALUE_BASE = 0.20
+VALUE_W_INTENSITY = 0.30
+VALUE_W_VALENCE = 0.20
+VALUE_W_SELF = 0.15
+VALUE_W_MAINLINE = 0.15
+VALUE_W_ROUTINE = 0.20
+
+# eviction weights (read-only score)
+EVICT_W_SALIENCE = 0.30
+EVICT_W_POSITION = 0.20
+EVICT_W_REDUNDANCY = 0.20
+EVICT_W_CONFIDENCE = 0.15
+EVICT_W_STALENESS = 0.15
+
+# identity write-back gate
+SAME_DIRECTION_MIN = 3
+MAX_STEP = 0.02
+MAJOR_EVENT_STEP = 0.02
+
+# thread card
+THREAD_TTL = 21600.0
+THREAD_LIMIT = 3
+
+# memory-point gate (OR): value >= MIN_VALUE or importance >= MIN_IMPORTANCE or self >= MIN_SELF
+# (event centrality / emotional intensity; self-reference effect; engineering thresholds)
+MEMORY_POINT_MIN_VALUE = 0.60
+MEMORY_POINT_MIN_SELF = 0.45
+MEMORY_POINT_MIN_IMPORTANCE = 0.75
+
+# engine wiring knobs (all read by MemoryEngine only)
+RATE_LIMIT_PER_MIN = 30
+COMPRESS_MAX_CHARS = 200
+AUDIT_TAIL = 50
+COOC_MAX_ENTRIES = 400
+# after-turn auto consolidation: every N successful remember() calls
+CONSOLIDATE_AUTO_TURNS = 10
+
+# recall -> affect feedback (task-218): a recalled memory nudges the live
+# affect a little. Engine owns the state; recall/feedback.py owns the guards.
+FEEDBACK_MAX_STEP = 0.02    # per-turn cap on |delta valence| and |delta arousal|
+FEEDBACK_GAIN = 0.50        # share of (recalled - current) that flows back
+FEEDBACK_COOLDOWN = 1800.0  # same entry: no second feedback inside 30 minutes
+FEEDBACK_NEG_FLOOR = -0.40  # at/below this valence a further negative pull is dropped
+
+
+# Per-mechanism flags: safety/read-path filters default ON; every optional
+# mechanism defaults OFF and must keep the old code path when disabled.
+# A flags.json in the data directory overrides these booleans at engine start
+# (and MemoryEngine.set_flags(..., persist=True) rewrites it).
+FLAGS = {
+    # safety / read-path (default ON)
+    # GA-03: keep engine default ON. DSH private mode disables it per-store via
+    # <dsh store>/flags.json; the shared engine must not be relaxed globally.
+    "security": True,          # store/security.should_reject before write
+    "provenance": True,        # provenance hash tag + chained tombstones
+    "source_filter": True,     # low-confidence candidates are counted/dropped
+    "temporal_filter": True,   # honour valid_at/invalid_at on recall
+    "dedupe": True,            # remember-side L0-L3 dedupe
+    "relay": True,             # relay card
+    "thread": True,            # thread card / TTL expiry
+    "embedding": True,         # optional embedding provider
+    # attention / model features (default OFF)
+    "slots": False,
+    "boundary": False,         # slots/boundary.py event-boundary switching
+    "three_channel": False,
+    "eviction_readonly": False,
+    "identity": False,
+    "identity_writeback": False,
+    "due_hints": False,
+    # recall extensions (default OFF)
+    "bm25": False,
+    "bm25_multi": False,
+    "ppr": False,
+    "mmr": False,
+    "mood_recall": False,
+    "affect_encoding": False,
+    "memory_feedback": False,  # task-218: recalled affect nudges the live affect
+    "preference_drift": False,  # task-219: repeated topics drift value_order weights
+    "complexity": False,
+    "constraints": False,
+    "tiering": False,
+    "entity_boost": False,
+    "inhibition": False,
+    "retrieval_practice": False,
+    "compress": False,         # output-only summary, never mutates the store
+    "source_consistency": False,  # source-rank marking/downweight on recall
+    # eviction extension modules (default OFF)
+    "heat": False,
+    "consequence": False,
+    "tiering_exec": False,
+    "apply_evictions": False,  # tick() may really soft-delete archived entries
+    "deletion_audit": False,   # derived-data coverage audit after forget()
+    "adaptive_evict": False,   # adaptive_score replaces the tick eviction score
+
+    # write-path extensions (default OFF)
+    "consistency": False,      # old/new fact conflict annotation on remember
+    "rate_limit": False,
+    "audit": False,
+    "permissions": False,
+    "notes": False,
+    "media": False,
+    "notes_link": False,
+    "ledger": False,
+    # index / graph
+    "graph": False,
+    "cue_writeback": True,      # store cue_index fields on each new entry (index-only, no recall change)
+    # consolidation modules (default OFF)
+    "consolidate_auto": False,  # after-turn auto consolidate every CONSOLIDATE_AUTO_TURNS remembers
+    "consolidate_gated": False,
+    "consolidate_tree": False,
+    "consolidate_reflection": False,
+    "consolidate_neighbors": False,
+    "consolidate_writeback": False,
+    "narrative": False,        # identity narrative update at consolidate end
+}