Fix: Support CLAUDE_CONFIG_DIR for custom Claude installations

src/services/context-generator.ts

@@ -6,7 +6,6 @@
  */
 
 import path from 'path';
-import { homedir } from 'os';
 import { existsSync, readFileSync, unlinkSync } from 'fs';
 import { SessionStore } from './sqlite/SessionStore.js';
 import {
@@ -17,9 +16,10 @@ import {
 } from '../constants/observation-metadata.js';
 import { logger } from '../utils/logger.js';
 import { SettingsDefaultsManager } from '../shared/SettingsDefaultsManager.js';
+import { MARKETPLACE_ROOT } from '../shared/paths.js';
 
-// Version marker path - use homedir-based path that works in both CJS and ESM contexts
-const VERSION_MARKER_PATH = path.join(homedir(), '.claude', 'plugins', 'marketplaces', 'thedotmack', 'plugin', '.install-version');
+// Version marker path - respects CLAUDE_CONFIG_DIR for users with custom Claude locations
+const VERSION_MARKER_PATH = path.join(MARKETPLACE_ROOT, 'plugin', '.install-version');
 
 interface ContextConfig {
   // Display counts

src/services/worker/BranchManager.ts

@@ -2,16 +2,15 @@
  * BranchManager: Git branch detection and switching for beta feature toggle
  *
  * Enables users to switch between stable (main) and beta branches via the UI.
- * The installed plugin at ~/.claude/plugins/marketplaces/thedotmack/ is a git repo.
+ * The installed plugin directory is determined by CLAUDE_CONFIG_DIR environment variable.
  */
 
 import { execSync } from 'child_process';
 import { existsSync, unlinkSync } from 'fs';
-import { homedir } from 'os';
-import { join } from 'path';
 import { logger } from '../../utils/logger.js';
+import { MARKETPLACE_ROOT } from '../../shared/paths.js';
 
-const INSTALLED_PLUGIN_PATH = join(homedir(), '.claude', 'plugins', 'marketplaces', 'thedotmack');
+const INSTALLED_PLUGIN_PATH = MARKETPLACE_ROOT;
 
 export interface BranchInfo {
   branch: string | null;

src/shared/paths.ts

@@ -27,6 +27,9 @@ export const DATA_DIR = SettingsDefaultsManager.get('CLAUDE_MEM_DATA_DIR');
 // Note: CLAUDE_CONFIG_DIR is a Claude Code setting, not claude-mem, so leave as env var
 export const CLAUDE_CONFIG_DIR = process.env.CLAUDE_CONFIG_DIR || join(homedir(), '.claude');
 
+// Plugin installation directory - respects CLAUDE_CONFIG_DIR for users with custom Claude locations
+export const MARKETPLACE_ROOT = join(CLAUDE_CONFIG_DIR, 'plugins', 'marketplaces', 'thedotmack');
+
 // Data subdirectories
 export const ARCHIVES_DIR = join(DATA_DIR, 'archives');
 export const LOGS_DIR = join(DATA_DIR, 'logs');

src/shared/worker-utils.ts

@@ -1,14 +1,10 @@
 import path from "path";
 import { existsSync } from "fs";
-import { homedir } from "os";
 import { spawnSync } from "child_process";
 import { SettingsDefaultsManager } from "./SettingsDefaultsManager.js";
 import { logger } from "../utils/logger.js";
 import { HOOK_TIMEOUTS, getTimeout } from "./hook-constants.js";
-
-// CRITICAL: Always use marketplace directory for PM2/ecosystem
-// This ensures cross-platform compatibility and avoids cache directory confusion
-const MARKETPLACE_ROOT = path.join(homedir(), '.claude', 'plugins', 'marketplaces', 'thedotmack');
+import { MARKETPLACE_ROOT } from "./paths.js";
 
 // Named constants for health checks
 // Windows needs longer timeouts due to startup overhead