sealos-cli 1.1.1 → 1.1.3

package/src/commands/devbox/index.ts

@@ -33,6 +33,7 @@ interface DevboxUpdateOptions {
   cpu?: string
   memory?: string
   port: string[]
+  output: string
 }
 
 interface DevboxReleaseOptions {
@@ -40,6 +41,7 @@ interface DevboxReleaseOptions {
   description?: string
   execCommand?: string
   noStart?: boolean
+  output: string
 }
 
 function formatValue (value: unknown): string {
@@ -398,7 +400,7 @@ export function createDevboxCommand (): Command {
   devboxCmd
     .command('list')
     .description('List all devboxes')
-    .option('-o, --output <format>', 'Output format (json|table)', 'table')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withAuth({ spinnerText: 'Loading devboxes...' }, async (ctx, options: { output: string }) => {
       const client = createDevboxClient()
       const { data, error, response } = await client.GET('/devbox', {
@@ -427,7 +429,7 @@ export function createDevboxCommand (): Command {
     .option('--env <NAME=VALUE>', 'Environment variable', collectOption, [] as string[])
     .option('--secret-env <NAME=SECRET:KEY>', 'Environment variable from secret', collectOption, [] as string[])
     .option('--autostart', 'Auto start devbox after creation')
-    .option('-o, --output <format>', 'Output format (json|table)', 'table')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withAuth({ spinnerText: 'Creating devbox...' }, async (ctx, options: DevboxCreateOptions & { output: string }) => {
       const client = createDevboxClient()
       const { data, error, response } = await client.POST('/devbox', {
@@ -449,7 +451,7 @@ export function createDevboxCommand (): Command {
   devboxCmd
     .command('get <name>')
     .description('Get devbox details')
-    .option('-o, --output <format>', 'Output format (json|table)', 'table')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withAuth({ spinnerText: 'Loading devbox...' }, async (ctx, name: string, options: { output: string }) => {
       const client = createDevboxClient()
       const { data, error, response } = await client.GET('/devbox/{name}', {
@@ -475,6 +477,7 @@ export function createDevboxCommand (): Command {
     .option('--cpu <cpu>', 'CPU cores')
     .option('--memory <memory>', 'Memory in GB')
     .option('--port <spec>', 'Port spec. Existing ports can include portName=...', collectOption, [] as string[])
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withAuth({ spinnerText: 'Updating devbox...' }, async (ctx, name: string, options: DevboxUpdateOptions) => {
       const client = createDevboxClient()
       const { error, response } = await client.PATCH('/devbox/{name}', {
@@ -486,6 +489,17 @@ export function createDevboxCommand (): Command {
       })
 
       if (error) throw mapApiError(response.status, error as ApiErrorBody)
+      if (options.output === 'json') {
+        ctx.spinner.stop()
+        outputJson({
+          success: true,
+          action: 'update',
+          resource: 'devbox',
+          name,
+          status: 'requested'
+        })
+        return
+      }
       ctx.spinner.succeed(`Devbox "${name}" update requested`)
     }))
 
@@ -493,7 +507,8 @@ export function createDevboxCommand (): Command {
     .command('delete <name>')
     .description('Delete a devbox')
     .alias('rm')
-    .action(withAuth({ spinnerText: 'Deleting devbox...' }, async (ctx, name: string) => {
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
+    .action(withAuth({ spinnerText: 'Deleting devbox...' }, async (ctx, name: string, options: { output: string }) => {
       const client = createDevboxClient()
       const { error, response } = await client.DELETE('/devbox/{name}', {
         headers: ctx.auth,
@@ -503,6 +518,17 @@ export function createDevboxCommand (): Command {
       })
 
       if (error) throw mapApiError(response.status, error as ApiErrorBody)
+      if (options.output === 'json') {
+        ctx.spinner.stop()
+        outputJson({
+          success: true,
+          action: 'delete',
+          resource: 'devbox',
+          name,
+          status: 'deleted'
+        })
+        return
+      }
       ctx.spinner.succeed(`Devbox "${name}" deleted`)
     }))
 
@@ -520,26 +546,40 @@ export function createDevboxCommand (): Command {
 
     if (action.alias) command.alias(action.alias)
 
-    command.action(withAuth({ spinnerText: action.spinnerText }, async (ctx, name: string) => {
-      const client = createDevboxClient()
-      const { error, response } = await client.POST(action.endpoint, {
-        headers: ctx.auth,
-        params: {
-          path: { name }
-        },
-        body: {}
-      } as any)
-
-      if (error) throw mapApiError(response.status, error as ApiErrorBody)
-      ctx.spinner.succeed(`Devbox "${name}" ${action.done}`)
-    }))
+    command
+      .option('-o, --output <format>', 'Output format (json|table)', 'json')
+      .action(withAuth({ spinnerText: action.spinnerText }, async (ctx, name: string, options: { output: string }) => {
+        const client = createDevboxClient()
+        const { error, response } = await client.POST(action.endpoint, {
+          headers: ctx.auth,
+          params: {
+            path: { name }
+          },
+          body: {}
+        } as any)
+
+        if (error) throw mapApiError(response.status, error as ApiErrorBody)
+        if (options.output === 'json') {
+          ctx.spinner.stop()
+          outputJson({
+            success: true,
+            action: action.name,
+            resource: 'devbox',
+            name,
+            status: 'requested'
+          })
+          return
+        }
+        ctx.spinner.succeed(`Devbox "${name}" ${action.done}`)
+      }))
   }
 
   devboxCmd
     .command('autostart <name>')
     .description('Configure devbox autostart')
     .option('--exec-command <command>', 'Command to execute when the devbox starts')
-    .action(withAuth({ spinnerText: 'Configuring autostart...' }, async (ctx, name: string, options: { execCommand?: string }) => {
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
+    .action(withAuth({ spinnerText: 'Configuring autostart...' }, async (ctx, name: string, options: { execCommand?: string; output: string }) => {
       const client = createDevboxClient()
       const body = options.execCommand ? { execCommand: options.execCommand } : {}
       const { error, response } = await client.POST('/devbox/{name}/autostart', {
@@ -551,6 +591,18 @@ export function createDevboxCommand (): Command {
       })
 
       if (error) throw mapApiError(response.status, error as ApiErrorBody)
+      if (options.output === 'json') {
+        ctx.spinner.stop()
+        outputJson({
+          success: true,
+          action: 'autostart',
+          resource: 'devbox',
+          name,
+          execCommand: options.execCommand ?? null,
+          status: 'configured'
+        })
+        return
+      }
       ctx.spinner.succeed(`Autostart configured for "${name}"`)
     }))
 
@@ -560,7 +612,7 @@ export function createDevboxCommand (): Command {
     .option('--start <timestamp>', 'Start timestamp in seconds or milliseconds')
     .option('--end <timestamp>', 'End timestamp in seconds or milliseconds')
     .option('--step <step>', 'Sampling interval, e.g. 2m')
-    .option('-o, --output <format>', 'Output format (json|table)', 'table')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withAuth({ spinnerText: 'Loading monitor data...' }, async (
       ctx,
       name: string,
@@ -592,7 +644,7 @@ export function createDevboxCommand (): Command {
   devboxCmd
     .command('templates')
     .description('List available devbox templates')
-    .option('-o, --output <format>', 'Output format (json|table)', 'table')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withAuth({ spinnerText: 'Loading devbox templates...' }, async (ctx, options: { output: string }) => {
       const client = createDevboxClient()
       const { data, error, response } = await client.GET('/devbox/templates', {
@@ -616,7 +668,7 @@ export function createDevboxCommand (): Command {
   releasesCommand
     .command('list <name>')
     .description('List devbox releases')
-    .option('-o, --output <format>', 'Output format (json|table)', 'table')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withAuth({ spinnerText: 'Loading releases...' }, async (ctx, name: string, options: { output: string }) => {
       const client = createDevboxClient()
       const { data, error, response } = await client.GET('/devbox/{name}/releases', {
@@ -643,6 +695,7 @@ export function createDevboxCommand (): Command {
     .option('--description <description>', 'Release description')
     .option('--exec-command <command>', 'Autostart command after release restart')
     .option('--no-start', 'Keep devbox stopped after the release build completes')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withAuth({ spinnerText: 'Creating release...' }, async (ctx, name: string, options: DevboxReleaseOptions) => {
       const client = createDevboxClient()
       const { data, error, response } = await client.POST('/devbox/{name}/releases', {
@@ -654,6 +707,11 @@ export function createDevboxCommand (): Command {
       })
 
       if (error) throw mapApiError(response.status, error as ApiErrorBody)
+      if (options.output === 'json') {
+        ctx.spinner.stop()
+        outputJson(data)
+        return
+      }
       ctx.spinner.succeed(`Release "${options.tag}" accepted for "${data.name}" (${data.status})`)
     }))
 
@@ -661,7 +719,8 @@ export function createDevboxCommand (): Command {
     .command('delete <name> <tag>')
     .alias('rm')
     .description('Delete a devbox release')
-    .action(withAuth({ spinnerText: 'Deleting release...' }, async (ctx, name: string, tag: string) => {
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
+    .action(withAuth({ spinnerText: 'Deleting release...' }, async (ctx, name: string, tag: string, options: { output: string }) => {
       const client = createDevboxClient()
       const { error, response } = await client.DELETE('/devbox/{name}/releases/{tag}', {
         headers: ctx.auth,
@@ -671,13 +730,26 @@ export function createDevboxCommand (): Command {
       })
 
       if (error) throw mapApiError(response.status, error as ApiErrorBody)
+      if (options.output === 'json') {
+        ctx.spinner.stop()
+        outputJson({
+          success: true,
+          action: 'delete',
+          resource: 'devbox-release',
+          name,
+          tag,
+          status: 'deleted'
+        })
+        return
+      }
       ctx.spinner.succeed(`Release "${tag}" deleted for "${name}"`)
     }))
 
   releasesCommand
     .command('deploy <name> <tag>')
     .description('Deploy a release to AppLaunchpad')
-    .action(withAuth({ spinnerText: 'Deploying release...' }, async (ctx, name: string, tag: string) => {
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
+    .action(withAuth({ spinnerText: 'Deploying release...' }, async (ctx, name: string, tag: string, options: { output: string }) => {
       const client = createDevboxClient()
       const { error, response } = await client.POST('/devbox/{name}/releases/{tag}/deploy', {
         headers: ctx.auth,
@@ -687,13 +759,25 @@ export function createDevboxCommand (): Command {
       })
 
       if (error) throw mapApiError(response.status, error as ApiErrorBody)
+      if (options.output === 'json') {
+        ctx.spinner.stop()
+        outputJson({
+          success: true,
+          action: 'deploy',
+          resource: 'devbox-release',
+          name,
+          tag,
+          status: 'deployed'
+        })
+        return
+      }
       ctx.spinner.succeed(`Release "${tag}" deployed for "${name}"`)
     }))
 
   devboxCmd
     .command('deployments <name>')
     .description('List deployed applications from a devbox')
-    .option('-o, --output <format>', 'Output format (json|table)', 'table')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withAuth({ spinnerText: 'Loading deployments...' }, async (ctx, name: string, options: { output: string }) => {
       const client = createDevboxClient()
       const { data, error, response } = await client.GET('/devbox/{name}/deployments', {

package/src/commands/template/index.ts

@@ -2,7 +2,7 @@ import { Command } from 'commander'
 import chalk from 'chalk'
 import { readFileSync } from 'node:fs'
 import { createTemplateClient } from '../../lib/api-client.ts'
-import { type ApiErrorBody, mapApiError } from '../../lib/errors.ts'
+import { type ApiErrorBody, handleError, mapApiError } from '../../lib/errors.ts'
 import { outputJson, outputTable } from '../../lib/output.ts'
 import { withAuth, withErrorHandling } from '../../lib/with-auth.ts'
 
@@ -12,6 +12,7 @@ interface TemplateDeployOptions {
   yaml?: string
   set: string[]
   dryRun?: boolean
+  output: string
 }
 
 export type TemplateDeployMode = 'catalog' | 'raw'
@@ -82,18 +83,16 @@ export function resolveTemplateDeployMode (
   options: TemplateDeployOptions,
   stdinIsTTY: boolean = process.stdin.isTTY
 ): TemplateDeployMode {
-  const isRaw = !!(options.file || options.yaml || !stdinIsTTY)
+  const hasExplicitRawInput = !!(options.file || options.yaml)
+  const isRaw = hasExplicitRawInput || (!template && !stdinIsTTY)
 
-  if (template && isRaw) {
-    throw new Error('Cannot specify both a template name and --file/--yaml/stdin. Use one or the other.')
+  if (template && hasExplicitRawInput) {
+    throw new Error('Cannot specify both a template name and --file/--yaml. Use one or the other.')
   }
   if (!template && !isRaw) {
     throw new Error('Provide a template name or use --file/--yaml/stdin to supply raw YAML.')
   }
   if (template) {
-    if (!options.name) {
-      throw new Error('--name is required when deploying from the template catalog.')
-    }
     if (options.dryRun) {
       throw new Error('--dry-run is only supported for raw template deploys (--file, --yaml, or stdin).')
     }
@@ -108,7 +107,7 @@ export function buildCatalogTemplateDeployBody (
   options: Pick<TemplateDeployOptions, 'name' | 'set'>
 ): { name: string; template: string; args?: Record<string, string> } {
   const body: { name: string; template: string; args?: Record<string, string> } = {
-    name: options.name!,
+    name: options.name ?? template,
     template
   }
   if (options.set.length > 0) {
@@ -208,6 +207,11 @@ export function createTemplateCommand (): Command {
 
       if (error) throw mapApiError(response.status, error as ApiErrorBody)
 
+      if (deployOptions.output === 'json') {
+        ctx.spinner.stop()
+        outputJson(data)
+        return
+      }
       ctx.spinner.succeed(`Instance "${data.name}" created successfully`)
       printInstanceResult(data, { template: catalogTemplate })
       return
@@ -224,6 +228,12 @@ export function createTemplateCommand (): Command {
 
     if (error) throw mapApiError(response.status, error as ApiErrorBody)
 
+    if (deployOptions.output === 'json') {
+      ctx.spinner.stop()
+      outputJson(data)
+      return
+    }
+
     if (deployOptions.dryRun) {
       ctx.spinner.succeed('Raw template validation passed; no resources were created')
       printInstanceResult(data, { raw: true, dryRun: true })
@@ -240,7 +250,7 @@ export function createTemplateCommand (): Command {
     .description('List available templates')
     .option('-c, --category <category>', 'Filter by category')
     .option('-l, --language <language>', 'Language code (for example: en, zh)')
-    .option('-o, --output <format>', 'Output format (json|table)', 'table')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withErrorHandling({ spinnerText: 'Loading templates...' }, async (ctx, options: { category?: string; language?: string; output: string }) => {
       const client = createTemplateClient()
       const { data, error, response } = await client.GET('/templates', {
@@ -281,7 +291,7 @@ export function createTemplateCommand (): Command {
     .alias('describe')
     .description('Get template details')
     .option('-l, --language <language>', 'Language code (for example: en, zh)')
-    .option('-o, --output <format>', 'Output format (json|table)', 'table')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .action(withErrorHandling({ spinnerText: 'Loading template...' }, async (ctx, name: string, options: { language?: string; output: string }) => {
       const client = createTemplateClient()
       const { data, error, response } = await client.GET('/templates/{name}', {
@@ -338,7 +348,8 @@ export function createTemplateCommand (): Command {
     .command('delete <instance>')
     .alias('rm')
     .description('Delete a deployed template instance')
-    .action(withAuth({ spinnerText: 'Deleting template instance...' }, async (ctx, instance: string) => {
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
+    .action(withAuth({ spinnerText: 'Deleting template instance...' }, async (ctx, instance: string, options: { output: string }) => {
       const client = createTemplateClient()
       const { error, response } = await client.DELETE('/templates/instances/{instanceName}', {
         headers: ctx.auth,
@@ -349,6 +360,17 @@ export function createTemplateCommand (): Command {
 
       if (error) throw mapApiError(response.status, error as ApiErrorBody)
 
+      if (options.output === 'json') {
+        ctx.spinner.stop()
+        outputJson({
+          success: true,
+          action: 'delete',
+          resource: 'template-instance',
+          instance,
+          status: 'deleted'
+        })
+        return
+      }
       ctx.spinner.succeed(`Instance "${instance}" deleted`)
     }))
 
@@ -356,14 +378,16 @@ export function createTemplateCommand (): Command {
   tplCmd
     .command('deploy [template]')
     .description('Deploy a template (from catalog or raw YAML)')
-    .option('--name <name>', 'Instance name (required when deploying from catalog)')
+    .option('--name <name>', 'Instance name (defaults to the catalog template name)')
     .option('--file <path>', 'Path to template YAML file')
     .option('--yaml <yaml>', 'Template YAML string')
     .option('--set <KEY=VALUE...>', 'Set template arguments', (val: string, prev: string[]) => [...prev, val], [] as string[])
     .option('--dry-run', 'Validate raw template YAML without creating resources')
+    .option('-o, --output <format>', 'Output format (json|table)', 'json')
     .addHelpText('after', `
 Examples:
   Catalog:
+    sealos-cli template deploy rybbit
     sealos-cli template deploy perplexica --name my-app --set OPENAI_API_KEY=xxx
 
   Raw:
@@ -372,8 +396,12 @@ Examples:
     cat template.yaml | sealos-cli template deploy --dry-run
 `)
     .action(async (template: string | undefined, options: TemplateDeployOptions) => {
-      const mode = resolveTemplateDeployMode(template, options)
-      await deployTemplate(template, options, mode)
+      try {
+        const mode = resolveTemplateDeployMode(template, options)
+        await deployTemplate(template, options, mode)
+      } catch (error) {
+        handleError(error)
+      }
     })
 
   return tplCmd

package/src/commands/workspace/index.ts

@@ -12,7 +12,7 @@ export function createWorkspaceCommand (): Command {
     .command('switch')
     .description('Switch to another workspace')
     .argument('<namespace>', 'Workspace id, uid, or team name')
-    .option('-o, --output <format>', 'Output format: json, table', 'table')
+    .option('-o, --output <format>', 'Output format: json, table', 'json')
     .action(async (namespace, options) => {
       try {
         const result = await switchWorkspace(namespace)
@@ -30,7 +30,7 @@ export function createWorkspaceCommand (): Command {
   workspaceCmd
     .command('list')
     .description('List all workspaces')
-    .option('-o, --output <format>', 'Output format: json, table', 'table')
+    .option('-o, --output <format>', 'Output format: json, table', 'json')
     .action(async (options) => {
       try {
         const result = await listWorkspaces()
@@ -58,7 +58,7 @@ export function createWorkspaceCommand (): Command {
   workspaceCmd
     .command('current')
     .description('Show current workspace')
-    .option('-o, --output <format>', 'Output format: json, table', 'table')
+    .option('-o, --output <format>', 'Output format: json, table', 'json')
     .action(async (options) => {
       try {
         const authInfo = getAuthInfo()

package/src/lib/auth.ts

@@ -3,6 +3,7 @@ import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node
 import { homedir, platform } from 'node:os'
 import { join } from 'node:path'
 import type { SealosAuthData, SealosWorkspace } from '../types/index.ts'
+import { AuthError } from './errors.ts'
 
 export const SEALOS_AUTH_CLIENT_ID = 'af993c98-d19d-4bdc-b338-79b80dc4f8bf'
 export const DEFAULT_SEALOS_REGION = 'https://usw-1.sealos.io'
@@ -64,6 +65,11 @@ interface KubeconfigResponse {
   }
 }
 
+interface SealosApiEnvelope {
+  code?: number
+  message?: string
+}
+
 export interface LoginResult {
   kubeconfig_path?: string
   region: string
@@ -236,7 +242,17 @@ export function getAuthInfo (deps: AuthDependencies = {}): AuthInfo {
 }
 
 async function parseResponse<T> (res: Response): Promise<T> {
-  return await res.json() as T
+  const body = await res.json() as T & SealosApiEnvelope
+  if (body && typeof body === 'object' && typeof body.code === 'number' && ![0, 200].includes(body.code)) {
+    const message = body.message || `Sealos API request failed with code ${body.code}`
+    if (body.code === 401) {
+      throw new AuthError(`Authentication expired. Please run "sealos-cli login" again. (${message})`)
+    }
+
+    throw new Error(message)
+  }
+
+  return body as T
 }
 
 async function readErrorBody (res: Response): Promise<string> {