neoagent 3.0.1-beta.12 → 3.0.1-beta.13

package/docs/billing.md

@@ -7,19 +7,40 @@ anywhere in the application.
 
 ## Enable billing
 
-Set the following environment variables before starting the server:
+Run the interactive setup wizard:
 
 ```bash
-neoagent env set NEOAGENT_BILLING_ENABLED true
-neoagent env set STRIPE_SECRET_KEY sk_live_...
-neoagent env set STRIPE_PUBLISHABLE_KEY pk_live_...
-neoagent env set STRIPE_WEBHOOK_SECRET whsec_...
+neoagent billing setup
 ```
 
-Restart the server. The admin dashboard will show a **Billing** navigation
-item and the `/api/billing/*` endpoints will become active.
+The wizard prompts for your Stripe API keys, webhook secret, and trial length,
+then asks whether to enable billing immediately. Use Stripe test keys
+(`sk_test_...`, `pk_test_...`) during development.
 
-Use Stripe test keys (`sk_test_...`, `pk_test_...`) during development.
+To check the current configuration at any time:
+
+```bash
+neoagent billing        # or: neoagent billing status
+```
+
+To toggle billing without re-running setup:
+
+```bash
+neoagent billing enable    # set NEOAGENT_BILLING_ENABLED=true and restart
+neoagent billing disable   # set NEOAGENT_BILLING_ENABLED=false and restart
+```
+
+When enabled the admin dashboard will show a **Billing** navigation item and
+the `/api/billing/*` endpoints become active.
+
+> **Manual alternative** — you can also set variables directly and restart:
+> ```bash
+> neoagent env set STRIPE_SECRET_KEY sk_live_...
+> neoagent env set STRIPE_PUBLISHABLE_KEY pk_live_...
+> neoagent env set STRIPE_WEBHOOK_SECRET whsec_...
+> neoagent env set NEOAGENT_BILLING_ENABLED true
+> neoagent restart
+> ```
 
 ## Subscription plans
 

package/docs/configuration.md

@@ -99,8 +99,17 @@ reset, email changes, and security notifications.
 
 ## Billing
 
-Billing is disabled by default. See [Billing](billing.md) for the full setup
-guide, webhook configuration, and plan management.
+Billing is disabled by default. Use the interactive wizard to configure it:
+
+```bash
+neoagent billing setup    # guided Stripe key and webhook setup
+neoagent billing          # show current status
+neoagent billing enable   # activate billing and restart
+neoagent billing disable  # deactivate billing and restart
+```
+
+See [Billing](billing.md) for the full setup guide, webhook configuration, and
+plan management.
 
 | Variable | Default | Purpose |
 |---|---|---|

package/flutter_app/lib/main_app_shell.dart

@@ -1695,6 +1695,7 @@ class _HomeViewState extends State<HomeView> {
                                     .allowMessagingSuggestion(
                                       notice.platform,
                                       suggestion,
+                                      chatId: notice.chatId,
                                     );
                               },
                               icon: Icon(Icons.verified_user_outlined),
@@ -1716,6 +1717,13 @@ class _HomeViewState extends State<HomeView> {
                 },
                 child: Text('Open Messaging'),
               ),
+              TextButton(
+                onPressed: () async {
+                  Navigator.of(dialogContext).pop();
+                  await widget.controller.ignoreBlockedSender(notice);
+                },
+                child: Text('Ignore'),
+              ),
               TextButton(
                 onPressed: () => Navigator.of(dialogContext).pop(),
                 child: Text('Dismiss'),

package/flutter_app/lib/main_chat.dart

@@ -1414,6 +1414,10 @@ class _MessagingPanelState extends State<MessagingPanel> {
           ),
           const SizedBox(height: 22),
         ],
+        if (controller.ignoredChats.isNotEmpty) ...[
+          const SizedBox(height: 18),
+          _IgnoredChatsPanel(controller: controller),
+        ],
         _MessagingActivityPanel(messages: controller.messagingMessages),
       ],
     );
@@ -1839,6 +1843,101 @@ class _MessagingGroupHeader extends StatelessWidget {
   }
 }
 
