@akash-chowdhury-24/deployhub 2.0.16 → 2.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akash-chowdhury-24/deployhub",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "description": "Zero-configuration deployment and artifact manager",
   "type": "module",
   "main": "./src/cli/index.js",

package/src/commands/env.js

@@ -6,6 +6,7 @@ import {
   saveConfig,
 } from '../core/config.js';
 import {
+  getEnabledEnvironmentNames,
   getEnvMethod,
   getEnvTrigger,
   isEnvEnabled,
@@ -25,6 +26,21 @@ import {
   envLatestArtifactRemoteKey,
 } from '../utils/build-id.js';
 
+/**
+ * Regenerate GitHub Actions workflows after env enable/disable/add/remove.
+ * @param {import('../core/config.js').DeployHubConfig} config
+ * @param {string} cwd
+ */
+async function regenerateWorkflows(config, cwd) {
+  await writeWorkflowFile(
+    config.storage || [],
+    getEnabledEnvironmentNames(config),
+    config.environments || {},
+    cwd,
+    config.cli?.source,
+    config
+  );
+}
 /**
  * Best-effort last buildId for an env from per-env deploy history.
  * @param {import('../core/config.js').DeployHubConfig} config
@@ -172,17 +188,7 @@ export function registerEnvCommand(program) {
 
       await saveConfig(config, cwd);
 
-      const enabledNames = Object.keys(config.environments).filter((n) =>
-        isEnvEnabled(config.environments[n])
-      );
-      await writeWorkflowFile(
-        config.storage || [],
-        enabledNames,
-        config.environments,
-        cwd,
-        config.cli?.source,
-        config
-      );
+      await regenerateWorkflows(config, cwd);
 
       log.success(`Added environment "${name}" (${deployAnswers.deployType})`);
       console.log(chalk.gray(`  defaultEnvironment: ${config.defaultEnvironment}`));
@@ -234,7 +240,9 @@ export function registerEnvCommand(program) {
       }
       config.environments[name].enabled = true;
       await saveConfig(config, cwd);
+      await regenerateWorkflows(config, cwd);
       console.log(chalk.green(`✓ Enabled environment "${name}"`));
+      console.log(chalk.gray('  Workflows regenerated — commit .github/workflows if using CI.'));
     });
 
   env
@@ -250,7 +258,9 @@ export function registerEnvCommand(program) {
       }
       config.environments[name].enabled = false;
       await saveConfig(config, cwd);
+      await regenerateWorkflows(config, cwd);
       console.log(chalk.yellow(`Disabled environment "${name}"`));
+      console.log(chalk.gray('  Workflows regenerated — commit .github/workflows if using CI.'));
     });
 
   env
@@ -301,17 +311,7 @@ export function registerEnvCommand(program) {
       }
       await saveConfig(config, cwd);
 
-      const enabledNames = Object.keys(config.environments).filter((n) =>
-        isEnvEnabled(config.environments[n])
-      );
-      await writeWorkflowFile(
-        config.storage || [],
-        enabledNames,
-        config.environments,
-        cwd,
-        config.cli?.source,
-        config
-      );
+      await regenerateWorkflows(config, cwd);
 
       console.log(chalk.green(`✓ Removed environment "${name}"`));
       console.log(

package/src/commands/init.js

@@ -28,6 +28,8 @@ import {
   promptServerDeployment,
   buildServerEnvEntry,
   getDockerEnvSecrets,
+  applyInitTriggerDefaults,
+  formatMultiEnvTriggerReminder,
   SSH_BASED,
 } from '../deployment/init-prompts.js';
 import {
@@ -452,6 +454,8 @@ export function registerInitCommand(program) {
         defaultEnvironment = picked.defaultEnvironment;
       }
 
+      applyInitTriggerDefaults(environments, deploy, defaultEnvironment);
+
       const version = await getProjectVersion(cwd);
       let hasDocker =
         (detectedFrontend?.hasDocker || detectedBackend?.hasDocker) ?? false;
@@ -571,6 +575,16 @@ export function registerInitCommand(program) {
       console.log('  • .github/workflows/deployhub-rollback.yml');
       console.log('  • .env.example');
       console.log('');
+
+      if (deploy.length >= 2 && defaultEnvironment) {
+        console.log(
+          chalk.yellow(
+            formatMultiEnvTriggerReminder(String(defaultEnvironment), deploy)
+          )
+        );
+        console.log('');
+      }
+
       printAuthorFooter();
     });
 }

package/src/commands/sync-workflows.js

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 import { loadConfig, loadEnv } from '../core/config.js';
+import { getEnabledEnvironmentNames } from '../core/environments.js';
 import {
   writeWorkflowFile,
   DEPLOY_WORKFLOW_FILENAME,
@@ -22,8 +23,10 @@ export function registerSyncWorkflowsCommand(program) {
       const config = await loadConfig(cwd);
 
       const storage = config.storage || [];
-      const deploy = config.deploy || [];
       const environments = config.environments || {};
+      // Prefer enabled environments over legacy deploy[] so every reachable env
+      // gets its secrets into the regenerated workflow env blocks.
+      const deploy = getEnabledEnvironmentNames(config);
       const cliSource = config.cli?.source;
 
       await writeWorkflowFile(storage, deploy, environments, cwd, cliSource, config);

package/src/core/config.js

@@ -290,7 +290,7 @@ export function migrateConfigToEnvironments(raw) {
     newEnvironments.default = {
       enabled: true,
       method,
-      trigger: 'manual',
+      trigger: 'push',
       config: flatConfig,
     };
     for (const key of FLAT_DEPLOY_KEYS) {
@@ -323,7 +323,7 @@ export function migrateConfigToEnvironments(raw) {
     newEnvironments[defaultEnvironment] = {
       enabled: true,
       method: 'ssh',
-      trigger: 'manual',
+      trigger: 'push',
       config: {},
     };
   }

package/src/deployment/init-prompts.js

@@ -539,6 +539,57 @@ export function buildServerEnvEntry(
   };
 }
 
+/**
+ * Apply init-time trigger defaults after environments are collected.
+ * - Exactly one env → always `push` (git push = auto-deploy).
+ * - Two or more → grandfathered/default gets `push`; all others stay `manual`.
+ *
+ * @param {Record<string, { trigger?: string }>} environments
+ * @param {string[]} deployNames
+ * @param {string|undefined|null} defaultEnvironment
+ */
+export function applyInitTriggerDefaults(environments, deployNames, defaultEnvironment) {
+  if (deployNames.length === 1 && environments[deployNames[0]]) {
+    environments[deployNames[0]].trigger = 'push';
+    return;
+  }
+  if (deployNames.length >= 2 && defaultEnvironment) {
+    for (const name of deployNames) {
+      if (!environments[name]) continue;
+      environments[name].trigger =
+        name === defaultEnvironment ? 'push' : 'manual';
+    }
+  }
+}
+
+/**
+ * End-of-init reminder for multi-env setups (grandfathered = push, others = manual).
+ * @param {string} grandfathered
+ * @param {string[]} allEnvNames
+ * @returns {string}
+ */
+export function formatMultiEnvTriggerReminder(grandfathered, allEnvNames) {
+  const others = allEnvNames.filter((n) => n !== grandfathered);
+  const otherList =
+    others.length > 0 ? others.map((n) => `"${n}"`).join(', ') : '(none)';
+  const exampleEnv = others[0] || '<env-name>';
+  return [
+    '─────────────────────────────────────────────',
+    `By default, only your first environment ("${grandfathered}")`,
+    `auto-deploys on push. Your other environment(s) — ${otherList} — are set to manual and will only deploy via:`,
+    '  deployhub deploy --env <name>',
+    'or GitHub Actions → Run workflow.',
+    '',
+    'To make an environment auto-deploy on push instead, open',
+    'deployhub.config.json and change its "trigger" to "push":',
+    '  "environments": {',
+    `    "${exampleEnv}": { "trigger": "push", ... }`,
+    '  }',
+    'Then run: deployhub sync-workflows',
+    '─────────────────────────────────────────────',
+  ].join('\n');
+}
+
 /**
  * @param {Awaited<ReturnType<typeof promptServerDeployment>>} deployAnswers
  * @returns {Record<string, string>|null}

package/src/utils/github-actions.js

@@ -1,6 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import yaml from 'js-yaml';
+import { fileURLToPath } from 'url';
 import { getWorkflowHeaderComment } from './author.js';
 import {
   generateDeploymentEnvSection,
@@ -135,6 +136,34 @@ export function getCliInstallSpec(cliSource) {
   return normalized;
 }
 
+/**
+ * Version/range suitable as a package.json dependency VALUE for this CLI
+ * (key is already NPM_PACKAGE — do not embed the package name again).
+ *
+ * @param {string} [cliSource]
+ * @returns {string}
+ */
+export function getCliPackageJsonDependencyVersion(cliSource) {
+  const normalized = normalizeCliSource(cliSource);
+  if (normalized === DEFAULT_NPM_CLI_SOURCE) {
+    try {
+      const pkgPath = path.join(
+        path.dirname(fileURLToPath(import.meta.url)),
+        '../../package.json'
+      );
+      const pkg = fs.readJsonSync(pkgPath);
+      if (typeof pkg.version === 'string' && pkg.version.trim()) {
+        return `^${pkg.version.trim()}`;
+      }
+    } catch {
+      // fall through
+    }
+    return 'latest';
+  }
+  // github: / file: specs are valid package.json dependency values as-is
+  return getCliInstallSpec(cliSource);
+}
+
 /**
  * Shell command to run deployhub build from the installed scoped package.
  * Uses node directly so it works reliably when installed from a private GitHub repo.
@@ -287,31 +316,51 @@ function upsertWorkflowEnvLine(envVars, lhs, valueExpr) {
   envVars.add(`${linePrefix}${valueExpr}`);
 }
 
+/**
+ * Enabled environment names from the live `environments` map (preferred over
+ * a possibly-stale `deploy[]` argument passed into workflow generators).
+ * @param {Record<string, { type?: string, method?: string }>} environments
+ * @returns {string[]}
+ */
+function listEnabledEnvironmentNames(environments) {
+  return Object.keys(environments || {}).filter((n) => isEnvEnabled(environments[n]));
+}
+
+/**
+ * Push-triggered enabled envs — same set `pipelineDeployTargets` deploys in GHA.
+ * @param {Record<string, { type?: string, method?: string }>} environments
+ * @returns {string[]}
+ */
+function listPushEnvironmentNames(environments) {
+  return listEnabledEnvironmentNames(environments).filter(
+    (n) => getEnvTrigger(environments[n]) === 'push'
+  );
+}
+
 /**
  * Shared env entries for deploy and rollback workflows (same secret resolution).
- * Multi-env: secrets are prefixed (PRODUCTION_SSH_HOST) but mapped to unprefixed
- * process env names the CLI already understands (SSH_HOST).
- *
- * Prefixed secret names are also exported as their own env vars so a single job can
- * carry credentials for every environment; deploy/rollback overlays them per target.
+ * Multi-env: each environment contributes its own CI secret names (grandfathered
+ * unprefixed SSH_HOST, or PRODUCTION_SSH_HOST, etc.). Prefixed envs are NOT
+ * last-wins-mapped onto unprefixed keys — that would overwrite the grandfathered
+ * binding and leave production looking fine in YAML while development silently
+ * inherits the wrong credentials. `applyEnvSecretOverlay` remaps PREFIX_* →
+ * unprefixed names at deploy time for non-grandfathered targets.
  *
  * @param {string[]} storageProviders
- * @param {string[]} deployEnvironments
+ * @param {string[]} deployEnvironments — environments whose secrets to inject
  * @param {Record<string, { type?: string, method?: string }>} environments
  * @param {import('../core/config.js').DeployHubConfig} [config]
- * @param {{ mapForEnv?: string|null }} [options] — when set, only map that env's secrets to unprefixed keys
  * @returns {Set<string>}
  */
 export function buildWorkflowEnvEntries(
   storageProviders,
   deployEnvironments,
   environments,
-  config = null,
-  options = {}
+  config = null
 ) {
   /** @type {Set<string>} */
   const envVars = new Set([
-    `DEPLOYHUB_ENV: ${options.mapForEnv || deployEnvironments[0] || 'production'}`,
+    `DEPLOYHUB_ENV: ${deployEnvironments[0] || 'production'}`,
   ]);
 
   for (const provider of storageProviders) {
@@ -321,13 +370,9 @@ export function buildWorkflowEnvEntries(
     }
   }
 
-  const targets = options.mapForEnv
-    ? [options.mapForEnv]
-    : deployEnvironments;
-
   const cfg = { ...(config || {}), environments };
 
-  for (const envName of targets) {
+  for (const envName of deployEnvironments) {
     const env = environments[envName];
     if (!env) continue;
 
@@ -338,26 +383,26 @@ export function buildWorkflowEnvEntries(
       const secretName = envUsesPrefixedSecrets(envName, cfg)
         ? prefixSecretKey(envName, key)
         : key;
-      // Keep every env's prefixed secret available under its full CI name.
-      if (secretName !== key) {
-        upsertWorkflowEnvLine(envVars, secretName, `\${{ secrets.${secretName} }}`);
-      }
-      // Unprefixed mapping for CLI defaults (last target wins in static YAML;
-      // applyEnvSecretOverlay restores the correct env's values at deploy time).
-      upsertWorkflowEnvLine(envVars, key, `\${{ secrets.${secretName} }}`);
+      // Bind process.env[secretName] for this environment (prefixed or grandfathered).
+      upsertWorkflowEnvLine(envVars, secretName, `\${{ secrets.${secretName} }}`);
     }
   }
 
-  applyKubernetesWorkflowEnv(targets, environments, envVars);
+  applyKubernetesWorkflowEnv(deployEnvironments, environments, envVars);
   return envVars;
 }
 
 /**
+ * Choice options for workflow_dispatch — enabled environments only, plus `all`.
+ * Disabled envs are omitted so selecting them cannot waste a CI run.
+ *
  * @param {Record<string, unknown>} environments
  * @returns {string}
  */
 function formatEnvironmentChoiceOptions(environments) {
-  const names = Object.keys(environments || {});
+  const names = Object.keys(environments || {}).filter((n) =>
+    isEnvEnabled(environments[n])
+  );
   const options = [...names, 'all'];
   return options.map((n) => `          - ${n}`).join('\n');
 }
@@ -412,25 +457,40 @@ export function generateWorkflowYaml(
   config = null
 ) {
   const envNames = Object.keys(environments || {});
+  // Secret injection must follow live environments (same as pipelineDeployTargets),
+  // not a possibly-stale deploy[] argument — otherwise push-deployed envs missing
+  // from deploy[] get no secrets in the job env block.
+  const enabledEnvs = listEnabledEnvironmentNames(environments);
+  const pushEnvs = listPushEnvironmentNames(environments);
   const allDeployNames =
-    deployEnvironments.length > 0 ? deployEnvironments : envNames.filter((n) => isEnvEnabled(environments[n]));
+    enabledEnvs.length > 0
+      ? enabledEnvs
+      : deployEnvironments.length > 0
+        ? deployEnvironments
+        : envNames;
 
-  // Push-triggered auto-deploy targets (build pipeline filters these in CI).
-  const pushEnvs = allDeployNames.filter(
-    (n) => isEnvEnabled(environments[n]) && getEnvTrigger(environments[n]) === 'push'
-  );
-
-  // Secrets for build job: storage + all push envs (or default if none are push).
+  // Build step: union of secrets for every push-triggered env (build deploys all of them).
   const buildSecretEnvs =
     pushEnvs.length > 0 ? pushEnvs : allDeployNames.slice(0, 1);
 
-  const envVars = buildWorkflowEnvEntries(
+  // workflow_dispatch step: union for ALL enabled envs (dropdown can pick any / all).
+  const dispatchSecretEnvs = allDeployNames;
+
+  const buildEnvVars = buildWorkflowEnvEntries(
     storageProviders,
     buildSecretEnvs,
     environments,
     config
   );
-  const envBlock = formatWorkflowEnvBlock(envVars);
+  const buildEnvBlock = formatWorkflowEnvBlock(buildEnvVars);
+
+  const dispatchEnvVars = buildWorkflowEnvEntries(
+    storageProviders,
+    dispatchSecretEnvs,
+    environments,
+    config
+  );
+  const dispatchEnvBlock = formatWorkflowEnvBlock(dispatchEnvVars);
 
   const installSpec = getCliInstallSpec(cliSource);
   const backendSteps = getBackendSetupSteps(config);
@@ -467,7 +527,7 @@ ${envChoiceOptions}
     ? `      - name: Deploy (workflow_dispatch)
         if: github.event_name == 'workflow_dispatch'
         env:
-${envBlock}
+${dispatchEnvBlock}
         run: |
           ENV_INPUT="\${{ inputs.environment }}"
           if [ -z "$ENV_INPUT" ] || [ "$ENV_INPUT" = "all" ]; then
@@ -497,7 +557,7 @@ ${kubernetesSteps}${githubGitConfigStep}      - name: Install project dependenci
       - name: Build (and auto-deploy push-triggered envs)
         run: ${getCliBuildCommand()}
         env:
-${envBlock}
+${buildEnvBlock}
 ${manualDeployStep}`;
 
   return workflow;
@@ -529,10 +589,13 @@ export function generateRollbackWorkflowYaml(
   config = null
 ) {
   const envNames = Object.keys(environments || {});
+  const enabledEnvs = listEnabledEnvironmentNames(environments);
   const allDeployNames =
-    deployEnvironments.length > 0
-      ? deployEnvironments
-      : envNames.filter((n) => isEnvEnabled(environments[n]));
+    enabledEnvs.length > 0
+      ? enabledEnvs
+      : deployEnvironments.length > 0
+        ? deployEnvironments
+        : envNames.filter((n) => isEnvEnabled(environments[n]));
 
   const envVars = buildWorkflowEnvEntries(
     storageProviders,
@@ -727,11 +790,14 @@ export function expectedWorkflowSecretKeysFromConfig(config, kind = 'rollback')
   /** @type {string[]} */
   let targets;
   if (kind === 'deploy') {
-    const enabled = allNames.filter((n) => isEnvEnabled(environments[n]));
-    const pushEnvs = enabled.filter((n) => getEnvTrigger(environments[n]) === 'push');
+    const pushEnvs = listPushEnvironmentNames(environments);
+    const enabled = listEnabledEnvironmentNames(environments);
+    // Deploy workflow Build step uses push envs; doctor also flags dispatch-needed
+    // secrets by using the broader enabled set via kind === 'rollback' / checklist.
     targets = pushEnvs.length > 0 ? pushEnvs : enabled.slice(0, 1);
   } else {
-    targets = allNames;
+    targets = allNames.length > 0 ? listEnabledEnvironmentNames(environments) : allNames;
+    if (targets.length === 0) targets = allNames;
   }
 
   const entries = buildWorkflowEnvEntries(
@@ -785,7 +851,7 @@ export function detectWorkflowConfigDrift(yamlText, config, filename = DEPLOY_WO
     return { drifted: false, missingEnvs, missingSecrets, summary: '' };
   }
 
-  const envNames = Object.keys(config.environments || {});
+  const envNames = listEnabledEnvironmentNames(config.environments || {});
   const root = /** @type {Record<string, any>} */ (parsed);
   const options = root?.on?.workflow_dispatch?.inputs?.environment?.options;
 
@@ -883,7 +949,9 @@ export async function addDeployhubToPackageJson(cliSource, cwd = process.cwd())
 
   const pkg = await fs.readJson(pkgPath);
   pkg.devDependencies = pkg.devDependencies || {};
-  pkg.devDependencies[NPM_PACKAGE] = getCliInstallSpec(cliSource);
+  // package.json value must be a semver range / "latest" / git URL — never "name@version"
+  // (that form is only for `npm install <spec>` via getCliInstallSpec).
+  pkg.devDependencies[NPM_PACKAGE] = getCliPackageJsonDependencyVersion(cliSource);
   delete pkg.devDependencies.deployhub;
   pkg.scripts = pkg.scripts || {};
   pkg.scripts['deployhub:build'] = 'deployhub build';