@1a35e1/sonar-cli 0.3.5 → 0.4.1

package/README.md

@@ -19,11 +19,7 @@ pnpm add -g @1a35e1/sonar-cli@latest
 Register your API key.
 
 ```sh
-# Ensure "SONAR_API_KEY" available in your env
-export SONAR_API_KEY=snr_xxxxx
-
-# or, manually register
-sonar config setup key=<YOUR_API_KEY>
+sonar account add snr_xxxxx
 ```
 
 View your account status:
@@ -160,8 +156,7 @@ What this means in practice:
 ```bash
 pnpm add -g @1a35e1/sonar-cli@latest
 
-export SONAR_API_KEY="your_api_key_here"
-sonar config setup key=<YOUR_API_KEY>
+sonar account add <YOUR_API_KEY>
 ```
 
 Verify it works:
@@ -269,7 +264,6 @@ sonar sync bookmarks                 # sync bookmarks to local SQLite
 
 | Variable            | Required             | Purpose                                                             |
 | ------------------- | -------------------- | ------------------------------------------------------------------- |
-| `SONAR_API_KEY`     | Yes                  | Auth token from [sonar.8640p.info](https://sonar.8640p.info/)       |
 | `SONAR_API_URL`     | No                   | GraphQL endpoint (default: production API)                          |
 | `SONAR_MAX_RETRIES` | No                   | Max retry attempts on transient failures (default: 3, 0 to disable) |
 | `OPENAI_API_KEY`    | For `topics suggest` | Required when using OpenAI vendor for AI suggestions                |
@@ -301,8 +295,8 @@ Locally, it skips when offline; in CI (`CI=true`) it is enforced.
 
 ## Troubleshooting
 
-**`No token found. Set SONAR_API_KEY or run: sonar config setup`**
-Set `SONAR_API_KEY` in your environment or run `sonar config setup key=<YOUR_KEY>`.
+**`No token found. Run: sonar account add <name> <key>`**
+Add an account with `sonar account add <YOUR_KEY>`. Get a key at [sonar.8640p.info](https://sonar.8640p.info/).
 
 **`Unable to reach server, please try again shortly.`**
 Check your network connection and API availability. The CLI automatically retries transient failures (network errors, 5xx) up to 3 times with exponential backoff. Use `--debug` to see retry attempts. Set `SONAR_MAX_RETRIES=0` to disable retries.

package/dist/cli.js

@@ -1,4 +1,17 @@
 #!/usr/bin/env node
+import { readFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
 import Pastel from 'pastel';
-const app = new Pastel({ importMeta: import.meta });
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const pkg = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf8'));
+const HEADER = `
+     S O N A R
+     ────────────────────────
+     ${pkg.version}
+`;
+if (process.argv.includes('--help') || process.argv.includes('-h')) {
+    process.stdout.write(HEADER);
+}
+const app = new Pastel({ importMeta: import.meta, name: 'sonar' });
 await app.run();

package/dist/commands/account/add.js

@@ -0,0 +1,58 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect } from 'react';
+import zod from 'zod';
+import { Text } from 'ink';
+import { readAccounts, writeAccounts, migrateToAccounts } from '../../lib/config.js';
+const ADJECTIVES = [
+    'bouncy', 'cosmic', 'dizzy', 'fuzzy', 'gentle', 'happy', 'jazzy',
+    'lucky', 'mellow', 'nimble', 'plucky', 'quiet', 'rusty', 'snappy',
+    'tiny', 'vivid', 'witty', 'zesty', 'bright', 'clever',
+];
+const ANIMALS = [
+    'rabbit', 'falcon', 'panda', 'otter', 'fox', 'wolf', 'eagle',
+    'dolphin', 'tiger', 'koala', 'lynx', 'owl', 'raven', 'seal',
+    'hawk', 'badger', 'crane', 'finch', 'heron', 'wren',
+];
+function randomName() {
+    const adj = ADJECTIVES[Math.floor(Math.random() * ADJECTIVES.length)];
+    const animal = ANIMALS[Math.floor(Math.random() * ANIMALS.length)];
+    return `${adj}-${animal}`;
+}
+export const args = zod.tuple([
+    zod.string().describe('API key (snr_...)'),
+]);
+export const options = zod.object({
+    alias: zod.string().optional().describe('Account alias (default: random)'),
+    'api-url': zod.string().optional().describe('Custom API URL'),
+});
+export default function AccountAdd({ args: [key], options: flags }) {
+    useEffect(() => {
+        migrateToAccounts();
+        if (!key.startsWith('snr_')) {
+            process.stderr.write('Invalid API key — must start with "snr_"\n');
+            process.exit(1);
+        }
+        const data = readAccounts();
+        let name = flags.alias ?? randomName();
+        // Avoid collisions with existing names
+        while (data.accounts[name]) {
+            name = randomName();
+        }
+        data.accounts[name] = {
+            token: key,
+            apiUrl: flags['api-url'] ?? 'https://api.sonar.8640p.info/graphql',
+        };
+        // If this is the first account, make it active
+        if (!data.active || !data.accounts[data.active]) {
+            data.active = name;
+        }
+        writeAccounts(data);
+        const isActive = data.active === name ? ' (active)' : '';
+        process.stdout.write(`Account "${name}" added${isActive}\n`);
+        if (!flags.alias) {
+            process.stdout.write(`tip  rename with: sonar account rename ${name} <your-name>\n`);
+        }
+        process.exit(0);
+    }, []);
+    return _jsx(Text, { dimColor: true, children: "Adding account..." });
+}

package/dist/commands/account/index.js

@@ -0,0 +1,30 @@
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import zod from 'zod';
+import { Box, Text } from 'ink';
+import { readAccounts, migrateToAccounts } from '../../lib/config.js';
+export const options = zod.object({
+    json: zod.boolean().default(false).describe('Raw JSON output'),
+});
+function maskToken(token) {
+    if (token.length <= 8)
+        return '***';
+    return token.slice(0, 4) + '...' + token.slice(-4);
+}
+export default function AccountList({ options: flags }) {
+    migrateToAccounts();
+    const { active, accounts } = readAccounts();
+    const names = Object.keys(accounts);
+    if (flags.json) {
+        process.stdout.write(JSON.stringify({ active, accounts: names }, null, 2) + '\n');
+        process.exit(0);
+        return _jsx(_Fragment, {});
+    }
+    if (names.length === 0) {
+        return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsx(Text, { children: "No accounts configured." }), _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "  sonar account add snr_xxxxx" }), _jsx(Text, { dimColor: true, children: "  sonar account add snr_yyyyy --alias work" })] })] }));
+    }
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Accounts" }), _jsxs(Text, { dimColor: true, children: [" (", names.length, ")"] })] }), names.map(name => {
+                const isActive = name === active;
+                const entry = accounts[name];
+                return (_jsxs(Box, { gap: 2, children: [_jsxs(Text, { color: isActive ? 'green' : undefined, children: [isActive ? '* ' : '  ', name] }), _jsx(Text, { dimColor: true, children: maskToken(entry.token) }), entry.apiUrl !== 'https://api.sonar.8640p.info/graphql' && (_jsx(Text, { dimColor: true, children: entry.apiUrl }))] }, name));
+            }), _jsx(Text, { dimColor: true, children: "switch: sonar account switch <name>" })] }));
+}

package/dist/commands/account/remove.js

