@openviking/opencode-plugin 0.2.0 → 0.2.2

package/README.md

@@ -135,9 +135,23 @@ Create `~/.config/opencode/openviking-config.json`:
 API keys are resolved from environment variables or `~/.openviking/ovcli.conf` and sent as `Authorization: Bearer ...` by both hooks and the MCP proxy. `account` and `user` are trusted-mode identity
 headers sent as `X-OpenViking-Account` and `X-OpenViking-User`; leave them empty
 when using API-key mode with user/admin API keys.
-`peerId` is sent as `X-OpenViking-Actor-Peer` on data-plane memory/resource
-requests; captured session messages store it as body `peer_id`. Configure
-`peerId` explicitly when peer-scoped memory routing is needed.
+By default the plugin derives a peer from the project directory using Claude's
+project-directory naming rule: every non-letter-or-digit character becomes `-`,
+with no path normalization. For example, `/Users/x/Dev/OpenViking` becomes
+`-Users-x-Dev-OpenViking`. Data-plane memory/resource requests send the
+effective peer as `X-OpenViking-Actor-Peer`; captured session messages store it
+as body `peer_id`. Configure `peerId` or `OPENVIKING_PEER_ID` to override the
+workspace-derived peer, or set `workspacePeer=false` /
+`OPENVIKING_WORKSPACE_PEER=0` to turn workspace-derived peers off.
+
+Recall defaults to the broad mode: global memory, the current workspace, and
+other workspace memories can all be recalled, with other workspaces penalized
+and rendered later. Set `recallPeerScope="actor"` or
+`OPENVIKING_RECALL_PEER_SCOPE=actor` for the isolation mode, which only sees
+global memory plus the current workspace. In deployments where one bot serves
+multiple real people, such as zouk, vikingbot, or AstrBot, use the isolation mode
+with an explicit actor peer so one person's memories are not recalled into
+another person's session.
 
 `OPENVIKING_API_KEY`, `OPENVIKING_ACCOUNT`, `OPENVIKING_USER`,
 and `OPENVIKING_PEER_ID` take precedence over values in this file.

package/lib/config.mjs

@@ -2,6 +2,7 @@ import fs from "fs"
 import path from "path"
 import { homedir } from "os"
 import { resolveOpenVikingCredentials } from "./shared/credentials.mjs"
