dsh-tdai-memory 0.2.9 → 0.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name":  "dsh-tdai-memory",
-    "version":  "0.2.9",
+    "version":  "0.2.11",
     "description":  "DeepSeek Harness 的 TencentDB Agent Memory 移植：L0 对话捕获 → L1 结构化记忆提取 → L2 场景/L3 画像，自动召回注入 + 记忆/对话搜索工具；复用现有 ~/.memory-tencentdb/memory-tdai 数据；附 Web UI 设置栏。",
     "type":  "module",
     "main":  "index.js",
@@ -11,8 +11,8 @@
                 },
     "dsh":  {
                 "bundle":  {
-                              "patch":  "./cordis.patch.yml"
-                          },
+                               "patch":  "./cordis.patch.yml"
+                           },
                 "client":  {
                                "platform":  "web"
                            }
@@ -68,5 +68,8 @@
                              "react":  "^18.2.0",
                              "@deepseek-ai/dsh-tools":  "^0.1.0-rc.6",
                              "@deepseek-ai/dsh-settings":  "^0.1.0-rc.6"
-                         }
-}
+                         },
+    "scripts":  {
+                    "test":  "node tests/settings-scope-compat.test.mjs"
+                }
+}

package/recall-inject.js

@@ -1,86 +1,86 @@
-/**
- * tdai-recall-inject — agent-plane recall injection row for dsh-tdai-memory.
- *
- * Mounted INSIDE an agent preset (agent.cordis.yml), this row listens on the
- * `system-prompt/assemble` waterfall in the preset's scope, so it runs for
- * every assembly of every agent joined to that preset (agent -> preset scope
- * chain). It asks the `tdaiMemory` service (provided by the root-level
- * dsh-tdai-memory plugin) for relevant long-term memories and appends them
- * as dynamic context sections (user-role snapshots):
- *
- *   - tdai:recall  — relevant L1 memories for the current user message
- *   - tdai:profile — stable persona / scene navigation context
- *
- * The recall call is bounded by `recall.timeoutMs`; failures degrade to no
- * injection and never break the assembly.
- */
-import z from "@deepseek-ai/schemastery";
-
-/** Cordis plugin name. */
-const name = "tdai-recall-inject";
-/** Services consumed: the prompt registry and the memory core service. */
-const inject = ["systemPrompt", "tdaiMemory"];
-
-/** Runtime schema for the recall-inject row. */
-const Config = z.object({
-  /** Skip recall when the user message is shorter than this. */
-  minUserTextChars: z.number().default(1),
-  /** Per-session cache TTL for identical user text (ms). */
-  cacheTtlMs: z.number().default(30_000),
-});
-
-function apply(ctx, config) {
-  const cache = new Map();
-
-  ctx.on("system-prompt/assemble", async (assembly, context) => {
-    try {
-      const agent = context?.agent;
-      if (!agent) return assembly;
-      const session = agent.session;
-      if (!session) return assembly;
-      // Only real human input triggers recall. DSH injects synthetic
-      // user-role context (system reminders, runtime context, skill
-      // catalogs, …) whose source.kind is not "user"; recalling on those
-      // would pollute the prompt with irrelevant memories (issue #1).
-      const lastUser = [...session.deriveMessages()]
-        .reverse()
-        .find((m) => m.role === "user" && (m.source == null || m.source.kind === "user"));
-      if (!lastUser) return assembly;
-      const text = extractText(lastUser.content);
-      if (!text || text.length < config.minUserTextChars) return assembly;
-
-      const now = Date.now();
-      const cached = cache.get(session.id);
-      if (cached && cached.text === text && now - cached.ts < config.cacheTtlMs) {
-        return injectRecall(assembly, cached.result);
-      }
-      const result = await ctx.tdaiMemory
-        .handleBeforeRecall(text, session.id)
-        .catch(() => null);
-      cache.set(session.id, { text, result: result ?? {}, ts: now });
-      return injectRecall(assembly, result ?? {});
-    } catch {
-      return assembly;
-    }
-  });
-}
-
-function extractText(content) {
-  if (typeof content === "string") return content.trim();
-  if (!Array.isArray(content)) return "";
-  return content
-    .filter((b) => b && b.type === "text" && typeof b.text === "string")
-    .map((b) => b.text)
-    .join("\n")
-    .trim();
-}
-
-function injectRecall(assembly, result) {
-  const extras = [];
-  if (result.prependContext) extras.push({ name: "tdai:recall", order: 1000, text: result.prependContext });
-  if (result.appendSystemContext) extras.push({ name: "tdai:profile", order: 1001, text: result.appendSystemContext });
-  if (extras.length === 0) return assembly;
-  return { ...assembly, contexts: [...assembly.contexts, ...extras] };
-}
-
-export { Config, apply, inject, name };
+/**
+ * tdai-recall-inject — agent-plane recall injection row for dsh-tdai-memory.
+ *
+ * Mounted INSIDE an agent preset (agent.cordis.yml), this row listens on the
+ * `system-prompt/assemble` waterfall in the preset's scope, so it runs for
+ * every assembly of every agent joined to that preset (agent -> preset scope
+ * chain). It asks the `tdaiMemory` service (provided by the root-level
+ * dsh-tdai-memory plugin) for relevant long-term memories and appends them
+ * as dynamic context sections (user-role snapshots):
+ *
+ *   - tdai:recall  — relevant L1 memories for the current user message
+ *   - tdai:profile — stable persona / scene navigation context
+ *
+ * The recall call is bounded by `recall.timeoutMs`; failures degrade to no
+ * injection and never break the assembly.
+ */
+import z from "@deepseek-ai/schemastery";
+
+/** Cordis plugin name. */
+const name = "tdai-recall-inject";
+/** Services consumed: the prompt registry and the memory core service. */
+const inject = ["systemPrompt", "tdaiMemory"];
+
+/** Runtime schema for the recall-inject row. */
+const Config = z.object({
+  /** Skip recall when the user message is shorter than this. */
+  minUserTextChars: z.number().default(1),
+  /** Per-session cache TTL for identical user text (ms). */
+  cacheTtlMs: z.number().default(30_000),
+});
+
+function apply(ctx, config) {
+  const cache = new Map();
+
+  ctx.on("system-prompt/assemble", async (assembly, context) => {
+    try {
+      const agent = context?.agent;
+      if (!agent) return assembly;
+      const session = agent.session;
+      if (!session) return assembly;
+      // Only real human input triggers recall. DSH injects synthetic
+      // user-role context (system reminders, runtime context, skill
+      // catalogs, …) whose source.kind is not "user"; recalling on those
+      // would pollute the prompt with irrelevant memories (issue #1).
+      const lastUser = [...session.deriveMessages()]
+        .reverse()
+        .find((m) => m.role === "user" && (m.source == null || m.source.kind === "user"));
+      if (!lastUser) return assembly;
+      const text = extractText(lastUser.content);
+      if (!text || text.length < config.minUserTextChars) return assembly;
+
+      const now = Date.now();
+      const cached = cache.get(session.id);
+      if (cached && cached.text === text && now - cached.ts < config.cacheTtlMs) {
+        return injectRecall(assembly, cached.result);
+      }
+      const result = await ctx.tdaiMemory
+        .handleBeforeRecall(text, session.id)
+        .catch(() => null);
+      cache.set(session.id, { text, result: result ?? {}, ts: now });
+      return injectRecall(assembly, result ?? {});
+    } catch {
+      return assembly;
+    }
+  });
+}
+
+function extractText(content) {
+  if (typeof content === "string") return content.trim();
+  if (!Array.isArray(content)) return "";
+  return content
+    .filter((b) => b && b.type === "text" && typeof b.text === "string")
+    .map((b) => b.text)
+    .join("\n")
+    .trim();
+}
+
+function injectRecall(assembly, result) {
+  const extras = [];
+  if (result.prependContext) extras.push({ name: "tdai:recall", order: 1000, text: result.prependContext });
+  if (result.appendSystemContext) extras.push({ name: "tdai:profile", order: 1001, text: result.appendSystemContext });
+  if (extras.length === 0) return assembly;
+  return { ...assembly, contexts: [...assembly.contexts, ...extras] };
+}
+
+export { Config, apply, inject, name };

