otoro-cli 1.0.0 → 1.2.0

package/bin/otoro.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
 const { program } = require('commander')
-const { startChat } = require('../lib/chat')
-const { runTask } = require('../lib/task')
-const { initConfig, getConfig } = require('../lib/config')
+const { initConfig, login, logout, isLoggedIn, requireAuth } = require('../lib/config')
 const chalk = require('chalk')
 const pkg = require('../package.json')
 
@@ -11,12 +9,26 @@ program
   .description('Otoro AGI — AI coding assistant')
   .version(pkg.version)
 
+program
+  .command('login')
+  .description('Sign in with your Otoro account')
+  .action(async () => {
+    await login()
+  })
+
+program
+  .command('logout')
+  .description('Sign out and clear credentials')
+  .action(async () => {
+    await logout()
+  })
+
 program
   .command('init')
   .description('Initialize Otoro in this project')
   .action(async () => {
     await initConfig()
-    console.log(chalk.green('✓ Otoro initialized. Run `otoro` to start coding.'))
+    console.log(chalk.green('  Run `otoro` to start coding.\n'))
   })
 
 program
@@ -24,6 +36,8 @@ program
   .alias('c')
   .description('Start interactive chat')
   .action(async () => {
+    requireAuth()
+    const { startChat } = require('../lib/chat')
     await startChat()
   })
 
@@ -31,6 +45,7 @@ program
   .command('ask <prompt...>')
   .description('Ask Otoro a single question')
   .action(async (prompt) => {
+    requireAuth()
     const { askOnce } = require('../lib/chat')
     await askOnce(prompt.join(' '))
   })
@@ -39,6 +54,8 @@ program
   .command('run <task...>')
   .description('Run a coding task (write + execute + verify)')
   .action(async (task) => {
+    requireAuth()
+    const { runTask } = require('../lib/task')
     await runTask(task.join(' '))
   })
 
@@ -46,14 +63,16 @@ program
   .command('image <prompt...>')
   .description('Generate an image')
   .action(async (prompt) => {
+    requireAuth()
     const { generateImage } = require('../lib/image')
     await generateImage(prompt.join(' '))
   })
 
 program
   .command('start')
-  .description('Start Otoro agent daemon — connects to server, waits for remote tasks')
+  .description('Start Otoro agent daemon — connects to server for remote tasks')
   .action(async () => {
+    requireAuth()
     const { startAgent } = require('../lib/agent')
     await startAgent()
   })
@@ -62,8 +81,9 @@ program
   .command('status')
   .description('Check connected agents and server status')
   .action(async () => {
+    requireAuth()
+    const config = require('../lib/config').getConfig()
     const http = require('http')
-    const config = getConfig()
     const url = `${config.gpu_url}/v1/agents`
     http.get(url, { headers: { 'Authorization': `Bearer ${config.api_key}` } }, (res) => {
       let data = ''
@@ -85,9 +105,20 @@ program
     }).on('error', (e) => console.log(chalk.red(`  Error: ${e.message}`)))
   })
 
-// Default: start interactive chat
+// Default: no args → check login then start chat
 if (process.argv.length <= 2) {
-  startChat()
+  if (!isLoggedIn()) {
+    console.log(chalk.cyan.bold('\n  🐙 Otoro AGI\n'))
+    console.log(chalk.yellow('  Not logged in. Run:\n'))
+    console.log(chalk.white('    otoro login     — Sign in with your Otoro account'))
+    console.log(chalk.white('    otoro init      — Initialize a project'))
+    console.log(chalk.white('    otoro           — Start coding\n'))
+    console.log(chalk.gray('  Don\'t have an account? Sign up at https://otoroagi.com\n'))
+  } else {
+    requireAuth()
+    const { startChat } = require('../lib/chat')
+    startChat()
+  }
 } else {
   program.parse()
 }

package/lib/config.js

@@ -3,15 +3,48 @@ const path = require('path')
 const os = require('os')
 const chalk = require('chalk')
 const readline = require('readline')
