dsh-plugin-xujie-memory 0.6.0 → 0.7.0

package/python/xujie_memory/server.py

@@ -53,6 +53,7 @@ from . import __version__
 from .encoder import RuleEncoder
 from .engine import Engine, SpecRegistry
 from .memory import Memory
+from .management import Management, ManagementError
 from .orchestrator import Orchestrator, TurnBudget
 from .profile import ProfileStore
 
@@ -95,6 +96,8 @@ class MemoryService:
         self.db_path = str(db_path)
         self.engine = Engine(Path(db_path), SpecRegistry.from_dir(Path(specs_dir)))
         self.profiles = ProfileStore(self.engine)
+        from .privacy import repair_legacy
+        repair_legacy(self.engine, self.profiles)
         self.orchestrator = Orchestrator(
             self.engine,
             profiles=self.profiles,
@@ -106,6 +109,9 @@ class MemoryService:
         # `INSERT OR IGNORE` 兜住了，这里只是避免无谓的重复计算。
         self._scopes: dict[str, str] = {}
         self._lock = threading.Lock()
+        # Serialize HTTP writes with reads of dependent projections. In
+        # particular, a /turn cannot republish a half-edited graph.
+        self.request_lock = threading.RLock()
 
     # ------------------------------------------------------------ scope
     def scope_of(self, session: str, user: str = "user") -> str:
@@ -342,7 +348,12 @@ class _Handler(BaseHTTPRequestHandler):
             self._json(400, {"ok": False, "error": f"bad_json: {exc}"})
             return
 
+        self.service.request_lock.acquire()
         try:
+            if route.startswith("/manage/"):
+                payload = self._manage(route, body)
+                self._json(200, payload)
+                return
             session = _str_field(body, "session")
             if not session:
                 self._json(400, {"ok": False, "error": "missing_session"})
@@ -390,6 +401,13 @@ class _Handler(BaseHTTPRequestHandler):
                 except ValueError as exc:
                     # 库里没有这条 / 不属于这个 scope：调用方参数问题，不是服务端崩了。
                     raise BadRequest(str(exc)) from exc
+            elif route == "/memory/edit":
+                payload = Management(self.service).edit(
+                    self.service.scope_of(session, user),
+                    _str_field(body, "trace_id"),
+                    _str_field(body, "content", limit=MAX_TEXT_CHARS),
+                    _str_field(body, "expected_hash"),
+                )
             elif route in ("/memory/mark", "/memory/unmark", "/memory/curve"):
                 trace_id = _str_field(body, "trace_id")
                 if not trace_id:
@@ -410,6 +428,12 @@ class _Handler(BaseHTTPRequestHandler):
             else:
                 self._json(404, {"ok": False, "error": "not_found"})
                 return
+        except ManagementError as exc:
+            status = 409 if exc.code == "version_conflict" else (
+                404 if exc.code.endswith("_not_found") else 400
+            )
+            self._json(status, {"ok": False, "error": exc.code})
+            return
         except BadRequest as exc:
             self._json(400, {"ok": False, "error": "bad_request", "detail": str(exc)})
             return
@@ -422,9 +446,37 @@ class _Handler(BaseHTTPRequestHandler):
             self._json(500, {"ok": False, "error": type(exc).__name__,
                              "detail": str(exc)[:300]})
             return
+        finally:
+            self.service.request_lock.release()
 
         self._json(200, payload)
 
+    def _manage(self, route: str, body: dict[str, Any]) -> dict[str, Any]:
+        manager = Management(self.service)
+        if route == "/manage/catalog":
+            return manager.catalog()
+        scope = _str_field(body, "scope_id")
+        if not scope:
+            raise BadRequest("missing_scope_id")
+        if route == "/manage/snapshot":
+            return manager.snapshot(scope, int(_num_field(body, "limit", 250, 1, 500)))
+        if route == "/manage/search":
+            return manager.search(
+                scope, _str_field(body, "query", limit=MAX_TEXT_CHARS),
+                int(_num_field(body, "limit", 30, 1, 50)),
+            )
+        trace = _str_field(body, "trace_id")
+        if route == "/manage/detail":
+            return manager.detail(scope, trace)
+        expected = _str_field(body, "expected_hash")
+        if route == "/manage/edit":
+            return manager.edit(
+                scope, trace, _str_field(body, "content", limit=MAX_TEXT_CHARS), expected
+            )
+        if route == "/manage/forget":
+            return manager.forget(scope, trace, expected)
+        raise ManagementError("route_not_found")
+
     # ---------------------------------------------------------- 工具
     def _read_json(self) -> dict[str, Any]:
         try:

package/scripts/build.mjs

@@ -0,0 +1,19 @@
+import { build } from 'esbuild'
+import { readFileSync, writeFileSync } from 'node:fs'
+import { resolve } from 'node:path'
+const root = resolve(import.meta.dirname, '..')
+const alias = {
+  '@deepseek-ai/dsh-typert-protocol/remote-info': resolve(root, 'vendor/dsh-protocol/remote-info.ts'),
+  '@deepseek-ai/dsh-typert-protocol': resolve(root, 'vendor/dsh-protocol/index.ts'),
+}
+const common = { bundle:true,format:'esm',target:'es2022',logLevel:'warning',alias }
+await build({...common,entryPoints:[resolve(root,'src/controller.ts')],platform:'node',external:['@deepseek-ai/cordis'],outfile:resolve(root,'lib/controller.js')})
+for (const name of ['typert.host','typert.remote-client']) {
+  await build({...common,entryPoints:[resolve(root,`src/generated/${name}.js`)],platform:'neutral',outfile:resolve(root,`lib/${name}.js`)})
+}
+writeFileSync(resolve(root,'lib/types.d.ts'),readFileSync(resolve(root,'src/types.ts')))
+writeFileSync(resolve(root,'lib/types.js'),'export {};\n')
+if (process.argv.includes('--host-only')) process.exit(0)
+const manifest = JSON.parse(readFileSync(resolve(root,'package.json'),'utf8'))
+await build({...common,entryPoints:[resolve(root,'src/client/index.tsx')],platform:'browser',format:'cjs',external:['react','react/jsx-runtime','react-dom','react-dom/client','@deepseek-ai/cordis'],jsx:'automatic',outfile:resolve(root,'lib/client.js'),loader:{'.css':'text'},banner:{js:`window.__ModuleLoader__.load({id:${JSON.stringify(manifest.name)},factory:(require)=>{var module={exports:{}};var exports=module.exports;`},footer:{js:'return module.exports;}});'}})
+console.log('Built host controller, strict contracts and DSH client factory.')

package/scripts/prepack.mjs

@@ -0,0 +1,9 @@
+import {readdirSync,rmSync,statSync,existsSync,readFileSync} from 'node:fs'
+import {resolve,join} from 'node:path'
+const root=resolve(import.meta.dirname,'..')
+function clean(dir){for(const entry of readdirSync(dir,{withFileTypes:true})){const p=join(dir,entry.name);if(entry.isDirectory()){if(entry.name==='__pycache__')rmSync(p,{recursive:true,force:true});else clean(p)}else if(entry.name.endsWith('.pyc'))rmSync(p)}}
+clean(join(root,'python'))
+for(const name of ['lib/index.js','lib/controller.js','lib/client.js','lib/typert.host.js','lib/typert.remote-client.js','python/xujie_memory/management.py','ACCEPTANCE.md'])if(!existsSync(join(root,name)))throw new Error('Missing release artifact: '+name)
+const m=JSON.parse(readFileSync(join(root,'package.json'),'utf8'))
+if(m.version!=='0.7.0'||m.engines.dsh!=='0.2.1-rc.5')throw new Error('Unreviewed package/host version')
+console.log('Release artifacts verified; Python bytecode caches excluded.')

package/scripts/test-all.mjs

@@ -0,0 +1,9 @@
+import {spawnSync} from 'node:child_process'
+import {resolve} from 'node:path'
+const root=resolve(import.meta.dirname,'..')
+const python=process.env.PYTHON ?? (process.platform==='win32'?resolve(root,'runtime/win32-x64/python.exe'):'python3')
+for (const [cmd,args] of [[python,['test/management_regression.py']],[process.execPath,['scripts/test-node.mjs']]]) {
+ const r=spawnSync(cmd,args,{cwd:root,stdio:'inherit',env:{...process.env,PYTHON:python}})
+ if(r.error)throw r.error
+ if(r.status!==0)process.exit(r.status??1)
+}

package/scripts/test-node.mjs

@@ -0,0 +1,10 @@
+import {build} from 'esbuild'
+import {spawnSync} from 'node:child_process'
+import {mkdtempSync,rmSync} from 'node:fs'
+import {tmpdir} from 'node:os'
+import {join,resolve} from 'node:path'
+const root=resolve(import.meta.dirname,'..'),dir=mkdtempSync(join(tmpdir(),'xujie-test-build-')),outfile=join(dir,'test.mjs')
+try{
+await build({entryPoints:[join(root,'test/node-regression.entry.mjs')],bundle:true,platform:'node',format:'esm',target:'node22',outfile,external:['node:*'],alias:{'@deepseek-ai/cordis':join(root,'test/cordis-fixture.mjs')},logLevel:'warning'})
+const r=spawnSync(process.execPath,[outfile],{cwd:root,stdio:'inherit',env:process.env});process.exitCode=r.status??1
+}finally{rmSync(dir,{recursive:true,force:true})}