@@ -0,0 +1,34 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect } from 'react';
+import zod from 'zod';
+import { Text } from 'ink';
+import { readAccounts, writeAccounts } from '../../lib/config.js';
+export const args = zod.tuple([
+    zod.string().describe('Account name to remove'),
+]);
+export const options = zod.object({
+    force: zod.boolean().default(false).describe('Remove even if active'),
+});
+export default function AccountRemove({ args: [name], options: flags }) {
+    useEffect(() => {
+        const data = readAccounts();
+        if (!data.accounts[name]) {
+            process.stderr.write(`Account "${name}" not found.\n`);
+            process.exit(1);
+        }
+        if (data.active === name && !flags.force) {
+            process.stderr.write(`"${name}" is the active account. Switch first, or use --force.\n`);
+            process.exit(1);
+        }
+        delete data.accounts[name];
+        // If we removed the active account, pick the first remaining one
+        if (data.active === name) {
+            const remaining = Object.keys(data.accounts);
+            data.active = remaining.length > 0 ? remaining[0] : '';
+        }
+        writeAccounts(data);
+        process.stdout.write(`Account "${name}" removed\n`);
+        process.exit(0);
+    }, []);
+    return _jsx(Text, { dimColor: true, children: "Removing account..." });
+}

package/dist/commands/account/rename.js

@@ -0,0 +1,35 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect } from 'react';
+import zod from 'zod';
+import { Text } from 'ink';
+import { readAccounts, writeAccounts } from '../../lib/config.js';
+export const args = zod.tuple([
+    zod.string().describe('Current account name'),
+    zod.string().describe('New account name'),
+]);
+export default function AccountRename({ args: [oldName, newName] }) {
+    useEffect(() => {
+        const data = readAccounts();
+        if (!data.accounts[oldName]) {
+            const names = Object.keys(data.accounts);
+            process.stderr.write(`Account "${oldName}" not found.`);
+            if (names.length > 0)
+                process.stderr.write(` Available: ${names.join(', ')}`);
+            process.stderr.write('\n');
+            process.exit(1);
+        }
+        if (data.accounts[newName]) {
+            process.stderr.write(`Account "${newName}" already exists.\n`);
+            process.exit(1);
+        }
+        data.accounts[newName] = data.accounts[oldName];
+        delete data.accounts[oldName];
+        if (data.active === oldName) {
+            data.active = newName;
+        }
+        writeAccounts(data);
+        process.stdout.write(`Renamed "${oldName}" → "${newName}"\n`);
+        process.exit(0);
+    }, []);
+    return _jsx(Text, { dimColor: true, children: "Renaming account..." });
+}

package/dist/commands/account/switch.js

@@ -0,0 +1,27 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect } from 'react';
+import zod from 'zod';
+import { Text } from 'ink';
+import { readAccounts, writeAccounts } from '../../lib/config.js';
+export const args = zod.tuple([
+    zod.string().describe('Account name to switch to'),
+]);
+export default function AccountSwitch({ args: [name] }) {
+    useEffect(() => {
+        const data = readAccounts();
+        if (!data.accounts[name]) {
+            const names = Object.keys(data.accounts);
+            process.stderr.write(`Account "${name}" not found.`);
+            if (names.length > 0) {
+                process.stderr.write(` Available: ${names.join(', ')}`);
+            }
+            process.stderr.write('\n');
+            process.exit(1);
+        }
+        data.active = name;
+        writeAccounts(data);
+        process.stdout.write(`Switched to "${name}"\n`);
+        process.exit(0);
+    }, []);
+    return _jsx(Text, { dimColor: true, children: "Switching account..." });
+}

package/dist/commands/config/env.js

@@ -1,15 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect } from 'react';
 import { Text } from 'ink';
-const maskSensitive = (value) => {
-    return value.replace(/[^a-zA-Z0-9]/g, '*').slice(0, 4) + '***' + value.slice(-4);
-};
 export default function Env() {
     useEffect(() => {
-        process.stdout.write(`SONAR_API_KEY=${maskSensitive(process.env.SONAR_API_KEY ?? '')}\n`);
-        process.stdout.write(`SONAR_AI_VENDOR=${process.env.SONAR_AI_VENDOR}\n`);
-        process.stdout.write(`SONAR_FEED_RENDER=${process.env.SONAR_FEED_RENDER}\n`);
-        process.stdout.write(`SONAR_FEED_WIDTH=${process.env.SONAR_FEED_WIDTH}\n`);
+        process.stdout.write(`SONAR_API_URL=${process.env.SONAR_API_URL ?? ''}\n`);
+        process.stdout.write(`SONAR_AI_VENDOR=${process.env.SONAR_AI_VENDOR ?? ''}\n`);
+        process.stdout.write(`SONAR_FEED_RENDER=${process.env.SONAR_FEED_RENDER ?? ''}\n`);
+        process.stdout.write(`SONAR_FEED_WIDTH=${process.env.SONAR_FEED_WIDTH ?? ''}\n`);
+        process.stdout.write(`SONAR_MAX_RETRIES=${process.env.SONAR_MAX_RETRIES ?? ''}\n`);
     }, []);
     return _jsx(Text, { dimColor: true, children: "Environment variables:" });
 }

package/dist/commands/config/setup.js

@@ -12,10 +12,10 @@ export default function Setup({ options: flags }) {
             process.stderr.write('Workspace already initialised at ~/.sonar/config.json\n');
             process.exit(1);
         }
