@nitsan-ai/ragsuite-test 0.1.3 → 0.1.5

package/README.md

@@ -1,103 +1,78 @@
 # RAGSuite test CLI (`ragsuite-test`)
 
-> **TESTING PACKAGE** — temporary name before the final `ragsuite` CLI.
-
-Two ways to run. Pick one:
-
-| | **A) Git source** | **B) Docker images only** |
-|--|-------------------|---------------------------|
-| Command | `ragsuite-test init` | `ragsuite-test init --from-images` |
-| On disk | Full monorepo clone | Tiny compose bundle only |
-| App code visible? | Yes | **No** (runs in containers) |
-| Needs | git + Node; Docker *or* native Postgres/Redis | Node + **Docker** |
-| Best for | Dev, debugging, native mode, reading code | Testers / “just run the app” |
-| Pros | Native mode; full scripts; offline rebuild from source | No source leak; faster to start; smaller disk |
-| Cons | Source on disk; larger checkout | Needs published GHCR images; Docker required; no native mode |
-
----
-
-## A) Git source (clone)
+npm-style deploy: **init once**, then **start / update / stop** via host **npm scripts** — **no Docker**.
 
 ```bash
 npm install -g @nitsan-ai/ragsuite-test
+
+# First time only
 ragsuite-test init
-# clones https://github.com/nitsan-ai/RAGSUITE.git → ~/ragsuite-test
-# auto: docker if daemon up, else native
+# clones → ~/ragsuite-test
 
-ragsuite-test start --repo-root ~/ragsuite-test --detach   # docker
-# or after init --mode native:
-# ragsuite-test start --repo-root ~/ragsuite-test
+# Needs Postgres :5436 (db ragsuite_v3) and Redis :6382 on the host
+ragsuite-test start
+# API http://localhost:9090  ·  Web http://localhost:9191
 
-# API http://localhost:9090
-# Web http://localhost:9091 (docker) or :9191 (native)
-ragsuite-test stop --repo-root ~/ragsuite-test
+ragsuite-test stop
 ```
 
-### Native (no Docker) — git install only
-
-Needs Postgres `:5436` (`ragsuite_v3`) and Redis `:6382`:
+Same under the hood as:
 
 ```bash
-ragsuite-test init --mode native
-ragsuite-test start --repo-root ~/ragsuite-test
+cd ~/ragsuite-test
+npm start          # scripts/native-start.sh
+npm run stop       # scripts/native-stop.sh
 ```
 
----
+Active install is remembered in `~/.ragsuite-test/config.json`.
 
-## B) Docker images (no source on disk)
-
-**Maintainer (once):** publish images — Actions → **Publish images (GHCR)**  
-(packages: `ghcr.io/nitsan-ai/ragsuite-backend`, `…/ragsuite-frontend`)
+---
 
-**User:**
+## Upgrade (keeps data & `.env`)
 
 ```bash
-npm install -g @nitsan-ai/ragsuite-test
-ragsuite-test init --from-images
-ragsuite-test start --repo-root ~/ragsuite-test --detach
-# pulls images — does NOT clone app source
-ragsuite-test stop --repo-root ~/ragsuite-test
+npm install -g @nitsan-ai/ragsuite-test@latest
+ragsuite-test update    # git pull only
+ragsuite-test start
 ```
 
-Optional pin:
+**Never** run `docker compose down -v` or `init --force` unless you mean to wipe data.
 
-```bash
-# in ~/ragsuite-test/.env
-IMAGE_TAG=1.0.0
-IMAGE_REGISTRY=ghcr.io/nitsan-ai
-```
-
-If images are private on GHCR, make packages public or `docker login ghcr.io`.
+If you already installed and run `init` again → **Already installed** (exit OK).
 
 ---
 
-## Prerequisites
+## Prerequisites (host)
 
