neoagent 3.3.1-beta.2 → 3.3.1-beta.4

package/flutter_app/lib/main_unified.dart

@@ -2,7 +2,7 @@ part of 'main.dart';
 
 enum _ToolsPageTab { integrations, mcp, skills }
 
-enum _SettingsWorkspaceSection { app, account, security }
+enum _SettingsWorkspaceSection { app, account, usage, security }
 
 class ToolsPanel extends StatefulWidget {
   const ToolsPanel({super.key, required this.controller});
@@ -137,9 +137,7 @@ class _RunsAndLogsPanelState extends State<RunsAndLogsPanel> {
             subtitle: 'Inspect execution history, failures, and tool traces.',
           ),
           const SizedBox(height: 12),
-          Expanded(
-            child: RunsPanel(controller: controller, embedded: true),
-          ),
+          Expanded(child: RunsPanel(controller: controller, embedded: true)),
         ],
       ),
     );
@@ -157,29 +155,31 @@ class SettingsWorkspacePanel extends StatefulWidget {
 
 class _SettingsWorkspacePanelState extends State<SettingsWorkspacePanel> {
   late _SettingsWorkspaceSection _selectedSection;
+  late AppSection _lastControllerSection;
 
   @override
   void initState() {
     super.initState();
-    _selectedSection =
-        widget.controller.selectedSection == AppSection.accountSettings
-        ? _SettingsWorkspaceSection.account
-        : _SettingsWorkspaceSection.app;
+    _lastControllerSection = widget.controller.selectedSection;
+    _selectedSection = _sectionForAppSection(_lastControllerSection);
   }
 
   @override
   void didUpdateWidget(covariant SettingsWorkspacePanel oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (widget.controller.selectedSection == AppSection.settings &&
-        _selectedSection != _SettingsWorkspaceSection.app) {
-      _selectedSection = _SettingsWorkspaceSection.app;
-    }
-    if (widget.controller.selectedSection == AppSection.accountSettings &&
-        _selectedSection == _SettingsWorkspaceSection.app) {
-      _selectedSection = _SettingsWorkspaceSection.account;
+    final controllerSection = widget.controller.selectedSection;
+    if (controllerSection != _lastControllerSection) {
+      _lastControllerSection = controllerSection;
+      _selectedSection = _sectionForAppSection(controllerSection);
     }
   }
 
+  _SettingsWorkspaceSection _sectionForAppSection(AppSection section) {
+    return section == AppSection.accountSettings
+        ? _SettingsWorkspaceSection.account
+        : _SettingsWorkspaceSection.app;
+  }
+
   @override
   Widget build(BuildContext context) {
     final compact = MediaQuery.sizeOf(context).width < AppBreakpoints.tablet;
@@ -194,39 +194,34 @@ class _SettingsWorkspacePanelState extends State<SettingsWorkspacePanel> {
           ),
           const SizedBox(height: 12),
           Expanded(
-            child: Card(
-              child: Padding(
-                padding: const EdgeInsets.all(20),
-                child: compact
-                    ? Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: <Widget>[
-                          _SettingsWorkspaceNav(
-                            selected: _selectedSection,
-                            compact: true,
-                            onSelected: _selectSection,
-                          ),
-                          const SizedBox(height: 16),
-                          Expanded(child: _buildContent()),
-                        ],
-                      )
-                    : Row(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: <Widget>[
-                          SizedBox(
-                            width: 220,
-                            child: _SettingsWorkspaceNav(
-                              selected: _selectedSection,
-                              compact: false,
-                              onSelected: _selectSection,
-                            ),
-                          ),
-                          const SizedBox(width: 24),
-                          Expanded(child: _buildContent()),
-                        ],
+            child: compact
+                ? Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
+                      _SettingsWorkspaceNav(
+                        selected: _selectedSection,
+                        compact: true,
+                        onSelected: _selectSection,
                       ),
-              ),
-            ),
+                      const SizedBox(height: 16),
+                      Expanded(child: _buildContent()),
+                    ],
+                  )
+                : Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
+                      SizedBox(
+                        width: 240,
+                        child: _SettingsWorkspaceNav(
+                          selected: _selectedSection,
+                          compact: false,
+                          onSelected: _selectSection,
+                        ),
+                      ),
+                      const SizedBox(width: 24),
+                      Expanded(child: _buildContent()),
+                    ],
+                  ),
           ),
         ],
       ),
