vault-cortex 0.7.0 → 0.9.0-beta.43

package/dist/scaffold.js

@@ -8,6 +8,8 @@ const ENV_PORT_LINE = /^PORT=(\d+)\s*$/m;
 const ENV_VAULT_PATH_LINE = /^VAULT_PATH=(.+)\s*$/m;
 /** Matches an active (uncommented) PUBLIC_URL line. */
 const ENV_PUBLIC_URL_LINE = /^PUBLIC_URL=/m;
+/** Matches an active (uncommented) PUBLIC_URL line, capturing a non-empty value. */
+const ENV_PUBLIC_URL_VALUE_LINE = /^PUBLIC_URL=(.+)\s*$/m;
 /** Matches an active (uncommented) OBSIDIAN_AUTH_TOKEN line. */
 const OBSIDIAN_AUTH_TOKEN_LINE = /^OBSIDIAN_AUTH_TOKEN=/m;
 export const buildFilesToWrite = (envContent) => [
@@ -46,6 +48,21 @@ export const hasEnvPublicUrl = (envFilePath) => {
         return false;
     return ENV_PUBLIC_URL_LINE.test(readFileSync(envFilePath, "utf8"));
 };
+/**
+ * Reads the public URL value from a .env file. Returns undefined when the
+ * file is missing or has no uncommented, non-empty PUBLIC_URL line —
+ * deliberately stricter than hasEnvPublicUrl, whose job is old-compose
+ * detection and so matches an empty `PUBLIC_URL=` line too.
+ */
+export const readEnvPublicUrl = (envFilePath) => {
+    if (!existsSync(envFilePath))
+        return undefined;
+    const match = ENV_PUBLIC_URL_VALUE_LINE.exec(readFileSync(envFilePath, "utf8"));
+    // A whitespace-only line matches the regex and trims to "" — normalize to
+    // undefined so the non-empty contract holds ("" is never a legitimate URL).
+    const publicUrlValue = match?.[1].trim();
+    return publicUrlValue || undefined;
+};
 /**
  * Detects the deployment mode from a .env file. Remote mode requires
  * OBSIDIAN_AUTH_TOKEN (absent from local). Returns undefined when the

package/dist/upgrade.js

@@ -1,35 +1,19 @@
-import { join, resolve } from "node:path";
-import { CONTAINER_NAME, LOCAL_IMAGE, REMOTE_IMAGE, pollHealth, } from "./docker.js";
-import { detectMode, hasEnvPublicUrl, readEnvPort, readEnvVaultPath, } from "./scaffold.js";
-import { expandTilde } from "./vault.js";
-const DEFAULT_TARGET_DIR = "./vault-cortex";
+import { LOCAL_IMAGE, REMOTE_IMAGE } from "./docker.js";
+import { ensureDaemonRunning, recreateContainer, resolveDeployment, } from "./lifecycle.js";
+/**
+ * Pulls the latest image, re-creates the container, and verifies health.
+ * The only lifecycle command that contacts the registry — restart re-creates
+ * from the image already on disk.
+ */
 export const runUpgrade = async (flags, deps) => {
     const { prompts, docker, fetchFn } = deps;
     prompts.intro("vault-cortex upgrade");
-    const targetDir = resolve(expandTilde(flags.dir ?? DEFAULT_TARGET_DIR));
-    const envFilePath = join(targetDir, ".env");
-    const mode = detectMode(envFilePath);
-    if (!mode) {
-        prompts.error(`No .env found in ${targetDir} — run \`npx vault-cortex init\` first.`);
+    const deployment = resolveDeployment(flags.dir, prompts);
+    if (!deployment)
         return 1;
-    }
-    const port = readEnvPort(envFilePath);
-    const vaultPath = mode === "local" ? readEnvVaultPath(envFilePath) : undefined;
-    if (mode === "local" && !vaultPath) {
-        prompts.error(`VAULT_PATH is empty or missing in ${targetDir}/.env — cannot start the container.`);
-        return 1;
-    }
-    if (mode === "local" && !hasEnvPublicUrl(envFilePath)) {
-        prompts.error(`PUBLIC_URL not found in ${targetDir}/.env — the server requires it.\n` +
-            `Add this line to your .env:\n  PUBLIC_URL=http://localhost:${port}`);
-        return 1;
-    }
-    const image = mode === "local" ? LOCAL_IMAGE : REMOTE_IMAGE;
-    if (!docker.isDaemonRunning()) {
-        prompts.error("Container runtime not running — start Docker Desktop, Colima,\n" +
-            "OrbStack, or another Docker-compatible runtime.");
+    const image = deployment.mode === "local" ? LOCAL_IMAGE : REMOTE_IMAGE;
+    if (!ensureDaemonRunning(docker, prompts))
         return 1;
-    }
     const spinner = prompts.spinner();
     spinner.start(`Pulling ${image}`);
     const imagePulled = docker.pullImage(image);
@@ -38,28 +22,9 @@ export const runUpgrade = async (flags, deps) => {
         return 1;
     }
     spinner.stop("Image pulled.");
-    docker.stopAndRemoveContainer();
-    prompts.log("Starting container...");
-    const containerStarted = docker.dockerRun({
-        mode,
-        envFilePath,
-        port,
-        vaultPath,
-    });
-    if (!containerStarted) {
-        prompts.error("docker run failed — see output above.");
-        return 1;
-    }
-    spinner.start("Waiting for the server to come up");
-    const healthy = await pollHealth({
-        url: `http://127.0.0.1:${port}/healthz`,
-        timeoutMs: deps.healthTimeoutMs,
-    }, fetchFn);
-    if (!healthy) {
-        spinner.stop(`Server did not respond within 2 minutes — check: docker logs ${CONTAINER_NAME}`);
-        return 1;
-    }
-    spinner.stop("Server is up — health check passed.");
+    const exitCode = await recreateContainer({ deployment, healthTimeoutMs: deps.healthTimeoutMs }, { prompts, docker, fetchFn });
+    if (exitCode !== 0)
+        return exitCode;
     prompts.log("Your vault data, search index, and settings are preserved.");
     prompts.outro("Upgrade complete.");
     return 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vault-cortex",
-  "version": "0.7.0",
+  "version": "0.9.0-beta.43",
   "description": "Set up a Vault Cortex MCP server for your Obsidian vault in one command: npx vault-cortex init",
   "license": "MIT",
   "type": "module",