add updated cli

Author: rgarcia

.gitignore

@@ -7,4 +7,3 @@ dist
 dist-deno
 /*.tgz
 .idea/
-

package.json

@@ -28,23 +28,37 @@
     "@arethetypeswrong/cli": "^0.17.0",
     "@swc/core": "^1.3.102",
     "@swc/jest": "^0.2.29",
+    "@types/archiver": "^6.0.3",
+    "@types/bun": "^1.2.12",
+    "@types/fs-extra": "^11.0.4",
+    "@types/ignore-walk": "^4.0.3",
     "@types/jest": "^29.4.0",
     "@types/node": "^20.17.6",
-    "typescript-eslint": "8.31.1",
+    "@types/tmp": "^0.2.6",
     "@typescript-eslint/eslint-plugin": "8.31.1",
     "@typescript-eslint/parser": "8.31.1",
+    "archiver": "^7.0.1",
+    "chalk": "^5.4.1",
     "eslint": "^9.20.1",
     "eslint-plugin-prettier": "^5.2.3",
     "eslint-plugin-unused-imports": "^4.1.4",
+    "execa": "^9.5.3",
+    "fs-extra": "^11.3.0",
+    "get-port": "^7.1.0",
     "iconv-lite": "^0.6.3",
+    "ignore-walk": "^7.0.0",
     "jest": "^29.4.0",
     "prettier": "^3.0.0",
     "publint": "^0.2.12",
+    "smol-toml": "^1.3.4",
+    "tar": "^7.4.3",
+    "tmp": "^0.2.3",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.5.0",
     "tsc-multi": "https://github.com/stainless-api/tsc-multi/releases/download/v1.1.4/tsc-multi-1.1.4.tgz",
     "tsconfig-paths": "^4.0.0",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "typescript-eslint": "8.31.1"
   },
   "resolutions": {
     "synckit": "0.8.8"
@@ -72,4 +86,4 @@
   "engines": {
     "node": ">= 20"
   }
-}
+}

src/cli/index.ts

@@ -1,9 +1,9 @@
-import type { KernelJson } from '@onkernel/sdk';
 import { Command } from 'commander';
 import fs from 'fs';
 import getPort from 'get-port';
 import os from 'os';
 import path from 'path';
+import type { KernelJson } from '../core/app-framework';
 import { packageApp } from './lib/package';
 import { getPackageVersion, isPnpmInstalled, isUvInstalled } from './lib/util';
 
@@ -13,29 +13,23 @@ const program = new Command();
 // This is useful for local dev.
 // KERNEL_NODE_SDK_OVERRIDE=/Users/rafaelgarcia/code/onkernel/kernel/packages/sdk-node
 // KERNEL_NODE_SDK_OVERRIDE_VERSION=0.0.1alpha.1
-const KERNEL_NODE_SDK_OVERRIDE = process.env.KERNEL_NODE_SDK_OVERRIDE || undefined;
+const KERNEL_NODE_SDK_OVERRIDE = process.env['KERNEL_NODE_SDK_OVERRIDE'] || undefined;
 // Same for python...
 // KERNEL_PYTHON_SDK_OVERRIDE=/Users/rafaelgarcia/code/onkernel/kernel/packages/sdk-python
 // KERNEL_PYTHON_SDK_OVERRIDE_VERSION=0.0.1alpha.1
-const KERNEL_PYTHON_SDK_OVERRIDE = process.env.KERNEL_PYTHON_SDK_OVERRIDE || undefined;
+const KERNEL_PYTHON_SDK_OVERRIDE = process.env['KERNEL_PYTHON_SDK_OVERRIDE'] || undefined;
 
 // Point to a local version of the boot loader or a specific version
-const KERNEL_NODE_BOOT_LOADER_OVERRIDE = process.env.KERNEL_NODE_BOOT_LOADER_OVERRIDE;
-const KERNEL_PYTHON_BOOT_LOADER_OVERRIDE = process.env.KERNEL_PYTHON_BOOT_LOADER_OVERRIDE;
+const KERNEL_NODE_BOOT_LOADER_OVERRIDE = process.env['KERNEL_NODE_BOOT_LOADER_OVERRIDE'] || undefined;
+const KERNEL_PYTHON_BOOT_LOADER_OVERRIDE = process.env['KERNEL_PYTHON_BOOT_LOADER_OVERRIDE'] || undefined;
 
-program
-  .name('kernel')
-  .description('CLI for Kernel deployment and invocation')
-  .version(getPackageVersion());
+program.name('kernel').description('CLI for Kernel deployment and invocation').version(getPackageVersion());
 
 program
   .command('deploy')
   .description('Deploy a Kernel application')
   .argument('<entrypoint>', 'Path to entrypoint file (TypeScript or Python)')
-  .option(
-    '--local',
-    'Does not publish the app to Kernel, but installs it on disk for invoking locally',
-  )
+  .option('--local', 'Does not publish the app to Kernel, but installs it on disk for invoking locally')
   .action(async (entrypoint, options) => {
     const resolvedEntrypoint = path.resolve(entrypoint);
     if (!fs.existsSync(resolvedEntrypoint)) {
@@ -48,12 +42,12 @@ program
       sourceDir: path.dirname(resolvedEntrypoint), // TODO: handle nested entrypoint, i.e. ./src/entrypoint.ts
       entrypoint: resolvedEntrypoint,
       sdkOverrides: {
-        node: KERNEL_NODE_SDK_OVERRIDE,
-        python: KERNEL_PYTHON_SDK_OVERRIDE,
+        ...(KERNEL_NODE_SDK_OVERRIDE && { node: KERNEL_NODE_SDK_OVERRIDE }),
+        ...(KERNEL_PYTHON_SDK_OVERRIDE && { python: KERNEL_PYTHON_SDK_OVERRIDE }),
       },
       bootLoaderOverrides: {
-        node: KERNEL_NODE_BOOT_LOADER_OVERRIDE,
-        python: KERNEL_PYTHON_BOOT_LOADER_OVERRIDE,
+        ...(KERNEL_NODE_BOOT_LOADER_OVERRIDE && { node: KERNEL_NODE_BOOT_LOADER_OVERRIDE }),
+        ...(KERNEL_PYTHON_BOOT_LOADER_OVERRIDE && { python: KERNEL_PYTHON_BOOT_LOADER_OVERRIDE }),
       },
     });
 
@@ -109,25 +103,15 @@ program
     console.log(JSON.stringify(parsedPayload, null, 2));
 
     // Get the app directory
-    const cacheFile = path.join(
-      os.homedir(),
-      '.local',
-      'state',
-      'kernel',
-      'deploy',
-      'local',
-      appName,
-    );
+    const cacheFile = path.join(os.homedir(), '.local', 'state', 'kernel', 'deploy', 'local', appName);
     if (!fs.existsSync(cacheFile)) {
       console.error(`Error: App "${appName}" local deployment not found. `);
       console.error('Did you `kernel deploy --local <entrypoint>`?');
       process.exit(1);
     }
     const kernelLocalDir = fs.readFileSync(cacheFile, 'utf8').trim();
     if (!fs.existsSync(kernelLocalDir)) {
-      console.error(
-        `Error: App "${appName}" local deployment has been corrupted, please re-deploy.`,
-      );
+      console.error(`Error: App "${appName}" local deployment has been corrupted, please re-deploy.`);
       process.exit(1);
     }
 
@@ -176,10 +160,7 @@ async function waitForStartupMessage(
         const text = decoder.decode(value);
         process.stderr.write(text);
 
-        if (
-          text.includes('Application startup complete.') ||
-          text.includes('Kernel application running')
-        ) {
+        if (text.includes('Application startup complete.') || text.includes('Kernel application running')) {
           clearTimeout(timeout);
           resolve();
           break;
@@ -201,12 +182,7 @@ type InvokeLocalOptions = {
 /**
  * Invokes a locally deployed Python app action
  */