+class _IgnoredChatsPanel extends StatelessWidget {
+  const _IgnoredChatsPanel({required this.controller});
+
+  final NeoAgentController controller;
+
+  @override
+  Widget build(BuildContext context) {
+    final ignored = controller.ignoredChats;
+    return Container(
+      padding: const EdgeInsets.all(18),
+      decoration: BoxDecoration(
+        color: _bgCard,
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(color: _borderLight),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      'Ignored Channels',
+                      style: TextStyle(
+                        color: _textPrimary,
+                        fontSize: 18,
+                        fontWeight: FontWeight.w800,
+                      ),
+                    ),
+                    const SizedBox(height: 3),
+                    Text(
+                      'These channels are permanently silenced. To receive messages from them, add them manually to the access policy for the relevant platform.',
+                      style: TextStyle(color: _textSecondary, fontSize: 13, height: 1.4),
+                    ),
+                  ],
+                ),
+              ),
+              _StatusPill(label: '${ignored.length}', color: _textMuted),
+            ],
+          ),
+          const SizedBox(height: 14),
+          for (final key in ignored)
+            Builder(builder: (context) {
+              final sep = key.indexOf(':');
+              final platform = sep > 0 ? key.substring(0, sep) : key;
+              final chatId = sep > 0 ? key.substring(sep + 1) : '';
+              return Container(
+                margin: const EdgeInsets.only(bottom: 8),
+                padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
+                decoration: BoxDecoration(
+                  color: _bgSecondary,
+                  borderRadius: BorderRadius.circular(8),
+                  border: Border.all(color: _borderLight),
+                ),
+                child: Row(
+                  children: [
+                    Icon(Icons.block_rounded, size: 16, color: _textMuted),
+                    const SizedBox(width: 10),
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            platform.toUpperCase(),
+                            style: TextStyle(
+                              color: _textMuted,
+                              fontSize: 10,
+                              fontWeight: FontWeight.w700,
+                              letterSpacing: 0.6,
+                            ),
+                          ),
+                          Text(
+                            chatId.isNotEmpty ? chatId : platform,
+                            style: TextStyle(color: _textPrimary, fontSize: 13),
+                          ),
+                        ],
+                      ),
+                    ),
+                    TextButton(
+                      onPressed: () => controller.removeIgnoredChat(key),
+                      child: Text('Remove'),
+                    ),
+                  ],
+                ),
+              );
+            }),
+        ],
+      ),
+    );
+  }
+}
+
 class _MessagingActivityPanel extends StatelessWidget {
   const _MessagingActivityPanel({required this.messages});
 

package/flutter_app/lib/main_controller.dart

@@ -163,6 +163,7 @@ class NeoAgentController extends ChangeNotifier {
   MessagingQrState? pendingMessagingQr;
   ToolApprovalRequest? pendingApproval;
   final List<BlockedSenderNotice> _blockedSenderQueue = <BlockedSenderNotice>[];
+  final Set<String> _ignoredChats = <String>{};
   List<SkillItem> skills = const <SkillItem>[];
   List<StoreSkillItem> storeSkills = const <StoreSkillItem>[];
   List<OfficialIntegrationItem> officialIntegrations =
@@ -636,6 +637,8 @@ class NeoAgentController extends ChangeNotifier {
   BlockedSenderNotice? get pendingBlockedSenderNotice =>
       _blockedSenderQueue.isEmpty ? null : _blockedSenderQueue.first;
 
+  List<String> get ignoredChats => _ignoredChats.toList();
+
   void _handleRecordingBridgeChanged() {
     _logRecording('bridge.changed');
     notifyListeners();
@@ -721,6 +724,7 @@ class NeoAgentController extends ChangeNotifier {
 
   Future<void> bootstrap() async {
     _prefs = await SharedPreferences.getInstance();
+    _ignoredChats.addAll(_prefs?.getStringList('messaging.ignored_chats') ?? <String>[]);
     await _desktopCompanion.bootstrap(_prefs!);
     final configured = _configuredBackendUrl.trim();
     final savedBackendUrl = _prefs?.getString('backend_url')?.trim() ?? '';
@@ -1922,14 +1926,20 @@ class NeoAgentController extends ChangeNotifier {
 
   Future<void> allowMessagingSuggestion(
     String platform,
-    QuickAllowSuggestion suggestion,
-  ) async {
+    QuickAllowSuggestion suggestion, {
+    String? chatId,
+  }) async {
     try {
       final nextPolicy = _policyWithAddedRule(
         currentMessagingAccessPolicy(platform),
         suggestion,
       );
       await saveMessagingAccessPolicy(platform, nextPolicy);
+      if (chatId != null) {
+        _blockedSenderQueue.removeWhere(
+          (notice) => notice.platform == platform && notice.chatId == chatId,
+        );
+      }
       errorMessage = null;
       notifyListeners();
     } catch (error) {
@@ -1938,6 +1948,22 @@ class NeoAgentController extends ChangeNotifier {
     }
   }
 
+  Future<void> ignoreBlockedSender(BlockedSenderNotice notice) async {
+    final key = '${notice.platform}:${notice.chatId ?? notice.sender ?? ''}';
+    _ignoredChats.add(key);
+    _blockedSenderQueue.removeWhere(
+      (n) => n.platform == notice.platform && (n.chatId == notice.chatId || n.sender == notice.sender),
+    );
+    await _prefs?.setStringList('messaging.ignored_chats', _ignoredChats.toList());
+    notifyListeners();
+  }
+
+  Future<void> removeIgnoredChat(String key) async {
+    _ignoredChats.remove(key);
+    await _prefs?.setStringList('messaging.ignored_chats', _ignoredChats.toList());
+    notifyListeners();
+  }
+
   void consumeBlockedSenderNotice(String id) {
     if (_blockedSenderQueue.isNotEmpty && _blockedSenderQueue.first.id == id) {
       _blockedSenderQueue.removeAt(0);
@@ -1948,6 +1974,8 @@ class NeoAgentController extends ChangeNotifier {
   }
 
   void _enqueueBlockedSenderNotice(BlockedSenderNotice notice) {
+    final ignoreKey = '${notice.platform}:${notice.chatId ?? notice.sender ?? ''}';
+    if (_ignoredChats.contains(ignoreKey)) return;
     final exists = _blockedSenderQueue.any((item) => item.id == notice.id);
     if (!exists) {
       _blockedSenderQueue.add(notice);

package/lib/manager.js

@@ -2000,6 +2000,152 @@ function cmdVersion() {
   console.log(currentInstalledVersionLabel());
 }
 
+async function cmdBilling(args = []) {
+  const sub = (args[0] || 'status').toLowerCase();
+
+  if (sub === '--help' || sub === '-h' || sub === 'help') {
+    console.log('\nNeoAgent Billing');
+    console.log('Usage: neoagent billing [subcommand]');
+    console.log('');
+    console.log('Subcommands:');
+    console.log('  neoagent billing           Show billing configuration status');
+    console.log('  neoagent billing setup     Interactive Stripe setup wizard');
+    console.log('  neoagent billing enable    Enable billing and restart');
+    console.log('  neoagent billing disable   Disable billing and restart');
+    console.log('');
+    return;
+  }
+
+  if (sub === 'status') {
+    cliBanner('Billing', 'configuration status');
+    heading('Billing Status');
+    const env = Object.fromEntries(parseEnv(readEnvFileRaw()).entries());
+    const enabled = ['1', 'true', 'yes'].includes(String(env.NEOAGENT_BILLING_ENABLED || '').toLowerCase());
+    const hasSecret = Boolean(env.STRIPE_SECRET_KEY);
+    const hasPub = Boolean(env.STRIPE_PUBLISHABLE_KEY);
+    const hasWebhook = Boolean(env.STRIPE_WEBHOOK_SECRET);
+    const trialDays = env.BILLING_TRIAL_DAYS || '14';
+
+    cliSection('Billing config');
+    statusLine(enabled, 'enabled', enabled ? 'yes' : 'no', enabled ? '' : 'run: neoagent billing enable');
+    statusLine(hasSecret, 'secret', hasSecret ? maskEnvValue('SECRET', env.STRIPE_SECRET_KEY) : 'not set', hasSecret ? '' : 'run: neoagent billing setup');
+    statusLine(hasPub, 'public', hasPub ? maskEnvValue('KEY', env.STRIPE_PUBLISHABLE_KEY) : 'not set');
+    statusLine(hasWebhook, 'webhook', hasWebhook ? 'configured' : 'not set');
+    console.log('');
+    cliSection('Trial');
+    console.log(`  trial days  ${trialDays}`);
+
+    const port = loadEnvPort();
+    const publicUrl = env.PUBLIC_URL || `http://localhost:${port}`;
+    console.log('');
+    cliSection('Webhook endpoint');
+    console.log(`  ${publicUrl}/api/billing/webhook`);
+    console.log('');
+
+    if (!hasSecret || !hasPub) {
+      logWarn('Stripe keys not configured. Run `neoagent billing setup` to get started.');
+    } else if (!enabled) {
+      logInfo('Billing is configured but not enabled. Run `neoagent billing enable` to activate.');
+    } else {
+      logOk('Billing is active. Manage plans in Admin › Billing.');
+    }
+    return;
+  }
+
+  if (sub === 'enable') {
+    heading('Enable Billing');
+    upsertEnvValue('NEOAGENT_BILLING_ENABLED', 'true');
+    logOk('Set NEOAGENT_BILLING_ENABLED=true');
+    logInfo('Restarting NeoAgent to apply changes...');
+    cmdRestart();
+    return;
+  }
+
+  if (sub === 'disable') {
+    heading('Disable Billing');
+    upsertEnvValue('NEOAGENT_BILLING_ENABLED', 'false');
+    logOk('Set NEOAGENT_BILLING_ENABLED=false');
+    logInfo('Restarting NeoAgent to apply changes...');
+    cmdRestart();
+    return;
+  }
+
+  if (sub === 'setup') {
+    cliBanner('Billing Setup', 'Stripe configuration');
+    heading('Billing Setup');
+    ensureRuntimeDirs();
+
+    const current = Object.fromEntries(parseEnv(readEnvFileRaw()).entries());
+    const port = loadEnvPort();
+    const publicUrl = current.PUBLIC_URL || `http://localhost:${port}`;
+
+    logInfo('Press Enter to keep the current value shown in brackets.');
+    logInfo(`Webhook endpoint: ${publicUrl}/api/billing/webhook`);
+    console.log('');
+
+    heading('Stripe API keys');
+    logInfo('Find these in your Stripe dashboard: https://dashboard.stripe.com/apikeys');
+    const secretKey = await askSecret('Stripe secret key (sk_live_... or sk_test_...)', current.STRIPE_SECRET_KEY || '');
+    const publishableKey = await askSecret('Stripe publishable key (pk_live_... or pk_test_...)', current.STRIPE_PUBLISHABLE_KEY || '');
+
+    if (secretKey && !secretKey.startsWith('sk_')) {
+      logWarn('Secret key does not start with "sk_" — double-check the value.');
+    }
+    if (publishableKey && !publishableKey.startsWith('pk_')) {
+      logWarn('Publishable key does not start with "pk_" — double-check the value.');
+    }
+
+    heading('Webhook');
+    logInfo(`Register this endpoint in Stripe: ${publicUrl}/api/billing/webhook`);
+    logInfo('Required events: customer.subscription.*, invoice.payment_succeeded, invoice.payment_failed');
+    const webhookSecret = await askSecret('Stripe webhook signing secret (whsec_...)', current.STRIPE_WEBHOOK_SECRET || '');
+
+    if (webhookSecret && !webhookSecret.startsWith('whsec_')) {
+      logWarn('Webhook secret does not start with "whsec_" — double-check the value.');
+    }
+
+    heading('Trial');
+    const trialDaysRaw = await ask('Free trial length in days (0 to disable)', current.BILLING_TRIAL_DAYS || '14');
+    const trialDays = Number(trialDaysRaw);
+    if (!Number.isInteger(trialDays) || trialDays < 0) {
+      throw new Error(`Invalid trial length "${trialDaysRaw}". Must be a non-negative integer.`);
+    }
+
+    if (secretKey) upsertEnvValue('STRIPE_SECRET_KEY', secretKey);
+    if (publishableKey) upsertEnvValue('STRIPE_PUBLISHABLE_KEY', publishableKey);
+    if (webhookSecret) upsertEnvValue('STRIPE_WEBHOOK_SECRET', webhookSecret);
+    upsertEnvValue('BILLING_TRIAL_DAYS', String(trialDays));
+
+    logOk('Stripe credentials saved to .env');
+
+    const isAlreadyEnabled = ['1', 'true', 'yes'].includes(String(current.NEOAGENT_BILLING_ENABLED || '').toLowerCase());
+    let enableNow = isAlreadyEnabled;
+    if (!isAlreadyEnabled) {
+      const enableAnswer = await ask('Enable billing now? (y/N)', 'N');
+      enableNow = enableAnswer.toLowerCase() === 'y' || enableAnswer.toLowerCase() === 'yes';
+    }
+
+    if (enableNow) {
+      upsertEnvValue('NEOAGENT_BILLING_ENABLED', 'true');
+      logOk('Billing enabled');
+      logInfo('Restarting NeoAgent to apply credentials...');
+      cmdRestart();
+    } else {
+      logInfo('Billing is not yet enabled. Run `neoagent billing enable` when ready.');
+    }
+
+    console.log('');
+    heading('Next steps');
+    logInfo('1. Verify the webhook endpoint is reachable from Stripe');
+    logInfo('2. Create subscription plans in Admin › Billing › Plans');
+    logInfo('3. Add a free plan (price = 0) for users without a paid subscription');
+    logInfo('   See: neoagent billing status');
+    return;
+  }
+
+  throw new Error(`Unknown billing subcommand: ${sub}. Run "neoagent billing --help" for usage.`);
+}
+
 function printHelp() {
   const c = COLORS;
   const W = 38;
@@ -2047,6 +2193,13 @@ function printHelp() {
   row('admin',               'Show admin dashboard URL and credentials');
   console.log('');
 
+  cliSection('Billing');
+  row('billing',             'Show billing configuration status');
+  row('billing setup',       'Interactive Stripe setup wizard');
+  row('billing enable',      'Enable billing and restart');
+  row('billing disable',     'Disable billing and restart');
+  console.log('');
+
   cliSection('Maintenance');
   row('migrate',             'Migrate from another agent installation');
   row('migrate dry-run',     'Preview what would be migrated');
@@ -2106,6 +2259,9 @@ async function runCLI(argv) {
     case 'login':
       await cmdLogin(argv.slice(1));
       break;
+    case 'billing':
+      await cmdBilling(argv.slice(1));
+      break;
     case 'admin': {
       cliBanner('Admin Dashboard', 'credentials');
       const adminCreds = readAdminCredentials();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neoagent",
-  "version": "3.0.1-beta.12",
+  "version": "3.0.1-beta.13",
   "description": "Self-hosted AI agent for long-running tasks, automation, messaging, device control, and local memory",
   "license": "AGPL-3.0-only",
   "main": "server/index.js",

package/server/admin/billing.js

@@ -12,7 +12,6 @@ async function loadBilling() {
       document.getElementById('billing-plans-content').innerHTML =
         '<div class="empty">Billing is not enabled on this server. Set <code>NEOAGENT_BILLING_ENABLED=1</code> to enable it.</div>';
       document.getElementById('billing-subs-content').innerHTML = '';
-      document.getElementById('nav-billing').style.display = '';
       return;
     }
     const data = await r.json();

package/server/public/.last_build_id

@@ -1 +1 @@
-ea6fa5cc59204621d580c6c7ce0cf0ad
+6909cff5608bd6620d57f74f1cca0974

package/server/public/flutter_bootstrap.js

@@ -37,6 +37,6 @@ _flutter.buildConfig = {"engineRevision":"77e2e94772b6eb43759e34ed1ad7da4674e19c
 
 _flutter.loader.load({
   serviceWorkerSettings: {
-    serviceWorkerVersion: "158549597" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
+    serviceWorkerVersion: "3978533651" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
   }
 });