@@ -235,11 +230,13 @@ class _SettingsWorkspacePanelState extends State<SettingsWorkspacePanel> {
 
   void _selectSection(_SettingsWorkspaceSection section) {
     setState(() => _selectedSection = section);
-    if (section == _SettingsWorkspaceSection.app) {
-      widget.controller.setSelectedSection(AppSection.settings);
-      return;
+    final appSection = section == _SettingsWorkspaceSection.app
+        ? AppSection.settings
+        : AppSection.accountSettings;
+    _lastControllerSection = appSection;
+    if (widget.controller.selectedSection != appSection) {
+      widget.controller.setSelectedSection(appSection);
     }
-    widget.controller.setSelectedSection(AppSection.accountSettings);
   }
 
   Widget _buildContent() {
@@ -252,6 +249,12 @@ class _SettingsWorkspacePanelState extends State<SettingsWorkspacePanel> {
           embedded: true,
           initialTab: AccountSettingsTab.account,
         );
+      case _SettingsWorkspaceSection.usage:
+        return AccountSettingsPanel(
+          controller: widget.controller,
+          embedded: true,
+          initialTab: AccountSettingsTab.usage,
+        );
       case _SettingsWorkspaceSection.security:
         return AccountSettingsPanel(
           controller: widget.controller,
@@ -275,45 +278,144 @@ class _SettingsWorkspaceNav extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final items = <Widget>[
-      _navButton(
+    final items = <_SettingsWorkspaceNavItem>[
+      const _SettingsWorkspaceNavItem(
         section: _SettingsWorkspaceSection.app,
         icon: Icons.tune,
-        label: 'App Settings',
+        label: 'General',
+        description: 'Models, behavior, voice, and workspace',
       ),
-      _navButton(
+      const _SettingsWorkspaceNavItem(
         section: _SettingsWorkspaceSection.account,
         icon: Icons.person_outline,
         label: 'Account',
+        description: 'Profile, email, and personal data',
+      ),
+      const _SettingsWorkspaceNavItem(
+        section: _SettingsWorkspaceSection.usage,
+        icon: Icons.data_usage_outlined,
+        label: 'Usage & limits',
+        description: 'Plan usage and allowance details',
       ),
-      _navButton(
+      const _SettingsWorkspaceNavItem(
         section: _SettingsWorkspaceSection.security,
         icon: Icons.security_outlined,
         label: 'Security',
+        description: 'Password, 2FA, and active sessions',
       ),
     ];
-    return compact
-        ? Wrap(spacing: 8, runSpacing: 8, children: items)
-        : Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: items,
-          );
+    if (compact) {
+      return DropdownButtonFormField<_SettingsWorkspaceSection>(
+        key: ValueKey<_SettingsWorkspaceSection>(selected),
+        initialValue: selected,
+        isExpanded: true,
+        decoration: const InputDecoration(
+          labelText: 'Settings area',
+          prefixIcon: Icon(Icons.settings_outlined),
+        ),
+        items: items
+            .map(
+              (item) => DropdownMenuItem<_SettingsWorkspaceSection>(
+                value: item.section,
+                child: Text(item.label),
+              ),
+            )
+            .toList(),
+        onChanged: (section) {
+          if (section != null) onSelected(section);
+        },
+      );
+    }
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: _bgSecondary,
+        borderRadius: BorderRadius.circular(14),
+        border: Border.all(color: _border),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: <Widget>[
+          Padding(
+            padding: const EdgeInsets.fromLTRB(8, 4, 8, 10),
+            child: Text(
+              'Settings areas',
+              style: TextStyle(
+                color: _textSecondary,
+                fontSize: 12,
+                fontWeight: FontWeight.w700,
+              ),
+            ),
+          ),
+          for (final item in items) _navButton(item),
+        ],
+      ),
+    );
   }
 
-  Widget _navButton({
-    required _SettingsWorkspaceSection section,
-    required IconData icon,
-    required String label,
-  }) {
-    final button = _SidebarButton(
-      label: label,
-      icon: icon,
-      active: selected == section,
-      onTap: () => onSelected(section),
+  Widget _navButton(_SettingsWorkspaceNavItem item) {
+    final active = selected == item.section;
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 4),
+      child: Material(
+        color: active ? _accent.withValues(alpha: 0.12) : Colors.transparent,
+        borderRadius: BorderRadius.circular(10),
+        child: InkWell(
+          borderRadius: BorderRadius.circular(10),
+          onTap: () => onSelected(item.section),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 11),
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                Icon(
+                  item.icon,
+                  size: 20,
+                  color: active ? _accent : _textSecondary,
+                ),
+                const SizedBox(width: 10),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: <Widget>[
+                      Text(
+                        item.label,
+                        style: TextStyle(
+                          fontWeight: FontWeight.w700,
+                          color: active ? _accent : _textPrimary,
+                        ),
+                      ),
+                      const SizedBox(height: 2),
+                      Text(
+                        item.description,
+                        style: TextStyle(
+                          color: _textSecondary,
+                          fontSize: 11,
+                          height: 1.3,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
     );
-    if (compact) {
-      return button;
-    }
-    return Padding(padding: const EdgeInsets.only(bottom: 8), child: button);
   }
 }
+
+class _SettingsWorkspaceNavItem {
+  const _SettingsWorkspaceNavItem({
+    required this.section,
+    required this.icon,
+    required this.label,
+    required this.description,
+  });
+
+  final _SettingsWorkspaceSection section;
+  final IconData icon;
+  final String label;
+  final String description;
+}

package/lib/manager.js

@@ -21,6 +21,7 @@ const {
   DATA_DIR,
   LOG_DIR,
   ENV_FILE,
+  DATABASE_FILE,
   PID_FILE,
   getDefaultVmBaseImageUrl,
   ensureRuntimeDirs,
@@ -43,6 +44,9 @@ const { createGitHelpers } = require('../runtime/git_helpers');
 const {
   parseDeploymentMode
 } = require('../server/utils/deployment');
+const {
+  AI_PROVIDER_DEFINITIONS,
+} = require('../server/services/ai/provider_definitions');
 const {
   detectSourceAgents,
   cmdMigrateDryRun,
@@ -59,6 +63,10 @@ const SYSTEMD_UNIT = path.join(os.homedir(), '.config', 'systemd', 'user', 'neoa
 const FLUTTER_APP_DIR = path.join(APP_DIR, 'flutter_app');
 const WEB_CLIENT_DIR = path.join(APP_DIR, 'server', 'public');
 const PACKAGE_JSON_PATH = path.join(APP_DIR, 'package.json');
+const API_KEY_PROVIDERS = Object.freeze(
+  Object.values(AI_PROVIDER_DEFINITIONS)
+    .filter((definition) => definition.authentication === 'api_key'),
+);
 
 const COLORS = process.stdout.isTTY
   ? {
@@ -492,6 +500,37 @@ function listNeoAgentServerProcesses() {
     });
 }
 
+function scanForInstalledInstance({
+  platform = detectPlatform(),
+  databaseFile = DATABASE_FILE,
+  macServiceFile = PLIST_DST,
+  linuxServiceFile = SYSTEMD_UNIT,
+  serverProcesses = listNeoAgentServerProcesses(),
+} = {}) {
+  const evidence = [];
+
+  if (fs.existsSync(databaseFile)) {
+    evidence.push({ type: 'runtime-data', path: databaseFile });
+  }
+  if (platform === 'macos' && fs.existsSync(macServiceFile)) {
+    evidence.push({ type: 'launchd-service', path: macServiceFile });
+  }
+  if (platform === 'linux' && fs.existsSync(linuxServiceFile)) {
+    evidence.push({ type: 'systemd-service', path: linuxServiceFile });
+  }
+  if (serverProcesses.length > 0) {
+    evidence.push({
+      type: 'running-server',
+      pids: serverProcesses.map((processInfo) => processInfo.pid),
+    });
+  }
+
+  return {
+    installed: evidence.length > 0,
+    evidence,
+  };
+}
+
 function killNeoAgentServerProcesses() {
   const processes = listNeoAgentServerProcesses();
   let killed = false;
@@ -543,17 +582,156 @@ async function ask(question, fallback = '') {
 }
 
 async function askSecret(question, currentValue = '') {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve) => {
-    const suffix = currentValue ? ' [configured]' : '';
-    rl.question(`  ? ${question}${suffix}: `, (answer) => {
-      rl.close();
-      const trimmed = answer.trim();
-      resolve(trimmed || currentValue);
+  if (
+    !process.stdin.isTTY ||
+    !process.stdout.isTTY ||
+    typeof process.stdin.setRawMode !== 'function'
+  ) {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    return new Promise((resolve) => {
+      const suffix = currentValue ? ' [configured]' : '';
+      rl.question(`  ? ${question}${suffix}: `, (answer) => {
+        rl.close();
+        const trimmed = answer.trim();
+        resolve(trimmed || currentValue);
+      });
     });
+  }
+
+  const input = process.stdin;
+  const output = process.stdout;
+  const wasRaw = Boolean(input.isRaw);
+  const wasPaused = input.isPaused();
+
+  output.write(`  ? ${question}${currentValue ? ' [configured]' : ''}: `);
+
+  return new Promise((resolve, reject) => {
+    let value = '';
+    let escapeSequenceState = 0;
+
+    const eraseLastMask = () => output.write('\b \b');
+    const cleanup = () => {
+      input.removeListener('data', onData);
+      input.setRawMode(wasRaw);
+      if (wasPaused) input.pause();
+    };
+    const finish = () => {
+      cleanup();
+      output.write('\n');
+      resolve(value || currentValue);
+    };
+    const onData = (chunk) => {
+      for (const character of String(chunk)) {
+        if (escapeSequenceState === 1) {
+          escapeSequenceState = character === '[' || character === 'O' ? 2 : 0;
+          continue;
+        }
+        if (escapeSequenceState === 2) {
+          if (/[@-~]/.test(character)) escapeSequenceState = 0;
+          continue;
+        }
+        if (character === '\u001b') {
+          escapeSequenceState = 1;
+          continue;
+        }
+        if (character === '\u0003') {
+          cleanup();
+          output.write('\n');
+          reject(new Error('Setup cancelled.'));
+          return;
+        }
+        if (character === '\r' || character === '\n' || character === '\u0004') {
+          finish();
+          return;
+        }
+        if (character === '\b' || character === '\u007f') {
+          if (value) {
+            value = value.slice(0, -1);
+            eraseLastMask();
+          }
+          continue;
+        }
+        if (character === '\u0015') {
+          while (value) {
+            value = value.slice(0, -1);
+            eraseLastMask();
+          }
+          continue;
+        }
+        if (character >= ' ') {
+          value += character;
+          output.write('•');
+        }
+      }
+    };
+
+    input.setEncoding('utf8');
+    input.setRawMode(true);
+    input.resume();
+    input.on('data', onData);
   });
 }
 
+function parseProviderChoices(answer, providerCount = API_KEY_PROVIDERS.length) {
+  const normalized = String(answer || '').trim();
+  if (!normalized || normalized === '0') return [];
+
+  const choices = normalized.split(',').map((choice) => Number(choice.trim()));
+  if (
+    choices.some(
+      (choice) => !Number.isInteger(choice) || choice < 1 || choice > providerCount,
+    )
+  ) {
+    throw new Error(`Choose provider numbers from 1 to ${providerCount}, separated by commas.`);
+  }
+  return [...new Set(choices)];
+}
+
+async function cmdApiKeySetup() {
+  heading('AI Provider Setup');
+  const current = Object.fromEntries(parseEnv(readEnvFileRaw()).entries());
+
+  logInfo('Choose one or more hosted providers. You can also configure these later in Settings.');
+  for (const [index, provider] of API_KEY_PROVIDERS.entries()) {
+    const configured = String(current[provider.envKey] || '').trim() ? ' (configured)' : '';
+    console.log(`  [${index + 1}] ${provider.label}${configured}`);
+  }
+  console.log('  [0] Skip for now');
+
+  let choices;
+  while (!choices) {
+    const answer = await ask('Provider numbers, separated by commas', '0');
+    try {
+      choices = parseProviderChoices(answer);
+    } catch (error) {
+      logWarn(error.message);
+    }
+  }
+  if (choices.length === 0) {
+    logInfo('Skipping hosted provider keys. Local Ollama and the Settings UI remain available.');
+    rememberInstallAction('Add a hosted provider later in Settings or with `neoagent setup`.');
+    return 0;
+  }
+
+  let saved = 0;
+  for (const choice of choices) {
+    const provider = API_KEY_PROVIDERS[choice - 1];
+    const apiKey = await askSecret(
+      `${provider.label} API key`,
+      current[provider.envKey] || '',
+    );
+    if (!String(apiKey || '').trim()) {
+      logWarn(`${provider.label} was skipped because no key was entered.`);
+      continue;
+    }
+    upsertEnvValue(provider.envKey, apiKey);
+    logOk(`${provider.label} API key saved`);
+    saved += 1;
+  }
+
+  return saved;
+}
+
 function defaultEnvLines(current = {}) {
   const defaultVmBaseImageUrl = getDefaultVmBaseImageUrl();
   const port = current.PORT || '3333';
@@ -585,7 +763,7 @@ function defaultEnvLines(current = {}) {
   ].filter(Boolean);
 }
 
-function writeDefaultEnvFile() {
+function writeDefaultEnvFile({ remindProviderSetup = true } = {}) {
   ensureRuntimeDirs();
   const current = Object.fromEntries(parseEnv(readEnvFileRaw()).entries());
   for (const line of defaultEnvLines(current)) {
@@ -595,7 +773,9 @@ function writeDefaultEnvFile() {
     upsertEnvValue(key, line.slice(separatorIndex + 1));
   }
   logOk(`Ensured default config at ${ENV_FILE}`);
-  rememberInstallAction('Add provider keys with `neoagent setup`, `neoagent env set KEY VALUE`, or the login commands when you are ready.');
+  if (remindProviderSetup) {
+    rememberInstallAction('Add provider keys with `neoagent setup`, `neoagent env set KEY VALUE`, or the login commands when you are ready.');
+  }
 }
 
 async function cmdSetup() {
@@ -1552,13 +1732,22 @@ function ensureYtDlpInstalled() {
   return false;
 }
 
-async function cmdInstall() {
+async function cmdInstall({ guidedProviderSetup = false, showBanner = true } = {}) {
   installActionItems.length = 0;
-  cliBanner(`Install ${APP_NAME}`, 'guided bootstrap');
+  if (showBanner) {
+    cliBanner(`Install ${APP_NAME}`, 'guided bootstrap');
+  }
   heading(`Install ${APP_NAME}`);
   installPreflight();
 
-  if (!fs.existsSync(ENV_FILE)) {
+  if (guidedProviderSetup) {
+    if (fs.existsSync(ENV_FILE)) {
+      logOk(`Found existing config ${ENV_FILE}; missing defaults will be added safely`);
+    } else {
+      logInfo('Creating secure local defaults before provider setup');
+    }
+    writeDefaultEnvFile({ remindProviderSetup: false });
+  } else if (!fs.existsSync(ENV_FILE)) {
     if (process.stdin.isTTY) {
       logWarn('.env not found; starting guided setup');
       await cmdSetup();
@@ -1576,6 +1765,14 @@ async function cmdInstall() {
   ensureYtDlpInstalled();
   buildBundledWebClientIfPossible({ required: true });
 
+  if (guidedProviderSetup) {
+    if (process.stdin.isTTY && process.stdout.isTTY) {
+      await cmdApiKeySetup();
+    } else {
+      rememberInstallAction('Run `neoagent setup` or use Settings to add an AI provider.');
+    }
+  }
+
   const platform = detectPlatform();
   if (platform === 'macos' && commandExists('launchctl')) {
     installMacService();
@@ -1603,6 +1800,33 @@ async function cmdInstall() {
   logWarn('Save these credentials — stored in .env and shown again with `neoagent admin`');
 }
 
+async function cmdDefault() {
+  cliBanner('Welcome', 'installation scan');
+  heading('Scan This Computer');
+  logInfo('Checking NeoAgent runtime data, system services, and running processes…');
+
+  const scan = scanForInstalledInstance();
+  if (scan.installed) {
+    const locations = scan.evidence
+      .map((item) => item.path)
+      .filter(Boolean);
+    logOk('Existing NeoAgent installation found');
+    if (locations.length > 0) {
+      logInfo(`Detected ${locations.join(', ')}`);
+    }
+    await cmdStatus({ showBanner: false });
+    console.log('');
+    logInfo('Run `neoagent --help` to see all commands.');
+    return;
+  }
+
+  logInfo('No installed NeoAgent instance was found. Starting first-time setup.');
+  if (fs.existsSync(ENV_FILE)) {
+    logInfo(`Existing configuration at ${ENV_FILE} will be preserved.`);
+  }
+  await cmdInstall({ guidedProviderSetup: true, showBanner: false });
+}
+
 function cmdStart() {
   cliBanner(`Start ${APP_NAME}`, 'boot sequence');
   heading(`Start ${APP_NAME}`);
@@ -1761,8 +1985,10 @@ function cmdUninstall() {
   cmdStop();
 }
 
-async function cmdStatus() {
-  cliBanner(`${APP_NAME} Status`, 'systems sweep');
+async function cmdStatus({ showBanner = true } = {}) {
+  if (showBanner) {
+    cliBanner(`${APP_NAME} Status`, 'systems sweep');
+  }
   heading(`${APP_NAME} Status`);
   const port = loadEnvPort();
   const running = await isPortOpen(port);
@@ -2144,7 +2370,8 @@ function printHelp() {
   }
 
   cliBanner('neoagent', 'command deck');
-  console.log(`\n${c.bold}Usage${c.reset}  neoagent <command> [args]\n`);
+  console.log(`\n${c.bold}Usage${c.reset}  neoagent [command] [args]\n`);
+  console.log(`${c.dim}  Run neoagent without a command to detect or install NeoAgent.${c.reset}\n`);
 
   cliSection('Lifecycle');
   row('install',              'Guided bootstrap, dependencies, config, service');
@@ -2198,7 +2425,12 @@ function printHelp() {
 async function runCLI(argv) {
   migrateLegacyRuntime((msg) => logInfo(msg));
   ensureRuntimeDirs();
-  const command = argv[0] || 'help';
+  const command = argv[0];
+
+  if (!command) {
+    await cmdDefault();
+    return;
+  }
 
   switch (command) {
     case 'install':
@@ -2273,4 +2505,8 @@ async function runCLI(argv) {
   }
 }
 
-module.exports = { runCLI };
+module.exports = {
+  parseProviderChoices,
+  runCLI,
+  scanForInstalledInstance,
+};