@amodalai/amodal 0.1.13 → 0.1.15

package/package.json

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

package/src/commands/command-exports.test.ts

@@ -7,38 +7,21 @@
 import {describe, it, expect} from 'vitest';
 import type {CommandModule} from 'yargs';
 
-import {connectCommand} from './connect.js';
-import {installPkgCommand} from './install-pkg.js';
-import {uninstallCommand} from './uninstall.js';
-import {listCommand} from './list.js';
-import {updateCommand} from './update.js';
-import {diffCommand} from './diff.js';
-import {searchCommand} from './search.js';
-import {publishCommand} from './publish.js';
-import {loginCommand} from './login.js';
-import {syncCommand} from './sync.js';
-
 import {initCommand} from './init.js';
 import {devCommand} from './dev.js';
 import {inspectCommand} from './inspect.js';
 import {validateCommand} from './validate.js';
-
-import {secretsCommand} from './secrets.js';
-import {deployCommand} from './deploy.js';
-import {buildCommand} from './build.js';
-import {dockerCommand} from './docker.js';
-import {rollbackCommand} from './rollback.js';
-import {deploymentsCommand} from './deployments.js';
-import {promoteCommand} from './promote.js';
-import {serveCommand} from './serve.js';
-import {statusCommand} from './status.js';
-import {auditCommand} from './audit.js';
-import {automationsCommand} from './automations.js';
-
+import {chatCommand} from './chat.js';
 import {evalCommand} from './eval.js';
-import {experimentCommand} from './experiment.js';
 import {testQueryCommand} from './test-query.js';
 