+const https = require('https')
+const http = require('http')
+
+const crypto = require('crypto')
 
 const CONFIG_DIR = path.join(os.homedir(), '.otoro')
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json')
 const PROJECT_FILE = '.otoro.json'
 
+// Encryption for API key storage — key derived from machine ID
+const ENCRYPTION_KEY = crypto
+  .createHash('sha256')
+  .update(os.hostname() + os.userInfo().username + '__otoro_seal__')
+  .digest()
+
+function encrypt(text) {
+  const iv = crypto.randomBytes(16)
+  const cipher = crypto.createCipheriv('aes-256-cbc', ENCRYPTION_KEY, iv)
+  let encrypted = cipher.update(text, 'utf8', 'hex')
+  encrypted += cipher.final('hex')
+  return iv.toString('hex') + ':' + encrypted
+}
+
+function decrypt(data) {
+  try {
+    const [ivHex, encrypted] = data.split(':')
+    const iv = Buffer.from(ivHex, 'hex')
+    const decipher = crypto.createDecipheriv('aes-256-cbc', ENCRYPTION_KEY, iv)
+    let decrypted = decipher.update(encrypted, 'hex', 'utf8')
+    decrypted += decipher.final('utf8')
+    return decrypted
+  } catch {
+    return '' // corrupted or wrong machine
+  }
+}
+
 const DEFAULT_CONFIG = {
   api_url: 'https://otoroagi.com/api/otoro',
-  gpu_url: 'http://100.124.135.21:8000',
-  api_key: 'otoro-secret',
+  gpu_url: '',
+  api_key: '',
+  user_id: '',
+  email: '',
   model: 'qwen-coder',
   theme: 'dark',
 }
