omnara 0.6.0 → 1.0.0-beta.0

package/package.json

@@ -1,69 +1,26 @@
 {
   "name": "omnara",
-  "version": "0.6.0",
+  "version": "1.0.0-beta.0",
   "type": "module",
-  "description": "Command-line interface for Omnara.",
-  "main": "dist/cli.js",
-  "types": "dist/cli.d.ts",
   "bin": {
-    "omnara": "./bin/omnara.js"
+    "omnara": "./src/bin.ts"
   },
   "scripts": {
-    "build": "npm run build:types && node build.mjs && npm run copy-assets",
-    "build:types": "tsc --emitDeclarationOnly --project tsconfig.json",
-    "build:exe": "bun run scripts/build-executable.ts",
-    "build:exe:all": "bun run scripts/build-executable.ts --all",
-    "build:release": "bun run scripts/build-executable.ts --all && bun run scripts/generate-release-json.ts",
-    "copy-assets": "node scripts/copy-assets.mjs",
-    "preinstall": "node scripts/preinstall.js"
+    "omnara": "tsx src/bin.ts",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit -p tsconfig.json"
   },
-  "keywords": [
-    "omnara",
-    "cli"
-  ],
-  "author": "Omnara",
-  "license": "UNLICENSED",
-  "files": [
-    "dist",
-    "bin",
-    "instrument.mjs",
-    "scripts",
-    "README.md"
-  ],
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.1.42",
-    "@anthropic-ai/sdk": "^0.67.0",
-    "@modelcontextprotocol/sdk": "^1.20.1",
-    "@sentry/node": "^10.28.0",
-    "@types/glob": "^8.1.0",
-    "ajv": "^8.17.1",
-    "ajv-formats": "^2.1.1",
-    "chalk": "^4.1.2",
-    "commander": "^11.1.0",
-    "glob": "^9.3.5",
-    "jsonc-parser": "^3.3.1",
-    "simple-git": "^3.30.0",
-    "ws": "^8.18.3",
-    "zod": "^3.25.76"
+    "@clack/prompts": "^1.7.0",
+    "@omnara/sdk": "workspace:*",
+    "commander": "^14.0.0",
+    "tar": "^7.5.22",
+    "zod": "^4.4.3"
   },
   "devDependencies": {
-    "@omnara/shared-js": "file:../shared-js",
-    "@types/node": "^20.11.30",
-    "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.46.2",
-    "@typescript-eslint/parser": "^8.46.2",
-    "@vitest/ui": "^2.1.8",
-    "esbuild": "^0.25.12",
-    "eslint": "^9.38.0",
-    "eslint-formatter-unix": "^8.40.0",
-    "json-schema-to-typescript": "^14.0.1",
-    "prettier": "^3.6.2",
-    "tsx": "^4.7.0",
-    "typescript": "^5.4.0",
-    "typescript-eslint": "^8.46.2",
-    "vitest": "^2.1.8"
-  },
-  "engines": {
-    "node": ">=20"
+    "@types/node": "^22.10.0",
+    "tsx": "^4.19.0",
+    "typescript": "^5.6.0",
+    "vitest": "4.1.9"
   }
 }

package/src/bin.ts

@@ -0,0 +1,34 @@
+#!/usr/bin/env tsx
+import { Command } from 'commander'
+
+import { loadConfig, registerConfigCommand } from './config.ts'
+import { registerGroup, registerOperation } from './factory.ts'
+import { registerLoginCommand } from './login.ts'
+import { commandGroups, topLevelOperations } from './manifest.ts'
+
+process.stdout.on('error', (error: NodeJS.ErrnoException) => {
+  if (error.code === 'EPIPE') process.exit(0)
+  throw error
+})
+
+const program = new Command('omnara').description('Interact with the Omnara API')
+program.configureHelp({
+  subcommandTerm: (cmd) => {
+    const args = cmd.registeredArguments
+      .map((arg) =>
+        arg.required
+          ? `<${arg.name()}${arg.variadic ? '...' : ''}>`
+          : `[${arg.name()}${arg.variadic ? '...' : ''}]`,
+      )
+      .join(' ')
+    return [cmd.name(), cmd.options.length > 0 ? '[options]' : '', args]
+      .filter((part) => part !== '')
+      .join(' ')
+  },
+})
+const config = loadConfig()
+for (const group of commandGroups) registerGroup(program, config, group)
+for (const operation of topLevelOperations) registerOperation(program, config, operation)
+registerLoginCommand(program, config)
+registerConfigCommand(program, config)
+await program.parseAsync()

