Merge remote-tracking branch 'origin/main' into fix-and-ship-codex-mem-search-access

# Conflicts: # .mcp.json # plugin/.mcp.json # plugin/scripts/mcp-server.cjs # plugin/scripts/worker-service.cjs # tests/infrastructure/plugin-distribution.test.ts
2026-05-06 19:10:49 -07:00
parent 37d186e767 7af43146e4
commit 3a000b6bc6
31 changed files with 2178 additions and 579 deletions
@@ -398,7 +398,7 @@ async function buildHooks() {
    if (!mcpSearchCommand.includes('.codex/plugins/cache/claude-mem-local/claude-mem')) {
      throw new Error('plugin/.mcp.json mcp-search launcher must include Codex cache fallback for hosts that do not inject PLUGIN_ROOT');
    }
-    if (!mcpSearchCommand.includes('.claude/plugins/cache/thedotmack/claude-mem')) {
+    if (!mcpSearchCommand.includes('plugins/cache/thedotmack/claude-mem')) {
      throw new Error('plugin/.mcp.json mcp-search launcher must include Claude cache fallback for hosts that do not inject PLUGIN_ROOT');
    }
    console.log('✓ All required distribution files present');