Refactor code structure for improved readability and maintainability

src/hooks/cleanup.ts

@@ -1,4 +1,5 @@
 import { SessionStore } from '../services/sqlite/SessionStore.js';
+import { ensureWorkerRunning } from '../shared/worker-utils.js';
 
 export interface SessionEndInput {
   session_id: string;
@@ -67,15 +68,22 @@ export async function cleanupHook(input?: SessionEndInput): Promise<void> {
     // 1. Delete session via HTTP
     if (session.worker_port) {
       try {
-        const response = await fetch(`http://127.0.0.1:${session.worker_port}/sessions/${session.id}`, {
-          method: 'DELETE',
-          signal: AbortSignal.timeout(5000)
-        });
-
-        if (response.ok) {
-          console.error('[claude-mem cleanup] Session deleted successfully via HTTP');
+        // Ensure worker is running before sending cleanup request
+        const workerReady = await ensureWorkerRunning();
+        if (!workerReady) {
+          console.error('[claude-mem cleanup] Worker not available - skipping HTTP cleanup');
+          // Continue with local cleanup below
         } else {
-          console.error('[claude-mem cleanup] Failed to delete session:', await response.text());
+          const response = await fetch(`http://127.0.0.1:${session.worker_port}/sessions/${session.id}`, {
+            method: 'DELETE',
+            signal: AbortSignal.timeout(5000)
+          });
+
+          if (response.ok) {
+            console.error('[claude-mem cleanup] Session deleted successfully via HTTP');
+          } else {
+            console.error('[claude-mem cleanup] Failed to delete session:', await response.text());
+          }
         }
       } catch (error: any) {
         console.error('[claude-mem cleanup] HTTP DELETE error:', error.message);

src/hooks/save.ts

@@ -1,6 +1,7 @@
 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;
@@ -51,6 +52,12 @@ export async function saveHook(input?: PostToolUseInput): Promise<void> {
   const promptNumber = db.getPromptCounter(session.id);
   db.close();
 
+  // Ensure worker is running before sending observation
+  const workerReady = await ensureWorkerRunning();
+  if (!workerReady) {
+    throw new Error('Worker service failed to start or become healthy');
+  }
+
   const toolStr = logger.formatTool(tool_name, tool_input);
 
   logger.dataIn('HOOK', `PostToolUse: ${toolStr}`, {

src/hooks/summary.ts

@@ -1,6 +1,7 @@
 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;
@@ -37,6 +38,12 @@ export async function summaryHook(input?: StopInput): Promise<void> {
   const promptNumber = db.getPromptCounter(session.id);
   db.close();
 
+  // Ensure worker is running before requesting summary
+  const workerReady = await ensureWorkerRunning();
+  if (!workerReady) {
+    throw new Error('Worker service failed to start or become healthy');
+  }
+
   logger.dataIn('HOOK', 'Stop: Requesting summary', {
     sessionId: session.id,
     workerPort: session.worker_port,

src/shared/worker-utils.ts

@@ -37,7 +37,7 @@ export async function ensureWorkerRunning(): Promise<boolean> {
 
     // Find worker service path
     const packageRoot = getPackageRoot();
-    const workerPath = path.join(packageRoot, 'dist', 'worker-service.cjs');
+    const workerPath = path.join(packageRoot, 'plugin', 'scripts', 'worker-service.cjs');
 
     if (!existsSync(workerPath)) {
       console.error(`[claude-mem] Worker service not found at ${workerPath}`);