@soleri/cli 1.12.5 → 8.0.0

package/src/prompts/create-wizard.ts

@@ -424,27 +424,112 @@ export async function runCreateWizard(initialName?: string): Promise<AgentConfig
   const setupTarget = await p.select({
     message: 'Setup target',
     options: [
+      {
+        value: 'opencode',
+        label: 'OpenCode',
+        hint: 'OpenCode with Claude Max subscription (default)',
+      },
       {
         value: 'claude',
         label: 'Claude Code',
-        hint: 'Generate/setup Claude integrations (default)',
+        hint: 'Claude Code CLI integrations',
       },
       {
         value: 'codex',
         label: 'Codex',
-        hint: 'Generate/setup Codex integrations',
+        hint: 'Codex integrations',
       },
       {
-        value: 'both',
-        label: 'Both',
-        hint: 'Generate/setup for Claude Code and Codex',
+        value: 'all',
+        label: 'All',
+        hint: 'OpenCode + Claude Code + Codex',
       },
     ],
-    initialValue: 'claude',
+    initialValue: 'opencode',
   });
 
   if (p.isCancel(setupTarget)) return null;
 
+  // ─── Step 13: Model selection ────────────────────────────
+  p.note(
+    [
+      'Claude Max models are free with a Claude Max subscription.',
+      'API models require provider keys in .opencode.json under "providers".',
+      'You can switch models anytime in OpenCode with ctrl+o.',
+    ].join('\n'),
+    'Model Selection',
+  );
+
+  const model = await p.select({
+    message: 'Primary model (can change anytime with ctrl+o)',
+    options: [
+      // ── Free with Claude Max ──
+      {
+        value: 'claude-code-sonnet-4',
+        label: 'Claude 4 Sonnet (Max)',
+        hint: 'Free — balanced speed + quality (default)',
+      },
+      {
+        value: 'claude-code-opus-4',
+        label: 'Claude 4 Opus (Max)',
+        hint: 'Free — most capable, slower',
+      },
+      {
+        value: 'claude-code-3.5-haiku',
+        label: 'Claude 3.5 Haiku (Max)',
+        hint: 'Free — fastest Claude model',
+      },
+      // ── Anthropic API ──
+      {
+        value: 'claude-4-sonnet',
+        label: 'Claude 4 Sonnet (API)',
+        hint: 'Anthropic API key required',
+      },
+      {
+        value: 'claude-4-opus',
+        label: 'Claude 4 Opus (API)',
+        hint: 'Anthropic API key required',
+      },
+      // ── OpenAI ──
+      {
+        value: 'gpt-4.1',
+        label: 'GPT 4.1',
+        hint: 'OpenAI API key required',
+      },
+      {
+        value: 'o4-mini',
+        label: 'o4-mini',
+        hint: 'OpenAI API key — reasoning model',
+      },
+      // ── Google ──
+      {
+        value: 'gemini-2.5',
+        label: 'Gemini 2.5 Pro',
+        hint: 'Google API key required',
+      },
+      {
+        value: 'gemini-2.5-flash',
+        label: 'Gemini 2.5 Flash',
+        hint: 'Google API key — fast + cheap',
+      },
+      // ── Groq ──
+      {
+        value: 'llama-3.3-70b-versatile',
+        label: 'Llama 3.3 70B (Groq)',
+        hint: 'Groq API key — open source, fast',
+      },
+      // ── xAI ──
+      {
+        value: 'grok-3-beta',
+        label: 'Grok 3',
+        hint: 'xAI API key required',
+      },
+    ],
+    initialValue: 'claude-code-sonnet-4',
+  });
+
+  if (p.isCancel(model)) return null;
+
   return {
     id,
     name,
@@ -456,6 +541,7 @@ export async function runCreateWizard(initialName?: string): Promise<AgentConfig
     greeting,
     outputDir,
     skills: selectedSkills,
-    setupTarget: setupTarget as 'claude' | 'codex' | 'both',
+    model: model as string,
+    setupTarget: setupTarget as 'claude' | 'codex' | 'opencode' | 'all',
   };
 }

package/src/utils/agent-context.ts

@@ -1,24 +1,52 @@
 /**
  * Detect and validate an agent project in the current working directory.
+ * Supports both file-tree agents (agent.yaml) and legacy TS agents (package.json).
  */
 import { existsSync, readFileSync } from 'node:fs';
 import { join, resolve } from 'node:path';
+import { parse as parseYaml } from 'yaml';
 
-interface AgentContext {
+export type AgentFormat = 'filetree' | 'typescript';
+
+export interface AgentContext {
   agentPath: string;
   agentId: string;
   packageName: string;
   hasBrain: boolean;
+  /** Agent format: 'filetree' (v7+) or 'typescript' (legacy) */
+  format: AgentFormat;
 }
 
 /**
  * Detect an agent in the given directory.
+ * Checks for file-tree agent (agent.yaml) first, then legacy TS agent (package.json).
  * Returns null if the directory is not a valid agent project.
  */
 export function detectAgent(dir?: string): AgentContext | null {
   const agentPath = resolve(dir ?? process.cwd());
-  const pkgPath = join(agentPath, 'package.json');
 
+  // v7: File-tree agent (agent.yaml)
+  const yamlPath = join(agentPath, 'agent.yaml');
+  if (existsSync(yamlPath)) {
+    try {
+      const yaml = parseYaml(readFileSync(yamlPath, 'utf-8'));
+      const id = yaml?.id;
+      if (typeof id === 'string' && id.length > 0) {
+        return {
+          agentPath,
+          agentId: id,
+          packageName: id,
+          hasBrain: true, // file-tree agents always have brain via engine
+          format: 'filetree',
+        };
+      }
+    } catch {
+      // Invalid YAML — fall through to legacy detection
+    }
+  }
+
+  // Legacy: TypeScript agent (package.json with -mcp suffix)
+  const pkgPath = join(agentPath, 'package.json');
   if (!existsSync(pkgPath)) return null;
 
   try {
@@ -31,8 +59,17 @@ export function detectAgent(dir?: string): AgentContext | null {
       agentId: name.replace(/-mcp$/, ''),
       packageName: name,
       hasBrain: existsSync(join(agentPath, 'src', 'brain')),
+      format: 'typescript',
     };
   } catch {
     return null;
   }
 }
+
+/**
+ * Detect a file-tree agent specifically (agent.yaml only).
+ */
+export function detectFileTreeAgent(dir?: string): AgentContext | null {
+  const ctx = detectAgent(dir);
+  return ctx?.format === 'filetree' ? ctx : null;
+}