@amodalai/amodal 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amodalai/amodal",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Amodal CLI",
   "license": "MIT",
   "repository": {
@@ -30,16 +30,9 @@
     "semver": "^7.6.0",
     "yargs": "^17.7.2",
     "zod": "^4.3.6",
-    "@amodalai/core": "0.1.11",
-    "@amodalai/runtime": "0.1.11"
-  },
-  "peerDependencies": {
-    "@amodalai/runtime-app": "0.1.11"
-  },
-  "peerDependenciesMeta": {
-    "@amodalai/runtime-app": {
-      "optional": true
-    }
+    "@amodalai/core": "0.1.13",
+    "@amodalai/runtime": "0.1.13",
+    "@amodalai/runtime-app": "0.1.13"
   },
   "devDependencies": {
     "@types/node": "^20.11.24",

package/src/commands/admin.ts

@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright 2025 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+
+import {readFile} from 'node:fs/promises';
+import * as path from 'node:path';
+import {
+  fetchAdminAgent,
+  getAdminAgentVersion,
+} from '@amodalai/core';
+import {findRepoRoot} from '../shared/repo-discovery.js';
+
+/**
+ * Update the global admin agent cache from the registry.
+ * Called by `amodal update --admin-agent`.
+ */
+export async function updateAdminAgentCommand(): Promise<number> {
+  // Check if amodal.json overrides the admin agent
+  let repoPath: string | undefined;
+  try {
+    repoPath = findRepoRoot();
+  } catch {
+    // Not in a repo — that's fine
+  }
+
+  if (repoPath) {
+    try {
+      const configRaw = await readFile(path.join(repoPath, 'amodal.json'), 'utf-8');
+      const parsed: unknown = JSON.parse(configRaw);
+      if (parsed && typeof parsed === 'object' && 'adminAgent' in parsed) {
+         
+        const adminPath = (parsed as Record<string, unknown>)['adminAgent'];
+        if (typeof adminPath === 'string') {
+          process.stderr.write(`[update] Admin agent is overridden in amodal.json (adminAgent: "${adminPath}").\n`);
+          process.stderr.write('[update] The global cache is not used. Update your local copy directly.\n');
+          return 1;
+        }
+      }
+    } catch {
+      // No config or parse error — proceed
+    }
+  }
+
+  process.stderr.write('[update] Fetching latest admin agent from registry...\n');
+  try {
+    const dir = await fetchAdminAgent();
+    const version = await getAdminAgentVersion(dir);
+    process.stderr.write(`[update] Admin agent updated to v${version ?? 'unknown'}\n`);
+    process.stderr.write(`[update] Cached at ${dir}\n`);
+    return 0;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    process.stderr.write(`[update] Admin agent update failed: ${msg}\n`);
+    return 1;
+  }
+}

package/src/commands/dev.ts

@@ -6,6 +6,7 @@
 
 import type {CommandModule} from 'yargs';
 import {existsSync} from 'node:fs';
+import {createRequire} from 'node:module';
 import path from 'node:path';
 import {fileURLToPath} from 'node:url';
 import {createLocalServer} from '@amodalai/runtime';
@@ -42,15 +43,19 @@ export async function runDev(options: DevOptions = {}): Promise<void> {
   try {
     let staticAppDir: string | undefined;
 
-    // Use pre-built static assets for the SPA for the SPA.
+    // Use pre-built static assets for the SPA.
     // Vite dev middleware is only used inside the monorepo with `pnpm dev`.
     const scriptDir = path.dirname(fileURLToPath(import.meta.url));
     const candidates = [
       // esbuild bundle: bundle/app/
       path.resolve(scriptDir, 'app'),
-      // global/local install: <pkg root>/node_modules/@amodalai/runtime-app/dist/
-      path.resolve(scriptDir, '..', '..', '..', 'node_modules', '@amodalai', 'runtime-app', 'dist'),
     ];
+
+    // Resolve @amodalai/runtime-app via Node module resolution (works regardless of install layout)
+    const require = createRequire(import.meta.url);
+    const runtimeAppPkg = require.resolve('@amodalai/runtime-app/package.json');
+    candidates.push(path.join(path.dirname(runtimeAppPkg), 'dist'));
+
     for (const dir of candidates) {
       if (existsSync(path.join(dir, 'index.html'))) {
         process.stderr.write('[dev] Serving pre-built runtime app\n');

package/src/commands/index.ts

@@ -34,7 +34,6 @@ import {evalCommand} from './eval.js';
 import {experimentCommand} from './experiment.js';
 import {testQueryCommand} from './test-query.js';
 import {automationsCommand} from './automations.js';
-
 /**
  * All amodal subcommands for flat registration on the root yargs instance.
  */

package/src/commands/update.ts

@@ -148,21 +148,49 @@ export async function runUpdate(options: UpdateOptions = {}): Promise<number> {
 
 export const updateCommand: CommandModule = {
   command: 'update [name]',
-  describe: 'Update installed packages',
+  describe: 'Update packages. Use --all for all packages, --admin-agent for the admin agent, or specify a name.',
   builder: (yargs) =>
     yargs
       .positional('name', {type: 'string', describe: 'Package name to update'})
+      .option('all', {type: 'boolean', default: false, describe: 'Update all installed packages'})
+      .option('admin-agent', {type: 'boolean', default: false, describe: 'Update the global admin agent cache'})
       .option('latest', {type: 'boolean', default: false, describe: 'Allow major version updates'})
       .option('dry-run', {type: 'boolean', default: false, describe: 'Show what would be updated'}),
   handler: async (argv) => {
-    const code = await runUpdate({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-      name: argv['name'] as string | undefined,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-      latest: argv['latest'] as boolean,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-      dryRun: argv['dryRun'] as boolean,
-    });
-    process.exit(code);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    const name = argv['name'] as string | undefined;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    const all = argv['all'] as boolean;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    const adminAgent = argv['adminAgent'] as boolean;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    const latest = argv['latest'] as boolean;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    const dryRun = argv['dryRun'] as boolean;
+
+    // Must specify at least one target
+    if (!name && !all && !adminAgent) {
+      process.stderr.write('Usage: amodal update <name> | --all | --admin-agent\n');
+      process.stderr.write('  <name>          Update a specific package\n');
+      process.stderr.write('  --all           Update all installed packages\n');
+      process.stderr.write('  --admin-agent   Update the global admin agent\n');
+      process.stderr.write('  Flags can be combined: amodal update --all --admin-agent\n');
+      process.exit(1);
+    }
+
+    let failures = 0;
+
+    // Update admin agent if requested
+    if (adminAgent) {
+      const {updateAdminAgentCommand} = await import('./admin.js');
+      failures += await updateAdminAgentCommand();
+    }
+
+    // Update packages if requested
+    if (name || all) {
+      failures += await runUpdate({name, latest, dryRun});
+    }
+
+    process.exit(failures > 0 ? 1 : 0);
   },
 };

package/src/shared/connection-preflight.ts

@@ -227,8 +227,34 @@ export async function runConnectionPreflight(repoPath: string): Promise<Prefligh
 
   const results: LiveTestResult[] = [];
 
+  // Split connections by protocol
+  const restConnections: Array<[string, typeof repo.connections extends Map<string, infer V> ? V : never]> = [];
+  const mcpFromConnections: Record<string, {transport: 'stdio' | 'sse' | 'http'; command?: string; args?: string[]; env?: Record<string, string>; url?: string; headers?: Record<string, string>}> = {};
+
+  for (const [name, conn] of repo.connections) {
+    if (conn.spec.protocol === 'mcp') {
+      // Resolve env: references in headers
+      const resolvedHeaders: Record<string, string> = {};
+      if (conn.spec.headers) {
+        for (const [k, v] of Object.entries(conn.spec.headers)) {
+          resolvedHeaders[k] = v.startsWith('env:') ? (envVars.get(v.slice(4)) ?? process.env[v.slice(4)] ?? '') : v;
+        }
+      }
+      mcpFromConnections[name] = {
+        transport: conn.spec.transport ?? 'stdio',
+        command: conn.spec.command,
+        args: conn.spec.args,
+        env: conn.spec.env,
+        url: conn.spec.url,
+        headers: Object.keys(resolvedHeaders).length > 0 ? resolvedHeaders : undefined,
+      };
+    } else {
+      restConnections.push([name, conn]);
+    }
+  }
+
   // Test REST connections in parallel
-  const restPromises = [...repo.connections.entries()].map(([name, conn]) =>
+  const restPromises = restConnections.map(([name, conn]) =>
     testRestConnection(name, conn.spec, envVars),
   );
   const restResults = await Promise.allSettled(restPromises);
@@ -238,9 +264,17 @@ export async function runConnectionPreflight(repoPath: string): Promise<Prefligh
     }
   }
 
-  // Test MCP servers
-  if (repo.mcpServers && Object.keys(repo.mcpServers).length > 0) {
-    const mcpResults = await testMcpServers(repo.mcpServers);
+  // Test MCP connections (from protocol:mcp connections + legacy mcp.servers)
+  const allMcpConfigs = {...mcpFromConnections};
+  if (repo.mcpServers) {
+    for (const [name, config] of Object.entries(repo.mcpServers)) {
+      if (!allMcpConfigs[name]) {
+        allMcpConfigs[name] = config;
+      }
+    }
+  }
+  if (Object.keys(allMcpConfigs).length > 0) {
+    const mcpResults = await testMcpServers(allMcpConfigs);
     results.push(...mcpResults);
   }