+import { resolveEffectivePeerId } from "./shared/workspace-peer.mjs"
 
 const DEFAULT_CONFIG = {
   endpoint: "http://127.0.0.1:1933",
@@ -9,6 +10,8 @@ const DEFAULT_CONFIG = {
   account: "",
   user: "",
   peerId: "",
+  workspacePeer: true,
+  recallPeerScope: "all",
   enabled: true,
   timeoutMs: 30000,
   runtime: {
@@ -147,6 +150,8 @@ function applyBehaviorConfig(config, fileConfig = {}) {
     "bypassSessionPatterns",
     "debug",
     "debugLogPath",
+    "workspacePeer",
+    "recallPeerScope",
   ]) {
     if (fileConfig[key] !== undefined) config[key] = fileConfig[key]
   }
@@ -166,6 +171,10 @@ function applyEnv(config) {
   if (process.env.OPENVIKING_RECALL_PREFER_ABSTRACT !== undefined) {
     config.autoRecall.preferAbstract = envBool("OPENVIKING_RECALL_PREFER_ABSTRACT") ?? config.autoRecall.preferAbstract
   }
+  if (process.env.OPENVIKING_RECALL_PEER_SCOPE) config.recallPeerScope = process.env.OPENVIKING_RECALL_PEER_SCOPE
+  if (process.env.OPENVIKING_WORKSPACE_PEER !== undefined) {
+    config.workspacePeer = envBool("OPENVIKING_WORKSPACE_PEER") ?? config.workspacePeer
+  }
   if (process.env.OPENVIKING_MIN_QUERY_LENGTH) config.autoRecall.minQueryLength = process.env.OPENVIKING_MIN_QUERY_LENGTH
   if (process.env.OPENVIKING_AUTO_CAPTURE !== undefined) {
     config.autoCapture = envBool("OPENVIKING_AUTO_CAPTURE") ?? config.autoCapture
@@ -220,6 +229,7 @@ function normalizeConfig(config) {
   config.autoRecall.tokenBudget = Math.max(200, Math.min(50000, Math.round(Number(config.autoRecall.tokenBudget) || 2000)))
   config.autoRecall.minQueryLength = Math.max(1, Math.min(64, Math.round(Number(config.autoRecall.minQueryLength) || 3)))
   config.captureMode = config.captureMode === "keyword" ? "keyword" : "semantic"
+  config.recallPeerScope = config.recallPeerScope === "actor" ? "actor" : "all"
   config.captureMaxLength = Math.max(200, Math.min(100000, Math.round(Number(config.captureMaxLength) || 24000)))
   config.captureToolMaxChars = Math.max(200, Math.min(20000, Math.round(Number(config.captureToolMaxChars) || 2000)))
   config.commitTokenThreshold = Math.max(1000, Math.round(Number(config.commitTokenThreshold) || 20000))
@@ -262,7 +272,9 @@ export function loadConfig(pluginRoot, projectDirectory) {
   applyEnv(config)
   config.configPath = configPath
   config.legacyCredentialsUsed = legacyUsed && creds.credentialSource !== "env"
-  return normalizeConfig(config)
+  const normalized = normalizeConfig(config)
+  normalized.effectivePeer = resolveEffectivePeerId({ cfg: normalized, cwd: projectDirectory })
+  return normalized
 }
 
 export function resolveDataDir(pluginRoot, config) {

package/lib/shared/mcp-proxy-core.mjs

@@ -201,11 +201,14 @@ export function createOpenVikingMcpProxy({
     return true;
   }
 
-  function headersForRequest(includeSession = true, message = null) {
+  function headersForRequest(includeSession = true) {
     const headers = {
       "Content-Type": "application/json",
       "Accept": "application/json, text/event-stream",
-      "MCP-Protocol-Version": message?.params?.protocolVersion || protocolVersion,
+      // Always the proxy's current version (default, then server-negotiated) —
+      // never the client's un-negotiated ask, which strict upstreams reject
+      // with HTTP 400 before initialize negotiation can run.
+      "MCP-Protocol-Version": protocolVersion,
     };
     if (includeSession && sessionId) headers["Mcp-Session-Id"] = sessionId;
     if (proxyConfig.apiKey) headers.Authorization = `Bearer ${proxyConfig.apiKey}`;
@@ -265,7 +268,7 @@ export function createOpenVikingMcpProxy({
     try {
       const res = await fetchImpl(proxyConfig.mcpUrl, {
         method: "POST",
-        headers: headersForRequest(includeSession, message),
+        headers: headersForRequest(includeSession),
         body: JSON.stringify(message),
         signal: controller.signal,
       });
@@ -273,6 +276,10 @@ export function createOpenVikingMcpProxy({
       const messages = parseHttpBody(res.headers.get("content-type"), text);
       const nextSessionId = res.headers.get("mcp-session-id");
       if (nextSessionId) sessionId = nextSessionId;
+      if (message?.method === "initialize" && res.ok) {
+        const negotiated = messages.find((m) => typeof m?.result?.protocolVersion === "string")?.result.protocolVersion;
+        if (negotiated) protocolVersion = negotiated;
+      }
       if (!res.ok) {
         throw new HttpStatusError(res.status, res.statusText, text, messages);
       }
@@ -366,7 +373,7 @@ export function createOpenVikingMcpProxy({
     const expectsResponse = isRequest(message);
     if (message.method === "initialize") {
       initializeRequest = cloneMessage(message);
-      protocolVersion = message.params?.protocolVersion || protocolVersion || DEFAULT_PROTOCOL_VERSION;
+      protocolVersion = DEFAULT_PROTOCOL_VERSION;
       sessionId = "";
     }
     if (message.method === "notifications/initialized") {

package/lib/shared/recall-core.mjs

@@ -20,7 +20,7 @@ export function estimateTokens(text) {
 
 export function buildRecallEndpointBody(cfg = {}) {
   const limit = Math.max(Number(cfg.recallLimit || 0), 1);
-  return {
+  const body = {
     query: "",
     quotas: {
       events: limit,
@@ -32,6 +32,8 @@ export function buildRecallEndpointBody(cfg = {}) {
     min_score: Number.isFinite(Number(cfg.scoreThreshold)) ? Number(cfg.scoreThreshold) : 0.35,
     render: true,
   };
+  if (cfg.recallPeerScope === "actor") body.peer_scope = "actor";
+  return body;
 }
 
 function clampScore(v) {
@@ -233,10 +235,7 @@ async function buildFallbackInjectionBlock(fetchJSON, items, cfg, actorPeerId =
 async function recallViaEndpoint(fetchJSON, cfg, query, actorPeerId = "", log = () => {}) {
   const body = buildRecallEndpointBody(cfg);
   body.query = query;
-  const res = await fetchJSON("/api/v1/search/recall", {
-    method: "POST",
-    body: JSON.stringify(body),
-  }, { actorPeerId });
+  const res = await postRecall(fetchJSON, body, { actorPeerId, log });
   if (!res.ok) {
     log("recall_endpoint_fallback", { status: res.status || 0 });
     return null;
@@ -251,6 +250,27 @@ async function recallViaEndpoint(fetchJSON, cfg, query, actorPeerId = "", log =
   ].join("\n");
 }
 
+export async function postRecall(fetchJSON, body, opts = {}) {
+  const actorPeerId = opts.actorPeerId || "";
+  const log = opts.log || (() => {});
+  const request = { ...body };
+  const res = await fetchJSON("/api/v1/search/recall", {
+    method: "POST",
+    body: JSON.stringify(request),
+  }, { actorPeerId });
+  if (!request.peer_scope || (res.status !== 400 && res.status !== 422)) {
+    return res;
+  }
+
+  const downgraded = { ...request };
+  delete downgraded.peer_scope;
+  log("recall_peer_scope_downgrade", { status: res.status || 0 });
+  return fetchJSON("/api/v1/search/recall", {
+    method: "POST",
+    body: JSON.stringify(downgraded),
+  }, { actorPeerId });
+}
+
 export async function buildRecallBlock(fetchJSON, cfg, query, options = {}) {
   const actorPeerId = options.actorPeerId ?? cfg.peerId ?? "";
   const log = options.log || (() => {});

package/lib/shared/workspace-peer.mjs

@@ -0,0 +1,16 @@
+// GENERATED FROM examples/memory-plugin-shared/lib. DO NOT EDIT.
+export function deriveWorkspacePeerId(cwd) {
+  return String(cwd || "").replace(/[^A-Za-z0-9]/g, "-");
+}
+
+export function resolveEffectivePeerId({ cfg = {}, cwd = "" } = {}) {
+  const explicit = String(cfg.peerId || "").trim();
+  if (explicit) return { peerId: explicit, source: "explicit" };
+
+  if (cfg.workspacePeer !== false) {
+    const peerId = deriveWorkspacePeerId(cwd);
+    if (peerId) return { peerId, source: "workspace" };
+  }
+
+  return { peerId: "", source: "none" };
+}

package/lib/utils.mjs

@@ -65,7 +65,7 @@ export function normalizeEndpoint(endpoint) {
 }
 
 export function effectivePeerId(config) {
-  return String(config.peerId || "").trim() || null
+  return String(config.effectivePeer?.peerId || config.peerId || "").trim() || null
 }
 
 export async function fetchJSON(config, endpoint, init = {}, options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openviking/opencode-plugin",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "author": "@openviking",
   "description": "Unified OpenCode plugin for OpenViking repository retrieval and long-term memory",
   "type": "module",

package/servers/mcp-proxy.mjs

@@ -14,6 +14,7 @@ import { fileURLToPath } from "node:url"
 import { loadConfig } from "../lib/config.mjs"
 import { createLogger } from "../lib/shared/debug-log.mjs"
 import { createOpenVikingMcpProxy } from "../lib/shared/mcp-proxy-core.mjs"
+import { resolveEffectivePeerId } from "../lib/shared/workspace-peer.mjs"
 
 export { createOpenVikingMcpProxy } from "../lib/shared/mcp-proxy-core.mjs"
 
@@ -37,13 +38,14 @@ function uniq(values) {
 
 function readProxyConfig() {
   const cfg = loadConfig(resolvePath(fileURLToPath(import.meta.url), "..", ".."))
+  const effectivePeer = resolveEffectivePeerId({ cfg, cwd: process.cwd() })
   const mcpUrl = cfg.mcpUrl || `${trimSlash(cfg.endpoint)}/mcp`
   return {
     mcpUrl,
     apiKey: cfg.apiKey || "",
     account: cfg.account || "",
     user: cfg.user || "",
-    peerId: cfg.peerId || "",
+    peerId: effectivePeer.peerId,
     timeoutMs: Math.max(1000, Number(cfg.timeoutMs) || DEFAULT_TIMEOUT_MS),
     debug: cfg.debug === true,
     debugLogPath: cfg.debugLogPath,