@agent_memory/dsh 0.5.1 → 0.5.3

package/client/client.js

@@ -711,7 +711,13 @@ function MemoryPage() {
     setUpdateBusy(true);
     setUpdateInfo({ checking: true });
     fetch("/api/agent-memory/update/check", { headers: { accept: "application/json" } }).then(async (response) => {
-      const data2 = await response.json();
+      const text = await response.text();
+      let data2;
+      try {
+        data2 = JSON.parse(text);
+      } catch {
+        throw new Error(`更新接口返回非 JSON（HTTP ${response.status}）：${text.slice(0, 80)}`);
+      }
       if (!response.ok) throw new Error(data2.error || `HTTP ${response.status}`);
       return data2;
     }).then((data2) => setUpdateInfo(data2)).catch((error) => setUpdateInfo({ error: String(error) })).finally(() => setUpdateBusy(false));
@@ -725,7 +731,13 @@ function MemoryPage() {
       headers: { accept: "application/json", "content-type": "application/json" },
       body: JSON.stringify({ version: updateInfo.latest })
     }).then(async (response) => {
-      const data2 = await response.json();
+      const text = await response.text();
+      let data2;
+      try {
+        data2 = JSON.parse(text);
+      } catch {
+        throw new Error(`更新接口返回非 JSON（HTTP ${response.status}）：${text.slice(0, 80)}`);
+      }
       if (!response.ok || data2.ok === false) throw new Error(data2.error || `HTTP ${response.status}`);
       return data2;
     }).then((data2) => setUpdateInfo((previous) => ({ ...previous || {}, applied: data2 }))).catch((error) => setUpdateInfo((previous) => ({ ...previous || {}, applyError: String(error) }))).finally(() => setUpdateBusy(false));

package/dist/plugin.mjs

@@ -5364,7 +5364,7 @@ function registerTools(ctx, service2, actor, quota = new SessionQuota(service2.c
     memory_recall: "\u68C0\u7D22\u957F\u671F\u8BB0\u5FC6\uFF1A\u6309\u67E5\u8BE2\u8FD4\u56DE\u76F8\u5173\u6458\u8981\u4E0E\u8BB0\u5FC6\u7F16\u53F7",
     memory_read: "\u8BFB\u53D6\u4E00\u6761\u8BB0\u5FC6\u7684\u5168\u6587\u3001\u51FA\u5904\u4E0E\u72B6\u6001",
     memory_record: "\u5199\u5165\u4E00\u6761\u65B0\u8BB0\u5FC6\uFF08\u5FC5\u987B\u7ED9\u51FA\u771F\u5B9E\u4E8B\u4EF6\u51FA\u5904\uFF09",
-    memory_propose: "\u63D0\u51FA\u8BB0\u5FC6\u4FEE\u8BA2\u6216\u5220\u9664\u63D0\u6848\uFF0C\u7B49\u5F85\u4EBA\u786E\u8BA4",
+    memory_propose: "\u63D0\u51FA\u8BB0\u5FC6\u4FEE\u8BA2\u6216\u5220\u9664\u63D0\u6848\uFF1B\u53EA\u521B\u5EFA\u5F85\u5BA1\u63D0\u6848\uFF0C\u4E0D\u81EA\u52A8\u5BA1\u6279",
     memory_review: "\u4E3A\u5F85\u5BA1\u63D0\u6848\u5F39\u51FA\u4E2D\u6587\u5BA1\u6279\u5361\u7247",
     memory_context: "\u67E5\u770B\u5F53\u524D\u4F1A\u8BDD\u6700\u8FD1\u4E8B\u4EF6\uFF0C\u53D6\u5F97\u53EF\u7528\u4E8E\u51FA\u5904\u7684 event_seq",
     rules_list: "\u5217\u51FA\u5F53\u524D\u751F\u6548\u7684\u89C4\u5219"
@@ -5414,10 +5414,7 @@ function registerTools(ctx, service2, actor, quota = new SessionQuota(service2.c
       if (service2.mode === "readonly") {
         throw new ToolInputError("\u5F53\u524D\u4E3A readonly \u6A21\u5F0F\uFF1A\u53EA\u80FD\u8BFB\u53D6\u8BB0\u5FC6\uFF0C\u4E0D\u80FD\u63D0\u51FA\u4FEE\u6539");
       }
-      const proposal = await service2.propose(args, actor, exec);
-      if (hooks.reviewProposal === void 0) return proposal;
-      const review = await hooks.reviewProposal(proposal, exec);
-      return { proposal, review };
+      return service2.propose(args, actor, exec);
     },
     memory_review: async (args, exec) => {
       if (hooks.reviewPending === void 0) {
@@ -5514,11 +5511,17 @@ async function reviewProposal(deps, proposal, exec) {
     ...exec.callId === void 0 ? {} : { wait: { callId: exec.callId } }
   });
   const decision = decisionFromAnswer(answer);
+  if (answer.answers[0]?.id !== proposal.id) {
+    return { decision: "defer", message: "\u6536\u5230\u7684\u5BA1\u6279\u7B54\u590D\u4E0D\u5C5E\u4E8E\u5F53\u524D\u63D0\u6848\uFF0C\u63D0\u6848\u4FDD\u7559\u5F85\u5BA1" };
+  }
   const line = commandForDecision(proposal.id, decision);
   if (line === void 0) {
     return { decision, message: "\u5DF2\u6682\u7F13\uFF0C\u63D0\u6848\u7EE7\u7EED\u5F85\u5BA1" };
   }
   const result = await executeCommandLine(deps, exec.agent, line, exec.signal);
+  if (result.ok && listProposals(deps.store).some((entry) => entry.id === proposal.id)) {
+    return { decision, command: line, result, message: "\u5BA1\u6279\u547D\u4EE4\u5DF2\u6267\u884C\uFF0C\u4F46\u63D0\u6848\u4ECD\u5728\u5F85\u5BA1\uFF1B\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5" };
+  }
   return { decision, command: line, result, message: result.text };
 }
 
@@ -6584,7 +6587,7 @@ function registerGuiRoutes(connection, deps, effect) {
 }
 
 // packages/dsh/src/update.ts
-var PLUGIN_VERSION = "0.5.1";
+var PLUGIN_VERSION = "0.5.3";
 var PACKAGE_NAME = "@agent_memory/dsh";
 var REGISTRY_LATEST = [
   "https://registry.npmjs.org/@agent_memory%2Fdsh/latest",
@@ -6612,8 +6615,16 @@ function createUpdateService(manager, fetcher = fetch) {
             headers: { accept: "application/json" },
             signal: AbortSignal.timeout(8e3)
           });
-          if (!response.ok) throw new Error(`registry returned HTTP ${response.status}`);
-          const body = await response.json();
+          const text = await response.text();
+          if (!response.ok) {
+            throw new Error(`registry returned HTTP ${response.status}: ${text.slice(0, 120)}`);
+          }
+          let body;
+          try {
+            body = JSON.parse(text);
+          } catch {
+            throw new Error(`registry returned non-JSON: ${text.slice(0, 120)}`);
+          }
           if (typeof body.version !== "string" || !/^\d+\.\d+\.\d+/.test(body.version)) {
             throw new Error("registry response has no valid version");
           }