@openviking/dsh-memory-plugin 0.5.24 → 0.5.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config.mjs +1 -1
- package/package.json +1 -1
- package/runtime.mjs +12 -7
- package/shared/capture-utils.mjs +35 -6
- package/shared/ov-http.mjs +22 -1
package/config.mjs
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { buildPluginConfig } from "./shared/plugin-config.mjs";
|
|
2
2
|
import { loadCredentialFiles } from "./shared/credentials.mjs";
|
|
3
3
|
|
|
4
|
-
export const PLUGIN_VERSION = "0.5.
|
|
4
|
+
export const PLUGIN_VERSION = "0.5.26";
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
7
|
* Namespace for the bridged OpenViking MCP tools. DSH publishes every MCP tool
|
package/package.json
CHANGED
package/runtime.mjs
CHANGED
|
@@ -179,22 +179,27 @@ export class OpenVikingRuntime {
|
|
|
179
179
|
}
|
|
180
180
|
|
|
181
181
|
maybeCommit(session, event) {
|
|
182
|
-
|
|
182
|
+
// DSH appends compaction/start before it summarizes and rewrites history,
|
|
183
|
+
// so commit there regardless of the threshold, like PreCompact elsewhere.
|
|
184
|
+
const boundary = event.type === "compaction/start";
|
|
185
|
+
if (event.type !== "turn/end" && !boundary) return;
|
|
183
186
|
const state = this.stateFor(session);
|
|
184
187
|
if (!isCaptureEnabled(state.config)) return;
|
|
185
188
|
this.enqueueWrite(state, async () => {
|
|
186
189
|
if (state.hasPendingWrites) return;
|
|
187
190
|
if (!state.ready && !(await this.ensureState(state)).ready) return;
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
191
|
+
if (!boundary) {
|
|
192
|
+
const metadata = await this.client.getSession(
|
|
193
|
+
state.ovSessionId,
|
|
194
|
+
state.config.peerId,
|
|
195
|
+
);
|
|
196
|
+
if (Number(metadata?.pending_tokens || 0) < state.config.commitTokenThreshold) return;
|
|
197
|
+
}
|
|
193
198
|
const response = await this.client.commitSession(
|
|
194
199
|
state.ovSessionId,
|
|
195
200
|
state.config.peerId,
|
|
196
201
|
);
|
|
197
|
-
this.log("commit", {
|
|
202
|
+
this.log(boundary ? "compaction_commit" : "commit", {
|
|
198
203
|
sessionId: state.ovSessionId,
|
|
199
204
|
ok: response.ok,
|
|
200
205
|
trace_id: response.result?.trace_id || response.traceId,
|
package/shared/capture-utils.mjs
CHANGED
|
@@ -362,14 +362,41 @@ export function extractPartsFromPayload(payload, options = {}) {
|
|
|
362
362
|
return parts;
|
|
363
363
|
}
|
|
364
364
|
|
|
365
|
+
function substituteValue(value, rules, role) {
|
|
366
|
+
if (typeof value === "string") {
|
|
367
|
+
let current = value;
|
|
368
|
+
for (const rule of rules) {
|
|
369
|
+
if (rule.op !== "s" || (rule.scope && rule.scope !== role)) continue;
|
|
370
|
+
current = current.replace(rule.re, rule.replacement);
|
|
371
|
+
}
|
|
372
|
+
return current;
|
|
373
|
+
}
|
|
374
|
+
if (Array.isArray(value)) return value.map((item) => substituteValue(item, rules, role));
|
|
375
|
+
if (value && typeof value === "object") {
|
|
376
|
+
return Object.fromEntries(
|
|
377
|
+
Object.entries(value).map(([key, item]) => [key, substituteValue(item, rules, role)]),
|
|
378
|
+
);
|
|
379
|
+
}
|
|
380
|
+
return value;
|
|
381
|
+
}
|
|
382
|
+
|
|
383
|
+
function substituteToolPart(part, rules, role) {
|
|
384
|
+
if (part.type !== "tool") return part;
|
|
385
|
+
const out = { ...part };
|
|
386
|
+
if (part.tool_input !== undefined) out.tool_input = substituteValue(part.tool_input, rules, role);
|
|
387
|
+
if (part.tool_output !== undefined) out.tool_output = substituteValue(part.tool_output, rules, role);
|
|
388
|
+
return out;
|
|
389
|
+
}
|
|
390
|
+
|
|
365
391
|
/**
|
|
366
392
|
* Prune blank text parts and run `cfg.captureFilters` over the ones that remain.
|
|
367
393
|
*
|
|
368
394
|
* One drop verdict is taken per turn, on the aggregate of its text parts; the
|
|
369
395
|
* individual parts are then rewritten with the substitutions only, so a rule can
|
|
370
|
-
* never both keep and drop the same turn. Tool call/result parts
|
|
371
|
-
*
|
|
372
|
-
*
|
|
396
|
+
* never both keep and drop the same turn. Tool call/result parts get the
|
|
397
|
+
* substitutions too, on their input values and output, so a redaction rule also
|
|
398
|
+
* covers a secret that reached a command or its output; only text parts decide
|
|
399
|
+
* the drop verdict, and a turn dropped on its text takes its tool parts with it.
|
|
373
400
|
*/
|
|
374
401
|
export function filterCaptureParts(parts, role, cfg = {}) {
|
|
375
402
|
const kept = [];
|
|
@@ -389,7 +416,9 @@ export function filterCaptureParts(parts, role, cfg = {}) {
|
|
|
389
416
|
if (!compiled.rules.length || kept.length === 0) return blank;
|
|
390
417
|
|
|
391
418
|
const textParts = kept.filter((part) => part.type === "text");
|
|
392
|
-
if (textParts.length === 0)
|
|
419
|
+
if (textParts.length === 0) {
|
|
420
|
+
return { parts: kept.map((part) => substituteToolPart(part, compiled.rules, role)), dropped: false };
|
|
421
|
+
}
|
|
393
422
|
|
|
394
423
|
const verdict = applyInputFilters(textParts.map((part) => part.text).join("\n\n"), compiled.rules, {
|
|
395
424
|
role,
|
|
@@ -399,7 +428,7 @@ export function filterCaptureParts(parts, role, cfg = {}) {
|
|
|
399
428
|
const out = [];
|
|
400
429
|
for (const part of kept) {
|
|
401
430
|
if (part.type !== "text") {
|
|
402
|
-
out.push(part);
|
|
431
|
+
out.push(substituteToolPart(part, compiled.rules, role));
|
|
403
432
|
continue;
|
|
404
433
|
}
|
|
405
434
|
const shaped = applyInputFilters(part.text, compiled.rules, { role, substituteOnly: true });
|
|
@@ -431,7 +460,7 @@ function faithfulCaptureDecision(text, cfg) {
|
|
|
431
460
|
/**
|
|
432
461
|
* Shape one host message before an adapter builds its session payload.
|
|
433
462
|
* Sanitize injected context before evaluating keep/drop rules, so text that
|
|
434
|
-
* will not be sent cannot satisfy a keep rule. Tool parts
|
|
463
|
+
* will not be sent cannot satisfy a keep rule. Tool parts never decide keep or drop.
|
|
435
464
|
*/
|
|
436
465
|
export function shapeCapturePayload(payload, role, cfg = {}, { toolNameById = {}, faithful = false } = {}) {
|
|
437
466
|
const options = { toolMaxChars: cfg.captureToolMaxChars, toolNameById };
|
package/shared/ov-http.mjs
CHANGED
|
@@ -17,6 +17,8 @@
|
|
|
17
17
|
// that asks for less than a second gets a second.
|
|
18
18
|
const MIN_TIMEOUT_MS = 1000;
|
|
19
19
|
|
|
20
|
+
import { parseExtraHeaders } from "./mcp-proxy-config.mjs";
|
|
21
|
+
|
|
20
22
|
/**
|
|
21
23
|
* The headers every harness puts on every OpenViking request.
|
|
22
24
|
*
|
|
@@ -59,6 +61,12 @@ export function createOvHttp(cfg = {}, {
|
|
|
59
61
|
} = {}) {
|
|
60
62
|
// dsh and pi name this field `endpoint`; every other harness names it `baseUrl`.
|
|
61
63
|
const baseUrl = cfg.baseUrl || cfg.endpoint || "";
|
|
64
|
+
// A caller that owns its header map passes it in; every other harness gets the
|
|
65
|
+
// operator's escape hatch from the environment. A deployment behind an
|
|
66
|
+
// authenticating gateway (Cloudflare Access, oauth2-proxy, mTLS-terminating proxy)
|
|
67
|
+
// needs the same headers on the turn hooks as on the MCP path, and wiring each
|
|
68
|
+
// harness by hand is how the header blocks drifted in the first place.
|
|
69
|
+
const resolvedExtraHeaders = extraHeaders ?? parseExtraHeaders(process.env.OPENVIKING_EXTRA_HEADERS);
|
|
62
70
|
return async function fetchJSON(path, init = {}, options = {}) {
|
|
63
71
|
const timeoutMs = Math.max(MIN_TIMEOUT_MS, Number(options.timeoutMs) || Number(defaultTimeoutMs) || 0);
|
|
64
72
|
const controller = new AbortController();
|
|
@@ -72,7 +80,7 @@ export function createOvHttp(cfg = {}, {
|
|
|
72
80
|
...buildOvHeaders(cfg, {
|
|
73
81
|
actorPeerId: options.actorPeerId ?? resolveActorPeerId(),
|
|
74
82
|
identityHeaders,
|
|
75
|
-
extraHeaders,
|
|
83
|
+
extraHeaders: resolvedExtraHeaders,
|
|
76
84
|
}),
|
|
77
85
|
...(init.headers || {}),
|
|
78
86
|
};
|
|
@@ -81,6 +89,19 @@ export function createOvHttp(cfg = {}, {
|
|
|
81
89
|
if (!(error instanceof SyntaxError)) throw error;
|
|
82
90
|
return null;
|
|
83
91
|
});
|
|
92
|
+
const contentType = response.headers.get("content-type") || "";
|
|
93
|
+
if (body === null && response.ok && contentType && !/json/i.test(contentType)) {
|
|
94
|
+
// A 2xx that is not JSON is not OpenViking. An authenticating gateway's login
|
|
95
|
+
// page, a captive portal or a WAF page answers with 200 and HTML; calling that a
|
|
96
|
+
// success makes a harness believe it is connected while every capture and recall
|
|
97
|
+
// is quietly dropped.
|
|
98
|
+
return {
|
|
99
|
+
ok: false,
|
|
100
|
+
status: response.status,
|
|
101
|
+
result: null,
|
|
102
|
+
error: { message: `non-JSON response (${contentType})` },
|
|
103
|
+
};
|
|
104
|
+
}
|
|
84
105
|
if (requireJsonBody && !body) {
|
|
85
106
|
return {
|
|
86
107
|
ok: false,
|