-async function invokeLocalPython({
-  kernelLocalDir,
-  appName,
-  actionName,
-  parsedPayload,
-}: InvokeLocalOptions) {
+async function invokeLocalPython({ kernelLocalDir, appName, actionName, parsedPayload }: InvokeLocalOptions) {
   const uvInstalled = await isUvInstalled();
   if (!uvInstalled) {
     console.error('Error: uv is not installed. Please install it with:');
@@ -254,12 +230,7 @@ async function invokeLocalPython({
 /**
  * Invokes a locally deployed TypeScript app action
  */
-async function invokeLocalNode({
-  kernelLocalDir,
-  appName,
-  actionName,
-  parsedPayload,
-}: InvokeLocalOptions) {
+async function invokeLocalNode({ kernelLocalDir, appName, actionName, parsedPayload }: InvokeLocalOptions) {
   const pnpmInstalled = await isPnpmInstalled();
   if (!pnpmInstalled) {
     console.error('Error: pnpm is not installed. Please install it with:');
@@ -279,15 +250,7 @@ async function invokeLocalNode({
   // Find an available port and start the boot loader
   const port = await getPort();
   const tsProcess = Bun.spawn(
-    [
-      'pnpm',
-      'exec',
-      'tsx',
-      'index.ts',
-      '--port',
-      port.toString(),
-      path.join(kernelLocalDir, 'app'),
-    ],
+    ['pnpm', 'exec', 'tsx', 'index.ts', '--port', port.toString(), path.join(kernelLocalDir, 'app')],
     {
       cwd: kernelLocalDir,
       stdio: ['inherit', 'inherit', 'pipe'],

src/cli/lib/package.ts

@@ -1,9 +1,9 @@
-import type { KernelJson } from '@onkernel/sdk';
 import fs from 'fs';
 import fsExtra from 'fs-extra';
 import os from 'os';
 import path from 'path';
 import { parse as parseToml, stringify as stringifyToml } from 'smol-toml';
+import type { KernelJson } from '../../core/app-framework';
 import { NODE_PACKAGE_NAME, PYTHON_PACKAGE_NAME } from './constants';
 import { runInDirectory } from './util';
 
@@ -74,10 +74,7 @@ export async function packageApp(config: PackageConfig): Promise<string> {
     // 1. Update kernel SDK dependency if override is provided
     if (sdkOverrides.python) {
       if (fs.existsSync(path.join(kernelAppDir, 'pyproject.toml'))) {
-        overwriteKernelDependencyInPyproject(
-          path.join(kernelAppDir, 'pyproject.toml'),
-          sdkOverrides.python,
-        );
+        overwriteKernelDependencyInPyproject(path.join(kernelAppDir, 'pyproject.toml'), sdkOverrides.python);
       }
       if (fs.existsSync(path.join(kernelAppDir, 'requirements.txt'))) {
         overwriteKernelDependencyInRequirementsTxt(
@@ -196,32 +193,18 @@ export async function packageApp(config: PackageConfig): Promise<string> {
 /**
  * Copy all files from source directory to target directory
  */
-export function copyDirectoryContents(
-  sourceDir: string,
-  targetDir: string,
-  excludeDirs: string[] = [],
-) {
+export function copyDirectoryContents(sourceDir: string, targetDir: string, excludeDirs: string[] = []) {
   fsExtra.copySync(sourceDir, targetDir, {
     filter: (src: string) => {
       const basename = path.basename(src);
-      const standardExcludes = [
-        '.build',
-        'node_modules',
-        '.git',
-        '.mypy_cache',
-        '.venv',
-        '__pycache__',
-      ];
+      const standardExcludes = ['.build', 'node_modules', '.git', '.mypy_cache', '.venv', '__pycache__'];
       return ![...standardExcludes, ...excludeDirs].includes(basename);
     },
     overwrite: true,
   });
 }
 
-function overwriteKernelDependencyInPyproject(
-  pyprojectPath: string,
-  kernelDependencyOverride: string,
-) {
+function overwriteKernelDependencyInPyproject(pyprojectPath: string, kernelDependencyOverride: string) {
   const pyproject = parseToml(fs.readFileSync(pyprojectPath, 'utf8')) as any;
   if (!pyproject.project) {
     pyproject.project = { dependencies: [] };

src/cli/lib/util.ts

@@ -11,10 +11,7 @@ import { fileURLToPath } from 'url';
  * @param options Optional options including working directory
  * @returns Promise resolving to just the exit code
  */
-export async function runForExitCode(
-  command: string,
-  options: { cwd?: string } = {},
-): Promise<number> {
+export async function runForExitCode(command: string, options: { cwd?: string } = {}): Promise<number> {
   try {
     const cwd = options.cwd ? path.resolve(options.cwd) : process.cwd();
 

src/client.ts

@@ -32,7 +32,8 @@ import { Browser, BrowserCreateSessionResponse } from './resources/browser';
 import { readEnv } from './internal/utils/env';
 import { formatRequestDetails, loggerFor } from './internal/utils/log';
 import { isEmptyObj } from './internal/utils/values';
-import { KernelApp, appRegistry, browsers as appBrowsers } from './core/app-framework';
+import { KernelApp, appRegistry, KernelAction, KernelContext, KernelJson } from './core/app-framework';
+export type { KernelAction, KernelContext, KernelJson };
 
 export interface ClientOptions {
   /**
@@ -710,7 +711,6 @@ export class Kernel {
 
   apps: API.Apps = new API.Apps(this);
   browser: API.Browser = new API.Browser(this);
-  appFrameworkBrowsers = appBrowsers;
 }
 Kernel.Apps = Apps;
 Kernel.Browser = Browser;

src/core/app-framework.ts

@@ -43,10 +43,7 @@ export class KernelApp {
    * Define an action
    */
   action<T, R>(
-    nameOrHandler:
-      | string
-      | ((input: T) => Promise<R>)
-      | ((context: KernelContext, input: T) => Promise<R>),
+    nameOrHandler: string | ((input: T) => Promise<R>) | ((context: KernelContext, input: T) => Promise<R>),
     handler?: ((input: T) => Promise<R>) | ((context: KernelContext, input: T) => Promise<R>),
   ) {
     let actionName: string;
@@ -145,16 +142,3 @@ class KernelAppRegistry {
 
 // Create a singleton registry for apps
 export const appRegistry = new KernelAppRegistry();
-
-// Browser management module
-export const browsers = {
-  /**
-   * Create a new browser instance
-   */
-  create: async ({ invocationId }: { invocationId: string }): Promise<Browser> => {
-    return {
-      cdp_ws_url:
-        'wss://floral-morning-3s0r8t7x.iad-prod-apiukp-0.onkernel.app:9222/devtools/browser/4dc1cbf6-be0e-4612-bba3-8e399d9638c7',
-    };
-  },
-};