egaki 0.5.0 → 0.7.0

package/src/{login.ts → cli/login.ts}

@@ -20,8 +20,11 @@ import {
   getKeyStatus,
   getChatGptAuth,
   saveChatGptAuth,
+  getXaiAuth,
+  saveXaiAuth,
 } from './credentials.js'
 import { chatGptOAuthLogin, extractPlanType } from './chatgpt-auth.js'
+import { xaiOAuthLogin } from './xai-auth.js'
 
 export async function loginInteractive(): Promise<void> {
   intro(pc.bold('egaki login'))
@@ -36,9 +39,17 @@ export async function loginInteractive(): Promise<void> {
         return pc.green('(saved)')
       }
       if (status.source === 'oauth') {
-        const auth = getChatGptAuth()
-        const email = auth?.email
-        return pc.green(`(signed in${email ? ` as ${email}` : ''})`)
+        if (key === 'chatgpt') {
+          const auth = getChatGptAuth()
+          const email = auth?.email
+          return pc.green(`(signed in${email ? ` as ${email}` : ''})`)
+        }
+        if (key === 'xai-oauth') {
+          const auth = getXaiAuth()
+          const email = auth?.email
+          return pc.green(`(signed in${email ? ` as ${email}` : ''})`)
+        }
+        return pc.green('(signed in)')
       }
       return pc.dim('(not configured)')
     })()
@@ -77,6 +88,14 @@ export async function loginInteractive(): Promise<void> {
     return
   }
 
+  // xAI Grok Build uses browser OAuth
+  if (provider === 'xai-oauth') {
+    const auth = await xaiOAuthLogin()
+    saveXaiAuth(auth)
+    outro('Done — xAI OAuth saved')
+    return
+  }
+
   log.info(
     `${pc.dim('Env var:')} ${info.envVar} ${pc.dim('(also used by the CLI when set)')}`,
   )
@@ -131,6 +150,14 @@ export async function loginNonInteractive({
     return
   }
 
+  // xAI Grok Build uses browser OAuth — key flag is not needed
+  if (provider === 'xai-oauth') {
+    const auth = await xaiOAuthLogin()
+    saveXaiAuth(auth)
+    console.log(pc.green('xAI OAuth saved'))
+    return
+  }
+
   if (!key || key.trim().length === 0) {
     console.error(pc.red('API key cannot be empty'))
     process.exit(1)
@@ -165,6 +192,24 @@ export function showLoginStatus(): void {
       continue
     }
 
+    if (key === 'xai-oauth') {
+      const auth = getXaiAuth()
+      if (auth) {
+        const email = auth.email ?? 'unknown'
+        const expired = auth.expires < Date.now()
+        const expiryLabel = expired
+          ? pc.yellow('(token expired, will auto-refresh)')
+          : pc.dim('(token valid)')
+        console.log(`${pc.green('*')} ${info.label} ${pc.green('(signed in)')}`)
+        console.log(pc.dim(`  account: ${email}`))
+        console.log(`  ${expiryLabel}`)
+      } else {
+        console.log(`${pc.dim('-')} ${info.label} ${pc.dim('(not signed in)')}`)
+        console.log(pc.dim(`  run: egaki login → select xAI Grok Build`))
+      }
+      continue
+    }
+
     const icon = status.available ? pc.green('*') : pc.dim('-')
     const source = (() => {
       if (status.source === 'env') {

package/src/cli/main.ts

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+// Entrypoint that imports the CLI instance and runs it.
+// cli.ts defines all commands but does not call parse() so that
+// other tools (like goke's generateDocs) can import the CLI without
+// triggering argument parsing.
+import { cli } from './cli.js'
+
+await cli.parse()