-| Need | Git install | Images install |
-|------|-------------|----------------|
-| Node 18+ | Yes | Yes |
-| git | Yes | No |
-| Docker | Optional | **Required** |
-| Postgres/Redis on host | Only for `--mode native` | No (in compose) |
+| Tool | Notes |
+|------|--------|
+| Node.js 18+ | |
+| Python 3 + venv | backend |
+| Yarn | Expo frontend |
+| Git | `init` clone |
+| Postgres | `localhost:5436`, database `ragsuite_v3` |
+| Redis | `localhost:6382` |
 
-SMTP/LLM: no init prompts. Real SMTP only in local `.env` (gitignored).
+Docker is **not** required for this CLI.
 
-## Ports
+---
 
-| Service | Port |
-|---------|------|
-| API | 9090 |
-| Web (Docker/images) | 9091 |
-| Web (native Expo) | 9191 |
-| Postgres | 5436 |
-| Redis | 6382 |
+## Commands
 
-## Publish CLI
+| Command | Purpose |
+|---------|---------|
+| `init` | First-time git install |
+| `start` | `scripts/native-start.sh` |
+| `stop` | `scripts/native-stop.sh` (host PIDs only) |
+| `update` | `git pull` in place |
+| `doctor` | Native prereq checks |
+| `logs` | Tail `.ragsuite/native/*.log` |
+| `version` | CLI version |
 
-See [PUBLISH.md](./PUBLISH.md). Version bump then Actions → **CLI publish**.
+## Ports
 
-## Tests
+API **9090** · Web **9191** · Postgres **5436** · Redis **6382** · Chroma **8004** (started by native-start if needed)
 
