@amodalai/amodal 0.2.2 → 0.2.4

package/package.json

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

package/src/commands/connect-channel.ts

@@ -53,12 +53,7 @@ async function runConnectChannel(options: ConnectChannelOptions): Promise<number
 
   // Step 1: Install if not present
   const packageDir = path.join(repoPath, 'node_modules', ...npmName.split('/'));
-  let alreadyInstalled = false;
-  try {
-    alreadyInstalled = existsSync(path.join(packageDir, 'package.json'));
-  } catch {
-    // Not installed
-  }
+  const alreadyInstalled = existsSync(path.join(packageDir, 'package.json'));
 
   if (!alreadyInstalled) {
     process.stderr.write(`[connect channel] Installing ${npmName}...\n`);
@@ -75,8 +70,14 @@ async function runConnectChannel(options: ConnectChannelOptions): Promise<number
   }
 
   // Step 2: Load the plugin
-  const plugin = await loadChannelPlugin(packageDir, npmName);
-  if (!plugin) return 1;
+  let plugin: ChannelPlugin;
+  try {
+    plugin = await loadChannelPlugin(packageDir, npmName);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    process.stderr.write(`[connect channel] ${msg}\n`);
+    return 1;
+  }
 
   // Step 3: Add to packages array in amodal.json if not present
   const configPath = path.join(repoPath, 'amodal.json');
@@ -118,11 +119,10 @@ async function runConnectChannel(options: ConnectChannelOptions): Promise<number
 async function loadChannelPlugin(
   packageDir: string,
   npmName: string,
-): Promise<ChannelPlugin | null> {
+): Promise<ChannelPlugin> {
   const pkgJsonPath = path.join(packageDir, 'package.json');
   if (!existsSync(pkgJsonPath)) {
-    process.stderr.write(`[connect channel] Package "${npmName}" not found in node_modules.\n`);
-    return null;
+    throw new Error(`Package "${npmName}" not found in node_modules.`);
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- parsing external JSON
@@ -131,26 +131,18 @@ async function loadChannelPlugin(
   const entryPath = path.resolve(packageDir, mainField);
 
   if (!entryPath.startsWith(path.resolve(packageDir))) {
-    process.stderr.write(`[connect channel] Package "${npmName}" has invalid main field.\n`);
-    return null;
+    throw new Error(`Package "${npmName}" has invalid main field.`);
   }
 
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- dynamic import
-    const mod = await import(pathToFileURL(entryPath).href) as {default?: unknown};
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- validating shape below
-    const plugin = mod.default as ChannelPlugin | undefined;
-
-    if (!plugin || typeof plugin.channelType !== 'string' || typeof plugin.createAdapter !== 'function') {
-      process.stderr.write(`[connect channel] Package "${npmName}" does not export a valid ChannelPlugin.\n`);
-      return null;
-    }
-    return plugin;
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`[connect channel] Failed to load plugin: ${msg}\n`);
-    return null;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- dynamic import
+  const mod = await import(pathToFileURL(entryPath).href) as {default?: unknown};
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- validating shape below
+  const plugin = mod.default as ChannelPlugin | undefined;
+
+  if (!plugin || typeof plugin.channelType !== 'string' || typeof plugin.createAdapter !== 'function') {
+    throw new Error(`Package "${npmName}" does not export a valid ChannelPlugin.`);
   }
+  return plugin;
 }
 
 function buildSetupContext(

package/src/commands/connect.ts

@@ -49,8 +49,13 @@ export async function runConnect(options: ConnectOptions): Promise<number> {
   let isReconnect = false;
   try {
     isReconnect = statSync(packageDir).isDirectory();
-  } catch {
-    // Not installed
+  } catch (err: unknown) {
+    // ENOENT means not installed; any other error is unexpected
+    if (err && typeof err === 'object' && 'code' in err && err.code !== 'ENOENT') {
+      const msg = err instanceof Error ? err.message : String(err);
+      process.stderr.write(`[connect] Unexpected error checking ${npmName}: ${msg}\n`);
+      return 1;
+    }
   }
 
   // Step 1: Install if fresh

package/src/commands/install-pkg.ts

@@ -43,8 +43,12 @@ export async function runInstallPkg(options: {cwd?: string; packages?: string[]}
     if (config && typeof config === 'object' && 'name' in config) {
       projectName = String((config as Record<string, unknown>)['name']);
     }
-  } catch {
-    // Use default project name
+  } catch (err) {
+    // amodal.json may not exist yet (bare install before init). Only warn
+    // if the file was present but unreadable/corrupt.
+    if (err && typeof err === 'object' && 'code' in err && err.code !== 'ENOENT') {
+      process.stderr.write(`[install] Warning: could not read amodal.json: ${err instanceof Error ? err.message : String(err)}\n`);
+    }
   }
 
   ensurePackageJson(repoPath, projectName);