servyx-cli 0.1.3 → 0.1.5

package/README.md

@@ -38,7 +38,7 @@ servyx status
 
 - Global config: `~/.servyx/config.json` (mode 600)
 - Project config: `servyx.json` in your project root
-- Optional excludes: `.servyxignore` (rsync patterns). Hidden files (`.env`, `.htaccess`, etc.) are excluded by default.
+- Optional excludes: `.servyxignore` (rsync patterns). Hidden files (`.env`, `.htaccess`, etc.) are not uploaded from your machine; existing server copies are preserved during deploy.
 
 Environment variables:
 
@@ -47,7 +47,8 @@ Environment variables:
 ## How it works
 
 1. `servyx deploy` fetches the deploy target (SSH user, host, staging path) from cli-service
-2. Files are rsynced to `<app_root>/.cli-staging` on the server
-3. cli-service calls server-service to queue a CLI deployment
-4. The agent syncs staging → public, runs the pipeline, and reports progress
-5. The CLI polls until the deployment succeeds or fails
+2. Files are rsynced to `<app_root>/.cli-staging` on the server (local hidden files are skipped)
+3. Live dotfiles from `public` (`.env`, `.htaccess`, etc.) are copied into staging so they are not removed on deploy
+4. cli-service calls server-service to queue a CLI deployment
+5. The agent syncs staging → public, runs the pipeline, and reports progress
+6. The CLI polls until the deployment succeeds or fails

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "servyx-cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Servyx CLI — Upload local projects and deploy via the Servyx platform",
   "type": "module",
   "bin": {

package/src/commands/deploy.js

@@ -2,7 +2,7 @@ import pc from 'picocolors';
 import { getDeployTarget, getDeployment, startDeployment } from '../lib/api.js';
 import { getToken } from '../lib/config.js';
 import { loadProjectConfig, loadServyxIgnore } from '../lib/project.js';
-import { rsyncDeploy, sshPreflight, DEFAULT_RSYNC_EXCLUDES } from '../lib/rsync.js';
+import { rsyncDeploy, sshPreflight, DEFAULT_RSYNC_EXCLUDES, preserveServerDotfiles, ensureRemoteDir, verifyRemoteStagingDir } from '../lib/rsync.js';
 
 const TERMINAL_STATUSES = new Set(['success', 'failure', 'cancelled']);
 
@@ -65,6 +65,18 @@ export async function runDeploy(options = {}) {
   ];
 
   console.log(pc.bold('Syncing files via rsync...'));
+  ensureRemoteDir({
+    host: target.ssh_host,
+    port: target.ssh_port || 22,
+    user: target.ssh_user,
+    remotePath: target.root_path,
+  });
+  ensureRemoteDir({
+    host: target.ssh_host,
+    port: target.ssh_port || 22,
+    user: target.ssh_user,
+    remotePath: target.staging_path,
+  });
   rsyncDeploy({
     localDir: root,
     host: target.ssh_host,
@@ -73,8 +85,34 @@ export async function runDeploy(options = {}) {
     remotePath: target.staging_path,
     excludes,
   });
+
+  const stagingCheck = verifyRemoteStagingDir({
+    host: target.ssh_host,
+    port: target.ssh_port || 22,
+    user: target.ssh_user,
+    remotePath: target.staging_path,
+  });
+  if (!stagingCheck.ok) {
+    console.error(pc.red(`Staging directory is missing or empty after rsync: ${target.staging_path}`));
+    if (stagingCheck.stderr) {
+      console.error(pc.dim(stagingCheck.stderr));
+    }
+    console.error(pc.yellow('Ensure the app system user exists on the server and can write under /srv/users/<user>/apps/.'));
+    process.exit(1);
+  }
   console.log(pc.green('Rsync complete.'));
 
+  const publicPath = target.public_path || `${target.root_path}/public`;
+  console.log(pc.bold('Preserving server dotfiles (.env, .htaccess, etc.)...'));
+  preserveServerDotfiles({
+    host: target.ssh_host,
+    port: target.ssh_port || 22,
+    user: target.ssh_user,
+    publicPath,
+    stagingPath: target.staging_path,
+  });
+  console.log(pc.green('Server dotfiles preserved.'));
+
   console.log(pc.bold('Starting deployment...'));
   let startResult;
   try {

package/src/commands/link.js

@@ -24,7 +24,7 @@ export async function runLink(options = {}) {
       name: 'appId',
       message: 'Select an app to link',
       choices: apps.map((app) => ({
-        title: `${app.name} (${app.slug}) — ${app.server_name || app.hostname}`,
+        title: `${app.name} (${app.system_username}) — ${app.server_name || app.hostname}`,
         value: app.id,
       })),
     });
@@ -45,10 +45,10 @@ export async function runLink(options = {}) {
   saveProjectConfig(cwd, {
     appId: app.id,
     appName: app.name,
-    appSlug: app.slug,
+    appSlug: app.system_username,
     linkedAt: new Date().toISOString(),
   });
 
-  console.log(pc.green(`Linked ${app.name} (${app.slug})`));
+  console.log(pc.green(`Linked ${app.name} (${app.system_username})`));
   console.log(pc.dim(`Wrote servyx.json in ${cwd}`));
 }

package/src/lib/rsync.js

@@ -1,9 +1,13 @@
 import { spawnSync } from 'child_process';
 import path from 'path';
 
-/** Hidden files/dirs are not synced so server-side config (.env, .htaccess, etc.) is preserved. */
+/** Local hidden files are not uploaded; server copies are re-seeded into staging before deploy. */
 export const DEFAULT_RSYNC_EXCLUDES = ['.*'];
 
+function shellQuote(value) {
+  return `'${String(value).replace(/'/g, `'\\''`)}'`;
+}
+
 export function requireBinary(name) {
   const result = spawnSync('which', [name], { encoding: 'utf8' });
   if (result.status !== 0) {
@@ -59,3 +63,73 @@ export function rsyncDeploy({ localDir, host, port = 22, user, remotePath, exclu
 
   return { target };
 }
+
+export function ensureRemoteDir({ host, port = 22, user, remotePath }) {
+  requireBinary('ssh');
+  const target = `${user}@${host}`;
+  const cmd = `mkdir -p ${shellQuote(remotePath)}`;
+  const args = [
+    '-o', 'BatchMode=yes',
+    '-o', 'StrictHostKeyChecking=accept-new',
+    '-o', 'ConnectTimeout=10',
+    '-p', String(port),
+    target,
+    cmd,
+  ];
+  const result = spawnSync('ssh', args, { encoding: 'utf8' });
+  if (result.status !== 0) {
+    const err = new Error(`Failed to create remote directory ${remotePath}: ${(result.stderr || '').trim() || 'unknown error'}`);
+    err.exitCode = result.status;
+    throw err;
+  }
+}
+
+export function verifyRemoteStagingDir({ host, port = 22, user, remotePath }) {
+  requireBinary('ssh');
+  const target = `${user}@${host}`;
+  const cmd = [
+    `test -d ${shellQuote(remotePath)}`,
+    `&& [ -n "$(ls -A ${shellQuote(remotePath)} 2>/dev/null | head -1)" ]`,
+  ].join(' ');
+  const args = [
+    '-o', 'BatchMode=yes',
+    '-o', 'StrictHostKeyChecking=accept-new',
+    '-o', 'ConnectTimeout=10',
+    '-p', String(port),
+    target,
+    cmd,
+  ];
+  const result = spawnSync('ssh', args, { encoding: 'utf8' });
+  return {
+    ok: result.status === 0,
+    stderr: (result.stderr || '').trim(),
+  };
+}
+
+/** Copy live dotfiles from public into staging so the agent's staging→public sync does not delete them. */
+export function preserveServerDotfiles({ host, port = 22, user, publicPath, stagingPath }) {
+  requireBinary('ssh');
+  const target = `${user}@${host}`;
+  const cmd = [
+    `mkdir -p ${shellQuote(stagingPath)}`,
+    `&& find ${shellQuote(publicPath)} -maxdepth 1 -name '.*' -type f`,
+    `-exec cp -a {} ${shellQuote(`${stagingPath.replace(/\/$/, '')}/`)} \\;`,
+    '2>/dev/null || true',
+  ].join(' ');
+
+  const args = [
+    '-o', 'BatchMode=yes',
+    '-o', 'StrictHostKeyChecking=accept-new',
+    '-o', 'ConnectTimeout=10',
+    '-p', String(port),
+    target,
+    cmd,
+  ];
+
+  const result = spawnSync('ssh', args, { encoding: 'utf8' });
+  if (result.status !== 0) {
+    const err = new Error(`Failed to preserve server dotfiles: ${(result.stderr || '').trim() || 'unknown error'}`);
+    err.exitCode = result.status;
+    throw err;
+  }
+}