package/vendor/dsh-settings-expose.js

@@ -1,75 +1,75 @@
-/**
- * dsh-host-apiproxy exposes only namespaces listed in its hard-coded
- * WEB_SETTINGS_NAMESPACES allowlist to the Web settings client. A namespace
- * registered by a third-party plugin answers `settings-not-exposed` even
- * though it is registered — upstream explicitly defers letting plugins
- * expose their own configuration.
- *
- * This module idempotently patches that allowlist in the dsh installation
- * actually loaded by the host process, so the plugin's settings section
- * becomes visible in the Web UI without manual edits. A dsh update
- * overwrites the file; the next plugin start re-patches it.
- */
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { createRequire } from "node:module";
-import { dirname, join, sep } from "node:path";
-
-/**
- * Ensure `nsName` is present in dsh-host-apiproxy's WEB_SETTINGS_NAMESPACES.
- * No-op when already exposed or when the file cannot be located/patched.
- * @param {import("cordis").Context} ctx
- * @param {string} nsName - settings namespace short name (e.g. "tdai-memory").
- * @param {{info?: Function, warn?: Function}} logger - dsh logger.
- */
-export function ensureSettingsNamespaceExposed(ctx, nsName, logger) {
-  void ctx;
-  try {
-    const target = findApiproxyIndex();
-    if (!target) {
-      logger?.warn?.(`[settings-expose] could not locate dsh-host-apiproxy; add "${nsName}" to WEB_SETTINGS_NAMESPACES in dsh-host-apiproxy/lib/index.js to get a Web settings section`);
-      return;
-    }
-    let src;
-    try {
-      src = readFileSync(target, "utf8");
-    } catch (error) {
-      logger?.warn?.(`[settings-expose] cannot read ${target}: ${String(error)}`);
-      return;
-    }
-    const body = src.match(/const WEB_SETTINGS_NAMESPACES = \[([\s\S]*?)\];/)?.[1] ?? "";
-    if (body.includes(`"${nsName}"`)) return; // already exposed (manual or previous patch)
-    const patched = src.replace(/(const WEB_SETTINGS_NAMESPACES = \[[\s\S]*?)(\n\s*\];)/, (_, pre, post) => {
-      const trailingComma = /,\s*$/.test(pre) ? "" : ",";
-      const sep2 = pre.trimEnd().endsWith("[") ? "" : trailingComma;
-      return `${pre}${sep2}\n\t"${nsName}"${post}`;
-    });
-    if (patched === src) {
-      logger?.warn?.(`[settings-expose] allowlist pattern not found in ${target}; add "${nsName}" to WEB_SETTINGS_NAMESPACES manually`);
-      return;
-    }
-    writeFileSync(target, patched, "utf8");
-    logger?.info?.(`[settings-expose] added "${nsName}" to WEB_SETTINGS_NAMESPACES (${target}) — restart dsh web for the settings section to appear`);
-  } catch (error) {
-    logger?.warn?.(`[settings-expose] failed: ${String(error)}`);
-  }
-}
-
-function findApiproxyIndex() {
-  // 1) The host process has already loaded dsh-host-apiproxy: read the real
-  //    module path from the CommonJS module cache (any install layout).
-  try {
-    const Module = createRequire(import.meta.url)("module");
-    const cache = Module._cache ?? {};
-    for (const key of Object.keys(cache)) {
-      if (key.includes(`${sep}dsh-host-apiproxy${sep}`) && key.endsWith(`${sep}index.js`)) return key;
-    }
-  } catch { /* fall through */ }
-  // 2) Fallback: sibling of @deepseek-ai/dsh-settings (dsh's nested layout).
-  try {
-    const require = createRequire(import.meta.url);
-    const settingsEntry = require.resolve("@deepseek-ai/dsh-settings");
-    const candidate = join(dirname(dirname(dirname(settingsEntry))), "dsh-host-apiproxy", "lib", "index.js");
-    if (existsSync(candidate)) return candidate;
-  } catch { /* fall through */ }
-  return "";
-}
+/**
+ * dsh-host-apiproxy exposes only namespaces listed in its hard-coded
+ * WEB_SETTINGS_NAMESPACES allowlist to the Web settings client. A namespace
+ * registered by a third-party plugin answers `settings-not-exposed` even
+ * though it is registered — upstream explicitly defers letting plugins
+ * expose their own configuration.
+ *
+ * This module idempotently patches that allowlist in the dsh installation
+ * actually loaded by the host process, so the plugin's settings section
+ * becomes visible in the Web UI without manual edits. A dsh update
+ * overwrites the file; the next plugin start re-patches it.
+ */
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { dirname, join, sep } from "node:path";
+
+/**
+ * Ensure `nsName` is present in dsh-host-apiproxy's WEB_SETTINGS_NAMESPACES.
+ * No-op when already exposed or when the file cannot be located/patched.
+ * @param {import("cordis").Context} ctx
+ * @param {string} nsName - settings namespace short name (e.g. "tdai-memory").
+ * @param {{info?: Function, warn?: Function}} logger - dsh logger.
+ */
+export function ensureSettingsNamespaceExposed(ctx, nsName, logger) {
+  void ctx;
+  try {
+    const target = findApiproxyIndex();
+    if (!target) {
+      logger?.warn?.(`[settings-expose] could not locate dsh-host-apiproxy; add "${nsName}" to WEB_SETTINGS_NAMESPACES in dsh-host-apiproxy/lib/index.js to get a Web settings section`);
+      return;
+    }
+    let src;
+    try {
+      src = readFileSync(target, "utf8");
+    } catch (error) {
+      logger?.warn?.(`[settings-expose] cannot read ${target}: ${String(error)}`);
+      return;
+    }
+    const body = src.match(/const WEB_SETTINGS_NAMESPACES = \[([\s\S]*?)\];/)?.[1] ?? "";
+    if (body.includes(`"${nsName}"`)) return; // already exposed (manual or previous patch)
+    const patched = src.replace(/(const WEB_SETTINGS_NAMESPACES = \[[\s\S]*?)(\n\s*\];)/, (_, pre, post) => {
+      const trailingComma = /,\s*$/.test(pre) ? "" : ",";
+      const sep2 = pre.trimEnd().endsWith("[") ? "" : trailingComma;
+      return `${pre}${sep2}\n\t"${nsName}"${post}`;
+    });
+    if (patched === src) {
+      logger?.warn?.(`[settings-expose] allowlist pattern not found in ${target}; add "${nsName}" to WEB_SETTINGS_NAMESPACES manually`);
+      return;
+    }
+    writeFileSync(target, patched, "utf8");
+    logger?.info?.(`[settings-expose] added "${nsName}" to WEB_SETTINGS_NAMESPACES (${target}) — restart dsh web for the settings section to appear`);
+  } catch (error) {
+    logger?.warn?.(`[settings-expose] failed: ${String(error)}`);
+  }
+}
+
+function findApiproxyIndex() {
+  // 1) The host process has already loaded dsh-host-apiproxy: read the real
+  //    module path from the CommonJS module cache (any install layout).
+  try {
+    const Module = createRequire(import.meta.url)("module");
+    const cache = Module._cache ?? {};
+    for (const key of Object.keys(cache)) {
+      if (key.includes(`${sep}dsh-host-apiproxy${sep}`) && key.endsWith(`${sep}index.js`)) return key;
+    }
+  } catch { /* fall through */ }
+  // 2) Fallback: sibling of @deepseek-ai/dsh-settings (dsh's nested layout).
+  try {
+    const require = createRequire(import.meta.url);
+    const settingsEntry = require.resolve("@deepseek-ai/dsh-settings");
+    const candidate = join(dirname(dirname(dirname(settingsEntry))), "dsh-host-apiproxy", "lib", "index.js");
+    if (existsSync(candidate)) return candidate;
+  } catch { /* fall through */ }
+  return "";
+}

