Refactor worker management and cleanup hooks

- Removed ensureWorkerRunning calls from multiple hooks (cleanup, context, new, save, summary) to streamline code and avoid unnecessary checks.
- Introduced fixed port usage for worker communication across hooks.
- Enhanced error handling in newHook, saveHook, and summaryHook to provide clearer messages for worker connection issues.
- Updated worker service to start without health checks, relying on PM2 for management.
- Cached Claude executable path to optimize repeated calls.
- Improved logging for better traceability of worker actions and errors.

src/hooks/cleanup-hook.ts

@@ -5,7 +5,6 @@
 
 import { stdin } from 'process';
 import { SessionStore } from '../services/sqlite/SessionStore.js';
-import { ensureWorkerRunning } from '../shared/worker-utils.js';
 
 export interface SessionEndInput {
   session_id: string;
@@ -45,12 +44,6 @@ async function cleanupHook(input?: SessionEndInput): Promise<void> {
   const { session_id, reason } = input;
   console.error('[claude-mem cleanup] Searching for active SDK session', { session_id, reason });
 
-  // Ensure worker is running first
-  const workerReady = await ensureWorkerRunning();
-  if (!workerReady) {
-    console.error('[claude-mem cleanup] Worker not available - skipping HTTP cleanup');
-  }
-
   // Find active SDK session
   const db = new SessionStore();
   const session = db.findActiveSDKSession(session_id);

src/hooks/context-hook.ts

@@ -6,7 +6,6 @@
 import path from 'path';
 import { stdin } from 'process';
 import { SessionStore } from '../services/sqlite/SessionStore.js';
-import { ensureWorkerRunning } from '../shared/worker-utils.js';
 
 // Configuration: Read from environment or use defaults
 const DISPLAY_OBSERVATION_COUNT = parseInt(process.env.CLAUDE_MEM_CONTEXT_OBSERVATIONS || '50', 10);
@@ -127,7 +126,6 @@ function getObservations(db: SessionStore, sessionIds: string[]): Observation[]
  * Context Hook Main Logic
  */
 function contextHook(input?: SessionStartInput, useColors: boolean = false, useIndexView: boolean = false): string {
-  ensureWorkerRunning();
   const cwd = input?.cwd ?? process.cwd();
   const project = cwd ? path.basename(cwd) : 'unknown-project';
 

src/hooks/new-hook.ts

@@ -7,7 +7,6 @@ import path from 'path';
 import { stdin } from 'process';
 import { SessionStore } from '../services/sqlite/SessionStore.js';
 import { createHookResponse } from './hook-response.js';
-import { ensureWorkerRunning, getWorkerPort } from '../shared/worker-utils.js';
 
 export interface UserPromptSubmitInput {
   session_id: string;
@@ -27,12 +26,6 @@ async function newHook(input?: UserPromptSubmitInput): Promise<void> {
   const { session_id, cwd, prompt } = input;
   const project = path.basename(cwd);
 
-  // Ensure worker is running first
-  const workerReady = await ensureWorkerRunning();
-  if (!workerReady) {
-    throw new Error('Worker service failed to start or become healthy');
-  }
-
   const db = new SessionStore();
 
   // Save session_id for indexing
@@ -46,20 +39,29 @@ async function newHook(input?: UserPromptSubmitInput): Promise<void> {
 
   db.close();
 
-  // Get fixed port
-  const port = getWorkerPort();
+  // Use fixed worker port
+  const FIXED_PORT = parseInt(process.env.CLAUDE_MEM_WORKER_PORT || '37777', 10);
 
-  // Initialize session via HTTP
-  const response = await fetch(`http://127.0.0.1:${port}/sessions/${sessionDbId}/init`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ project, userPrompt: prompt }),
-    signal: AbortSignal.timeout(5000)
-  });
+  try {
+    // Initialize session via HTTP
+    const response = await fetch(`http://127.0.0.1:${FIXED_PORT}/sessions/${sessionDbId}/init`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ project, userPrompt: prompt }),
+      signal: AbortSignal.timeout(5000)
+    });
 
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`Failed to initialize session: ${response.status} ${errorText}`);
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to initialize session: ${response.status} ${errorText}`);
+    }
+  } catch (error: any) {
+    // Only show restart message for connection errors, not HTTP errors
+    if (error.cause?.code === 'ECONNREFUSED' || error.name === 'TimeoutError' || error.message.includes('fetch failed')) {
+      throw new Error("There's a problem with the worker. If you just updated, type `pm2 restart claude-mem-worker` in your terminal to continue");
+    }
+    // Re-throw HTTP errors and other errors as-is
+    throw error;
   }
 
   console.log(createHookResponse('UserPromptSubmit', true));

src/hooks/save-hook.ts

@@ -7,7 +7,6 @@ import { stdin } from 'process';
 import { SessionStore } from '../services/sqlite/SessionStore.js';
 import { createHookResponse } from './hook-response.js';
 import { logger } from '../utils/logger.js';
-import { ensureWorkerRunning } from '../shared/worker-utils.js';
 
 export interface PostToolUseInput {
   session_id: string;
@@ -38,12 +37,6 @@ async function saveHook(input?: PostToolUseInput): Promise<void> {
     return;
   }
 
-  // Ensure worker is running first
-  const workerReady = await ensureWorkerRunning();
-  if (!workerReady) {
-    throw new Error('Worker service failed to start or become healthy');
-  }
-
   const db = new SessionStore();
 
   // Get or create session
@@ -61,28 +54,38 @@ async function saveHook(input?: PostToolUseInput): Promise<void> {
     workerPort: FIXED_PORT
   });
 
-  const response = await fetch(`http://127.0.0.1:${FIXED_PORT}/sessions/${sessionDbId}/observations`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      tool_name,
-      tool_input: tool_input !== undefined ? JSON.stringify(tool_input) : '{}',
-      tool_output: tool_output !== undefined ? JSON.stringify(tool_output) : '{}',
-      prompt_number: promptNumber
-    }),
-    signal: AbortSignal.timeout(2000)
-  });
+  try {
+    const response = await fetch(`http://127.0.0.1:${FIXED_PORT}/sessions/${sessionDbId}/observations`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        tool_name,
+        tool_input: tool_input !== undefined ? JSON.stringify(tool_input) : '{}',
+        tool_output: tool_output !== undefined ? JSON.stringify(tool_output) : '{}',
+        prompt_number: promptNumber
+      }),
+      signal: AbortSignal.timeout(2000)
+    });
 
