specmem-hardwicksoftware 3.5.99 → 3.6.1

package/claude-hooks/team-comms-enforcer.cjs

@@ -48,7 +48,8 @@ try {
 // CONFIGURATION
 // ============================================================================
 const MAX_SEARCHES_BEFORE_BLOCK = 3;
-const BROADCAST_CHECK_INTERVAL = 5;   // Check broadcasts every 5 tool usages
+const TEAM_COMMS_CHECK_INTERVAL = 4;  // MUST read_team_messages every 4 tool usages
+const BROADCAST_CHECK_INTERVAL = 5;   // MUST read_team_messages w/ include_broadcasts every 5 tool usages
 const HELP_CHECK_INTERVAL = 8;        // Check help requests every 8 tool usages
 
 // Tools that count as "announcing"
@@ -142,11 +143,14 @@ function getAgentState(tracking, sessionId) {
       usedMemoryTools: false,
       searchCount: 0,
       blockedCount: 0,
-      toolUsageCount: 0,           // Total tool calls since last broadcast check
-      helpToolUsageCount: 0,       // Total tool calls since last help check
+      commsToolCount: 0,           // Tool calls since last team comms check (every 4)
+      broadcastToolCount: 0,       // Tool calls since last broadcast check (every 5)
+      helpToolUsageCount: 0,       // Tool calls since last help check (every 8)
+      lastCommsCheck: Date.now(),
       lastBroadcastCheck: Date.now(),
       lastHelpCheck: Date.now(),
-      needsBroadcastCheck: false,  // Flag when they hit the limit
+      needsCommsCheck: false,      // HARD BLOCK until they read team messages
+      needsBroadcastCheck: false,  // HARD BLOCK until they read broadcasts
       needsHelpCheck: false,       // Flag when they hit the limit
       lastActivity: Date.now()
     };
@@ -287,93 +291,78 @@ process.stdin.on('end', () => {
     state.lastActivity = Date.now();
 
     // ========================================================================
-    // ALWAYS ALLOWED TOOLS - but track state
+    // TRACK STATE FOR ALL TOOLS (announcements, claims, memory, comms)
     // ========================================================================
-    if (ALWAYS_ALLOWED.includes(toolName)) {
-      // Track announcements
-      if (ANNOUNCE_TOOLS.includes(toolName)) {
-        state.announced = true;
-      }
-      // Track claims + write to shared claims file
-      if (CLAIM_TOOLS.includes(toolName)) {
-        state.claimed = true;
-        // Write claim to shared file so other agents can see it
-        const params = data.tool_input || {};
-        const claimFiles = params.files || [];
-        const claimDesc = params.description || 'unnamed task';
-        const claimsFile = `${PROJECT_TMP_DIR}/active-claims.json`;
-        try {
-          let claims = {};
-          if (fs.existsSync(claimsFile)) {
-            claims = JSON.parse(fs.readFileSync(claimsFile, 'utf8'));
-          }
-          // Add this claim
-          const claimId = `claim-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
-          claims[claimId] = {
-            sessionId,
-            agentId: sessionId,
-            files: claimFiles,
-            description: claimDesc,
-            createdAt: Date.now()
-          };
-          // Clean up old claims (>30 min)
-          const now = Date.now();
+    if (ANNOUNCE_TOOLS.includes(toolName)) {
+      state.announced = true;
+    }
+    if (CLAIM_TOOLS.includes(toolName)) {
+      state.claimed = true;
+      const params = data.tool_input || {};
+      const claimFiles = params.files || [];
+      const claimDesc = params.description || 'unnamed task';
+      const claimsFile = `${PROJECT_TMP_DIR}/active-claims.json`;
+      try {
+        let claims = {};
+        if (fs.existsSync(claimsFile)) {
+          claims = JSON.parse(fs.readFileSync(claimsFile, 'utf8'));
+        }
+        const claimId = `claim-${Date.now()}-${Math.random().toString(36).slice(2, 6)}`;
+        claims[claimId] = {
+          sessionId, agentId: sessionId, files: claimFiles,
+          description: claimDesc, createdAt: Date.now()
+        };
+        const now = Date.now();
+        for (const [id, claim] of Object.entries(claims)) {
+          if (now - claim.createdAt > 1800000) delete claims[id];
+        }
+        fs.writeFileSync(claimsFile, JSON.stringify(claims, null, 2));
+        state.currentClaimId = claimId;
+      } catch (e) {}
+    }
+    if (toolName === 'mcp__specmem__release_task') {
+      const claimsFile = `${PROJECT_TMP_DIR}/active-claims.json`;
+      try {
+        if (fs.existsSync(claimsFile)) {
+          let claims = JSON.parse(fs.readFileSync(claimsFile, 'utf8'));
           for (const [id, claim] of Object.entries(claims)) {
-            if (now - claim.createdAt > 1800000) delete claims[id];
+            if (claim.sessionId === sessionId) delete claims[id];
           }
           fs.writeFileSync(claimsFile, JSON.stringify(claims, null, 2));
-          state.currentClaimId = claimId;
-        } catch (e) {}
-      }
-      // Track release_task - remove from shared claims
-      if (toolName === 'mcp__specmem__release_task') {
-        const claimsFile = `${PROJECT_TMP_DIR}/active-claims.json`;
-        try {
-          if (fs.existsSync(claimsFile)) {
-            let claims = JSON.parse(fs.readFileSync(claimsFile, 'utf8'));
-            // Remove claims from this session
-            for (const [id, claim] of Object.entries(claims)) {
-              if (claim.sessionId === sessionId) delete claims[id];
-            }
-            fs.writeFileSync(claimsFile, JSON.stringify(claims, null, 2));
-          }
-        } catch (e) {}
-        state.claimed = false;
-        state.editedFiles = [];
-      }
-      // Track memory tool usage
-      if (MEMORY_TOOLS.includes(toolName)) {
-        state.usedMemoryTools = true;
-        state.searchCount = 0; // Reset search count
-      }
-      // Track broadcast checks (read_team_messages with broadcasts)
-      if (BROADCAST_CHECK_TOOLS.includes(toolName)) {
-        // Check if they included broadcasts in the params
-        const params = data.tool_input || {};
-        if (params.include_broadcasts !== false) {  // Default is true
-          state.toolUsageCount = 0;  // Reset counter
-          state.lastBroadcastCheck = Date.now();
-          state.needsBroadcastCheck = false;
         }
+      } catch (e) {}
+      state.claimed = false;
+      state.editedFiles = [];
+    }
+    if (MEMORY_TOOLS.includes(toolName)) {
+      state.usedMemoryTools = true;
+      state.searchCount = 0;
+    }
+    // Track team comms reads - resets comms counter
+    if (BROADCAST_CHECK_TOOLS.includes(toolName)) {
+      state.commsToolCount = 0;
+      state.lastCommsCheck = Date.now();
+      state.needsCommsCheck = false;
+      // Also reset broadcast counter IF they included broadcasts
+      const params = data.tool_input || {};
+      if (params.include_broadcasts !== false) {
+        state.broadcastToolCount = 0;
+        state.lastBroadcastCheck = Date.now();
+        state.needsBroadcastCheck = false;
       }
-      // Track help checks
-      if (HELP_CHECK_TOOLS.includes(toolName)) {
-        state.helpToolUsageCount = 0;  // Reset counter
-        state.lastHelpCheck = Date.now();
-        state.needsHelpCheck = false;
-      }
-      saveTracking(tracking);
-      console.log(JSON.stringify({ continue: true }));
-      return;
+    }
+    if (HELP_CHECK_TOOLS.includes(toolName)) {
+      state.helpToolUsageCount = 0;
+      state.lastHelpCheck = Date.now();
+      state.needsHelpCheck = false;
     }
 
     // ========================================================================
-    // CHECK: Must announce first
+    // CHECK: Must announce first (before anything else)
     // ========================================================================
-    if (!state.announced) {
+    if (!state.announced && !ALWAYS_ALLOWED.includes(toolName)) {
       state.blockedCount++;
       saveTracking(tracking);
-      // Make the announcement requirement very clear with proper channel guidance
       console.log(blockResponse(
         `[BLOCKED] You MUST ANNOUNCE yourself first!\n\n` +
         `This is your MANDATORY FIRST ACTION before any other tool:\n\n` +
@@ -386,23 +375,43 @@ process.stdin.on('end', () => {
     }
 
     // ========================================================================
-    // INCREMENT TOOL USAGE COUNTERS (for broadcast/help enforcement)
+    // INCREMENT ALL COUNTERS ON EVERY TOOL CALL (per-agent, per-session)
+    // This counts ALL tools including ALWAYS_ALLOWED - no dodging
     // ========================================================================
-    state.toolUsageCount = (state.toolUsageCount || 0) + 1;
+    state.commsToolCount = (state.commsToolCount || 0) + 1;
+    state.broadcastToolCount = (state.broadcastToolCount || 0) + 1;
     state.helpToolUsageCount = (state.helpToolUsageCount || 0) + 1;
 
     // ========================================================================
-    // CHECK: Must check broadcasts every 5 tool usages
+    // HARD BLOCK: Must read team messages every 4 tool usages
+    // read_team_messages() satisfies this - any mode
+    // ========================================================================
+    if (state.commsToolCount >= TEAM_COMMS_CHECK_INTERVAL && !BROADCAST_CHECK_TOOLS.includes(toolName)) {
+      state.needsCommsCheck = true;
+      state.blockedCount++;
+      saveTracking(tracking);
+      console.log(blockResponse(
+        `[BLOCKED] MANDATORY team comms check! (${state.commsToolCount} tools since last check)\n\n` +
+        `REQUIRED: read_team_messages({include_swarms: true, limit: 5})\n\n` +
+        `You MUST check team messages every 4 tool calls. This is non-negotiable.\n` +
+        `Other agents may have critical updates for you. CHECK NOW.`
+      ));
+      return;
+    }
+
     // ========================================================================
-    if (state.toolUsageCount >= BROADCAST_CHECK_INTERVAL) {
+    // HARD BLOCK: Must read broadcasts every 5 tool usages
+    // read_team_messages({include_broadcasts: true}) satisfies this
+    // ========================================================================
+    if (state.broadcastToolCount >= BROADCAST_CHECK_INTERVAL && !BROADCAST_CHECK_TOOLS.includes(toolName)) {
       state.needsBroadcastCheck = true;
       state.blockedCount++;
       saveTracking(tracking);
       console.log(blockResponse(
-        `[BLOCKED] Time to check broadcasts! (${state.toolUsageCount} tools since last check)\n\n` +
-        `REQUIRED: read_team_messages({include_broadcasts: true, limit: 10})\n\n` +
-        `Stay informed about team updates. Other swarms might need your help!\n` +
-        `After checking, you can continue working.`
+        `[BLOCKED] MANDATORY broadcast check! (${state.broadcastToolCount} tools since last broadcast check)\n\n` +
+        `REQUIRED: read_team_messages({include_broadcasts: true, include_swarms: true, limit: 10})\n\n` +
+        `You MUST check broadcasts every 5 tool calls. This is non-negotiable.\n` +
+        `Team-wide announcements and status updates require your attention. CHECK NOW.`
       ));
       return;
     }
@@ -410,7 +419,7 @@ process.stdin.on('end', () => {
     // ========================================================================
     // CHECK: Must check help requests every 8 tool usages
     // ========================================================================
-    if (state.helpToolUsageCount >= HELP_CHECK_INTERVAL) {
+    if (state.helpToolUsageCount >= HELP_CHECK_INTERVAL && !HELP_CHECK_TOOLS.includes(toolName)) {
       state.needsHelpCheck = true;
       state.blockedCount++;
       saveTracking(tracking);
@@ -425,12 +434,20 @@ process.stdin.on('end', () => {
     }
 
     // ========================================================================
-    // WARN: Approaching broadcast check
+    // ALWAYS ALLOWED TOOLS - pass through after counter checks
+    // ========================================================================
+    if (ALWAYS_ALLOWED.includes(toolName)) {
+      saveTracking(tracking);
+      console.log(JSON.stringify({ continue: true }));
+      return;
+    }
+
+    // ========================================================================
+    // WARN: Approaching comms check
     // ========================================================================
-    if (state.toolUsageCount === BROADCAST_CHECK_INTERVAL - 1) {
-      // Don't block, just warn
+    if (state.commsToolCount === TEAM_COMMS_CHECK_INTERVAL - 1) {
       console.log(allowWithReminder(
-        `[HEADS UP] Next tool call will require broadcast check. Consider checking now with read_team_messages({include_broadcasts: true})`
+        `[HEADS UP] Next tool call will require team comms check. Do it now: read_team_messages({include_swarms: true, limit: 5})`
       ));
       // Don't return - continue to other checks
     }

package/dist/config/embeddingTimeouts.js

@@ -89,10 +89,10 @@ export const embeddingTimeouts = {
     },
     /**
      * Timeout for embedding generation during memory search (find_memory)
-     * Env: SPECMEM_FIND_EMBEDDING_TIMEOUT_MS (default: 60000 = 60s)
+     * Env: SPECMEM_FIND_EMBEDDING_TIMEOUT_MS (default: 120000 = 120s, increased from 60s to match cold-start)
      */
     get search() {
-        return this.master ?? parseTimeoutMs('SPECMEM_FIND_EMBEDDING_TIMEOUT_MS', 60000);
+        return this.master ?? parseTimeoutMs('SPECMEM_FIND_EMBEDDING_TIMEOUT_MS', 120000);
     },
     /**
      * Timeout for health check embedding tests
@@ -140,10 +140,10 @@ export const embeddingTimeouts = {
     /**
      * Code search/pointer lookup timeout
      * Used by find_code_pointers tool
-     * Env: SPECMEM_CODE_SEARCH_TIMEOUT (default: 60000 - increased from 30s)
+     * Env: SPECMEM_CODE_SEARCH_TIMEOUT (default: 120000 - increased from 60s to match cold-start initial timeout)
      */
     get codeSearch() {
-        return this.master ?? parseTimeoutMs('SPECMEM_CODE_SEARCH_TIMEOUT', 60000);
+        return this.master ?? parseTimeoutMs('SPECMEM_CODE_SEARCH_TIMEOUT', 120000);
     },
     /**
      * Search timeout for database queries in find_memory

package/dist/database.js

@@ -172,28 +172,70 @@ export class DatabaseManager {
         return undefined;
     }
     createPool() {
+        // Issue #11 FIX: All pool settings are env-var configurable with sensible defaults
+        const poolMax = parseInt(process.env['SPECMEM_DB_POOL_MAX'] || String(this.config.maxConnections || 20), 10);
+        const connectionTimeoutMillis = parseInt(process.env['SPECMEM_DB_CONNECTION_TIMEOUT_MS'] || String(this.config.connectionTimeout || 10000), 10);
+        const statementTimeoutMs = parseInt(process.env['SPECMEM_DB_STATEMENT_TIMEOUT_MS'] || '30000', 10);
+        const idleInTransactionTimeoutMs = parseInt(process.env['SPECMEM_DB_IDLE_TRANSACTION_TIMEOUT_MS'] || '60000', 10);
+        logger.info({
+            poolMax,
+            connectionTimeoutMillis,
+            statementTimeoutMs,
+            idleInTransactionTimeoutMs
+        }, 'Creating pool with configurable timeouts (Issue #11 fix)');
         return new Pool({
             host: this.config.host,
             port: this.config.port,
             database: this.config.database,
             user: this.config.user,
             password: this.config.password,
-            max: this.config.maxConnections,
+            max: poolMax,
             idleTimeoutMillis: this.config.idleTimeout,
-            connectionTimeoutMillis: this.config.connectionTimeout,
-            ssl: this.config.ssl
+            connectionTimeoutMillis: connectionTimeoutMillis,
+            ssl: this.config.ssl,
+            // Issue #11: Set statement_timeout and idle_in_transaction_session_timeout
+            // These prevent hung queries from blocking the pool over long sessions
+            statement_timeout: statementTimeoutMs,
+            idle_in_transaction_session_timeout: idleInTransactionTimeoutMs
         });
     }
     setupPoolEvents() {
+        // Issue #11 FIX: Enhanced pool error handler with connection details
         this.pool.on('error', (err) => {
-            logger.error({ err }, 'Unexpected pool error');
+            logger.error({
+                err,
+                totalCount: this.pool.totalCount,
+                idleCount: this.pool.idleCount,
+                waitingCount: this.pool.waitingCount
+            }, 'Unexpected pool error - logging pool health for diagnostics');
         });
         // SCHEMA ISOLATION FIX: pool.on('connect') doesn't wait for async callbacks!
         // The client is returned to the caller before await completes.
         // We still set search_path here for defense-in-depth, but critical paths
         // must use ensureSearchPath() explicitly to guarantee isolation.
         this.pool.on('connect', (client) => {
-            logger.debug('New client connected to pool');
+            // Issue #11 FIX: Set statement_timeout and idle_in_transaction_session_timeout
+            // on each new connection as defense-in-depth (in addition to pool-level config).
+            // This ensures timeouts apply even if the pool config is ignored by the driver.
+            const statementTimeoutMs = parseInt(process.env['SPECMEM_DB_STATEMENT_TIMEOUT_MS'] || '30000', 10);
+            const idleInTransactionTimeoutMs = parseInt(process.env['SPECMEM_DB_IDLE_TRANSACTION_TIMEOUT_MS'] || '60000', 10);
+            logger.debug({
+                totalCount: this.pool.totalCount,
+                idleCount: this.pool.idleCount,
+                waitingCount: this.pool.waitingCount
+            }, 'New client connected to pool');
+            // Set statement_timeout and idle_in_transaction_session_timeout via SET command
+            // This is fire-and-forget (pg doesn't await connect handlers)
+            client.query('SET statement_timeout TO ' + statementTimeoutMs)
+                .then(() => {
+                return client.query('SET idle_in_transaction_session_timeout TO ' + idleInTransactionTimeoutMs);
+            })
+                .then(() => {
+                logger.debug({ statementTimeoutMs, idleInTransactionTimeoutMs }, 'Set query timeouts on new pool connection');
+            })
+                .catch((error) => {
+                logger.error({ error }, 'Failed to set query timeouts on new connection');
+            });
             // If we have a current schema, set search_path on this new connection
             // NOTE: This is fire-and-forget because pg doesn't await connect handlers
             // Critical code paths should call ensureSearchPath() explicitly
@@ -211,7 +253,11 @@ export class DatabaseManager {
             }
         });
         this.pool.on('remove', () => {
-            logger.debug('Client removed from pool');
+            logger.debug({
+                totalCount: this.pool.totalCount,
+                idleCount: this.pool.idleCount,
+                waitingCount: this.pool.waitingCount
+            }, 'Client removed from pool');
         });
     }
     async initialize() {

package/dist/db/bigBrainMigrations.js

@@ -636,8 +636,8 @@ export class BigBrainMigrations {
             )
           );
 
-          -- index for content hash deduplication
-          CREATE UNIQUE INDEX IF NOT EXISTS idx_codebase_files_content_hash
+          -- index for content hash lookup (NOT unique - multiple files can share same hash)
+          CREATE INDEX IF NOT EXISTS idx_codebase_files_content_hash
             ON codebase_files(content_hash);
 
           -- full-text search index for code search
@@ -4203,10 +4203,11 @@ export class BigBrainMigrations {
           CREATE INDEX IF NOT EXISTS idx_memories_project_path_type
             ON memories(project_path, memory_type);
 
-          -- Composite index for codebase_files project + file_path
-          -- Used by: codebaseTools queries filtering by project_path and file_path
-          CREATE INDEX IF NOT EXISTS idx_codebase_files_project_path_file
-            ON codebase_files(project_path, file_path);
+          -- UNIQUE composite index for codebase_files project + file_path
+          -- MUST be UNIQUE for ON CONFLICT (file_path, project_path) upsert to work
+          -- Used by: changeHandler.updateCodebaseFiles, codebaseTools queries
+          CREATE UNIQUE INDEX IF NOT EXISTS idx_codebase_files_path_project_unique
+            ON codebase_files(file_path, project_path);
 
           -- Composite index for codebase_files project + content_hash (dedup check)
           -- Used by: codebaseIndexer for hash lookups per project

package/dist/db/memoryDrilldown.sql

@@ -52,7 +52,7 @@ CREATE TABLE IF NOT EXISTS team_member_conversations (
 );
 
 CREATE INDEX IF NOT EXISTS idx_team_member_conversations_memory ON team_member_conversations(memory_id);
-CREATE INDEX IF NOT EXISTS idx_team_member_conversations_team member ON team_member_conversations(team_member_id);
+CREATE INDEX IF NOT EXISTS idx_team_member_conversations_team_member ON team_member_conversations(team_member_id);
 CREATE INDEX IF NOT EXISTS idx_team_member_conversations_time ON team_member_conversations(timestamp);
 
 -- HELPER FUNCTIONS

package/dist/db/projectSchemaInit.sql

@@ -266,6 +266,27 @@ INSERT INTO team_channels (name, channel_type, created_by, project_path)
 SELECT 'team-broadcast', 'broadcast', 'system', '/'
 WHERE NOT EXISTS (SELECT 1 FROM team_channels WHERE name = 'team-broadcast' AND channel_type = 'broadcast');
 
+-- ============================================================================
+-- TEAM MEMBER CONVERSATIONS TABLE
+-- Stores the conversation context that spawned a memory
+-- Required by MemoryDrilldown.js for getMemoryFull / drill_down
+-- ============================================================================
+CREATE TABLE IF NOT EXISTS team_member_conversations (
+    id BIGSERIAL PRIMARY KEY,
+    memory_id UUID NOT NULL,
+    team_member_id VARCHAR(255) NOT NULL,
+    team_member_name VARCHAR(255),
+    timestamp TIMESTAMPTZ DEFAULT NOW(),
+    summary TEXT,
+    full_transcript TEXT,
+    message_count INTEGER,
+    created_at TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_team_member_conversations_memory ON team_member_conversations(memory_id);
+CREATE INDEX IF NOT EXISTS idx_team_member_conversations_team_member ON team_member_conversations(team_member_id);
+CREATE INDEX IF NOT EXISTS idx_team_member_conversations_time ON team_member_conversations(timestamp);
+
 -- ============================================================================
 -- END - Core data uses PUBLIC schema with project_path filtering
 -- ============================================================================