-        const apiKey = flags.key || process.env.SONAR_API_KEY;
+        const apiKey = flags.key;
         const apiUrl = process.env.SONAR_API_URL;
         if (!apiKey) {
-            process.stderr.write('SONAR_API_KEY is not set. Generate a key at https://sonar.8640p.info\n');
+            process.stderr.write('API key required. Run: sonar config setup --key=<YOUR_KEY>\n');
             process.exit(1);
         }
         writeConfig({

package/dist/commands/config/skill.js

@@ -6,10 +6,11 @@ import { writeSkillTo } from '../../lib/skill.js';
 export const options = zod.object({
     install: zod.boolean().default(false).describe('Install to ~/.claude/skills/sonar/SKILL.md'),
     dest: zod.string().optional().describe('Write to a custom path'),
+    force: zod.boolean().default(false).describe('Overwrite even if file was modified'),
 });
 export default function Skill({ options: flags }) {
     useEffect(() => {
-        writeSkillTo(flags.dest, flags.install);
+        writeSkillTo(flags.dest, flags.install, flags.force);
     }, []);
     return _jsx(Text, { dimColor: true, children: "Generating SKILL.md..." });
 }

package/dist/commands/data/backup.js

@@ -0,0 +1,57 @@
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import zod from 'zod';
+import { Text } from 'ink';
+import { existsSync, mkdirSync } from 'node:fs';
+import { basename, dirname, join } from 'node:path';
+import { DB_PATH } from '../../lib/db.js';
+import { integrityCheck, copyDbWithSidecars } from '../../lib/data-utils.js';
+export const options = zod.object({
+    out: zod.string().optional().describe('Backup output path (default: ~/.sonar/data-backup-<timestamp>.db)'),
+    json: zod.boolean().default(false).describe('Raw JSON output'),
+});
+function ts() {
+    const d = new Date();
+    const p = (n) => String(n).padStart(2, '0');
+    return `${d.getUTCFullYear()}${p(d.getUTCMonth() + 1)}${p(d.getUTCDate())}${p(d.getUTCHours())}${p(d.getUTCMinutes())}${p(d.getUTCSeconds())}`;
+}
+export default function DataBackup({ options: flags }) {
+    const [error, setError] = useState(null);
+    useEffect(() => {
+        try {
+            if (!existsSync(DB_PATH))
+                throw new Error(`source database not found: ${DB_PATH}`);
+            const trimmedOut = flags.out?.trim();
+            const out = trimmedOut && trimmedOut.length > 0
+                ? trimmedOut
+                : join(dirname(DB_PATH), `${basename(DB_PATH, '.db')}-backup-${ts()}.db`);
+            mkdirSync(dirname(out), { recursive: true });
+            copyDbWithSidecars(DB_PATH, out);
+            const check = integrityCheck(out);
+            if (check !== 'ok')
+                throw new Error(`backup integrity check failed: ${check}`);
+            const result = { ok: true, source: DB_PATH, backup: out };
+            if (flags.json) {
+                process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+            }
+            else {
+                process.stdout.write(`Backup complete: ${out}\n`);
+            }
+            process.exit(0);
+        }
+        catch (e) {
+            setError(e instanceof Error ? e.message : String(e));
+        }
+    }, []);
+    useEffect(() => {
+        if (!error)
+            return;
+        if (flags.json) {
+            process.stderr.write(`${error}\n`);
+            process.exit(1);
+        }
+    }, [error, flags.json]);
+    if (error)
+        return flags.json ? _jsx(_Fragment, {}) : _jsxs(Text, { color: "red", children: ["Error: ", error] });
+    return flags.json ? _jsx(_Fragment, {}) : _jsx(Text, { dimColor: true, children: "Creating backup..." });
+}

package/dist/commands/{config/data → data}/path.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect } from 'react';
 import { Text } from 'ink';
-import { DB_PATH } from '../../../lib/db.js';
+import { DB_PATH } from '../../lib/db.js';
 export default function DataPath() {
     useEffect(() => {
         process.stdout.write(`${DB_PATH}\n`);

package/dist/commands/{config/data/sync.js → data/pull.js}

@@ -2,10 +2,10 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { Box, Text } from 'ink';
 import { unlinkSync, existsSync } from 'node:fs';
-import { gql } from '../../../lib/client.js';
-import { Spinner } from '../../../components/Spinner.js';
-import { DB_PATH, openDb, upsertTweet, upsertFeedItem, upsertSuggestion, upsertInterest, getSyncState, setSyncState, } from '../../../lib/db.js';
-import { FEED_QUERY, SUGGESTIONS_QUERY, INTERESTS_QUERY } from '../../../lib/data-queries.js';
+import { gql } from '../../lib/client.js';
+import { Spinner } from '../../components/Spinner.js';
+import { DB_PATH, openDb, upsertTweet, upsertFeedItem, upsertSuggestion, upsertTopic, getSyncState, setSyncState, } from '../../lib/db.js';
+import { FEED_QUERY, SUGGESTIONS_QUERY, INTERESTS_QUERY } from '../../lib/data-queries.js';
 export default function DataSync() {
     const [result, setResult] = useState(null);
     const [error, setError] = useState(null);
@@ -32,12 +32,12 @@ export default function DataSync() {
                         upsertTweet(freshDb, s.tweet);
                         upsertSuggestion(freshDb, { suggestionId: s.suggestionId, tweetId: s.tweet.id, score: s.score, status: s.status, relevance: null, projectsMatched: s.projectsMatched });
                     }
-                    for (const i of interestsResult.topics) {
-                        upsertInterest(freshDb, i);
+                    for (const t of interestsResult.topics) {
+                        upsertTopic(freshDb, t);
                     }
                     setSyncState(freshDb, 'last_synced_at', new Date().toISOString());
                     freshDb.close();
-                    setResult({ feedCount: feedResult.feed.length, suggestionsCount: suggestionsResult.suggestions.length, interestsCount: interestsResult.topics.length });
+                    setResult({ feedCount: feedResult.feed.length, suggestionsCount: suggestionsResult.suggestions.length, topicsCount: interestsResult.topics.length });
                     return;
                 }
                 const hoursSinceSync = Math.min(Math.ceil((Date.now() - new Date(lastSyncedAt).getTime()) / 3600000), 168);
@@ -45,8 +45,8 @@ export default function DataSync() {
                     gql(FEED_QUERY, { hours: hoursSinceSync, days: null, limit: 500 }),
                     gql(SUGGESTIONS_QUERY, { status: null, limit: 500 }),
                 ]);
-                const prevFeedCount = db.prepare('SELECT COUNT(*) as n FROM feed_items').get().n;
-                const prevSuggestionsCount = db.prepare('SELECT COUNT(*) as n FROM suggestions').get().n;
+                const prevFeedCount = db.get('SELECT COUNT(*) as n FROM feed_items').n;
+                const prevSuggestionsCount = db.get('SELECT COUNT(*) as n FROM suggestions').n;
                 for (const item of feedResult.feed) {
                     upsertTweet(db, item.tweet);
                     upsertFeedItem(db, { tweetId: item.tweet.id, score: item.score, matchedKeywords: item.matchedKeywords });
@@ -56,13 +56,13 @@ export default function DataSync() {
                     upsertSuggestion(db, { suggestionId: s.suggestionId, tweetId: s.tweet.id, score: s.score, status: s.status, relevance: null, projectsMatched: s.projectsMatched });
                 }
                 setSyncState(db, 'last_synced_at', new Date().toISOString());
-                const newFeedCount = db.prepare('SELECT COUNT(*) as n FROM feed_items').get().n;
-                const newSuggestionsCount = db.prepare('SELECT COUNT(*) as n FROM suggestions').get().n;
+                const newFeedCount = db.get('SELECT COUNT(*) as n FROM feed_items').n;
+                const newSuggestionsCount = db.get('SELECT COUNT(*) as n FROM suggestions').n;
                 db.close();
                 setResult({
                     feedCount: newFeedCount,
                     suggestionsCount: newSuggestionsCount,
-                    interestsCount: 0,
+                    topicsCount: 0,
                     isSync: true,
                     deltaFeed: newFeedCount - prevFeedCount,
                     deltaSuggestions: newSuggestionsCount - prevSuggestionsCount,
@@ -81,5 +81,5 @@ export default function DataSync() {
     if (result.isSync) {
         return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Sync complete" }), _jsxs(Text, { dimColor: true, children: ["  ", DB_PATH] })] }), _jsxs(Text, { children: [_jsx(Text, { color: "green", children: "feed" }), _jsxs(Text, { dimColor: true, children: [" +", result.deltaFeed ?? 0, " (", result.feedCount, " total)  "] }), _jsx(Text, { color: "green", children: "suggestions" }), _jsxs(Text, { dimColor: true, children: [" +", result.deltaSuggestions ?? 0, " (", result.suggestionsCount, " total)"] })] })] }));
     }
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Download complete" }), _jsxs(Text, { dimColor: true, children: ["  ", DB_PATH] })] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: result.feedCount }), _jsx(Text, { dimColor: true, children: " feed items  " }), _jsx(Text, { color: "cyan", children: result.suggestionsCount }), _jsx(Text, { dimColor: true, children: " suggestions  " }), _jsx(Text, { color: "cyan", children: result.interestsCount }), _jsx(Text, { dimColor: true, children: " interests" })] })] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Download complete" }), _jsxs(Text, { dimColor: true, children: ["  ", DB_PATH] })] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: result.feedCount }), _jsx(Text, { dimColor: true, children: " feed items  " }), _jsx(Text, { color: "cyan", children: result.suggestionsCount }), _jsx(Text, { dimColor: true, children: " suggestions  " }), _jsx(Text, { color: "cyan", children: result.topicsCount }), _jsx(Text, { dimColor: true, children: " topics" })] })] }));
 }

package/dist/commands/{config/data → data}/restore.js

