@soleri/cli 1.9.0 → 1.10.1

package/src/commands/create.ts

@@ -2,137 +2,185 @@ import { readFileSync, existsSync } from 'node:fs';
 import { resolve } from 'node:path';
 import type { Command } from 'commander';
 import * as p from '@clack/prompts';
-import { previewScaffold, scaffold, AgentConfigSchema } from '@soleri/forge/lib';
+import {
+  previewScaffold,
+  scaffold,
+  AgentConfigSchema,
+  SETUP_TARGETS,
+  type SetupTarget,
+} from '@soleri/forge/lib';
 import { runCreateWizard } from '../prompts/create-wizard.js';
 import { listPacks } from '../hook-packs/registry.js';
 import { installPack } from '../hook-packs/installer.js';
 
+function parseSetupTarget(value?: string): SetupTarget | undefined {
+  if (!value) return undefined;
+  if ((SETUP_TARGETS as readonly string[]).includes(value)) {
+    return value as SetupTarget;
+  }
+  return undefined;
+}
+
+function includesClaudeSetup(target: SetupTarget | undefined): boolean {
+  const resolved = target ?? 'claude';
+  return resolved === 'claude' || resolved === 'both';
+}
+
 export function registerCreate(program: Command): void {
   program
     .command('create')
     .argument('[name]', 'Agent ID (kebab-case)')
     .option('-c, --config <path>', 'Path to JSON config file (skip interactive prompts)')
+    .option(
+      '--setup-target <target>',
+      `Setup target: ${SETUP_TARGETS.join(', ')} (default: claude)`,
+    )
     .option('-y, --yes', 'Skip confirmation prompts (use with --config for fully non-interactive)')
     .description('Create a new Soleri agent')
-    .action(async (name?: string, opts?: { config?: string; yes?: boolean }) => {
-      try {
-        let config;
-
-        if (opts?.config) {
-          // Non-interactive: read from config file
-          const configPath = resolve(opts.config);
-          if (!existsSync(configPath)) {
-            p.log.error(`Config file not found: ${configPath}`);
-            process.exit(1);
+    .action(
+      async (name?: string, opts?: { config?: string; yes?: boolean; setupTarget?: string }) => {
+        try {
+          let config;
+
+          if (opts?.config) {
+            // Non-interactive: read from config file
+            const configPath = resolve(opts.config);
+            if (!existsSync(configPath)) {
+              p.log.error(`Config file not found: ${configPath}`);
+              process.exit(1);
+            }
+            const raw = JSON.parse(readFileSync(configPath, 'utf-8'));
+            const parsed = AgentConfigSchema.safeParse(raw);
+            if (!parsed.success) {
+              p.log.error(`Invalid config: ${parsed.error.message}`);
+              process.exit(1);
+            }
+            config = parsed.data;
+          } else {
+            // Interactive wizard
+            const wizardResult = await runCreateWizard(name);
+            if (!wizardResult) {
+              p.outro('Cancelled.');
+              return;
+            }
+            const parsed = AgentConfigSchema.safeParse(wizardResult);
+            if (!parsed.success) {
+              p.log.error(`Invalid config: ${parsed.error.message}`);
+              process.exit(1);
+            }
+            config = parsed.data;
           }
-          const raw = JSON.parse(readFileSync(configPath, 'utf-8'));
-          const parsed = AgentConfigSchema.safeParse(raw);
-          if (!parsed.success) {
-            p.log.error(`Invalid config: ${parsed.error.message}`);
+
+          const setupTarget = parseSetupTarget(opts?.setupTarget);
+          if (opts?.setupTarget && !setupTarget) {
+            p.log.error(
+              `Invalid --setup-target "${opts.setupTarget}". Expected one of: ${SETUP_TARGETS.join(', ')}`,
+            );
             process.exit(1);
           }
-          config = parsed.data;
-        } else {
-          // Interactive wizard
-          config = await runCreateWizard(name);
-          if (!config) {
-            p.outro('Cancelled.');
-            return;
+          if (setupTarget) {
+            config = { ...config, setupTarget };
           }
-        }
+          const claudeSetup = includesClaudeSetup(config.setupTarget);
+
+          const nonInteractive = !!(opts?.yes || opts?.config);
+
+          // Hook packs — from config file or interactive prompt
+          let selectedPacks: string[] = [];
+          if (!claudeSetup && config.hookPacks && config.hookPacks.length > 0) {
+            p.log.warn(
+              'Hook packs are Claude-only. Skipping because setup target excludes Claude.',
+            );
+          } else if (config.hookPacks && config.hookPacks.length > 0) {
+            selectedPacks = config.hookPacks;
 
-        const nonInteractive = !!(opts?.yes || opts?.config);
-
-        // Hook packs — from config file or interactive prompt
-        let selectedPacks: string[] = [];
-        if (config.hookPacks && config.hookPacks.length > 0) {
-          selectedPacks = config.hookPacks;
-
-          // Validate pack names against registry — warn and skip unknown
-          const available = listPacks().map((pk) => pk.name);
-          const unknown = selectedPacks.filter((pk) => !available.includes(pk));
-          if (unknown.length > 0) {
-            for (const name of unknown) {
-              p.log.warn(
-                `Unknown hook pack "${name}" — skipping. Available: ${available.join(', ')}`,
-              );
+            // Validate pack names against registry — warn and skip unknown
+            const available = listPacks().map((pk) => pk.name);
+            const unknown = selectedPacks.filter((pk) => !available.includes(pk));
+            if (unknown.length > 0) {
+              for (const name of unknown) {
+                p.log.warn(
+                  `Unknown hook pack "${name}" — skipping. Available: ${available.join(', ')}`,
+                );
+              }
+              selectedPacks = selectedPacks.filter((pk) => available.includes(pk));
+            }
+          } else if (!nonInteractive && claudeSetup) {
+            const packs = listPacks();
+            const packChoices = packs.map((pk) => ({
+              value: pk.name,
+              label: pk.name,
+              hint: `${pk.description} (${pk.hooks.length} hooks)`,
+            }));
+
+            const chosen = await p.multiselect({
+              message: 'Install hook packs? (Claude quality gates for ~/.claude/)',
+              options: packChoices,
+              required: false,
+            });
+
+            if (!p.isCancel(chosen)) {
+              selectedPacks = chosen as string[];
             }
-            selectedPacks = selectedPacks.filter((pk) => available.includes(pk));
-          }
-        } else if (!nonInteractive) {
-          const packs = listPacks();
-          const packChoices = packs.map((pk) => ({
-            value: pk.name,
-            label: pk.name,
-            hint: `${pk.description} (${pk.hooks.length} hooks)`,
-          }));
-
-          const chosen = await p.multiselect({
-            message: 'Install hook packs? (quality gates for ~/.claude/)',
-            options: packChoices,
-            required: false,
-          });
-
-          if (!p.isCancel(chosen)) {
-            selectedPacks = chosen as string[];
           }
-        }
 
-        // Preview
-        const preview = previewScaffold(config);
+          // Preview
+          const preview = previewScaffold(config);
 
-        p.log.info(`Will create ${preview.files.length} files in ${preview.agentDir}`);
-        p.log.info(`Facades: ${preview.facades.map((f) => f.name).join(', ')}`);
-        p.log.info(`Domains: ${preview.domains.join(', ')}`);
-        if (config.tone) {
-          p.log.info(`Tone: ${config.tone}`);
-        }
-        if (config.skills?.length) {
-          p.log.info(`Skills: ${config.skills.length} selected`);
-        }
-        if (selectedPacks.length > 0) {
-          p.log.info(`Hook packs: ${selectedPacks.join(', ')}`);
-        }
+          p.log.info(`Will create ${preview.files.length} files in ${preview.agentDir}`);
+          p.log.info(`Facades: ${preview.facades.map((f) => f.name).join(', ')}`);
+          p.log.info(`Domains: ${preview.domains.join(', ')}`);
+          p.log.info(`Setup target: ${config.setupTarget ?? 'claude'}`);
+          if (config.tone) {
+            p.log.info(`Tone: ${config.tone}`);
+          }
+          if (config.skills?.length) {
+            p.log.info(`Skills: ${config.skills.length} selected`);
+          }
+          if (selectedPacks.length > 0) {
+            p.log.info(`Hook packs: ${selectedPacks.join(', ')}`);
+          }
 
-        if (!nonInteractive) {
-          const confirmed = await p.confirm({ message: 'Create agent?' });
-          if (p.isCancel(confirmed) || !confirmed) {
-            p.outro('Cancelled.');
-            return;
+          if (!nonInteractive) {
+            const confirmed = await p.confirm({ message: 'Create agent?' });
+            if (p.isCancel(confirmed) || !confirmed) {
+              p.outro('Cancelled.');
+              return;
+            }
           }
-        }
 
-        // Scaffold + auto-build
-        const s = p.spinner();
-        s.start('Scaffolding and building agent...');
-        const result = scaffold(config);
-        s.stop(result.success ? 'Agent created and built!' : 'Scaffolding failed');
+          // Scaffold + auto-build
+          const s = p.spinner();
+          s.start('Scaffolding and building agent...');
+          const result = scaffold(config);
+          s.stop(result.success ? 'Agent created and built!' : 'Scaffolding failed');
 
-        if (!result.success) {
-          p.log.error(result.summary);
-          process.exit(1);
-        }
+          if (!result.success) {
+            p.log.error(result.summary);
+            process.exit(1);
+          }
 
-        // Install selected hook packs
-        if (selectedPacks.length > 0) {
-          for (const packName of selectedPacks) {
-            const { installed } = installPack(packName, { projectDir: result.agentDir });
-            if (installed.length > 0) {
-              p.log.success(`Hook pack "${packName}" installed (${installed.length} hooks)`);
-            } else {
-              p.log.info(`Hook pack "${packName}" — all hooks already present`);
+          // Install selected hook packs
+          if (selectedPacks.length > 0) {
+            for (const packName of selectedPacks) {
+              const { installed } = installPack(packName, { projectDir: result.agentDir });
+              if (installed.length > 0) {
+                p.log.success(`Hook pack "${packName}" installed (${installed.length} hooks)`);
+              } else {
+                p.log.info(`Hook pack "${packName}" — all hooks already present`);
+              }
             }
           }
-        }
 
-        if (result.success) {
-          p.note(result.summary, 'Next steps');
-        }
+          if (result.success) {
+            p.note(result.summary, 'Next steps');
+          }
 
-        p.outro('Done!');
-      } catch (err) {
-        p.log.error(err instanceof Error ? err.message : String(err));
-        process.exit(1);
-      }
-    });
+          p.outro('Done!');
+        } catch (err) {
+          p.log.error(err instanceof Error ? err.message : String(err));
+          process.exit(1);
+        }
+      },
+    );
 }

package/src/commands/install-knowledge.ts

@@ -1,13 +1,74 @@
 import { resolve } from 'node:path';
+import { existsSync } from 'node:fs';
+import { execFileSync } from 'node:child_process';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
 import type { Command } from 'commander';
 import * as p from '@clack/prompts';
 import { installKnowledge } from '@soleri/forge/lib';
 import { detectAgent } from '../utils/agent-context.js';
 
+/**
+ * Resolve a pack identifier to a local path.
+ * If `pack` is a local path, return it directly.
+ * If it looks like a package name, download from npm.
+ */
+async function resolvePackPath(pack: string): Promise<string> {
+  // Local path — use directly
+  if (pack.startsWith('.') || pack.startsWith('/') || existsSync(pack)) {
+    return resolve(pack);
+  }
+
+  // npm package name — resolve to @soleri/knowledge-{name} or use as-is if scoped
+  const npmName = pack.startsWith('@') ? pack : `@soleri/knowledge-${pack.replace(/@.*$/, '')}`;
+  const version = pack.includes('@') && !pack.startsWith('@') ? pack.split('@').pop() : undefined;
+  const spec = version ? `${npmName}@${version}` : npmName;
+
+  const tmpDir = join(tmpdir(), `soleri-pack-${Date.now()}`);
+
+  p.log.info(`Resolving ${spec} from npm...`);
+
+  try {
+    execFileSync('npm', ['pack', spec, '--pack-destination', tmpDir], {
+      stdio: 'pipe',
+      timeout: 30_000,
+    });
+
+    // Find the tarball
+    const { readdirSync } = await import('node:fs');
+    const { mkdirSync } = await import('node:fs');
+    mkdirSync(tmpDir, { recursive: true });
+
+    // npm pack creates a .tgz file — extract it
+    const files = readdirSync(tmpDir).filter((f: string) => f.endsWith('.tgz'));
+    if (files.length === 0) {
+      throw new Error(`No tarball found after npm pack ${spec}`);
+    }
+
+    const extractDir = join(tmpDir, 'extracted');
+    mkdirSync(extractDir, { recursive: true });
+    execFileSync('tar', ['xzf', join(tmpDir, files[0]), '-C', extractDir], {
+      stdio: 'pipe',
+      timeout: 15_000,
+    });
+
+    // npm pack extracts to a 'package/' subdirectory
+    const packageDir = join(extractDir, 'package');
+    if (!existsSync(packageDir)) {
+      throw new Error(`Extracted package directory not found at ${packageDir}`);
+    }
+
+    return packageDir;
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    throw new Error(`Failed to resolve ${spec} from npm: ${msg}`, { cause: e });
+  }
+}
+
 export function registerInstallKnowledge(program: Command): void {
   program
     .command('install-knowledge')
-    .argument('<pack>', 'Path to knowledge bundle file or directory')
+    .argument('<pack>', 'Path to knowledge bundle, directory, or npm package name')
     .option('--no-facades', 'Skip facade generation for new domains')
     .description('Install knowledge packs into the agent in the current directory')
     .action(async (pack: string, opts: { facades: boolean }) => {
@@ -17,10 +78,20 @@ export function registerInstallKnowledge(program: Command): void {
         process.exit(1);
       }
 
-      const bundlePath = resolve(pack);
-
       const s = p.spinner();
-      s.start(`Installing knowledge from ${bundlePath}...`);
+      s.start(`Resolving knowledge pack: ${pack}...`);
+
+      let bundlePath: string;
+      try {
+        bundlePath = await resolvePackPath(pack);
+      } catch (err) {
+        s.stop('Resolution failed');
+        p.log.error(err instanceof Error ? err.message : String(err));
+        process.exit(1);
+        return; // unreachable, for TS
+      }
+
+      s.message(`Installing knowledge from ${bundlePath}...`);
 
       try {
         const result = await installKnowledge({

package/src/commands/install.ts

@@ -0,0 +1,101 @@
+import type { Command } from 'commander';
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { homedir } from 'node:os';
+import * as p from '@clack/prompts';
+import { detectAgent } from '../utils/agent-context.js';
+
+type Target = 'claude' | 'codex' | 'both';
+
+function installClaude(agentId: string, agentDir: string): void {
+  const configPath = join(homedir(), '.claude.json');
+  let config: Record<string, unknown> = {};
+
+  if (existsSync(configPath)) {
+    try {
+      config = JSON.parse(readFileSync(configPath, 'utf-8'));
+    } catch {
+      p.log.error(`Failed to parse ${configPath}. Fix it manually or delete it to start fresh.`);
+      process.exit(1);
+    }
+  }
+
+  if (!config.mcpServers || typeof config.mcpServers !== 'object') {
+    config.mcpServers = {};
+  }
+
+  (config.mcpServers as Record<string, unknown>)[agentId] = {
+    type: 'stdio',
+    command: 'node',
+    args: [join(agentDir, 'dist', 'index.js')],
+    env: {},
+  };
+
+  writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+  p.log.success(`Registered ${agentId} in ~/.claude.json`);
+}
+
+function installCodex(agentId: string, agentDir: string): void {
+  const codexDir = join(homedir(), '.codex');
+  const configPath = join(codexDir, 'config.toml');
+
+  if (!existsSync(codexDir)) {
+    mkdirSync(codexDir, { recursive: true });
+  }
+
+  let content = '';
+  if (existsSync(configPath)) {
+    content = readFileSync(configPath, 'utf-8');
+  }
+
+  // Remove existing section for this agent if present
+  const sectionHeader = `[mcp_servers.${agentId}]`;
+  const sectionRegex = new RegExp(`\\[mcp_servers\\.${escapeRegExp(agentId)}\\][^\\[]*`, 's');
+  content = content.replace(sectionRegex, '').trim();
+
+  const entryPoint = join(agentDir, 'dist', 'index.js');
+  const section = `\n\n${sectionHeader}\ncommand = "node"\nargs = ["${entryPoint}"]\n`;
+
+  content = content + section;
+
+  writeFileSync(configPath, content.trim() + '\n', 'utf-8');
+  p.log.success(`Registered ${agentId} in ~/.codex/config.toml`);
+}
+
+function escapeRegExp(s: string): string {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+export function registerInstall(program: Command): void {
+  program
+    .command('install')
+    .argument('[dir]', 'Agent directory (defaults to cwd)')
+    .option('--target <target>', 'Registration target: claude, codex, or both', 'claude')
+    .description('Register agent as MCP server in editor config')
+    .action(async (dir?: string, opts?: { target?: string }) => {
+      const resolvedDir = dir ? resolve(dir) : undefined;
+      const ctx = detectAgent(resolvedDir);
+
+      if (!ctx) {
+        p.log.error('Not in an agent project. Run from an agent directory or pass its path.');
+        process.exit(1);
+      }
+
+      const target = (opts?.target ?? 'claude') as Target;
+
+      if (target !== 'claude' && target !== 'codex' && target !== 'both') {
+        p.log.error(`Invalid target "${target}". Use: claude, codex, or both`);
+        process.exit(1);
+      }
+
+      if (target === 'claude' || target === 'both') {
+        installClaude(ctx.agentId, ctx.agentPath);
+      }
+
+      if (target === 'codex' || target === 'both') {
+        installCodex(ctx.agentId, ctx.agentPath);
+      }
+
+      p.log.info(`Agent ${ctx.agentId} is now available as an MCP server.`);
+    });
+}