@contextecf/guardian-cli 0.1.0 → 0.1.2

package/dist/packages/guardian-cli/src/index.js

@@ -15172,8 +15172,7 @@ import { createCipheriv, createDecipheriv, createHash, randomBytes } from "node:
 import { readFileSync } from "node:fs";
 import { copyFile, mkdir, readFile, stat } from "node:fs/promises";
 import path from "node:path";
-import Database from "better-sqlite3";
-import PageEncryptedDatabase from "better-sqlite3-multiple-ciphers";
+import SQLiteDatabase from "better-sqlite3-multiple-ciphers";
 var HashSchema2 = external_exports.string().regex(/^(sha256:)?[a-f0-9]{64}$/);
 var NonEmptyStringSchema2 = external_exports.string().trim().min(1);
 var DateTimeStringSchema2 = external_exports.string().datetime({ offset: true });
@@ -15966,12 +15965,12 @@ function buildSQLitePersonalFabricStorePageEncryption(options) {
 }
 function openSQLitePersonalFabricDatabase(databasePath, pageEncryption) {
   if (!pageEncryption) {
-    return new Database(databasePath ?? ":memory:");
+    return new SQLiteDatabase(databasePath ?? ":memory:");
   }
   if (!databasePath) {
     throw new Error("Guardian SQLite page encryption requires a filesystem database path.");
   }
-  const db = new PageEncryptedDatabase(databasePath);
+  const db = new SQLiteDatabase(databasePath);
   if (pageEncryption.cipher === "sqlcipher") {
     db.pragma(`cipher=${sqliteStringLiteral("sqlcipher")}`);
     db.pragma(`legacy=${pageEncryption.legacy ?? 4}`);
@@ -16276,7 +16275,7 @@ function cloneList(values) {
 }
 
 // packages/guardian-cli/src/runtime.ts
-var GUARDIAN_CLI_VERSION = "0.1.0";
+var GUARDIAN_CLI_VERSION = "0.1.2";
 var GUARDIAN_PROFILE_SCHEMA_VERSION = "contextecf/project-guardian-profile/v1";
 var GUARDIAN_NPM_PACKAGE_NAME = "@contextecf/guardian-cli";
 var GUARDIAN_GLOBAL_INSTALL_COMMAND = `npm install -g ${GUARDIAN_NPM_PACKAGE_NAME}`;
@@ -17437,7 +17436,7 @@ async function runStartCommand(flags, options) {
   const home = resolveGuardianHome(options.env, options.platform);
   const profile = await readProfile(home);
   if (!profile) {
-    write(stderr, "Guardian is not installed. Run guardian install first.\n");
+    write(stderr, "Guardian is not installed. Run guardian setup first.\n");
     return 1;
   }
   const host = stringFlag(flags, "host") ?? "127.0.0.1";
@@ -17445,10 +17444,8 @@ async function runStartCommand(flags, options) {
     write(stderr, "Guardian start only accepts loopback hosts: 127.0.0.1, localhost, or ::1.\n");
     return 1;
   }
-  const port = numberFlag(flags, "port") ?? 4317;
-  const requestedDaemonUrl = formatDaemonBaseUrl(host, port);
-  const requestedControlTowerUrl = `${requestedDaemonUrl}/control-tower`;
-  const controlTowerSource = host === "127.0.0.1" && port === 4317 ? "default_loopback" : "env_or_flag";
+  const explicitPort = numberFlag(flags, "port");
+  const port = explicitPort ?? 4317;
   let token;
   try {
     token = await readRuntimeToken(home);
@@ -17460,14 +17457,66 @@ async function runStartCommand(flags, options) {
     );
     return 1;
   }
-  const healthUrl = resolveDaemonHealthUrl(requestedControlTowerUrl);
-  if (!healthUrl.ok) {
-    write(stderr, `${healthUrl.error}
+  const healthChecker = options.healthDaemon ?? requestGuardianDaemonHealth;
+  const candidates = explicitPort ? [explicitPort] : Array.from({ length: 8 }, (_, index) => port + index);
+  let selected;
+  let firstTokenMismatch;
+  for (const candidatePort of candidates) {
+    const requestedDaemonUrl2 = formatDaemonBaseUrl(host, candidatePort);
+    const requestedControlTowerUrl2 = `${requestedDaemonUrl2}/control-tower`;
+    const controlTowerSource2 = host === "127.0.0.1" && candidatePort === 4317 ? "default_loopback" : "env_or_flag";
+    const healthUrl2 = resolveDaemonHealthUrl(requestedControlTowerUrl2);
+    if (!healthUrl2.ok) {
+      write(stderr, `${healthUrl2.error}
 `);
+      return 1;
+    }
+    const existing2 = await healthChecker({ url: healthUrl2.url, token });
+    if (existing2.ok && existing2.reachable) {
+      selected = {
+        port: candidatePort,
+        requestedDaemonUrl: requestedDaemonUrl2,
+        requestedControlTowerUrl: requestedControlTowerUrl2,
+        healthUrl: healthUrl2.url,
+        controlTowerSource: controlTowerSource2,
+        existing: existing2
+      };
+      break;
+    }
+    if (existing2.statusCode === 401) {
+      firstTokenMismatch ??= {
+        requestedDaemonUrl: requestedDaemonUrl2,
+        port: candidatePort,
+        healthUrl: healthUrl2.url,
+        existing: existing2
+      };
+      if (explicitPort) {
+        write(stderr, renderDaemonTokenMismatchMessage(requestedDaemonUrl2, candidatePort));
+        return 1;
+      }
+      continue;
+    }
+    selected = {
+      port: candidatePort,
+      requestedDaemonUrl: requestedDaemonUrl2,
+      requestedControlTowerUrl: requestedControlTowerUrl2,
+      healthUrl: healthUrl2.url,
+      controlTowerSource: controlTowerSource2,
+      existing: existing2
+    };
+    break;
+  }
+  if (!selected) {
+    const mismatch = firstTokenMismatch ?? {
+      requestedDaemonUrl: formatDaemonBaseUrl(host, port),
+      port,
+      healthUrl: `${formatDaemonBaseUrl(host, port)}/v1/guardian/admin/health`,
+      existing: { ok: false, reachable: false, statusCode: 401, error: "unauthorized" }
+    };
+    write(stderr, renderDaemonTokenMismatchMessage(mismatch.requestedDaemonUrl, mismatch.port));
     return 1;
   }
-  const healthChecker = options.healthDaemon ?? requestGuardianDaemonHealth;
-  const existing = await healthChecker({ url: healthUrl.url, token });
+  const { requestedDaemonUrl, requestedControlTowerUrl, healthUrl, controlTowerSource, existing } = selected;
   if (existing.ok && existing.reachable) {
     profile.runtime.daemon_status = "start_requested";
     profile.control_tower = {
@@ -17481,7 +17530,7 @@ async function runStartCommand(flags, options) {
       daemonStatus: profile.runtime.daemon_status,
       daemonUrl: requestedDaemonUrl,
       controlTowerUrl: requestedControlTowerUrl,
-      healthUrl: healthUrl.url,
+      healthUrl,
       healthStatus: "reachable",
       nextCommands: ["guardian open", "guardian status", "guardian daemon pair --json"]
     };
@@ -17498,20 +17547,12 @@ async function runStartCommand(flags, options) {
     );
     return 0;
   }
-  if (existing.statusCode === 401) {
-    write(
-      stderr,
-      `Guardian daemon at ${requestedDaemonUrl} rejected the local runtime token. Run guardian status or guardian stop before starting another daemon.
-`
-    );
-    return 1;
-  }
   if (!options.startDetachedDaemon) {
     write(stderr, "Guardian detached daemon launcher is unavailable in this runtime.\n");
     return 1;
   }
-  const started = await options.startDetachedDaemon({ home, host, port });
-  const daemonUrl = normalizeDaemonBaseUrl(started.url, host, port);
+  const started = await options.startDetachedDaemon({ home, host, port: selected.port });
+  const daemonUrl = normalizeDaemonBaseUrl(started.url, host, selected.port);
   const controlTowerUrl = `${daemonUrl}/control-tower`;
   profile.runtime.daemon_status = "start_requested";
   profile.control_tower = {
@@ -17526,7 +17567,7 @@ async function runStartCommand(flags, options) {
     daemonUrl,
     controlTowerUrl,
     pid: started.pid,
-    healthUrl: healthUrl.url,
+    healthUrl,
     healthStatus: existing.error ? "unreachable" : "not_reachable",
     nextCommands: ["guardian open", "guardian status", "guardian daemon pair --json"]
   };
@@ -17544,6 +17585,15 @@ async function runStartCommand(flags, options) {
   );
   return 0;
 }
+function renderDaemonTokenMismatchMessage(requestedDaemonUrl, port) {
+  return [
+    `Guardian found another daemon or container at ${requestedDaemonUrl}, but it rejected this profile's local runtime token.`,
+    "This usually means an older Guardian daemon or Docker demo is still using the port.",
+    `Recovery: stop the other process/container, or run Guardian on a different port with guardian launch --port=${port + 1}.`,
+    `Diagnostics: guardian status; docker ps --filter publish=${port}`,
+    ""
+  ].join("\n");
+}
 async function runStopCommand(flags, options) {
   const stdout = options.stdout ?? process.stdout;
   const stderr = options.stderr ?? process.stderr;

package/dist/packages/guardian-cli/src/runtime.d.ts

@@ -1,7 +1,7 @@
 import type { Writable } from 'node:stream';
 import { type PolicyPackMarketplaceManifest } from '@contextecf/personal-fabric-contracts';
 import { SQLitePersonalFabricStore, type PersonalFabricDataImportResult, type PersonalFabricMutableDataDeleteResult, type SQLitePersonalFabricBackupResult } from '@contextecf/personal-fabric-store';
-export declare const GUARDIAN_CLI_VERSION = "0.1.0";
+export declare const GUARDIAN_CLI_VERSION = "0.1.2";
 export declare const GUARDIAN_PROFILE_SCHEMA_VERSION = "contextecf/project-guardian-profile/v1";
 export declare const GUARDIAN_NPM_PACKAGE_NAME = "@contextecf/guardian-cli";
 export declare const GUARDIAN_GLOBAL_INSTALL_COMMAND = "npm install -g @contextecf/guardian-cli";

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contextecf/guardian-cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Project Guardian local-first Personal Context Fabric CLI",
   "type": "module",
   "license": "UNLICENSED",
   "main": "dist/packages/guardian-cli/src/index.js",
   "types": "dist/packages/guardian-cli/src/index.d.ts",
   "engines": {
-    "node": ">=22"
+    "node": ">=20.20.0"
   },
   "files": [
     "dist/packages/guardian-cli/src/bin.d.ts",
@@ -46,7 +46,6 @@
     "mcp"
   ],
   "dependencies": {
-    "better-sqlite3": "^13.0.1",
     "better-sqlite3-multiple-ciphers": "^12.11.1"
   },
   "devDependencies": {