@nitsan-ai/ragsuite-test 0.1.3 → 0.1.5

package/src/utils/paths.js

@@ -1,13 +1,22 @@
 'use strict';
 
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 const { readConfig, CONFIG_DIR } = require('./config');
+const { getActiveInstall, setActiveInstall } = require('./global-config');
+
+/** Default app install dir (npm-CLI style home install). */
+function defaultInstallDir() {
+  return path.join(os.homedir(), 'ragsuite-test');
+}
 
 function looksLikeGitCheckout(dir) {
-  const start = path.join(dir, 'scripts', 'docker-start.sh');
   const pkg = path.join(dir, 'package.json');
-  return fs.existsSync(start) && fs.existsSync(pkg);
+  const native = path.join(dir, 'scripts', 'native-start.sh');
+  const docker = path.join(dir, 'scripts', 'docker-start.sh');
+  // Prefer native marker; still recognize older checkouts that only had docker-start.sh
+  return fs.existsSync(pkg) && (fs.existsSync(native) || fs.existsSync(docker));
 }
 
 function looksLikeImagesInstall(dir) {
@@ -23,46 +32,40 @@ function looksLikeImagesInstall(dir) {
       /* fall through */
     }
   }
-  // Before config is written, or force-detect by scripts present without docker-start.sh
-  return !fs.existsSync(path.join(dir, 'scripts', 'docker-start.sh'));
+  return !fs.existsSync(path.join(dir, 'scripts', 'native-start.sh'));
 }
 
 function looksLikeRepoRoot(dir) {
-  return looksLikeGitCheckout(dir) || looksLikeImagesInstall(dir);
+  return looksLikeGitCheckout(dir);
 }
 
 function looksLikeFullBundleRoot(dir) {
-  if (!looksLikeGitCheckout(dir)) return false;
-  const compose = path.join(dir, 'docker-compose.yml');
-  return fs.existsSync(compose);
+  return looksLikeGitCheckout(dir);
 }
 
 function walkUpForRepoRoot(startDir) {
   let current = path.resolve(startDir);
   for (;;) {
-    if (looksLikeRepoRoot(current)) {
-      return current;
-    }
+    if (looksLikeRepoRoot(current)) return current;
     const parent = path.dirname(current);
-    if (parent === current) {
-      return null;
-    }
+    if (parent === current) return null;
     current = parent;
   }
 }
 
 function envRepoRoot(env = process.env) {
-  const candidates = [env.RAGSUITE_REPO_ROOT, env.RAGSUITE_INSTALL_DIR];
-  for (const raw of candidates) {
+  for (const raw of [env.RAGSUITE_REPO_ROOT, env.RAGSUITE_INSTALL_DIR]) {
     if (!raw || !String(raw).trim()) continue;
     const root = path.resolve(String(raw).trim());
-    if (looksLikeRepoRoot(root)) {
-      return root;
-    }
+    if (looksLikeRepoRoot(root)) return root;
   }
   return null;
 }
 
+/**
+ * Resolve install root (npm-CLI style):
+ * --repo-root → env → cwd walk-up → ~/.ragsuite-test active install → ~/ragsuite-test
+ */
 function resolveRepoRoot({
   cwd = process.cwd(),
   repoRootFlag,
@@ -73,16 +76,18 @@ function resolveRepoRoot({
     const root = path.resolve(repoRootFlag);
     if (!looksLikeRepoRoot(root)) {
       const err = new Error(
-        `Not a RAGSuite install root: ${root} (need git checkout or images install)`,
+        `Not a RAGSuite install: ${root}. Run: ragsuite-test init`,
       );
       err.code = 'NOT_REPO_ROOT';
       throw err;
     }
+    setActiveInstall(root);
     return root;
   }
 
   const fromEnv = envRepoRoot(env);
   if (fromEnv) {
+    setActiveInstall(fromEnv);
     return fromEnv;
   }
 
@@ -94,21 +99,40 @@ function resolveRepoRoot({
         for (const key of ['repoRoot', 'installDir']) {
           const candidate = cfg[key];
           if (candidate && looksLikeRepoRoot(candidate)) {
-            return path.resolve(candidate);
+            const resolved = path.resolve(candidate);
+            setActiveInstall(resolved);
+            return resolved;
           }
         }
       }
+      setActiveInstall(walked);
       return walked;
     }
   }
 
   const walked = walkUpForRepoRoot(cwd);
   if (walked) {
+    setActiveInstall(walked);
     return walked;
   }
 
+  const active = getActiveInstall();
+  if (active && looksLikeRepoRoot(active)) {
+    return active;
+  }
+
+  const fallback = defaultInstallDir();
+  if (looksLikeRepoRoot(fallback)) {
+    setActiveInstall(fallback);
+    return fallback;
+  }
+
   const err = new Error(
-    'Could not find RAGSuite install. Run: ragsuite-test init   OR   ragsuite-test init --from-images',
+    [
+      'No RAGSuite install found.',
+      '  First time:  ragsuite-test init',
+      '  Then:        ragsuite-test start',
+    ].join('\n'),
   );
   err.code = 'NOT_REPO_ROOT';
   throw err;
@@ -134,7 +158,40 @@ function isImagesInstall(repoRoot) {
   return looksLikeImagesInstall(repoRoot) && !looksLikeGitCheckout(repoRoot);
 }
 
+/**
+ * Reject legacy images-only installs (Docker deployment removed).
+ */
+function assertNativeDeploy(repoRoot) {
+  if (isImagesInstall(repoRoot)) {
+    const err = new Error(
+      [
+        'This install was created with --from-images (Docker). That path was removed.',
+        '  Your Docker volumes were NOT touched.',
+        '  Reinstall with source + native npm scripts:',
+        '    ragsuite-test init --install-dir ~/ragsuite-test-native',
+        '    ragsuite-test start',
+      ].join('\n'),
+    );
+    err.code = 'IMAGES_REMOVED';
+    throw err;
+  }
+  const native = path.join(repoRoot, 'scripts', 'native-start.sh');
+  if (!fs.existsSync(native)) {
+    const err = new Error(
+      `Missing scripts/native-start.sh in ${repoRoot}. Run: ragsuite-test update  (or re-init)`,
+    );
+    err.code = 'NATIVE_SCRIPT_MISSING';
+    throw err;
+  }
+}
+
+function isDirEmptyOrMissing(dir) {
+  if (!fs.existsSync(dir)) return true;
+  return fs.readdirSync(dir).filter((n) => n !== '.DS_Store').length === 0;
+}
+
 module.exports = {
+  defaultInstallDir,
   looksLikeRepoRoot,
   looksLikeGitCheckout,
   looksLikeImagesInstall,
@@ -146,4 +203,6 @@ module.exports = {
   ensureRagsuiteDir,
   nativeLogDir,
   isImagesInstall,
+  assertNativeDeploy,
+  isDirEmptyOrMissing,
 };

package/src/utils/port.js

@@ -66,15 +66,14 @@ async function assertPortsFree(ports = DEFAULT_INSTALL_PORTS) {
         'Free them, then retry. This CLI will not kill foreign processes.',
         '',
         'If a previous RAGSuite install is running:',
-        '  ragsuite-test stop --repo-root ~/ragsuite-test',
-        '  # or from a monorepo checkout: cd <checkout> && npm run down',
+        '  ragsuite-test stop',
+        '  # or: npm run stop',
         '',
         'See what owns the ports (macOS/Linux):',
         '  lsof -nP -iTCP:9090 -sTCP:LISTEN',
-        '  lsof -nP -iTCP:9091 -sTCP:LISTEN',
+        '  lsof -nP -iTCP:9191 -sTCP:LISTEN',
         '  lsof -nP -iTCP:5436 -sTCP:LISTEN',
         '  lsof -nP -iTCP:6382 -sTCP:LISTEN',
-        '  docker ps',
       ].join('\n'),
     );
     err.code = 'PORT_IN_USE';

package/src/utils/prereqs.js

@@ -1,59 +1,40 @@
 'use strict';
 
 const { spawnSync } = require('child_process');
-const { info, warn, error } = require('./log');
+const { info, error } = require('./log');
 
 function commandExists(cmd) {
   const r = spawnSync('which', [cmd], { encoding: 'utf8' });
   return r.status === 0;
 }
 
-function dockerDaemonRunning() {
-  const r = spawnSync('docker', ['info'], {
-    encoding: 'utf8',
-    stdio: ['ignore', 'pipe', 'pipe'],
-  });
-  return r.status === 0;
-}
-
 function nodeMajorOk() {
   const major = Number(String(process.versions.node).split('.')[0]);
   return Number.isFinite(major) && major >= 18;
 }
 
-/**
- * How to install a missing prerequisite (shown in doctor/init).
- */
 function installHintFor(issueKey) {
   const hints = {
     node: 'Install Node 18+: https://nodejs.org/ or `brew install node` / `sudo apt install nodejs`',
-    docker:
-      'Docker is optional. Install Docker Desktop, OR use --mode native (Postgres :5436 + Redis :6382 on the host).',
-    'docker-compose': 'Install Docker Desktop (includes compose) or the docker compose plugin.',
     python3: 'Install Python 3: `brew install python` / `sudo apt install python3 python3-venv`',
-    yarn: 'Optional: `corepack enable && corepack prepare yarn@stable --activate` or `npm i -g yarn`',
+    yarn: '`corepack enable && corepack prepare yarn@stable --activate` or `npm i -g yarn`',
     git: 'Install git: macOS `xcode-select --install` / `brew install git`; Linux `sudo apt install git`',
     postgres:
-      'Native mode: Postgres on localhost:5436, db ragsuite_v3. Example: `brew install postgresql@15` then create DB/user.',
-    redis: 'Native mode: Redis on localhost:6382. Example: `brew install redis` then `redis-server --port 6382`.',
+      'Postgres on localhost:5436, db ragsuite_v3. Example: `brew install postgresql@15` then create DB/user.',
+    redis: 'Redis on localhost:6382. Example: `brew install redis` then `redis-server --port 6382`.',
   };
   return hints[issueKey] || null;
 }
 
-/**
- * Pick run mode when user did not pass --mode.
- * Docker is never required — prefer native if Docker is unavailable.
- */
-function resolvePreferredMode(flagMode) {
-  if (flagMode === 'docker' || flagMode === 'native') return flagMode;
-  if (commandExists('docker') && dockerDaemonRunning()) return 'docker';
+/** Deployment is always native (npm scripts). */
+function resolvePreferredMode() {
   return 'native';
 }
 
 /**
- * Check prerequisites for install mode. Returns { ok, issues[], notes[], hints[] }.
+ * Check prerequisites for native deploy. Returns { ok, issues[], notes[], hints[] }.
  */
-function checkPrereqs(mode = 'native', options = {}) {
+function checkPrereqs(_mode = 'native', options = {}) {
   const { needGit = false } = options;
   const issues = [];
   const notes = [];
@@ -73,44 +54,28 @@ function checkPrereqs(mode = 'native', options = {}) {
 
   if (needGit) {
     if (!commandExists('git')) {
-      pushIssue('git not found (required for --from-git)', 'git');
+      pushIssue('git not found (required for init)', 'git');
     } else {
       notes.push('git present');
     }
   }
 
-  if (mode === 'docker') {
-    if (!commandExists('docker')) {
-      pushIssue('Docker CLI not found', 'docker');
-    } else if (!dockerDaemonRunning()) {
-      pushIssue('Docker daemon not running — start Docker Desktop / dockerd', 'docker');
-    } else {
-      notes.push('Docker CLI + daemon OK');
-      const compose = spawnSync('docker', ['compose', 'version'], { encoding: 'utf8' });
-      if (compose.status !== 0) {
-        pushIssue('docker compose plugin not available', 'docker-compose');
-      } else {
-        notes.push('docker compose OK');
-      }
-    }
+  notes.push('Deploy mode=native (Docker is not used)');
+  if (!commandExists('python3')) {
+    pushIssue('python3 not found', 'python3');
   } else {
-    notes.push('Mode=native — Docker is NOT required');
-    if (!commandExists('python3')) {
-      pushIssue('python3 not found (required for native mode)', 'python3');
-    } else {
-      notes.push('python3 present');
-    }
-    if (!commandExists('yarn')) {
-      notes.push('yarn missing — enable with corepack or npm i -g yarn');
-      const h = installHintFor('yarn');
-      if (h) hints.push(h);
-    } else {
-      notes.push('yarn present');
-    }
-    notes.push('Need Postgres :5436 (ragsuite_v3) and Redis :6382 on this machine');
-    hints.push(installHintFor('postgres'));
-    hints.push(installHintFor('redis'));
+    notes.push('python3 present');
   }
+  if (!commandExists('yarn')) {
+    notes.push('yarn missing — enable with corepack or npm i -g yarn');
+    const h = installHintFor('yarn');
+    if (h) hints.push(h);
+  } else {
+    notes.push('yarn present');
+  }
+  notes.push('Need Postgres :5436 (ragsuite_v3) and Redis :6382 on this machine');
+  hints.push(installHintFor('postgres'));
+  hints.push(installHintFor('redis'));
 
   if (process.platform === 'win32') {
     notes.push('Windows: use WSL or Git Bash — start/stop spawn bash scripts');
@@ -124,9 +89,9 @@ function checkPrereqs(mode = 'native', options = {}) {
   };
 }
 
-function printPrereqs(mode, options = {}) {
+function printPrereqs(mode = 'native', options = {}) {
   const { ok, issues, notes, hints } = checkPrereqs(mode, options);
-  info(`Prerequisites (mode=${mode}):`);
+  info('Prerequisites (native / npm scripts):');
   for (const n of notes) info(`  ✓ ${n}`);
   for (const i of issues) error(`  ✗ ${i}`);
   if (hints.length) {
@@ -134,16 +99,11 @@ function printPrereqs(mode, options = {}) {
     info('How to get missing pieces:');
     for (const h of hints) info(`  → ${h}`);
   }
-  if (!ok && mode === 'docker') {
-    warn('');
-    warn('Docker is optional. Re-run with --mode native if you prefer host Postgres/Redis (no Docker).');
-  }
   return ok;
 }
 
 module.exports = {
   commandExists,
-  dockerDaemonRunning,
   nodeMajorOk,
   installHintFor,
   resolvePreferredMode,

package/src/utils/images-install.js

@@ -1,100 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const { defaultInstallDir } = require('./git-install');
-
-function templatesRoot() {
-  return path.join(__dirname, '..', '..', 'templates', 'images');
-}
-
-function isDirEmptyOrMissing(dir) {
-  if (!fs.existsSync(dir)) return true;
-  const items = fs.readdirSync(dir).filter((n) => n !== '.DS_Store');
-  return items.length === 0;
-}
-
-function copyFile(src, dest) {
-  fs.mkdirSync(path.dirname(dest), { recursive: true });
-  fs.copyFileSync(src, dest);
-}
-
-/**
- * Materialize a pull-only install dir (compose + scripts + .env.example).
- * No monorepo source.
- */
-function materializeImagesInstall(options = {}) {
-  const { installDir = defaultInstallDir(), force = false } = options;
-  const srcRoot = templatesRoot();
-  if (!fs.existsSync(path.join(srcRoot, 'docker-compose.yml'))) {
-    const err = new Error(
-      `Images templates missing in CLI package (${srcRoot}). Reinstall @nitsan-ai/ragsuite-test.`,
-    );
-    err.code = 'IMAGES_TEMPLATE_MISSING';
-    throw err;
-  }
-
-  const target = path.resolve(installDir);
-  if (!isDirEmptyOrMissing(target)) {
-    if (!force) {
-      const err = new Error(
-        `Install directory is not empty: ${target}. Pass --force to replace, or choose another --install-dir.`,
-      );
-      err.code = 'INSTALL_DIR_NONEMPTY';
-      throw err;
-    }
-    fs.rmSync(target, { recursive: true, force: true });
-  }
-
-  fs.mkdirSync(target, { recursive: true });
-  copyFile(
-    path.join(srcRoot, 'docker-compose.yml'),
-    path.join(target, 'docker-compose.yml'),
-  );
-  copyFile(
-    path.join(srcRoot, '.env.example'),
-    path.join(target, '.env.example'),
-  );
-  copyFile(
-    path.join(srcRoot, 'scripts', 'docker-start-images.sh'),
-    path.join(target, 'scripts', 'docker-start-images.sh'),
-  );
-  copyFile(
-    path.join(srcRoot, 'scripts', 'docker-stop-images.sh'),
-    path.join(target, 'scripts', 'docker-stop-images.sh'),
-  );
-  copyFile(
-    path.join(srcRoot, 'scripts', 'docker-doctor-images.sh'),
-    path.join(target, 'scripts', 'docker-doctor-images.sh'),
-  );
-  try {
-    fs.chmodSync(path.join(target, 'scripts', 'docker-start-images.sh'), 0o755);
-    fs.chmodSync(path.join(target, 'scripts', 'docker-stop-images.sh'), 0o755);
-    fs.chmodSync(path.join(target, 'scripts', 'docker-doctor-images.sh'), 0o755);
-  } catch {
-    /* windows */
-  }
-
-  // Minimal package.json so tooling can identify the install dir
-  fs.writeFileSync(
-    path.join(target, 'package.json'),
-    `${JSON.stringify(
-      {
-        name: 'ragsuite-images-install',
-        private: true,
-        description: 'RAGSuite pull-only images install (no source tree)',
-      },
-      null,
-      2,
-    )}\n`,
-    'utf8',
-  );
-
-  return { repoRoot: target };
-}
-
-module.exports = {
-  templatesRoot,
-  materializeImagesInstall,
-  defaultInstallDir,
-};

package/templates/images/.env.example

@@ -1,76 +0,0 @@
-# RAGSuite Server — copy to .env:  cp .env.example .env
-# Never commit .env.
-#
-# Used by docker compose (backend + worker env_file) and native-start (host process).
-# Compose injects DATABASE_URL, REDIS_HOST/PORT, CHROMA_* for containers — those override
-# anything duplicated here when using Docker mode.
-# For native mode (npm run start:native), set the Native block below (or rely on script defaults).
-
-# --- Required secrets ---
-# JWT is regenerated by `ragsuite-test init` (do not put real secrets here — use .env).
-JWT_SECRET_KEY=change-me-use-a-long-random-secret-in-production
-# First-run default (not a cloud vendor key). Override in .env anytime.
-CUSTOM_LLM_INTERNAL_API_KEY=ragsuite-default-llm-internal-key
-
-# --- Transactional email (invites, 2FA, password reset) ---
-# Template only — real SMTP_USER / SMTP_PASSWORD / EMAIL_FROM belong in .env (gitignored).
-# `ragsuite-test init` copies this file to .env and does NOT ask for SMTP.
-SMTP_HOST=smtp.gmail.com
-SMTP_PORT=587
-SMTP_USER=your-smtp-user@example.com
-SMTP_PASSWORD=change-me-app-password-or-smtp-secret
-SMTP_USE_TLS=true
-EMAIL_FROM=your-smtp-user@example.com
-
-# --- Frontend Docker build (baked into env.json at image build) ---
-FRONTEND_API_URL=http://localhost:9090
-# Optional: public origin that serves /widget assets (defaults to FRONTEND_API_URL in Dockerfile)
-# WIDGET_ASSET_BASE=
-
-# --- App policy ---
-HF_HUB_OFFLINE=1
-SSO_ENABLED=false
-SSO_REQUIRE_REDIS=true
-
-# --- RAG / ingest (optional) ---
-ENABLE_ASYNC_DOCUMENT_INGEST=true
-EMBEDDING_PREFERRED_SOURCE=chat
-COMPARE_MODEL_CONFIG_SOURCE=chat
-
-# --- Optional: Docker host-port overrides (defaults match npm start) ---
-# API_PORT=9090
-# WEB_PORT=9091
-# POSTGRES_HOST_PORT=5436
-# REDIS_HOST_PORT=6382
-
-# --- Optional: Compose Postgres credentials (defaults: ragsuite / ragsuite / ragsuite_v3) ---
-# POSTGRES_USER=ragsuite
-# POSTGRES_PASSWORD=ragsuite
-# POSTGRES_DB=ragsuite_v3
-
-# --- Optional: App URL / CORS (compose sets local defaults for Docker) ---
-# CORS_ORIGINS=http://localhost:9091
-# FRONTEND_BASE_URL=http://localhost:9091
-# PUBLIC_API_BASE_URL=http://localhost:9090/api/v1
-# SSO_CALLBACK_BASE_URL=http://localhost:9090/api/v1/auth/sso/callback
-
-# --- Native mode (npm run start:native) — host Postgres/Redis/Chroma ---
-# Do not use Docker service DNS names (postgres/redis/chromadb) on the host.
-# DATABASE_URL=postgresql://ragsuite:ragsuite@localhost:5436/ragsuite_v3
-# REDIS_HOST=localhost
-# REDIS_PORT=6382
-# CHROMA_MODE=http
-# CHROMA_HOST=127.0.0.1
-# CHROMA_PORT=8004
-# CHROMA_PERSIST_PATH=data/chroma_db
-# CORS_ORIGINS=http://localhost:9191,http://127.0.0.1:9191,http://localhost:9091
-# FRONTEND_BASE_URL=http://localhost:9191
-# PUBLIC_API_BASE_URL=http://localhost:9090/api/v1
-# EXPO_DEV_SERVER_PORT=9191
-# RAGSUITE_MODE=native
-
-# Advanced tuning: backend/docs/backend/configuration.md
-
-# --- Images install (init --from-images) ---
-# IMAGE_REGISTRY=ghcr.io/nitsan-ai
-# IMAGE_TAG=latest