-```bash
-cd cli && npm test && npm run prepublish:check
-```
+## Publish (maintainers)
+
+See [PUBLISH.md](./PUBLISH.md).

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nitsan-ai/ragsuite-test",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "private": false,
-  "description": "RAGSuite testing CLI — init (git source) or init --from-images (pull-only, no source).",
+  "description": "RAGSuite testing CLI — init once, then start/update/stop via native npm scripts (no Docker).",
   "main": "src/index.js",
   "bin": {
     "ragsuite-test": "./bin/ragsuite-test.js"
@@ -10,7 +10,6 @@
   "files": [
     "bin/",
     "src/",
-    "templates/",
     "package.json",
     "README.md",
     "LICENSE"

package/src/commands/doctor.js

@@ -2,20 +2,22 @@
 
 const path = require('path');
 const { resolveMode } = require('../utils/config');
-const { resolveRepoRoot, isImagesInstall } = require('../utils/paths');
+const { resolveRepoRoot, assertNativeDeploy } = require('../utils/paths');
 const { runScript } = require('../utils/spawn');
+const { error } = require('../utils/log');
 
 const name = 'doctor';
-const summary = 'Run doctor checks (git or images install)';
+const summary = 'Check native deploy prerequisites';
 
 function help() {
   return `Usage: ragsuite-test doctor [options]
 
-Git install: scripts/doctor.sh
-Images install: scripts/docker-doctor-images.sh
+Runs scripts/doctor.sh with RAGSUITE_MODE=native.
+
+Postgres (:5436) and Redis (:6382) must be reachable for a real install.
+In CI smoke, runtime TCP checks are skipped unless RAGSUITE_DOCTOR_STRICT=1.
 
 Options:
-  --mode <docker|native>   Git install gate
   --repo-root <path>
   --dry-run
 `;
@@ -26,18 +28,16 @@ function run(ctx) {
     cwd: ctx.cwd,
     repoRootFlag: ctx.globals.repoRoot,
   });
-  const images = isImagesInstall(repoRoot);
-  const mode = images
-    ? 'docker'
-    : resolveMode({
-        flagMode: ctx.globals.mode,
-        repoRoot,
-        env: ctx.env,
-      });
-  const script = images ? 'docker-doctor-images.sh' : 'doctor.sh';
-  return runScript(repoRoot, path.join('scripts', script), [], {
+  try {
+    assertNativeDeploy(repoRoot);
+  } catch (err) {
+    error(err.message);
+    return 1;
+  }
+
+  return runScript(repoRoot, path.join('scripts', 'doctor.sh'), [], {
     dryRun: ctx.globals.dryRun,
-    env: { ...ctx.env, RAGSUITE_MODE: mode },
+    env: { ...ctx.env, RAGSUITE_MODE: resolveMode() },
   });
 }
 

package/src/commands/init.js

@@ -1,85 +1,97 @@
 'use strict';
 
 const path = require('path');
-const { writeConfig, CONFIG_DIR } = require('../utils/config');
+const { writeConfig, CONFIG_DIR, readConfig } = require('../utils/config');
 const {
   ensureRagsuiteDir,
   resolveRepoRoot,
-  isImagesInstall,
+  looksLikeRepoRoot,
+  isDirEmptyOrMissing,
 } = require('../utils/paths');
+const { setActiveInstall } = require('../utils/global-config');
 const { assertSupportedInstall, installHint } = require('../utils/distribution');
 const {
   DEFAULT_GIT_URL,
   defaultInstallDir,
   cloneGitToInstallDir,
 } = require('../utils/git-install');
-const { materializeImagesInstall } = require('../utils/images-install');
 const { detectOs } = require('../utils/os-detect');
-const {
-  printPrereqs,
-  resolvePreferredMode,
-} = require('../utils/prereqs');
+const { printPrereqs, resolvePreferredMode } = require('../utils/prereqs');
 const {
   generateJwtSecret,
   isPlaceholderSecret,
   writeInstallEnv,
 } = require('../utils/env-file');
 const { assertPortsFree } = require('../utils/port');
-const { info, error } = require('../utils/log');
+const { info, warn, error } = require('../utils/log');
 
 const name = 'init';
-const summary = 'Install: git clone (source) or pull-only Docker images';
+const summary = 'First-time install (git + native npm scripts). Safe if already installed.';
 
-function printSuccess(repoRoot, mode, source) {
+function printSuccess(repoRoot) {
   info('');
   info('=== Install complete ===');
   info(`  Install dir : ${repoRoot}`);
-  info(`  Source      : ${source}`);
-  info(`  Mode        : ${mode}`);
-  info(`  Config      : ${path.join(repoRoot, CONFIG_DIR, 'config.json')}`);
+  info('  Mode        : native (npm scripts — no Docker)');
   info('');
   info('  API  http://localhost:9090');
-  if (source === 'images') {
-    info('  Web  http://localhost:9091  (images / Docker nginx)');
-  } else if (mode === 'native') {
-    info('  Web  http://localhost:9191  (Expo web — native mode)');
-  } else {
-    info('  Web  http://localhost:9091  (Docker nginx)');
-  }
+  info('  Web  http://localhost:9191');
   info('');
-  info('Next steps:');
-  const detach = mode === 'docker' || source === 'images' ? ' --detach' : '';
-  info(`  1. ragsuite-test start --repo-root ${repoRoot}${detach}`);
-  info('  2. Open the Web URL above and bootstrap the first admin');
-  info(`  3. ragsuite-test doctor --repo-root ${repoRoot}`);
+  info('Next (no --repo-root needed):');
+  info('  ragsuite-test start');
+  info('  ragsuite-test stop');
+  info('  ragsuite-test update   # later upgrades, keeps data');
+  info('');
+  info('Or in the install directory:');
+  info('  npm start');
+  info('  npm run stop');
   info('');
   info(installHint());
 }
 
+function printAlreadyInstalled(repoRoot) {
+  const cfg = readConfig(repoRoot);
+  setActiveInstall(repoRoot);
+  info('');
+  info('=== Already installed ===');
+  info(`  ${repoRoot}`);
+  if (cfg) info(`  source=${cfg.source} mode=native`);
+  info('');
+  info('Use:');
+  info('  ragsuite-test start     # run the app (npm scripts)');
+  info('  ragsuite-test update    # upgrade code (keeps .env + data)');
+  info('  ragsuite-test stop');
+  info('');
+  info('Do NOT run init --force unless you intend to wipe and reinstall.');
+}
+
+function isInitializedInstall(dir) {
+  return looksLikeRepoRoot(dir) && Boolean(readConfig(dir));
+}
+
 function help() {
   return `Usage: ragsuite-test init [options]
 
-Two install styles:
+First-time setup (npm-style, no Docker):
+
+  ragsuite-test init                 # git clone → ~/ragsuite-test
+  ragsuite-test start                # scripts/native-start.sh
+
+If already installed, init exits OK and tells you to start/update.
 
-  A) Source on disk (git) — default
-       ragsuite-test init
-       Clones ${DEFAULT_GIT_URL} → ~/ragsuite-test
-       Supports --mode docker|native
+Requires host Postgres (:5436) and Redis (:6382).
 
-  B) No source (Docker images only)
-       ragsuite-test init --from-images
-       Copies a tiny compose bundle → ~/ragsuite-test
-       Pulls ghcr.io/nitsan-ai/ragsuite-backend|frontend (no git clone of app code)
+Day-to-day:
+  ragsuite-test start
+  ragsuite-test update
+  ragsuite-test stop
 
 Options:
-  --from-images            Pull-only images install (no monorepo source)
-  --from-git [url]         Clone this URL (default public repo)
-  --repo-root <path>       Configure an existing git checkout
-  --install-dir <path>     Target dir (default: ~/ragsuite-test)
-  --mode <docker|native>   Git install only (images install is always docker)
-  --force                  Overwrite non-empty install dir / existing .env
+  --from-git [url]         Clone URL (default public repo)
+  --repo-root <path>       Point at an existing checkout
+  --install-dir <path>     Default: ~/ragsuite-test
+  --force                  Wipe install dir and reinstall (destructive)
   --yes, -y                Non-interactive
-  --llm-api-key / --smtp-* Optional overrides
 `;
 }
 
@@ -100,10 +112,9 @@ function resolveLlmOverride(g, env) {
   return null;
 }
 
-function countSources(fromGit, fromImages, repoRootFlag) {
+function countSources(fromGit, repoRootFlag) {
   let n = 0;
   if (fromGit !== null && fromGit !== undefined) n += 1;
-  if (fromImages) n += 1;
   if (repoRootFlag) n += 1;
   return n;
 }
@@ -113,12 +124,34 @@ async function run(ctx) {
   const g = ctx.globals;
 
   if (g.fromRelease) {
-    error('--from-release is not supported. Use init, --from-images, --from-git, or --repo-root.');
+    error('--from-release is not supported.');
     return 1;
   }
 
-  if (countSources(g.fromGit, g.fromImages, g.repoRoot) > 1) {
-    error('Use only one of --from-images, --from-git, or --repo-root');
+  if (g.fromImages) {
+    error(
+      [
+        '--from-images was removed (Docker deployment retired).',
+        '  Use:  ragsuite-test init',
+        '  Then: ragsuite-test start',
+      ].join('\n'),
+    );
+    return 1;
+  }
+
+  if (g.mode === 'docker') {
+    error(
+      [
+        'Docker mode was removed from deployment.',
+        '  Init always uses native npm scripts (no containers).',
+        '  Omit --mode, or use --mode native.',
+      ].join('\n'),
+    );
+    return 1;
+  }
+
+  if (countSources(g.fromGit, g.repoRoot) > 1) {
+    error('Use only one of --from-git or --repo-root');
     return 1;
   }
 
@@ -126,30 +159,53 @@ async function run(ctx) {
   info(`OS: ${osInfo.label} (${osInfo.platform})`);
 
   let fromGit = g.fromGit;
-  let fromImages = Boolean(g.fromImages);
   let repoRootFlag = g.repoRoot;
-  const installDir = g.installDir || defaultInstallDir();
+  const installDir = path.resolve(g.installDir || defaultInstallDir());
+
+  if (!g.force) {
+    if (repoRootFlag && isInitializedInstall(path.resolve(repoRootFlag))) {
+      printAlreadyInstalled(path.resolve(repoRootFlag));
+      return 0;
+    }
+    if (!repoRootFlag && isInitializedInstall(installDir)) {
+      printAlreadyInstalled(installDir);
+      return 0;
+    }
+  }
 
-  if (!fromImages && fromGit === null && !repoRootFlag) {
+  if (fromGit === null && !repoRootFlag) {
     fromGit = '';
-    info(`Install style: git clone (source on disk)`);
-    info(`  ${DEFAULT_GIT_URL} → ${path.resolve(installDir)}`);
+    info(`First-time install (git): ${DEFAULT_GIT_URL}`);
+    info(`  → ${installDir}`);
   }
 
-  if (fromImages) {
-    info('Install style: Docker images only (no app source on disk)');
-    info(`  Target: ${path.resolve(installDir)}`);
+  if (
+    !g.force &&
+    !repoRootFlag &&
+    looksLikeRepoRoot(installDir) &&
+    !readConfig(installDir)
+  ) {
+    info(`Found existing source at ${installDir} — finishing setup (no re-clone).`);
+    repoRootFlag = installDir;
+    fromGit = null;
   }
 
-  let mode;
-  if (fromImages) {
-    mode = 'docker';
-  } else {
-    mode = g.mode || resolvePreferredMode(null);
+  if (!g.force && !isDirEmptyOrMissing(installDir) && !looksLikeRepoRoot(installDir) && !repoRootFlag) {
+    error(
+      [
+        `Directory exists but is not a RAGSuite install: ${installDir}`,
+        '  Fix leftover files, or:',
+        '    ragsuite-test init --force          # wipe & reinstall (destructive)',
+        '    ragsuite-test init --install-dir ~/ragsuite-test-2',
+      ].join('\n'),
+    );
+    return 1;
   }
-  info(`Run mode: ${mode}`);
 
-  const needGit = !fromImages && fromGit !== null && fromGit !== undefined;
+  const mode = resolvePreferredMode();
+  info(`Run mode: ${mode} (npm scripts — Docker not used)`);
+
+  const needGit = fromGit !== null && fromGit !== undefined;
   if (!printPrereqs(mode, { needGit })) {
     error('Fix prerequisites above and re-run init');
     return 1;
@@ -157,7 +213,6 @@ async function run(ctx) {
 
   const jwtSecret = generateJwtSecret();
   info(`JWT_SECRET_KEY will be auto-generated (…${jwtSecret.slice(-8)})`);
-  info('SMTP + LLM: from .env.example into .env (no prompts).');
 
   const llmKey = resolveLlmOverride(g, ctx.env);
   const smtp = optionalSmtpOverrides(g, ctx.env);
@@ -175,31 +230,17 @@ async function run(ctx) {
   let source = 'checkout';
 
   try {
-    if (fromImages) {
-      const result = materializeImagesInstall({
-        installDir,
-        force: g.force,
-      });
-      repoRoot = result.repoRoot;
-      source = 'images';
-      info(`Images bundle installed at ${repoRoot}`);
-    } else if (fromGit !== null && fromGit !== undefined) {
+    if (fromGit !== null && fromGit !== undefined) {
       const url = fromGit === '' ? DEFAULT_GIT_URL : fromGit;
-      info(`Cloning ${url} → ${path.resolve(installDir)}`);
-      const result = cloneGitToInstallDir(url, {
-        installDir,
-        force: g.force,
-      });
+      const result = cloneGitToInstallDir(url, { installDir, force: g.force });
       repoRoot = result.repoRoot;
       source = 'git';
-      info(`Installed app at ${repoRoot}`);
     } else {
       repoRoot = resolveRepoRoot({
         cwd: ctx.cwd,
         repoRootFlag,
         env: ctx.env,
       });
-      if (isImagesInstall(repoRoot)) source = 'images';
     }
   } catch (err) {
     error(err.message || String(err));
@@ -208,11 +249,12 @@ async function run(ctx) {
 
   ensureRagsuiteDir(repoRoot);
   const cfg = writeConfig(repoRoot, {
-    mode,
+    mode: 'native',
     source,
     repoRoot,
     installDir: repoRoot,
   });
+  setActiveInstall(repoRoot);
 
   try {
     writeInstallEnv(repoRoot, {
@@ -222,17 +264,19 @@ async function run(ctx) {
       smtp,
     });
   } catch (err) {
-    if (err.code === 'ENV_EXISTS' || err.code === 'ENV_INCOMPLETE') {
+    if (err.code === 'ENV_EXISTS') {
+      warn('.env already present — keeping it (use --force only if you want to regenerate).');
+    } else if (err.code === 'ENV_INCOMPLETE') {
       error(err.message);
       return 1;
+    } else {
+      error(err.message || String(err));
+      return 1;
     }
-    error(err.message || String(err));
-    return 1;
   }
 
-  info(`Wrote ${path.join(repoRoot, CONFIG_DIR, 'config.json')}`);
-  info(`  mode=${cfg.mode} source=${cfg.source}`);
-  printSuccess(repoRoot, mode, source);
+  info(`Config: mode=${cfg.mode} source=${cfg.source}`);
+  printSuccess(repoRoot);
   return 0;
 }
 

package/src/commands/logs.js

@@ -2,23 +2,20 @@
 
 const fs = require('fs');
 const path = require('path');
-const { resolveMode } = require('../utils/config');
-const { resolveRepoRoot, nativeLogDir } = require('../utils/paths');
+const { resolveRepoRoot, nativeLogDir, assertNativeDeploy } = require('../utils/paths');
 const { runCommand } = require('../utils/spawn');
 const { error, info } = require('../utils/log');
 
 const name = 'logs';
-const summary = 'Follow Docker compose or native process logs';
+const summary = 'Follow native process logs';
 
 function help() {
   return `Usage: ragsuite-test logs [options]
 
-Docker mode: docker compose logs -f (same as root npm run logs).
-Native mode: tail -f .ragsuite/native/*.log when present.
+Tails .ragsuite/native/*.log (host processes — no Docker).
 
 Options:
-  --mode <docker|native>   Override config / RAGSUITE_MODE
-  --repo-root <path>       Monorepo root
+  --repo-root <path>       Install root
   --dry-run                Print the command and exit 0
 `;
 }
@@ -28,36 +25,27 @@ function run(ctx) {
     cwd: ctx.cwd,
     repoRootFlag: ctx.globals.repoRoot,
   });
-  const mode = resolveMode({
-    flagMode: ctx.globals.mode,
-    repoRoot,
-    env: ctx.env,
-  });
-
-  if (mode === 'native') {
-    const dir = nativeLogDir(repoRoot);
-    let logs = [];
-    if (fs.existsSync(dir)) {
-      logs = fs
-        .readdirSync(dir)
-        .filter((f) => f.endsWith('.log'))
-        .map((f) => path.join(dir, f));
-    }
-    if (logs.length === 0) {
-      error(
-        `No native log files under ${dir}. Start with mode=native first, or use --mode docker.`,
-      );
-      return 1;
-    }
-    info(`Following ${logs.length} native log file(s)…`);
-    return runCommand('tail', ['-f', ...logs], {
-      cwd: repoRoot,
-      dryRun: ctx.globals.dryRun,
-      env: ctx.env,
-    });
+  try {
+    assertNativeDeploy(repoRoot);
+  } catch (err) {
+    error(err.message);
+    return 1;
   }
 
-  return runCommand('docker', ['compose', 'logs', '-f'], {
+  const dir = nativeLogDir(repoRoot);
+  let logs = [];
+  if (fs.existsSync(dir)) {
+    logs = fs
+      .readdirSync(dir)
+      .filter((f) => f.endsWith('.log'))
+      .map((f) => path.join(dir, f));
+  }
+  if (logs.length === 0) {
+    error(`No native log files under ${dir}. Start with: ragsuite-test start`);
+    return 1;
+  }
+  info(`Following ${logs.length} native log file(s)…`);
+  return runCommand('tail', ['-f', ...logs], {
     cwd: repoRoot,
     dryRun: ctx.globals.dryRun,
     env: ctx.env,