Skip to content

#1 Persistent memory for AI coding agents based on real-world benchmarks

fix: address 38 system audit findings across security, correctness, and reliability (#68)

Rohit Ghumare70999c3f4525
diff --git a/src/auth.ts b/src/auth.ts
new file mode 100644
index 00000000..11bba275
--- /dev/null
+++ b/src/auth.ts
@@ -0,0 +1,12 @@
+import { timingSafeEqual, createHmac, randomBytes } from "node:crypto";
+
+const hmacKey = randomBytes(32);
+
+export function timingSafeCompare(a: string, b: string): boolean {
+ const hmacA = createHmac("sha256", hmacKey).update(a).digest();
+ const hmacB = createHmac("sha256", hmacKey).update(b).digest();
+ return timingSafeEqual(hmacA, hmacB);
+}
+
+export const VIEWER_CSP =
+ "default-src 'none'; script-src 'unsafe-inline'; style-src 'unsafe-inline'; connect-src 'self' ws://localhost:* wss://localhost:*; img-src 'self'; font-src 'self'";
diff --git a/src/eval/schemas.ts b/src/eval/schemas.ts
index cfd592ca..bf5bfca4 100644
--- a/src/eval/schemas.ts
+++ b/src/eval/schemas.ts
@@ -112,7 +112,7 @@ export const EvolveInputSchema = z.object({
export const ExportImportInputSchema = z.object({
exportData: z.object({
- version: z.literal("0.3.0"),
+ version: z.union([z.literal("0.3.0"), z.literal("0.4.0")]),
exportedAt: z.string(),
sessions: z.array(z.unknown()),
observations: z.record(z.string(), z.array(z.unknown())),
diff --git a/src/functions/export-import.ts b/src/functions/export-import.ts
index 46dfb9e9..05b98ec6 100644
--- a/src/functions/export-import.ts
+++ b/src/functions/export-import.ts
@@ -14,6 +14,7 @@ import type {
} from "../types.js";
import { KV } from "../state/schema.js";
import { StateKV } from "../state/kv.js";
+import { VERSION } from "../version.js";
export function registerExportImportFunction(sdk: ISdk, kv: StateKV): void {
sdk.registerFunction(
@@ -58,7 +59,7 @@ export function registerExportImportFunction(sdk: ISdk, kv: StateKV): void {
.catch(() => []);
const exportData: ExportData = {
- version: "0.4.0",
+ version: VERSION,
exportedAt: new Date().toISOString(),
sessions,
observations,
@@ -101,7 +102,8 @@ export function registerExportImportFunction(sdk: ISdk, kv: StateKV): void {
const strategy = data.strategy || "merge";
const importData = data.exportData;
- if (importData.version !== "0.3.0" && importData.version !== "0.4.0") {
+ const supportedVersions = new Set(["0.3.0", "0.4.0"]);
+ if (!supportedVersions.has(importData.version)) {
return {
success: false,
error: `Unsupported export version: ${importData.version}`,
diff --git a/src/functions/governance.ts b/src/functions/governance.ts
index efc0cd17..f3b1673a 100644
--- a/src/functions/governance.ts
+++ b/src/functions/governance.ts
@@ -50,6 +50,19 @@ export function registerGovernanceFunction(sdk: ISdk, kv: StateKV): void {
{ id: "mem::governance-bulk" },
async (data: GovernanceFilter & { dryRun?: boolean }) => {
const ctx = getContext();
+
+ const hasFilter =
+ (data.type && data.type.length > 0) ||
+ data.dateFrom ||
+ data.dateTo ||
+ data.qualityBelow !== undefined;
+ if (!hasFilter && !data.dryRun) {
+ return {
+ success: false,
+ error: "At least one filter is required for non-dryRun bulk delete",
+ };
+ }
+
const memories = await kv.list<Memory>(KV.memories);
let candidates = memories;
diff --git a/src/functions/graph.ts b/src/functions/graph.ts
index 3499b956..919d208f 100644
--- a/src/functions/graph.ts
+++ b/src/functions/graph.ts
@@ -190,8 +190,8 @@ export function registerGraphFunction(
const matchingNodes = allNodes.filter(
(n) =>
n.name.toLowerCase().includes(lower) ||
- Object.values(n.properties).some((v) =>
- v.toLowerCase().includes(lower),
+ Object.values(n.properties).some(
+ (v) => typeof v === "string" && v.toLowerCase().includes(lower),
),
);
const nodeIds = new Set(matchingNodes.map((n) => n.id));
diff --git a/src/functions/observe.ts b/src/functions/observe.ts
index 62567daf..2e280752 100644
--- a/src/functions/observe.ts
+++ b/src/functions/observe.ts
@@ -5,11 +5,13 @@ import { KV, STREAM, generateId } from "../state/schema.js";
import { StateKV } from "../state/kv.js";
import { stripPrivateData } from "./privacy.js";
import { DedupMap } from "./dedup.js";
+import { withKeyedLock } from "../state/keyed-mutex.js";
export function registerObserveFunction(
sdk: ISdk,
kv: StateKV,
dedupMap?: DedupMap,
+ maxObservationsPerSession?: number,
): void {
sdk.registerFunction(
{
@@ -36,21 +38,21 @@ export function registerObserveFunction(
const obsId = generateId("obs");
+ let dedupHash: string | undefined;
if (dedupMap) {
const d =
typeof payload.data === "object" && payload.data !== null
? (payload.data as Record<string, unknown>)
: {};
const toolName = (d["tool_name"] as string) || payload.hookType;
- const hash = dedupMap.computeHash(
+ dedupHash = dedupMap.computeHash(
payload.sessionId,
toolName,
d["tool_input"],
);
- if (dedupMap.isDuplicate(hash)) {
+ if (dedupMap.isDuplicate(dedupHash)) {
return { deduplicated: true, sessionId: payload.sessionId };
}
- dedupMap.record(hash);
}
let sanitizedRaw: unknown = payload.data;
@@ -85,42 +87,58 @@ export function registerObserveFunction(
}
}
- await kv.set(KV.observations(payload.sessionId), obsId, raw);
+ return withKeyedLock(`obs:${payload.sessionId}`, async () => {
+ if (maxObservationsPerSession && maxObservationsPerSession > 0) {
+ const existing = await kv.list(KV.observations(payload.sessionId));
+ if (existing.length >= maxObservationsPerSession) {
+ return {
+ success: false,
+ error: `Session observation limit reached (${maxObservationsPerSession})`,
+ };
+ }
+ }
- sdk.triggerVoid("stream::set", {
- stream_name: STREAM.name,
- group_id: STREAM.group(payload.sessionId),
- item_id: obsId,
- data: { type: "raw", observation: raw },
- });
+ await kv.set(KV.observations(payload.sessionId), obsId, raw);
- sdk.triggerVoid("stream::set", {
- stream_name: STREAM.name,
- group_id: STREAM.viewerGroup,
- item_id: obsId,
- data: { type: "raw", observation: raw, sessionId: payload.sessionId },
- });
+ if (dedupMap && dedupHash) {
+ dedupMap.record(dedupHash);
+ }
- const session = await kv.get<Session>(KV.sessions, payload.sessionId);
- if (session) {
- await kv.set(KV.sessions, payload.sessionId, {
- ...session,
- observationCount: (session.observationCount || 0) + 1,
+ sdk.triggerVoid("stream::set", {
+ stream_name: STREAM.name,
+ group_id: STREAM.group(payload.sessionId),
+ item_id: obsId,
+ data: { type: "raw", observation: raw },
});
- }
- sdk.triggerVoid("mem::compress", {
- observationId: obsId,
- sessionId: payload.sessionId,
- raw,
- });
+ sdk.triggerVoid("stream::set", {
+ stream_name: STREAM.name,
+ group_id: STREAM.viewerGroup,
+ item_id: obsId,
+ data: { type: "raw", observation: raw, sessionId: payload.sessionId },
+ });
- ctx.logger.info("Observation captured", {
- obsId,
- sessionId: payload.sessionId,
- hook: payload.hookType,
+ const session = await kv.get<Session>(KV.sessions, payload.sessionId);
+ if (session) {
+ await kv.set(KV.sessions, payload.sessionId, {
+ ...session,
+ observationCount: (session.observationCount || 0) + 1,
+ });
+ }
+
+ sdk.triggerVoid("mem::compress", {
+ observationId: obsId,
+ sessionId: payload.sessionId,
+ raw,
+ });
+
+ ctx.logger.info("Observation captured", {
+ obsId,
+ sessionId: payload.sessionId,
+ hook: payload.hookType,
+ });
+ return { observationId: obsId };
});
- return { observationId: obsId };
},
);
}
diff --git a/src/functions/privacy.ts b/src/functions/privacy.ts
index 32373568..bb67405c 100644
--- a/src/functions/privacy.ts
+++ b/src/functions/privacy.ts
@@ -12,6 +12,9 @@ const SECRET_PATTERN_SOURCES = [
/AKIA[0-9A-Z]{16}/g,
/AIza[A-Za-z0-9\-_]{35}/g,
/eyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}/g,
+ /npm_[A-Za-z0-9]{36}/g,
+ /glpat-[A-Za-z0-9\-_]{20,}/g,
+ /dop_v1_[A-Za-z0-9]{64}/g,
];
export function stripPrivateData(input: string): string {
diff --git a/src/functions/relations.ts b/src/functions/relations.ts
index 82d363e3..ebdc38c1 100644
--- a/src/functions/relations.ts
+++ b/src/functions/relations.ts
@@ -3,6 +3,7 @@ import { getContext } from "iii-sdk";
import type { Memory, MemoryRelation } from "../types.js";
import { KV, generateId } from "../state/schema.js";
import { StateKV } from "../state/kv.js";
+import { withKeyedLock } from "../state/keyed-mutex.js";
function computeConfidence(
source: Memory,
@@ -46,48 +47,56 @@ export function registerRelationsFunction(sdk: ISdk, kv: StateKV): void {
confidence?: number;
}) => {
const ctx = getContext();
+ const [firstId, secondId] = [data.sourceId, data.targetId].sort();
+
+ return withKeyedLock(`mem:${firstId}`, () =>
+ withKeyedLock(`mem:${secondId}`, async () => {
+ const source = await kv.get<Memory>(KV.memories, data.sourceId);
+ const target = await kv.get<Memory>(KV.memories, data.targetId);
+ if (!source || !target) {
+ return {
+ success: false,
+ error: "source or target memory not found",
+ };
+ }
- const source = await kv.get<Memory>(KV.memories, data.sourceId);
- const target = await kv.get<Memory>(KV.memories, data.targetId);
- if (!source || !target) {
- return { success: false, error: "source or target memory not found" };
- }
-
- const confidence =
- data.confidence !== undefined
- ? Math.max(0, Math.min(1, data.confidence))
- : computeConfidence(source, target, data.type);
-
- const relation: MemoryRelation = {
- type: data.type,
- sourceId: data.sourceId,
- targetId: data.targetId,
- createdAt: new Date().toISOString(),
- confidence,
- };
-
- const relationId = generateId("rel");
- await kv.set(KV.relations, relationId, relation);
-
- if (!source.relatedIds) source.relatedIds = [];
- if (!source.relatedIds.includes(data.targetId)) {
- source.relatedIds.push(data.targetId);
- await kv.set(KV.memories, data.sourceId, source);
- }
+ const confidence =
+ data.confidence !== undefined
+ ? Math.max(0, Math.min(1, data.confidence))
+ : computeConfidence(source, target, data.type);
+
+ const relation: MemoryRelation = {
+ type: data.type,
+ sourceId: data.sourceId,
+ targetId: data.targetId,
+ createdAt: new Date().toISOString(),
+ confidence,
+ };
+
+ const relationId = generateId("rel");
+ await kv.set(KV.relations, relationId, relation);
+
+ if (!source.relatedIds) source.relatedIds = [];
+ if (!source.relatedIds.includes(data.targetId)) {
+ source.relatedIds.push(data.targetId);
+ await kv.set(KV.memories, data.sourceId, source);
+ }
- if (!target.relatedIds) target.relatedIds = [];
- if (!target.relatedIds.includes(data.sourceId)) {
- target.relatedIds.push(data.sourceId);
- await kv.set(KV.memories, data.targetId, target);
- }
+ if (!target.relatedIds) target.relatedIds = [];
+ if (!target.relatedIds.includes(data.sourceId)) {
+ target.relatedIds.push(data.sourceId);
+ await kv.set(KV.memories, data.targetId, target);
+ }
- ctx.logger.info("Memory relation created", {
- relationId,
- type: data.type,
- source: data.sourceId,
- target: data.targetId,
- });
- return { success: true, relationId, relation };
+ ctx.logger.info("Memory relation created", {
+ relationId,
+ type: data.type,
+ source: data.sourceId,
+ target: data.targetId,
+ });
+ return { success: true, relationId, relation };
+ }),
+ );
},
);
diff --git a/src/functions/remember.ts b/src/functions/remember.ts
index 1f42da70..1ad5a637 100644
--- a/src/functions/remember.ts
+++ b/src/functions/remember.ts
@@ -3,6 +3,7 @@ import { getContext } from "iii-sdk";
import type { Memory } from "../types.js";
import { KV, generateId, jaccardSimilarity } from "../state/schema.js";
import { StateKV } from "../state/kv.js";
+import { withKeyedLock } from "../state/keyed-mutex.js";
export function registerRememberFunction(sdk: ISdk, kv: StateKV): void {
sdk.registerFunction(
@@ -41,53 +42,55 @@ export function registerRememberFunction(sdk: ISdk, kv: StateKV): void {
const now = new Date().toISOString();
- const existingMemories = await kv.list<Memory>(KV.memories);
- let supersededId: string | undefined;
- let supersededVersion = 1;
- let supersededMemory: Memory | undefined;
- const lowerContent = data.content.toLowerCase();
- for (const existing of existingMemories) {
- if (existing.isLatest === false) continue;
- const similarity = jaccardSimilarity(
- lowerContent,
- existing.content.toLowerCase(),
- );
- if (similarity > 0.7) {
- supersededId = existing.id;
- supersededVersion = existing.version ?? 1;
- supersededMemory = existing;
- break;
+ return withKeyedLock("mem:remember", async () => {
+ const existingMemories = await kv.list<Memory>(KV.memories);
+ let supersededId: string | undefined;
+ let supersededVersion = 1;
+ let supersededMemory: Memory | undefined;
+ const lowerContent = data.content.toLowerCase();
+ for (const existing of existingMemories) {
+ if (existing.isLatest === false) continue;
+ const similarity = jaccardSimilarity(
+ lowerContent,
+ existing.content.toLowerCase(),
+ );
+ if (similarity > 0.7) {
+ supersededId = existing.id;
+ supersededVersion = existing.version ?? 1;
+ supersededMemory = existing;
+ break;
+ }
}
- }
- const memory: Memory = {
- id: generateId("mem"),
- createdAt: now,
- updatedAt: now,
- type: memType,
- title: data.content.slice(0, 80),
- content: data.content,
- concepts: data.concepts || [],
- files: data.files || [],
- sessionIds: [],
- strength: 7,
- version: supersededId ? supersededVersion + 1 : 1,
- parentId: supersededId,
- supersedes: supersededId ? [supersededId] : [],
- isLatest: true,
- };
+ const memory: Memory = {
+ id: generateId("mem"),
+ createdAt: now,
+ updatedAt: now,
+ type: memType,
+ title: data.content.slice(0, 80),
+ content: data.content,
+ concepts: data.concepts || [],
+ files: data.files || [],
+ sessionIds: [],
+ strength: 7,
+ version: supersededId ? supersededVersion + 1 : 1,
+ parentId: supersededId,
+ supersedes: supersededId ? [supersededId] : [],
+ isLatest: true,
+ };
- await kv.set(KV.memories, memory.id, memory);
- if (supersededMemory) {
- supersededMemory.isLatest = false;
- await kv.set(KV.memories, supersededMemory.id, supersededMemory);
- }
+ if (supersededMemory) {
+ supersededMemory.isLatest = false;
+ await kv.set(KV.memories, supersededMemory.id, supersededMemory);
+ }
+ await kv.set(KV.memories, memory.id, memory);
- ctx.logger.info("Memory saved", {
- memId: memory.id,
- type: memory.type,
+ ctx.logger.info("Memory saved", {
+ memId: memory.id,
+ type: memory.type,
+ });
+ return { success: true, memory };
});
- return { success: true, memory };
},
);
diff --git a/src/functions/snapshot.ts b/src/functions/snapshot.ts
index 0b2aa3b5..ba85bc70 100644
--- a/src/functions/snapshot.ts
+++ b/src/functions/snapshot.ts
@@ -8,6 +8,9 @@ import type { SnapshotMeta, Session, Memory, GraphNode } from "../types.js";
import { KV, generateId } from "../state/schema.js";
import type { StateKV } from "../state/kv.js";
import { recordAudit } from "./audit.js";
+import { VERSION } from "../version.js";
+
+const COMMIT_HASH_RE = /^[0-9a-f]{7,40}$/i;
const execFileAsync = promisify(execFile);
@@ -55,7 +58,7 @@ export function registerSnapshotFunction(
}
const state = {
- version: "0.4.0",
+ version: VERSION,
timestamp: new Date().toISOString(),
sessions,
memories,
@@ -148,6 +151,9 @@ export function registerSnapshotFunction(
if (!data.commitHash) {
return { success: false, error: "commitHash is required" };
}
+ if (!COMMIT_HASH_RE.test(data.commitHash)) {
+ return { success: false, error: "Invalid commitHash format" };
+ }
try {
await gitExec(snapshotDir, [
diff --git a/src/functions/team.ts b/src/functions/team.ts
index 68fb1cbc..4d976d6e 100644
--- a/src/functions/team.ts
+++ b/src/functions/team.ts
@@ -10,6 +10,8 @@ import { KV, generateId } from "../state/schema.js";
import type { StateKV } from "../state/kv.js";
import { recordAudit } from "./audit.js";
+const VALID_ITEM_TYPES = new Set(["memory", "pattern", "observation"]);
+
export function registerTeamFunction(
sdk: ISdk,
kv: StateKV,
@@ -19,19 +21,30 @@ export function registerTeamFunction(
{ id: "mem::team-share" },
async (data: {
itemId: string;
- itemType: "memory" | "pattern";
+ itemType: "memory" | "pattern" | "observation";
+ sessionId?: string;
project?: string;
}) => {
const ctx = getContext();
if (!data.itemId || !data.itemType) {
return { success: false, error: "itemId and itemType are required" };
}
+ if (!VALID_ITEM_TYPES.has(data.itemType)) {
+ return { success: false, error: `Invalid itemType: ${data.itemType}` };
+ }
- let content: unknown = null;
- if (data.itemType === "memory" || data.itemType === "pattern") {
+ let content: unknown;
+ if (data.itemType === "observation") {
+ if (!data.sessionId) {
+ return {
+ success: false,
+ error: "sessionId is required for observations",
+ };
+ }
+ content = await kv.get(KV.observations(data.sessionId), data.itemId);
+ } else {
content = await kv.get<Memory>(KV.memories, data.itemId);
}
-
if (!content) {
return { success: false, error: "Item not found" };
}
diff --git a/src/health/monitor.ts b/src/health/monitor.ts
index 73cd3f48..e49468f7 100644
--- a/src/health/monitor.ts
+++ b/src/health/monitor.ts
@@ -77,6 +77,7 @@ export function registerHealthMonitor(
const interval = setInterval(() => {
collectHealth().catch(() => {});
}, 30_000);
+ interval.unref();
return {
stop: () => clearInterval(interval),
diff --git a/src/index.ts b/src/index.ts
index 6bbef0cb..86be25fe 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -56,6 +56,7 @@ import { MetricsStore } from "./eval/metrics-store.js";
import { DedupMap } from "./functions/dedup.js";
import { registerHealthMonitor } from "./health/monitor.js";
import { initMetrics, OTEL_CONFIG } from "./telemetry/setup.js";
+import { VERSION } from "./version.js";
async function main() {
const config = loadConfig();
@@ -69,7 +70,7 @@ async function main() {
const embeddingProvider = createEmbeddingProvider();
- console.log(`[agentmemory] Starting worker v0.4.0...`);
+ console.log(`[agentmemory] Starting worker v${VERSION}...`);
console.log(`[agentmemory] Engine: ${config.engineUrl}`);
console.log(
`[agentmemory] Provider: ${config.provider.provider} (${config.provider.model})`,
@@ -109,7 +110,7 @@ async function main() {
);
registerPrivacyFunction(sdk);
- registerObserveFunction(sdk, kv, dedupMap);
+ registerObserveFunction(sdk, kv, dedupMap, config.maxObservationsPerSession);
registerCompressFunction(sdk, kv, provider, metricsStore);
registerSearchFunction(sdk, kv);
registerContextFunction(sdk, kv, config.tokenBudget);
diff --git a/src/mcp/server.ts b/src/mcp/server.ts
index f4f365f5..2b7193b1 100644
--- a/src/mcp/server.ts
+++ b/src/mcp/server.ts
@@ -9,6 +9,7 @@ import type {
GraphEdge,
} from "../types.js";
import { getAllTools } from "./tools-registry.js";
+import { timingSafeCompare } from "../auth.js";
type McpResponse = {
status_code: number;
@@ -28,7 +29,7 @@ export function registerMcpEndpoints(
if (!sec) return null;
const auth =
req.headers?.["authorization"] || req.headers?.["Authorization"];
- if (auth !== `Bearer ${sec}`) {
+ if (typeof auth !== "string" || !timingSafeCompare(auth, `Bearer ${sec}`)) {
return { status_code: 401, body: { error: "unauthorized" } };
}
return null;
diff --git a/src/mcp/standalone.ts b/src/mcp/standalone.ts
index bb18db77..2922fa53 100644
--- a/src/mcp/standalone.ts
+++ b/src/mcp/standalone.ts
@@ -4,10 +4,19 @@ import { InMemoryKV } from "./in-memory-kv.js";
import { createStdioTransport } from "./transport.js";
import { getAllTools } from "./tools-registry.js";
import { getStandalonePersistPath } from "../config.js";
+import { VERSION } from "../version.js";
+
+const IMPLEMENTED_TOOLS = new Set([
+ "memory_save",
+ "memory_recall",
+ "memory_sessions",
+ "memory_export",
+ "memory_audit",
+]);
const SERVER_INFO = {
name: "agentmemory",
- version: "0.4.0",
+ version: VERSION,
protocolVersion: "2024-11-05",
};
@@ -77,7 +86,7 @@ async function handleToolCall(
{
type: "text",
text: JSON.stringify(
- { version: "0.4.0", memories, sessions },
+ { version: VERSION, memories, sessions },
null,
2,
),
@@ -126,7 +135,9 @@ const transport = createStdioTransport(async (method, params) => {
return {};
case "tools/list":
- return { tools: getAllTools() };
+ return {
+ tools: getAllTools().filter((t) => IMPLEMENTED_TOOLS.has(t.name)),
+ };
case "tools/call": {
const toolName = params.name as string;
diff --git a/src/providers/circuit-breaker.ts b/src/providers/circuit-breaker.ts
index 3b24acf3..e7f1f85d 100644
--- a/src/providers/circuit-breaker.ts
+++ b/src/providers/circuit-breaker.ts
@@ -1,8 +1,14 @@
import type { CircuitBreakerState } from "../types.js";
-const FAILURE_THRESHOLD = 3;
-const FAILURE_WINDOW_MS = 60_000;
-const RECOVERY_TIMEOUT_MS = 30_000;
+interface CircuitBreakerOptions {
+ failureThreshold?: number;
+ failureWindowMs?: number;
+ recoveryTimeoutMs?: number;
+}
+
+function positiveFinite(val: number | undefined, fallback: number): number {
+ return Number.isFinite(val) && val! > 0 ? val! : fallback;
+}
export class CircuitBreaker {
private state: "closed" | "open" | "half-open" = "closed";
@@ -10,10 +16,26 @@ export class CircuitBreaker {
private lastFailureAt: number | null = null;
private openedAt: number | null = null;
+ private readonly failureThreshold: number;
+ private readonly failureWindowMs: number;
+ private readonly recoveryTimeoutMs: number;
+
+ constructor(opts?: CircuitBreakerOptions) {
+ this.failureThreshold = Math.max(
+ 1,
+ Math.floor(positiveFinite(opts?.failureThreshold, 3)),
+ );
+ this.failureWindowMs = positiveFinite(opts?.failureWindowMs, 60_000);
+ this.recoveryTimeoutMs = positiveFinite(opts?.recoveryTimeoutMs, 30_000);
+ }
+
get isAllowed(): boolean {
if (this.state === "closed") return true;
if (this.state === "open") {
- if (this.openedAt && Date.now() - this.openedAt >= RECOVERY_TIMEOUT_MS) {
+ if (
+ this.openedAt &&
+ Date.now() - this.openedAt >= this.recoveryTimeoutMs
+ ) {
this.state = "half-open";
return true;
}
@@ -38,12 +60,12 @@ export class CircuitBreaker {
this.openedAt = now;
return;
}
- if (this.lastFailureAt && now - this.lastFailureAt > FAILURE_WINDOW_MS) {
+ if (this.lastFailureAt && now - this.lastFailureAt > this.failureWindowMs) {
this.failures = 0;
}
this.failures += 1;
this.lastFailureAt = now;
- if (this.failures >= FAILURE_THRESHOLD) {
+ if (this.failures >= this.failureThreshold) {
this.state = "open";
this.openedAt = now;
}
diff --git a/src/state/keyed-mutex.ts b/src/state/keyed-mutex.ts
new file mode 100644
index 00000000..b28531a6
--- /dev/null
+++ b/src/state/keyed-mutex.ts
@@ -0,0 +1,18 @@
+const locks = new Map<string, Promise<void>>();
+
+export function withKeyedLock<T>(
+ key: string,
+ fn: () => Promise<T>,
+): Promise<T> {
+ const prev = locks.get(key) ?? Promise.resolve();
+ const next = prev.then(fn, fn);
+ const cleanup = next.then(
+ () => {},
+ () => {},
+ );
+ locks.set(key, cleanup);
+ cleanup.then(() => {
+ if (locks.get(key) === cleanup) locks.delete(key);
+ });
+ return next;
+}
diff --git a/src/telemetry/setup.ts b/src/telemetry/setup.ts
index bfa37d3a..0785b614 100644
--- a/src/telemetry/setup.ts
+++ b/src/telemetry/setup.ts
@@ -1,3 +1,5 @@
+import { VERSION } from "../version.js";
+
interface OtelConfig {
serviceName: string;
serviceVersion: string;
@@ -6,7 +8,7 @@ interface OtelConfig {
export const OTEL_CONFIG: OtelConfig = {
serviceName: "agentmemory",
- serviceVersion: "0.4.0",
+ serviceVersion: VERSION,
metricsExportIntervalMs: 30_000,
};
@@ -112,13 +114,3 @@ export function initMetrics(getMeter?: (name: string) => Meter): {
return { counters, histograms };
}
-
-export function getCounters(): Counters {
- if (!counters) initMetrics();
- return counters!;
-}
-
-export function getHistograms(): Histograms {
- if (!histograms) initMetrics();
- return histograms!;
-}
diff --git a/src/triggers/api.ts b/src/triggers/api.ts
index 5bd399fb..af39497e 100644
--- a/src/triggers/api.ts
+++ b/src/triggers/api.ts
@@ -8,6 +8,8 @@ import { fileURLToPath } from "node:url";
import { getLatestHealth } from "../health/monitor.js";
import type { MetricsStore } from "../eval/metrics-store.js";
import type { ResilientProvider } from "../providers/resilient.js";
+import { VERSION } from "../version.js";
+import { timingSafeCompare, VIEWER_CSP } from "../auth.js";
type Response = {
status_code: number;
@@ -15,16 +17,16 @@ type Response = {
body: unknown;
};
-const VIEWER_CSP =
- "default-src 'none'; script-src 'unsafe-inline'; style-src 'unsafe-inline'; connect-src 'self' ws://localhost:* wss://localhost:*; img-src 'self'; font-src 'self'";
-
function checkAuth(
req: ApiRequest,
secret: string | undefined,
): Response | null {
if (!secret) return null;
const auth = req.headers?.["authorization"] || req.headers?.["Authorization"];
- if (auth !== `Bearer ${secret}`) {
+ if (
+ typeof auth !== "string" ||
+ !timingSafeCompare(auth, `Bearer ${secret}`)
+ ) {
return { status_code: 401, body: { error: "unauthorized" } };
}
return null;
@@ -69,7 +71,7 @@ export function registerApiTriggers(
body: {
status,
service: "agentmemory",
- version: "0.4.0",
+ version: VERSION,
health: health || null,
functionMetrics,
circuitBreaker,
diff --git a/src/types.ts b/src/types.ts
index ee7c5af8..90c78913 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -285,7 +285,7 @@ export interface GraphNode {
| "library"
| "person";
name: string;
- properties: Record<string, string>;
+ properties: Record<string, unknown>;
sourceObservationIds: string[];
createdAt: string;
}
diff --git a/src/version.ts b/src/version.ts
new file mode 100644
index 00000000..d155091a
--- /dev/null
+++ b/src/version.ts
@@ -0,0 +1 @@
+export const VERSION: "0.3.0" | "0.4.0" = "0.4.0";
diff --git a/test/snapshot.test.ts b/test/snapshot.test.ts
index f3a3a60b..69d33aca 100644
--- a/test/snapshot.test.ts
+++ b/test/snapshot.test.ts
@@ -8,13 +8,8 @@ vi.mock("iii-sdk", () => ({
vi.mock("node:child_process", () => ({
execFile: vi.fn(
- (
- _cmd: string,
- _args: string[],
- _opts: unknown,
- cb: Function,
- ) => {
- cb(null, { stdout: "abc123\n", stderr: "" });
+ (_cmd: string, _args: string[], _opts: unknown, cb: Function) => {
+ cb(null, { stdout: "abc1234\n", stderr: "" });
},
),
}));
@@ -26,7 +21,7 @@ vi.mock("node:util", async () => {
>;
return {
...actual,
- promisify: () => async () => ({ stdout: "abc123\n", stderr: "" }),
+ promisify: () => async () => ({ stdout: "abc1234\n", stderr: "" }),
};
});
@@ -36,9 +31,7 @@ vi.mock("node:fs", () => ({
writeFileSync: vi.fn(),
readFileSync: vi
.fn()
- .mockReturnValue(
- '{"version":"0.4.0","sessions":[],"memories":[]}',
- ),
+ .mockReturnValue('{"version":"0.4.0","sessions":[],"memories":[]}'),
}));
import { registerSnapshotFunction } from "../src/functions/snapshot.js";
@@ -125,7 +118,7 @@ describe("Snapshot Functions", () => {
expect(result.success).toBe(true);
expect(result.snapshot).toBeDefined();
- expect(result.snapshot.commitHash).toBe("abc123");
+ expect(result.snapshot.commitHash).toBe("abc1234");
expect(result.snapshot.message).toBe("Test snapshot");
expect(result.snapshot.stats.sessions).toBe(1);
expect(result.snapshot.stats.memories).toBe(1);
@@ -133,7 +126,11 @@ describe("Snapshot Functions", () => {
it("snapshot-list returns snapshots from git log", async () => {
const result = (await sdk.trigger("mem::snapshot-list", {})) as {
- snapshots: Array<{ commitHash: string; createdAt: string; message: string }>;
+ snapshots: Array<{
+ commitHash: string;
+ createdAt: string;
+ message: string;
+ }>;
};
expect(result.snapshots).toBeDefined();
@@ -152,11 +149,11 @@ describe("Snapshot Functions", () => {
it("snapshot-restore loads state from commit", async () => {
const result = (await sdk.trigger("mem::snapshot-restore", {
- commitHash: "abc123",
+ commitHash: "abc1234",
})) as { success: boolean; commitHash: string };
expect(result.success).toBe(true);
- expect(result.commitHash).toBe("abc123");
+ expect(result.commitHash).toBe("abc1234");
});
it("snapshot-create records an audit entry", async () => {