@openviking/openclaw-plugin 2026.6.2 → 2026.6.17-dev.2

package/dist/commands/setup.js

@@ -53,6 +53,29 @@ function readCompatRangeFromManifest() {
 }
 const PLUGIN_VERSION = readPluginVersion();
 const { min: COMPATIBLE_SERVER_MIN, max: COMPATIBLE_SERVER_MAX } = readCompatRangeFromManifest();
+const CONFIG_KEYS_TO_PRESERVE = [
+    "targetUri",
+    "timeoutMs",
+    "autoCapture",
+    "captureMode",
+    "captureMaxLength",
+    "autoRecall",
+    "recallResources",
+    "recallTargetTypes",
+    "recallLimit",
+    "recallScoreThreshold",
+    "recallMaxInjectedChars",
+    "recallMaxContentChars",
+    "recallPreferAbstract",
+    "recallTokenBudget",
+    "commitTokenThreshold",
+    "commitKeepRecentCount",
+    "bypassSessionPatterns",
+    "emitStandardDiagnostics",
+    "logFindRequests",
+];
+const DEFAULT_SETUP_PEER_ROLE = "assistant";
+const ALLOWED_RECALL_TARGET_TYPES = ["resource", "user", "agent"];
 function tr(langZh, en, zh) {
     return langZh ? zh : en;
 }
@@ -61,17 +84,103 @@ function maskKey(key) {
         return "****";
     return `${key.slice(0, 4)}...${key.slice(-4)}`;
 }
