@jjh32456/dsh-longlive 1.6.7 → 1.8.0

package/src/tools.js

@@ -36,7 +36,9 @@ import { memoryIndex } from './memory/index.js';
 import { memoryConsolidate } from './memory/consolidate.js';
 import { memoryReinforce } from './memory/reinforce.js';
 import { memoryForget } from './memory/forget.js';
+import { forgetV2 } from './memory/forget-v2.js';
 import { memoryRecall } from './memory/recall.js';
+import { recallV2 } from './memory/recall-v2.js';
 import { memoryProcedure, PROCEDURES_DIR, PROCEDURE_ACTIONS } from './memory/procedure.js';
 import {
   memoryError,
@@ -1643,9 +1645,9 @@ const WORKER_NO_SERVICE = 'unavailable: 本宿主未提供 subagents 服务';
  * byte-identical to 1.5.0 while taking the capability away by default.
  */
 export const WORKER_TOOL_NAMES = Object.freeze(['worker_spawn', 'worker_status', 'worker_kill']);
-export const WORKERS_DEFAULTS = Object.freeze({ enabled: false });
+export const WORKERS_DEFAULTS = Object.freeze({ enabled: true });
 export const WORKERS_DISABLED_MESSAGE =
-  'unavailable: worker_* 默认关闭（workers.enabled=false）；需要派子会话时请在配置里显式设置 workers.enabled: true';
+  'unavailable: worker_* 已关闭（workers.enabled=false）；需要派子会话时显式设置 workers.enabled: true';
 
 function workerUnavailable(message) {
   return { ok: false, status: 'unavailable', available: false, message };
@@ -2003,6 +2005,13 @@ function memoryTool(name, fn) {
   };
 }
 
+/** Product path must use forgetV2 so hostkey gate + tombstone enrichment cannot be bypassed. */
+function memoryForgetTool(args, config) {
+  // Preserve the legacy invalid-confirm error (throws before any execution).
+  if (args.confirm !== undefined && args.confirm !== 'FORGET') return memoryForget(args, config);
+  return forgetV2({ ...args, mode: args.confirm === 'FORGET' ? 'execute' : 'propose' }, config);
+}
+
 // --- D3: fetch the original text of one turn ------------------------------
 //
 // session_original is the deliberate escape hatch from the compressed view:
@@ -2638,7 +2647,7 @@ export const TOOLS = [
       confirm: { type: 'string', description: 'Default absent = dry-run. Pass "FORGET" to execute the proposals.' },
     },
     output: { schema: { type: 'object', additionalProperties: true }, render: (_a, value) => OUTPUT_TEXT(value) },
-    invoke: memoryTool('memory_forget', memoryForget),
+    invoke: memoryTool('memory_forget', memoryForgetTool),
   },
   {
     name: 'memory_procedure',
@@ -2697,6 +2706,26 @@ export const TOOLS = [
     output: { schema: { type: 'object', additionalProperties: true }, render: (_a, value) => OUTPUT_TEXT(value) },
     invoke: memoryTool('memory_recall', memoryRecall),
   },
+  {
+    name: 'memory_recall_v2',
+    description:
+      'Multi-route recall with an evidence gate and a deterministic fast-answer channel (read-only). Returns ' +
+      '{query,confidence,hits:[{card,anchor,quote,score}],didYouMean,slowPath,fastAnswer,evidenceGate}. ' +
+      'Fail-safe: no hit => confidence "none" with E_NO_EVIDENCE and NO guess; multiple/ambiguous/non-live ' +
+      'anchors => slowPath true and fallback "model"; only a unique high-confidence hit whose quote matches the ' +
+      'asked value type (version/path/time/number) produces fastAnswer (quote + coordinate, no generation). ' +
+      'Params: query (required), topK 1..10, project?, since?, until?, includeForgotten (default false).',
+    parameters: {
+      query: { type: 'string', description: 'Required. Natural-language question or keywords.' },
+      topK: { type: 'integer', description: 'How many hits to return (default 3, clamped 1..10).' },
+      project: { type: 'string', description: 'Optional project filter (card frontmatter project when present).' },
+      since: { type: 'string', description: 'Optional ISO date lower bound on card date.' },
+      until: { type: 'string', description: 'Optional ISO date upper bound on card date.' },
+      includeForgotten: { type: 'boolean', description: 'Default false; true also returns archived/forgotten cards (marked stale anchors).' },
+    },
+    output: { schema: { type: 'object', additionalProperties: true }, render: (_a, value) => OUTPUT_TEXT(value) },
+    invoke: memoryTool('memory_recall_v2', recallV2),
+  },
   {
     name: 'session_live_update',
     description:
@@ -2808,7 +2837,7 @@ export async function registerTools(ctx, config = {}) {
   // neither can be reconstructed from arguments.
   const bound = { ...config, host: () => ctx };
   // Fan-out tools are opt-in from 1.6.0 on; `undefined` means the safe default.
-  const workersEnabled = bound.workers?.enabled === true;
+  const workersEnabled = bound.workers?.enabled !== false;
   // R1 runtime adapter. Absent (or `routerRuntime: 'off'`, which creates no
   // adapter) means the execute closure below is byte-identical to before.
   const routerRuntime = bound.routerRuntime && typeof bound.routerRuntime.intercept === 'function' ? bound.routerRuntime : null;
@@ -2823,8 +2852,11 @@ export async function registerTools(ctx, config = {}) {
   // feature is enabled; appending it after the normal set keeps the baseline
   // order byte-identical when D6 is off.
   const d6Tools = Array.isArray(bound.d6Tools) ? bound.d6Tools : [];
-  const allTools = routerTools.length > 0 || d6Tools.length > 0
-    ? [...TOOLS, ...routerTools, ...d6Tools]
+  // 1.8.0 answer-guard: read-only answer_audit tool appended when enabled.
+  const answerTools = Array.isArray(bound.answerTools) ? bound.answerTools : [];
+  const extraTools = [...routerTools, ...d6Tools, ...answerTools];
+  const allTools = extraTools.length > 0
+    ? [...TOOLS, ...extraTools]
     : TOOLS;
   const ownNames = new Set(allTools.map((tool) => tool.name));
   for (const tool of allTools) {
@@ -2857,7 +2889,7 @@ export async function registerTools(ctx, config = {}) {
       },
     }));
   }
-  // `memory_save` belongs to the engram side, not to this plugin, so wrapping
+  // The external memory tool belongs to its plugin, not to this plugin, so wrapping
   // cannot see it. The host's pre-execute guard is the only non-invasive hook
   // that can: in shadow it returns undefined (allow) and only records; in `on`
   // it may return a denial reason for a high-risk write. `ownNames` keeps the

package/src/truncate-visible.js

@@ -25,6 +25,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import crypto from 'node:crypto';
+import { injectedMarkerPatterns } from './adapters/registry.js';
 
 import {
   compressFrame,
@@ -180,8 +181,7 @@ export const USER_TEXT_MARKERS = Object.freeze([
   /This is an automatically generated checkpoint/i,
   /Current runtime context/i,
   /<current_user_request\b/i,
-  /<engram_profile\b/i,
-  /<engram_memory_context\b/i,
+  ...injectedMarkerPatterns(),
   /<system-reminder\b/i,
   /\[Compressed conversation section\]/i,
   /background job[\s\S]{0,200}?\bfinished\b/i,