@cleocode/core 2026.4.0 → 2026.4.2

package/src/bootstrap.ts

@@ -67,8 +67,7 @@ export async function bootstrapGlobalCleo(options?: BootstrapOptions): Promise<B
   // Step 2: CAAMP injection into ~/.agents/AGENTS.md
   await injectAgentsHub(ctx);
 
-  // Step 3: Install MCP server to detected providers
-  await installMcpToProviders(ctx);
+  // Step 3: (removed)
 
   // Step 4: Install core skills globally
   await installSkillsGlobally(ctx);
@@ -286,46 +285,13 @@ async function injectAgentsHub(ctx: BootstrapContext): Promise<void> {
   }
 }
 
-// ── Step 3: MCP server installation ──────────────────────────────────
+// ── Step 3: (removed) ───────────────────────────────────────────────
 
 /**
- * Install the CLEO MCP server config to all detected providers.
+ * No-op. Kept for API compatibility.
  */
-export async function installMcpToProviders(ctx: BootstrapContext): Promise<void> {
-  try {
-    const { detectEnvMode, generateMcpServerEntry, getMcpServerName } = await import(
-      './mcp/index.js'
-    );
-    const { getInstalledProviders, installMcpServerToAll } = await import('@cleocode/caamp');
-    type McpServerConfig = import('@cleocode/caamp').McpServerConfig;
-
-    const env = detectEnvMode();
-    const serverEntry = generateMcpServerEntry(env) as McpServerConfig;
-    const serverName = getMcpServerName(env);
-    const providers = getInstalledProviders();
-
-    if (providers.length > 0) {
-      if (!ctx.isDryRun) {
-        const results = await installMcpServerToAll(
-          providers,
-          serverName,
-          serverEntry,
-          'global',
-          homedir(),
-        );
-        const successes = results.filter((r: { success: boolean }) => r.success);
-        if (successes.length > 0) {
-          ctx.created.push(
-            `MCP configs: ${successes.map((r: { provider: { id: string } }) => r.provider.id).join(', ')}`,
-          );
-        }
-      } else {
-        ctx.created.push('MCP configs (would update)');
-      }
-    }
-  } catch {
-    ctx.warnings.push('MCP config update skipped (non-critical)');
-  }
+export async function installMcpToProviders(_ctx: BootstrapContext): Promise<void> {
+  // No-op: removed
 }
 
 // ── Step 4: Core skills installation ─────────────────────────────────

package/src/caamp/adapter.ts

@@ -2,11 +2,11 @@
  * CAAMP Adapter - Canonical implementation
  *
  * Wraps @cleocode/caamp APIs for use across CLEO subsystems.
- * Provides provider registry, MCP config management, injection operations,
+ * Provides provider registry, injection operations,
  * and batch/orchestration functions as EngineResult-returning functions.
  *
  * This is the SINGLE SOURCE OF TRUTH for all CAAMP adapter logic.
- * MCP engine layer re-exports from here.
+ * CLI dispatch layer re-exports from here.
  *
  * @task T4678
  * @task T4705
@@ -16,13 +16,9 @@
 import {
   type BatchInstallOptions,
   type BatchInstallResult,
-  buildServerConfig,
   checkAllInjections,
   checkInjection,
-  configureProviderGlobalAndProject,
   type DetectionResult,
-  type DualScopeConfigureOptions,
-  type DualScopeConfigureResult,
   detectAllProviders,
   generateInjectionContent,
   // Provider Registry
@@ -33,22 +29,14 @@ import {
   getProviderCount,
   getRegistryVersion,
   type InjectionStatus,
-  type InstallResult,
   // Instructions
   inject,
   injectAll,
   // Batch / Orchestration
   installBatchWithRollback,
-  // MCP Config
-  installMcpServer,
-  listAllMcpServers,
-  listMcpServers,
-  type McpServerConfig,
   // Types
   type Provider,
-  removeMcpServer,
   resolveAlias,
-  resolveConfigPath,
 } from '@cleocode/caamp';
 
 // ============================================================
@@ -186,168 +174,6 @@ export function registryVersion(): EngineResult<{ version: string }> {
   }
 }
 
-// ============================================================
-// MCP Config Operations
-// ============================================================
-
-/**
- * List MCP servers for a specific provider.
- * @task T4332
- */
-export async function mcpList(
-  providerId: string,
-  scope: 'project' | 'global',
-  projectDir?: string,
-): Promise<EngineResult<{ servers: unknown[] }>> {
-  try {
-    const provider = getProvider(providerId);
-    if (!provider) {
-      return {
-        success: false,
-        error: {
-          code: 'E_CAAMP_PROVIDER_NOT_FOUND',
-          message: `Provider not found: ${providerId}`,
-        },
-      };
-    }
-    const servers = await listMcpServers(provider, scope, projectDir);
-    return { success: true, data: { servers } };
-  } catch (err) {
-    return {
-      success: false,
-      error: {
-        code: 'E_CAAMP_MCP_LIST',
-        message: err instanceof Error ? err.message : String(err),
-      },
-    };
-  }
-}
-
-/**
- * List MCP servers across all installed providers.
- * @task T4332
- */
-export async function mcpListAll(
-  scope: 'project' | 'global',
-  projectDir?: string,
-): Promise<EngineResult<{ servers: unknown[] }>> {
-  try {
-    const providers = getInstalledProviders();
-    const servers = await listAllMcpServers(providers, scope, projectDir);
-    return { success: true, data: { servers } };
-  } catch (err) {
-    return {
-      success: false,
-      error: {
-        code: 'E_CAAMP_MCP_LIST_ALL',
-        message: err instanceof Error ? err.message : String(err),
-      },
-    };
-  }
-}
-
-/**
- * Install an MCP server to a provider's config.
- * @task T4332
- */
-export async function mcpInstall(
-  providerId: string,
-  serverName: string,
-  config: McpServerConfig,
-  scope?: 'project' | 'global',
-  projectDir?: string,
-): Promise<EngineResult<InstallResult>> {
-  try {
-    const provider = getProvider(providerId);
-    if (!provider) {
-      return {
-        success: false,
-        error: {
-          code: 'E_CAAMP_PROVIDER_NOT_FOUND',
-          message: `Provider not found: ${providerId}`,
-        },
-      };
-    }
-    const result = await installMcpServer(provider, serverName, config, scope, projectDir);
-    return { success: true, data: result };
-  } catch (err) {
-    return {
-      success: false,
-      error: {
-        code: 'E_CAAMP_MCP_INSTALL',
-        message: err instanceof Error ? err.message : String(err),
-      },
-    };
-  }
-}
-
-/**
- * Remove an MCP server from a provider's config.
- * @task T4332
- */
-export async function mcpRemove(
-  providerId: string,
-  serverName: string,
-  scope: 'project' | 'global',
-  projectDir?: string,
-): Promise<EngineResult<{ removed: boolean }>> {
-  try {
-    const provider = getProvider(providerId);
-    if (!provider) {
-      return {
-        success: false,
-        error: {
-          code: 'E_CAAMP_PROVIDER_NOT_FOUND',
-          message: `Provider not found: ${providerId}`,
-        },
-      };
-    }
-    const removed = await removeMcpServer(provider, serverName, scope, projectDir);
-    return { success: true, data: { removed } };
-  } catch (err) {
-    return {
-      success: false,
-      error: {
-        code: 'E_CAAMP_MCP_REMOVE',
-        message: err instanceof Error ? err.message : String(err),
-      },
-    };
-  }
-}
-
-/**
- * Resolve the config file path for a provider.
- * @task T4332
- */
-export function mcpConfigPath(
-  providerId: string,
-  scope: 'project' | 'global',
-  projectDir?: string,
-): EngineResult<{ path: string | null }> {
-  try {
-    const provider = getProvider(providerId);
-    if (!provider) {
-      return {
-        success: false,
-        error: {
-          code: 'E_CAAMP_PROVIDER_NOT_FOUND',
-          message: `Provider not found: ${providerId}`,
-        },
-      };
-    }
-    const path = resolveConfigPath(provider, scope, projectDir);
-    return { success: true, data: { path } };
-  } catch (err) {
-    return {
-      success: false,
-      error: {
-        code: 'E_CAAMP_MCP_CONFIG_PATH',
-        message: err instanceof Error ? err.message : String(err),
-      },
-    };
-  }
-}
-
 // ============================================================
 // Injection Operations
 // ============================================================
@@ -454,9 +280,7 @@ export async function injectionUpdateAll(
 // ============================================================
 
 /**
- * Install multiple MCP servers atomically with rollback on failure.
- * Supports Wave 4 init rewrite which needs to install multiple
- * skills/configs as a single atomic operation.
+ * Install multiple skills atomically with rollback on failure.
  *
  * @task T4705
  * @epic T4663
@@ -478,41 +302,6 @@ export async function batchInstallWithRollback(
   }
 }
 
-/**
- * Configure a provider at both global and project scope simultaneously.
- * Used during init to set up MCP configs in both scopes atomically.
- *
- * @task T4705
- * @epic T4663
- */
-export async function dualScopeConfigure(
-  providerId: string,
-  options: DualScopeConfigureOptions,
-): Promise<EngineResult<DualScopeConfigureResult>> {
-  try {
-    const provider = getProvider(providerId);
-    if (!provider) {
-      return {
-        success: false,
-        error: {
-          code: 'E_CAAMP_PROVIDER_NOT_FOUND',
-          message: `Provider not found: ${providerId}`,
-        },
-      };
-    }
-    const result = await configureProviderGlobalAndProject(provider, options);
-    return { success: true, data: result };
-  } catch (err) {
-    return {
-      success: false,
-      error: {
-        code: 'E_CAAMP_DUAL_SCOPE_CONFIGURE',
-        message: err instanceof Error ? err.message : String(err),
-      },
-    };
-  }
-}
-
 // ============================================================
 // Utility Re-exports (passthrough, no EngineResult wrapping)
 // ============================================================
@@ -522,15 +311,10 @@ export type {
   BatchInstallOptions as CaampBatchInstallOptions,
   BatchInstallResult as CaampBatchInstallResult,
   DetectionResult as CaampDetectionResult,
-  DualScopeConfigureOptions as CaampDualScopeConfigureOptions,
-  DualScopeConfigureResult as CaampDualScopeConfigureResult,
   InjectionStatus as CaampInjectionStatus,
-  InstallResult as CaampInstallResult,
-  McpServerConfig as CaampMcpServerConfig,
   Provider as CaampProvider,
 };
 export {
-  buildServerConfig as caampBuildServerConfig,
   generateInjectionContent as caampGenerateInjectionContent,
   getInstructionFiles as caampGetInstructionFiles,
   resolveAlias as caampResolveAlias,

package/src/caamp/index.ts

@@ -2,7 +2,7 @@
  * CAAMP integration module - barrel export.
  *
  * All CAAMP adapter logic lives here as the single source of truth.
- * MCP engine layer and CLI commands re-export from this module.
+ * CLI dispatch layer re-exports from this module.
  *
  * @task T4678
  * @epic T4663
@@ -14,18 +14,12 @@ export {
   type CaampBatchInstallOptions,
   type CaampBatchInstallResult,
   type CaampDetectionResult,
-  type CaampDualScopeConfigureOptions,
-  type CaampDualScopeConfigureResult,
   type CaampInjectionStatus,
-  type CaampInstallResult,
-  type CaampMcpServerConfig,
   type CaampProvider,
-  caampBuildServerConfig,
   caampGenerateInjectionContent,
   caampGetInstructionFiles,
   // Utility Re-exports
   caampResolveAlias,
-  dualScopeConfigure,
   // Types
   type EngineResult,
   // Injection Operations
@@ -33,12 +27,6 @@ export {
   injectionCheckAll,
   injectionUpdate,
   injectionUpdateAll,
-  mcpConfigPath,
-  mcpInstall,
-  // MCP Config Operations
-  mcpList,
-  mcpListAll,
-  mcpRemove,
   providerCount,
   providerDetect,
   providerGet,

package/src/cant/__tests__/cant-agent-parse.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cant-agent-parse.test.d.ts","sourceRoot":"","sources":["cant-agent-parse.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG"}

package/src/cant/__tests__/cant-agent-parse.test.js

@@ -0,0 +1,77 @@
+/**
+ * Integration test: .cant agent file → cant-napi parse_document → TypeScript AST.
+ *
+ * This test validates the full pipeline from .cant file on disk through the
+ * Rust parser (via napi-rs bridge) to a TypeScript-consumable AST.
+ *
+ * BLOCKED: cant-napi does not yet export parse_document (only Layer 1 cant_parse).
+ * Once cleo-rust-lead extends cant-napi, remove the .skip from these tests.
+ *
+ * @see docs/specs/CANT-DSL-SPEC.md Section 7.2 (Workflow Execution)
+ * @see docs/specs/CANT-EXECUTION-SEMANTICS.md Section 5 (Session Blocking)
+ * @see docs/specs/CLEO-ORCH-PLAN.md Section 3.1 (Agent Profile System)
+ */
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { describe, expect, it } from 'vitest';
+// BLOCKED: uncomment when cant-napi exports parse_document
+// import { cantParseDocument } from 'cant-napi';
+describe('CANT Agent .cant File Parsing', () => {
+    const AGENTS_DIR = join(process.cwd(), '.cleo', 'agents');
+    it.skip('parses cleo-historian.cant through napi bridge', () => {
+        const content = readFileSync(join(AGENTS_DIR, 'cleo-historian.cant'), 'utf-8');
+        // BLOCKED: cantParseDocument not yet exported from cant-napi
+        // const doc = cantParseDocument(content);
+        // expect(doc.kind).toBe('agent');
+        // expect(doc.sections).toHaveLength(1);
+        // const agent = doc.sections[0];
+        // expect(agent.type).toBe('Agent');
+        // expect(agent.name).toBe('cleo-historian');
+        // expect(agent.permissions).toHaveLength(6);
+        // expect(agent.hooks).toHaveLength(4); // SessionStart, TaskCompleted, MemoryObserved, PipelineStageCompleted
+        // expect(agent.properties.find((p: { key: string }) => p.key === 'model')?.value).toBe('opus');
+    });
+    it.skip('parses cleo-rust-lead.cant through napi bridge', () => {
+        const content = readFileSync(join(AGENTS_DIR, 'cleo-rust-lead.cant'), 'utf-8');
+        // BLOCKED: cantParseDocument not yet exported from cant-napi
+        // const doc = cantParseDocument(content);
+        // expect(doc.kind).toBe('agent');
+        // expect(doc.sections[0].name).toBe('cleo-rust-lead');
+    });
+    it('.cant files exist on disk', () => {
+        const historianContent = readFileSync(join(AGENTS_DIR, 'cleo-historian.cant'), 'utf-8');
+        expect(historianContent).toContain('kind: agent');
+        expect(historianContent).toContain('agent cleo-historian:');
+        expect(historianContent).toContain('model: opus');
+        expect(historianContent).toContain('permissions:');
+        expect(historianContent).toContain('on SessionStart:');
+        expect(historianContent).toContain('on TaskCompleted:');
+        expect(historianContent).toContain('on MemoryObserved:');
+        expect(historianContent).toContain('on PipelineStageCompleted:');
+    });
+    it('.cant file uses canonical CANT grammar elements', () => {
+        const content = readFileSync(join(AGENTS_DIR, 'cleo-historian.cant'), 'utf-8');
+        // Frontmatter
+        expect(content).toMatch(/^---\nkind: agent\nversion: 1\n---/);
+        // Agent block with proper indentation (2 spaces)
+        expect(content).toMatch(/^agent cleo-historian:$/m);
+        expect(content).toMatch(/^ {2}model: opus$/m);
+        expect(content).toMatch(/^ {2}permissions:$/m);
+        expect(content).toMatch(/^ {4}tasks: read$/m);
+        expect(content).toMatch(/^ {4}memory: read, write$/m);
+        // Hook blocks with canonical event names (PascalCase)
+        expect(content).toMatch(/^ {2}on SessionStart:$/m);
+        expect(content).toMatch(/^ {2}on TaskCompleted:$/m);
+        expect(content).toMatch(/^ {2}on MemoryObserved:$/m);
+        expect(content).toMatch(/^ {2}on PipelineStageCompleted:$/m);
+        // Discretion conditions (** delimiters)
+        expect(content).toMatch(/\*\*.+\*\*/);
+        // CANT directives in hook bodies
+        expect(content).toMatch(/\/checkin @all/);
+        expect(content).toMatch(/\/review @cleo-historian/);
+        expect(content).toMatch(/\/action @cleo-historian/);
+        // No tabs (CANT spec rule: tabs rejected)
+        expect(content).not.toMatch(/\t/);
+    });
+});
+//# sourceMappingURL=cant-agent-parse.test.js.map

package/src/cant/__tests__/cant-agent-parse.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cant-agent-parse.test.js","sourceRoot":"","sources":["cant-agent-parse.test.ts"],"names":[],"mappings":"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"}

package/src/code/parser.ts

@@ -24,16 +24,48 @@ import { detectLanguage, type TreeSitterLanguage } from '../lib/tree-sitter-lang
 // Tree-sitter CLI resolution
 // ---------------------------------------------------------------------------
 
+/** Whether tree-sitter is available on this system. */
+let _treeSitterAvailable: boolean | null = null;
+
+/** Check if tree-sitter CLI is available and executable. Cached after first call. */
+export function isTreeSitterAvailable(): boolean {
+  if (_treeSitterAvailable !== null) return _treeSitterAvailable;
+  try {
+    const bin = resolveTreeSitterBin();
+    // Verify the binary actually runs (broken symlinks pass existsSync)
+    execFileSync(bin, ['--version'], { timeout: 5000, stdio: 'pipe' });
+    _treeSitterAvailable = true;
+  } catch {
+    _treeSitterAvailable = false;
+  }
+  return _treeSitterAvailable;
+}
+
 /** Resolve the tree-sitter CLI binary from node_modules. */
 function resolveTreeSitterBin(): string {
+  // Also check platform-specific binary extension for Windows
+  const ext = process.platform === 'win32' ? '.exe' : '';
+  const binName = `tree-sitter${ext}`;
   const candidates = [
-    join(process.cwd(), 'packages', 'core', 'node_modules', '.bin', 'tree-sitter'),
-    join(process.cwd(), 'node_modules', '.bin', 'tree-sitter'),
+    join(process.cwd(), 'packages', 'core', 'node_modules', '.bin', binName),
+    join(process.cwd(), 'node_modules', '.bin', binName),
+    // npm global install paths
+    join(process.cwd(), 'node_modules', 'tree-sitter-cli', binName),
   ];
+  // Also try without extension (npm .cmd shim on Windows)
+  if (ext) {
+    candidates.push(
+      join(process.cwd(), 'packages', 'core', 'node_modules', '.bin', 'tree-sitter'),
+      join(process.cwd(), 'node_modules', '.bin', 'tree-sitter'),
+    );
+  }
   for (const p of candidates) {
     if (existsSync(p)) return p;
   }
-  throw new Error('tree-sitter CLI not found. Run: pnpm add -F @cleocode/core tree-sitter-cli');
+  throw new Error(
+    'tree-sitter CLI not found. Code analysis features (cleo code outline/search/unfold) ' +
+      'require tree-sitter. Install with: npm install tree-sitter-cli',
+  );
 }
 
 // ---------------------------------------------------------------------------

package/src/codebase-map/analyzers/architecture.ts

@@ -29,7 +29,7 @@ const LAYER_PURPOSE: Record<string, string> = {
   hooks: 'React hooks',
   composables: 'Vue composables',
   cli: 'CLI interface',
-  mcp: 'MCP server layer',
+  mcp: 'Protocol server layer (legacy)',
   dispatch: 'Dispatch / routing layer',
   types: 'Type definitions',
   schemas: 'Schema definitions',
@@ -64,7 +64,7 @@ const ARCH_PATTERNS: Record<string, string[]> = {
   mvc: ['models', 'views', 'controllers'],
   modular: ['modules'],
   'clean-architecture': ['domain', 'application', 'infrastructure'],
-  'dispatch-first': ['dispatch', 'core', 'mcp', 'cli'],
+  'dispatch-first': ['dispatch', 'core', 'cli'],
   'component-based': ['components', 'pages'],
 };
 

package/src/compliance/protocol-enforcement.ts

@@ -4,7 +4,7 @@
  * Validates RCASD-IVTR+C lifecycle compliance with exit codes 60-70.
  * Intercepts domain operations to enforce protocol requirements before execution.
  *
- * Moved from src/mcp/lib/protocol-enforcement.ts to core for proper layering.
+ * Moved to core for proper layering (formerly in dispatch).
  *
  * @task T2918
  * @task T5707

package/src/compliance/protocol-rules.ts

@@ -2,7 +2,7 @@
  * Protocol Rule Definitions for CLEO
  *
  * Defines validation rules for all 9 RCASD-IVTR+C protocols.
- * Moved from src/mcp/lib/protocol-rules.ts to core for proper layering.
+ * Moved to core for proper layering (formerly in dispatch).
  *
  * @task T2918
  * @task T5707

package/src/compliance/protocol-types.ts

@@ -2,8 +2,7 @@
  * Protocol enforcement types used by the RCASD-IVTR+C protocol system.
  *
  * These types are used by protocol-enforcement.ts, protocol-rules.ts,
- * verification-gates.ts, and gate-validators.ts. Previously defined in
- * src/mcp/lib/exit-codes.ts (deprecated), now canonical in core.
+ * verification-gates.ts, and gate-validators.ts. Canonical location in core.
  *
  * @task T5707
  * @epic T5701
@@ -39,7 +38,7 @@ export enum ErrorCategory {
  * Protocol-specific exit codes used by the RCASD-IVTR+C enforcement system.
  *
  * These map to the protocol violation range (60-70) and lifecycle enforcement
- * range (80-84) defined in the MCP server specification. The values here
+ * range (80-84) defined in the protocol specification. The values here
  * align with the protocol enforcement layer's own exit code semantics,
  * which differ from the canonical CLI exit codes in src/types/exit-codes.ts.
  *

package/src/conduit/__tests__/dual-api-e2e.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dual-api-e2e.test.d.ts","sourceRoot":"","sources":["dual-api-e2e.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG"}