@compilr-dev/cli 0.5.12 → 0.5.13

package/dist/settings/mcp-config.js

@@ -1,18 +1,14 @@
 /**
- * MCP Configuration Loader
+ * MCP Configuration Loader — CLI wrapper
  *
- * Loads MCP server configs from:
- *   1. Global: ~/.compilr-dev/mcp.json
- *   2. Per-project: <projectRoot>/.compilr-dev/mcp.json
- *
- * Project config overrides global config (by server name).
- * Format is compatible with Claude Desktop / Gemini CLI.
+ * Types and file I/O come from @compilr-dev/sdk.
+ * This module adds CLI-specific path helpers (global + per-project).
  */
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
 import * as path from 'path';
+import { loadMCPServers, saveMCPServerEntry, getServerNames, } from '@compilr-dev/sdk';
 import { getDataPath } from './paths.js';
 // =============================================================================
-// Config Loading
+// CLI-specific path helpers
 // =============================================================================
 /**
  * Get the global MCP config file path.
@@ -26,118 +22,36 @@ export function getMCPConfigPath() {
 export function getProjectMCPConfigPath(projectRoot) {
     return path.join(projectRoot, '.compilr-dev', 'mcp.json');
 }
-/**
- * Read and parse an mcp.json file. Returns empty servers on any error.
- */
-function readMCPConfigFile(filePath) {
-    try {
-        if (!existsSync(filePath)) {
-            return {};
-        }
-        const data = readFileSync(filePath, 'utf-8');
-        const parsed = JSON.parse(data);
-        if (parsed.mcpServers && typeof parsed.mcpServers === 'object') {
-            return parsed.mcpServers;
-        }
-        return {};
-    }
-    catch {
-        return {};
-    }
-}
-/**
- * Convert an MCPServerEntry to a ResolvedMCPServer.
- * Returns null if the entry is invalid (neither command nor url).
- */
-function resolveEntry(name, entry) {
-    if (entry.disabled) {
-        return null;
-    }
-    if (entry.command) {
-        return {
-            name,
-            transport: 'stdio',
-            command: entry.command,
-            args: entry.args,
-            env: entry.env,
-            cwd: entry.cwd,
-            timeout: entry.timeout,
-        };
-    }
-    if (entry.url) {
-        return {
-            name,
-            transport: 'http',
-            url: entry.url,
-            headers: entry.headers,
-            timeout: entry.timeout,
-        };
-    }
-    // Neither command nor url — invalid entry
-    return null;
-}
+// =============================================================================
+// CLI-specific wrappers (delegate to SDK with resolved paths)
+// =============================================================================
 /**
  * Load MCP server configs from global and project-level config files.
  * Project configs override global by server name.
- *
- * @param projectRoot - Optional project root for per-project config
- * @returns Array of resolved MCP server configs
  */
 export function loadMCPConfig(projectRoot) {
-    // 1. Load global config
-    const globalServers = readMCPConfigFile(getMCPConfigPath());
-    // 2. Load project config (overrides global by name)
-    const projectServers = projectRoot
-        ? readMCPConfigFile(getProjectMCPConfigPath(projectRoot))
-        : {};
-    // 3. Merge: project overrides global
-    const merged = { ...globalServers, ...projectServers };
-    // 4. Resolve each entry
-    const resolved = [];
-    for (const [name, entry] of Object.entries(merged)) {
-        const server = resolveEntry(name, entry);
-        if (server) {
-            resolved.push(server);
-        }
+    const paths = [getMCPConfigPath()];
+    if (projectRoot) {
+        paths.push(getProjectMCPConfigPath(projectRoot));
     }
-    return resolved;
+    return loadMCPServers(...paths);
 }
 /**
  * Get existing server names from all config files.
- * Useful for validating uniqueness when adding a new server.
  */
 export function getExistingServerNames(projectRoot) {
-    const globalServers = readMCPConfigFile(getMCPConfigPath());
-    const projectServers = projectRoot
-        ? readMCPConfigFile(getProjectMCPConfigPath(projectRoot))
-        : {};
-    return new Set([...Object.keys(globalServers), ...Object.keys(projectServers)]);
+    const paths = [getMCPConfigPath()];
+    if (projectRoot) {
+        paths.push(getProjectMCPConfigPath(projectRoot));
+    }
+    return getServerNames(...paths);
 }
 /**
  * Save a new MCP server entry to the config file.
- *
- * @param name - Server name (unique identifier)
- * @param entry - Server configuration entry
- * @param scope - 'global' or 'project'
- * @param projectRoot - Required when scope is 'project'
  */
 export function saveMCPServer(name, entry, scope, projectRoot) {
     const configPath = scope === 'project' && projectRoot
         ? getProjectMCPConfigPath(projectRoot)
         : getMCPConfigPath();
-    // Read existing config (or empty)
-    let config = { mcpServers: {} };
-    try {
-        const raw = readFileSync(configPath, 'utf-8');
-        const parsed = JSON.parse(raw);
-        config = { mcpServers: parsed.mcpServers ?? {} };
-    }
-    catch {
-        // File doesn't exist or invalid — start fresh
-    }
-    // Add/overwrite server entry
-    config.mcpServers[name] = entry;
-    // Ensure directory exists, write file
-    mkdirSync(path.dirname(configPath), { recursive: true });
-    writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+    saveMCPServerEntry(configPath, name, entry);
 }

package/dist/tools/platform-adapter.d.ts

@@ -1,19 +1,9 @@
 /**
  * Platform Adapter
  *
- * Thin adapter that wraps the CLI's synchronous repositories and services as async
- * implementations of the SDK's platform interfaces, wires CLI-specific hooks,
+ * Uses the SDK's SQLite repository implementations (shared with Desktop),
+ * wires CLI-specific hooks and services (anchors, artifacts, episodes),
  * and delegates all 32 platform tool definitions to the SDK.
- *
- * This replaces ~2,900+ lines of duplicated tool logic that previously lived in:
- * - project-db.ts (4 tools)
- * - workitem-db.ts (9 tools)
- * - document-db.ts (4 tools)
- * - plan-tools.ts (5 tools)
- * - backlog-wrappers.ts (2 tools)
- * - anchor-tools.ts (3 tools)
- * - artifact-tools.ts (4 tools)
- * - recall-work-tool.ts (1 tool)
  */
 /**
  * All 32 platform tools from the SDK:
@@ -32,4 +22,4 @@ export declare const allPlatformTools: import("@compilr-dev/sdk").Tool<never>[];
  * - 3 model tools (app_model_get, app_model_update, app_model_validate)
  * - 2 factory tools (factory_scaffold, factory_list_toolkits)
  */
-export declare const allFactoryTools: import("@compilr-dev/agents").Tool<never>[];
+export declare const allFactoryTools: import("@compilr-dev/sdk").Tool<never>[];

package/dist/tools/platform-adapter.js

@@ -1,183 +1,64 @@
 /**
  * Platform Adapter
  *
- * Thin adapter that wraps the CLI's synchronous repositories and services as async
- * implementations of the SDK's platform interfaces, wires CLI-specific hooks,
+ * Uses the SDK's SQLite repository implementations (shared with Desktop),
+ * wires CLI-specific hooks and services (anchors, artifacts, episodes),
  * and delegates all 32 platform tool definitions to the SDK.
- *
- * This replaces ~2,900+ lines of duplicated tool logic that previously lived in:
- * - project-db.ts (4 tools)
- * - workitem-db.ts (9 tools)
- * - document-db.ts (4 tools)
- * - plan-tools.ts (5 tools)
- * - backlog-wrappers.ts (2 tools)
- * - anchor-tools.ts (3 tools)
- * - artifact-tools.ts (4 tools)
- * - recall-work-tool.ts (1 tool)
  */
-import { createPlatformTools, } from '@compilr-dev/sdk';
+import { createPlatformTools, createSQLiteRepositories, ProjectAnchorStore, } from '@compilr-dev/sdk';
 import { createFactoryTools } from '@compilr-dev/factory';
-import { projectRepository, workItemRepository, documentRepository, planRepository, } from '../db/repositories/index.js';
+import { getDb } from '../db/index.js';
+import { getDataPath, getSessionsPath } from '../settings/paths.js';
+import { existsSync, rmSync } from 'fs';
+import { join } from 'path';
 import { getCurrentProject, setCurrentProject } from './project-db.js';
 import { awardFirstProject, awardWorkItemCompletion } from '../games/coins.js';
 import { getActiveSharedContext } from '@compilr-dev/sdk';
-import { getGlobalAnchorManager, getAnchorManager, } from '../anchors/index.js';
+import { setAnchorStore } from '../anchors/index.js';
 import { getTeamCheckpointer, recordTeamActivity } from '../multi-agent/index.js';
 import { getGlobalEpisodeStore } from '../episodes/index.js';
 // =============================================================================
-// Async wrappers — each method wraps a sync CLI repo call in Promise.resolve()
-// =============================================================================
-const asyncProjectRepo = {
-    create: (input) => Promise.resolve(projectRepository.create(input)),
-    getById: (id) => Promise.resolve(projectRepository.getById(id)),
-    getByName: (name) => Promise.resolve(projectRepository.getByName(name)),
-    getByPath: (path) => Promise.resolve(projectRepository.getByPath(path)),
-    getByDocsPath: (docsPath) => Promise.resolve(projectRepository.getByDocsPath(docsPath)),
-    findByPath: (searchPath) => Promise.resolve(projectRepository.findByPath(searchPath)),
-    list: (options) => Promise.resolve(projectRepository.list(options)),
-    update: (id, input) => Promise.resolve(projectRepository.update(id, input)),
-    touch: (id) => { projectRepository.touch(id); return Promise.resolve(); },
-    delete: (id) => Promise.resolve(projectRepository.delete(id)),
-    archive: (id) => Promise.resolve(projectRepository.archive(id)),
-    isNameAvailable: (name, excludeId) => Promise.resolve(projectRepository.isNameAvailable(name, excludeId)),
-    getStatusCounts: () => Promise.resolve(projectRepository.getStatusCounts()),
-};
-const asyncWorkItemRepo = {
-    create: (input) => Promise.resolve(workItemRepository.create(input)),
-    getById: (id) => Promise.resolve(workItemRepository.getById(id)),
-    getByItemId: (projectId, itemId) => Promise.resolve(workItemRepository.getByItemId(projectId, itemId)),
-    query: (input) => Promise.resolve(workItemRepository.query(input)),
-    getNext: (projectId, type) => Promise.resolve(workItemRepository.getNext(projectId, type)),
-    update: (id, input) => Promise.resolve(workItemRepository.update(id, input)),
-    delete: (id) => Promise.resolve(workItemRepository.delete(id)),
-    getByOwner: (projectId, owner, status) => Promise.resolve(workItemRepository.getByOwner(projectId, owner, status)),
-    getOwnerCounts: (projectId) => Promise.resolve(workItemRepository.getOwnerCounts(projectId)),
-    getStatusCounts: (projectId) => Promise.resolve(workItemRepository.getStatusCounts(projectId)),
-    getHistory: (workItemId) => Promise.resolve(workItemRepository.getHistory(workItemId)),
-    bulkCreate: (projectId, items) => Promise.resolve(workItemRepository.bulkCreate(projectId, items)),
-};
-const asyncDocumentRepo = {
-    upsert: (input) => Promise.resolve(documentRepository.upsert(input)),
-    create: (input) => Promise.resolve(documentRepository.create(input)),
-    getById: (id) => Promise.resolve(documentRepository.getById(id)),
-    getByType: (projectId, docType) => Promise.resolve(documentRepository.getByType(projectId, docType)),
-    listByProject: (projectId) => Promise.resolve(documentRepository.listByProject(projectId)),
-    update: (id, input) => Promise.resolve(documentRepository.update(id, input)),
-    delete: (id) => Promise.resolve(documentRepository.delete(id)),
-    deleteByType: (projectId, docType) => Promise.resolve(documentRepository.deleteByType(projectId, docType)),
-    getTypeCounts: (projectId) => Promise.resolve(documentRepository.getTypeCounts(projectId)),
-};
-const asyncPlanRepo = {
-    create: (input) => Promise.resolve(planRepository.create(input)),
-    getById: (id) => Promise.resolve(planRepository.getById(id)),
-    getByName: (projectId, name) => Promise.resolve(planRepository.getByName(projectId, name)),
-    getWithWorkItem: (id) => Promise.resolve(planRepository.getWithWorkItem(id)),
-    update: (id, input) => Promise.resolve(planRepository.update(id, input)),
-    delete: (id) => Promise.resolve(planRepository.delete(id)),
-    list: (projectId, options) => Promise.resolve(planRepository.list(projectId, options)),
-    countByStatus: (projectId) => Promise.resolve(planRepository.countByStatus(projectId)),
-    getInProgress: (projectId) => Promise.resolve(planRepository.getInProgress(projectId)),
-    hasInProgress: (projectId) => Promise.resolve(planRepository.hasInProgress(projectId)),
-    linkWorkItem: (planId, workItemId) => Promise.resolve(planRepository.linkWorkItem(planId, workItemId)),
-    unlinkWorkItem: (planId) => Promise.resolve(planRepository.unlinkWorkItem(planId)),
-};
-// =============================================================================
-// Anchor Service — wraps dual-scope AnchorManager (global + project)
+// Repositories — SDK's SQLite implementations, backed by CLI's existing DB
 // =============================================================================
-const anchorService = {
-    add: (input) => {
-        const activeProject = getCurrentProject();
-        const priority = input.priority ?? 'info';
-        let scope = input.scope;
-        if (!scope) {
-            scope = activeProject ? 'project' : 'global';
-        }
-        if (scope === 'project' && !activeProject) {
-            throw new Error('Cannot add project-scoped anchor: no active project. Use scope: "global" instead.');
-        }
-        const projectId = scope === 'project' && activeProject
-            ? String(activeProject.id)
-            : undefined;
-        const manager = scope === 'global'
-            ? getGlobalAnchorManager()
-            : getAnchorManager(projectId ?? '');
-        const anchor = manager.add({
-            content: input.content,
-            priority,
-            scope: 'persistent',
-            tags: input.tags,
-            projectId,
-        });
-        return Promise.resolve({
-            id: anchor.id,
-            content: anchor.content,
-            priority: anchor.priority,
-            scope,
-            tags: anchor.tags,
-        });
-    },
-    remove: (id) => {
-        const activeProject = getCurrentProject();
-        let removed = false;
-        let scope;
-        if (activeProject) {
-            const projectManager = getAnchorManager(String(activeProject.id));
-            if (projectManager.has(id)) {
-                removed = projectManager.remove(id);
-                scope = 'project';
+const db = getDb();
+const repos = createSQLiteRepositories(db, {
+    projectDeleteHooks: {
+        onDelete: (projectId) => {
+            // Clean up session files
+            try {
+                const sessionsPath = getSessionsPath();
+                const projectSessionPath = join(sessionsPath, `project-${String(projectId)}`);
+                if (existsSync(projectSessionPath)) {
+                    rmSync(projectSessionPath, { recursive: true, force: true });
+                }
             }
-        }
-        if (!removed) {
-            const globalManager = getGlobalAnchorManager();
-            if (globalManager.has(id)) {
-                removed = globalManager.remove(id);
-                scope = 'global';
+            catch { /* best-effort */ }
+            // Clean up anchor files
+            try {
+                const anchorsPath = join(getSessionsPath(), '..', 'anchors');
+                const projectAnchorsPath = join(anchorsPath, `project-${String(projectId)}.json`);
+                if (existsSync(projectAnchorsPath)) {
+                    rmSync(projectAnchorsPath, { force: true });
+                }
             }
-        }
-        return Promise.resolve({ removed, scope });
+            catch { /* best-effort */ }
+        },
     },
-    list: (options) => {
-        const activeProject = getCurrentProject();
-        const scope = options?.scope ?? 'all';
-        const anchors = [];
-        if (scope === 'global' || scope === 'all') {
-            const globalManager = getGlobalAnchorManager();
-            for (const anchor of globalManager.getAll({ priority: options?.priority })) {
-                anchors.push({
-                    id: anchor.id,
-                    content: anchor.content,
-                    priority: anchor.priority,
-                    scope: 'global',
-                    tags: anchor.tags,
-                });
-            }
-        }
-        if ((scope === 'project' || scope === 'all') && activeProject) {
-            const projectManager = getAnchorManager(String(activeProject.id));
-            for (const anchor of projectManager.getAll({ priority: options?.priority })) {
-                anchors.push({
-                    id: anchor.id,
-                    content: anchor.content,
-                    priority: anchor.priority,
-                    scope: 'project',
-                    tags: anchor.tags,
-                });
-            }
-        }
-        // Sort by priority (critical first)
-        const priorityOrder = { critical: 0, safety: 1, info: 2 };
-        anchors.sort((a, b) => {
-            const pa = priorityOrder[a.priority] ?? 2;
-            const pb = priorityOrder[b.priority] ?? 2;
-            return pa - pb;
-        });
-        return Promise.resolve({
-            count: anchors.length,
-            activeProjectName: activeProject?.displayName ?? null,
-            anchors,
-        });
+});
+// =============================================================================
+// Anchor Service — ProjectAnchorStore from SDK (shared with Desktop)
+// =============================================================================
+const anchorStore = new ProjectAnchorStore({
+    anchorsDir: join(getDataPath(), 'anchors'),
+    getCurrentProjectId: () => getCurrentProject()?.id,
+    getProjectName: () => {
+        // getCurrentProject() is always in memory — no async needed
+        return getCurrentProject()?.displayName ?? null;
     },
-};
+});
+// Register the store so CLI's anchors module delegates to it
+setAnchorStore(anchorStore);
+const anchorService = anchorStore.toService();
 // =============================================================================
 // Artifact Service — wraps ArtifactStore from TeamCheckpointer
 // =============================================================================
@@ -338,10 +219,10 @@ const episodeService = {
 // PlatformContext with getter/setter for currentProjectId
 // =============================================================================
 const context = {
-    projects: asyncProjectRepo,
-    workItems: asyncWorkItemRepo,
-    documents: asyncDocumentRepo,
-    plans: asyncPlanRepo,
+    projects: repos.projects,
+    workItems: repos.workItems,
+    documents: repos.documents,
+    plans: repos.plans,
     anchors: anchorService,
     artifacts: artifactService,
     episodes: episodeService,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@compilr-dev/cli",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "description": "AI-powered coding assistant CLI using @compilr-dev/agents",
   "type": "module",
   "main": "dist/index.js",
@@ -58,7 +58,7 @@
     "@compilr-dev/agents-coding": "^1.0.4",
     "@compilr-dev/editor-core": "^0.0.2",
     "@compilr-dev/factory": "^0.1.12",
-    "@compilr-dev/sdk": "^0.2.0",
+    "@compilr-dev/sdk": "^0.2.7",
     "@compilr-dev/ui-core": "^0.0.1",
     "@modelcontextprotocol/sdk": "^1.23.0",
     "better-sqlite3": "^12.5.0",