+import {pkgCommand} from './groups/pkg.js';
+import {deployGroupCommand} from './groups/deploy.js';
+import {opsCommand} from './groups/ops.js';
+import {authCommand} from './groups/auth.js';
+
+import {amodalCommands} from './index.js';
+
 function assertValidCommandModule(mod: CommandModule, expectedCommand: string): void {
   expect(mod.command).toBeDefined();
   expect(String(mod.command).split(' ')[0]).toBe(expectedCommand);
@@ -46,43 +29,24 @@ function assertValidCommandModule(mod: CommandModule, expectedCommand: string):
 }
 
 describe('command-exports', () => {
-  it('package management commands export valid CommandModules', () => {
-    assertValidCommandModule(connectCommand, 'connect');
-    assertValidCommandModule(installPkgCommand, 'install');
-    assertValidCommandModule(uninstallCommand, 'uninstall');
-    assertValidCommandModule(listCommand, 'list');
-    assertValidCommandModule(updateCommand, 'update');
-    assertValidCommandModule(diffCommand, 'diff');
-    assertValidCommandModule(searchCommand, 'search');
-    assertValidCommandModule(publishCommand, 'publish');
-    assertValidCommandModule(loginCommand, 'login');
-    assertValidCommandModule(syncCommand, 'sync');
-  });
-
-  it('project commands export valid CommandModules', () => {
+  it('top-level commands export valid CommandModules', () => {
     assertValidCommandModule(initCommand, 'init');
     assertValidCommandModule(devCommand, 'dev');
-    assertValidCommandModule(inspectCommand, 'inspect');
+    assertValidCommandModule(chatCommand, 'chat');
     assertValidCommandModule(validateCommand, 'validate');
+    assertValidCommandModule(inspectCommand, 'inspect');
+    assertValidCommandModule(evalCommand, 'eval');
+    assertValidCommandModule(testQueryCommand, 'test-query');
   });
 
-  it('platform commands export valid CommandModules', () => {
-    assertValidCommandModule(secretsCommand, 'secrets');
-    assertValidCommandModule(deployCommand, 'deploy');
-    assertValidCommandModule(buildCommand, 'build');
-    assertValidCommandModule(dockerCommand, 'docker');
-    assertValidCommandModule(rollbackCommand, 'rollback');
-    assertValidCommandModule(deploymentsCommand, 'deployments');
-    assertValidCommandModule(promoteCommand, 'promote');
-    assertValidCommandModule(serveCommand, 'serve');
-    assertValidCommandModule(statusCommand, 'status');
-    assertValidCommandModule(auditCommand, 'audit');
-    assertValidCommandModule(automationsCommand, 'automations');
+  it('group commands export valid CommandModules', () => {
+    assertValidCommandModule(pkgCommand, 'pkg');
+    assertValidCommandModule(deployGroupCommand, 'deploy');
+    assertValidCommandModule(opsCommand, 'ops');
+    assertValidCommandModule(authCommand, 'auth');
   });
 
-  it('advanced commands export valid CommandModules', () => {
-    assertValidCommandModule(evalCommand, 'eval');
-    assertValidCommandModule(experimentCommand, 'experiment');
-    assertValidCommandModule(testQueryCommand, 'test-query');
+  it('amodalCommands has expected count', () => {
+    expect(amodalCommands).toHaveLength(11);
   });
 });

package/src/commands/deploy.ts

@@ -148,8 +148,8 @@ export async function runDeploy(options: DeployOptions = {}): Promise<number> {
 }
 
 export const deployCommand: CommandModule = {
-  command: 'deploy',
-  describe: 'Deploy to the platform',
+  command: 'push',
+  describe: 'Push a deployment to the platform',
   builder: (yargs) =>
     yargs
       .option('message', {

package/src/commands/deployments.ts

@@ -58,7 +58,7 @@ export async function runDeployments(options: DeploymentsOptions = {}): Promise<
 }
 
 export const deploymentsCommand: CommandModule = {
-  command: 'deployments',
+  command: 'list',
   describe: 'List deployment history',
   builder: (yargs) =>
     yargs

package/src/commands/dev.ts

@@ -5,7 +5,7 @@
  */
 
 import type {CommandModule} from 'yargs';
-import {existsSync} from 'node:fs';
+import {existsSync, readFileSync} from 'node:fs';
 import {createRequire} from 'node:module';
 import path from 'node:path';
 import {fileURLToPath} from 'node:url';
@@ -35,6 +35,23 @@ export async function runDev(options: DevOptions = {}): Promise<void> {
     process.exit(1);
   }
 
+  // Load .env file from the repo root (if present)
+  const envPath = path.join(repoPath, '.env');
+  if (existsSync(envPath)) {
+    const envContent = readFileSync(envPath, 'utf-8');
+    for (const line of envContent.split('\n')) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith('#')) continue;
+      const eqIdx = trimmed.indexOf('=');
+      if (eqIdx === -1) continue;
+      const key = trimmed.slice(0, eqIdx).trim();
+      const value = trimmed.slice(eqIdx + 1).trim();
+      if (key && !(key in process.env)) {
+        process.env[key] = value;
+      }
+    }
+  }
+
   const port = options.port ?? DEFAULT_PORT;
   const host = options.host ?? '0.0.0.0';
 

package/src/commands/groups/auth.ts

@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright 2025 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+
+import type {CommandModule} from 'yargs';
+import {loginCommand, logoutCommand} from '../login.js';
+
+export const authCommand: CommandModule = {
+  command: 'auth <command>',
+  describe: 'Authentication',
+  builder: (yargs) =>
+    yargs
+      .command(loginCommand)
+      .command(logoutCommand)
+      .demandCommand(1, 'Specify a subcommand'),
+  handler: () => {},
+};

package/src/commands/groups/deploy.ts

@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright 2025 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+
+import type {CommandModule} from 'yargs';
+import {deployCommand as pushCommand} from '../deploy.js';
+import {buildCommand} from '../build.js';
+import {serveCommand} from '../serve.js';
+import {statusCommand} from '../status.js';
+import {deploymentsCommand} from '../deployments.js';
+import {rollbackCommand} from '../rollback.js';
+import {promoteCommand} from '../promote.js';
+
+export const deployGroupCommand: CommandModule = {
+  command: 'deploy <command>',
+  describe: 'Deployment lifecycle',
+  builder: (yargs) =>
+    yargs
+      .command(pushCommand)
+      .command(buildCommand)
+      .command(serveCommand)
+      .command(statusCommand)
+      .command(deploymentsCommand)
+      .command(rollbackCommand)
+      .command(promoteCommand)
+      .demandCommand(1, 'Specify a subcommand'),
+  handler: () => {},
+};

package/src/commands/groups/ops.ts

@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright 2025 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+
+import type {CommandModule} from 'yargs';
+import {secretsCommand} from '../secrets.js';
+import {dockerCommand} from '../docker.js';
+import {automationsCommand} from '../automations.js';
+import {auditCommand} from '../audit.js';
+import {experimentCommand} from '../experiment.js';
+
+export const opsCommand: CommandModule = {
+  command: 'ops <command>',
+  describe: 'Platform operations',
+  builder: (yargs) =>
+    yargs
+      .command(secretsCommand)
+      .command(dockerCommand)
+      .command(automationsCommand)
+      .command(auditCommand)
+      .command(experimentCommand)
+      .demandCommand(1, 'Specify a subcommand'),
+  handler: () => {},
+};

package/src/commands/groups/pkg.ts

@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright 2025 Amodal Labs, Inc.
+ * SPDX-License-Identifier: MIT
+ */
+
+import type {CommandModule} from 'yargs';
+import {connectCommand} from '../connect.js';
+import {installPkgCommand} from '../install-pkg.js';
+import {uninstallCommand} from '../uninstall.js';
+import {listCommand} from '../list.js';
+import {updateCommand} from '../update.js';
+import {diffCommand} from '../diff.js';
+import {searchCommand} from '../search.js';
+import {publishCommand} from '../publish.js';
+import {linkCommand} from '../link.js';
+import {syncCommand} from '../sync.js';
+
+export const pkgCommand: CommandModule = {
+  command: 'pkg <command>',
+  describe: 'Manage packages',
+  builder: (yargs) =>
+    yargs
+      .command(connectCommand)
+      .command(installPkgCommand)
+      .command(uninstallCommand)
+      .command(listCommand)
+      .command(updateCommand)
+      .command(diffCommand)
+      .command(searchCommand)
+      .command(publishCommand)
+      .command(linkCommand)
+      .command(syncCommand)
+      .demandCommand(1, 'Specify a subcommand'),
+  handler: () => {},
+};

package/src/commands/index.ts

@@ -8,69 +8,32 @@ import {initCommand} from './init.js';
 import {devCommand} from './dev.js';
 import {inspectCommand} from './inspect.js';
 import {validateCommand} from './validate.js';
-import {connectCommand} from './connect.js';
-import {installPkgCommand} from './install-pkg.js';
-import {uninstallCommand} from './uninstall.js';
-import {listCommand} from './list.js';
-import {updateCommand} from './update.js';
-import {diffCommand} from './diff.js';
-import {searchCommand} from './search.js';
-import {publishCommand} from './publish.js';
-import {loginCommand, logoutCommand} from './login.js';
-import {linkCommand} from './link.js';
-import {syncCommand} from './sync.js';
-import {secretsCommand} from './secrets.js';
-import {deployCommand} from './deploy.js';
-import {buildCommand} from './build.js';
-import {dockerCommand} from './docker.js';
-import {rollbackCommand} from './rollback.js';
-import {deploymentsCommand} from './deployments.js';
-import {promoteCommand} from './promote.js';
-import {serveCommand} from './serve.js';
-import {statusCommand} from './status.js';
 import {chatCommand} from './chat.js';
-import {auditCommand} from './audit.js';
 import {evalCommand} from './eval.js';
-import {experimentCommand} from './experiment.js';
 import {testQueryCommand} from './test-query.js';
-import {automationsCommand} from './automations.js';
+import {pkgCommand} from './groups/pkg.js';
+import {deployGroupCommand} from './groups/deploy.js';
+import {opsCommand} from './groups/ops.js';
+import {authCommand} from './groups/auth.js';
+
 /**
- * All amodal subcommands for flat registration on the root yargs instance.
+ * All amodal subcommands registered on the root yargs instance.
+ *
+ * Top-level: daily-driver commands (init, dev, chat, validate, inspect, eval, test)
+ * Groups: pkg, deploy, ops, auth
  */
 export const amodalCommands = [
-  // Project
+  // Top-level
   initCommand,
   devCommand,
-  inspectCommand,
-  validateCommand,
-  // Package management
-  connectCommand,
-  installPkgCommand,
-  uninstallCommand,
-  listCommand,
-  updateCommand,
-  diffCommand,
-  searchCommand,
-  publishCommand,
-  loginCommand,
-  logoutCommand,
-  linkCommand,
-  syncCommand,
-  // Platform
-  secretsCommand,
-  deployCommand,
-  buildCommand,
-  dockerCommand,
-  rollbackCommand,
-  deploymentsCommand,
-  promoteCommand,
-  serveCommand,
-  statusCommand,
   chatCommand,
-  auditCommand,
-  automationsCommand,
-  // Advanced
+  validateCommand,
+  inspectCommand,
   evalCommand,
-  experimentCommand,
   testQueryCommand,
+  // Groups
+  pkgCommand,
+  deployGroupCommand,
+  opsCommand,
+  authCommand,
 ];

package/src/commands/init.test.ts

@@ -52,18 +52,14 @@ describe('runInit', () => {
     expect(config['models']['main']['provider']).toBe('anthropic');
   });
 
-  it('should write starter skill', async () => {
+  it('should not write starter files into directories', async () => {
     await runInit({cwd: tempDir});
 
-    const skill = readFileSync(join(tempDir, 'skills', 'SKILL.md'), 'utf-8');
-    expect(skill).toContain('general-analysis');
-  });
-
-  it('should write starter knowledge', async () => {
-    await runInit({cwd: tempDir});
-
-    const knowledge = readFileSync(join(tempDir, 'knowledge', 'domain.md'), 'utf-8');
-    expect(knowledge).toContain('Domain Knowledge');
+    // Directories should exist but be empty — no fake/mock content
+    expect(existsSync(join(tempDir, 'skills'))).toBe(true);
+    expect(existsSync(join(tempDir, 'skills', 'SKILL.md'))).toBe(false);
+    expect(existsSync(join(tempDir, 'knowledge'))).toBe(true);
+    expect(existsSync(join(tempDir, 'knowledge', 'domain.md'))).toBe(false);
   });
 
   it('should skip if config already exists', async () => {

package/src/commands/init.ts

@@ -8,8 +8,6 @@ import {existsSync, mkdirSync, writeFileSync} from 'node:fs';
 import {join} from 'node:path';
 import type {CommandModule} from 'yargs';
 import {generateConfigTemplate} from '../templates/config-template.js';
-import {generateSkillTemplate} from '../templates/skill-template.js';
-import {generateKnowledgeTemplate} from '../templates/knowledge-template.js';
 
 export interface InitOptions {
   cwd?: string;
@@ -48,18 +46,6 @@ export async function runInit(options: InitOptions = {}): Promise<void> {
   // Write amodal.json at repo root
   writeFileSync(configPath, generateConfigTemplate({name, provider}));
 
-  // Write starter skill
-  writeFileSync(
-    join(cwd, 'skills', 'SKILL.md'),
-    generateSkillTemplate(),
-  );
-
-  // Write starter knowledge
-  writeFileSync(
-    join(cwd, 'knowledge', 'domain.md'),
-    generateKnowledgeTemplate(),
-  );
-
   // Write .gitignore if it doesn't exist
   const gitignorePath = join(cwd, '.gitignore');
   if (!existsSync(gitignorePath)) {

package/src/main.ts

@@ -8,6 +8,16 @@
 import {readFileSync} from 'node:fs';
 import yargs from 'yargs';
 import {hideBin} from 'yargs/helpers';
+
+// Suppress OpenTelemetry DiagAPI logger warnings from @google/gemini-cli-core.
+// gemini-cli-core calls setLogger() which triggers a noisy "Current logger will
+// be overwritten" stack trace on every startup. Not actionable on our side.
+const origError = console.error; // eslint-disable-line no-console
+console.error = (...args: unknown[]) => { // eslint-disable-line no-console
+  if (typeof args[0] === 'string' && args[0].includes('Current logger will')) return;
+  origError.apply(console, args);
+};
+
 import {amodalCommands} from './commands/index.js';
 import {loadEnvFile} from './shared/load-env.js';
 
@@ -18,7 +28,11 @@ const raw: unknown = JSON.parse(readFileSync(new URL('../../package.json', impor
 if (typeof raw !== 'object' || raw === null || !('version' in raw) || typeof raw.version !== 'string') {
   throw new Error('Failed to read version from package.json');
 }
-const pkgVersion = raw.version;
+// Detect source build: pnpm-workspace.yaml exists at repo root (4 levels up from dist/src/main.js)
+const isSourceBuild = (() => {
+  try { return readFileSync(new URL('../../../../pnpm-workspace.yaml', import.meta.url), 'utf-8').length > 0; } catch { return false; }
+})();
+const pkgVersion = raw.version + (isSourceBuild ? '-dev' : '');
 
 const cli = yargs(hideBin(process.argv))
   .scriptName('amodal')