@amodalai/amodal 0.3.39 → 0.3.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amodalai/amodal",
-  "version": "0.3.39",
+  "version": "0.3.41",
   "description": "Amodal CLI",
   "license": "MIT",
   "repository": {
@@ -26,12 +26,12 @@
     "react": "^19.2.4",
     "yargs": "^17.7.2",
     "zod": "^4.3.6",
-    "@amodalai/types": "0.3.39",
-    "@amodalai/core": "0.3.39",
-    "@amodalai/db": "0.3.39",
-    "@amodalai/runtime": "0.3.39",
-    "@amodalai/studio": "0.3.39",
-    "@amodalai/runtime-app": "0.3.39"
+    "@amodalai/types": "0.3.41",
+    "@amodalai/core": "0.3.41",
+    "@amodalai/db": "0.3.41",
+    "@amodalai/runtime": "0.3.41",
+    "@amodalai/studio": "0.3.41",
+    "@amodalai/runtime-app": "0.3.41"
   },
   "devDependencies": {
     "@types/node": "^20.11.24",

package/src/commands/admin.ts

@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-import {readFile} from 'node:fs/promises';
-import * as path from 'node:path';
 import {
   fetchAdminAgent,
+  getAdminAgentConfig,
   getAdminAgentVersion,
 } from '@amodalai/core';
 import {findRepoRoot} from '../shared/repo-discovery.js';
@@ -17,7 +16,6 @@ import {findRepoRoot} from '../shared/repo-discovery.js';
  * 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();
@@ -25,27 +23,20 @@ export async function updateAdminAgentCommand(): Promise<number> {
     // 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
-    }
+  const config = await getAdminAgentConfig(repoPath);
+
+  if (config.pathOverride) {
+    process.stderr.write(`[update] Admin agent is overridden in amodal.json (adminAgent: "${config.pathOverride}").\n`);
+    process.stderr.write('[update] The global cache is not used. Update your local copy directly.\n');
+    return 1;
   }
 
-  process.stderr.write('[update] Fetching latest admin agent from registry...\n');
+  process.stderr.write(config.pinnedVersion
+    ? `[update] Fetching admin agent v${config.pinnedVersion} from registry...\n`
+    : '[update] Fetching latest admin agent from registry...\n');
+
   try {
-    const dir = await fetchAdminAgent();
+    const dir = await fetchAdminAgent({version: config.pinnedVersion});
     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`);

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 {ensureAdminAgent} from '@amodalai/core';
+import {ensureAdminAgent, getAdminAgentConfig, getAdminAgentVersion, checkRegistryVersion} from '@amodalai/core';
 import {findRepoRoot} from '../shared/repo-discovery.js';
 import {createServer} from 'node:net';
 import {runConnectionPreflight, printPreflightTable} from '../shared/connection-preflight.js';
@@ -179,6 +179,7 @@ function spawnStudio(opts: {
   repoPath: string;
   agentId?: string;
   adminAgentUrl?: string;
+  basePath?: string;
 }): StudioSpawnResult | null {
   const studioDir = resolveStudioDir();
   if (!studioDir) {
@@ -197,6 +198,7 @@ function spawnStudio(opts: {
     HOSTNAME: '0.0.0.0',
     ...(opts.agentId ? {AGENT_ID: opts.agentId} : {}),
     ...(opts.adminAgentUrl ? {ADMIN_AGENT_URL: opts.adminAgentUrl} : {}),
+    ...(opts.basePath ? {BASE_PATH: opts.basePath} : {}),
   };
 
   // Pre-built server (npm install): dist-server/studio-server.js
@@ -287,6 +289,27 @@ async function spawnAdminAgent(opts: {
     return null;
   }
 
+  const adminVersion = await getAdminAgentVersion(adminAgentPath);
+  log.info('admin_agent_resolved', {path: adminAgentPath, version: adminVersion ?? 'unknown'});
+
+  // Non-blocking upgrade check for unpinned admin agent
+  void (async () => {
+    try {
+      const config = await getAdminAgentConfig(opts.repoPath);
+      if (config.pathOverride || config.pinnedVersion) return;
+      const cached = await getAdminAgentVersion(adminAgentPath);
+      if (!cached) return;
+      const registry = await checkRegistryVersion();
+      if (registry && registry !== cached) {
+        process.stderr.write(
+          `[admin] Admin agent v${cached} — v${registry} available (run \`amodal update --admin-agent\` to upgrade)\n`,
+        );
+      }
+    } catch {
+      // Non-blocking — silently ignore
+    }
+  })().catch(() => {});
+
   // Verify the admin agent directory has an amodal.json
   if (!existsSync(path.join(adminAgentPath, 'amodal.json'))) {
     log.warn('admin_agent_invalid', {