session-collab-mcp 0.3.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "session-collab-mcp",
-  "version": "0.3.0",
+  "version": "0.4.2",
   "description": "MCP server for Claude Code session collaboration - prevents conflicts between parallel sessions",
   "type": "module",
   "bin": {
@@ -16,8 +16,6 @@
     "start": "node dist/cli.js",
     "start:dev": "tsx src/cli.ts",
     "prepublishOnly": "npm run build",
-    "dev": "wrangler dev",
-    "deploy": "wrangler deploy",
     "typecheck": "tsc --noEmit",
     "lint": "eslint src/",
     "test": "vitest"
@@ -28,12 +26,10 @@
     "zod": "^3.24.1"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20241218.0",
     "@types/better-sqlite3": "^7.6.12",
     "eslint": "^9.17.0",
     "tsup": "^8.5.1",
     "typescript": "^5.7.2",
-    "vitest": "^2.1.8",
-    "wrangler": "^3.99.0"
+    "vitest": "^2.1.8"
   }
 }

package/src/auth/handlers.ts

@@ -1,6 +1,6 @@
 // Authentication API handlers
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from '../db/sqlite-adapter.js';
 import { hashPassword, verifyPassword, validatePasswordStrength } from './password';
 import { createAccessToken, createRefreshToken, verifyJwt, getTokenExpiry } from './jwt';
 import {

package/src/auth/middleware.ts

@@ -1,6 +1,6 @@
 // Authentication middleware
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from '../db/sqlite-adapter.js';
 import { verifyJwt } from './jwt';
 import { getApiTokenByHash, updateApiTokenLastUsed } from '../db/auth-queries';
 import { sha256, timingSafeEqual } from '../utils/crypto';

package/src/auth/password.ts

@@ -50,7 +50,7 @@ export async function verifyPassword(password: string, stored: string): Promise<
   const hash = await crypto.subtle.deriveBits(
     {
       name: 'PBKDF2',
-      salt,
+      salt: salt as BufferSource,
       iterations,
       hash: 'SHA-256',
     },

package/src/cli.ts

@@ -107,7 +107,7 @@ async function main(): Promise<void> {
 
         case 'tools/call': {
           const result = await handleMcpRequest(
-            db as unknown as import('@cloudflare/workers-types').D1Database,
+            db,
             params.name,
             params.arguments ?? {}
           );

package/src/db/auth-queries.ts

@@ -1,6 +1,6 @@
 // Database queries for authentication
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from './sqlite-adapter.js';
 import type { User, UserPublic, ApiToken, ApiTokenPublic, RefreshToken } from './types';
 import { generateId, sha256 } from '../utils/crypto';
 

package/src/db/queries.ts

@@ -1,6 +1,6 @@
 // Database queries for Session Collaboration MCP
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from './sqlite-adapter.js';
 import type {
   Session,
   Claim,

package/src/mcp/server.ts

@@ -1,6 +1,6 @@
 // MCP Server implementation for Session Collaboration
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from '../db/sqlite-adapter.js';
 import {
   JsonRpcRequestSchema,
   type JsonRpcRequest,
@@ -22,13 +22,45 @@ import type { AuthContext } from '../auth/types';
 
 const SERVER_INFO: McpServerInfo = {
   name: 'session-collab-mcp',
-  version: '0.2.0',
+  version: '0.3.0',
 };
 
 const CAPABILITIES: McpCapabilities = {
   tools: {},
 };
 
+const SERVER_INSTRUCTIONS = `
+# Session Collaboration
+
+This MCP server coordinates multiple Claude Code sessions working on the same codebase.
+
+## Required Behaviors
+
+1. **On conversation start**: Immediately call \`collab_session_start\` with:
+   - project_root: Current working directory
+   - name: Descriptive session name (e.g., "feature-auth", "bugfix-api")
+
+2. **Before editing any file**: Call \`collab_check\` with the file path to verify no conflicts
+
+3. **If conflicts detected**:
+   - Show warning to user
+   - Ask if they want to proceed or coordinate
+   - Consider using \`collab_message_send\` to notify other session
+
+4. **For significant changes**: Call \`collab_claim\` before starting work on files
+
+5. **When done with files**: Call \`collab_release\` to free them for others
+
+6. **On conversation end**: Call \`collab_session_end\` to clean up
+
+## Best Practices
+
+- Claim files early, release when done
+- Use descriptive intents when claiming (e.g., "Refactoring auth module")
+- Check for messages periodically with \`collab_message_list\`
+- Record architectural decisions with \`collab_decision_add\`
+`.trim();
+
 // Combine all tools
 const ALL_TOOLS: McpTool[] = [...sessionTools, ...claimTools, ...messageTools, ...decisionTools];
 
@@ -74,6 +106,7 @@ export class McpServer {
       protocolVersion: '2024-11-05',
       serverInfo: SERVER_INFO,
       capabilities: CAPABILITIES,
+      instructions: SERVER_INSTRUCTIONS,
     });
   }
 

package/src/mcp/tools/claim.ts

@@ -1,6 +1,6 @@
 // Claim management tools (WIP declarations)
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from '../../db/sqlite-adapter.js';
 import type { McpTool, McpToolResult } from '../protocol';
 import { createToolResult } from '../protocol';
 import type { ClaimScope } from '../../db/types';

package/src/mcp/tools/decision.ts

@@ -1,6 +1,6 @@
 // Decision recording tools
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from '../../db/sqlite-adapter.js';
 import type { McpTool, McpToolResult } from '../protocol';
 import { createToolResult } from '../protocol';
 import type { DecisionCategory } from '../../db/types';

package/src/mcp/tools/message.ts

@@ -1,6 +1,6 @@
 // Inter-session messaging tools
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from '../../db/sqlite-adapter.js';
 import type { McpTool, McpToolResult } from '../protocol';
 import { createToolResult } from '../protocol';
 import { sendMessage, listMessages, getSession } from '../../db/queries';

package/src/mcp/tools/session.ts

@@ -1,6 +1,6 @@
 // Session management tools
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from '../../db/sqlite-adapter.js';
 import type { McpTool, McpToolResult } from '../protocol';
 import { createToolResult } from '../protocol';
 import {

package/src/tokens/handlers.ts

@@ -1,6 +1,6 @@
 // Token management API handlers
 
-import type { D1Database } from '@cloudflare/workers-types';
+import type { D1Database } from '../db/sqlite-adapter.js';
 import { z } from 'zod';
 import { generateApiToken } from './generator';
 import { createApiToken, listApiTokens, revokeApiToken } from '../db/auth-queries';