@@ -4,8 +4,8 @@ import zod from 'zod';
 import { Text } from 'ink';
 import { existsSync, mkdirSync, rmSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
-import { DB_PATH } from '../../../lib/db.js';
-import { integrityCheck, copyDbWithSidecars } from './utils.js';
+import { DB_PATH } from '../../lib/db.js';
+import { integrityCheck, copyDbWithSidecars } from '../../lib/data-utils.js';
 export const options = zod.object({
     from: zod.string().describe('Backup database path to restore from'),
     to: zod.string().optional().describe('Target database path (default: local sonar DB path)'),

package/dist/commands/{config/data → data}/sql.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect } from 'react';
 import { Text } from 'ink';
 import { spawnSync } from 'node:child_process';
-import { DB_PATH } from '../../../lib/db.js';
+import { DB_PATH } from '../../lib/db.js';
 export default function DataSql() {
     useEffect(() => {
         const { status } = spawnSync('sqlite3', [DB_PATH], { stdio: 'inherit' });

package/dist/commands/{config/data → data}/verify.js

@@ -3,8 +3,8 @@ import { useEffect, useState } from 'react';
 import zod from 'zod';
 import { Text } from 'ink';
 import { existsSync } from 'node:fs';
-import { DB_PATH } from '../../../lib/db.js';
-import { integrityCheck } from './utils.js';
+import { DB_PATH } from '../../lib/db.js';
+import { integrityCheck } from '../../lib/data-utils.js';
 export const options = zod.object({
     path: zod.string().optional().describe('Database path (default: local sonar DB path)'),
     json: zod.boolean().default(false).describe('Raw JSON output'),

package/dist/commands/refresh.js

@@ -1,19 +1,73 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
+import zod from 'zod';
 import { Box, Text, useApp } from 'ink';
 import { gql } from '../lib/client.js';
+import { getToken, getApiUrl } from '../lib/config.js';
 import { Spinner } from '../components/Spinner.js';
-export default function Refresh() {
+export const options = zod.object({
+    bookmarks: zod.boolean().default(false).describe('Sync bookmarks from X'),
+    likes: zod.boolean().default(false).describe('Sync likes from X'),
+    graph: zod.boolean().default(false).describe('Rebuild social graph'),
+    tweets: zod.boolean().default(false).describe('Index tweets across network'),
+    suggestions: zod.boolean().default(false).describe('Regenerate suggestions'),
+});
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+const REFRESH_MUTATION = `
+  mutation Refresh($days: Int!, $steps: [String!]) {
+    refresh(days: $days, steps: $steps)
+  }
+`;
+export default function Refresh({ options: flags }) {
     const { exit } = useApp();
     const [status, setStatus] = useState('pending');
     const [error, setError] = useState(null);
     const [batchId, setBatchId] = useState(null);
+    // Build steps array from flags — null means run all
+    const selectedSteps = [];
+    if (flags.bookmarks)
+        selectedSteps.push('bookmarks');
+    if (flags.likes)
+        selectedSteps.push('likes');
+    if (flags.graph)
+        selectedSteps.push('graph');
+    if (flags.tweets)
+        selectedSteps.push('tweets');
+    if (flags.suggestions)
+        selectedSteps.push('suggestions');
+    const steps = selectedSteps.length > 0 ? selectedSteps : null;
     useEffect(() => {
         async function run() {
             setStatus('running');
             try {
-                const result = await gql('mutation Refresh { refresh(days: 1) }');
+                const result = await gql(REFRESH_MUTATION, {
+                    days: 1,
+                    steps,
+                });
                 setBatchId(result.refresh);
+                // Brief poll to catch instant pipeline failures (e.g. expired X auth)
+                await sleep(3000);
+                try {
+                    const token = getToken();
+                    const baseUrl = getApiUrl().replace(/\/graphql$/, '');
+                    const res = await fetch(`${baseUrl}/indexing/status`, {
+                        headers: { Authorization: `Bearer ${token}` },
+                    });
+                    if (res.ok) {
+                        const data = await res.json();
+                        if (data.pipeline?.status === 'failed') {
+                            const pipelineError = data.pipeline?.error ?? '';
+                            setError(pipelineError);
+                            setStatus('auth-failed');
+                            return;
+                        }
+                    }
+                }
+                catch {
+                    // Poll failed — not critical, proceed normally
+                }
                 setStatus('ok');
             }
             catch (err) {
@@ -24,11 +78,15 @@ export default function Refresh() {
         run();
     }, []);
     useEffect(() => {
-        if (status === 'ok' || status === 'failed')
+        if (status === 'ok' || status === 'failed' || status === 'auth-failed')
             exit();
     }, [status]);
+    const label = steps ? steps.join(', ') : 'full pipeline';
     if (status === 'running') {
-        return _jsx(Spinner, { label: "Queuing refresh pipeline..." });
+        return _jsx(Spinner, { label: `Queuing refresh (${label})...` });
+    }
+    if (status === 'auth-failed') {
+        return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsxs(Text, { color: "red", children: ["Pipeline failed", error ? `: ${error}` : ''] }), _jsxs(Text, { dimColor: true, children: ["Re-connect your X account at ", _jsx(Text, { color: "cyan", children: "https://sonar.8640p.info/account" })] }), _jsxs(Text, { dimColor: true, children: ["Then run ", _jsx(Text, { color: "cyan", children: "sonar refresh" }), " to retry."] })] }));
     }
     if (status === 'failed') {
         const isAuthError = error?.includes('Re-authorize') || error?.includes('not connected');
@@ -37,5 +95,5 @@ export default function Refresh() {
         }
         return _jsxs(Text, { color: "red", children: ["Error: ", error] });
     }
-    return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsx(Text, { color: "green", children: "\u2713 Refresh pipeline queued" }), batchId && _jsxs(Text, { dimColor: true, children: ["batch: ", batchId] }), _jsxs(Text, { dimColor: true, children: ["Run ", _jsx(Text, { color: "cyan", children: "sonar status --watch" }), " to monitor progress."] })] }));
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsxs(Text, { color: "green", children: ["\u2713 Refresh queued (", label, ")"] }), batchId && _jsxs(Text, { dimColor: true, children: ["batch: ", batchId] }), _jsxs(Text, { dimColor: true, children: ["Run ", _jsx(Text, { color: "cyan", children: "sonar status --watch" }), " to monitor progress."] })] }));
 }

package/dist/commands/status.js

