@soleri/forge 3.0.0 → 4.0.0

package/src/scaffolder.ts

@@ -13,32 +13,17 @@ import type { AgentConfig, ScaffoldResult, ScaffoldPreview, AgentInfo } from './
 import { generatePackageJson } from './templates/package-json.js';
 import { generateTsconfig } from './templates/tsconfig.js';
 import { generateVitestConfig } from './templates/vitest-config.js';
-import { generateFacadeTypes } from './templates/facade-types.js';
-import { generateFacadeFactory } from './templates/facade-factory.js';
-import { generateVault } from './templates/vault.js';
-import { generateIntelligenceTypes } from './templates/intelligence-types.js';
-import { generateIntelligenceLoader } from './templates/intelligence-loader.js';
 import { generatePersona } from './templates/persona.js';
 import { generateDomainFacade } from './templates/domain-facade.js';
 import { generateCoreFacade } from './templates/core-facade.js';
 import { generateEntryPoint } from './templates/entry-point.js';
-import { generateVaultTest } from './templates/test-vault.js';
-import { generateLoaderTest } from './templates/test-loader.js';
 import { generateFacadesTest } from './templates/test-facades.js';
 import { generateClaudeMdTemplate } from './templates/claude-md-template.js';
 import { generateInjectClaudeMd } from './templates/inject-claude-md.js';
 import { generateActivate } from './templates/activate.js';
 import { generateReadme } from './templates/readme.js';
 import { generateSetupScript } from './templates/setup-script.js';
-import { generatePlanner } from './templates/planner.js';
-import { generatePlannerTest } from './templates/test-planner.js';
-import { generateBrain } from './templates/brain.js';
-import { generateBrainTest } from './templates/test-brain.js';
-import { generateLLMTypes } from './templates/llm-types.js';
-import { generateLLMUtils } from './templates/llm-utils.js';
-import { generateLLMKeyPool } from './templates/llm-key-pool.js';
 import { generateLLMClient } from './templates/llm-client.js';