@@ -19,7 +52,13 @@ const DEFAULT_CONFIG = {
 function getConfig() {
   try {
     if (fs.existsSync(CONFIG_FILE)) {
-      return { ...DEFAULT_CONFIG, ...JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8')) }
+      const raw = JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'))
+      // Decrypt API key if encrypted
+      if (raw._api_key_enc) {
+        raw.api_key = decrypt(raw._api_key_enc)
+        delete raw._api_key_enc
+      }
+      return { ...DEFAULT_CONFIG, ...raw }
     }
   } catch {}
   return DEFAULT_CONFIG
@@ -27,28 +66,131 @@ function getConfig() {
 
 function saveConfig(config) {
   fs.mkdirSync(CONFIG_DIR, { recursive: true })
-  fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2))
+  // Encrypt the API key before saving
+  const toSave = { ...config }
+  if (toSave.api_key) {
+    toSave._api_key_enc = encrypt(toSave.api_key)
+    delete toSave.api_key
+  }
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(toSave, null, 2), { mode: 0o600 })
 }
 
-async function initConfig() {
+function isLoggedIn() {
   const config = getConfig()
+  return !!(config.api_key && config.user_id)
+}
+
+function requireAuth() {
+  if (!isLoggedIn()) {
+    console.log(chalk.red('\n  ✗ Not logged in. Run `otoro login` first.\n'))
+    process.exit(1)
+  }
+  return getConfig()
+}
+
+async function login() {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
   const ask = (q) => new Promise(r => rl.question(q, r))
 
-  console.log(chalk.cyan.bold('\n  🐙 Otoro AGI Setup\n'))
+  console.log(chalk.cyan.bold('\n  🐙 Otoro AGI — Login\n'))
+  console.log(chalk.gray('  Sign in with your Otoro account (otoroagi.com)\n'))
+
+  const email = await ask(chalk.white('  Email: '))
+  const password = await ask(chalk.white('  Password: '))
+
+  if (!email.trim() || !password.trim()) {
+    console.log(chalk.red('\n  ✗ Email and password are required.\n'))
+    rl.close()
+    return
+  }
+
+  console.log(chalk.gray('\n  Authenticating...'))
+
+  try {
+    // Authenticate with Supabase via the website
+    const result = await new Promise((resolve, reject) => {
+      const body = JSON.stringify({ email: email.trim(), password: password.trim() })
+      const req = https.request('https://otoroagi.com/api/otoro/auth', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        timeout: 15000,
+      }, (res) => {
+        let data = ''
+        res.on('data', c => data += c)
+        res.on('end', () => {
+          try { resolve(JSON.parse(data)) }
+          catch { reject(new Error('Invalid response from server')) }
+        })
+      })
+      req.on('error', reject)
+      req.on('timeout', () => { req.destroy(); reject(new Error('Connection timed out')) })
+      req.write(body)
+      req.end()
+    })
+
+    if (result.error) {
+      console.log(chalk.red(`\n  ✗ ${result.error}\n`))
+      rl.close()
+      return
+    }
+
+    if (result.success && result.api_key) {
+      const config = getConfig()
+      config.api_key = result.api_key
+      config.user_id = result.user_id
+      config.email = email.trim()
+      config.gpu_url = result.gpu_url || config.gpu_url
+      saveConfig(config)
+
+      console.log(chalk.green(`\n  ✓ Logged in as ${email.trim()}`))
+      console.log(chalk.gray(`  Config saved to ${CONFIG_FILE}\n`))
+      console.log(chalk.cyan('  Get started:'))
+      console.log(chalk.gray('    otoro          — Interactive chat'))
+      console.log(chalk.gray('    otoro start    — Agent daemon (remote tasks)'))
+      console.log(chalk.gray('    otoro ask "?"   — Quick question\n'))
+    } else {
+      console.log(chalk.red('\n  ✗ Login failed. Check your credentials.\n'))
+    }
+  } catch (e) {
+    console.log(chalk.red(`\n  ✗ ${e.message}\n`))
+  }
+
+  rl.close()
+}
+
+async function logout() {
+  if (fs.existsSync(CONFIG_FILE)) {
+    const config = getConfig()
+    config.api_key = ''
+    config.user_id = ''
+    config.email = ''
+    saveConfig(config)
+    console.log(chalk.green('\n  ✓ Logged out. Credentials cleared.\n'))
+  } else {
+    console.log(chalk.gray('\n  Already logged out.\n'))
+  }
+}
+
+async function initConfig() {
+  const config = requireAuth()
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+  const ask = (q) => new Promise(r => rl.question(q, r))
 
-  const url = await ask(chalk.gray(`  GPU URL [${config.gpu_url}]: `))
-  if (url.trim()) config.gpu_url = url.trim()
+  console.log(chalk.cyan.bold('\n  🐙 Otoro AGI — Project Setup\n'))
+  console.log(chalk.gray(`  Logged in as: ${config.email}`))
+  console.log(chalk.gray(`  Directory: ${process.cwd()}\n`))
 
-  const key = await ask(chalk.gray(`  API Key [${config.api_key}]: `))
-  if (key.trim()) config.api_key = key.trim()
+  const name = await ask(chalk.gray(`  Project name [${path.basename(process.cwd())}]: `))
 
   rl.close()
-  saveConfig(config)
 
-  // Create project config
-  const projectConfig = { name: path.basename(process.cwd()), created: new Date().toISOString() }
+  const projectConfig = {
+    name: name.trim() || path.basename(process.cwd()),
+    created: new Date().toISOString(),
+    user_id: config.user_id,
+  }
   fs.writeFileSync(PROJECT_FILE, JSON.stringify(projectConfig, null, 2))
+  console.log(chalk.green(`\n  ✓ Project "${projectConfig.name}" initialized.\n`))
 }
 
-module.exports = { getConfig, saveConfig, initConfig }
+module.exports = { getConfig, saveConfig, initConfig, login, logout, isLoggedIn, requireAuth }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "otoro-cli",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Otoro AGI — AI coding assistant for your terminal. Code, generate images, execute tasks, and control your projects remotely.",
   "main": "index.js",
   "bin": {