@@ -124,5 +124,5 @@ export default function Status({ options: flags }) {
     const BAR_WIDTH = 20;
     const filledCount = Math.round((embedPct / 100) * BAR_WIDTH);
     const progressBar = '█'.repeat(filledCount) + '░'.repeat(BAR_WIDTH - filledCount);
-    return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: true, color: "cyan", children: ["@", me.xHandle] }), _jsxs(Text, { dimColor: true, children: [me.indexedTweets.toLocaleString(), " tweets", ' · ', "indexed ", timeAgo(me.twitterIndexedAt), ' · ', "refreshed ", timeAgo(me.refreshedSuggestionsAt)] })] }), me.pendingEmbeddings > 0 && (_jsx(Box, { flexDirection: "column", children: _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "embeddings " }), _jsx(Text, { color: embedPct === 100 ? 'green' : 'yellow', children: progressBar }), _jsxs(Text, { dimColor: true, children: [" ", embedPct, "% "] }), _jsxs(Text, { dimColor: true, children: ["(", embedded.toLocaleString(), "/", me.indexedTweets.toLocaleString(), ")"] })] }) })), _jsxs(Box, { borderStyle: "round", borderColor: "gray", flexDirection: "column", paddingX: 1, children: [usage && (_jsxs(Box, { gap: 2, children: [_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "plan " }), _jsx(Text, { color: usage.plan === 'trial' ? 'yellow' : 'green', children: usage.plan })] }), _jsx(Text, { dimColor: true, children: "\u2502" }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "topics " }), _jsxs(Text, { color: usage.interests.atLimit ? 'red' : undefined, children: [usage.interests.used, usage.interests.limit !== null ? `/${usage.interests.limit}` : ''] })] }), _jsx(Text, { dimColor: true, children: "\u2502" }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "refreshes " }), usage.suggestionRefreshes.limit !== null ? (_jsxs(Text, { color: usage.suggestionRefreshes.atLimit ? 'red' : undefined, children: [usage.suggestionRefreshes.used, "/", usage.suggestionRefreshes.limit] })) : (_jsx(Text, { color: "green", children: "unlimited" }))] })] })), _jsxs(Box, { gap: 2, children: [_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "inbox " }), _jsx(Text, { color: suggestionCounts.inbox > 0 ? 'green' : undefined, children: suggestionCounts.inbox })] }), _jsx(Text, { dimColor: true, children: "\u2502" }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "later " }), suggestionCounts.later] }), _jsx(Text, { dimColor: true, children: "\u2502" }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "archived " }), suggestionCounts.archived] })] })] }), pipeline && pipeline.status === 'running' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: "PIPELINE" }), pipeline.steps.map((step, i) => (_jsxs(Text, { children: [_jsx(Text, { color: "green", children: "  \u2713 " }), _jsx(Text, { children: step.label }), _jsxs(Text, { dimColor: true, children: [" (", step.duration, "s)"] })] }, i))), pipeline.current !== '' && (_jsxs(Box, { children: [_jsx(Text, { children: "  " }), _jsx(Spinner, { label: pipeline.current })] }))] })), pipeline && pipeline.status === 'complete' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: "PIPELINE" }), pipeline.steps.map((step, i) => (_jsxs(Text, { children: [_jsx(Text, { color: "green", children: "  \u2713 " }), _jsx(Text, { children: step.label }), _jsxs(Text, { dimColor: true, children: [" (", step.duration, "s)"] })] }, i))), _jsxs(Text, { color: "green", children: ["  \u2713 Complete (", pipeline.total_duration, "s)"] })] })), pipeline && pipeline.status === 'failed' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: "PIPELINE" }), pipeline.steps.map((step, i) => (_jsxs(Text, { children: [_jsx(Text, { color: "green", children: "  \u2713 " }), _jsx(Text, { children: step.label }), _jsxs(Text, { dimColor: true, children: [" (", step.duration, "s)"] })] }, i))), _jsx(Text, { color: "red", children: "  \u2717 Failed" })] })), me.pendingEmbeddings > 0 && !(pipeline && pipeline.status === 'running') && (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: 'Embeddings'.padEnd(16) }), _jsxs(Text, { color: "yellow", children: ["\u25CF ", me.pendingEmbeddings.toLocaleString(), " pending"] })] })), entries.filter(([name]) => name !== 'default').length > 0 && !(pipeline && pipeline.status === 'running') && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: "QUEUES" }), entries.filter(([name]) => name !== 'default').map(([name, counts]) => (_jsxs(Text, { children: [_jsxs(Text, { dimColor: true, children: ["  ", (QUEUE_LABELS[name] ?? name).padEnd(16)] }), counts.running > 0 && _jsxs(Text, { color: "green", children: ["\u25B6 ", counts.running, " running  "] }), counts.queued > 0 && _jsxs(Text, { color: "yellow", children: ["\u25CF ", counts.queued, " queued  "] }), (counts.deferred ?? 0) > 0 && _jsxs(Text, { color: "blue", children: ["\u25C6 ", counts.deferred, " pending  "] })] }, name)))] })), !hasActivity && (_jsxs(Text, { dimColor: true, children: ["idle \u2014 run ", _jsx(Text, { color: "cyan", children: "sonar refresh" }), " to trigger pipeline"] })), flags.watch && (_jsxs(Box, { gap: 2, children: [refreshing && _jsx(Text, { color: "yellow", children: "refreshing..." }), refreshMsg && _jsx(Text, { color: "green", children: refreshMsg }), _jsxs(Text, { dimColor: true, children: ["press ", _jsx(Text, { color: "cyan", children: "r" }), " to refresh \u00B7 ", _jsx(Text, { color: "cyan", children: "q" }), " to quit"] })] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: true, color: "cyan", children: ["@", me.xHandle] }), _jsxs(Text, { dimColor: true, children: [me.indexedTweets.toLocaleString(), " tweets", ' · ', "indexed ", timeAgo(me.twitterIndexedAt), ' · ', "refreshed ", timeAgo(me.refreshedSuggestionsAt)] })] }), me.pendingEmbeddings > 0 && (_jsx(Box, { flexDirection: "column", children: _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "embeddings " }), _jsx(Text, { color: embedPct === 100 ? 'green' : 'yellow', children: progressBar }), _jsxs(Text, { dimColor: true, children: [" ", embedPct, "% "] }), _jsxs(Text, { dimColor: true, children: ["(", embedded.toLocaleString(), "/", me.indexedTweets.toLocaleString(), ")"] })] }) })), _jsxs(Box, { borderStyle: "round", borderColor: "gray", flexDirection: "column", paddingX: 1, children: [usage && (_jsxs(Box, { gap: 2, children: [_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "plan " }), _jsx(Text, { color: usage.plan === 'trial' ? 'yellow' : 'green', children: usage.plan })] }), _jsx(Text, { dimColor: true, children: "\u2502" }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "topics " }), _jsxs(Text, { color: usage.interests.atLimit ? 'red' : undefined, children: [usage.interests.used, usage.interests.limit !== null ? `/${usage.interests.limit}` : ''] })] }), _jsx(Text, { dimColor: true, children: "\u2502" }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "refreshes " }), usage.suggestionRefreshes.limit !== null ? (_jsxs(Text, { color: usage.suggestionRefreshes.atLimit ? 'red' : undefined, children: [usage.suggestionRefreshes.used, "/", usage.suggestionRefreshes.limit] })) : (_jsx(Text, { color: "green", children: "unlimited" }))] })] })), _jsxs(Box, { gap: 2, children: [_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "inbox " }), _jsx(Text, { color: suggestionCounts.inbox > 0 ? 'green' : undefined, children: suggestionCounts.inbox })] }), _jsx(Text, { dimColor: true, children: "\u2502" }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "later " }), suggestionCounts.later] }), _jsx(Text, { dimColor: true, children: "\u2502" }), _jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: "archived " }), suggestionCounts.archived] })] })] }), pipeline && pipeline.status === 'running' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: "PIPELINE" }), pipeline.steps.map((step, i) => (_jsxs(Text, { children: [_jsx(Text, { color: "green", children: "  \u2713 " }), _jsx(Text, { children: step.label }), _jsxs(Text, { dimColor: true, children: [" (", step.duration, "s)"] })] }, i))), pipeline.current !== '' && (_jsxs(Box, { children: [_jsx(Text, { children: "  " }), _jsx(Spinner, { label: pipeline.current })] }))] })), pipeline && pipeline.status === 'complete' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: "PIPELINE" }), pipeline.steps.map((step, i) => (_jsxs(Text, { children: [_jsx(Text, { color: "green", children: "  \u2713 " }), _jsx(Text, { children: step.label }), _jsxs(Text, { dimColor: true, children: [" (", step.duration, "s)"] })] }, i))), _jsxs(Text, { color: "green", children: ["  \u2713 Complete (", pipeline.total_duration, "s)"] })] })), pipeline && pipeline.status === 'failed' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: "PIPELINE" }), pipeline.steps.map((step, i) => (_jsxs(Text, { children: [_jsx(Text, { color: "green", children: "  \u2713 " }), _jsx(Text, { children: step.label }), _jsxs(Text, { dimColor: true, children: [" (", step.duration, "s)"] })] }, i))), _jsx(Text, { color: "red", children: "  \u2717 Failed" }), pipeline.error && (_jsxs(Text, { color: "red", children: ["  ", pipeline.error] })), (pipeline.error?.toLowerCase().includes('oauth') || pipeline.error?.toLowerCase().includes('authorization') || pipeline.error?.toLowerCase().includes('401') || pipeline.steps.length === 0) && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsxs(Text, { dimColor: true, children: ["  Re-connect your X account at ", _jsx(Text, { color: "cyan", children: "https://sonar.8640p.info/account" })] }), _jsxs(Text, { dimColor: true, children: ["  Then run ", _jsx(Text, { color: "cyan", children: "sonar refresh" }), " to retry."] })] }))] })), me.pendingEmbeddings > 0 && !(pipeline && pipeline.status === 'running') && (_jsxs(Text, { children: [_jsx(Text, { dimColor: true, children: 'Embeddings'.padEnd(16) }), _jsxs(Text, { color: "yellow", children: ["\u25CF ", me.pendingEmbeddings.toLocaleString(), " pending"] })] })), entries.filter(([name]) => name !== 'default').length > 0 && !(pipeline && pipeline.status === 'running') && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, dimColor: true, children: "QUEUES" }), entries.filter(([name]) => name !== 'default').map(([name, counts]) => (_jsxs(Text, { children: [_jsxs(Text, { dimColor: true, children: ["  ", (QUEUE_LABELS[name] ?? name).padEnd(16)] }), counts.running > 0 && _jsxs(Text, { color: "green", children: ["\u25B6 ", counts.running, " running  "] }), counts.queued > 0 && _jsxs(Text, { color: "yellow", children: ["\u25CF ", counts.queued, " queued  "] }), (counts.deferred ?? 0) > 0 && _jsxs(Text, { color: "blue", children: ["\u25C6 ", counts.deferred, " pending  "] })] }, name)))] })), !hasActivity && (_jsxs(Text, { dimColor: true, children: ["idle \u2014 run ", _jsx(Text, { color: "cyan", children: "sonar refresh" }), " to trigger pipeline"] })), flags.watch && (_jsxs(Box, { gap: 2, children: [refreshing && _jsx(Text, { color: "yellow", children: "refreshing..." }), refreshMsg && _jsx(Text, { color: "green", children: refreshMsg }), _jsxs(Text, { dimColor: true, children: ["press ", _jsx(Text, { color: "cyan", children: "r" }), " to refresh \u00B7 ", _jsx(Text, { color: "cyan", children: "q" }), " to quit"] })] }))] }));
 }