package/vendor/tdai/adapters/index.js

@@ -1,15 +1,15 @@
-/**
- * TDAI Adapters — barrel re-export for all host adapter implementations.
- *
- * Each adapter translates a specific host environment's API into
- * the host-neutral HostAdapter interface consumed by TdaiCore.
- *
- * Directory structure:
- *   adapters/
- *   ├── openclaw/      — OpenClaw plugin host (in-process, runEmbeddedPiAgent)
- *   └── standalone/    — Gateway / Hermes sidecar (HTTP, OpenAI-compatible API)
- */
-// OpenClaw adapter
-export { OpenClawHostAdapter, OpenClawLLMRunner, OpenClawLLMRunnerFactory } from "./openclaw/index.js";
-// Standalone adapter
-export { StandaloneHostAdapter, StandaloneLLMRunner, StandaloneLLMRunnerFactory } from "./standalone/index.js";
+/**
+ * TDAI Adapters — barrel re-export for all host adapter implementations.
+ *
+ * Each adapter translates a specific host environment's API into
+ * the host-neutral HostAdapter interface consumed by TdaiCore.
+ *
+ * Directory structure:
+ *   adapters/
+ *   ├── openclaw/      — OpenClaw plugin host (in-process, runEmbeddedPiAgent)
+ *   └── standalone/    — Gateway / Hermes sidecar (HTTP, OpenAI-compatible API)
+ */
+// OpenClaw adapter
+export { OpenClawHostAdapter, OpenClawLLMRunner, OpenClawLLMRunnerFactory } from "./openclaw/index.js";
+// Standalone adapter
+export { StandaloneHostAdapter, StandaloneLLMRunner, StandaloneLLMRunnerFactory } from "./standalone/index.js";

