@context-forge/mcp 0.6.25 → 0.6.27

package/dist/tools/resolveProjectId.d.ts

@@ -1,11 +1,12 @@
 /**
  * Resolves the project ID to use for an MCP tool call.
- * Accepts a project ID or name (case-insensitive name match).
+ * Accepts a project ID, name (case-insensitive), or omit to resolve from CWD.
  *
  * Priority:
  * 1. If value looks like an auto-generated ID, return it directly (no store lookup)
  * 2. Otherwise, search by ID then by name
- * 3. Throws a descriptive error with usage guidance
+ * 3. If no explicit ID, resolve from CWD (match against registered project/worktree paths)
+ * 4. Throws a descriptive error with usage guidance
  *
  * @param explicitId - projectId or project name from MCP tool arguments (may be undefined)
  */

package/dist/tools/resolveProjectId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveProjectId.d.ts","sourceRoot":"","sources":["../../src/tools/resolveProjectId.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAkCjB"}
+{"version":3,"file":"resolveProjectId.d.ts","sourceRoot":"","sources":["../../src/tools/resolveProjectId.ts"],"names":[],"mappings":"AA2CA;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CA2CjB"}

package/dist/tools/resolveProjectId.js

@@ -1,31 +1,69 @@
 import { FileProjectStore } from '@context-forge/core/node';
 /** Project IDs start with the "project_" prefix */
 const PROJECT_ID_RE = /^project_/;
+/**
+ * Match CWD against registered project paths and worktree paths.
+ * Returns the best match (longest path wins; worktree over project root on tie).
+ */
+function findProjectByCwd(projects) {
+    const cwd = process.cwd();
+    const candidates = [];
+    for (const p of projects) {
+        if (p.projectPath) {
+            candidates.push({ id: p.id, path: p.projectPath, isWorktree: false });
+        }
+        for (const wt of p.worktrees ?? []) {
+            if (wt.worktreePath) {
+                candidates.push({ id: p.id, path: wt.worktreePath, isWorktree: true });
+            }
+        }
+    }
+    const matches = candidates
+        .filter((c) => {
+        const path = c.path.endsWith('/') ? c.path.slice(0, -1) : c.path;
+        return cwd === path || cwd.startsWith(path + '/');
+    })
+        .sort((a, b) => {
+        const lenDiff = b.path.length - a.path.length;
+        if (lenDiff !== 0)
+            return lenDiff;
+        if (a.isWorktree && !b.isWorktree)
+            return -1;
+        if (!a.isWorktree && b.isWorktree)
+            return 1;
+        return 0;
+    });
+    return matches.length > 0 ? matches[0].id : null;
+}
 /**
  * Resolves the project ID to use for an MCP tool call.
- * Accepts a project ID or name (case-insensitive name match).
+ * Accepts a project ID, name (case-insensitive), or omit to resolve from CWD.
  *
  * Priority:
  * 1. If value looks like an auto-generated ID, return it directly (no store lookup)
  * 2. Otherwise, search by ID then by name
- * 3. Throws a descriptive error with usage guidance
+ * 3. If no explicit ID, resolve from CWD (match against registered project/worktree paths)
+ * 4. Throws a descriptive error with usage guidance
  *
  * @param explicitId - projectId or project name from MCP tool arguments (may be undefined)
  */
 export async function resolveProjectId(explicitId) {
-    if (!explicitId) {
-        throw new Error('No project ID provided. Pass a projectId argument (ID or name).\n' +
-            '  Use project_list to see available projects.\n' +
-            '  Use project_create to register a new project.');
-    }
     // Fast path: project IDs pass through without store lookup
-    if (PROJECT_ID_RE.test(explicitId)) {
+    if (explicitId && PROJECT_ID_RE.test(explicitId)) {
         return explicitId;
     }
-    // Name-based lookup: search all projects
+    // Need to consult the store for name lookup or CWD resolution
+    let projects;
     try {
         const store = new FileProjectStore();
-        const projects = await store.getAll();
+        projects = await store.getAll();
+    }
+    catch {
+        throw new Error('No project ID provided and project store is unavailable.\n' +
+            '  Use project_list to see available projects.\n' +
+            '  Use project_create to register a new project.');
+    }
+    if (explicitId) {
         // Try exact ID match first (for non-standard IDs)
         const byId = projects.find((p) => p.id === explicitId);
         if (byId)
@@ -35,10 +73,14 @@ export async function resolveProjectId(explicitId) {
         const byName = projects.find((p) => p.name?.toLowerCase() === lower);
         if (byName)
             return byName.id;
+        throw new Error(`Project not found: '${explicitId}'. Use the project_list tool to see available projects.`);
     }
-    catch {
-        // Store unavailable — fall through to error
-    }
-    throw new Error(`Project not found: '${explicitId}'. Use the project_list tool to see available projects.`);
+    // No explicit ID — resolve from CWD
+    const cwdMatch = findProjectByCwd(projects);
+    if (cwdMatch)
+        return cwdMatch;
+    throw new Error('No project ID provided. Pass a projectId argument (ID or name).\n' +
+        '  Use project_list to see available projects.\n' +
+        '  Use project_create to register a new project.');
 }
 //# sourceMappingURL=resolveProjectId.js.map

package/dist/tools/resolveProjectId.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveProjectId.js","sourceRoot":"","sources":["../../src/tools/resolveProjectId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,mDAAmD;AACnD,MAAM,aAAa,GAAG,WAAW,CAAC;AAElC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,UAAmB;IAEnB,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACb,mEAAmE;YACjE,iDAAiD;YACjD,iDAAiD,CACpD,CAAC;IACJ,CAAC;IAED,2DAA2D;IAC3D,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,yCAAyC;IACzC,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QAEtC,kDAAkD;QAClD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC;QACvD,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QAEzB,kCAAkC;QAClC,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC;QACrE,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,EAAE,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,4CAA4C;IAC9C,CAAC;IAED,MAAM,IAAI,KAAK,CACb,uBAAuB,UAAU,yDAAyD,CAC3F,CAAC;AACJ,CAAC"}
+{"version":3,"file":"resolveProjectId.js","sourceRoot":"","sources":["../../src/tools/resolveProjectId.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@context-forge/mcp",
-  "version": "0.6.25",
+  "version": "0.6.27",
   "description": "MCP server for Context Forge — generates structured AI context prompts from project configuration and templates",
   "type": "module",
   "main": "dist/index.js",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",
     "zod": "^4.1.5",
-    "@context-forge/core": "0.6.25"
+    "@context-forge/core": "0.6.27"
   },
   "devDependencies": {
     "@types/node": "^25.3.0",