package/dist/commands/sync/likes.js

@@ -0,0 +1,35 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import { Box, Text, useApp } from 'ink';
+import { gql } from '../../lib/client.js';
+import { Spinner } from '../../components/Spinner.js';
+export default function SyncLikes() {
+    const { exit } = useApp();
+    const [status, setStatus] = useState('pending');
+    const [error, setError] = useState(null);
+    useEffect(() => {
+        async function run() {
+            setStatus('running');
+            try {
+                await gql('mutation SyncLikes { syncLikes }');
+                setStatus('ok');
+            }
+            catch (err) {
+                setStatus('failed');
+                setError(err instanceof Error ? err.message : String(err));
+            }
+        }
+        run();
+    }, []);
+    useEffect(() => {
+        if (status === 'ok' || status === 'failed')
+            exit();
+    }, [status]);
+    if (status === 'running') {
+        return _jsx(Spinner, { label: "Syncing likes..." });
+    }
+    if (status === 'failed') {
+        return _jsxs(Text, { color: "red", children: ["Error: ", error] });
+    }
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "green", children: "\u2713 Likes sync queued" }), _jsxs(Text, { dimColor: true, children: ["Run ", _jsx(Text, { color: "cyan", children: "sonar status --watch" }), " to monitor progress."] })] }));
+}

package/dist/components/Spinner.js

@@ -1,15 +1,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useEffect } from 'react';
 import { Text } from 'ink';
-// Sonar ping — radiates outward, resets
-const FRAMES = [' ', ' ', '·', '•', '●', '◉', '◎', '○', ' '];
+import spinners from 'unicode-animations';
+const SPINNER = spinners.pulse;
 export function Spinner({ label }) {
     const [frame, setFrame] = useState(0);
     useEffect(() => {
         const timer = setInterval(() => {
-            setFrame((f) => (f + 1) % FRAMES.length);
-        }, 100);
+            setFrame((f) => (f + 1) % SPINNER.frames.length);
+        }, SPINNER.interval);
         return () => clearInterval(timer);
     }, []);
-    return (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: FRAMES[frame] }), label ? _jsxs(Text, { children: [" ", label] }) : null] }));
+    return (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: SPINNER.frames[frame] }), label ? _jsxs(Text, { children: [" ", label] }) : null] }));
 }

package/dist/lib/config.js

@@ -4,6 +4,7 @@ import { join } from 'node:path';
 import { DB_PATH } from './db.js';
 const CONFIG_DIR = join(homedir(), '.sonar');
 const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
