engrm 0.4.37 → 0.4.39

package/dist/server.js

@@ -19,6 +19,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 // src/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 
 // node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -13552,6 +13553,9 @@ function date4(params) {
 
 // node_modules/zod/v4/classic/external.js
 config(en_default());
+// src/server.ts
+import { createServer } from "node:http";
+
 // src/config.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, hostname as hostname3, networkInterfaces } from "node:os";
@@ -13626,6 +13630,16 @@ function createDefaultConfig() {
     },
     transcript_analysis: {
       enabled: false
+    },
+    http: {
+      enabled: false,
+      port: 3767,
+      bearer_tokens: []
+    },
+    fleet: {
+      project_name: "shared-experience",
+      namespace: "",
+      api_key: ""
     }
   };
 }
@@ -13687,6 +13701,16 @@ function loadConfig() {
     },
     transcript_analysis: {
       enabled: asBool(config2["transcript_analysis"]?.["enabled"], defaults.transcript_analysis.enabled)
+    },
+    http: {
+      enabled: asBool(config2["http"]?.["enabled"], defaults.http.enabled),
+      port: asNumber(config2["http"]?.["port"], defaults.http.port),
+      bearer_tokens: asStringArray(config2["http"]?.["bearer_tokens"], defaults.http.bearer_tokens)
+    },
+    fleet: {
+      project_name: asString(config2["fleet"]?.["project_name"], defaults.fleet.project_name),
+      namespace: asString(config2["fleet"]?.["namespace"], defaults.fleet.namespace),
+      api_key: asString(config2["fleet"]?.["api_key"], defaults.fleet.api_key)
     }
   };
 }
@@ -15506,6 +15530,12 @@ function containsSecrets(text, customPatterns = []) {
   }
   return false;
 }
+var FLEET_HOSTNAME_PATTERN = /\b(?=.{1,253}\b)(?!-)(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,63}\b/gi;
+var FLEET_IP_PATTERN = /\b(?:\d{1,3}\.){3}\d{1,3}\b/g;
+var FLEET_MAC_PATTERN = /\b(?:[0-9a-f]{2}[:-]){5}[0-9a-f]{2}\b/gi;
+function scrubFleetIdentifiers(text) {
+  return text.replace(FLEET_MAC_PATTERN, "[REDACTED_MAC]").replace(FLEET_IP_PATTERN, "[REDACTED_IP]").replace(FLEET_HOSTNAME_PATTERN, "[REDACTED_HOSTNAME]");
+}
 
 // src/capture/quality.ts
 var QUALITY_THRESHOLD = 0.1;
@@ -16093,6 +16123,35 @@ function narrativesConflict(narrative1, narrative2) {
   return null;
 }
 
+// src/sync/targets.ts
+function isFleetProjectName(projectName, config2) {
+  const fleetProjectName = config2.fleet?.project_name ?? "shared-experience";
+  if (!projectName || !fleetProjectName)
+    return false;
+  return projectName.trim().toLowerCase() === fleetProjectName.trim().toLowerCase();
+}
+function hasFleetTarget(config2) {
+  return Boolean(config2.fleet?.namespace?.trim() && config2.fleet?.api_key?.trim() && (config2.fleet?.project_name ?? "shared-experience").trim());
+}
+function resolveSyncTarget(config2, projectName) {
+  if (isFleetProjectName(projectName, config2) && hasFleetTarget(config2)) {
+    return {
+      key: `fleet:${config2.fleet.namespace}`,
+      apiKey: config2.fleet.api_key,
+      namespace: config2.fleet.namespace,
+      siteId: config2.site_id,
+      isFleet: true
+    };
+  }
+  return {
+    key: `default:${config2.namespace}`,
+    apiKey: config2.candengo_api_key,
+    namespace: config2.namespace,
+    siteId: config2.site_id,
+    isFleet: false
+  };
+}
+
 // src/tools/save.ts
 var VALID_TYPES = [
   "bugfix",
@@ -16141,7 +16200,8 @@ async function saveObservation(db, config2, input) {
   const factsJson = structuredFacts.length > 0 ? config2.scrubbing.enabled ? scrubSecrets(JSON.stringify(structuredFacts), customPatterns) : JSON.stringify(structuredFacts) : null;
   const filesReadJson = filesRead ? JSON.stringify(filesRead) : null;
   const filesModifiedJson = filesModified ? JSON.stringify(filesModified) : null;
-  let sensitivity = input.sensitivity ?? config2.scrubbing.default_sensitivity;
+  const fleetProject = isFleetProjectName(project.name, config2);
+  let sensitivity = input.sensitivity ?? (fleetProject ? "shared" : config2.scrubbing.default_sensitivity);
   if (config2.scrubbing.enabled && containsSecrets([input.title, input.narrative, JSON.stringify(input.facts)].filter(Boolean).join(" "), customPatterns)) {
     if (sensitivity === "shared") {
       sensitivity = "personal";
@@ -16329,7 +16389,14 @@ async function searchObservations(db, input) {
     }
   }
   const safeQuery = sanitizeFtsQuery(query);
-  const ftsResults = safeQuery ? db.searchFts(safeQuery, projectId, undefined, limit * 2, input.user_id) : [];
+  let ftsResults = [];
+  if (safeQuery) {
+    try {
+      ftsResults = db.searchFts(safeQuery, projectId, undefined, limit * 2, input.user_id);
+    } catch {
+      ftsResults = [];
+    }
+  }
   let vecResults = [];
   const queryEmbedding = await embedText(query);
   if (queryEmbedding && db.vecAvailable) {
@@ -18482,20 +18549,21 @@ function listRecallItems(db, input) {
       source_agent: null
     }))
   ];
-  const deduped = dedupeRecallItems(items).sort((a, b) => compareRecallItems(a, b, input.current_device_id)).slice(0, limit);
+  const deduped = dedupeRecallItems(items).sort((a, b) => compareRecallItems(a, b, input.current_device_id, input.preferred_agent)).slice(0, limit);
   return {
     project: projectName,
     continuity_mode: deduped.some((item) => item.kind === "handoff" || item.kind === "thread") ? "direct" : "indexed",
     items: deduped
   };
 }
