Skip to content

fix(acl): separate scope enumeration from store-level bypass #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rwmjhb merged 1 commit into from
Mar 17, 2026
Merged

fix(acl): separate scope enumeration from store-level bypass #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 62 additions & 27 deletions index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { spawn } from "node:child_process";
import { MemoryStore, validateStoragePath } from "./src/store.js";
import { createEmbedder, getVectorDimensions } from "./src/embedder.js";
import { createRetriever, DEFAULT_RETRIEVAL_CONFIG } from "./src/retriever.js";
import { createScopeManager } from "./src/scopes.js";
import { createScopeManager, resolveScopeFilter, isSystemBypassId, parseAgentIdFromSessionKey } from "./src/scopes.js";
import { createMigrator } from "./src/migrate.js";
import { registerAllMemoryTools } from "./src/tools.js";
import { appendSelfImprovementEntry, ensureSelfImprovementLearningFiles } from "./src/self-improvement-files.js";
Expand Down Expand Up @@ -226,7 +226,10 @@ function resolveHookAgentId(
explicitAgentId: string | undefined,
sessionKey: string | undefined,
): string {
return explicitAgentId || parseAgentIdFromSessionKey(sessionKey) || "main";
const trimmedExplicit = explicitAgentId?.trim();
return (trimmedExplicit && trimmedExplicit.length > 0
? trimmedExplicit
: parseAgentIdFromSessionKey(sessionKey)) || "main";
}

function summarizeAgentEndMessages(messages: unknown[]): string {
Expand Down Expand Up @@ -558,13 +561,6 @@ async function loadSelfImprovementReminderContent(workspaceDir?: string): Promis
}
}

function parseAgentIdFromSessionKey(sessionKey: string | undefined): string | undefined {
const sk = (sessionKey ?? "").trim();
const parts = sk.split(":");
if (parts.length >= 2 && parts[0] === "agent" && parts[1]) return parts[1];
return undefined;
}

