@agent-deck/backend 1.10.1 → 1.10.2

package/dist/scope/repo-deck.js

@@ -0,0 +1,63 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RepoDeckManifestError = void 0;
+exports.parseRepoDeckManifest = parseRepoDeckManifest;
+exports.repoDeckManifestFilePath = repoDeckManifestFilePath;
+exports.loadRepoDeckManifest = loadRepoDeckManifest;
+exports.formatRepoDeckManifest = formatRepoDeckManifest;
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const shared_1 = require("@agent-deck/shared");
+class RepoDeckManifestError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'RepoDeckManifestError';
+    }
+}
+exports.RepoDeckManifestError = RepoDeckManifestError;
+/** Lightweight parser — avoids a YAML dependency for the single-field MVP manifest. */
+function parseRepoDeckManifest(content) {
+    const deckIdMatch = content.match(/^deck_id:\s*["']?([0-9a-f-]{36})["']?\s*$/im);
+    if (!deckIdMatch) {
+        throw new RepoDeckManifestError('deck_id is required in .agent-deck/deck.yaml');
+    }
+    const nameMatch = content.match(/^name:\s*["']?(.+?)["']?\s*$/im);
+    const raw = {
+        deck_id: deckIdMatch[1],
+        ...(nameMatch ? { name: nameMatch[1].trim() } : {}),
+    };
+    return shared_1.RepoDeckManifestSchema.parse(raw);
+}
+function repoDeckManifestFilePath(workspaceRoot) {
+    return node_path_1.default.join(node_path_1.default.resolve(workspaceRoot), shared_1.REPO_DECK_MANIFEST_PATH);
+}
+async function loadRepoDeckManifest(workspaceRoot) {
+    const filePath = repoDeckManifestFilePath(workspaceRoot);
+    try {
+        const content = await promises_1.default.readFile(filePath, 'utf8');
+        return parseRepoDeckManifest(content);
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            return null;
+        }
+        if (error instanceof RepoDeckManifestError) {
+            throw error;
+        }
+        throw new RepoDeckManifestError(error instanceof Error ? error.message : 'Failed to read .agent-deck/deck.yaml');
+    }
+}
+function formatRepoDeckManifest(deckId, name) {
+    const lines = [
+        '# Link this repo to an Agent Deck (copy to .agent-deck/deck.yaml in your project)',
+        `deck_id: ${deckId}`,
+    ];
+    if (name) {
+        lines.push(`name: ${name}`);
+    }
+    return lines.join('\n') + '\n';
+}
+//# sourceMappingURL=repo-deck.js.map

package/dist/scope/repo-deck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"repo-deck.js","sourceRoot":"","sources":["../../src/scope/repo-deck.ts"],"names":[],"mappings":";;;;;;AAYA,sDAaC;AAED,4DAEC;AAED,oDAiBC;AAED,wDASC;AA3DD,gEAAkC;AAClC,0DAA6B;AAC7B,+CAAuG;AAEvG,MAAa,qBAAsB,SAAQ,KAAK;IAC9C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;IACtC,CAAC;CACF;AALD,sDAKC;AAED,uFAAuF;AACvF,SAAgB,qBAAqB,CAAC,OAAe;IACnD,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACjF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,qBAAqB,CAAC,8CAA8C,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG;QACV,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;QACvB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACpD,CAAC;IAEF,OAAO,+BAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,wBAAwB,CAAC,aAAqB;IAC5D,OAAO,mBAAI,CAAC,IAAI,CAAC,mBAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,gCAAuB,CAAC,CAAC;AACzE,CAAC;AAEM,KAAK,UAAU,oBAAoB,CAAC,aAAqB;IAC9D,MAAM,QAAQ,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;IAEzD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACpD,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;YAC3C,MAAM,KAAK,CAAC;QACd,CAAC;QACD,MAAM,IAAI,qBAAqB,CAC7B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,sCAAsC,CAChF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc,EAAE,IAAa;IAClE,MAAM,KAAK,GAAG;QACZ,mFAAmF;QACnF,YAAY,MAAM,EAAE;KACrB,CAAC;IACF,IAAI,IAAI,EAAE,CAAC;QACT,KAAK,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AACjC,CAAC"}

package/dist/test-local-mcp-e2e.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env tsx
+export {};
+//# sourceMappingURL=test-local-mcp-e2e.d.ts.map

package/dist/test-local-mcp-e2e.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-local-mcp-e2e.d.ts","sourceRoot":"","sources":["../src/test-local-mcp-e2e.ts"],"names":[],"mappings":""}

package/dist/test-local-mcp-e2e.js

@@ -0,0 +1,104 @@
+#!/usr/bin/env tsx
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const local_mcp_server_manager_1 = require("./services/local-mcp-server-manager");
+const config_manager_1 = require("./services/config-manager");
+const service_manager_1 = require("./services/service-manager");
+const mcp_client_manager_1 = require("./services/mcp-client-manager");
+const oauth_manager_1 = require("./services/oauth-manager");
+const database_1 = require("./models/database");
+async function testLocalMCPServerE2E() {
+    console.log('🧪 Testing Local MCP Server End-to-End Flow...\n');
+    // Initialize managers
+    const db = new database_1.DatabaseManager();
+    const configManager = new config_manager_1.ConfigManager();
+    const localManager = new local_mcp_server_manager_1.LocalMCPServerManager();
+    // Create MCP client manager with local server manager
+    const mcpClient = new mcp_client_manager_1.MCPClientManager();
+    mcpClient.localServerManager = localManager;
+    // Create OAuth manager (required by ServiceManager)
+    const oauthManager = new oauth_manager_1.OAuthManager();
+    const serviceManager = new service_manager_1.ServiceManager(db, mcpClient, oauthManager);
+    try {
+        // Test 1: Import local servers from configuration
+        console.log('📋 Test 1: Importing local servers from configuration...');
+        const config = {
+            mcpServers: {
+                memory: {
+                    command: 'npx',
+                    args: ['-y', '@modelcontextprotocol/server-memory']
+                }
+            }
+        };
+        const services = await serviceManager.importLocalServersFromConfig(JSON.stringify(config));
+        console.log('✅ Imported services:', services.length);
+        services.forEach(service => {
+            console.log(`  - ${service.name} (${service.id}): ${service.localCommand} ${service.localArgs?.join(' ')}`);
+        });
+        if (services.length === 0) {
+            throw new Error('No services were imported');
+        }
+        const memoryService = services[0];
+        // Test 2: Start the local MCP server
+        console.log('\n📋 Test 2: Starting local MCP server...');
+        await serviceManager.startLocalServer(memoryService.id);
+        console.log('✅ Local MCP server started');
+        // Test 3: Discover tools (using unified API)
+        console.log('\n📋 Test 3: Discovering tools (unified API)...');
+        const tools = await serviceManager.discoverServiceTools(memoryService.id);
+        console.log('✅ Discovered tools:', tools.length);
+        tools.forEach(tool => {
+            console.log(`  - ${tool.name}: ${tool.description}`);
+        });
+        if (tools.length === 0) {
+            console.log('⚠️ No tools discovered - this might be normal for some servers');
+        }
+        // Test 4: Call a tool (using unified API)
+        console.log('\n📋 Test 4: Calling tool (unified API)...');
+        if (tools.length > 0) {
+            const firstTool = tools[0];
+            console.log(`  Calling tool: ${firstTool.name}`);
+            try {
+                const result = await serviceManager.callServiceTool(memoryService.id, firstTool.name, {});
+                console.log('✅ Tool call result:', result);
+            }
+            catch (error) {
+                console.log('⚠️ Tool call failed (this might be expected):', error.message);
+            }
+        }
+        else {
+            console.log('⚠️ Skipping tool call - no tools available');
+        }
+        // Test 5: Check service health (using unified API)
+        console.log('\n📋 Test 5: Checking service health (unified API)...');
+        const health = await serviceManager.checkServiceHealth(memoryService.id);
+        console.log('✅ Service health:', health);
+        // Test 6: Get local server status
+        console.log('\n📋 Test 6: Getting local server status...');
+        const status = await serviceManager.getLocalServerStatus(memoryService.id);
+        console.log('✅ Local server status:', status);
+        // Test 7: Stop the local MCP server
+        console.log('\n📋 Test 7: Stopping local MCP server...');
+        await serviceManager.stopLocalServer(memoryService.id);
+        console.log('✅ Local MCP server stopped');
+        // Test 8: Verify server is stopped
+        console.log('\n📋 Test 8: Verifying server is stopped...');
+        const finalStatus = await serviceManager.getLocalServerStatus(memoryService.id);
+        console.log('✅ Final status:', finalStatus);
+        console.log('\n🎉 All end-to-end tests passed! Local MCP server integration is working correctly.');
+    }
+    catch (error) {
+        console.error('❌ End-to-end test failed:', error);
+        process.exit(1);
+    }
+    finally {
+        // Cleanup
+        console.log('\n🧹 Cleaning up...');
+        await localManager.cleanup();
+        await db.close();
+        console.log('✅ Cleanup completed');
+    }
+}
+// Run the end-to-end test
+testLocalMCPServerE2E().catch(console.error);
+//# sourceMappingURL=test-local-mcp-e2e.js.map

package/dist/test-local-mcp-e2e.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-local-mcp-e2e.js","sourceRoot":"","sources":["../src/test-local-mcp-e2e.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-deck/backend",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "Agent Deck backend API, MCP server, and vault",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -46,7 +46,7 @@
     "prepublishOnly": "node ../../scripts/pre-publish-check.mjs && npm run build"
   },
   "dependencies": {
-    "@agent-deck/shared": "^1.10.1",
+    "@agent-deck/shared": "^1.10.2",
     "@fastify/cors": "^10.0.0",
     "@fastify/static": "^8.0.0",
     "@fastify/websocket": "^11.2.0",

package/dist/config/mcp-endpoint.d.ts

@@ -1,6 +0,0 @@
-/** Default MCP port for `agent-deck start` (dev repo uses AGENT_DECK_MCP_PORT=3001). */
-export declare const DEFAULT_AGENT_DECK_MCP_PORT = 1110;
-export declare function resolveAgentDeckMcpHost(): string;
-export declare function resolveAgentDeckMcpPort(): number;
-export declare function resolveAgentDeckMcpUrl(): string;
-//# sourceMappingURL=mcp-endpoint.d.ts.map

package/dist/config/mcp-endpoint.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mcp-endpoint.d.ts","sourceRoot":"","sources":["../../src/config/mcp-endpoint.ts"],"names":[],"mappings":"AAAA,wFAAwF;AACxF,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAEhD,wBAAgB,uBAAuB,IAAI,MAAM,CAEhD;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAGhD;AAED,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C"}

package/dist/config/mcp-endpoint.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_AGENT_DECK_MCP_PORT = void 0;
-exports.resolveAgentDeckMcpHost = resolveAgentDeckMcpHost;
-exports.resolveAgentDeckMcpPort = resolveAgentDeckMcpPort;
-exports.resolveAgentDeckMcpUrl = resolveAgentDeckMcpUrl;
-/** Default MCP port for `agent-deck start` (dev repo uses AGENT_DECK_MCP_PORT=3001). */
-exports.DEFAULT_AGENT_DECK_MCP_PORT = 1110;
-function resolveAgentDeckMcpHost() {
-    return process.env.AGENT_DECK_HOST?.trim() || process.env.HOST?.trim() || '127.0.0.1';
-}
-function resolveAgentDeckMcpPort() {
-    const parsed = Number.parseInt(process.env.AGENT_DECK_MCP_PORT ?? '', 10);
-    return Number.isFinite(parsed) ? parsed : exports.DEFAULT_AGENT_DECK_MCP_PORT;
-}
-function resolveAgentDeckMcpUrl() {
-    return `http://${resolveAgentDeckMcpHost()}:${resolveAgentDeckMcpPort()}/mcp`;
-}
-//# sourceMappingURL=mcp-endpoint.js.map

package/dist/config/mcp-endpoint.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mcp-endpoint.js","sourceRoot":"","sources":["../../src/config/mcp-endpoint.ts"],"names":[],"mappings":";;;AAGA,0DAEC;AAED,0DAGC;AAED,wDAEC;AAdD,wFAAwF;AAC3E,QAAA,2BAA2B,GAAG,IAAI,CAAC;AAEhD,SAAgB,uBAAuB;IACrC,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,WAAW,CAAC;AACxF,CAAC;AAED,SAAgB,uBAAuB;IACrC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1E,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,mCAA2B,CAAC;AACxE,CAAC;AAED,SAAgB,sBAAsB;IACpC,OAAO,UAAU,uBAAuB,EAAE,IAAI,uBAAuB,EAAE,MAAM,CAAC;AAChF,CAAC"}