Merge branch 'MemTensor:main' into main

Author: whipser030

apps/memos-local-openclaw/install.ps1

@@ -148,16 +148,21 @@ function Update-OpenClawConfig {
   param(
     [string]$OpenClawHome,
     [string]$ConfigPath,
-    [string]$PluginId
+    [string]$PluginId,
+    [string]$InstallPath,
+    [string]$Spec
   )
 
   Write-Info "Updating OpenClaw config..."
   New-Item -ItemType Directory -Path $OpenClawHome -Force | Out-Null
   $nodeScript = @'
 const fs = require("fs");
+const path = require("path");
 
 const configPath = process.argv[2];
 const pluginId = process.argv[3];
+const installPath = process.argv[4];
+const spec = process.argv[5];
 
 let config = {};
 if (fs.existsSync(configPath)) {
@@ -187,14 +192,48 @@ if (!config.plugins.allow.includes(pluginId)) {
 // Clean up stale contextEngine slot from previous versions
 if (config.plugins.slots && config.plugins.slots.contextEngine) {
   delete config.plugins.slots.contextEngine;
-  if (Object.keys(config.plugins.slots).length === 0) {
-    delete config.plugins.slots;
-  }
 }
 
+// Register plugin in memory slot
+if (!config.plugins.slots || typeof config.plugins.slots !== "object") {
+  config.plugins.slots = {};
+}
+config.plugins.slots.memory = pluginId;
+
+// Ensure plugin entry is enabled (preserve existing config if present)
+if (!config.plugins.entries || typeof config.plugins.entries !== "object") {
+  config.plugins.entries = {};
+}
+if (!config.plugins.entries[pluginId] || typeof config.plugins.entries[pluginId] !== "object") {
+  config.plugins.entries[pluginId] = {};
+}
+config.plugins.entries[pluginId].enabled = true;
+
+// Register plugin in installs so gateway auto-loads it on restart
+if (!config.plugins.installs || typeof config.plugins.installs !== "object") {
+  config.plugins.installs = {};
+}
+const pkgJsonPath = path.join(installPath, "package.json");
+let resolvedName, resolvedVersion;
+if (fs.existsSync(pkgJsonPath)) {
+  const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf8"));
+  resolvedName = pkg.name;
+  resolvedVersion = pkg.version;
+}
+config.plugins.installs[pluginId] = {
+  source: "npm",
+  spec,
+  installPath,
+  ...(resolvedVersion ? { version: resolvedVersion } : {}),
+  ...(resolvedName ? { resolvedName } : {}),
+  ...(resolvedVersion ? { resolvedVersion } : {}),
+  ...(resolvedName && resolvedVersion ? { resolvedSpec: `${resolvedName}@${resolvedVersion}` } : {}),
+  installedAt: new Date().toISOString(),
+};
+
 fs.writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`, "utf8");
 '@
-  $nodeScript | & node - $ConfigPath $PluginId
+  $nodeScript | & node - $ConfigPath $PluginId $InstallPath $Spec
   Write-Success "OpenClaw config updated: $ConfigPath"
 }
 
@@ -320,7 +359,20 @@ if (-not (Test-Path $ExtensionDir)) {
   exit 1
 }
 
-Update-OpenClawConfig -OpenClawHome $OpenClawHome -ConfigPath $OpenClawConfigPath -PluginId $PluginId
+Update-OpenClawConfig -OpenClawHome $OpenClawHome -ConfigPath $OpenClawConfigPath -PluginId $PluginId -InstallPath $ExtensionDir -Spec $PackageSpec
+
+Write-Info "Installing OpenClaw Gateway service..."
+& npx openclaw gateway install --port $Port --force 2>&1
+if (-not $?) { Write-Warn "Gateway service install returned a warning; continuing..." }
+
+Write-Success "Starting OpenClaw Gateway service..."
+& npx openclaw gateway start 2>&1
 
-Write-Success "Restarting OpenClaw Gateway..."
-& npx openclaw gateway run --port $Port --force
+Write-Host ""
+Write-Success "=========================================="
+Write-Success "  Installation complete!"
+Write-Success "=========================================="
+Write-Host ""
+Write-Info "  OpenClaw Web UI:      http://localhost:$Port"
+Write-Info "  Memory Viewer:        http://localhost:18799"
+Write-Host ""

apps/memos-local-openclaw/install.sh

@@ -215,11 +215,14 @@ OPENCLAW_CONFIG_PATH="${OPENCLAW_HOME}/openclaw.json"
 update_openclaw_config() {
   info "Update OpenClaw config, 更新 OpenClaw 配置..."
   mkdir -p "${OPENCLAW_HOME}"
-  node - "${OPENCLAW_CONFIG_PATH}" "${PLUGIN_ID}" <<'NODE'
+  node - "${OPENCLAW_CONFIG_PATH}" "${PLUGIN_ID}" "${EXTENSION_DIR}" "${PACKAGE_SPEC}" <<'NODE'
 const fs = require('fs');
+const path = require('path');
 
 const configPath = process.argv[2];
 const pluginId = process.argv[3];
+const installPath = process.argv[4];
+const spec = process.argv[5];
 
 let config = {};
 if (fs.existsSync(configPath)) {
@@ -249,11 +252,45 @@ if (!config.plugins.allow.includes(pluginId)) {
 // Clean up stale contextEngine slot from previous versions
 if (config.plugins.slots && config.plugins.slots.contextEngine) {
   delete config.plugins.slots.contextEngine;
-  if (Object.keys(config.plugins.slots).length === 0) {
-    delete config.plugins.slots;
-  }
 }
 
+// Register plugin in memory slot
+if (!config.plugins.slots || typeof config.plugins.slots !== 'object') {
+  config.plugins.slots = {};
+}
+config.plugins.slots.memory = pluginId;
+
+// Ensure plugin entry is enabled (preserve existing config if present)
+if (!config.plugins.entries || typeof config.plugins.entries !== 'object') {
+  config.plugins.entries = {};
+}
+if (!config.plugins.entries[pluginId] || typeof config.plugins.entries[pluginId] !== 'object') {
+  config.plugins.entries[pluginId] = {};
+}
+config.plugins.entries[pluginId].enabled = true;
+
+// Register plugin in installs so gateway auto-loads it on restart
+if (!config.plugins.installs || typeof config.plugins.installs !== 'object') {
+  config.plugins.installs = {};
+}
+const pkgJsonPath = path.join(installPath, 'package.json');
+let resolvedName, resolvedVersion;
+if (fs.existsSync(pkgJsonPath)) {
+  const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
+  resolvedName = pkg.name;
+  resolvedVersion = pkg.version;
+}
+config.plugins.installs[pluginId] = {
+  source: 'npm',
+  spec,
+  installPath,
+  ...(resolvedVersion ? { version: resolvedVersion } : {}),
+  ...(resolvedName ? { resolvedName } : {}),
+  ...(resolvedVersion ? { resolvedVersion } : {}),
+  ...(resolvedName && resolvedVersion ? { resolvedSpec: `${resolvedName}@${resolvedVersion}` } : {}),
+  installedAt: new Date().toISOString(),
+};
+
 fs.writeFileSync(configPath, `${JSON.stringify(config, null, 2)}\n`, 'utf8');
 NODE
   success "OpenClaw config updated, OpenClaw 配置已更新: ${OPENCLAW_CONFIG_PATH}"
@@ -323,5 +360,17 @@ fi
 
 update_openclaw_config
 
-success "Restart OpenClaw Gateway, 重启 OpenClaw Gateway..."
-exec npx openclaw gateway run --port "${PORT}" --force
+info "Install OpenClaw Gateway service, 安装 OpenClaw Gateway 服务..."
+npx openclaw gateway install --port "${PORT}" --force 2>&1 || true
+
+success "Start OpenClaw Gateway service, 启动 OpenClaw Gateway 服务..."
+npx openclaw gateway start 2>&1
+
+echo ""
+success "=========================================="
+success "  Installation complete! 安装完成!"
+success "=========================================="
+echo ""
+info "  OpenClaw Web UI:      http://localhost:${PORT}"
+info "  Memory Viewer:        http://localhost:18799"
+echo ""