@openviking/dsh-memory-plugin 0.3.0 → 0.4.3

package/README.md

@@ -29,10 +29,12 @@ be a real package. Linking a source checkout (`dsh plugin --profile web add
 ./examples/dsh-memory-plugin`) only works when that checkout has its own
 `node_modules`, because Node resolves the bundle's dsh peers from the source
 tree's realpath rather than from the profile.
+It also needs `node examples/memory-plugin-shared/sync.mjs` run first: the
+`shared/` modules the bundle imports are generated, not committed.
 
 ## Requirements
 
-- `@deepseek-ai/dsh` `0.1.0-rc.6` or newer in the `0.1.x` release line
+- `@deepseek-ai/dsh` `0.1.0-rc.6`, `0.1.5-rc.1`, or `0.1.5-rc.2`; stable `0.1.x` releases are also admitted by the peer range
 - Node.js `^22.19.0` or `>=24`
 - A reachable OpenViking server
 
@@ -40,17 +42,62 @@ The bundle has no runtime npm dependencies. Its message structures come from
 `createUserMessage` (`@deepseek-ai/dsh-llm`), its tool surface from
 `@deepseek-ai/dsh-mcp-client`, and its skill provider from
 `@deepseek-ai/dsh-skill-filesystem` — peerDependencies that DSH itself already
-installs, so there is nothing extra to add to a profile. The supported peer
-range starts at `0.1.0-rc.6` and stops before `0.2.0`, allowing current DSH
-releases whose core packages resolve to newer release candidates. The local
-devDependencies and `overrides` stay pinned to rc.6 so CI continues to exercise
-the minimum supported contract.
+installs. Keep those packages in the host installation rather than adding
+individual DSH core packages to the profile. DSH initializes profiles with
+`nodeLinker: hoisted` and `autoInstallPeers: false`, then makes the host packages
+available through its module fallback at boot. A missing-peer warning during
+`dsh plugin add` alone does not prove startup is broken.
+
+The peer range is `>=0.1.0-rc.6 <0.2.0 || ^0.1.5-rc.1`. The second clause
+explicitly admits the `0.1.5` release candidates: semver does not include them
+in the first clause merely because they compare above `0.1.0-rc.6`. Other
+pre-release series need separate verification. Local devDependencies and
+`overrides` stay pinned to rc.6 to exercise the minimum supported contract.
 
 Everything under `shared/` and `skills/` is generated by
 `node examples/memory-plugin-shared/sync.mjs` — edit
 `examples/memory-plugin-shared/lib/` and `examples/skills/`, never the vendored
 copies.
 
+## Troubleshooting startup
+
+If startup reports that `@deepseek-ai/dsh-llm` does not export `assertNever`,
+inspect the affected profile before changing dependencies:
+
+```bash
+dsh --version
+dsh plugin --profile web why @deepseek-ai/dsh-skill
+dsh plugin --profile web why @deepseek-ai/dsh-skill-filesystem
+dsh plugin --profile web why @deepseek-ai/dsh-llm
+```
+
+Replace `web` with the affected profile name. Check its `package.json`,
+`pnpm-lock.yaml`, and `pnpm-workspace.yaml` under
+`${DSH_HOME:-$HOME/.dsh}/profiles/<profile>/`, including dependency overrides.
+`dsh-skill@0.0.1-rc.1` imports `assertNever` from the old location. A profile-local
+copy can shadow the newer host package and break both DSH's own skill loader
+and this plugin. As of 2026-09-14, the skill and skill-filesystem npm `latest`
+tags still point to `0.0.1` release candidates; installing either without a
+version is not an upgrade strategy.
+
+If these old packages are direct profile dependencies added only to satisfy
+this plugin, remove those constraints and let DSH supply its matching packages:
+
+```bash
+dsh plugin --profile web remove @deepseek-ai/dsh-skill @deepseek-ai/dsh-skill-filesystem
+dsh plugin --profile web add @openviking/dsh-memory-plugin@latest
+dsh --profile web
+```
+
+If another plugin requires them, update that plugin's constraints instead of
+removing them blindly. Keep `autoInstallPeers: false` and `nodeLinker: hoisted`
+in the profile's pnpm settings. Do not patch the import in `node_modules`: a
+mixed DSH package family can have other incompatible interfaces. Updating this
+memory plugin alone does not remove conflicting profile-local packages.
+
+Use `dsh --profile <profile>` to start a named profile. `dsh web` is an alias for
+the stock `web` profile, not a subcommand to append after `--profile`.
+
 ## Design notes
 
 ### Why injection uses pre-step user messages, not the system prompt