-function isValidAgentPrefixInput(value) {
+function isValidPeerPrefixInput(value) {
     const trimmed = value.trim();
     return !trimmed || /^[a-zA-Z0-9_-]+$/.test(trimmed);
 }
-async function askAgentPrefix(zh, q, defaultValue) {
+function normalizePeerRole(value) {
+    if (typeof value !== "string")
+        return undefined;
+    const role = value.trim().toLowerCase();
+    if (role === "none" || role === "assistant" || role === "person")
+        return role;
+    return undefined;
+}
+function resolveExistingPeerRole(existing) {
+    const explicit = normalizePeerRole(existing?.peer_role);
+    if (explicit)
+        return explicit;
+    return DEFAULT_SETUP_PEER_ROLE;
+}
+function resolveExistingPeerPrefix(existing) {
+    const value = existing?.peer_prefix;
+    if (typeof value !== "string" || !value.trim())
+        return "";
+    const trimmed = value.trim();
+    return trimmed === "default" ? "" : trimmed;
+}
+function resolveSetupPeerRole(value) {
+    if (value === undefined)
+        return DEFAULT_SETUP_PEER_ROLE;
+    const role = normalizePeerRole(value);
+    if (role)
+        return role;
+    throw new Error('peer_role must be "none", "assistant", or "person"');
+}
+function normalizeSetupRecallTargetTypes(value) {
+    if (value === undefined || value === null || value === "") {
+        return undefined;
+    }
+    const entries = Array.isArray(value)
+        ? value
+        : typeof value === "string"
+            ? value.split(/[,\n]/)
+            : [];
+    const seen = new Set();
+    const normalized = [];
+    const unknown = [];
+    for (const raw of entries) {
+        if (typeof raw !== "string") {
+            continue;
+        }
+        const entry = raw.trim();
+        if (!entry) {
+            continue;
+        }
+        if (ALLOWED_RECALL_TARGET_TYPES.includes(entry)) {
+            const typed = entry;
+            if (!seen.has(typed)) {
+                seen.add(typed);
+                normalized.push(typed);
+            }
+        }
+        else {
+            unknown.push(entry);
+        }
+    }
+    if (unknown.length > 0) {
+        throw new Error(`recall-target-types contains unknown resource types: ${unknown.join(", ")}`);
+    }
+    return normalized.length > 0 ? normalized : undefined;
+}
+function preserveCurrentConfig(existing) {
+    const config = {};
+    if (!existing) {
+        return config;
+    }
+    for (const key of CONFIG_KEYS_TO_PRESERVE) {
+        if (key in existing) {
+            config[key] = existing[key];
+        }
+    }
+    return config;
+}
+async function askPeerRole(zh, q, defaultValue) {
     while (true) {
-        const value = (await q(tr(zh, "Agent Prefix (optional)", "Agent Prefix（可选）"), defaultValue)).trim();
-        if (isValidAgentPrefixInput(value)) {
+        const value = await q(tr(zh, "Peer Role (none/assistant/person)", "Peer Role（none/assistant/person）"), defaultValue);
+        const role = normalizePeerRole(value);
+        if (role)
+            return role;
+        console.log(`  ✗ ${tr(zh, 'Peer Role must be "none", "assistant", or "person".', 'Peer Role 必须是 "none"、"assistant" 或 "person"。')}`);
+    }
+}
+async function askPeerPrefix(zh, q, defaultValue) {
+    while (true) {
+        const value = (await q(tr(zh, "Peer Prefix (optional)", "Peer Prefix（可选）"), defaultValue)).trim();
+        if (isValidPeerPrefixInput(value)) {
             return value;
         }
-        console.log(`  ✗ ${tr(zh, "Agent Prefix may only contain letters, digits, underscores, and hyphens, or be empty.", "Agent Prefix 只能包含字母、数字、下划线和连字符，或留空。")}`);
+        console.log(`  ✗ ${tr(zh, "Peer Prefix may only contain letters, digits, underscores, and hyphens, or be empty.", "Peer Prefix 只能包含字母、数字、下划线和连字符，或留空。")}`);
     }
 }
 function ask(rl, prompt, defaultValue = "") {
@@ -351,15 +460,17 @@ export function registerSetupCli(api) {
             .option("--zh", "Chinese prompts")
             .option("--base-url <url>", "OpenViking server URL (enables non-interactive mode)")
             .option("--api-key <key>", "API key for authentication")
-            .option("--agent-prefix <prefix>", "Agent routing prefix for namespace isolation")
+            .option("--peer-role <role>", "Peer ID role: none, assistant, or person")
+            .option("--peer-prefix <prefix>", "Prefix for assistant peer_id values")
             .option("--account-id <id>", "Account ID (required for root API keys)")
             .option("--user-id <id>", "User ID (required for root API keys)")
+            .option("--recall-target-types <types>", "Comma-separated recall target types: user, agent, resource")
             .option("--allow-offline", "Allow config write even if server is unreachable")
             .option("--force-slot", "Replace existing contextEngine slot even if owned by another plugin")
             .option("--json", "Output result as JSON (machine-readable)")
             .action(async (...args) => {
             const options = (args[0] ?? {});
-            const { reconfigure, zh: zhOpt, baseUrl, apiKey, agentPrefix, accountId, userId, allowOffline, forceSlot, json: jsonOpt, } = options;
+            const { reconfigure, zh: zhOpt, baseUrl, apiKey, peerRole, peerPrefix, accountId, userId, recallTargetTypes, allowOffline, forceSlot, json: jsonOpt, } = options;
             const zh = detectLangZh(options);
             const configPath = path.join(OPENCLAW_DIR, "openclaw.json");
             const jsonMode = !!jsonOpt;
@@ -368,9 +479,11 @@ export function registerSetupCli(api) {
                 const result = await setupNonInteractive(configPath, {
                     baseUrl: baseUrl,
                     apiKey,
-                    agentPrefix,
+                    peerRole,
+                    peerPrefix,
                     accountId,
                     userId,
+                    recallTargetTypes: normalizeSetupRecallTargetTypes(recallTargetTypes),
                     allowOffline: !!allowOffline,
                     forceSlot: !!forceSlot,
                 });
@@ -414,8 +527,10 @@ export function registerSetupCli(api) {
                     console.log(`  baseUrl: ${existing.baseUrl ?? DEFAULT_REMOTE_URL}`);
                     if (existing.apiKey)
                         console.log(`  apiKey:  ${maskKey(String(existing.apiKey))}`);
-                    if (existing.agent_prefix)
-                        console.log(`  agent_prefix: ${existing.agent_prefix}`);
+                    console.log(`  peer_role: ${resolveExistingPeerRole(existing)}`);
+                    const existingPeerPrefix = resolveExistingPeerPrefix(existing);
+                    if (existingPeerPrefix)
+                        console.log(`  peer_prefix: ${existingPeerPrefix}`);
                     console.log("");
                     console.log(tr(zh, "Press Enter to keep existing values, or use --reconfigure to change.", "按 Enter 保留现有配置，或使用 --reconfigure 重新配置。"));
                     console.log("");
@@ -501,7 +616,12 @@ async function runRemoteCheck(zh, existing) {
 }
 async function setupNonInteractive(configPath, params) {
     try {
-        const { baseUrl, apiKey, agentPrefix, accountId, userId, allowOffline, forceSlot } = params;
+        const { baseUrl, apiKey, peerPrefix, accountId, userId, recallTargetTypes, allowOffline, forceSlot } = params;
+        const resolvedPeerRole = resolveSetupPeerRole(params.peerRole);
+        const resolvedPeerPrefix = (peerPrefix ?? "").trim();
+        if (!isValidPeerPrefixInput(resolvedPeerPrefix)) {
+            throw new Error("peer_prefix may only contain letters, digits, underscores, and hyphens, or be empty");
+        }
         // Phase 1: validate connectivity and key type BEFORE writing config
         const health = await checkServiceHealth(baseUrl, apiKey);
         if (!health.ok && !allowOffline) {
@@ -539,12 +659,16 @@ async function setupNonInteractive(configPath, params) {
         const pluginCfg = { mode: "remote", baseUrl };
         if (apiKey)
             pluginCfg.apiKey = apiKey;
-        if (agentPrefix)
-            pluginCfg.agent_prefix = agentPrefix;
+        pluginCfg.peer_role = resolvedPeerRole;
+        if (resolvedPeerPrefix)
+            pluginCfg.peer_prefix = resolvedPeerPrefix;
         if (accountId)
             pluginCfg.accountId = accountId;
         if (userId)
             pluginCfg.userId = userId;
+        if (recallTargetTypes && recallTargetTypes.length > 0) {
+            pluginCfg.recallTargetTypes = recallTargetTypes;
+        }
         writeConfig(configPath, pluginCfg);
         const slot = activateContextEngineSlot(configPath, !!forceSlot);
         if (!slot.activated && slot.previousOwner) {
@@ -555,9 +679,11 @@ async function setupNonInteractive(configPath, params) {
                     mode: "remote",
                     baseUrl,
                     ...(apiKey ? { apiKey: maskKey(apiKey) } : {}),
-                    ...(agentPrefix ? { agent_prefix: agentPrefix } : {}),
+                    peer_role: resolvedPeerRole,
+                    ...(resolvedPeerPrefix ? { peer_prefix: resolvedPeerPrefix } : {}),
                     ...(accountId ? { accountId } : {}),
                     ...(userId ? { userId } : {}),
+                    ...(recallTargetTypes && recallTargetTypes.length > 0 ? { recallTargetTypes } : {}),
                 },
                 health,
                 keyProbe,
@@ -572,9 +698,11 @@ async function setupNonInteractive(configPath, params) {
                 mode: "remote",
                 baseUrl,
                 ...(apiKey ? { apiKey: maskKey(apiKey) } : {}),
-                ...(agentPrefix ? { agent_prefix: agentPrefix } : {}),
+                peer_role: resolvedPeerRole,
+                ...(resolvedPeerPrefix ? { peer_prefix: resolvedPeerPrefix } : {}),
                 ...(accountId ? { accountId } : {}),
                 ...(userId ? { userId } : {}),
+                ...(recallTargetTypes && recallTargetTypes.length > 0 ? { recallTargetTypes } : {}),
             },
             health,
             keyProbe,
@@ -600,12 +728,15 @@ function printSetupResult(zh, result) {
             console.log(`  baseUrl: ${result.config.baseUrl}`);
             if (result.config.apiKey)
                 console.log(`  apiKey:  ${result.config.apiKey}`);
-            if (result.config.agent_prefix)
-                console.log(`  agent_prefix: ${result.config.agent_prefix}`);
+            console.log(`  peer_role: ${result.config.peer_role ?? DEFAULT_SETUP_PEER_ROLE}`);
+            if (result.config.peer_prefix)
+                console.log(`  peer_prefix: ${result.config.peer_prefix}`);
             if (result.config.accountId)
                 console.log(`  accountId: ${result.config.accountId}`);
             if (result.config.userId)
                 console.log(`  userId:  ${result.config.userId}`);
+            if (result.config.recallTargetTypes)
+                console.log(`  recallTargetTypes: ${result.config.recallTargetTypes.join(",")}`);
         }
         console.log("");
         if (result.health?.ok) {
@@ -642,14 +773,15 @@ async function getStatus(configPath) {
     const apiKey = existing.apiKey ? String(existing.apiKey) : undefined;
     const health = await checkServiceHealth(baseUrl, apiKey);
     const keyProbe = health.ok ? await probeApiKeyType(baseUrl, apiKey) : undefined;
-    const agentPrefix = existing.agent_prefix ?? existing.agentId;
+    const peerPrefix = resolveExistingPeerPrefix(existing);
     return {
         configured: true,
         config: {
             mode: String(existing.mode ?? "remote"),
             baseUrl,
             hasApiKey: !!existing.apiKey,
-            ...(agentPrefix ? { agent_prefix: String(agentPrefix) } : {}),
+            peer_role: resolveExistingPeerRole(existing),
+            ...(peerPrefix ? { peer_prefix: peerPrefix } : {}),
             hasAccountId: !!existing.accountId,
             hasUserId: !!existing.userId,
         },
@@ -695,8 +827,9 @@ function printStatus(zh, result) {
         console.log(`  mode:      ${result.config.mode}`);
         console.log(`  baseUrl:   ${result.config.baseUrl}`);
         console.log(`  apiKey:    ${result.config.hasApiKey ? "set" : "not set"}`);
-        if (result.config.agent_prefix)
-            console.log(`  agent_prefix: ${result.config.agent_prefix}`);
+        console.log(`  peer_role: ${result.config.peer_role}`);
+        if (result.config.peer_prefix)
+            console.log(`  peer_prefix: ${result.config.peer_prefix}`);
         console.log(`  accountId: ${result.config.hasAccountId ? "set" : "not set"}`);
         console.log(`  userId:    ${result.config.hasUserId ? "set" : "not set"}`);
     }
@@ -723,7 +856,8 @@ async function setupRemote(zh, configPath, existing, q) {
         ? String(existing.baseUrl)
         : DEFAULT_REMOTE_URL;
     const defaultApiKey = existing?.apiKey ? String(existing.apiKey) : "";
-    const defaultAgentPrefix = existing?.agent_prefix ? String(existing.agent_prefix) : "";
+    const defaultPeerRole = resolveExistingPeerRole(existing);
+    const defaultPeerPrefix = resolveExistingPeerPrefix(existing);
     const baseUrl = await q(tr(zh, "OpenViking server URL", "OpenViking 服务器地址"), defaultUrl);
     const apiKey = await q(tr(zh, "API Key (optional)", "API Key（可选）"), defaultApiKey);
     let accountId = existing?.accountId ? String(existing.accountId) : "";
@@ -740,7 +874,10 @@ async function setupRemote(zh, configPath, existing, q) {
             console.log(tr(zh, "  ✓ User key verified", "  ✓ User key 已验证"));
         }
     }
-    const agentPrefix = await askAgentPrefix(zh, q, defaultAgentPrefix);
+    const peerRole = await askPeerRole(zh, q, defaultPeerRole);
+    const peerPrefix = peerRole === "assistant"
+        ? await askPeerPrefix(zh, q, defaultPeerPrefix)
+        : "";
     console.log("");
     console.log(tr(zh, `Testing connectivity to ${baseUrl}...`, `正在测试连接 ${baseUrl}...`));
     const health = await checkServiceHealth(baseUrl, apiKey || undefined);
@@ -756,7 +893,7 @@ async function setupRemote(zh, configPath, existing, q) {
     }
     console.log("");
     const pluginCfg = {
-        ...(existing ?? {}),
+        ...preserveCurrentConfig(existing),
         mode: "remote",
         baseUrl,
     };
@@ -764,10 +901,11 @@ async function setupRemote(zh, configPath, existing, q) {
         pluginCfg.apiKey = apiKey;
     else
         delete pluginCfg.apiKey;
-    if (agentPrefix)
-        pluginCfg.agent_prefix = agentPrefix;
+    pluginCfg.peer_role = peerRole;
+    if (peerPrefix)
+        pluginCfg.peer_prefix = peerPrefix;
     else
-        delete pluginCfg.agent_prefix;
+        delete pluginCfg.peer_prefix;
     if (accountId)
         pluginCfg.accountId = accountId;
     else
@@ -776,8 +914,6 @@ async function setupRemote(zh, configPath, existing, q) {
         pluginCfg.userId = userId;
     else
         delete pluginCfg.userId;
-    delete pluginCfg.configPath;
-    delete pluginCfg.port;
     writeConfig(configPath, pluginCfg);
     const slotResult = activateContextEngineSlot(configPath);
     console.log("");
@@ -785,8 +921,9 @@ async function setupRemote(zh, configPath, existing, q) {
     console.log(`  baseUrl: ${baseUrl}`);
     if (apiKey)
         console.log(`  apiKey:  ${maskKey(apiKey)}`);
-    if (agentPrefix)
-        console.log(`  agent_prefix: ${agentPrefix}`);
+    console.log(`  peer_role: ${peerRole}`);
+    if (peerPrefix)
+        console.log(`  peer_prefix: ${peerPrefix}`);
     if (accountId)
         console.log(`  accountId: ${accountId}`);
     if (userId)
@@ -798,7 +935,8 @@ async function setupRemote(zh, configPath, existing, q) {
 }
 export const __test__ = {
     isLegacyLocalMode,
-    isValidAgentPrefixInput,
+    isValidPeerPrefixInput,
+    normalizeSetupRecallTargetTypes,
     activateContextEngineSlot,
     isContextEngineSlotActive,
     getStatus,