-  if (!response.ok) {
-    const errorText = await response.text();
-    logger.failure('HOOK', 'Failed to send observation', {
-      sessionId: sessionDbId,
-      status: response.status
-    }, errorText);
-    throw new Error(`Failed to send observation to worker: ${response.status} ${errorText}`);
+    if (!response.ok) {
+      const errorText = await response.text();
+      logger.failure('HOOK', 'Failed to send observation', {
+        sessionId: sessionDbId,
+        status: response.status
+      }, errorText);
+      throw new Error(`Failed to send observation to worker: ${response.status} ${errorText}`);
+    }
+
+    logger.debug('HOOK', 'Observation sent successfully', { sessionId: sessionDbId, toolName: tool_name });
+  } catch (error: any) {
+    // Only show restart message for connection errors, not HTTP errors
+    if (error.cause?.code === 'ECONNREFUSED' || error.name === 'TimeoutError' || error.message.includes('fetch failed')) {
+      throw new Error("There's a problem with the worker. If you just updated, type `pm2 restart claude-mem-worker` in your terminal to continue");
+    }
+    // Re-throw HTTP errors and other errors as-is
+    throw error;
   }
 
-  logger.debug('HOOK', 'Observation sent successfully', { sessionId: sessionDbId, toolName: tool_name });
   console.log(createHookResponse('PostToolUse', true));
 }
 

src/hooks/summary-hook.ts

@@ -7,7 +7,6 @@ import { stdin } from 'process';
 import { SessionStore } from '../services/sqlite/SessionStore.js';
 import { createHookResponse } from './hook-response.js';
 import { logger } from '../utils/logger.js';
-import { ensureWorkerRunning } from '../shared/worker-utils.js';
 
 export interface StopInput {
   session_id: string;
@@ -25,12 +24,6 @@ async function summaryHook(input?: StopInput): Promise<void> {
 
   const { session_id } = input;
 
-  // Ensure worker is running first
-  const workerReady = await ensureWorkerRunning();
-  if (!workerReady) {
-    throw new Error('Worker service failed to start or become healthy');
-  }
-
   const db = new SessionStore();
 
   // Get or create session
@@ -47,23 +40,33 @@ async function summaryHook(input?: StopInput): Promise<void> {
     promptNumber
   });
 
-  const response = await fetch(`http://127.0.0.1:${FIXED_PORT}/sessions/${sessionDbId}/summarize`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ prompt_number: promptNumber }),
-    signal: AbortSignal.timeout(2000)
-  });
+  try {
+    const response = await fetch(`http://127.0.0.1:${FIXED_PORT}/sessions/${sessionDbId}/summarize`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ prompt_number: promptNumber }),
+      signal: AbortSignal.timeout(2000)
+    });
 
-  if (!response.ok) {
-    const errorText = await response.text();
-    logger.failure('HOOK', 'Failed to generate summary', {
-      sessionId: sessionDbId,
-      status: response.status
-    }, errorText);
-    throw new Error(`Failed to request summary from worker: ${response.status} ${errorText}`);
+    if (!response.ok) {
+      const errorText = await response.text();
+      logger.failure('HOOK', 'Failed to generate summary', {
+        sessionId: sessionDbId,
+        status: response.status
+      }, errorText);
+      throw new Error(`Failed to request summary from worker: ${response.status} ${errorText}`);
+    }
+
+    logger.debug('HOOK', 'Summary request sent successfully', { sessionId: sessionDbId });
+  } catch (error: any) {
+    // Only show restart message for connection errors, not HTTP errors
+    if (error.cause?.code === 'ECONNREFUSED' || error.name === 'TimeoutError' || error.message.includes('fetch failed')) {
+      throw new Error("There's a problem with the worker. If you just updated, type `pm2 restart claude-mem-worker` in your terminal to continue");
+    }
+    // Re-throw HTTP errors and other errors as-is
+    throw error;
   }
 
-  logger.debug('HOOK', 'Summary request sent successfully', { sessionId: sessionDbId });
   console.log(createHookResponse('Stop', true));
 }