@promptbook/cli 0.112.0-95 → 0.112.0-97

package/apps/agents-server/src/utils/vpsConfiguration.ts

@@ -6,6 +6,7 @@ import { promisify } from 'util';
 import { spaceTrim } from 'spacetrim';
 import { NotAllowed } from '../../../../src/errors/NotAllowed';
 import { normalizeServerDomain } from './serverRegistry';
+import { isStandaloneVpsRawIpBootstrapActive } from './standaloneVpsRawIpBootstrap';
 
 const execFileAsync = promisify(execFile);
 
@@ -31,8 +32,6 @@ export const VPS_ENVIRONMENT_VARIABLE_KEYS = [
     'PTBK_PM2_APP_NAME',
     'PTBK_NGINX_SITE_NAME',
     'LETS_ENCRYPT_EMAIL',
-    'PTBK_AGENTS_SERVER_DATABASE',
-    'PTBK_AGENTS_SERVER_SQLITE_PATH',
     'SUPABASE_TABLE_PREFIX',
     'SUPABASE_AUTO_MIGRATE',
     'COPILOT_GITHUB_TOKEN',
@@ -87,6 +86,21 @@ export type VpsCommandResult = {
     readonly output: string;
 };
 
+/**
+ * Runtime-installer execution options used by VPS admin actions.
+ */
+type RunVpsInstallerCommandOptions = {
+    /**
+     * Whether the installer should disable interactive prompts.
+     */
+    readonly isNonInteractiveModeEnabled?: boolean;
+
+    /**
+     * Whether the installer may restart the running Agents Server process.
+     */
+    readonly isProcessRestartEnabled?: boolean;
+};
+
 /**
  * Parsed `.env` line representation used to preserve comments and ordering.
  */
@@ -191,30 +205,51 @@ export async function listConfiguredVpsDomains(): Promise<Array<string>> {
     return parseDomainsCsv(rawServers);
 }
 
+/**
+ * Options used when updating the standalone VPS domain list.
+ */
+type UpdateConfiguredVpsDomainsOptions = {
+    /**
+     * Optional server-level table prefix to persist together with the domain list.
+     */
+    readonly tablePrefix?: string | null;
+};
+
 /**
  * Replaces the standalone VPS domain list in `.env`.
  *
  * @param domains - Domains to store in `SERVERS`.
+ * @param options - Optional server-level settings to persist.
  * @returns Safe environment snapshot after writing.
  */
 export async function updateConfiguredVpsDomains(
     domains: ReadonlyArray<string>,
+    options?: UpdateConfiguredVpsDomainsOptions,
 ): Promise<Awaited<ReturnType<typeof listVpsEnvironmentVariables>>> {
     const normalizedDomains = normalizeDomains(domains);
     const primaryDomain = normalizedDomains[0] ?? '';
+    const envValues = await readVpsEnvironmentMap(resolveVpsEnvironmentFilePath());
+    const currentPublicSiteUrl = envValues.get('NEXT_PUBLIC_SITE_URL') ?? process.env.NEXT_PUBLIC_SITE_URL ?? '';
+    const publicIpAddress = envValues.get('PTBK_PUBLIC_IP_ADDRESS') ?? process.env.PTBK_PUBLIC_IP_ADDRESS ?? '';
     const updates: Record<string, string> = {
         SERVERS: normalizedDomains.join(','),
     };
 
     if (primaryDomain) {
-        updates.NEXT_PUBLIC_SITE_URL = `https://${primaryDomain}`;
-        updates.SUPABASE_TABLE_PREFIX = buildDomainTablePrefix(primaryDomain);
+        updates.NEXT_PUBLIC_SITE_URL = isStandaloneVpsRawIpBootstrapActive({
+            nextPublicSiteUrl: currentPublicSiteUrl,
+            publicIpAddress,
+        })
+            ? currentPublicSiteUrl
+            : `https://${primaryDomain}`;
     } else {
-        const publicIpAddress = process.env.PTBK_PUBLIC_IP_ADDRESS?.trim();
         updates.NEXT_PUBLIC_SITE_URL = publicIpAddress
             ? `http://${publicIpAddress}`
             : '';
-        updates.SUPABASE_TABLE_PREFIX = '';
+    }
+
+    if (options && Object.prototype.hasOwnProperty.call(options, 'tablePrefix')) {
+        updates.SUPABASE_TABLE_PREFIX = options.tablePrefix?.trim() || '';
     }
 
     return updateVpsEnvironmentVariables(updates);
@@ -225,8 +260,14 @@ export async function updateConfiguredVpsDomains(
  *
  * @returns Command output or a skipped reason when not running on a Linux VPS.
  */
-export async function applyVpsRuntimeConfiguration(): Promise<VpsCommandResult> {
-    return runVpsInstallerCommand('apply-domains', 'VPS runtime configuration can only be applied on Linux.');
+export async function applyVpsRuntimeConfiguration(
+    options?: RunVpsInstallerCommandOptions,
+): Promise<VpsCommandResult> {
+    return runVpsInstallerCommand(
+        'apply-domains',
+        'VPS runtime configuration can only be applied on Linux.',
+        options,
+    );
 }
 
 /**
@@ -270,7 +311,11 @@ export async function readVpsPm2Logs(lineCount = 200): Promise<VpsCommandResult>
  * @param unavailableOutput - Message returned on non-Linux platforms.
  * @returns Command output or unavailable reason.
  */
-async function runVpsInstallerCommand(command: string, unavailableOutput: string): Promise<VpsCommandResult> {
+async function runVpsInstallerCommand(
+    command: string,
+    unavailableOutput: string,
+    options?: RunVpsInstallerCommandOptions,
+): Promise<VpsCommandResult> {
     if (process.platform !== 'linux') {
         return {
             isAvailable: false,
@@ -288,10 +333,7 @@ async function runVpsInstallerCommand(command: string, unavailableOutput: string
 
     try {
         const { stdout, stderr } = await execFileAsync('bash', [scriptPath, command], {
-            env: {
-                ...process.env,
-                PTBK_NON_INTERACTIVE: '1',
-            },
+            env: createVpsInstallerCommandEnvironment(options),
             maxBuffer: 1024 * 1024,
         });
 
@@ -316,6 +358,31 @@ async function runVpsInstallerCommand(command: string, unavailableOutput: string
     }
 }
 
+/**
+ * Creates the environment passed to the shared VPS installer script.
+ *
+ * @param options - Installer execution options.
+ * @returns Child-process environment.
+ *
+ * @private internal helper of `vpsConfiguration`
+ */
+export function createVpsInstallerCommandEnvironment(
+    options?: RunVpsInstallerCommandOptions,
+): NodeJS.ProcessEnv {
+    const environment: NodeJS.ProcessEnv = {
+        ...process.env,
+        ...(options?.isProcessRestartEnabled === false ? { PTBK_SKIP_PM2_RESTART: '1' } : {}),
+    };
+
+    if (options?.isNonInteractiveModeEnabled === false) {
+        delete environment.PTBK_NON_INTERACTIVE;
+    } else {
+        environment.PTBK_NON_INTERACTIVE = '1';
+    }
+
+    return environment;
+}
+
 /**
  * Returns whether an environment variable must be masked in the UI.
  *
@@ -477,7 +544,12 @@ function parseEnvLines(content: string): Array<ParsedEnvLine> {
             return { type: 'raw', raw };
         }
 
-        const [, key, rawValue = ''] = match;
+        const key = match[1];
+        const rawValue = match[2] ?? '';
+        if (!key) {
+            return { type: 'raw', raw };
+        }
+
         return {
             type: 'entry',
             raw,
@@ -528,7 +600,7 @@ async function readOptionalTextFile(filePath: string): Promise<string> {
  *
  * @returns Script path or `null` when unavailable.
  */
-async function resolveVpsInstallerScriptPath(): Promise<string | null> {
+export async function resolveVpsInstallerScriptPath(): Promise<string | null> {
     const candidates = [
         process.env.PTBK_VPS_INSTALL_SCRIPT?.trim(),
         process.env.PTBK_REPOSITORY_DIR ? join(process.env.PTBK_REPOSITORY_DIR, 'other/vps/install.sh') : '',