@@ -77,18 +124,17 @@ SDK client opens that standalone stream it stops resolving POST responses, so
 `tools/list` never returns. The proxy owns the transport itself and is
 unaffected.
 
-The bundle's resolved credentials travel to the proxy through the child
-environment, because DSH scrubs credential-shaped names out of the inherited env
-and a subprocess cannot see the Cordis patch; the proxy then applies the usual
-`OPENVIKING_*` → `ovcli.conf` → `ov.conf` chain and reloads when those files
-change.
+The bundle's resolved connection — url, MCP url, key, account, user and auth
+mode — travels to the proxy through the child environment, because DSH scrubs
+credential-shaped names out of the inherited env and a subprocess cannot see the
+Cordis patch. It goes with `OPENVIKING_CREDENTIAL_SOURCE=env`, so the proxy reads
+no config file and reaches the server exactly as the runtime does, including
+with no key when the runtime has none. A changed `ovcli.conf` therefore takes
+effect for the tools when DSH restarts the bundle, as it does for the runtime.
 
 Two consequences follow from the proxy being one process per profile:
 
-- **The actor peer is process-level.** Recall, capture, and commit still resolve
-  a peer per session from that session's workspace, but tool calls carry the
-  peer resolved at boot. Set `OPENVIKING_PEER_ID` when one process serves
-  several workspaces and you need tool calls attributed exactly.
+- **The actor peer is process-level.** Recall, capture, and commit still resolve a peer per session from that session's workspace repository, but tool calls carry the peer resolved at boot. Set `OPENVIKING_PEER_ID` when one process serves several repositories and you need tool calls attributed exactly.
 - **`remember` is not session-scoped.** The server's MCP `remember` stores into
   its own short-lived session rather than the live `dsh-<session-id>` stream —
   the same behavior the Claude Code, Codex, and Cursor integrations have.
@@ -100,9 +146,11 @@ lifecycle registration, so a proxy that cannot start holds up nothing above it.
 ### Why the skill gets its own provider
 
 `skills.mjs` registers a second `ctx.skills` provider with
-`includeDefaultRoots: false`, serving only `skills/`. DSH already mounts a
-`filesystem` provider over the project and user skill roots; an isolated
-provider adds the bundle's skill without shadowing or duplicating that catalog.
+`includeDefaultRoots: false` and `bundledSkillDir` pointing at `skills/`. DSH
+reads this host-owned bundle directly rather than asking a workspace filesystem
+to resolve a path outside its root. Its existing `filesystem` provider still
+owns the project and user skill roots; the bundle does not duplicate that
+catalog or override higher-priority project skills.
 
 ## Configuration
 
@@ -121,7 +169,7 @@ Common environment variables:
 | `OPENVIKING_ACCOUNT` | Trusted-mode account |
 | `OPENVIKING_USER` | Trusted-mode user |
 | `OPENVIKING_PEER_ID` | Explicit actor peer |
-| `OPENVIKING_WORKSPACE_PEER` | Derive a peer from each DSH session workspace by default |
+| `OPENVIKING_WORKSPACE_PEER` | Derive a peer from each DSH session workspace's git identity by default; `0` sends no peer |
 | `OPENVIKING_RECALL_PEER_SCOPE` | `all` for cross-workspace recall or `actor` for isolation |
 
 The patch can also carry plugin config:
@@ -153,10 +201,12 @@ The patch can also carry plugin config:
 - `session/event` captures user, assistant, and optionally tool-result messages without scraping a transcript.
 - `turn/end` checks the OpenViking pending-token threshold and commits when required.
 - `skipSubagentSessions: true` excludes sessions marked with `header.origin: subagent` from automatic profile, recall, capture, and commit; it defaults to `false`.
