Merge remote-tracking branch 'origin/master' into feat/master-retrieval-and-context

# Conflicts:
#	package.json

Author: LvPengfei1

.github/workflows/ci.yml

@@ -5,6 +5,22 @@ on:
   pull_request:
 
 jobs:
+  version-sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check version consistency
+        run: |
+          pkg_ver=$(node -p "JSON.parse(require('fs').readFileSync('package.json','utf8')).version")
+          plugin_ver=$(node -p "JSON.parse(require('fs').readFileSync('openclaw.plugin.json','utf8')).version")
+          if [ "$pkg_ver" != "$plugin_ver" ]; then
+            echo "::error::Version mismatch: package.json=$pkg_ver, openclaw.plugin.json=$plugin_ver"
+            exit 1
+          fi
+          echo "Versions match: $pkg_ver"
+
   cli-smoke:
     runs-on: ubuntu-latest
     steps:

package.json

@@ -35,12 +35,13 @@
     ]
   },
   "scripts": {
-    "test": "node test/embedder-error-hints.test.mjs && node test/migrate-legacy-schema.test.mjs && node --test test/config-session-strategy-migration.test.mjs && node --test test/recall-text-cleanup.test.mjs && node test/update-consistency-lancedb.test.mjs && node test/cli-smoke.mjs && node test/functional-e2e.mjs && node test/retriever-rerank-regression.mjs && node test/smart-memory-lifecycle.mjs && node test/smart-extractor-branches.mjs && node test/plugin-manifest-regression.mjs && node test/smart-metadata-v2.mjs && node test/vector-search-cosine.test.mjs && node test/context-support-e2e.mjs",
-    "test:openclaw-host": "node test/openclaw-host-functional.mjs"
+    "test": "node test/embedder-error-hints.test.mjs && node test/migrate-legacy-schema.test.mjs && node --test test/config-session-strategy-migration.test.mjs && node --test test/recall-text-cleanup.test.mjs && node test/update-consistency-lancedb.test.mjs && node test/cli-smoke.mjs && node test/functional-e2e.mjs && node test/retriever-rerank-regression.mjs && node test/smart-memory-lifecycle.mjs && node test/smart-extractor-branches.mjs && node test/plugin-manifest-regression.mjs && node --test test/sync-plugin-version.test.mjs && node test/smart-metadata-v2.mjs && node test/vector-search-cosine.test.mjs && node test/context-support-e2e.mjs",
+    "test:openclaw-host": "node test/openclaw-host-functional.mjs",
+    "version": "node scripts/sync-plugin-version.mjs openclaw.plugin.json package.json && git add openclaw.plugin.json"
   },
   "devDependencies": {
     "commander": "^14.0.0",
     "jiti": "^2.6.0",
     "typescript": "^5.9.3"
   }
-}
+}

scripts/sync-plugin-version.mjs

