@claudetools/tools 0.7.2 → 0.7.3

package/dist/helpers/config.d.ts

@@ -34,7 +34,8 @@ export declare function resolveProjectId(): string;
 export declare function resolveProjectIdAsync(): Promise<string>;
 /**
  * Gets the default project ID (synchronous version)
- * Checks session-context.md first, then config, then falls back to cwd resolution
+ * ALWAYS checks session-context.md first (even if cached), then config, then falls back to cwd resolution
+ * This handles race conditions where MCP server starts before session-start hook writes the file
  */
 export declare function getDefaultProjectId(): string;
 /**

package/dist/helpers/config.js

@@ -100,11 +100,21 @@ export function resolveProjectId() {
  * Should be called during server startup
  */
 export async function resolveProjectIdAsync() {
-    // Return cached result if available
+    // ALWAYS check session-context.md first (even if cached) - handles race condition
+    // where MCP server starts before Claude Code's session-start hook writes the file
+    const sessionProjectId = getProjectIdFromSessionContext();
+    if (sessionProjectId) {
+        if (resolvedProjectId !== sessionProjectId) {
+            mcpLogger.info('MEMORY', `Project resolved from session context: ${sessionProjectId} (was: ${resolvedProjectId})`);
+            resolvedProjectId = sessionProjectId;
+        }
+        return resolvedProjectId;
+    }
+    // Return cached result if available (and no session-context.md)
     if (resolvedProjectId) {
         return resolvedProjectId;
     }
-    // Check environment variable first
+    // Check environment variable
     if (process.env.CLAUDETOOLS_PROJECT_ID) {
         const envProjectId = process.env.CLAUDETOOLS_PROJECT_ID;
         // Validate UUID format
@@ -116,14 +126,6 @@ export async function resolveProjectIdAsync() {
         mcpLogger.debug('MEMORY', `Using project ID from env: ${resolvedProjectId}`);
         return resolvedProjectId;
     }
-    // Check session-context.md (written by Claude Code's session-start hook)
-    // This is the most reliable source since MCP server's cwd isn't the project dir
-    const sessionProjectId = getProjectIdFromSessionContext();
-    if (sessionProjectId) {
-        resolvedProjectId = sessionProjectId;
-        mcpLogger.info('MEMORY', `Project resolved from session context: ${resolvedProjectId}`);
-        return resolvedProjectId;
-    }
     const cwd = process.cwd();
     // Check projects.json cache
     const binding = findProjectBinding(cwd);
@@ -165,16 +167,23 @@ export async function resolveProjectIdAsync() {
 let _defaultProjectId = null;
 /**
  * Gets the default project ID (synchronous version)
- * Checks session-context.md first, then config, then falls back to cwd resolution
+ * ALWAYS checks session-context.md first (even if cached), then config, then falls back to cwd resolution
+ * This handles race conditions where MCP server starts before session-start hook writes the file
  */
 export function getDefaultProjectId() {
-    if (_defaultProjectId) {
-        return _defaultProjectId;
-    }
-    // Check session-context.md first (most reliable for MCP server)
+    // ALWAYS check session-context.md first - it may have been written after we cached a fallback value
+    // This handles the race condition where MCP server starts before Claude Code's session-start hook runs
     const sessionProjectId = getProjectIdFromSessionContext();
     if (sessionProjectId) {
-        _defaultProjectId = sessionProjectId;
+        // Update cache if different (session-context.md is authoritative)
+        if (_defaultProjectId !== sessionProjectId) {
+            mcpLogger.debug('MEMORY', `Updating project ID from session-context: ${sessionProjectId} (was: ${_defaultProjectId})`);
+            _defaultProjectId = sessionProjectId;
+        }
+        return _defaultProjectId;
+    }
+    // If we have a cached value and no session-context.md, use cache
+    if (_defaultProjectId) {
         return _defaultProjectId;
     }
     // Try config second
@@ -198,10 +207,19 @@ export function getDefaultProjectId() {
  * Async version for server startup
  */
 export async function getDefaultProjectIdAsync() {
+    // ALWAYS check session-context.md first - same as sync version
+    const sessionProjectId = getProjectIdFromSessionContext();
+    if (sessionProjectId) {
+        if (_defaultProjectId !== sessionProjectId) {
+            mcpLogger.debug('MEMORY', `Updating project ID from session-context (async): ${sessionProjectId} (was: ${_defaultProjectId})`);
+            _defaultProjectId = sessionProjectId;
+        }
+        return _defaultProjectId;
+    }
     if (_defaultProjectId) {
         return _defaultProjectId;
     }
-    // Try config first
+    // Try config
     if (config.defaultProjectId) {
         if (!isValidProjectId(config.defaultProjectId)) {
             // Legacy format - convert to local_ format instead of throwing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@claudetools/tools",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Persistent AI memory, task management, and codebase intelligence for Claude Code",
   "type": "module",
   "main": "dist/index.js",