memorix 1.2.1 → 1.2.2

package/src/memory/secret-filter.ts

@@ -1,79 +1,79 @@
-/**
- * Secret Filter
- *
- * Conservative credential detection and redaction for Memorix memory content.
- * Designed for low false-positive risk: only matches explicit credential
- * assignments (key=value / key: value), not generic discussion of auth concepts.
- *
- *   sanitizeCredentials()  — store-time: called inside storeObservation() before write
- *   redactCredentials()    — retrieval-time: called in format/output paths for legacy safety
- *   containsCredential()   — predicate used for testing and optional logging
- *
- * Both sanitize and redact share the same pattern logic. They are kept as
- * separate named exports so call-site semantics remain clear.
- */
-
-/**
- * Replaces the VALUE portion of matched credential patterns with [REDACTED].
- * The credential key name is preserved so context is not lost.
- *
- * Pattern categories:
- *   1. key=value / key: value forms — password, token, api_key, secret, etc.
- *      Requires a real value (6+ non-whitespace chars) to avoid matching
- *      discussion text like "password must be 8 chars".
- *   2. Bearer authorization header tokens (20+ chars)
- *   3. Structured token prefixes: GitHub (ghp_/ghs_/gho_), OpenAI (sk-), JWT (eyJ)
- */
-function applyRedaction(text: string): string {
-  if (!text) return text;
-  let out = text;
-
-  // key=value / key: "value" / key='value' — preserve key, redact value
-  out = out.replace(
-    /((?:password|passwd|pwd|secret|token|api[_-]?key|auth[_-]?key|access[_-]?key|private[_-]?key|client[_-]?secret)\s*[:=]\s*["']?)([^\s"',;\n]{6,})/gi,
-    '$1[REDACTED]',
-  );
-
-  // Bearer <token> — preserve "Bearer ", redact token
-  out = out.replace(
-    /(Bearer\s+)([A-Za-z0-9._\-/+]{20,})/g,
-    '$1[REDACTED]',
-  );
-
-  // GitHub tokens (ghp_, ghs_, gho_, github_pat_)
-  out = out.replace(/\b(?:ghp|ghs|gho|github_pat)_[A-Za-z0-9]{36,}\b/g, '[REDACTED]');
-
-  // OpenAI / similar keys (sk-...)
-  out = out.replace(/\bsk-[A-Za-z0-9T-]{20,}\b/g, '[REDACTED]');
-
-  // JWT tokens (base64url header eyJ...)
-  out = out.replace(/\beyJ[A-Za-z0-9._-]{40,}\b/g, '[REDACTED]');
-
-  return out;
-}
-
-/**
- * Store-time sanitization: strips credential values before any durable write.
- * Called inside storeObservation() / upsertObservation() so that every write
- * path (hooks, git-ingest, CLI, reasoning, compact-on-write) is covered.
- */
-export function sanitizeCredentials(text: string): string {
-  return applyRedaction(text);
-}
-
-/**
- * Retrieval-time redaction: masks credential values in display output.
- * Applied in all output formatters (detail, index table, timeline, session context)
- * as a safety net for legacy observations stored before sanitization was in place.
- */
-export function redactCredentials(text: string): string {
-  return applyRedaction(text);
-}
-
-/**
- * Returns true if the text contains an obvious credential pattern.
- * Used for testing and optional diagnostic logging.
- */
-export function containsCredential(text: string): boolean {
-  return applyRedaction(text) !== text;
-}
+/**
+ * Secret Filter
+ *
+ * Conservative credential detection and redaction for Memorix memory content.
+ * Designed for low false-positive risk: only matches explicit credential
+ * assignments (key=value / key: value), not generic discussion of auth concepts.
+ *
+ *   sanitizeCredentials()  — store-time: called inside storeObservation() before write
+ *   redactCredentials()    — retrieval-time: called in format/output paths for legacy safety
+ *   containsCredential()   — predicate used for testing and optional logging
+ *
+ * Both sanitize and redact share the same pattern logic. They are kept as
+ * separate named exports so call-site semantics remain clear.
+ */
+
+/**
+ * Replaces the VALUE portion of matched credential patterns with [REDACTED].
+ * The credential key name is preserved so context is not lost.
+ *
+ * Pattern categories:
+ *   1. key=value / key: value forms — password, token, api_key, secret, etc.
+ *      Requires a real value (6+ non-whitespace chars) to avoid matching
+ *      discussion text like "password must be 8 chars".
+ *   2. Bearer authorization header tokens (20+ chars)
+ *   3. Structured token prefixes: GitHub (ghp_/ghs_/gho_), OpenAI (sk-), JWT (eyJ)
+ */
+function applyRedaction(text: string): string {
+  if (!text) return text;
+  let out = text;
+
+  // key=value / key: "value" / key='value' — preserve key, redact value
+  out = out.replace(
+    /((?:password|passwd|pwd|secret|token|api[_-]?key|auth[_-]?key|access[_-]?key|private[_-]?key|client[_-]?secret)\s*[:=]\s*["']?)([^\s"',;\n]{6,})/gi,
+    '$1[REDACTED]',
+  );
+
+  // Bearer <token> — preserve "Bearer ", redact token
+  out = out.replace(
+    /(Bearer\s+)([A-Za-z0-9._\-/+]{20,})/g,
+    '$1[REDACTED]',
+  );
+
+  // GitHub tokens (ghp_, ghs_, gho_, github_pat_)
+  out = out.replace(/\b(?:ghp|ghs|gho|github_pat)_[A-Za-z0-9]{36,}\b/g, '[REDACTED]');
+
+  // OpenAI / similar keys (sk-...)
+  out = out.replace(/\bsk-[A-Za-z0-9T-]{20,}\b/g, '[REDACTED]');
+
+  // JWT tokens (base64url header eyJ...)
+  out = out.replace(/\beyJ[A-Za-z0-9._-]{40,}\b/g, '[REDACTED]');
+
+  return out;
+}
+
+/**
+ * Store-time sanitization: strips credential values before any durable write.
+ * Called inside storeObservation() / upsertObservation() so that every write
+ * path (hooks, git-ingest, CLI, reasoning, compact-on-write) is covered.
+ */
+export function sanitizeCredentials(text: string): string {
+  return applyRedaction(text);
+}
+
+/**
+ * Retrieval-time redaction: masks credential values in display output.
+ * Applied in all output formatters (detail, index table, timeline, session context)
+ * as a safety net for legacy observations stored before sanitization was in place.
+ */
+export function redactCredentials(text: string): string {
+  return applyRedaction(text);
+}
+
+/**
+ * Returns true if the text contains an obvious credential pattern.
+ * Used for testing and optional diagnostic logging.
+ */
+export function containsCredential(text: string): boolean {
+  return applyRedaction(text) !== text;
+}

package/src/memory/session.ts

@@ -12,6 +12,7 @@
  */
 
 import type { Observation, Session } from '../types.js';
+import { isEligibleForAutomaticDelivery } from './admission.js';
 import { classifyLayer } from './disclosure-policy.js';
 import { resolveAliases } from '../project/aliases.js';
 import { getObservationStore } from '../store/obs-store.js';
@@ -369,13 +370,15 @@ export async function getSessionContext(
 
   // L1: recent hook activity signals (titles only, most recent first)
   const l1HookObs = projectObs
-    .filter((obs) => classifyLayer(obs) === 'L1')
+    .filter((obs) => isEligibleForAutomaticDelivery(obs) && classifyLayer(obs) === 'L1')
     .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
     .slice(0, 3);
 
   // L3: git-ingest evidence count (pointer only, not injected)
   const l3GitCount = projectObs.filter((obs) => classifyLayer(obs) === 'L3').length;
-  const totalHookCount = projectObs.filter((obs) => classifyLayer(obs) === 'L1').length;
+  const totalHookCount = projectObs
+    .filter((obs) => isEligibleForAutomaticDelivery(obs) && classifyLayer(obs) === 'L1')
+    .length;
 
   // Active entities: unique entity names from top-scored L2 memories.
   // Surfaced in L1 Routing as next-hop search guidance — not working context.

package/src/memory/visibility.ts

@@ -0,0 +1,80 @@
+import type { ObservationReader, ObservationVisibility } from '../types.js';
+
+/** Minimal common shape shared by persisted observations and Orama documents. */
+export interface VisibilityRecord {
+  projectId: string;
+  visibility?: ObservationVisibility | string;
+  createdByAgentId?: string;
+  sharedWithAgentIds?: string[] | string;
+}
+
+/**
+ * Pre-control-plane records were intentionally project-shared. Preserve that
+ * behavior so an upgrade does not make a user's historical memory disappear.
+ */
+export function resolveObservationVisibility(record: Pick<VisibilityRecord, 'visibility'>): ObservationVisibility {
+  switch (record.visibility) {
+    case 'personal':
+    case 'team':
+    case 'project':
+      return record.visibility;
+    default:
+      return 'project';
+  }
+}
+
+function sharedAgentIds(record: VisibilityRecord): string[] {
+  if (Array.isArray(record.sharedWithAgentIds)) return record.sharedWithAgentIds;
+  if (typeof record.sharedWithAgentIds !== 'string' || !record.sharedWithAgentIds) return [];
+  try {
+    const parsed = JSON.parse(record.sharedWithAgentIds);
+    return Array.isArray(parsed) ? parsed.filter((id): id is string => typeof id === 'string') : [];
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * The policy is intentionally fail-closed for personal and team scopes. A
+ * missing actor never turns a private record into a project-wide result.
+ * `undefined` is reserved for trusted internal maintenance, not MCP delivery.
+ */
+export function canReadObservation(record: VisibilityRecord, reader?: ObservationReader): boolean {
+  if (!reader) return true;
+
+  const sameProject = reader.projectId === record.projectId;
+  const visibility = resolveObservationVisibility(record);
+  // An explicit global search may inspect project-visible facts across projects,
+  // but it never gains a team or personal scope without a bound project.
+  if (visibility === 'project') return !reader.projectId || sameProject;
+  if (!sameProject || !reader.agentId) return false;
+
+  if (visibility === 'team') return reader.isTeamMember === true;
+  return record.createdByAgentId === reader.agentId || sharedAgentIds(record).includes(reader.agentId);
+}
+
+/**
+ * Reading a targeted handoff does not grant the recipient permission to alter
+ * it. Project evidence is jointly maintainable; personal records stay owned by
+ * their creator; team records require an active team member.
+ */
+export function canManageObservation(record: VisibilityRecord, reader?: ObservationReader): boolean {
+  if (!reader) return true;
+  if (!reader.projectId || reader.projectId !== record.projectId) return false;
+
+  switch (resolveObservationVisibility(record)) {
+    case 'project':
+      return true;
+    case 'team':
+      return reader.isTeamMember === true;
+    case 'personal':
+      return Boolean(reader.agentId && record.createdByAgentId === reader.agentId);
+  }
+}
+
+export function filterReadableObservations<T extends VisibilityRecord>(
+  observations: readonly T[],
+  reader?: ObservationReader,
+): T[] {
+  return reader ? observations.filter((observation) => canReadObservation(observation, reader)) : [...observations];
+}

package/src/multimodal/image-loader.ts

@@ -1,143 +1,143 @@
-/**
- * Image Loader — Vision LLM Integration
- *
- * Analyzes images via OpenAI Vision API (or compatible),
- * extracting descriptions, tags, and entities.
- */
-
-import { getLLMApiKey, getLLMBaseUrl, getLLMModel } from '../config.js';
-import { isLLMEnabled, getLLMConfig } from '../llm/provider.js';
-
-// Providers that use the OpenAI-compatible /chat/completions Vision endpoint
-const OPENAI_COMPATIBLE_PROVIDERS = new Set(['openai', 'openrouter', 'custom']);
-
-// ── Types ────────────────────────────────────────────────────────────
-
-export interface ImageInput {
-  /** Base64-encoded image data */
-  base64: string;
-  /** Image MIME type (default: image/png) */
-  mimeType?: string;
-  /** Original filename */
-  filename?: string;
-  /** Custom analysis prompt */
-  prompt?: string;
-}
-
-export interface ImageAnalysisResult {
-  /** Natural language description of the image */
-  description: string;
-  /** Relevant tags/categories */
-  tags: string[];
-  /** Key entities/concepts depicted */
-  entities: string[];
-}
-
-// ── Internal Vision LLM Call ─────────────────────────────────────────
-
-async function callVisionLLM(
-  systemPrompt: string,
-  imageBase64: string,
-  mimeType: string,
-): Promise<string> {
-  const apiKey = getLLMApiKey();
-  if (!apiKey) {
-    throw new Error('No LLM API key configured for image analysis.');
-  }
-
-  let baseUrl = getLLMBaseUrl('https://api.openai.com/v1').replace(/\/+$/, '');
-  if (!baseUrl.endsWith('/v1')) baseUrl += '/v1';
-  const model = getLLMModel('gpt-4o');
-
-  const response = await fetch(`${baseUrl}/chat/completions`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      'Authorization': `Bearer ${apiKey}`,
-    },
-    body: JSON.stringify({
-      model,
-      messages: [{
-        role: 'user',
-        content: [
-          { type: 'text', text: systemPrompt },
-          {
-            type: 'image_url',
-            image_url: { url: `data:${mimeType};base64,${imageBase64}` },
-          },
-        ],
-      }],
-      temperature: 0.1,
-      max_tokens: 1024,
-    }),
-    signal: AbortSignal.timeout(30_000),
-  });
-
-  if (!response.ok) {
-    const errorText = await response.text().catch(() => 'unknown error');
-    throw new Error(`Vision LLM error (${response.status}): ${errorText}`);
-  }
-
-  const data = await response.json() as {
-    choices: Array<{ message: { content: string } }>;
-  };
-
-  return data.choices[0]?.message?.content ?? '';
-}
-
-// ── Public API ───────────────────────────────────────────────────────
-
-const DEFAULT_PROMPT =
-  'Analyze this image. Return ONLY a JSON object with this exact format: ' +
-  '{"description": "detailed description", "tags": ["tag1", "tag2"], "entities": ["entity1", "entity2"]}';
-
-/**
- * Analyze an image using Vision LLM.
- *
- * @throws Error if LLM not configured.
- */
-export async function analyzeImage(input: ImageInput): Promise<ImageAnalysisResult> {
-  if (!isLLMEnabled()) {
-    throw new Error(
-      'LLM not configured for image analysis. ' +
-      'Set MEMORIX_LLM_API_KEY or OPENAI_API_KEY.',
-    );
-  }
-
-  const config = getLLMConfig()!;
-  if (!OPENAI_COMPATIBLE_PROVIDERS.has(config.provider)) {
-    throw new Error(
-      `Image analysis requires an OpenAI-compatible provider (openai, openrouter, or custom). ` +
-      `Current provider "${config.provider}" uses a different API shape. ` +
-      `Set MEMORIX_LLM_PROVIDER=openai or configure an OpenAI-compatible base URL.`,
-    );
-  }
-
-  const mimeType = input.mimeType ?? 'image/png';
-  const prompt = input.prompt ?? DEFAULT_PROMPT;
-
-  const response = await callVisionLLM(prompt, input.base64, mimeType);
-
-  // Try to parse structured JSON response
-  try {
-    // Extract JSON from response (may be wrapped in markdown code block)
-    const jsonMatch = response.match(/\{[\s\S]*\}/);
-    if (jsonMatch) {
-      const parsed = JSON.parse(jsonMatch[0]);
-      return {
-        description: parsed.description ?? response,
-        tags: Array.isArray(parsed.tags) ? parsed.tags : [],
-        entities: Array.isArray(parsed.entities) ? parsed.entities : [],
-      };
-    }
-  } catch {
-    // JSON parse failed — fall through to text extraction
-  }
-
-  // Fallback: treat entire response as description
-  return {
-    description: response,
-    tags: [],
-    entities: [],
-  };
-}
+/**
+ * Image Loader — Vision LLM Integration
+ *
+ * Analyzes images via OpenAI Vision API (or compatible),
+ * extracting descriptions, tags, and entities.
+ */
+
+import { getLLMApiKey, getLLMBaseUrl, getLLMModel } from '../config.js';
+import { isLLMEnabled, getLLMConfig } from '../llm/provider.js';
+
+// Providers that use the OpenAI-compatible /chat/completions Vision endpoint
+const OPENAI_COMPATIBLE_PROVIDERS = new Set(['openai', 'openrouter', 'custom']);
+
+// ── Types ────────────────────────────────────────────────────────────
+
+export interface ImageInput {
+  /** Base64-encoded image data */
+  base64: string;
+  /** Image MIME type (default: image/png) */
+  mimeType?: string;
+  /** Original filename */
+  filename?: string;
+  /** Custom analysis prompt */
+  prompt?: string;
+}
+
+export interface ImageAnalysisResult {
+  /** Natural language description of the image */
+  description: string;
+  /** Relevant tags/categories */
+  tags: string[];
+  /** Key entities/concepts depicted */
+  entities: string[];
+}
+
+// ── Internal Vision LLM Call ─────────────────────────────────────────
+
+async function callVisionLLM(
+  systemPrompt: string,
+  imageBase64: string,
+  mimeType: string,
+): Promise<string> {
+  const apiKey = getLLMApiKey();
+  if (!apiKey) {
+    throw new Error('No LLM API key configured for image analysis.');
+  }
+
+  let baseUrl = getLLMBaseUrl('https://api.openai.com/v1').replace(/\/+$/, '');
+  if (!baseUrl.endsWith('/v1')) baseUrl += '/v1';
+  const model = getLLMModel('gpt-4o');
+
+  const response = await fetch(`${baseUrl}/chat/completions`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': `Bearer ${apiKey}`,
+    },
+    body: JSON.stringify({
+      model,
+      messages: [{
+        role: 'user',
+        content: [
+          { type: 'text', text: systemPrompt },
+          {
+            type: 'image_url',
+            image_url: { url: `data:${mimeType};base64,${imageBase64}` },
+          },
+        ],
+      }],
+      temperature: 0.1,
+      max_tokens: 1024,
+    }),
+    signal: AbortSignal.timeout(30_000),
+  });
+
+  if (!response.ok) {
+    const errorText = await response.text().catch(() => 'unknown error');
+    throw new Error(`Vision LLM error (${response.status}): ${errorText}`);
+  }
+
+  const data = await response.json() as {
+    choices: Array<{ message: { content: string } }>;
+  };
+
+  return data.choices[0]?.message?.content ?? '';
+}
+
+// ── Public API ───────────────────────────────────────────────────────
+
+const DEFAULT_PROMPT =
+  'Analyze this image. Return ONLY a JSON object with this exact format: ' +
+  '{"description": "detailed description", "tags": ["tag1", "tag2"], "entities": ["entity1", "entity2"]}';
+
+/**
+ * Analyze an image using Vision LLM.
+ *
+ * @throws Error if LLM not configured.
+ */
+export async function analyzeImage(input: ImageInput): Promise<ImageAnalysisResult> {
+  if (!isLLMEnabled()) {
+    throw new Error(
+      'LLM not configured for image analysis. ' +
+      'Set MEMORIX_LLM_API_KEY or OPENAI_API_KEY.',
+    );
+  }
+
+  const config = getLLMConfig()!;
+  if (!OPENAI_COMPATIBLE_PROVIDERS.has(config.provider)) {
+    throw new Error(
+      `Image analysis requires an OpenAI-compatible provider (openai, openrouter, or custom). ` +
+      `Current provider "${config.provider}" uses a different API shape. ` +
+      `Set MEMORIX_LLM_PROVIDER=openai or configure an OpenAI-compatible base URL.`,
+    );
+  }
+
+  const mimeType = input.mimeType ?? 'image/png';
+  const prompt = input.prompt ?? DEFAULT_PROMPT;
+
+  const response = await callVisionLLM(prompt, input.base64, mimeType);
+
+  // Try to parse structured JSON response
+  try {
+    // Extract JSON from response (may be wrapped in markdown code block)
+    const jsonMatch = response.match(/\{[\s\S]*\}/);
+    if (jsonMatch) {
+      const parsed = JSON.parse(jsonMatch[0]);
+      return {
+        description: parsed.description ?? response,
+        tags: Array.isArray(parsed.tags) ? parsed.tags : [],
+        entities: Array.isArray(parsed.entities) ? parsed.entities : [],
+      };
+    }
+  } catch {
+    // JSON parse failed — fall through to text extraction
+  }
+
+  // Fallback: treat entire response as description
+  return {
+    description: response,
+    tags: [],
+    entities: [],
+  };
+}