@amodalai/amodal 0.3.24 → 0.3.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amodalai/amodal",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "description": "Amodal CLI",
   "license": "MIT",
   "repository": {
@@ -30,12 +30,12 @@
     "semver": "^7.6.0",
     "yargs": "^17.7.2",
     "zod": "^4.3.6",
-    "@amodalai/types": "0.3.24",
-    "@amodalai/core": "0.3.24",
-    "@amodalai/db": "0.3.24",
-    "@amodalai/runtime": "0.3.24",
-    "@amodalai/studio": "0.3.24",
-    "@amodalai/runtime-app": "0.3.24"
+    "@amodalai/types": "0.3.25",
+    "@amodalai/core": "0.3.25",
+    "@amodalai/db": "0.3.25",
+    "@amodalai/runtime": "0.3.25",
+    "@amodalai/studio": "0.3.25",
+    "@amodalai/runtime-app": "0.3.25"
   },
   "devDependencies": {
     "@types/node": "^20.11.24",

package/src/commands/dev.test.ts

@@ -33,7 +33,7 @@ vi.mock('@amodalai/db', () => ({
 }));
 
 vi.mock('@amodalai/core', () => ({
-  resolveAdminAgent: vi.fn().mockResolvedValue(null),
+  ensureAdminAgent: vi.fn().mockResolvedValue(null),
 }));
 
 vi.mock('../shared/connection-preflight.js', () => ({

package/src/commands/dev.ts

@@ -12,7 +12,7 @@ import {spawn} from 'node:child_process';
 import path from 'node:path';
 import {fileURLToPath} from 'node:url';
 import {createLocalServer, initLogLevel, interceptConsole, log} from '@amodalai/runtime';
-import {resolveAdminAgent} from '@amodalai/core';
+import {ensureAdminAgent} from '@amodalai/core';
 import {findRepoRoot} from '../shared/repo-discovery.js';
 import {findFreePort} from '../shared/find-free-port.js';
 import {runConnectionPreflight, printPreflightTable} from '../shared/connection-preflight.js';
@@ -253,10 +253,13 @@ async function spawnAdminAgent(opts: {
   studioUrl: string | null;
   repoPath: string;
 }): Promise<AdminSpawnResult | null> {
-  const adminAgentPath = await resolveAdminAgent(opts.repoPath);
-  if (!adminAgentPath) {
-    log.info('admin_agent_not_available', {
-      hint: 'No admin agent found at ~/.amodal/admin-agent/ or in amodal.json — skipped',
+  let adminAgentPath: string | null;
+  try {
+    adminAgentPath = await ensureAdminAgent(opts.repoPath);
+  } catch (err: unknown) {
+    log.warn('admin_agent_fetch_failed', {
+      error: err instanceof Error ? err.message : String(err),
+      hint: 'Could not download @amodalai/agent-admin — admin agent skipped',
     });
     return null;
   }

package/src/commands/init.test.ts

@@ -38,6 +38,13 @@ describe('runInit', () => {
     const gitignore = readFileSync(join(tempDir, '.gitignore'), 'utf-8');
     expect(gitignore).toContain('node_modules/');
     expect(gitignore).toContain('.env');
+
+    expect(existsSync(join(tempDir, '.env'))).toBe(true);
+    const env = readFileSync(join(tempDir, '.env'), 'utf-8');
+    expect(env).toContain('ANTHROPIC_API_KEY=');
+    expect(env).toContain('# OPENAI_API_KEY=');
+    expect(env).toContain('# GOOGLE_API_KEY=');
+    expect(env).toContain('# DATABASE_URL=');
   });
 
   it('should write valid config.json', async () => {
@@ -84,6 +91,10 @@ describe('runInit', () => {
     const config = JSON.parse(readFileSync(join(tempDir, 'amodal.json'), 'utf-8'));
     expect(config['models']['main']['provider']).toBe('openai');
     expect(config['models']['main']['model']).toBe('gpt-4o');
+
+    const env = readFileSync(join(tempDir, '.env'), 'utf-8');
+    expect(env).toContain('OPENAI_API_KEY=');
+    expect(env).toContain('# ANTHROPIC_API_KEY=');
   });
 
   it('should use Google provider', async () => {

package/src/commands/init.ts

@@ -56,6 +56,12 @@ export async function runInit(options: InitOptions = {}): Promise<void> {
     writeFileSync(gitignorePath, '.amodal/\nnode_modules/\n.env\n.env.*\n');
   }
 
+  // Write skeleton .env if it doesn't exist
+  const envPath = join(cwd, '.env');
+  if (!existsSync(envPath)) {
+    writeFileSync(envPath, generateEnvTemplate(provider));
+  }
+
   process.stderr.write(`[init] Created project "${name}" (${provider})\n`);
   process.stderr.write('[init] Next steps:\n');
   process.stderr.write('  1. Add a connection:  amodal connect <name>\n');
@@ -63,6 +69,45 @@ export async function runInit(options: InitOptions = {}): Promise<void> {
   process.stderr.write('  3. Start dev server:  amodal dev\n');
 }
 
+/**
+ * Generates a skeleton .env with commented provider keys and common vars.
+ * The selected provider's key is uncommented; others are commented out.
+ */
+function generateEnvTemplate(
+  provider: 'anthropic' | 'openai' | 'google',
+): string {
+  const lines = [
+    '# Amodal environment variables',
+    '# Only fill in what you need — most projects use a single provider.',
+    '# The runtime auto-detects your provider from whichever key is set.',
+    '',
+    '# LLM provider keys (uncomment the one you use)',
+  ];
+
+  const keys: Array<{key: string; provider: string}> = [
+    {key: 'ANTHROPIC_API_KEY', provider: 'anthropic'},
+    {key: 'OPENAI_API_KEY', provider: 'openai'},
+    {key: 'GOOGLE_API_KEY', provider: 'google'},
+  ];
+
+  for (const {key, provider: p} of keys) {
+    if (p === provider) {
+      lines.push(`${key}=`);
+    } else {
+      lines.push(`# ${key}=`);
+    }
+  }
+
+  lines.push(
+    '',
+    '# Database (required — Postgres connection for memory, stores, and sessions)',
+    '# DATABASE_URL=postgresql://localhost:5432/my_agent',
+    '',
+  );
+
+  return lines.join('\n');
+}
+
 export const initCommand: CommandModule = {
   command: 'init',
   describe: 'Initialize a new amodal project',

package/src/templates/config-template.ts

@@ -19,14 +19,7 @@ export function generateConfigTemplate(options: ConfigTemplateOptions): string {
     google: 'gemini-2.0-flash',
   };
 
-  const envKeyMap: Record<string, string> = {
-    anthropic: 'ANTHROPIC_API_KEY',
-    openai: 'OPENAI_API_KEY',
-    google: 'GOOGLE_API_KEY',
-  };
-
   const model = modelMap[options.provider] ?? modelMap['anthropic'];
-  const envKey = envKeyMap[options.provider] ?? envKeyMap['anthropic'];
 
   const config = {
     name: options.name,
@@ -35,7 +28,6 @@ export function generateConfigTemplate(options: ConfigTemplateOptions): string {
       main: {
         provider: options.provider,
         model,
-        apiKey: `\${${envKey}}`,
       },
     },
   };