@@ -0,0 +1,100 @@
+import { readFileSync, writeFileSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+function parseJsonStringToken(text, startIndex) {
+  let index = startIndex + 1;
+
+  while (index < text.length) {
+    const ch = text[index];
+    if (ch === "\\") {
+      index += 2;
+      continue;
+    }
+    if (ch === "\"") {
+      return {
+        raw: text.slice(startIndex + 1, index),
+        end: index,
+      };
+    }
+    index += 1;
+  }
+
+  throw new Error("Unterminated JSON string");
+}
+
+function skipWhitespace(text, startIndex) {
+  let index = startIndex;
+  while (index < text.length && /\s/.test(text[index])) {
+    index += 1;
+  }
+  return index;
+}
+
+export function replaceTopLevelVersion(text, nextVersion) {
+  let depth = 0;
+
+  for (let index = 0; index < text.length; index += 1) {
+    const ch = text[index];
+
+    if (ch === "\"") {
+      const token = parseJsonStringToken(text, index);
+
+      if (depth === 1 && token.raw === "version") {
+        const colonIndex = skipWhitespace(text, token.end + 1);
+        if (text[colonIndex] !== ":") {
+          throw new Error("Malformed JSON: expected ':' after version key");
+        }
+
+        const valueIndex = skipWhitespace(text, colonIndex + 1);
+        if (text[valueIndex] !== "\"") {
+          throw new Error("Malformed JSON: expected string version value");
+        }
+
+        const currentValue = parseJsonStringToken(text, valueIndex);
+        const escapedVersion = JSON.stringify(nextVersion);
+        return `${text.slice(0, valueIndex)}${escapedVersion}${text.slice(currentValue.end + 1)}`;
+      }
+
+      index = token.end;
+      continue;
+    }
+
+    if (ch === "{") {
+      depth += 1;
+      continue;
+    }
+
+    if (ch === "}") {
+      depth -= 1;
+    }
+  }
+
+  throw new Error("Top-level version field not found in manifest");
+}
+
+export function syncManifestVersion({
+  manifestPath,
+  packagePath,
+}) {
+  const pkg = JSON.parse(readFileSync(packagePath, "utf8"));
+  const manifestText = readFileSync(manifestPath, "utf8");
+  const updatedManifestText = replaceTopLevelVersion(manifestText, pkg.version);
+
+  if (updatedManifestText !== manifestText) {
+    writeFileSync(manifestPath, updatedManifestText);
+    return true;
+  }
+
+  return false;
+}
+
+const isDirectRun = process.argv[1] === fileURLToPath(import.meta.url);
+
+if (isDirectRun) {
+  const scriptDir = path.dirname(fileURLToPath(import.meta.url));
+  const manifestPath = process.argv[2] ?? path.resolve(scriptDir, "../openclaw.plugin.json");
+  const packagePath = process.argv[3] ?? path.resolve(scriptDir, "../package.json");
+
+  syncManifestVersion({ manifestPath, packagePath });
+}

test/functional-e2e.mjs

@@ -62,6 +62,9 @@ async function runFunctionalE2E() {
   const workDir = mkdtempSync(path.join(tmpdir(), "memory-lancedb-pro-e2e-"));
 
   try {
+    const pkg = JSON.parse(
+      readFileSync(new URL("../package.json", import.meta.url), "utf8"),
+    );
     const { createMemoryCLI } = jiti("../cli.ts");
     const { MemoryStore } = jiti("../src/store.ts");
     const { createRetriever, DEFAULT_RETRIEVAL_CONFIG } = jiti("../src/retriever.ts");
@@ -145,7 +148,7 @@ async function runFunctionalE2E() {
     const versionOutput = await captureStdout(async () => {
       await program.parseAsync(["node", "openclaw", "memory-pro", "version"]);
     });
-    assert.match(versionOutput, /1\.1\.0-beta\.5/);
+    assert.match(versionOutput, new RegExp(pkg.version.replaceAll(".", "\\.")));
 
     const importOutput = await captureStdout(async () => {
       await program.parseAsync([

test/sync-plugin-version.test.mjs

@@ -0,0 +1,46 @@
+import assert from "node:assert/strict";
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
+import test from "node:test";
+
+import { syncManifestVersion } from "../scripts/sync-plugin-version.mjs";
+
+test("syncManifestVersion only updates the top-level manifest version", () => {
+  const tempDir = mkdtempSync(path.join(tmpdir(), "sync-plugin-version-"));
+
+  try {
+    const packagePath = path.join(tempDir, "package.json");
+    const manifestPath = path.join(tempDir, "openclaw.plugin.json");
+    const originalManifest = `{
+  "id": "memory-lancedb-pro",
+  "version": "1.1.0-beta.5",
+  "uiHints": {
+    "llm.apiKey": {
+      "label": "Legacy help text"
+    },
+    "llm.apiKey": {
+      "label": "Current help text"
+    }
+  }
+}
+`;
+
+    writeFileSync(
+      packagePath,
+      JSON.stringify({ name: "memory-lancedb-pro", version: "1.1.1-beta.0" }, null, 2),
+    );
+    writeFileSync(manifestPath, originalManifest);
+
+    syncManifestVersion({ manifestPath, packagePath });
+
+    const updatedManifest = readFileSync(manifestPath, "utf8");
+    assert.equal(
+      updatedManifest,
+      originalManifest.replace('"version": "1.1.0-beta.5"', '"version": "1.1.1-beta.0"'),
+    );
+    assert.equal(updatedManifest.match(/"llm\.apiKey"/g)?.length, 2);
+  } finally {
+    rmSync(tempDir, { recursive: true, force: true });
+  }
+});