reeboot 1.3.2 → 1.3.4

package/dist/wizard/steps/web-search.js

@@ -31,7 +31,7 @@ export async function runWebSearchStep(opts) {
         return { provider: 'none', apiKey: '', searxngBaseUrl: '' };
     }
     if (provider === 'searxng') {
-        return await runSearXNGSubflow();
+        return await runSearXNGSubflow(prompter);
     }
     // API-key providers: Brave, Tavily, Serper, Exa
     const envVar = SEARCH_ENV_VARS[provider] ?? 'API_KEY';
@@ -43,7 +43,9 @@ export async function runWebSearchStep(opts) {
     return { provider, apiKey, searxngBaseUrl: '' };
 }
 // ─── SearXNG sub-flow ─────────────────────────────────────────────────────────
-async function runSearXNGSubflow() {
+const SEARXNG_PORT = 8888;
+const SEARXNG_DEFAULT_URL = `http://localhost:${SEARXNG_PORT}`;
+async function runSearXNGSubflow(prompter) {
     const { checkDockerStatus } = await import('../../utils/docker.js');
     const dockerStatus = await checkDockerStatus();
     if (dockerStatus === 'not-installed') {
@@ -57,10 +59,35 @@ async function runSearXNGSubflow() {
         console.log('  ℹ Using DuckDuckGo as fallback. Run `reeboot search setup searxng` later.\n');
         return { provider: 'duckduckgo', apiKey: '', searxngBaseUrl: '' };
     }
-    // Docker is running — start the SearXNG container
+    // Probe for an already-running SearXNG instance
+    const { probeSearXNG } = await import('../probe-searxng.js');
+    const detected = await probeSearXNG();
+    // Ask user to confirm or edit the URL
+    const urlMessage = detected
+        ? '  SearXNG URL (confirm or edit):'
+        : '  SearXNG URL:';
+    const defaultUrl = detected ?? SEARXNG_DEFAULT_URL;
+    const searxngUrl = await prompter.input({
+        message: urlMessage,
+        default: defaultUrl,
+        validate: (val) => val.trim().length > 0 ? true : 'URL cannot be empty',
+    });
+    // Ask whether to use URL directly or start a new container
+    const action = await prompter.select({
+        message: '  What would you like to do?',
+        choices: [
+            { name: 'Use this URL directly', value: 'use-url' },
+            { name: `Start new reeboot-searxng container on port ${SEARXNG_PORT}`, value: 'start-new' },
+        ],
+        default: 'use-url',
+    });
+    if (action === 'use-url') {
+        console.log(`  ✓ Using SearXNG at ${searxngUrl}\n`);
+        return { provider: 'searxng', apiKey: '', searxngBaseUrl: searxngUrl };
+    }
+    // Start new container
     console.log('  Starting reeboot-searxng container...');
     const { spawnSync } = await import('child_process');
-    const SEARXNG_PORT = 8888;
     // Remove any existing container
     spawnSync('docker', ['rm', '-f', 'reeboot-searxng'], { stdio: 'pipe' });
     const start = spawnSync('docker', [
@@ -74,11 +101,7 @@ async function runSearXNGSubflow() {
         console.log('  ✗ SearXNG failed to start — using DuckDuckGo instead.\n');
         return { provider: 'duckduckgo', apiKey: '', searxngBaseUrl: '' };
     }
-    console.log(`  ✓ SearXNG running at http://localhost:${SEARXNG_PORT}\n`);
-    return {
-        provider: 'searxng',
-        apiKey: '',
-        searxngBaseUrl: `http://localhost:${SEARXNG_PORT}`,
-    };
+    console.log(`  ✓ SearXNG running at ${SEARXNG_DEFAULT_URL}\n`);
+    return { provider: 'searxng', apiKey: '', searxngBaseUrl: SEARXNG_DEFAULT_URL };
 }
 //# sourceMappingURL=web-search.js.map

package/dist/wizard/steps/web-search.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../../src/wizard/steps/web-search.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../../src/wizard/steps/web-search.ts"],"names":[],"mappings":"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"}

package/extensions/web-search.ts

@@ -392,9 +392,8 @@ export async function searchBackend(
 
 // ─── Extension Default Export ─────────────────────────────────────────────────
 
-export default async function webSearchExtension(pi: ExtensionAPI): Promise<void> {
-  const config = (pi.getConfig() as any);
-  const searchConfig: SearchConfig = config?.search ?? {};
+export default async function webSearchExtension(pi: ExtensionAPI, reebotConfig?: any): Promise<void> {
+  const searchConfig: SearchConfig = reebotConfig?.search ?? {};
   const rawProvider: string = searchConfig.provider ?? 'none';
 
   // SearXNG startup health-check — fall back to DDG if unreachable

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reeboot",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Personal AI agent running locally, reachable via WhatsApp, Signal, or WebChat",
   "author": "Bogdan Nenu",
   "license": "MIT",
@@ -36,7 +36,9 @@
     "build": "tsc",
     "dev": "tsx src/index.ts",
     "test": "vitest",
-    "test:ui": "vitest --ui"
+    "test:ui": "vitest --ui",
+    "test:run": "vitest run",
+    "check": "npm run build && npm run test:run"
   },
   "dependencies": {
     "@fastify/static": "^9.0.0",