Refactor SettingsDefaultsManager: Move to shared directory and update imports

- Moved SettingsDefaultsManager from worker/settings to shared directory.
- Updated all import paths across the codebase to reflect the new location.
- Removed early-settings.ts as its functionality is now handled by SettingsDefaultsManager.
- Adjusted logger and paths to utilize SettingsDefaultsManager for configuration values.
This commit is contained in:
Alex Newman
2025-12-09 15:29:17 -05:00
parent c3761a2204
commit 005a80c540
21 changed files with 205 additions and 275 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ import {
TYPE_WORK_EMOJI_MAP
} from '../constants/observation-metadata.js';
import { logger } from '../utils/logger.js';
import { SettingsDefaultsManager } from './worker/settings/SettingsDefaultsManager.js';
import { SettingsDefaultsManager } from '../shared/SettingsDefaultsManager.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');
+1 -1
View File
@@ -13,7 +13,7 @@ import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
import { ParsedObservation, ParsedSummary } from '../../sdk/parser.js';
import { SessionStore } from '../sqlite/SessionStore.js';
import { logger } from '../../utils/logger.js';
import { SettingsDefaultsManager } from '../worker/settings/SettingsDefaultsManager.js';
import { SettingsDefaultsManager } from '../../shared/SettingsDefaultsManager.js';
import { USER_SETTINGS_PATH } from '../../shared/paths.js';
import { happy_path_error__with_fallback } from '../../utils/silent-debug.js';
import path from 'path';
+1 -1
View File
@@ -17,7 +17,7 @@ import { logger } from '../../utils/logger.js';
import { happy_path_error__with_fallback } from '../../utils/silent-debug.js';
import { parseObservations, parseSummary } from '../../sdk/parser.js';
import { buildInitPrompt, buildObservationPrompt, buildSummaryPrompt, buildContinuationPrompt } from '../../sdk/prompts.js';
import { SettingsDefaultsManager } from './settings/SettingsDefaultsManager.js';
import { SettingsDefaultsManager } from '../../shared/SettingsDefaultsManager.js';
import { USER_SETTINGS_PATH } from '../../shared/paths.js';
import type { ActiveSession, SDKUserMessage, PendingMessage } from '../worker-types.js';
@@ -20,7 +20,7 @@ import {
ObservationConcept
} from '../../../../constants/observation-metadata.js';
import { BaseRouteHandler } from '../BaseRouteHandler.js';
import { SettingsDefaultsManager } from '../../settings/SettingsDefaultsManager.js';
import { SettingsDefaultsManager } from '../../../../shared/SettingsDefaultsManager.js';
export class SettingsRoutes extends BaseRouteHandler {
constructor(
@@ -8,7 +8,7 @@
import { readFileSync, existsSync } from 'fs';
import { join } from 'path';
import { homedir } from 'os';
import { DEFAULT_OBSERVATION_TYPES_STRING, DEFAULT_OBSERVATION_CONCEPTS_STRING } from '../../../constants/observation-metadata.js';
import { DEFAULT_OBSERVATION_TYPES_STRING, DEFAULT_OBSERVATION_CONCEPTS_STRING } from '../constants/observation-metadata.js';
export interface SettingsDefaults {
CLAUDE_MEM_MODEL: string;
@@ -74,14 +74,14 @@ export class SettingsDefaultsManager {
}
/**
* Get a default value with optional environment variable override
* Get a default value from defaults (no environment variable override)
*/
static get(key: keyof SettingsDefaults): string {
return process.env[key] || this.DEFAULTS[key];
return this.DEFAULTS[key];
}
/**
* Get an integer default value with optional environment variable override
* Get an integer default value
*/
static getInt(key: keyof SettingsDefaults): number {
const value = this.get(key);
@@ -89,7 +89,7 @@ export class SettingsDefaultsManager {
}
/**
* Get a boolean default value with optional environment variable override
* Get a boolean default value
*/
static getBool(key: keyof SettingsDefaults): boolean {
const value = this.get(key);
@@ -107,13 +107,12 @@ export class SettingsDefaultsManager {
const settingsData = readFileSync(settingsPath, 'utf-8');
const settings = JSON.parse(settingsData);
const env = settings.env || {};
// Merge file settings with defaults
// Merge file settings with defaults (flat schema, no env wrapper)
const result: SettingsDefaults = { ...this.DEFAULTS };
for (const key of Object.keys(this.DEFAULTS) as Array<keyof SettingsDefaults>) {
if (env[key] !== undefined) {
result[key] = env[key];
if (settings[key] !== undefined) {
result[key] = settings[key];
}
}
-32
View File
@@ -1,32 +0,0 @@
import { join } from 'path';
import { homedir } from 'os';
import { existsSync, readFileSync } from 'fs';
import { happy_path_error__with_fallback } from '../utils/silent-debug.js';
const SETTINGS_PATH = join(homedir(), '.claude-mem', 'settings.json');
interface EarlySettings {
CLAUDE_MEM_DATA_DIR?: string;
CLAUDE_MEM_LOG_LEVEL?: string;
CLAUDE_MEM_PYTHON_VERSION?: string;
CLAUDE_CODE_PATH?: string;
}
/**
* Load settings for early-stage modules (paths, logger)
* Falls back to env vars, then defaults
*/
export function loadEarlySetting(key: keyof EarlySettings, defaultValue: string): string {
// Priority: settings.json > env var > default
try {
if (existsSync(SETTINGS_PATH)) {
const data = JSON.parse(readFileSync(SETTINGS_PATH, 'utf-8'));
const fileValue = data.env?.[key];
if (fileValue !== undefined) return fileValue;
}
} catch (error) {
happy_path_error__with_fallback('Failed to load settings file', { error, settingsPath: SETTINGS_PATH, key });
}
return process.env[key] || defaultValue;
}
+2 -2
View File
@@ -3,7 +3,7 @@ import { homedir } from 'os';
import { existsSync, mkdirSync } from 'fs';
import { execSync } from 'child_process';
import { fileURLToPath } from 'url';
import { loadEarlySetting } from './early-settings.js';
import { SettingsDefaultsManager } from './SettingsDefaultsManager.js';
// Get __dirname that works in both ESM (hooks) and CJS (worker) contexts
function getDirname(): string {
@@ -23,7 +23,7 @@ const _dirname = getDirname();
*/
// Base directories
export const DATA_DIR = loadEarlySetting('CLAUDE_MEM_DATA_DIR', join(homedir(), '.claude-mem'));
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');
+1 -1
View File
@@ -2,7 +2,7 @@ import path from "path";
import { existsSync } from "fs";
import { homedir } from "os";
import { spawnSync } from "child_process";
import { SettingsDefaultsManager } from "../services/worker/settings/SettingsDefaultsManager.js";
import { SettingsDefaultsManager } from "./SettingsDefaultsManager.js";
import { logger } from "../utils/logger.js";
import { HOOK_TIMEOUTS, getTimeout } from "./hook-constants.js";
+3 -3
View File
@@ -3,7 +3,7 @@
* Provides readable, traceable logging with correlation IDs and data flow tracking
*/
import { loadEarlySetting } from '../shared/early-settings.js';
import { SettingsDefaultsManager } from '../shared/SettingsDefaultsManager.js';
export enum LogLevel {
DEBUG = 0,
@@ -27,8 +27,8 @@ class Logger {
private useColor: boolean;
constructor() {
// Parse log level from environment
const envLevel = loadEarlySetting('CLAUDE_MEM_LOG_LEVEL', 'INFO').toUpperCase();
// Parse log level from settings
const envLevel = SettingsDefaultsManager.get('CLAUDE_MEM_LOG_LEVEL').toUpperCase();
this.level = LogLevel[envLevel as keyof typeof LogLevel] ?? LogLevel.INFO;
// Disable colors when output is not a TTY (e.g., PM2 logs)