function resolveAgentPrimaryModelRef(cfg: unknown, agentId: string): string | undefined {
try {
const root = cfg as Record<string, unknown>;
Expand Down Expand Up @@ -1726,7 +1722,7 @@ const memoryLanceDBProPlugin = {

async function runRecallLifecycle(
results: Array<{ entry: { id: string; text: string; category: "preference" | "fact" | "decision" | "entity" | "other"; scope: string; importance: number; timestamp: number; metadata?: string } }>,
scopeFilter: string[],
scopeFilter?: string[],
): Promise<Map<string, string>> {
const now = Date.now();
type LifecycleEntry = {
Expand Down Expand Up @@ -1757,11 +1753,15 @@ const memoryLanceDBProPlugin = {
);

try {
const recentEntries = await store.list(scopeFilter, undefined, 100, 0);
for (const entry of recentEntries) {
if (!lifecycleEntries.has(entry.id)) {
lifecycleEntries.set(entry.id, entry);
if (scopeFilter !== undefined) {
const recentEntries = await store.list(scopeFilter, undefined, 100, 0);
for (const entry of recentEntries) {
if (!lifecycleEntries.has(entry.id)) {
lifecycleEntries.set(entry.id, entry);
}
}
} else {
api.logger.debug(`memory-lancedb-pro: skipping tier maintenance preload for bypass scope filter`);
}
} catch (err) {
api.logger.warn(`memory-lancedb-pro: tier maintenance preload failed: ${String(err)}`);
Expand Down Expand Up @@ -1875,17 +1875,40 @@ const memoryLanceDBProPlugin = {
return clipped;
};

const loadAgentReflectionSlices = async (agentId: string, scopeFilter: string[]) => {
const cacheKey = `${agentId}::${[...scopeFilter].sort().join(",")}`;
const loadAgentReflectionSlices = async (agentId: string, scopeFilter?: string[]) => {
const scopeKey = Array.isArray(scopeFilter)
? `scopes:${[...scopeFilter].sort().join(",")}`
: "<NO_SCOPE_FILTER>";
const cacheKey = `${agentId}::${scopeKey}`;
const cached = reflectionByAgentCache.get(cacheKey);
if (cached && Date.now() - cached.updatedAt < 15_000) return cached;

const entries = await store.list(scopeFilter, undefined, 120, 0);
const { invariants, derived } = loadAgentReflectionSlicesFromEntries({
// Prefer reflection-category rows to avoid full-table reads on bypass callers.
// Fall back to an uncategorized scan only when the category query produced no
// agent-owned reflection slices, preserving backward compatibility with mixed-schema stores.
let entries = await store.list(scopeFilter, "reflection", 240, 0);
let slices = loadAgentReflectionSlicesFromEntries({
entries,
agentId,
deriveMaxAgeMs: DEFAULT_REFLECTION_DERIVED_MAX_AGE_MS,
});
if (slices.invariants.length === 0 && slices.derived.length === 0) {
const legacyEntries = await store.list(scopeFilter, undefined, 240, 0);
entries = legacyEntries.filter((entry) => {
try {
const metadata = parseReflectionMetadata(entry.metadata);
return isReflectionMetadataType(metadata.type) && isOwnedByAgent(metadata, agentId);
} catch {
return false;
}
});
slices = loadAgentReflectionSlicesFromEntries({
entries,
agentId,
deriveMaxAgeMs: DEFAULT_REFLECTION_DERIVED_MAX_AGE_MS,
});
}
const { invariants, derived } = slices;
const next = { updatedAt: Date.now(), invariants, derived };
reflectionByAgentCache.set(cacheKey, next);
return next;
Expand Down Expand Up @@ -2028,7 +2051,7 @@ const memoryLanceDBProPlugin = {
try {
// Determine agent ID and accessible scopes
const agentId = resolveHookAgentId(ctx?.agentId, (event as any).sessionKey);
const accessibleScopes = scopeManager.getAccessibleScopes(agentId);
const accessibleScopes = resolveScopeFilter(scopeManager, agentId);

const results = filterUserMdExclusiveRecallResults(await retrieveWithRetry({
query: event.prompt,
Expand Down Expand Up @@ -2120,8 +2143,10 @@ const memoryLanceDBProPlugin = {
try {
// Determine agent ID and default scope
const agentId = resolveHookAgentId(ctx?.agentId, (event as any).sessionKey);
const accessibleScopes = scopeManager.getAccessibleScopes(agentId);
const defaultScope = scopeManager.getDefaultScope(agentId);
const accessibleScopes = resolveScopeFilter(scopeManager, agentId);
const defaultScope = isSystemBypassId(agentId)
? config.scopes?.default ?? "global"
: scopeManager.getDefaultScope(agentId);
const sessionKey = ctx?.sessionKey || (event as any).sessionKey || "unknown";

api.logger.debug(
Expand Down Expand Up @@ -2564,8 +2589,11 @@ const memoryLanceDBProPlugin = {
if (reflectionInjectMode !== "inheritance-only" && reflectionInjectMode !== "inheritance+derived") return;
try {
pruneReflectionSessionState();
const agentId = typeof ctx.agentId === "string" && ctx.agentId.trim() ? ctx.agentId.trim() : "main";
const scopes = scopeManager.getAccessibleScopes(agentId);
const agentId = resolveHookAgentId(
typeof ctx.agentId === "string" ? ctx.agentId : undefined,
sessionKey,
);
const scopes = resolveScopeFilter(scopeManager, agentId);
const slices = await loadAgentReflectionSlices(agentId, scopes);
if (slices.invariants.length === 0) return;
const body = slices.invariants.slice(0, 6).map((line, i) => `${i + 1}. ${line}`).join("\n");
Expand All @@ -2585,13 +2613,16 @@ const memoryLanceDBProPlugin = {
api.on("before_prompt_build", async (_event, ctx) => {
const sessionKey = typeof ctx.sessionKey === "string" ? ctx.sessionKey : "";
if (isInternalReflectionSessionKey(sessionKey)) return;
const agentId = typeof ctx.agentId === "string" && ctx.agentId.trim() ? ctx.agentId.trim() : "main";
const agentId = resolveHookAgentId(
typeof ctx.agentId === "string" ? ctx.agentId : undefined,
sessionKey,
);
pruneReflectionSessionState();

const blocks: string[] = [];
if (reflectionInjectMode === "inheritance+derived") {
try {
const scopes = scopeManager.getAccessibleScopes(agentId);
const scopes = resolveScopeFilter(scopeManager, agentId);
const derivedCache = sessionKey ? reflectionDerivedBySession.get(sessionKey) : null;
const derivedLines = derivedCache?.derived?.length
? derivedCache.derived
Expand Down Expand Up @@ -2712,7 +2743,9 @@ const memoryLanceDBProPlugin = {
const timeHms = timeIso.split(".")[0];
const timeCompact = timeIso.replace(/[:.]/g, "");
const reflectionRunAgentId = resolveReflectionRunAgentId(cfg, sourceAgentId);
const targetScope = scopeManager.getDefaultScope(sourceAgentId);
const targetScope = isSystemBypassId(sourceAgentId)
? config.scopes?.default ?? "global"
: scopeManager.getDefaultScope(sourceAgentId);
const toolErrorSignals = sessionKey
? (reflectionErrorStateBySession.get(sessionKey)?.entries ?? []).slice(-reflectionErrorReminderMaxEntries)
: [];
Expand Down Expand Up @@ -2926,7 +2959,9 @@ const memoryLanceDBProPlugin = {
(event.agentId as string) || (context.agentId as string) || undefined,
sessionKey || (context.sessionKey as string) || undefined,
);
const defaultScope = scopeManager.getDefaultScope(agentId);
const defaultScope = isSystemBypassId(agentId)
? config.scopes?.default ?? "global"
: scopeManager.getDefaultScope(agentId);
const workspaceDir = resolveWorkspaceDirFromContext(context);
const cfg = context.cfg;
const sessionEntry = (context.previousSessionEntry || context.sessionEntry || {}) as Record<string, unknown>;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
]
},
"scripts": {
"test": "node test/embedder-error-hints.test.mjs && node test/migrate-legacy-schema.test.mjs && node --test test/config-session-strategy-migration.test.mjs && node --test test/recall-text-cleanup.test.mjs && node test/update-consistency-lancedb.test.mjs && node test/cli-smoke.mjs && node test/functional-e2e.mjs && node test/retriever-rerank-regression.mjs && node test/smart-memory-lifecycle.mjs && node test/smart-extractor-branches.mjs && node test/plugin-manifest-regression.mjs && node --test test/sync-plugin-version.test.mjs && node test/smart-metadata-v2.mjs && node test/vector-search-cosine.test.mjs && node test/context-support-e2e.mjs && node test/temporal-facts.test.mjs && node test/memory-update-supersede.test.mjs && node test/memory-upgrader-diagnostics.test.mjs && node --test test/workflow-fork-guards.test.mjs",
"test": "node test/embedder-error-hints.test.mjs && node test/migrate-legacy-schema.test.mjs && node --test test/config-session-strategy-migration.test.mjs && node --test test/scope-access-undefined.test.mjs && node --test test/reflection-bypass-hook.test.mjs && node --test test/smart-extractor-scope-filter.test.mjs && node --test test/store-empty-scope-filter.test.mjs && node --test test/recall-text-cleanup.test.mjs && node test/update-consistency-lancedb.test.mjs && node test/cli-smoke.mjs && node test/functional-e2e.mjs && node test/retriever-rerank-regression.mjs && node test/smart-memory-lifecycle.mjs && node test/smart-extractor-branches.mjs && node test/plugin-manifest-regression.mjs && node --test test/sync-plugin-version.test.mjs && node test/smart-metadata-v2.mjs && node test/vector-search-cosine.test.mjs && node test/context-support-e2e.mjs && node test/temporal-facts.test.mjs && node test/memory-update-supersede.test.mjs && node test/memory-upgrader-diagnostics.test.mjs && node --test test/workflow-fork-guards.test.mjs",
"test:openclaw-host": "node test/openclaw-host-functional.mjs",
"version": "node scripts/sync-plugin-version.mjs openclaw.plugin.json package.json && git add openclaw.plugin.json"
},
Expand Down
Loading
Loading