-function compareRecallItems(a, b, currentDeviceId) {
+function compareRecallItems(a, b, currentDeviceId, preferredAgent) {
   const priority = (item) => {
     const freshness = item.freshness === "live" ? 0 : item.freshness === "recent" ? 1 : 2;
     const kind = item.kind === "handoff" ? 0 : item.kind === "thread" ? 1 : item.kind === "chat" ? 2 : 3;
     const remoteBoost = currentDeviceId && item.source_device_id && item.source_device_id !== currentDeviceId ? -0.5 : 0;
+    const preferredAgentBoost = preferredAgent && item.source_agent === preferredAgent ? -0.75 : 0;
     const draftPenalty = item.kind === "handoff" && /draft/i.test(item.title) ? 0.25 : 0;
-    return freshness * 10 + kind + remoteBoost + draftPenalty;
+    return freshness * 10 + kind + remoteBoost + preferredAgentBoost + draftPenalty;
   };
   const priorityDiff = priority(a) - priority(b);
   if (priorityDiff !== 0)
@@ -18657,18 +18725,20 @@ function getProjectMemoryIndex(db, input) {
     user_id: input.user_id,
     limit: 20
   });
+  const activeAgents = collectActiveAgents(recentSessions);
+  const preferredAgent = pickPreferredAgent(activeAgents, recentSessions[0]?.agent ?? null);
   const recentChatCount = recentChat.messages.length;
   const recallIndex = listRecallItems(db, {
     cwd,
     project_scoped: true,
     user_id: input.user_id,
+    preferred_agent: preferredAgent,
     limit: 10
   });
   const latestSession = recentSessions[0] ?? null;
   const latestSummary = latestSession ? db.getSessionSummary(latestSession.session_id) : null;
   const recentOutcomes = observations.filter((obs) => ["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type)).map((obs) => obs.title.trim()).filter((title) => title.length > 0 && !looksLikeFileOperationTitle4(title)).slice(0, 8);
   const captureSummary = summarizeCaptureState(recentSessions);
-  const activeAgents = collectActiveAgents(recentSessions);
   const topTypes = Object.entries(counts).map(([type, count]) => ({ type, count })).sort((a, b) => b.count - a.count || a.type.localeCompare(b.type)).slice(0, 5);
   const suggestedTools = buildSuggestedTools(recentSessions, recentRequestsCount, recentToolsCount, observations.length, recentChatCount, recentChat.coverage_state, activeAgents);
   const estimatedReadTokens = estimateTokens([
@@ -18682,7 +18752,7 @@ function getProjectMemoryIndex(db, input) {
 `));
   const continuityState = classifyContinuityState(recentRequestsCount, recentToolsCount, recentHandoffsCount.length, recentChatCount, recentSessions, recentOutcomes.length);
   const sourceTimestamp = pickResumeSourceTimestamp(latestSession, recentChat.messages);
-  const bestRecallItem = pickBestRecallItem(recallIndex.items);
+  const bestRecallItem = pickBestRecallItem(recallIndex.items, preferredAgent);
   return {
     project: project.name,
     canonical_id: project.canonical_id,
@@ -18702,7 +18772,7 @@ function getProjectMemoryIndex(db, input) {
     best_recall_key: bestRecallItem?.key ?? null,
     best_recall_title: bestRecallItem?.title ?? null,
     best_recall_kind: bestRecallItem?.kind ?? null,
-    best_agent_resume_agent: activeAgents.length > 1 ? latestSession?.agent ?? null : null,
+    best_agent_resume_agent: activeAgents.length > 1 ? preferredAgent : null,
     resume_freshness: classifyResumeFreshness(sourceTimestamp),
     resume_source_session_id: latestSession?.session_id ?? null,
     resume_source_device_id: latestSession?.device_id ?? null,
@@ -18733,7 +18803,12 @@ function getProjectMemoryIndex(db, input) {
     suggested_tools: suggestedTools
   };
 }
-function pickBestRecallItem(items) {
+function pickBestRecallItem(items, preferredAgent) {
+  if (preferredAgent) {
+    const preferred = items.find((item) => item.source_agent === preferredAgent && item.kind !== "memory") ?? items.find((item) => item.source_agent === preferredAgent);
+    if (preferred)
+      return preferred;
+  }
   return items.find((item) => item.kind !== "memory") ?? items[0] ?? null;
 }
 function pickResumeSourceTimestamp(latestSession, messages) {
@@ -18821,6 +18896,11 @@ function summarizeCaptureState(sessions) {
 function collectActiveAgents(sessions) {
   return Array.from(new Set(sessions.map((session) => session.agent?.trim()).filter((agent) => Boolean(agent) && !agent.startsWith("engrm-")))).sort();
 }
+function pickPreferredAgent(activeAgents, latestAgent) {
+  if (activeAgents.includes("claude-code"))
+    return "claude-code";
+  return latestAgent && activeAgents.includes(latestAgent) ? latestAgent : activeAgents[0] ?? null;
+}
 function buildSuggestedTools(sessions, requestCount, toolCount, observationCount, recentChatCount, chatCoverageState, activeAgents) {
   const suggested = [];
   if (sessions.length > 0) {
@@ -18905,6 +18985,7 @@ function getMemoryConsole(db, input) {
     cwd,
     project_scoped: projectScoped,
     user_id: input.user_id,
+    preferred_agent: pickPreferredAgent(projectIndex?.active_agents ?? collectActiveAgents(sessions), sessions[0]?.agent ?? null) ?? undefined,
     limit: 10
   });
   const projectIndex = projectScoped ? getProjectMemoryIndex(db, {
@@ -18929,10 +19010,10 @@ function getMemoryConsole(db, input) {
       title: item.title,
       source_agent: item.source_agent
     })),
-    best_recall_key: projectIndex?.best_recall_key ?? (recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null)?.key ?? null,
-    best_recall_title: projectIndex?.best_recall_title ?? (recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null)?.title ?? null,
-    best_recall_kind: projectIndex?.best_recall_kind ?? (recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null)?.kind ?? null,
-    best_agent_resume_agent: projectIndex?.best_agent_resume_agent ?? (activeAgents.length > 1 ? sessions[0]?.agent ?? null : null),
+    best_recall_key: projectIndex?.best_recall_key ?? pickBestRecallItem2(recallIndex.items, activeAgents, sessions[0]?.agent ?? null)?.key ?? null,
+    best_recall_title: projectIndex?.best_recall_title ?? pickBestRecallItem2(recallIndex.items, activeAgents, sessions[0]?.agent ?? null)?.title ?? null,
+    best_recall_kind: projectIndex?.best_recall_kind ?? pickBestRecallItem2(recallIndex.items, activeAgents, sessions[0]?.agent ?? null)?.kind ?? null,
+    best_agent_resume_agent: projectIndex?.best_agent_resume_agent ?? (activeAgents.length > 1 ? pickPreferredAgent(activeAgents, sessions[0]?.agent ?? null) : null),
     resume_freshness: projectIndex?.resume_freshness ?? "stale",
     resume_source_session_id: projectIndex?.resume_source_session_id ?? sessions[0]?.session_id ?? null,
     resume_source_device_id: projectIndex?.resume_source_device_id ?? sessions[0]?.device_id ?? null,
@@ -18962,6 +19043,15 @@ function getMemoryConsole(db, input) {
     suggested_tools: projectIndex?.suggested_tools ?? buildFallbackSuggestedTools(sessions.length, requests.length, tools.length, observations.length, recentHandoffs.length, recentChat.messages.length, recentChat.coverage_state, activeAgents.length)
   };
 }
+function pickBestRecallItem2(items, activeAgents, latestAgent) {
+  const preferredAgent = pickPreferredAgent(activeAgents, latestAgent);
+  if (preferredAgent) {
+    const preferred = items.find((item) => item.source_agent === preferredAgent && item.kind !== "memory") ?? items.find((item) => item.source_agent === preferredAgent);
+    if (preferred)
+      return preferred;
+  }
+  return items.find((item) => item.kind !== "memory") ?? items[0] ?? null;
+}
 function collectProvenanceTypeMix(observations) {
   const grouped = new Map;
   for (const observation of observations) {
@@ -19387,14 +19477,20 @@ function getCaptureStatus(db, input = {}) {
   const claudeSettings = join3(home, ".claude", "settings.json");
   const codexConfig = join3(home, ".codex", "config.toml");
   const codexHooks = join3(home, ".codex", "hooks.json");
+  const opencodeConfig = join3(home, ".config", "opencode", "opencode.json");
+  const opencodePlugin = join3(home, ".config", "opencode", "plugins", "engrm.js");
+  const config2 = configExists() ? loadConfig() : null;
   const claudeJsonContent = existsSync3(claudeJson) ? readFileSync3(claudeJson, "utf-8") : "";
   const claudeSettingsContent = existsSync3(claudeSettings) ? readFileSync3(claudeSettings, "utf-8") : "";
   const codexConfigContent = existsSync3(codexConfig) ? readFileSync3(codexConfig, "utf-8") : "";
   const codexHooksContent = existsSync3(codexHooks) ? readFileSync3(codexHooks, "utf-8") : "";
+  const opencodeConfigContent = existsSync3(opencodeConfig) ? readFileSync3(opencodeConfig, "utf-8") : "";
   const claudeMcpRegistered = claudeJsonContent.includes('"engrm"');
   const claudeHooksRegistered = claudeSettingsContent.includes("engrm") || claudeSettingsContent.includes("session-start") || claudeSettingsContent.includes("user-prompt-submit");
   const codexMcpRegistered = codexConfigContent.includes("[mcp_servers.engrm]") || codexConfigContent.includes(`[mcp_servers.${LEGACY_CODEX_SERVER_NAME}]`);
   const codexHooksRegistered = codexHooksContent.includes('"SessionStart"') && codexHooksContent.includes('"Stop"');
+  const opencodeMcpRegistered = opencodeConfigContent.includes('"engrm"') && opencodeConfigContent.includes('"type"') && opencodeConfigContent.includes('"local"');
+  const opencodePluginRegistered = existsSync3(opencodePlugin);
   let claudeHookCount = 0;
   let claudeSessionStartHook = false;
   let claudeUserPromptHook = false;
@@ -19467,6 +19563,11 @@ function getCaptureStatus(db, input = {}) {
   return {
     schema_version: schemaVersion,
     schema_current: schemaVersion >= LATEST_SCHEMA_VERSION,
+    http_enabled: Boolean(config2?.http?.enabled || process.env.ENGRM_HTTP_PORT),
+    http_port: config2?.http?.port ?? (process.env.ENGRM_HTTP_PORT ? Number(process.env.ENGRM_HTTP_PORT) : null),
+    http_bearer_token_count: config2?.http?.bearer_tokens?.length ?? 0,
+    fleet_project_name: config2?.fleet?.project_name ?? null,
+    fleet_configured: Boolean(config2?.fleet?.namespace && config2?.fleet?.api_key),
     claude_mcp_registered: claudeMcpRegistered,
     claude_hooks_registered: claudeHooksRegistered,
     claude_hook_count: claudeHookCount,
@@ -19479,6 +19580,8 @@ function getCaptureStatus(db, input = {}) {
     codex_session_start_hook: codexSessionStartHook,
     codex_stop_hook: codexStopHook,
     codex_raw_chronology_supported: false,
+    opencode_mcp_registered: opencodeMcpRegistered,
+    opencode_plugin_registered: opencodePluginRegistered,
     recent_user_prompts: recentUserPrompts,
     recent_tool_events: recentToolEvents,
     recent_sessions_with_raw_capture: recentSessionsWithRawCapture,
@@ -20059,6 +20162,7 @@ function getSessionContext(db, input) {
     project_scoped: true,
     user_id: input.user_id,
     current_device_id: input.current_device_id,
+    preferred_agent: pickPreferredAgent(collectActiveAgents(context.recentSessions ?? []), context.recentSessions?.[0]?.agent ?? null) ?? undefined,
     limit: 10
   });
   const latestSession = context.recentSessions?.[0] ?? null;
@@ -20068,8 +20172,9 @@ function getSessionContext(db, input) {
   const continuityState = classifyContinuityState(recentRequests, recentTools, recentHandoffs, recentChatMessages, context.recentSessions ?? [], (context.recentOutcomes ?? []).length);
   const latestChatEpoch = recentChat.messages.length > 0 ? recentChat.messages[recentChat.messages.length - 1]?.created_at_epoch ?? null : null;
   const resumeTimestamp = latestChatEpoch ?? latestSession?.completed_at_epoch ?? latestSession?.started_at_epoch ?? null;
-  const bestRecallItem = recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null;
   const activeAgents = collectActiveAgents(context.recentSessions ?? []);
+  const preferredAgent = pickPreferredAgent(activeAgents, latestSession?.agent ?? null);
+  const bestRecallItem = preferredAgent ? recallIndex.items.find((item) => item.source_agent === preferredAgent && item.kind !== "memory") ?? recallIndex.items.find((item) => item.source_agent === preferredAgent) ?? recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null : recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null;
   return {
     project_name: context.project_name,
     canonical_id: context.canonical_id,
@@ -20089,7 +20194,7 @@ function getSessionContext(db, input) {
     best_recall_key: bestRecallItem?.key ?? null,
     best_recall_title: bestRecallItem?.title ?? null,
     best_recall_kind: bestRecallItem?.kind ?? null,
-    best_agent_resume_agent: activeAgents.length > 1 ? latestSession?.agent ?? null : null,
+    best_agent_resume_agent: activeAgents.length > 1 ? preferredAgent : null,
     resume_freshness: classifyResumeFreshness(resumeTimestamp),
     resume_source_session_id: latestSession?.session_id ?? null,
     resume_source_device_id: latestSession?.device_id ?? null,
@@ -20753,8 +20858,10 @@ async function resumeThread(db, config2, input = {}) {
   const detected = detectProject(cwd);
   const project = db.getProjectByCanonicalId(detected.canonical_id);
   let snapshot = await buildResumeSnapshot(db, cwd, input.user_id, input.current_device_id, limit);
-  if (input.agent) {
-    snapshot = filterResumeSnapshotByAgent(snapshot, input.agent, input.current_device_id);
+  const activeAgents = Array.from(new Set(snapshot.recentSessions.map((session) => session.agent).filter((agent) => Boolean(agent))));
+  const effectiveAgent = input.agent ?? pickPreferredAgent(activeAgents, snapshot.recentSessions[0]?.agent ?? null) ?? undefined;
+  if (effectiveAgent) {
+    snapshot = filterResumeSnapshotByAgent(snapshot, effectiveAgent, input.current_device_id);
   }
   let repairResult = null;
   const shouldRepair = repairIfNeeded && snapshot.recentChat.coverage_state !== "transcript-backed" && (snapshot.recentChat.messages.length > 0 || snapshot.recentSessions.length > 0 || snapshot.context?.continuity_state !== "cold");
@@ -20766,13 +20873,13 @@ async function resumeThread(db, config2, input = {}) {
     });
     if (repairResult.imported_chat_messages > 0) {
       snapshot = await buildResumeSnapshot(db, cwd, input.user_id, input.current_device_id, limit);
-      if (input.agent) {
-        snapshot = filterResumeSnapshotByAgent(snapshot, input.agent, input.current_device_id);
+      if (effectiveAgent) {
+        snapshot = filterResumeSnapshotByAgent(snapshot, effectiveAgent, input.current_device_id);
       }
     }
   }
   const { context, handoff, recentChat, recentSessions, recall } = snapshot;
-  const bestRecallItem = pickBestRecallItem2(snapshot.recallIndex.items);
+  const bestRecallItem = pickBestRecallItem3(snapshot.recallIndex.items, effectiveAgent);
   const latestSession = recentSessions[0] ?? null;
   const latestSummary = latestSession ? db.getSessionSummary(latestSession.session_id) : null;
   const inferredRequest = latestSession?.request?.trim() || null;
@@ -20809,7 +20916,7 @@ async function resumeThread(db, config2, input = {}) {
   ])).slice(0, 4);
   return {
     project_name: project?.name ?? context?.project_name ?? null,
-    target_agent: input.agent ?? null,
+    target_agent: effectiveAgent ?? null,
     continuity_state: context?.continuity_state ?? "cold",
     continuity_summary: context?.continuity_summary ?? "No fresh repo-local continuity yet; older memory should be treated cautiously.",
     resume_freshness: classifyResumeFreshness2(sourceTimestamp),
@@ -20929,7 +21036,12 @@ function filterResumeSnapshotByAgent(snapshot, agent, currentDeviceId) {
     recallIndex
   };
 }
-function pickBestRecallItem2(items) {
+function pickBestRecallItem3(items, preferredAgent) {
+  if (preferredAgent) {
+    const preferred = items.find((item) => item.source_agent === preferredAgent && item.kind !== "memory") ?? items.find((item) => item.source_agent === preferredAgent);
+    if (preferred)
+      return preferred;
+  }
   return items.find((item) => item.kind !== "memory") ?? items[0] ?? null;
 }
 function compareRecallCandidates(epochA, epochB, deviceA, deviceB, currentDeviceId) {
@@ -21466,16 +21578,16 @@ class VectorClient {
   apiKey;
   siteId;
   namespace;
-  constructor(config2) {
+  constructor(config2, overrides = {}) {
     const baseUrl = getBaseUrl(config2);
-    const apiKey = getApiKey(config2);
+    const apiKey = overrides.apiKey ?? getApiKey(config2);
     if (!baseUrl || !apiKey) {
       throw new Error("VectorClient requires candengo_url and candengo_api_key");
     }
     this.baseUrl = baseUrl.replace(/\/$/, "");
     this.apiKey = apiKey;
-    this.siteId = config2.site_id;
-    this.namespace = config2.namespace;
+    this.siteId = overrides.siteId ?? config2.site_id;
+    this.namespace = overrides.namespace ?? config2.namespace;
   }
   static isConfigured(config2) {
     return getApiKey(config2) !== null && getBaseUrl(config2) !== null;
@@ -21641,10 +21753,10 @@ function parseJsonArray5(value) {
 }
 
 // src/sync/push.ts
-function buildChatVectorDocument(chat, config2, project) {
+function buildChatVectorDocument(chat, config2, project, target = resolveSyncTarget(config2, project.name)) {
   return {
-    site_id: config2.site_id,
-    namespace: config2.namespace,
+    site_id: target.siteId,
+    namespace: target.namespace,
     source_type: "chat",
     source_id: buildSourceId(config2, chat.id, "chat"),
     content: chat.content,
@@ -21665,7 +21777,7 @@ function buildChatVectorDocument(chat, config2, project) {
     }
   };
 }
-function buildVectorDocument(obs, config2, project) {
+function buildVectorDocument(obs, config2, project, target = resolveSyncTarget(config2, project.name)) {
   const parts = [obs.title];
   if (obs.narrative)
     parts.push(obs.narrative);
@@ -21682,8 +21794,8 @@ function buildVectorDocument(obs, config2, project) {
     }
   }
   return {
-    site_id: config2.site_id,
-    namespace: config2.namespace,
+    site_id: target.siteId,
+    namespace: target.namespace,
     source_type: obs.type,
     source_id: buildSourceId(config2, obs.id),
     content: parts.join(`
@@ -21714,7 +21826,10 @@ function buildVectorDocument(obs, config2, project) {
     }
   };
 }
-function buildSummaryVectorDocument(summary, config2, project, observations = [], captureContext) {
+function buildSummaryVectorDocument(summary, config2, project, targetOrObservations = resolveSyncTarget(config2, project.name), observationsOrCaptureContext = [], captureContext) {
+  const target = Array.isArray(targetOrObservations) ? resolveSyncTarget(config2, project.name) : targetOrObservations;
+  const observations = Array.isArray(targetOrObservations) ? targetOrObservations : Array.isArray(observationsOrCaptureContext) ? observationsOrCaptureContext : [];
+  const resolvedCaptureContext = Array.isArray(observationsOrCaptureContext) ? captureContext : observationsOrCaptureContext;
   const parts = [];
   if (summary.request)
     parts.push(`Request: ${summary.request}`);
@@ -21727,9 +21842,17 @@ function buildSummaryVectorDocument(summary, config2, project, observations = []
   if (summary.next_steps)
     parts.push(`Next Steps: ${summary.next_steps}`);
   const valueSignals = computeSessionValueSignals(observations, []);
+  const observationSourceTools = resolvedCaptureContext?.observation_source_tools ?? summarizeObservationSourceTools(observations);
+  const latestObservationPromptNumber = resolvedCaptureContext?.latest_observation_prompt_number ?? observations.reduce((latest, obs) => {
+    if (typeof obs.source_prompt_number !== "number")
+      return latest;
+    if (latest === null || obs.source_prompt_number > latest)
+      return obs.source_prompt_number;
+    return latest;
+  }, null);
   return {
-    site_id: config2.site_id,
-    namespace: config2.namespace,
+    site_id: target.siteId,
+    namespace: target.namespace,
     source_type: "summary",
     source_id: buildSourceId(config2, summary.id, "summary"),
     content: parts.join(`
@@ -21751,18 +21874,18 @@ function buildSummaryVectorDocument(summary, config2, project, observations = []
       learned_items: extractSectionItems2(summary.learned),
       completed_items: extractSectionItems2(summary.completed),
       next_step_items: extractSectionItems2(summary.next_steps),
-      prompt_count: captureContext?.prompt_count ?? 0,
-      tool_event_count: captureContext?.tool_event_count ?? 0,
-      capture_state: captureContext?.capture_state ?? "summary-only",
-      recent_request_prompts: captureContext?.recent_request_prompts ?? [],
-      latest_request: captureContext?.latest_request ?? null,
-      current_thread: captureContext?.current_thread ?? null,
-      recent_tool_names: captureContext?.recent_tool_names ?? [],
-      recent_tool_commands: captureContext?.recent_tool_commands ?? [],
-      hot_files: captureContext?.hot_files ?? [],
-      recent_outcomes: captureContext?.recent_outcomes ?? [],
-      observation_source_tools: captureContext?.observation_source_tools ?? [],
-      latest_observation_prompt_number: captureContext?.latest_observation_prompt_number ?? null,
+      prompt_count: resolvedCaptureContext?.prompt_count ?? 0,
+      tool_event_count: resolvedCaptureContext?.tool_event_count ?? 0,
+      capture_state: resolvedCaptureContext?.capture_state ?? "summary-only",
+      recent_request_prompts: resolvedCaptureContext?.recent_request_prompts ?? [],
+      latest_request: resolvedCaptureContext?.latest_request ?? null,
+      current_thread: resolvedCaptureContext?.current_thread ?? null,
+      recent_tool_names: resolvedCaptureContext?.recent_tool_names ?? [],
+      recent_tool_commands: resolvedCaptureContext?.recent_tool_commands ?? [],
+      hot_files: resolvedCaptureContext?.hot_files ?? [],
+      recent_outcomes: resolvedCaptureContext?.recent_outcomes ?? [],
+      observation_source_tools: observationSourceTools,
+      latest_observation_prompt_number: latestObservationPromptNumber,
       decisions_count: valueSignals.decisions_count,
       lessons_count: valueSignals.lessons_count,
       discoveries_count: valueSignals.discoveries_count,
@@ -21776,7 +21899,7 @@ function buildSummaryVectorDocument(summary, config2, project, observations = []
     }
   };
 }
-async function pushOutbox(db, client, config2, batchSize = 50) {
+async function pushOutbox(db, config2, batchSize = 50) {
   const entries = getPendingEntries(db, batchSize);
   let pushed = 0;
   let failed = 0;
@@ -21803,11 +21926,12 @@ async function pushOutbox(db, client, config2, batchSize = 50) {
       const summaryObservations = db.getObservationsBySession(summary.session_id);
       const sessionPrompts = db.getSessionUserPrompts(summary.session_id, 20);
       const sessionToolEvents = db.getSessionToolEvents(summary.session_id, 20);
+      const target2 = resolveSyncTarget(config2, project2.name);
       const doc3 = buildSummaryVectorDocument(summary, config2, {
         canonical_id: project2.canonical_id,
         name: project2.name
-      }, summaryObservations, buildSessionHandoffMetadata(sessionPrompts, sessionToolEvents, summaryObservations));
-      batch.push({ entryId: entry.id, doc: doc3 });
+      }, target2, summaryObservations, buildSessionHandoffMetadata(sessionPrompts, sessionToolEvents, summaryObservations));
+      batch.push({ entryId: entry.id, doc: maybeScrubFleetDocument(doc3, target2), target: target2 });
       continue;
     }
     if (entry.record_type === "chat_message") {
@@ -21829,11 +21953,12 @@ async function pushOutbox(db, client, config2, batchSize = 50) {
         continue;
       }
       markSyncing(db, entry.id);
+      const target2 = resolveSyncTarget(config2, project2.name);
       const doc3 = buildChatVectorDocument(chat, config2, {
         canonical_id: project2.canonical_id,
         name: project2.name
-      });
-      batch.push({ entryId: entry.id, doc: doc3 });
+      }, target2);
+      batch.push({ entryId: entry.id, doc: maybeScrubFleetDocument(doc3, target2), target: target2 });
       continue;
     }
     if (entry.record_type !== "observation") {
@@ -21863,30 +21988,33 @@ async function pushOutbox(db, client, config2, batchSize = 50) {
       continue;
     }
     markSyncing(db, entry.id);
+    const target = resolveSyncTarget(config2, project.name);
     const doc2 = buildVectorDocument(obs, config2, {
       canonical_id: project.canonical_id,
       name: project.name
-    });
-    batch.push({ entryId: entry.id, doc: doc2 });
+    }, target);
+    batch.push({ entryId: entry.id, doc: maybeScrubFleetDocument(doc2, target), target });
   }
   if (batch.length === 0)
     return { pushed, failed, skipped };
-  try {
-    await client.batchIngest(batch.map((b) => b.doc));
-    for (const { entryId, doc: doc2 } of batch) {
-      if (doc2.source_type === "chat") {
-        const localId = typeof doc2.metadata?.local_id === "number" ? doc2.metadata.local_id : null;
-        if (localId !== null) {
-          db.db.query("UPDATE chat_messages SET remote_source_id = ? WHERE id = ?").run(doc2.source_id, localId);
-        }
-      }
-      markSynced(db, entryId);
-      pushed++;
+  const grouped = new Map;
+  for (const item of batch) {
+    const existing = grouped.get(item.target.key);
+    if (existing) {
+      existing.items.push(item);
+    } else {
+      grouped.set(item.target.key, { target: item.target, items: [item] });
     }
-  } catch {
-    for (const { entryId, doc: doc2 } of batch) {
-      try {
-        await client.ingest(doc2);
+  }
+  for (const { target, items } of grouped.values()) {
+    const client = new VectorClient(config2, {
+      apiKey: target.apiKey,
+      namespace: target.namespace,
+      siteId: target.siteId
+    });
+    try {
+      await client.batchIngest(items.map((b) => b.doc));
+      for (const { entryId, doc: doc2 } of items) {
         if (doc2.source_type === "chat") {
           const localId = typeof doc2.metadata?.local_id === "number" ? doc2.metadata.local_id : null;
           if (localId !== null) {
@@ -21895,14 +22023,47 @@ async function pushOutbox(db, client, config2, batchSize = 50) {
         }
         markSynced(db, entryId);
         pushed++;
-      } catch (err) {
-        markFailed(db, entryId, err instanceof Error ? err.message : String(err));
-        failed++;
+      }
+    } catch {
+      for (const { entryId, doc: doc2 } of items) {
+        try {
+          await client.ingest(doc2);
+          if (doc2.source_type === "chat") {
+            const localId = typeof doc2.metadata?.local_id === "number" ? doc2.metadata.local_id : null;
+            if (localId !== null) {
+              db.db.query("UPDATE chat_messages SET remote_source_id = ? WHERE id = ?").run(doc2.source_id, localId);
+            }
+          }
+          markSynced(db, entryId);
+          pushed++;
+        } catch (err) {
+          markFailed(db, entryId, err instanceof Error ? err.message : String(err));
+          failed++;
+        }
       }
     }
   }
   return { pushed, failed, skipped };
 }
+function maybeScrubFleetDocument(doc2, target) {
+  if (!target.isFleet)
+    return doc2;
+  return {
+    ...doc2,
+    content: scrubFleetIdentifiers(doc2.content),
+    metadata: scrubFleetMetadata(doc2.metadata)
+  };
+}
+function scrubFleetMetadata(value) {
+  if (typeof value === "string")
+    return scrubFleetIdentifiers(value);
+  if (Array.isArray(value))
+    return value.map((item) => scrubFleetMetadata(item));
+  if (value && typeof value === "object") {
+    return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, scrubFleetMetadata(item)]));
+  }
+  return value;
+}
 function countPresentSections2(summary) {
   return [
     summary.request,
@@ -21915,12 +22076,29 @@ function countPresentSections2(summary) {
 function extractSectionItems2(section) {
   return extractSummaryItems(section, 4);
 }
+function summarizeObservationSourceTools(observations) {
+  const counts = new Map;
+  for (const obs of observations) {
+    const tool = obs.source_tool;
+    if (!tool)
+      continue;
+    counts.set(tool, (counts.get(tool) ?? 0) + 1);
+  }
+  return Array.from(counts.entries()).map(([tool, count]) => ({ tool, count })).sort((a, b) => {
+    if (b.count !== a.count)
+      return b.count - a.count;
+    return a.tool.localeCompare(b.tool);
+  });
+}
 
 // src/sync/pull.ts
-var PULL_CURSOR_KEY = "pull_cursor";
+function pullCursorKey(namespace) {
+  return namespace === "default" ? "pull_cursor" : `pull_cursor:${namespace}`;
+}
 var MAX_PAGES = 20;
 async function pullFromVector(db, client, config2, limit = 50) {
-  let cursor = db.getSyncState(PULL_CURSOR_KEY) ?? undefined;
+  const cursorKey = pullCursorKey(client.namespace || "default");
+  let cursor = db.getSyncState(cursorKey) ?? undefined;
   let totalReceived = 0;
   let totalMerged = 0;
   let totalSkipped = 0;
@@ -21931,7 +22109,7 @@ async function pullFromVector(db, client, config2, limit = 50) {
     totalMerged += merged;
     totalSkipped += skipped;
     if (response.cursor) {
-      db.setSyncState(PULL_CURSOR_KEY, response.cursor);
+      db.setSyncState(cursorKey, response.cursor);
       cursor = response.cursor;
     }
     if (!response.has_more || response.changes.length === 0)
@@ -22149,6 +22327,7 @@ class SyncEngine {
   db;
   config;
   client = null;
+  fleetClient = null;
   pushTimer = null;
   pullTimer = null;
   _pushing = false;
@@ -22160,6 +22339,13 @@ class SyncEngine {
     if (VectorClient.isConfigured(config2)) {
       try {
         this.client = new VectorClient(config2);
+        if (hasFleetTarget(config2)) {
+          this.fleetClient = new VectorClient(config2, {
+            apiKey: config2.fleet.api_key,
+            namespace: config2.fleet.namespace,
+            siteId: config2.site_id
+          });
+        }
       } catch {}
     }
   }
@@ -22194,7 +22380,7 @@ class SyncEngine {
       return;
     this._pushing = true;
     try {
-      await pushOutbox(this.db, this.client, this.config, this.config.sync.batch_size);
+      await pushOutbox(this.db, this.config, this.config.sync.batch_size);
     } finally {
       this._pushing = false;
     }
@@ -22205,6 +22391,9 @@ class SyncEngine {
     this._pulling = true;
     try {
       await pullFromVector(this.db, this.client, this.config);
+      if (this.fleetClient) {
+        await pullFromVector(this.db, this.fleetClient, this.config);
+      }
       await pullSettings(this.client, this.config);
     } finally {
       this._pulling = false;
@@ -22873,7 +23062,7 @@ process.on("SIGTERM", () => {
 });
 var server = new McpServer({
   name: "engrm",
-  version: "0.4.37"
+  version: "0.4.39"
 });
 server.tool("save_observation", "Directly save a durable memory item now. Use this when something should be remembered on purpose instead of waiting for an end-of-session digest.", {
   type: exports_external.enum([
@@ -23934,6 +24123,11 @@ server.tool("capture_status", "Show whether Engrm hook registration and recent p
       {
         type: "text",
         text: `Schema: v${result.schema_version} (${result.schema_current ? "current" : "outdated"})
+` + `HTTP MCP: ${result.http_enabled ? `enabled${result.http_port ? ` (:${result.http_port})` : ""}` : "disabled"}
+` + `HTTP bearer tokens: ${result.http_bearer_token_count}
+` + `Fleet project: ${result.fleet_project_name ?? "none"}
+` + `Fleet sync: ${result.fleet_configured ? "configured" : "not configured"}
+
 ` + `Claude MCP: ${result.claude_mcp_registered ? "registered" : "missing"}
 ` + `Claude hooks: ${result.claude_hooks_registered ? `registered (${result.claude_hook_count})` : "missing"}
 ` + `Claude raw chronology hooks: session-start=${result.claude_session_start_hook ? "yes" : "no"}, prompt=${result.claude_user_prompt_hook ? "yes" : "no"}, post-tool=${result.claude_post_tool_hook ? "yes" : "no"}, stop=${result.claude_stop_hook ? "yes" : "no"}
@@ -23941,6 +24135,9 @@ server.tool("capture_status", "Show whether Engrm hook registration and recent p
 ` + `Codex hooks: ${result.codex_hooks_registered ? "registered" : "missing"}
 ` + `Codex raw chronology: ${result.codex_raw_chronology_supported ? "supported" : "not yet supported (start/stop only)"}
 
+` + `OpenCode MCP: ${result.opencode_mcp_registered ? "registered" : "missing"}
+` + `OpenCode plugin: ${result.opencode_plugin_registered ? "installed" : "missing"}
+
 ` + `Recent user prompts: ${result.recent_user_prompts}
 ` + `Recent tool events: ${result.recent_tool_events}
 ` + `Recent sessions with raw chronology: ${result.recent_sessions_with_raw_capture}
@@ -24858,9 +25055,82 @@ async function main() {
   }
   syncEngine = new SyncEngine(db, config2);
   syncEngine.start();
+  if (shouldStartHttpMode()) {
+    await startHttpServer();
+    return;
+  }
   const transport = new StdioServerTransport;
   await server.connect(transport);
 }
+function shouldStartHttpMode() {
+  return process.argv.includes("--http") || Boolean(process.env.ENGRM_HTTP_PORT) || config2.http.enabled;
+}
+function resolveHttpPort() {
+  const raw = process.env.ENGRM_HTTP_PORT;
+  if (raw) {
+    const parsed = Number(raw);
+    if (!Number.isNaN(parsed) && parsed > 0)
+      return parsed;
+  }
+  return config2.http.port > 0 ? config2.http.port : 3767;
+}
+function getHttpBearerTokens() {
+  const env = process.env.ENGRM_HTTP_BEARER_TOKENS;
+  if (env && env.trim()) {
+    return env.split(",").map((value) => value.trim()).filter(Boolean);
+  }
+  return config2.http.bearer_tokens.filter(Boolean);
+}
+async function startHttpServer() {
+  const port = resolveHttpPort();
+  const tokens = getHttpBearerTokens();
+  if (tokens.length === 0) {
+    throw new Error("HTTP mode requires at least one bearer token via settings.json http.bearer_tokens or ENGRM_HTTP_BEARER_TOKENS");
+  }
+  const transport = new StreamableHTTPServerTransport({
+    sessionIdGenerator: undefined
+  });
+  await server.connect(transport);
+  const httpServer = createServer(async (req, res) => {
+    try {
+      if (!req.url || !req.url.startsWith("/mcp")) {
+        res.writeHead(404).end("Not found");
+        return;
+      }
+      const authHeader = req.headers.authorization ?? "";
+      const token = authHeader.startsWith("Bearer ") ? authHeader.slice("Bearer ".length).trim() : "";
+      if (!token || !tokens.includes(token)) {
+        res.writeHead(401, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "Unauthorized" }));
+        return;
+      }
+      const authorizedReq = req;
+      authorizedReq.auth = { token };
+      const parsedBody = req.method === "POST" ? await readJsonBody(req) : undefined;
+      await transport.handleRequest(authorizedReq, res, parsedBody);
+    } catch (error48) {
+      res.writeHead(500, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ error: error48 instanceof Error ? error48.message : String(error48) }));
+    }
+  });
+  await new Promise((resolve4, reject) => {
+    httpServer.once("error", reject);
+    httpServer.listen(port, () => resolve4());
+  });
+  console.error(`Engrm HTTP MCP listening on :${port}/mcp`);
+}
+async function readJsonBody(req) {
+  const chunks = [];
+  for await (const chunk of req) {
+    chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
+  }
+  if (chunks.length === 0)
+    return;
+  const raw = Buffer.concat(chunks).toString("utf-8").trim();
+  if (!raw)
+    return;
+  return JSON.parse(raw);
+}
 main().catch((error48) => {
   console.error("Fatal:", error48);
   db.close();