-import { generateLLMTest } from './templates/test-llm.js';
 
 /**
  * Preview what scaffold will create without writing anything.
@@ -60,40 +45,11 @@ export function previewScaffold(config: AgentConfig): ScaffoldPreview {
       description:
         'Entry point — initializes vault, planner, brain, registers facades, starts stdio',
     },
-    {
-      path: 'src/planning/planner.ts',
-      description: 'Plan state machine — draft → approved → executing → completed',
-    },
-    {
-      path: 'src/brain/brain.ts',
-      description:
-        'Intelligence layer — TF-IDF scoring, auto-tagging, duplicate detection, adaptive weights',
-    },
-    {
-      path: 'src/llm/types.ts',
-      description:
-        'LLM types — SecretString, LLMError, call options/result, circuit breaker, key pool, routing',
-    },
-    {
-      path: 'src/llm/utils.ts',
-      description:
-        'LLM utilities — CircuitBreaker, retry with backoff+jitter, rate limit header parser',
-    },
-    {
-      path: 'src/llm/key-pool.ts',
-      description:
-        'Key pool — multi-key rotation with per-key circuit breakers, preemptive quota rotation',
-    },
     {
       path: 'src/llm/llm-client.ts',
       description:
         'LLM client — unified OpenAI/Anthropic caller with model routing (optional, needs API keys)',
     },
-    { path: 'src/facades/types.ts', description: 'Facade type system (OpHandler, FacadeConfig)' },
-    {
-      path: 'src/facades/facade-factory.ts',
-      description: 'Registers facades as MCP tools with op dispatch',
-    },
     {
       path: 'src/facades/core.facade.ts',
       description: 'Core facade — search, vault stats, health, identity',
@@ -102,18 +58,6 @@ export function previewScaffold(config: AgentConfig): ScaffoldPreview {
       path: `src/facades/${d}.facade.ts`,
       description: `${d} facade — search, get_patterns, capture, remove`,
     })),
-    {
-      path: 'src/vault/vault.ts',
-      description: 'SQLite vault with FTS5 full-text search (BM25 ranking)',
-    },
-    {
-      path: 'src/intelligence/types.ts',
-      description: 'IntelligenceEntry and IntelligenceBundle types',
-    },
-    {
-      path: 'src/intelligence/loader.ts',
-      description: 'Loads and validates JSON intelligence data files',
-    },
     ...config.domains.map((d) => ({
       path: `src/intelligence/data/${d}.json`,
       description: `Empty ${d} intelligence bundle — ready for knowledge capture`,
@@ -134,32 +78,10 @@ export function previewScaffold(config: AgentConfig): ScaffoldPreview {
       path: 'src/activation/activate.ts',
       description: `${config.name} activation system — persona adoption, setup status, tool recommendations`,
     },
-    {
-      path: 'src/__tests__/vault.test.ts',
-      description: 'Vault tests — CRUD, FTS5 search, stats, project registration (32 tests)',
-    },
-    {
-      path: 'src/__tests__/loader.test.ts',
-      description: 'Intelligence loader tests — valid/invalid JSON, edge cases (9 tests)',
-    },
     {
       path: 'src/__tests__/facades.test.ts',
       description: `Facade integration tests — all ${config.domains.length + 1} facades`,
     },
-    {
-      path: 'src/__tests__/planner.test.ts',
-      description: 'Planner tests — state machine, task lifecycle, persistence (~20 tests)',
-    },
-    {
-      path: 'src/__tests__/brain.test.ts',
-      description:
-        'Brain tests — TF-IDF scoring, auto-tagging, duplicate detection, adaptive weights (~38 tests)',
-    },
-    {
-      path: 'src/__tests__/llm.test.ts',
-      description:
-        'LLM tests — SecretString, CircuitBreaker, retry, rate limits, KeyPool, ModelRouter (~30 tests)',
-    },
     { path: '.mcp.json', description: 'MCP client config for connecting to this agent' },
     {
       path: 'README.md',
@@ -238,13 +160,10 @@ export function scaffold(config: AgentConfig): ScaffoldResult {
     'scripts',
     'src',
     'src/facades',
-    'src/vault',
     'src/intelligence',
     'src/intelligence/data',
     'src/identity',
     'src/activation',
-    'src/planning',
-    'src/brain',
     'src/llm',
     'src/__tests__',
   ];
@@ -282,29 +201,14 @@ export function scaffold(config: AgentConfig): ScaffoldResult {
 
   // Write source files
   const sourceFiles: Array<[string, string]> = [
-    ['src/facades/types.ts', generateFacadeTypes()],
-    ['src/facades/facade-factory.ts', generateFacadeFactory()],
     ['src/facades/core.facade.ts', generateCoreFacade(config)],
-    ['src/vault/vault.ts', generateVault()],
-    ['src/intelligence/types.ts', generateIntelligenceTypes()],
-    ['src/intelligence/loader.ts', generateIntelligenceLoader()],
     ['src/identity/persona.ts', generatePersona(config)],
     ['src/activation/claude-md-content.ts', generateClaudeMdTemplate(config)],
     ['src/activation/inject-claude-md.ts', generateInjectClaudeMd(config)],
     ['src/activation/activate.ts', generateActivate(config)],
     ['src/index.ts', generateEntryPoint(config)],
-    ['src/planning/planner.ts', generatePlanner()],
-    ['src/brain/brain.ts', generateBrain()],
-    ['src/llm/types.ts', generateLLMTypes()],
-    ['src/llm/utils.ts', generateLLMUtils()],
-    ['src/llm/key-pool.ts', generateLLMKeyPool(config)],
     ['src/llm/llm-client.ts', generateLLMClient(config)],
-    ['src/__tests__/vault.test.ts', generateVaultTest()],
-    ['src/__tests__/loader.test.ts', generateLoaderTest()],
     ['src/__tests__/facades.test.ts', generateFacadesTest(config)],
-    ['src/__tests__/planner.test.ts', generatePlannerTest()],
-    ['src/__tests__/brain.test.ts', generateBrainTest()],
-    ['src/__tests__/llm.test.ts', generateLLMTest(config)],
   ];
 
   // Domain facades and empty data files
@@ -329,7 +233,7 @@ export function scaffold(config: AgentConfig): ScaffoldResult {
     `${config.domains.length} empty knowledge domains ready for capture`,
     `Intelligence layer (Brain) — TF-IDF scoring, auto-tagging, duplicate detection`,
     `Activation system included — say "Hello, ${config.name}!" to activate`,
-    `6 test suites — vault, loader, facades, planner, brain, llm`,
+    `1 test suite — facades (vault, brain, planner, llm tests provided by @soleri/core)`,
   ];
 
   if (mcpReg.registered) {

package/src/templates/activate.ts

@@ -35,8 +35,7 @@ export function generateActivate(config: AgentConfig): string {
     "import { homedir } from 'node:os';",
     "import { PERSONA } from '../identity/persona.js';",
     "import { hasAgentMarker } from './inject-claude-md.js';",
-    "import type { Vault } from '../vault/vault.js';",
-    "import type { Planner, Plan } from '../planning/planner.js';",
+    "import type { Vault, Planner, Plan } from '@soleri/core';",
     '',
     'export interface ActivationResult {',
     '  activated: boolean;',

package/src/templates/core-facade.ts

@@ -6,16 +6,11 @@ import type { AgentConfig } from '../types.js';
  */
 export function generateCoreFacade(config: AgentConfig): string {
   return `import { z } from 'zod';
-import type { FacadeConfig } from './types.js';
-import type { Vault } from '../vault/vault.js';
-import type { IntelligenceEntry } from '../intelligence/types.js';
+import type { FacadeConfig, Vault, IntelligenceEntry, Planner, Brain, KeyPool } from '@soleri/core';
 import { PERSONA } from '../identity/persona.js';
 import { activateAgent, deactivateAgent } from '../activation/activate.js';
 import { injectClaudeMd, injectClaudeMdGlobal, hasAgentMarker } from '../activation/inject-claude-md.js';
-import type { Planner } from '../planning/planner.js';
-import type { Brain } from '../brain/brain.js';
 import type { LLMClient } from '../llm/llm-client.js';
-import type { KeyPool } from '../llm/key-pool.js';
 
 export function createCoreFacade(vault: Vault, planner: Planner, brain: Brain, llmClient?: LLMClient, openaiKeyPool?: KeyPool, anthropicKeyPool?: KeyPool): FacadeConfig {
   return {

package/src/templates/domain-facade.ts

@@ -6,9 +6,7 @@ export function generateDomainFacade(agentId: string, domain: string): string {
   const facadeName = `${agentId}_${domain.replace(/-/g, '_')}`;
 
   return `import { z } from 'zod';
-import type { FacadeConfig } from './types.js';
-import type { Vault } from '../vault/vault.js';
-import type { Brain } from '../brain/brain.js';
+import type { FacadeConfig, Vault, Brain } from '@soleri/core';
 
 export function create${pascalCase(domain)}Facade(vault: Vault, brain: Brain): FacadeConfig {
   return {

package/src/templates/entry-point.ts

@@ -24,15 +24,10 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
 
-import { registerAllFacades } from './facades/facade-factory.js';
+import { Vault, Brain, Planner, KeyPool, loadKeyPoolConfig, loadIntelligenceData, registerAllFacades } from '@soleri/core';
 ${facadeImports}
 import { createCoreFacade } from './facades/core.facade.js';
-import { loadIntelligenceData } from './intelligence/loader.js';
-import { Vault } from './vault/vault.js';
-import { Planner } from './planning/planner.js';
-import { Brain } from './brain/brain.js';
 import { LLMClient } from './llm/llm-client.js';
-import { KeyPool, loadKeyPoolConfig } from './llm/key-pool.js';
 import { PERSONA, getPersonaPrompt } from './identity/persona.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -63,7 +58,7 @@ async function main(): Promise<void> {
   console.error(\`[\${PERSONA.name.toLowerCase()}] Brain: vocabulary \${brain.getVocabularySize()} terms\`);
 
   // Initialize LLM client (optional — works without API keys)
-  const keyPoolFiles = loadKeyPoolConfig();
+  const keyPoolFiles = loadKeyPoolConfig('${config.id}');
   const openaiKeyPool = new KeyPool(keyPoolFiles.openai);
   const anthropicKeyPool = new KeyPool(keyPoolFiles.anthropic);
   const llmClient = new LLMClient(openaiKeyPool, anthropicKeyPool);

package/src/templates/llm-client.ts

@@ -12,15 +12,14 @@ export function generateLLMClient(config: AgentConfig): string {
  */
 
 import Anthropic from '@anthropic-ai/sdk';
-import { SecretString, LLMError } from './types.js';
+import { SecretString, LLMError, CircuitBreaker, retry, parseRateLimitHeaders } from '@soleri/core';
 import type {
   LLMCallOptions,
   LLMCallResult,
   RouteEntry,
   RoutingConfig,
-} from './types.js';
-import { CircuitBreaker, retry, parseRateLimitHeaders } from './utils.js';
-import type { KeyPool } from './key-pool.js';
+  KeyPool,
+} from '@soleri/core';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { homedir } from 'node:os';

package/src/templates/package-json.ts

@@ -23,11 +23,10 @@ export function generatePackageJson(config: AgentConfig): string {
     dependencies: {
       '@anthropic-ai/sdk': '^0.39.0',
       '@modelcontextprotocol/sdk': '^1.12.1',
-      'better-sqlite3': '^11.8.1',
+      '@soleri/core': '^1.0.0',
       zod: '^3.24.2',
     },
     devDependencies: {
-      '@types/better-sqlite3': '^7.6.12',
       '@types/node': '^22.13.4',
       '@vitest/coverage-v8': '^3.0.5',
       tsx: '^4.19.2',

package/src/templates/test-facades.ts

@@ -17,17 +17,14 @@ export function generateFacadesTest(config: AgentConfig): string {
     .join('\n\n');
 
   return `import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { Vault } from '../vault/vault.js';
-import { Brain } from '../brain/brain.js';
-import type { IntelligenceEntry } from '../intelligence/types.js';
+import { Vault, Brain, Planner, KeyPool } from '@soleri/core';
+import type { IntelligenceEntry } from '@soleri/core';
 import { mkdirSync, readFileSync, rmSync, writeFileSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 ${domainImports}
 import { createCoreFacade } from '../facades/core.facade.js';
-import { Planner } from '../planning/planner.js';
 import { LLMClient } from '../llm/llm-client.js';
-import { KeyPool } from '../llm/key-pool.js';
 
 function makeEntry(overrides: Partial<IntelligenceEntry> = {}): IntelligenceEntry {
   return {