@akash-chowdhury-24/deployhub 1.0.11 → 1.0.13

package/package.json

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

package/src/commands/init.js

@@ -15,10 +15,8 @@ import {
   writeWorkflowFile,
   getRequiredSecrets,
   generateEnvExampleContent,
-  guessCliGithubRepo,
   addDeployhubToPackageJson,
-  isGithubCliSource,
-  normalizeGithubCliSource,
+  DEFAULT_NPM_CLI_SOURCE,
 } from '../utils/github-actions.js';
 import {
   promptPlatformQuestions,
@@ -365,7 +363,7 @@ export function registerInitCommand(program) {
       const detectedFrontend = detectFrontend(cwd);
       const detectedBackend = detectBackend(cwd);
       const defaultName = path.basename(cwd) || 'my-app';
-      const defaultCliRepo = await guessCliGithubRepo(cwd);
+      const cliSource = DEFAULT_NPM_CLI_SOURCE;
 
       const { projectName } = await inquirer.prompt([
         {
@@ -448,14 +446,6 @@ export function registerInitCommand(program) {
           message: 'Configure deployment?',
           default: false,
         },
-        {
-          type: 'input',
-          name: 'cliSource',
-          message:
-            'DeployHub CLI source for GitHub Actions (github:user/repo or npm:@akash-chowdhury-24/deployhub):',
-          default: defaultCliRepo,
-          filter: (value) => normalizeGithubCliSource(value),
-        },
       ]);
 
       /** @type {Record<string, Record<string, unknown>>} */
@@ -734,7 +724,7 @@ export function registerInitCommand(program) {
         },
         artifactRetention: 10,
         cli: {
-          source: answers.cliSource,
+          source: cliSource,
         },
       };
 
@@ -752,13 +742,13 @@ export function registerInitCommand(program) {
       }
 
       await saveConfig(config, cwd);
-      await addDeployhubToPackageJson(answers.cliSource, cwd);
+      await addDeployhubToPackageJson(cliSource, cwd);
       await writeWorkflowFile(
         config.storage,
         deploy,
         environments,
         cwd,
-        answers.cliSource,
+        cliSource,
         config
       );
 
@@ -784,24 +774,13 @@ export function registerInitCommand(program) {
       console.log('  • .env.example');
       console.log('');
       console.log(chalk.bold('Next steps:'));
-      if (isGithubCliSource(answers.cliSource)) {
-        console.log(
-          '  1. For a private DeployHub CLI repo, create a GitHub PAT with repo read access'
-        );
-        console.log(
-          `     and add it as ${chalk.cyan('DEPLOYHUB_GITHUB_TOKEN')} in your demo project secrets`
-        );
-        console.log('     (public CLI repos can skip this — HTTPS is used automatically)');
-      } else {
-        console.log('  1. Push the DeployHub CLI repo to GitHub (if using github: source)');
-      }
-      console.log('  2. Copy .env.example to .env and fill in credentials');
+      console.log('  1. Copy .env.example to .env and fill in credentials');
       if (secrets.length > 0) {
-        console.log('  3. Add these secrets to GitHub (Settings → Secrets):');
+        console.log('  2. Add these secrets to GitHub (Settings → Secrets):');
         secrets.forEach((s) => console.log(`     • ${s}`));
       }
-      console.log(`  ${secrets.length > 0 ? '4' : '3'}. Run ${chalk.cyan('deployhub doctor')} to verify your setup`);
-      console.log(`  ${secrets.length > 0 ? '5' : '4'}. Push to main — GitHub Actions will run ${chalk.cyan('deployhub build')} automatically`);
+      console.log(`  ${secrets.length > 0 ? '3' : '2'}. Run ${chalk.cyan('deployhub doctor')} to verify your setup`);
+      console.log(`  ${secrets.length > 0 ? '4' : '3'}. Push to main — GitHub Actions will run ${chalk.cyan('deployhub build')} automatically`);
       console.log('');
       printAuthorFooter();
     });

package/src/core/config.js

@@ -21,6 +21,7 @@ const EnvironmentSchema = z.object({
   accountId: z.string().optional(),
   appId: z.string().optional(),
   region: z.string().optional(),
+  branch: z.string().optional(),
   githubConnected: z.boolean().optional(),
   resourceName: z.string().optional(),
   projectId: z.string().optional(),

package/src/deployment/providers/platforms/aws-amplify.js

@@ -1,5 +1,6 @@
 import path from 'path';
 import fs from 'fs-extra';
+import archiver from 'archiver';
 import { execa } from 'execa';
 import { createLogger } from '../../../logger/index.js';
 import {
@@ -9,6 +10,25 @@ import {
   checkUrlHealth,
 } from './_shared.js';
 
+/**
+ * @param {string} sourceDir
+ * @param {string} zipPath
+ */
+async function createRootZip(sourceDir, zipPath) {
+  await fs.ensureDir(path.dirname(zipPath));
+  return new Promise((resolve, reject) => {
+    const output = fs.createWriteStream(zipPath);
+    const archive = archiver('zip', { zlib: { level: 9 } });
+
+    output.on('close', resolve);
+    archive.on('error', reject);
+
+    archive.pipe(output);
+    archive.directory(sourceDir, false);
+    archive.finalize();
+  });
+}
+
 /**
  * @param {import('../../../core/config.js').DeployHubConfig} config
  * @param {string} envName
@@ -19,21 +39,68 @@ export function createAwsAmplifyProvider(config, envName, env = process.env) {
   const log = createLogger('aws-amplify');
   const appId = environment?.appId || env.AMPLIFY_APP_ID;
   const region = environment?.region || env.AWS_REGION || 'us-east-1';
+  const branch = environment?.branch || env.AMPLIFY_BRANCH || 'main';
   const githubConnected = environment?.githubConnected ?? false;
 
-  async function deploy(artifactDir) {
-    if (!appId) throw new Error('AMPLIFY_APP_ID is required');
-
-    const awsEnv = {
+  function getAwsEnv() {
+    return {
       AWS_ACCESS_KEY_ID: env.AWS_ACCESS_KEY_ID || '',
       AWS_SECRET_ACCESS_KEY: env.AWS_SECRET_ACCESS_KEY || '',
       AWS_DEFAULT_REGION: region,
     };
+  }
+
+  /**
+   * @param {string} stage
+   */
+  function resolveAmplifyStage(stage) {
+    const normalized = stage.toLowerCase();
+    if (normalized === 'production') return 'PRODUCTION';
+    if (normalized === 'staging') return 'BETA';
+    return 'DEVELOPMENT';
+  }
+
+  async function branchExists(awsEnv) {
+    const result = await runCli(
+      `aws amplify get-branch --app-id ${appId} --branch-name ${branch}`,
+      process.cwd(),
+      awsEnv
+    );
+    return result.exitCode === 0;
+  }
+
+  async function ensureBranchExists(awsEnv) {
+    if (await branchExists(awsEnv)) return;
+
+    if (githubConnected) {
+      throw new Error(
+        `Amplify branch "${branch}" not found. Connect your GitHub repo in the Amplify console or choose a branch that already exists.`
+      );
+    }
+
+    const stage = resolveAmplifyStage(envName);
+    log.info(`Creating Amplify branch "${branch}" for manual zip deploys...`);
+    const createResult = await runCli(
+      `aws amplify create-branch --app-id ${appId} --branch-name ${branch} --stage ${stage} --no-enable-auto-build --description "Created by DeployHub for manual deployments"`,
+      process.cwd(),
+      awsEnv
+    );
+    if (createResult.exitCode !== 0) {
+      throw new Error(`Amplify create-branch failed: ${createResult.stderr || createResult.stdout}`);
+    }
+    log.success(`Amplify branch "${branch}" ready`);
+  }
+
+  async function deploy(artifactDir) {
+    if (!appId) throw new Error('AMPLIFY_APP_ID is required');
+
+    const awsEnv = getAwsEnv();
 
     if (githubConnected) {
-      log.info('Triggering Amplify release job (GitHub connected)...');
+      await ensureBranchExists(awsEnv);
+      log.info(`Triggering Amplify release job on branch ${branch} (GitHub connected)...`);
       const result = await runCli(
-        `aws amplify start-job --app-id ${appId} --branch-name main --job-type RELEASE`,
+        `aws amplify start-job --app-id ${appId} --branch-name ${branch} --job-type RELEASE`,
         process.cwd(),
         awsEnv
       );
@@ -50,6 +117,7 @@ export function createAwsAmplifyProvider(config, envName, env = process.env) {
           platform: 'aws-amplify',
           deploymentId: jobId,
           appId,
+          branch,
           method: 'github',
         },
         envName
@@ -58,14 +126,22 @@ export function createAwsAmplifyProvider(config, envName, env = process.env) {
       return;
     }
 
-    log.info('Uploading artifact zip to Amplify...');
-    const zipPath = path.join(artifactDir, 'artifact.zip');
-    if (!(await fs.pathExists(zipPath))) {
-      throw new Error('artifact.zip not found for Amplify upload');
+    log.info(`Uploading build output to Amplify branch ${branch}...`);
+    await ensureBranchExists(awsEnv);
+
+    const buildOutput = config.frontend?.buildOutput || config.buildOutput || 'dist';
+    const buildDir = path.join(process.cwd(), buildOutput);
+    if (!(await fs.pathExists(buildDir))) {
+      throw new Error(
+        `Build output not found at ${buildOutput}. Amplify needs the built static files, not artifact.zip with a nested folder.`
+      );
     }
 
+    const amplifyZipPath = path.join(artifactDir, 'amplify-deploy.zip');
+    await createRootZip(buildDir, amplifyZipPath);
+
     const createResult = await runCli(
-      `aws amplify create-deployment --app-id ${appId} --branch-name main --output json`,
+      `aws amplify create-deployment --app-id ${appId} --branch-name ${branch} --output json`,
       process.cwd(),
       awsEnv
     );
@@ -77,14 +153,14 @@ export function createAwsAmplifyProvider(config, envName, env = process.env) {
     const jobId = deployment.jobId;
     const zipUploadUrl = deployment.zipUploadUrl;
 
-    await execa('curl', ['-T', zipPath, zipUploadUrl], {
+    await execa('curl', ['-T', amplifyZipPath, zipUploadUrl], {
       env: { ...process.env, ...awsEnv },
       stdio: 'inherit',
       shell: true,
     });
 
     const startResult = await runCli(
-      `aws amplify start-deployment --app-id ${appId} --branch-name main --job-id ${jobId}`,
+      `aws amplify start-deployment --app-id ${appId} --branch-name ${branch} --job-id ${jobId}`,
       process.cwd(),
       awsEnv
     );
@@ -92,12 +168,15 @@ export function createAwsAmplifyProvider(config, envName, env = process.env) {
       throw new Error(`Amplify start-deployment failed: ${startResult.stderr}`);
     }
 
+    await fs.remove(amplifyZipPath);
+
     await saveDeploymentRecord(
       artifactDir,
       {
         platform: 'aws-amplify',
         deploymentId: jobId,
         appId,
+        branch,
         method: 'zip',
       },
       envName
@@ -114,21 +193,18 @@ export function createAwsAmplifyProvider(config, envName, env = process.env) {
       throw new Error('No previous Amplify job ID found for rollback');
     }
 
-    const awsEnv = {
-      AWS_ACCESS_KEY_ID: env.AWS_ACCESS_KEY_ID || '',
-      AWS_SECRET_ACCESS_KEY: env.AWS_SECRET_ACCESS_KEY || '',
-      AWS_DEFAULT_REGION: region,
-    };
+    const awsEnv = getAwsEnv();
+    const rollbackBranch = previous?.branch || branch;
 
-    log.info(`Re-triggering Amplify job ${jobId}...`);
+    log.info(`Re-triggering Amplify job ${jobId} on branch ${rollbackBranch}...`);
     const result = await runCli(
-      `aws amplify start-job --app-id ${appId} --branch-name main --job-id ${jobId} --job-type RETRY`,
+      `aws amplify start-job --app-id ${appId} --branch-name ${rollbackBranch} --job-id ${jobId} --job-type RETRY`,
       process.cwd(),
       awsEnv
     );
     if (result.exitCode !== 0) {
       await runCli(
-        `aws amplify start-job --app-id ${appId} --branch-name main --job-type RELEASE`,
+        `aws amplify start-job --app-id ${appId} --branch-name ${rollbackBranch} --job-type RELEASE`,
         process.cwd(),
         awsEnv
       );
@@ -144,18 +220,28 @@ export function createAwsAmplifyProvider(config, envName, env = process.env) {
 
   async function testConnection() {
     if (!appId) throw new Error('AMPLIFY_APP_ID is required');
-    const result = await runCli(
+
+    const awsEnv = getAwsEnv();
+    const appResult = await runCli(
       `aws amplify get-app --app-id ${appId}`,
       process.cwd(),
-      {
-        AWS_ACCESS_KEY_ID: env.AWS_ACCESS_KEY_ID || '',
-        AWS_SECRET_ACCESS_KEY: env.AWS_SECRET_ACCESS_KEY || '',
-        AWS_DEFAULT_REGION: region,
-      }
+      awsEnv
     );
-    if (result.exitCode !== 0) {
+    if (appResult.exitCode !== 0) {
       throw new Error('Could not find Amplify app — check AMPLIFY_APP_ID and AWS credentials');
     }
+
+    if (await branchExists(awsEnv)) return;
+
+    if (githubConnected) {
+      throw new Error(
+        `Amplify branch "${branch}" not found. Connect your GitHub repo in the Amplify console or choose a branch that already exists.`
+      );
+    }
+
+    log.info(
+      `Amplify branch "${branch}" will be created automatically on the first deploy`
+    );
   }
 
   return { deploy, rollback, healthCheck, testConnection };

package/src/utils/github-actions.js

@@ -60,7 +60,7 @@ const ENV_VAR_DEFAULTS = {
 };
 
 const NPM_PACKAGE = '@akash-chowdhury-24/deployhub';
-const DEFAULT_NPM_CLI_SOURCE = `npm:${NPM_PACKAGE}`;
+export const DEFAULT_NPM_CLI_SOURCE = `npm:${NPM_PACKAGE}`;
 export const GITHUB_CLI_TOKEN_SECRET = 'DEPLOYHUB_GITHUB_TOKEN';
 
 /**

package/src/utils/init-platform.js

@@ -104,6 +104,12 @@ export async function promptPlatformQuestions(
           message: 'AWS region:',
           default: 'us-east-1',
         },
+        {
+          type: 'input',
+          name: 'branch',
+          message: 'Amplify branch name (auto-created for manual zip deploys):',
+          default: 'main',
+        },
         {
           type: 'confirm',
           name: 'githubConnected',
@@ -113,6 +119,7 @@ export async function promptPlatformQuestions(
       ]);
       config.appId = answers.appId;
       config.region = answers.region;
+      config.branch = answers.branch;
       config.githubConnected = answers.githubConnected;
       break;
     }