+const ACCOUNTS_FILE = join(CONFIG_DIR, 'accounts.json');
 export function readConfig() {
     try {
         const raw = readFileSync(CONFIG_FILE, 'utf8');
@@ -35,23 +36,65 @@ export function writeConfig(config) {
     mkdirSync(CONFIG_DIR, { recursive: true });
     writeFileSync(CONFIG_FILE, JSON.stringify(updated, null, 2), 'utf8');
 }
+// ─── Accounts ────────────────────────────────────────────────────────────────
+const DEFAULT_API_URL = 'https://api.sonar.8640p.info/graphql';
+export function readAccounts() {
+    try {
+        const raw = readFileSync(ACCOUNTS_FILE, 'utf8');
+        return JSON.parse(raw);
+    }
+    catch {
+        return { active: '', accounts: {} };
+    }
+}
+export function writeAccounts(data) {
+    mkdirSync(CONFIG_DIR, { recursive: true });
+    writeFileSync(ACCOUNTS_FILE, JSON.stringify(data, null, 2), 'utf8');
+}
+export function accountsExist() {
+    return existsSync(ACCOUNTS_FILE);
+}
+/** Migrate legacy config.json token into accounts.json as "default". */
+export function migrateToAccounts() {
+    if (accountsExist())
+        return;
+    const config = readConfig();
+    if (!config.token)
+        return;
+    writeAccounts({
+        active: 'default',
+        accounts: {
+            default: { token: config.token, apiUrl: config.apiUrl || DEFAULT_API_URL },
+        },
+    });
+}
+export function getActiveAccount() {
+    migrateToAccounts();
+    const { active, accounts } = readAccounts();
+    if (!active || !accounts[active])
+        return null;
+    return { name: active, ...accounts[active] };
+}
 export function getToken() {
-    // SONAR_API_KEY env var takes highest priority
-    const apiKey = process.env.SONAR_API_KEY;
-    if (apiKey)
-        return apiKey;
+    // Check accounts.json
+    const account = getActiveAccount();
+    if (account?.token)
+        return account.token;
     // Fall back to config file token
     const config = readConfig();
     if (config.token)
         return config.token;
-    process.stderr.write('No token found. Set SONAR_API_KEY or run: sonar config setup\n');
+    process.stderr.write('No token found. Run: sonar account add <name> <key>\n');
     process.exit(1);
 }
 export function getApiUrl() {
+    if (process.env.SONAR_API_URL)
+        return process.env.SONAR_API_URL;
+    const account = getActiveAccount();
+    if (account?.apiUrl)
+        return account.apiUrl;
     const config = readConfig();
-    return (process.env.SONAR_API_URL ??
-        config.apiUrl ??
-        'https://api.sonar.8640p.info/graphql');
+    return config.apiUrl ?? DEFAULT_API_URL;
 }
 export function getFeedRender(override) {
     return (override ??

package/dist/{commands/config/data/utils.js → lib/data-utils.js}

@@ -2,20 +2,17 @@
  * Shared utilities for the data backup/restore/verify commands.
  */
 import { copyFileSync, existsSync, rmSync } from 'node:fs';
-import Database from 'better-sqlite3';
+import pkg from 'node-sqlite3-wasm';
+const { Database } = pkg;
 /**
  * Run SQLite's built-in integrity_check pragma on the given database file.
  * Returns `'ok'` when the database is healthy.
- *
- * The DB handle is always closed — even when the pragma throws — so callers
- * never have to worry about leaked file descriptors.
  */
 export function integrityCheck(path) {
-    const db = new Database(path, { readonly: true });
+    const db = new Database(path, { readOnly: true });
     try {
-        const rows = db.pragma('integrity_check');
-        const first = Object.values(rows[0] ?? {})[0];
-        return String(first ?? 'unknown');
+        const row = db.get('PRAGMA integrity_check');
+        return row?.integrity_check ?? 'unknown';
     }
     finally {
         db.close();
@@ -23,8 +20,6 @@ export function integrityCheck(path) {
 }
 /**
  * Copy a SQLite DB file together with any WAL / SHM sidecars that exist.
- * If a sidecar does not exist at the source it is removed from the destination
- * (so that the destination remains self-consistent).
  */
 export function copyDbWithSidecars(src, dst) {
     copyFileSync(src, dst);

package/dist/lib/db.js

@@ -1,4 +1,5 @@
-import Database from 'better-sqlite3';
+import pkg from 'node-sqlite3-wasm';
+const { Database } = pkg;
 import { mkdirSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
@@ -26,9 +27,9 @@ export function openDb() {
       metadata TEXT,
       synced_at TEXT
     );
-    CREATE TABLE IF NOT EXISTS interests (
+    CREATE TABLE IF NOT EXISTS topics (
       id TEXT PRIMARY KEY, name TEXT, description TEXT,
-      keywords TEXT, topics TEXT,
+      keywords TEXT, related_topics TEXT,
       created_at TEXT, updated_at TEXT, synced_at TEXT
     );
     CREATE TABLE IF NOT EXISTS sync_state (
@@ -38,36 +39,46 @@ export function openDb() {
     return db;
 }
 export function upsertTweet(db, tweet) {
-    db.prepare(`
+    db.run(`
     INSERT OR REPLACE INTO tweets
       (id, xid, text, created_at, like_count, retweet_count, reply_count,
        author_username, author_display_name, author_followers_count, author_following_count)
     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(tweet.id, tweet.xid, tweet.text, tweet.createdAt, tweet.likeCount, tweet.retweetCount, tweet.replyCount, tweet.user.username, tweet.user.displayName, tweet.user.followersCount, tweet.user.followingCount);
+  `, [tweet.id, tweet.xid, tweet.text, tweet.createdAt,
+        tweet.likeCount, tweet.retweetCount, tweet.replyCount,
+        tweet.user.username, tweet.user.displayName,
+        tweet.user.followersCount, tweet.user.followingCount]);
 }
 export function upsertFeedItem(db, item) {
-    db.prepare(`
+    db.run(`
     INSERT OR REPLACE INTO feed_items (tweet_id, score, matched_keywords, synced_at)
     VALUES (?, ?, ?, ?)
-  `).run(item.tweetId, item.score, JSON.stringify(item.matchedKeywords), new Date().toISOString());
+  `, [item.tweetId, item.score, JSON.stringify(item.matchedKeywords), new Date().toISOString()]);
 }
 export function upsertSuggestion(db, s) {
-    db.prepare(`
+    db.run(`
     INSERT OR REPLACE INTO suggestions
       (suggestion_id, tweet_id, score, status, relevance, projects_matched, metadata, synced_at)
     VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(s.suggestionId, s.tweetId, s.score, s.status, s.relevance, JSON.stringify(s.projectsMatched), s.metadata != null ? JSON.stringify(s.metadata) : null, new Date().toISOString());
+  `, [s.suggestionId, s.tweetId, s.score, s.status, s.relevance,
+        JSON.stringify(s.projectsMatched),
+        s.metadata != null ? JSON.stringify(s.metadata) : null,
+        new Date().toISOString()]);
 }
-export function upsertInterest(db, interest) {
-    db.prepare(`
-    INSERT OR REPLACE INTO interests (id, name, description, keywords, topics, created_at, updated_at, synced_at)
+export function upsertTopic(db, topic) {
+    db.run(`
+    INSERT OR REPLACE INTO topics (id, name, description, keywords, related_topics, created_at, updated_at, synced_at)
     VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(interest.id, interest.name, interest.description, JSON.stringify(interest.keywords ?? []), JSON.stringify(interest.relatedTopics ?? []), interest.createdAt, interest.updatedAt, new Date().toISOString());
+  `, [topic.id, topic.name, topic.description,
+        JSON.stringify(topic.keywords ?? []),
+        JSON.stringify(topic.relatedTopics ?? []),
+        topic.createdAt, topic.updatedAt,
+        new Date().toISOString()]);
 }
 export function getSyncState(db, key) {
-    const row = db.prepare('SELECT value FROM sync_state WHERE key = ?').get(key);
+    const row = db.get('SELECT value FROM sync_state WHERE key = ?', [key]);
     return row?.value ?? null;
 }
 export function setSyncState(db, key, value) {
-    db.prepare('INSERT OR REPLACE INTO sync_state (key, value) VALUES (?, ?)').run(key, value);
+    db.run('INSERT OR REPLACE INTO sync_state (key, value) VALUES (?, ?)', [key, value]);
 }

package/dist/lib/skill.js

@@ -1,4 +1,5 @@
-import { writeFileSync, mkdirSync } from 'node:fs';
+import { writeFileSync, readFileSync, existsSync, mkdirSync } from 'node:fs';
+import { createHash } from 'node:crypto';
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
 const SKILL_CONTENT = `---
@@ -8,7 +9,7 @@ homepage: https://sonar.sh
 user-invocable: true
 allowed-tools: Bash
 argument-hint: [command and options]
-metadata: {"openclaw":{"emoji":"📡","primaryEnv":"SONAR_API_KEY","requires":{"bins":["sonar"],"env":["SONAR_API_KEY"]}}}
+metadata: {"openclaw":{"emoji":"📡","requires":{"bins":["sonar"]}}}
 ---
 
 # Sonar CLI
@@ -101,7 +102,6 @@ sonar config nuke --confirm
 
 | Variable | Purpose |
 |---|---|
-| \`SONAR_API_KEY\` | API key for auth (overrides config file token) |
 | \`SONAR_API_URL\` | Backend URL (defaults to production GraphQL endpoint) |
 | \`SONAR_AI_VENDOR\` | Vendor override for AI-assisted operations (\`openai\` or \`anthropic\`) |
 | \`SONAR_FEED_RENDER\` | Default feed renderer override |
@@ -110,18 +110,33 @@ sonar config nuke --confirm
 | \`ANTHROPIC_API_KEY\` | Required when vendor is \`anthropic\` |
 `;
 const DEFAULT_INSTALL_PATH = join(homedir(), '.claude', 'skills', 'sonar', 'SKILL.md');
-export function writeSkillTo(dest, install) {
+function sha256(content) {
+    return createHash('sha256').update(content).digest('hex');
+}
+function safeWrite(target, content, force) {
+    if (existsSync(target) && !force) {
+        const existing = readFileSync(target, 'utf8');
+        if (existing === content) {
+            process.stdout.write(`SKILL.md is already up to date: ${target}\n`);
+            process.exit(0);
+        }
+        // File exists and differs — user may have customized it
+        process.stderr.write(`SKILL.md has been modified: ${target}\n` +
+            `Use --force to overwrite, or manually merge.\n` +
+            `New version hash: ${sha256(content).slice(0, 8)}\n`);
+        process.exit(1);
+    }
+    mkdirSync(dirname(target), { recursive: true });
+    writeFileSync(target, content, 'utf8');
+    process.stdout.write(`SKILL.md written to ${target}\n`);
+}
+export function writeSkillTo(dest, install, force) {
     if (install || dest === '--install') {
-        const target = DEFAULT_INSTALL_PATH;
-        mkdirSync(dirname(target), { recursive: true });
-        writeFileSync(target, SKILL_CONTENT, 'utf8');
-        process.stdout.write(`SKILL.md written to ${target}\n`);
+        safeWrite(DEFAULT_INSTALL_PATH, SKILL_CONTENT, force ?? false);
         process.exit(0);
     }
     if (dest) {
-        mkdirSync(dirname(dest), { recursive: true });
-        writeFileSync(dest, SKILL_CONTENT, 'utf8');
-        process.stdout.write(`SKILL.md written to ${dest}\n`);
+        safeWrite(dest, SKILL_CONTENT, force ?? false);
         process.exit(0);
     }
     // Default: print to stdout

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1a35e1/sonar-cli",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "description": "X social graph CLI for signal filtering and curation",
   "type": "module",
   "bin": {
@@ -21,21 +21,21 @@
     "access": "public"
   },
   "dependencies": {
-    "better-sqlite3": "^11",
     "date-fns": "4.1.0",
     "graphql": "^16.12.0",
     "graphql-request": "^7.4.0",
     "ink": "^6",
     "ink-link": "^5.0.0",
     "ink-table": "^3.1.0",
+    "node-sqlite3-wasm": "^0.8.55",
     "pastel": "^3.0.0",
     "react": "^19",
+    "unicode-animations": "^1.0.3",
     "zod": "^3.25.76"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.5",
     "@graphql-codegen/typescript-graphql-request": "^6.4.0",
-    "@types/better-sqlite3": "^7",
     "@types/node": "^22",
     "@types/react": "^19",
     "biome": "^0.3.3",

package/dist/commands/config/data/backup.js

@@ -1,74 +0,0 @@
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useState } from 'react';
-import zod from 'zod';
-import { Text } from 'ink';
-import { existsSync, mkdirSync } from 'node:fs';
-import { basename, dirname, join } from 'node:path';
-import Database from 'better-sqlite3';
-import { DB_PATH } from '../../../lib/db.js';
-import { integrityCheck } from './utils.js';
-export const options = zod.object({
-    out: zod.string().optional().describe('Backup output path (default: ~/.sonar/data-backup-<timestamp>.db)'),
-    json: zod.boolean().default(false).describe('Raw JSON output'),
-});
-function ts() {
-    const d = new Date();
-    const p = (n) => String(n).padStart(2, '0');
-    return `${d.getUTCFullYear()}${p(d.getUTCMonth() + 1)}${p(d.getUTCDate())}${p(d.getUTCHours())}${p(d.getUTCMinutes())}${p(d.getUTCSeconds())}`;
-}
-export default function DataBackup({ options: flags }) {
-    const [error, setError] = useState(null);
-    useEffect(() => {
-        async function run() {
-            try {
-                if (!existsSync(DB_PATH))
-                    throw new Error(`source database not found: ${DB_PATH}`);
-                // Use trimmed value for the actual output path to avoid confusing
-                // filesystem errors from leading/trailing whitespace.
-                const trimmedOut = flags.out?.trim();
-                const out = trimmedOut && trimmedOut.length > 0
-                    ? trimmedOut
-                    : join(dirname(DB_PATH), `${basename(DB_PATH, '.db')}-backup-${ts()}.db`);
-                mkdirSync(dirname(out), { recursive: true });
-                // Use SQLite's online backup API (better-sqlite3 wraps the C-level
-                // sqlite3_backup_* functions) instead of a plain filesystem copy.
-                // This works correctly under concurrent writes: it iterates over DB
-                // pages in a consistent snapshot without requiring an exclusive lock
-                // and without needing a prior WAL checkpoint.
-                const db = new Database(DB_PATH);
-                try {
-                    await db.backup(out);
-                }
-                finally {
-                    db.close();
-                }
-                const check = integrityCheck(out);
-                if (check !== 'ok')
-                    throw new Error(`backup integrity check failed: ${check}`);
-                const result = { ok: true, source: DB_PATH, backup: out };
-                if (flags.json) {
-                    process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
-                }
-                else {
-                    process.stdout.write(`Backup complete: ${out}\n`);
-                }
-                process.exit(0);
-            }
-            catch (e) {
-                setError(e instanceof Error ? e.message : String(e));
-            }
-        }
-        run();
-    }, []);
-    useEffect(() => {
-        if (!error)
-            return;
-        if (flags.json) {
-            process.stderr.write(`${error}\n`);
-            process.exit(1);
-        }
-    }, [error, flags.json]);
-    if (error)
-        return flags.json ? _jsx(_Fragment, {}) : _jsxs(Text, { color: "red", children: ["Error: ", error] });
-    return flags.json ? _jsx(_Fragment, {}) : _jsx(Text, { dimColor: true, children: "Creating backup..." });
-}

package/dist/commands/config/data/download.js

@@ -1,53 +0,0 @@
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useState } from 'react';
-import { Box, Text } from 'ink';
-import { unlinkSync, existsSync } from 'node:fs';
-import { gql } from '../../../lib/client.js';
-import { Spinner } from '../../../components/Spinner.js';
-import { DB_PATH, openDb, upsertTweet, upsertFeedItem, upsertSuggestion, upsertInterest, setSyncState, } from '../../../lib/db.js';
-import { FEED_QUERY, SUGGESTIONS_QUERY, INTERESTS_QUERY } from '../../../lib/data-queries.js';
-export default function DataDownload() {
-    const [result, setResult] = useState(null);
-    const [error, setError] = useState(null);
-    useEffect(() => {
-        async function run() {
-            try {
-                if (existsSync(DB_PATH))
-                    unlinkSync(DB_PATH);
-                const db = openDb();
-                const [feedResult, suggestionsResult, interestsResult] = await Promise.all([
-                    gql(FEED_QUERY, { hours: null, days: 7, limit: 500 }),
-                    gql(SUGGESTIONS_QUERY, { status: null, limit: 500 }),
-                    gql(INTERESTS_QUERY),
-                ]);
-                for (const item of feedResult.feed) {
-                    upsertTweet(db, item.tweet);
-                    upsertFeedItem(db, { tweetId: item.tweet.id, score: item.score, matchedKeywords: item.matchedKeywords });
-                }
-                for (const s of suggestionsResult.suggestions) {
-                    upsertTweet(db, s.tweet);
-                    upsertSuggestion(db, { suggestionId: s.suggestionId, tweetId: s.tweet.id, score: s.score, status: s.status, relevance: null, projectsMatched: s.projectsMatched });
-                }
-                for (const i of interestsResult.topics) {
-                    upsertInterest(db, i);
-                }
-                setSyncState(db, 'last_synced_at', new Date().toISOString());
-                db.close();
-                setResult({
-                    feedCount: feedResult.feed.length,
-                    suggestionsCount: suggestionsResult.suggestions.length,
-                    interestsCount: interestsResult.topics.length,
-                });
-            }
-            catch (err) {
-                setError(err instanceof Error ? err.message : String(err));
-            }
-        }
-        run();
-    }, []);
-    if (error)
-        return _jsxs(Text, { color: "red", children: ["Error: ", error] });
-    if (!result)
-        return _jsx(Spinner, { label: "Downloading data..." });
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Download complete" }), _jsxs(Text, { dimColor: true, children: ["  ", DB_PATH] })] }), _jsxs(Text, { children: [_jsx(Text, { color: "cyan", children: result.feedCount }), _jsx(Text, { dimColor: true, children: " feed items  " }), _jsx(Text, { color: "cyan", children: result.suggestionsCount }), _jsx(Text, { dimColor: true, children: " suggestions  " }), _jsx(Text, { color: "cyan", children: result.interestsCount }), _jsx(Text, { dimColor: true, children: " interests" })] })] }));
-}