package/src/browser.ts

@@ -0,0 +1,16 @@
+import { spawn } from 'node:child_process'
+
+function browserCommand(url: string): { command: string; args: string[] } {
+  if (process.platform === 'darwin') return { command: 'open', args: [url] }
+  if (process.platform === 'win32') return { command: 'cmd', args: ['/c', 'start', '', url] }
+  return { command: 'xdg-open', args: [url] }
+}
+
+export function openInBrowser(url: string, onError: (message: string) => void): void {
+  const { command, args } = browserCommand(url)
+  const child = spawn(command, args, { stdio: 'ignore', detached: true })
+  child.once('error', () => {
+    onError('could not open a browser; use the URL above')
+  })
+  child.unref()
+}

package/src/config.ts

@@ -0,0 +1,185 @@
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { dirname, join } from 'node:path'
+
+import { bearerToken, createOmnaraClient, type OmnaraClient } from '@omnara/sdk'
+import { zOrganizationId, zProjectId } from '@omnara/sdk/zod'
+import type { Command } from 'commander'
+import * as z from 'zod'
+
+import {
+  canPromptInteractively,
+  promptOrgSelection,
+  promptProjectSelection,
+} from './interactive.ts'
+import { CliInputError, runCliAction } from './output.ts'
+
+export const DEFAULT_BASE_URL = 'https://app.omnara.com'
+
+const zConfigFile = z.looseObject({
+  base_url: z.url().optional(),
+  token: z.string().min(1).optional(),
+  org_id: zOrganizationId.optional(),
+  project_id: zProjectId.optional(),
+})
+
+export type ConfigFile = z.infer<typeof zConfigFile>
+
+export interface CliConfig {
+  client: OmnaraClient
+  baseUrl: string
+  defaultOrgId?: string
+  defaultProjectId?: string
+}
+
+export function configFilePath(): string {
+  return join(homedir(), '.config', 'omnara', 'config.json')
+}
+
+let warnedAboutConfig = false
+
+function warnConfigIgnored(message: string): void {
+  if (warnedAboutConfig) return
+  warnedAboutConfig = true
+  console.error(message)
+}
+
+const zConfigContents = z
+  .string()
+  .transform((raw, ctx): unknown => {
+    try {
+      return JSON.parse(raw)
+    } catch (error) {
+      ctx.addIssue(error instanceof Error ? error.message : String(error))
+      return z.NEVER
+    }
+  })
+  .pipe(zConfigFile)
+
+function loadConfigFile(): z.ZodSafeParseResult<ConfigFile> {
+  const path = configFilePath()
+  if (!existsSync(path)) return { success: true, data: {} }
+  return zConfigContents.safeParse(readFileSync(path, 'utf8'))
+}
+
+export function readConfigFile(): ConfigFile {
+  const result = loadConfigFile()
+  if (result.success) return result.data
+  warnConfigIgnored(
+    `warning: ignoring unreadable config at ${configFilePath()}: ${z.prettifyError(result.error)}`,
+  )
+  return {}
+}
+
+export function readConfigFileForUpdate(): ConfigFile {
+  const result = loadConfigFile()
+  if (result.success) return result.data
+  throw new CliInputError(
+    `refusing to modify unreadable config at ${configFilePath()} (fix or delete it first): ${z.prettifyError(result.error)}`,
+  )
+}
+
+export function updateConfigFile(patch: Partial<ConfigFile>): ConfigFile {
+  const merged = Object.fromEntries(
+    Object.entries({ ...readConfigFileForUpdate(), ...patch }).filter(
+      ([, value]) => value !== undefined,
+    ),
+  )
+  const result = zConfigFile.safeParse(merged)
+  if (!result.success) {
+    throw new CliInputError(`refusing to save invalid config:\n${z.prettifyError(result.error)}`)
+  }
+  mkdirSync(dirname(configFilePath()), { recursive: true, mode: 0o700 })
+  writeFileSync(configFilePath(), `${JSON.stringify(result.data, null, 2)}\n`, { mode: 0o600 })
+  chmodSync(configFilePath(), 0o600)
+  return result.data
+}
+
+export function loadConfig(): CliConfig {
+  const file = readConfigFile()
+  const baseUrl = process.env.OMNARA_BASE_URL ?? file.base_url ?? DEFAULT_BASE_URL
+  const token = process.env.OMNARA_API_KEY ?? file.token
+  const client = createOmnaraClient({
+    baseUrl,
+    auth: token ? bearerToken(token) : undefined,
+  })
+  return {
+    client,
+    baseUrl,
+    defaultOrgId: process.env.OMNARA_ORG_ID ?? file.org_id,
+    defaultProjectId: process.env.OMNARA_PROJECT_ID ?? file.project_id,
+  }
+}
+
+interface ConfigOptions {
+  org?: string
+  project?: string
+  baseUrl?: string
+}
+
+function describeValue(
+  envName: string,
+  fileValue: string | undefined,
+  defaultValue?: string,
+): string {
+  const envValue = process.env[envName]
+  if (envValue !== undefined) {
+    const shadowed = fileValue !== undefined ? ` (config has ${fileValue})` : ''
+    return `${envValue}  [from ${envName}${shadowed}]`
+  }
+  if (fileValue !== undefined) return `${fileValue}  [from config file]`
+  if (defaultValue !== undefined) return `${defaultValue}  [default]`
+  return '(not set)'
+}
+
+function printConfig(): void {
+  const file = readConfigFile()
+  console.log(`config file  ${configFilePath()}`)
+  console.log(`org_id       ${describeValue('OMNARA_ORG_ID', file.org_id)}`)
+  console.log(`project_id   ${describeValue('OMNARA_PROJECT_ID', file.project_id)}`)
+  console.log(`base_url     ${describeValue('OMNARA_BASE_URL', file.base_url, DEFAULT_BASE_URL)}`)
+}
+
+export function registerConfigCommand(program: Command, cli: CliConfig): void {
+  const config = program
+    .command('config')
+    .description('Show or set the default organization and project')
+    .option('--org <org-id>', 'save this organization ID as the default')
+    .option('--project <project-id>', 'save this project ID as the default')
+    .option('--base-url <url>', 'save this API base URL as the default')
+    .action(async (options: ConfigOptions) => {
+      await runCliAction(() => {
+        if (
+          options.org !== undefined ||
+          options.project !== undefined ||
+          options.baseUrl !== undefined
+        ) {
+          const clearStaleProject = options.org !== undefined && options.project === undefined
+          updateConfigFile({
+            ...(options.org !== undefined ? { org_id: options.org } : {}),
+            ...(clearStaleProject
+              ? { project_id: undefined }
+              : options.project !== undefined
+                ? { project_id: options.project }
+                : {}),
+            ...(options.baseUrl !== undefined ? { base_url: options.baseUrl } : {}),
+          })
+        }
+        printConfig()
+      })
+    })
+  config
+    .command('select')
+    .description('Interactively choose the default organization and project')
+    .action(async () => {
+      await runCliAction(async () => {
+        if (!canPromptInteractively()) {
+          throw new CliInputError('interactive selection needs a terminal')
+        }
+        const orgId = await promptOrgSelection(cli.client)
+        const projectId = await promptProjectSelection(cli.client, orgId)
+        updateConfigFile({ org_id: orgId, project_id: projectId })
+        printConfig()
+      })
+    })
+}