package/vendor/tdai/adapters/openclaw/host-adapter.js

@@ -1,83 +1,83 @@
-/**
- * OpenClawHostAdapter — translates OpenClaw's plugin API into TDAI Core's
- * unified HostAdapter interface.
- *
- * This is the "thin shell" that keeps OpenClaw-specific dependencies
- * (OpenClawPluginApi, pluginConfig, resolveStateDir, event system)
- * confined to the adapter layer while TDAI Core remains host-neutral.
- *
- * Usage (in index.ts):
- *   const adapter = new OpenClawHostAdapter({ api, pluginDataDir, config });
- *   const core = new TdaiCore({ hostAdapter: adapter, config: parsedConfig });
- */
-import { OpenClawLLMRunnerFactory } from "./llm-runner.js";
-// ============================
-// OpenClawHostAdapter
-// ============================
-export class OpenClawHostAdapter {
-    hostType = "openclaw";
-    api;
-    pluginDataDir;
-    openclawConfig;
-    runnerFactory;
-    constructor(opts) {
-        this.api = opts.api;
-        this.pluginDataDir = opts.pluginDataDir;
-        this.openclawConfig = opts.openclawConfig;
-        this.runnerFactory = new OpenClawLLMRunnerFactory({
-            config: opts.openclawConfig,
-            agentRuntime: opts.api.runtime.agent,
-            logger: opts.api.logger,
-        });
-    }
-    /**
-     * Build a RuntimeContext from the current OpenClaw session.
-     *
-     * In OpenClaw, sessionKey and sessionId come from the event/ctx objects
-     * passed to hooks. This method returns a context with sensible defaults;
-     * callers can override sessionKey/sessionId per-hook invocation using
-     * `buildRuntimeContextForSession()`.
-     */
-    getRuntimeContext() {
-        return {
-            userId: "default_user",
-            sessionId: "",
-            sessionKey: "",
-            platform: "openclaw",
-            workspaceDir: process.cwd(),
-            dataDir: this.pluginDataDir,
-        };
-    }
-    /**
-     * Build a RuntimeContext for a specific session (used per-hook).
-     *
-     * This is an OpenClaw-specific convenience that merges session-level
-     * identifiers from hook ctx into the base context.
-     */
-    buildRuntimeContextForSession(sessionKey, sessionId) {
-        return {
-            ...this.getRuntimeContext(),
-            sessionKey,
-            sessionId: sessionId ?? "",
-        };
-    }
-    getLogger() {
-        return this.api.logger;
-    }
-    getLLMRunnerFactory() {
-        return this.runnerFactory;
-    }
-    // -- OpenClaw-specific accessors (for index.ts bridge) --------------------
-    /** Get the raw OpenClaw plugin API (for legacy callers during migration). */
-    getPluginApi() {
-        return this.api;
-    }
-    /** Get the OpenClaw config object (for legacy callers during migration). */
-    getOpenClawConfig() {
-        return this.openclawConfig;
-    }
-    /** Get the resolved plugin data directory. */
-    getPluginDataDir() {
-        return this.pluginDataDir;
-    }
-}
+/**
+ * OpenClawHostAdapter — translates OpenClaw's plugin API into TDAI Core's
+ * unified HostAdapter interface.
+ *
+ * This is the "thin shell" that keeps OpenClaw-specific dependencies
+ * (OpenClawPluginApi, pluginConfig, resolveStateDir, event system)
+ * confined to the adapter layer while TDAI Core remains host-neutral.
+ *
+ * Usage (in index.ts):
+ *   const adapter = new OpenClawHostAdapter({ api, pluginDataDir, config });
+ *   const core = new TdaiCore({ hostAdapter: adapter, config: parsedConfig });
+ */
+import { OpenClawLLMRunnerFactory } from "./llm-runner.js";
+// ============================
+// OpenClawHostAdapter
+// ============================
+export class OpenClawHostAdapter {
+    hostType = "openclaw";
+    api;
+    pluginDataDir;
+    openclawConfig;
+    runnerFactory;
+    constructor(opts) {
+        this.api = opts.api;
+        this.pluginDataDir = opts.pluginDataDir;
+        this.openclawConfig = opts.openclawConfig;
+        this.runnerFactory = new OpenClawLLMRunnerFactory({
+            config: opts.openclawConfig,
+            agentRuntime: opts.api.runtime.agent,
+            logger: opts.api.logger,
+        });
+    }
+    /**
+     * Build a RuntimeContext from the current OpenClaw session.
+     *
+     * In OpenClaw, sessionKey and sessionId come from the event/ctx objects
+     * passed to hooks. This method returns a context with sensible defaults;
+     * callers can override sessionKey/sessionId per-hook invocation using
+     * `buildRuntimeContextForSession()`.
+     */
+    getRuntimeContext() {
+        return {
+            userId: "default_user",
+            sessionId: "",
+            sessionKey: "",
+            platform: "openclaw",
+            workspaceDir: process.cwd(),
+            dataDir: this.pluginDataDir,
+        };
+    }
+    /**
+     * Build a RuntimeContext for a specific session (used per-hook).
+     *
+     * This is an OpenClaw-specific convenience that merges session-level
+     * identifiers from hook ctx into the base context.
+     */
+    buildRuntimeContextForSession(sessionKey, sessionId) {
+        return {
+            ...this.getRuntimeContext(),
+            sessionKey,
+            sessionId: sessionId ?? "",
+        };
+    }
+    getLogger() {
+        return this.api.logger;
+    }
+    getLLMRunnerFactory() {
+        return this.runnerFactory;
+    }
+    // -- OpenClaw-specific accessors (for index.ts bridge) --------------------
+    /** Get the raw OpenClaw plugin API (for legacy callers during migration). */
+    getPluginApi() {
+        return this.api;
+    }
+    /** Get the OpenClaw config object (for legacy callers during migration). */
+    getOpenClawConfig() {
+        return this.openclawConfig;
+    }
+    /** Get the resolved plugin data directory. */
+    getPluginDataDir() {
+        return this.pluginDataDir;
+    }
+}

package/vendor/tdai/adapters/openclaw/index.js

@@ -1,5 +1,5 @@
-/**
- * OpenClaw adapter — barrel exports.
- */
-export { OpenClawHostAdapter } from "./host-adapter.js";
-export { OpenClawLLMRunner, OpenClawLLMRunnerFactory } from "./llm-runner.js";
+/**
+ * OpenClaw adapter — barrel exports.
+ */
+export { OpenClawHostAdapter } from "./host-adapter.js";
+export { OpenClawLLMRunner, OpenClawLLMRunnerFactory } from "./llm-runner.js";