@amodalai/amodal 0.3.86 → 0.3.88

package/package.json

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

package/src/commands/dev.ts

@@ -328,14 +328,25 @@ function spawnStudio(opts: {
     log.debug('studio_prebuilt', {path: prebuiltEntry});
     spawnArgs = [prebuiltEntry];
   } else if (existsSync(sourceEntry)) {
-    // Resolve tsx from the studio package's dependency tree
+    // Resolve tsx from the studio package's dependency tree. tsx 4.x
+    // walls off `./dist/cli.mjs` in its `exports` field, so we resolve
+    // its package.json (always exposed via `./package.json`) and read
+    // the `bin` entry to find the CLI runner.
     const studioRequire = createRequire(path.join(studioDir, 'package.json'));
     let tsxBin: string;
     try {
-      tsxBin = studioRequire.resolve('tsx/dist/cli.mjs');
-    } catch {
+      const tsxPkgPath = studioRequire.resolve('tsx/package.json');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- tsx's package.json shape; we read bin field with a guarded fallback below.
+      const tsxPkg = JSON.parse(readFileSync(tsxPkgPath, 'utf-8')) as {bin?: string | Record<string, string>};
+      const binRel = typeof tsxPkg.bin === 'string'
+        ? tsxPkg.bin
+        : tsxPkg.bin?.['tsx'];
+      if (!binRel) throw new Error('tsx package.json has no usable bin entry');
+      tsxBin = path.resolve(path.dirname(tsxPkgPath), binRel);
+    } catch (err) {
       log.info('studio_tsx_not_found', {
         hint: 'tsx not resolvable from @amodalai/studio — Studio subprocess skipped',
+        error: err instanceof Error ? err.message : String(err),
       });
       return null;
     }

package/src/commands/eval.test.ts

@@ -6,12 +6,19 @@
 
 import {describe, it, expect, vi, beforeEach} from 'vitest';
 
-vi.mock('@amodalai/runtime', () => ({
-  createLocalServer: vi.fn().mockResolvedValue({
-    start: vi.fn().mockResolvedValue({address: () => ({port: 9999})}),
-    stop: vi.fn().mockResolvedValue(undefined),
-  }),
-}));
+vi.mock('@amodalai/runtime', async () => {
+  const actual = await vi.importActual<typeof import('@amodalai/runtime')>('@amodalai/runtime');
+  return {
+    ...actual,
+    createLocalServer: vi.fn().mockResolvedValue({
+      start: vi.fn().mockResolvedValue({address: () => ({port: 9999})}),
+      stop: vi.fn().mockResolvedValue(undefined),
+    }),
+    // eval.ts now does `await import('@amodalai/runtime')` for loadAgentRepo;
+    // route it through mockLoadRepo so the test controls the bundle.
+    loadAgentRepo: (...args: unknown[]) => mockLoadRepo(...args),
+  };
+});
 
 vi.mock('../shared/repo-discovery.js', () => ({
   findRepoRoot: vi.fn(() => '/test/repo'),
@@ -20,7 +27,7 @@ vi.mock('../shared/repo-discovery.js', () => ({
 const mockLoadRepo = vi.fn();
 const mockRunEvalSuite = vi.fn();
 vi.mock('@amodalai/core', async () => {
-  const actual = await vi.importActual('@amodalai/core');
+  const actual = await vi.importActual<typeof import('@amodalai/core')>('@amodalai/core');
   return {
     ...actual,
     loadRepoFromDisk: mockLoadRepo,

package/src/commands/eval.ts

@@ -59,9 +59,10 @@ export async function runEval(options: EvalOptions): Promise<void> {
   const baseUrl = `http://127.0.0.1:${actualPort}`;
 
   try {
-    // Load repo to get evals
-    const {loadRepoFromDisk} = await import('@amodalai/core');
-    const repo = await loadRepoFromDisk(repoPath);
+    // Load repo to get evals — use the runtime wrapper so first-party
+    // built-ins (SQL connection driver) register cleanly.
+    const {loadAgentRepo} = await import('@amodalai/runtime');
+    const repo = await loadAgentRepo({localPath: repoPath});
 
     if (repo.evals.length === 0) {
       process.stderr.write('[eval] No evals found in evals/\n');

package/src/commands/inspect.test.ts

@@ -13,9 +13,12 @@ vi.mock('../shared/repo-discovery.js', () => ({
   findRepoRoot: mockFindRepoRoot,
 }));
 
-vi.mock('@amodalai/core', () => ({
-  resolveAllPackages: mockResolveAllPackages,
-  loadRepo: vi.fn().mockResolvedValue({
+vi.mock('@amodalai/core', async () => {
+  const actual = await vi.importActual<typeof import('@amodalai/core')>('@amodalai/core');
+  return {
+    ...actual,
+    resolveAllPackages: mockResolveAllPackages,
+    loadRepo: vi.fn().mockResolvedValue({
     config: {models: {main: {provider: 'anthropic', model: 'test'}}},
     connections: new Map([['crm', {spec: {auth: {type: 'bearer'}}, surface: [{}, {}]}]]),
     skills: [{name: 'triage'}],
@@ -42,7 +45,8 @@ vi.mock('@amodalai/core', () => ({
       connections: new Map([['crm', {spec: {auth: {type: 'bearer'}}, surface: [{}, {}]}]]),
     },
   })),
-}));
+  };
+});
 
 describe('runInspect', () => {
   let stdoutOutput: string[];

package/src/commands/inspect.ts

@@ -5,7 +5,8 @@
  */
 
 import type {CommandModule} from 'yargs';
-import {loadRepo, setupSession, resolveAllPackages} from '@amodalai/core';
+import {setupSession, resolveAllPackages} from '@amodalai/core';
+import {loadAgentRepo} from '@amodalai/runtime';
 import {findRepoRoot} from '../shared/repo-discovery.js';
 
 export interface InspectOptions {
@@ -34,7 +35,7 @@ export async function runInspect(options: InspectOptions = {}): Promise<void> {
 
   process.stderr.write(`[inspect] Loading repo from ${repoPath}\n`);
 
-  const repo = await loadRepo({localPath: repoPath});
+  const repo = await loadAgentRepo({localPath: repoPath});
   const runtime = setupSession({repo});
 
   const showAll = !options.context && !options.explore && !options.tools && !options.connections && !options.resolved;

package/src/commands/validate.test.ts

@@ -20,11 +20,15 @@ const mockMcpManager = {
   shutdown: vi.fn().mockResolvedValue(undefined),
 };
 
-vi.mock('@amodalai/core', () => ({
-  loadRepo: mockLoadRepo,
-  resolveAllPackages: mockResolveAllPackages,
-  McpManager: vi.fn(() => mockMcpManager),
-}));
+vi.mock('@amodalai/core', async () => {
+  const actual = await vi.importActual<typeof import('@amodalai/core')>('@amodalai/core');
+  return {
+    ...actual,
+    loadRepo: mockLoadRepo,
+    resolveAllPackages: mockResolveAllPackages,
+    McpManager: vi.fn(() => mockMcpManager),
+  };
+});
 
 describe('runValidate', () => {
   beforeEach(() => {

package/src/commands/validate.ts

@@ -7,8 +7,9 @@
 import {join} from 'node:path';
 import {readFile} from 'node:fs/promises';
 import type {CommandModule} from 'yargs';
-import {loadRepo, resolveAllPackages, McpManager} from '@amodalai/core';
+import {resolveAllPackages, McpManager} from '@amodalai/core';
 import type {ConnectionSpec} from '@amodalai/core';
+import {loadAgentRepo} from '@amodalai/runtime';
 import {findRepoRoot} from '../shared/repo-discovery.js';
 
 export interface ValidateOptions {
@@ -256,7 +257,7 @@ export async function runValidate(options: ValidateOptions = {}): Promise<number
   process.stderr.write(`[validate] Loading repo from ${repoPath}\n`);
 
   try {
-    const repo = await loadRepo({localPath: repoPath});
+    const repo = await loadAgentRepo({localPath: repoPath});
 
     // Check: at least one connection
     if (repo.connections.size === 0) {

package/src/shared/connection-preflight.ts

@@ -6,8 +6,9 @@
 
 import {join} from 'node:path';
 import {readFile} from 'node:fs/promises';
-import {loadRepo, McpManager} from '@amodalai/core';
+import {McpManager} from '@amodalai/core';
 import type {ConnectionSpec} from '@amodalai/core';
+import {loadAgentRepo} from '@amodalai/runtime';
 
 export interface LiveTestResult {
   name: string;
@@ -220,7 +221,7 @@ export async function runConnectionPreflight(repoPath: string): Promise<Prefligh
 
   let repo;
   try {
-    repo = await loadRepo({localPath: repoPath});
+    repo = await loadAgentRepo({localPath: repoPath});
   } catch {
     return {results: [], hasFailures: false};
   }