-- Failed writes enter the shared OpenViking pending queue for replay at the next session start.
-- `tools/pre-execute` blocks DSH filesystem and shell tools from treating `viking://` URIs as local paths, pointing the model at the bridged `mcp__openviking__*` tools instead.
+- `syncTurns: false` stops every new write: no captured messages, no threshold or shutdown commit. Writes queued while the toggle was on are still replayed by the background drainer once the server recovers — they were captured with the toggle on. Profile injection and recall are unaffected; it defaults to `true`.
+- Failed writes enter the shared OpenViking pending queue. A background drainer (default every 60s, `OPENVIKING_PENDING_DRAIN_INTERVAL_MS`) probes the server health and replays the queue in-process, so a transient write failure recovers without restarting dsh; it does not consume the session-start retry budget. Session-start replays keep consuming retries as before.
+- `tools/pre-execute` denies a DSH filesystem tool (`read`, `glob`, `grep`, `edit`, `write`, `str_replace_editor`) whose path argument is a `viking://` URI, pointing the model at the bridged `mcp__openviking__*` tools instead. A `grep` whose pattern is `viking://` text still runs.
+- `tools/post-execute` lets a `bash` command that carries a `viking://` URI run unchanged and attaches a notice for the model: use the bridged tools if it meant OpenViking content, or ignore the notice when the URI is intentional data such as an `ov` argument or an HTTP payload.
 
-Each DSH session maps to `dsh-<session-id>` in OpenViking. Workspace-derived actor peers are resolved per session and sent on every session-specific request.
+Each DSH session maps to `dsh-<session-id>` in OpenViking. Workspace-derived actor peers are resolved per session and sent on every session-specific request: the peer is the git identity of the session's workspace — the normalized `origin` URL (`git@github.com:volcengine/OpenViking.git` becomes `github.com-volcengine-openviking`), else the repository root path, that fallback keeping the older rule where every non-letter-or-digit character becomes `-`. Outside a git repository no peer is sent at all, and what is remembered there goes to the user-level space `viking://user/<you>/memories`. One repository therefore keeps one peer across subdirectories, worktrees, clones and machines, while a fork's different origin keeps it separate. DSH does not read workspace `.openviking/config.json` files, so a `peer.id` written there has no effect; pin a peer with `OPENVIKING_PEER_ID` instead. Memories written under the older path-derived peer stay reachable: the default `recallPeerScope: all` sweeps every peer under the user.
 
 ## Tools
 
