dsh-memory-eternal 0.6.1 → 0.6.2-rc.1

package/index.js

@@ -277,7 +277,18 @@ export function apply(ctx, config) {
 
   const webServer = ctx.get('webServer')
   if (webServer !== undefined) {
-    const handleApi = createApi({ vaultDir, vaultRoots, getSettings: settings.get })
+    const handleApi = createApi({
+      vaultDir, vaultRoots, getSettings: settings.get,
+      getDshInfo: () => ({
+        name: 'dsh',
+        label: 'DSH (当前宿主)',
+        installed: true,
+        memoryRecallTool: !!ctx.get('tools'),
+        autoCapture: (settings.get() ?? {}).autoCapture !== false,
+        autoRecall: (settings.get() ?? {}).autoRecall !== false,
+        vaultDir: vaultDir(),
+      }),
+    })
     webServer.register({
       kind: 'prefix',
       path: API_PREFIX,
@@ -287,6 +298,54 @@ export function apply(ctx, config) {
           if (pathname === API_PREFIX + '/web-info') {
             return json(res, 200, { ok: true, ...webInfo })
           }
+          if (pathname === API_PREFIX + '/config') {
+            const method = req.method || 'GET'
+            if (method === 'GET') {
+              const cfg = settings.get() ?? {}
+              // 只暴露可安全展示/回填的字段
+              const safe = {
+                autoCapture: cfg.autoCapture, autoRecall: cfg.autoRecall, recallLimit: cfg.recallLimit, recallSummaryLen: cfg.recallSummaryLen, recallIncludeBody: cfg.recallIncludeBody,
+                captureMinChars: cfg.captureMinChars, captureCooldownMs: cfg.captureCooldownMs, dedupThreshold: cfg.dedupThreshold, maxCardsPerDay: cfg.maxCardsPerDay,
+                autoWeb: cfg.autoWeb, autoWebMode: cfg.autoWebMode, webPort: cfg.webPort, webCheckIntervalMs: cfg.webCheckIntervalMs, webMaxRestart: cfg.webMaxRestart, watchdogAutoSpawn: cfg.watchdogAutoSpawn, autoMcpSetup: cfg.autoMcpSetup,
+              }
+              const descriptor = (ctx.get('settings') ?? {}).describe?.({ redactSecrets: true }) ?? []
+              const me = descriptor.find((d) => d.ns === 'memory-eternal')
+              const dshInfo = {
+                name: 'dsh',
+                label: 'DSH (当前宿主)',
+                installed: true,
+                memoryRecallTool: !!ctx.get('tools'),
+                autoCapture: cfg.autoCapture !== false,
+                autoRecall: cfg.autoRecall !== false,
+                vaultDir: vaultDir(),
+              }
+              return json(res, 200, { ok: true, config: safe, revision: me?.revision ?? 0, schema: me?.schema ?? null, dsh: dshInfo })
+            }
+            if (method === 'POST') {
+              let raw = ''
+              for await (const chunk of req) raw += chunk
+              let body = {}
+              try { body = JSON.parse(raw || '{}') } catch { return json(res, 400, { ok: false, error: 'JSON 解析失败' }) }
+              const patch = body.patch ?? {}
+              const expectedRevision = Number.isInteger(body.expectedRevision) ? body.expectedRevision : undefined
+              // 仅允许写入 Config 中声明过的键（白名单，防注入）。schemastery 用 .dict 存 object schema 字段表。
+              const allowed = new Set(Object.keys(Config.dict || {}))
+              const clean = {}
+              for (const k of Object.keys(patch)) { if (allowed.has(k)) clean[k] = patch[k] }
+              if (Object.keys(clean).length === 0) return json(res, 400, { ok: false, error: '无可写入字段' })
+              if (typeof settings.update === 'function') {
+                try {
+                  await settings.update(clean)
+                  return json(res, 200, { ok: true, applied: Object.keys(clean), note: '已保存。autoWebMode/watchdogAutoSpawn 等需重启 DSH 生效' })
+                } catch (e) {
+                  if (e && e.code === 'SETTINGS_CONFLICT') return json(res, 409, { ok: false, error: '配置已被外部修改，请刷新后重试（revision conflict）' })
+                  return json(res, 500, { ok: false, error: String(e?.message || e) })
+                }
+              }
+              return json(res, 501, { ok: false, error: '当前环境不支持写配置' })
+            }
+            return json(res, 405, { ok: false, error: 'method not allowed' })
+          }
           await handleApi(req, res)
         } catch (error) {
           json(res, 500, { ok: false, error: String(error?.message || error) })

package/lib/api.js

@@ -20,6 +20,8 @@ export function createApi(deps = {}) {
   const vaultDir = deps.vaultDir ?? (() => '')
   const vaultRoots = deps.vaultRoots ?? (() => [{ name: '', root: vaultDir() }])
   const getSettings = deps.getSettings ?? (() => ({}))
+  // DSH 宿主信息（独立 web server 无 DSH 环境时为 null）。head DSH 状态行用。
+  const getDshInfo = deps.getDshInfo ?? (() => null)
 
   return async function handleApi(req, res) {
     const vaultRoot = vaultDir()
@@ -154,6 +156,11 @@ export function createApi(deps = {}) {
       case '/setup-status': {
         // 只读查询各 agent MCP 配置状态，不写任何文件
         const status = await getSetupStatus()
+        // prepend DSH 宿主行（独立 web server 无 DSH 环境时只有外部 agent）
+        const dsh = getDshInfo ? getDshInfo() : null
+        if (dsh) {
+          status.agents = [{ name: 'dsh', label: dsh.label || 'DSH (当前宿主)', installed: true, mcpConfigured: true, isDsh: true, recallTool: dsh.memoryRecallTool, autoCapture: dsh.autoCapture, autoRecall: dsh.autoRecall, vaultDir: dsh.vaultDir }, ...(status.agents || [])]
+        }
         json(res, 200, status)
         return
       }
@@ -170,10 +177,24 @@ export function createApi(deps = {}) {
       case '/budget': {
         try {
           const cfg = getSettings() ?? {}
-          json(res, 200, { ok: true, budgetChars: cfg.sessionBudgetChars ?? 80000, recallLimit: cfg.recallLimit ?? 5, embedding: cfg.recallEmbedding || '' })
+          const env = typeof process !== 'undefined' ? process.env : {}
+          json(res, 200, {
+            ok: true,
+            budgetChars: cfg.sessionBudgetChars ?? 80000,
+            recallLimit: cfg.recallLimit ?? 5,
+            embedding: cfg.recallEmbedding || '',
+            // 服务自管理配置（DSH host 从 settings 读；独立 web server 从 env 兜底）
+            autoWeb: cfg.autoWeb ?? env.MEMORY_AUTO_WEB !== '0',
+            autoWebMode: cfg.autoWebMode || 'init',
+            webPort: Number(cfg.webPort) || Number(env.MEMORY_WEB_PORT) || 7999,
+            webCheckIntervalMs: Number(cfg.webCheckIntervalMs) || 5000,
+            webMaxRestart: Number(cfg.webMaxRestart) || 10,
+            watchdogAutoSpawn: cfg.watchdogAutoSpawn ?? env.MEMORY_WATCHDOG === '1',
+            autoMcpSetup: cfg.autoMcpSetup ?? false,
+          })
         } catch (e) {
           // 配置读取异常时降级返回默认值，避免面板整块红屏
-          json(res, 200, { ok: true, budgetChars: 80000, recallLimit: 5, embedding: '' })
+          json(res, 200, { ok: true, budgetChars: 80000, recallLimit: 5, embedding: '', autoWeb: true, autoWebMode: 'init', webPort: 7999, webCheckIntervalMs: 5000, webMaxRestart: 10, watchdogAutoSpawn: true, autoMcpSetup: false })
         }
         return
       }