@@ -184,6 +234,20 @@ npm run check   # syntax check every shipped module + package/PLUGIN_VERSION agr
 npm test        # node --test *.test.mjs — runs in the repo's PR workflow
 ```
 
+The `0.3.2` compatibility check installed the packed bundle through
+`dsh plugin add` in isolated profiles and exercised DSH `0.1.0-rc.6`,
+`0.1.5-rc.1`, and `0.1.5-rc.2` with matching core packages. It covered Web startup
+and browser loading, skill discovery/read, MCP tool calls, profile/recall
+injection, user/assistant capture, resume deduplication, threshold commits, and
+disposal commits. The check used a local HTTP/MCP fixture and a deterministic
+model adapter on macOS with Node.js 26.5.0; it verifies harness integration, not
+real-server memory extraction. The rc.2 CLI also exited cleanly on SIGTERM.
+
+The startup failure from issue #4944 was reproduced by adding the reported
+old skill packages to an rc.2 profile; removing those direct dependencies and
+reinstalling the bundle restored the same integration checks. A clean rc.2
+profile with the published `0.3.0` bundle did not reproduce that import error.
+
 `live-recall.test.mjs` is an opt-in end-to-end gate against a real OpenViking
 server: it stores a sentinel memory through a session commit, waits for
 extraction, and asserts recall returns that sentinel — the property no stub

package/capture.mjs

@@ -1,3 +1,4 @@
+import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import {
   extractPartsFromPayload,
   extractTextFromPayload,
@@ -6,6 +7,19 @@ import {
 
 export const OPENVIKING_PLUGIN_SOURCE = "openviking-memory";
 
+export function pluginMessage(content, source) {
+  // dsh's own constructor: identity, normalization, and any future Message
+  // invariants come from the pinned peer instead of a hand-built object.
+  return createUserMessage({
+    content: [{ type: "text", text: content }],
+    source: {
+      kind: "plugin",
+      plugin: OPENVIKING_PLUGIN_SOURCE,
+      ...source,
+    },
+  });
+}
+
 export function captureEvent(event, config, toolNames = new Map()) {
   if (!event || typeof event !== "object") return null;
   if (event.type === "tool/call") {

package/client.mjs

@@ -1,67 +1,13 @@
+import { createOvHttp } from "./shared/ov-http.mjs";
+
 export class OpenVikingClient {
   constructor(config) {
     this.config = config;
     this.connected = false;
-  }
-
-  headers(options = {}) {
-    const headers = { "Content-Type": "application/json" };
-    if (this.config.apiKey) headers.Authorization = `Bearer ${this.config.apiKey}`;
-    if (this.config.account) headers["X-OpenViking-Account"] = this.config.account;
-    if (this.config.user) headers["X-OpenViking-User"] = this.config.user;
-    const actorPeerId = options.actorPeerId ?? this.config.peerId;
-    if (actorPeerId) headers["X-OpenViking-Actor-Peer"] = actorPeerId;
-    if (this.config.userAgent) headers["User-Agent"] = this.config.userAgent;
-    return headers;
-  }
-
-  async fetchJSON(path, init = {}, options = {}) {
-    const timeoutMs = options.timeoutMs ?? this.config.requestTimeoutMs;
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), timeoutMs);
-    try {
-      const response = await fetch(`${this.config.endpoint}${path}`, {
-        ...init,
-        headers: {
-          ...this.headers(options),
-          ...(init.headers || {}),
-        },
-        signal: controller.signal,
-      });
-      const body = await response.json().catch(() => ({}));
-      const traceId = body?.result?.trace_id
-        || body?.error?.trace_id
-        || body?.trace_id
-        || undefined;
-      if (!response.ok || body?.status === "error") {
-        return {
-          ok: false,
-          result: null,
-          status: response.status,
-          error: body?.error || { message: `HTTP ${response.status}` },
-          traceId,
-        };
-      }
-      return {
-        ok: true,
-        result: body?.result ?? body,
-        status: response.status,
-        traceId,
-      };
-    } catch (error) {
-      return {
-        ok: false,
-        result: null,
-        status: 0,
-        error: { message: error instanceof Error ? error.message : String(error) },
-      };
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-
-  async health() {
-    return (await this.healthResult()).ok;
+    this.fetchJSON = createOvHttp(config, {
+      defaultTimeoutMs: config.requestTimeoutMs,
+      resolveActorPeerId: () => this.config.peerId,
+    });
   }
 
   async healthResult() {
@@ -70,12 +16,6 @@ export class OpenVikingClient {
     return response;
   }
 
-  async ensureSession(sessionId, actorPeerId) {
-    const response = await this.ensureSessionResult(sessionId, actorPeerId);
-    return response.ok
-      || (response.status === 409 && response.error?.code === "ALREADY_EXISTS");
-  }
-
   async ensureSessionResult(sessionId, actorPeerId) {
     const response = await this.fetchJSON("/api/v1/sessions", {
       method: "POST",
@@ -93,15 +33,6 @@ export class OpenVikingClient {
     return response.ok ? response.result : null;
   }
 
-  async getSessionArchive(sessionId, archiveId, actorPeerId) {
-    const response = await this.fetchJSON(
-      `/api/v1/sessions/${encodeURIComponent(sessionId)}/archives/${encodeURIComponent(archiveId)}`,
-      {},
-      { actorPeerId },
-    );
-    return response.ok ? response.result : null;
-  }
-
   async addMessage(sessionId, payload, actorPeerId) {
     return this.fetchJSON(
       `/api/v1/sessions/${encodeURIComponent(sessionId)}/messages`,
@@ -123,84 +54,4 @@ export class OpenVikingClient {
       { timeoutMs: options.timeoutMs ?? 30000, actorPeerId },
     );
   }
-
-  async find(query, options = {}) {
-    const body = { query };
-    if (options.targetUri) body.target_uri = options.targetUri;
-    if (options.limit) body.limit = options.limit;
-    if (options.scoreThreshold !== undefined) body.score_threshold = options.scoreThreshold;
-    const response = await this.fetchJSON("/api/v1/search/find", {
-      method: "POST",
-      body: JSON.stringify(body),
-    }, { actorPeerId: options.actorPeerId });
-    if (!response.ok || !response.result) return [];
-
-    const results = [];
-    for (const bucket of ["memories", "resources", "skills"]) {
-      const entries = response.result[bucket];
-      if (!Array.isArray(entries)) continue;
-      for (const entry of entries) {
-        results.push({
-          uri: entry?.uri || "",
-          contextType: entry?.context_type
-            || (bucket === "memories" ? "memory" : bucket === "skills" ? "skill" : "resource"),
-          score: Number(entry?.score || 0),
-          abstract: entry?.abstract || "",
-          overview: entry?.overview || null,
-        });
-      }
-    }
-    return results;
-  }
-
-  async read(uri, level, actorPeerId) {
-    const endpoint = level === "abstract"
-      ? "abstract"
-      : level === "overview"
-        ? "overview"
-        : "read";
-    const response = await this.fetchJSON(
-      `/api/v1/content/${endpoint}?uri=${encodeURIComponent(uri)}`,
-      {},
-      { actorPeerId },
-    );
-    return response.ok ? response.result : null;
-  }
-
-  async list(uri, actorPeerId) {
-    const response = await this.fetchJSON(
-      `/api/v1/fs/ls?uri=${encodeURIComponent(uri)}&output=original`,
-      {},
-      { actorPeerId },
-    );
-    return response.ok && Array.isArray(response.result) ? response.result : [];
-  }
-
-  async stat(uri, actorPeerId) {
-    const response = await this.fetchJSON(
-      `/api/v1/fs/stat?uri=${encodeURIComponent(uri)}`,
-      {},
-      { actorPeerId },
-    );
-    return response.ok ? response.result : null;
-  }
-
-  async forget(uri, recursive = false, actorPeerId) {
-    const response = await this.fetchJSON(
-      `/api/v1/fs?uri=${encodeURIComponent(uri)}&recursive=${recursive}`,
-      { method: "DELETE" },
-      { actorPeerId },
-    );
-    return response.ok;
-  }
-
-  async addResource(path, reason, actorPeerId) {
-    const body = { path };
-    if (reason) body.reason = reason;
-    const response = await this.fetchJSON("/api/v1/resources", {
-      method: "POST",
-      body: JSON.stringify(body),
-    }, { timeoutMs: 30000, actorPeerId });
-    return response.ok ? response.result : null;
-  }
 }

package/config.mjs

@@ -1,7 +1,7 @@
-import { buildUserAgent, resolveOpenVikingCredentials } from "./shared/credentials.mjs";
-import { resolveEffectivePeerId } from "./shared/workspace-peer.mjs";
+import { buildPluginConfig } from "./shared/plugin-config.mjs";
+import { loadCredentialFiles } from "./shared/credentials.mjs";
 
-export const PLUGIN_VERSION = "0.3.0";
+export const PLUGIN_VERSION = "0.4.3";
 
 /**
  * Namespace for the bridged OpenViking MCP tools. DSH publishes every MCP tool
@@ -10,168 +10,38 @@ export const PLUGIN_VERSION = "0.3.0";
  */
 export const MCP_SERVER_NAME = "openviking";
 
-const DEFAULT_CONFIG = Object.freeze({
-  endpoint: "http://127.0.0.1:1933",
-  apiKey: "",
-  account: "",
-  user: "",
-  peerId: "",
-  userAgent: "",
-  workspacePeer: true,
-  recallPeerScope: "all",
-  recallQueryExpansion: "auto",
-  recallQueryExpansionConfigured: false,
-  syncTurns: true,
-  recallTokenBudget: 2000,
-  recallMaxContentChars: 500,
-  recallPreferAbstract: true,
-  recallLimit: 10,
-  recallLimitConfigured: false,
-  scoreThreshold: 0.35,
-  minQueryLength: 3,
-  profileTokenBudget: 10000,
-  commitTokenThreshold: 20000,
-  commitKeepRecentCount: 10,
-  captureToolResults: false,
-  captureMode: "semantic",
-  captureMaxLength: 24000,
-  captureToolMaxChars: 1000000,
-  captureAssistantTurns: true,
-  skipSubagentSessions: false,
-  requestTimeoutMs: 10000,
-  mcpToolCallTimeoutMs: 60000,
-});
-
+/**
+ * Resolve the plugin's configuration.
+ *
+ * `input` is what the cordis host hands the plugin — this harness has no config
+ * file of its own. Every knob is declared in `shared/config-schema.mjs`, and
+ * `ovcli.conf`'s `plugin` section outranks the host's input so one file
+ * configures every harness and `ov config switch` moves them together.
+ * Connection fields are the exception: an endpoint, key, identity or auth mode
+ * named by the host is the more specific answer and stays ahead of the
+ * credential chain.
+ */
 export function resolveConfig(input = {}, env = process.env, cwd = process.cwd()) {
-  const credentials = resolveOpenVikingCredentials(env);
-  const explicitPeerId = input.peerId || credentials.peerId;
-  const config = {
-    ...DEFAULT_CONFIG,
-    ...input,
-    endpoint: input.endpoint || credentials.baseUrl || DEFAULT_CONFIG.endpoint,
-    apiKey: input.apiKey || credentials.apiKey,
-    account: input.account || credentials.account,
-    user: input.user || credentials.user,
-    peerId: explicitPeerId,
-    explicitPeerId,
-    userAgent: buildUserAgent("dsh", PLUGIN_VERSION),
-    recallLimitConfigured: Object.prototype.hasOwnProperty.call(input, "recallLimit"),
-    recallQueryExpansionConfigured: Object.prototype.hasOwnProperty.call(input, "recallQueryExpansion"),
-  };
-
-  if (env.OPENVIKING_WORKSPACE_PEER !== undefined) {
-    config.workspacePeer = environmentBoolean(
-      env.OPENVIKING_WORKSPACE_PEER,
-      config.workspacePeer,
-    );
-  }
-  if (env.OPENVIKING_RECALL_PEER_SCOPE) {
-    config.recallPeerScope = env.OPENVIKING_RECALL_PEER_SCOPE;
-  }
-  if (env.OPENVIKING_RECALL_QUERY_EXPANSION) {
-    config.recallQueryExpansion = env.OPENVIKING_RECALL_QUERY_EXPANSION;
-    config.recallQueryExpansionConfigured = true;
-  }
-  if (env.OPENVIKING_RECALL_LIMIT) {
-    config.recallLimit = env.OPENVIKING_RECALL_LIMIT;
-    config.recallLimitConfigured = true;
-  }
-
-  config.endpoint = String(config.endpoint || DEFAULT_CONFIG.endpoint).replace(/\/+$/, "");
-  config.workspacePeer = config.workspacePeer !== false;
-  config.peerId = resolveEffectivePeerId({ cfg: config, cwd }).peerId;
-  config.recallPeerScope = config.recallPeerScope === "actor" ? "actor" : "all";
-  config.recallQueryExpansion = config.recallQueryExpansion === "off" ? "off" : "auto";
-  config.recallLimit = clampInteger(config.recallLimit, 1, 50, DEFAULT_CONFIG.recallLimit);
-  config.recallMaxContentChars = clampInteger(
-    config.recallMaxContentChars,
-    100,
-    5000,
-    DEFAULT_CONFIG.recallMaxContentChars,
-  );
-  config.recallTokenBudget = clampInteger(
-    config.recallTokenBudget,
-    200,
-    50000,
-    DEFAULT_CONFIG.recallTokenBudget,
-  );
-  config.scoreThreshold = clampNumber(
-    config.scoreThreshold,
-    0,
-    1,
-    DEFAULT_CONFIG.scoreThreshold,
-  );
-  config.minQueryLength = clampInteger(
-    config.minQueryLength,
-    1,
-    64,
-    DEFAULT_CONFIG.minQueryLength,
-  );
-  config.profileTokenBudget = clampInteger(
-    config.profileTokenBudget,
-    500,
-    50000,
-    DEFAULT_CONFIG.profileTokenBudget,
-  );
-  config.commitTokenThreshold = clampInteger(
-    config.commitTokenThreshold,
-    1000,
-    1000000,
-    DEFAULT_CONFIG.commitTokenThreshold,
-  );
-  config.commitKeepRecentCount = clampInteger(
-    config.commitKeepRecentCount,
-    0,
-    1000,
-    DEFAULT_CONFIG.commitKeepRecentCount,
-  );
-  config.captureMaxLength = clampInteger(
-    config.captureMaxLength,
-    200,
-    100000,
-    DEFAULT_CONFIG.captureMaxLength,
-  );
-  config.captureToolMaxChars = clampInteger(
-    config.captureToolMaxChars,
-    200,
-    1000000,
-    DEFAULT_CONFIG.captureToolMaxChars,
-  );
-  config.requestTimeoutMs = clampInteger(
-    config.requestTimeoutMs,
-    1000,
-    120000,
-    DEFAULT_CONFIG.requestTimeoutMs,
-  );
-  config.mcpToolCallTimeoutMs = clampInteger(
-    config.mcpToolCallTimeoutMs,
-    1000,
-    600000,
-    DEFAULT_CONFIG.mcpToolCallTimeoutMs,
-  );
-  config.captureMode = config.captureMode === "keyword" ? "keyword" : "semantic";
-  config.syncTurns = config.syncTurns !== false;
-  config.captureAssistantTurns = config.captureAssistantTurns !== false;
-  config.captureToolResults = config.captureToolResults === true;
-  config.skipSubagentSessions = config.skipSubagentSessions === true;
-  return config;
-}
-
-function environmentBoolean(value, fallback) {
-  const normalized = String(value || "").trim().toLowerCase();
-  if (["0", "false", "no", "off"].includes(normalized)) return false;
-  if (["1", "true", "yes", "on"].includes(normalized)) return true;
-  return fallback;
-}
-
-function clampInteger(value, minimum, maximum, fallback) {
-  const number = Math.round(Number(value));
-  if (!Number.isFinite(number)) return fallback;
-  return Math.max(minimum, Math.min(maximum, number));
-}
-
-function clampNumber(value, minimum, maximum, fallback) {
-  const number = Number(value);
-  if (!Number.isFinite(number)) return fallback;
-  return Math.max(minimum, Math.min(maximum, number));
+  // ov.conf's `dsh` section is the legacy layer here as everywhere else, but
+  // the cordis patch shares that slot; the host named this process's settings,
+  // so it wins the overlap.
+  const ovSection = loadCredentialFiles(env).ovFile.dsh;
+  const config = buildPluginConfig("dsh", {
+    env,
+    cwd,
+    legacy: { ...(ovSection && typeof ovSection === "object" ? ovSection : {}), ...input },
+    version: PLUGIN_VERSION,
+    hostInput: {
+      peerId: input.peerId,
+      account: input.account,
+      user: input.user,
+      apiKey: input.apiKey,
+      baseUrl: input.endpoint,
+      // The legacy knob layer this used to ride accepted both spellings.
+      authMode: input.authMode || input.auth_mode,
+    },
+    deriveEffectivePeer: true,
+  });
+
+  return { ...config, peerId: config.effectivePeer.peerId };
 }

package/index.mjs

@@ -4,7 +4,7 @@ import { injectStartupProfile } from "./lifecycle.mjs";
 import { mountOpenVikingMcp } from "./mcp.mjs";
 import { OpenVikingRuntime } from "./runtime.mjs";
 import { mountOpenVikingSkills } from "./skills.mjs";
-import { guardVikingUri } from "./uri-guard.mjs";
+import { guardVikingUri, noticeVikingUri } from "./uri-guard.mjs";
 
 export const name = "openviking-memory";
 export const inject = ["agents", "sessions", "tools"];
@@ -21,6 +21,14 @@ export function apply(ctx, input = {}) {
     () => () => runtime.disposeAll(),
     "openvikingMemory.disposeAll()",
   );
+  // The pending-queue drainer is the in-process recovery path: without it a
+  // single transient write failure latches capture/commit until the next dsh
+  // restart. Started here so every session shares one single-flight drainer.
+  runtime.startDrainer();
+  ctx.effect(
+    () => () => runtime.stopDrainer(),
+    "openvikingMemory.stopDrainer()",
+  );
 
   ctx.on("agent/session-start", ({ agent }) => {
     if (skipMemory(agent.session)) return false;
@@ -33,13 +41,17 @@ export function apply(ctx, input = {}) {
 
   // prepend: downstream waterfall listeners run first, so this plugin sees
   // the final claimed batch and appends after every other contributor.
+  // Profile + recall are independent after `next()`; run them concurrently so
+  // the agent/pre-step waterfall (which currently gates user/message push in
+  // dsh-agent-loop) spends less wall time (#4515).
   ctx.on("agent/pre-step", async ({ agent, messages, signal }, next) => {
     const decision = await next();
     if (skipMemory(agent.session)) return decision;
     if (decision.kind !== "enter" || signal.aborted) return decision;
-    const profile = await runtime.profileMessage(agent);
-    if (signal.aborted) return decision;
-    const recall = await runtime.recallMessage(agent, decision.messages);
+    const [profile, recall] = await Promise.all([
+      runtime.profileMessage(agent),
+      runtime.recallMessage(agent, decision.messages),
+    ]);
     if (signal.aborted) return decision;
     const additions = [profile, recall].filter(Boolean);
     return additions.length > 0
@@ -59,6 +71,7 @@ export function apply(ctx, input = {}) {
   });
 
   ctx.on("tools/pre-execute", guardVikingUri);
+  ctx.on("tools/post-execute", noticeVikingUri);
 
   // Mounted last, and deliberately not awaited: the bridge's apply blocks on
   // its first tools/list, so a server that accepts the connection but never