@wyxos/zephyr 0.8.1 → 0.8.2

package/README.md

@@ -118,7 +118,7 @@ For Laravel app deployments, `--maintenance on|off` overrides both the saved pre
 
 `--skip-versioning` keeps Zephyr from mutating `package.json` or `composer.json`. On app deploys it skips the local npm version bump step. On package release workflows it releases the version already present in the manifest and creates the release tag from the current `HEAD`.
 
-`--then-deploy <path>` is available for `--type node` and `--type vue` package releases. After the package release succeeds and the published version is visible on npm, Zephyr updates the local consumer repository, commits the consumer dependency change, and deploys that consumer through its normal Zephyr app-deploy preset. Use `--consumer-preset <name>` to choose the app preset and `--consumer-package <name>` when the consumer dependency name differs from the released package name. Consumer lockfiles are refreshed only when the consumer repository already tracks an npm lockfile; Zephyr does not create or commit server-side lockfiles.
+`--then-deploy <path>` is available for `--type node` and `--type vue` package releases. After the package release succeeds and the published version is visible on npm, Zephyr updates the local consumer repository, commits the consumer dependency change, and deploys that consumer through its normal Zephyr app-deploy preset. Use `--consumer-preset <name>` to choose the app preset and `--consumer-package <name>` when the consumer dependency name differs from the released package name. Pass `--consumer-auto-commit` when the consumer app may already have pending changes; Zephyr will stage, commit, and push all pending consumer changes before applying the dependency bump. Consumer lockfiles are refreshed only when the consumer repository already tracks an npm lockfile; Zephyr does not create or commit server-side lockfiles.
 
 ## AI Agents and Automation
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wyxos/zephyr",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "A streamlined deployment tool for web applications with intelligent Laravel project detection",
   "type": "module",
   "main": "./src/index.mjs",

package/src/application/consumer/release-package-then-deploy-consumer.mjs

@@ -12,7 +12,7 @@ import {resolvePendingSnapshot} from '../deploy/resolve-pending-snapshot.mjs'
 import {runDeployment} from '../deploy/run-deployment.mjs'
 import {waitForNpmPackageVersion} from './npm-publish-wait.mjs'
 import {
-  assertCleanConsumerRepo,
+  ensureConsumerRepoReady,
   updateConsumerDependency
 } from './update-consumer-dependency.mjs'
 
@@ -113,7 +113,7 @@ export async function releasePackageThenDeployConsumer({
   createAppContextImpl = createAppContext,
   waitForNpmPackageVersionImpl = waitForNpmPackageVersion,
   updateConsumerDependencyImpl = updateConsumerDependency,
-  assertCleanConsumerRepoImpl = assertCleanConsumerRepo,
+  ensureConsumerRepoReadyImpl = ensureConsumerRepoReady,
   validateLocalDependenciesImpl = validateLocalDependencies,
   selectDeploymentTargetImpl = selectDeploymentTarget,
   resolvePendingSnapshotImpl = resolvePendingSnapshot,
@@ -158,7 +158,16 @@ export async function releasePackageThenDeployConsumer({
   const configurationService = createConfigurationService(context)
 
   logProcessing?.(`Preparing consumer app at ${resolvedConsumerRootDir}...`)
-  await assertCleanConsumerRepoImpl(resolvedConsumerRootDir, {runCommandCapture})
+  await ensureConsumerRepoReadyImpl(resolvedConsumerRootDir, {
+    runCommand,
+    runCommandCapture,
+    runPrompt,
+    logProcessing,
+    logSuccess,
+    logWarning,
+    autoCommit: executionMode.autoCommit,
+    skipGitHooks: executionMode.skipGitHooks
+  })
 
   await bootstrapImpl.ensureGitignoreEntry(resolvedConsumerRootDir, {
     runCommand,
@@ -226,6 +235,8 @@ export async function releasePackageThenDeployConsumer({
     logProcessing,
     logSuccess,
     logWarning,
+    runPrompt,
+    autoCommit: executionMode.autoCommit,
     skipGitHooks: executionMode.skipGitHooks
   })
 

package/src/application/consumer/update-consumer-dependency.mjs

@@ -1,7 +1,12 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
 
-import {gitCommitArgs} from '../../utils/git-hooks.mjs'
+import {
+  formatWorkingTreePreview,
+  parseWorkingTreeEntries,
+  suggestReleaseCommitMessage as suggestCommitMessageImpl
+} from '../../release/commit-message.mjs'
+import {gitCommitArgs, gitPushArgs} from '../../utils/git-hooks.mjs'
 
 const DEPENDENCY_FIELDS = [
   'dependencies',
@@ -55,6 +60,113 @@ export async function assertCleanConsumerRepo(rootDir, {runCommandCapture} = {})
   }
 }
 
+function normalizeCommandOutput(output) {
+  return typeof output === 'string' ? output : output?.stdout ?? ''
+}
+
+function createCaptureAwareRunCommand({runCommand, runCommandCapture}) {
+  return async (command, args, {capture = false, cwd} = {}) => {
+    if (capture) {
+      const captured = await runCommandCapture(command, args, {cwd})
+
+      if (typeof captured === 'string') {
+        return {stdout: captured.trim(), stderr: ''}
+      }
+
+      const stdout = captured?.stdout ?? ''
+      const stderr = captured?.stderr ?? ''
+      return {stdout: stdout.trim(), stderr: stderr.trim()}
+    }
+
+    await runCommand(command, args, {cwd})
+    return undefined
+  }
+}
+
+export async function ensureConsumerRepoReady(rootDir, {
+  runCommand,
+  runCommandCapture,
+  runPrompt,
+  logProcessing,
+  logSuccess,
+  logWarning,
+  autoCommit = false,
+  skipGitHooks = false,
+  suggestCommitMessage = suggestCommitMessageImpl
+} = {}) {
+  if (typeof runCommandCapture !== 'function') {
+    throw new Error('Consumer repository checks require a command capture runner.')
+  }
+
+  const status = normalizeCommandOutput(await runCommandCapture('git', ['status', '--porcelain'], {cwd: rootDir}))
+  const statusEntries = parseWorkingTreeEntries(status)
+
+  if (statusEntries.length === 0) {
+    return {committed: false, pushed: false}
+  }
+
+  if (!autoCommit && typeof runPrompt !== 'function') {
+    throw new Error('Consumer repository has uncommitted changes. Commit, stash, or clean them before running a package-to-consumer release.')
+  }
+
+  if (typeof runCommand !== 'function') {
+    throw new Error('Consumer repository auto-commit requires a command runner.')
+  }
+
+  const captureAwareRunCommand = createCaptureAwareRunCommand({runCommand, runCommandCapture})
+  const suggestedCommitMessage = await suggestCommitMessage(rootDir, {
+    runCommand: captureAwareRunCommand,
+    logStep: logProcessing,
+    logWarning,
+    statusEntries
+  })
+  let message = suggestedCommitMessage?.trim() ?? ''
+
+  if (autoCommit) {
+    if (!message) {
+      throw new Error('Consumer auto-commit failed because Codex could not determine a usable commit message.')
+    }
+
+    logProcessing?.(`Consumer auto-commit enabled. Using Codex-generated commit message "${message}".`)
+  } else {
+    const {commitMessage} = await runPrompt([
+      {
+        type: 'input',
+        name: 'commitMessage',
+        message:
+          'Pending changes detected in the consumer repository:\n\n' +
+          `${formatWorkingTreePreview(statusEntries)}\n\n` +
+          'Enter a commit message to stage, commit, and push all current consumer changes before continuing.\n' +
+          'Leave blank to cancel.',
+        default: message
+      }
+    ])
+
+    if (!commitMessage || commitMessage.trim().length === 0) {
+      throw new Error('Consumer release cancelled: pending changes were not committed.')
+    }
+
+    message = commitMessage.trim()
+  }
+
+  logProcessing?.('Staging all pending consumer changes before dependency update...')
+  await runCommand('git', ['add', '-A'], {cwd: rootDir})
+
+  logProcessing?.('Committing pending consumer changes before dependency update...')
+  await runCommand('git', gitCommitArgs(['-m', message], {skipGitHooks}), {cwd: rootDir})
+
+  logProcessing?.('Pushing pending consumer changes before dependency update...')
+  await runCommand('git', gitPushArgs([], {skipGitHooks}), {cwd: rootDir})
+
+  const finalStatus = normalizeCommandOutput(await runCommandCapture('git', ['status', '--porcelain'], {cwd: rootDir}))
+  if (parseWorkingTreeEntries(finalStatus).length > 0) {
+    throw new Error('Consumer repository still has uncommitted changes after auto-commit. Aborting package-to-consumer release.')
+  }
+
+  logSuccess?.(`Committed and pushed consumer changes with "${message}".`)
+  return {committed: true, pushed: true, message}
+}
+
 async function isTracked(rootDir, filePath, {runCommandCapture} = {}) {
   try {
     await runCommandCapture('git', ['ls-files', '--error-unmatch', filePath], {cwd: rootDir})
@@ -91,10 +203,13 @@ export async function updateConsumerDependency({
   version,
   runCommand,
   runCommandCapture,
+  runPrompt,
   logProcessing,
   logSuccess,
   logWarning,
-  skipGitHooks = false
+  autoCommit = false,
+  skipGitHooks = false,
+  suggestCommitMessage = suggestCommitMessageImpl
 } = {}) {
   if (!rootDir) {
     throw new Error('Consumer root directory is required.')
@@ -112,7 +227,17 @@ export async function updateConsumerDependency({
     throw new Error('Consumer dependency updates require command runners.')
   }
 
-  await assertCleanConsumerRepo(rootDir, {runCommandCapture})
+  await ensureConsumerRepoReady(rootDir, {
+    runCommand,
+    runCommandCapture,
+    runPrompt,
+    logProcessing,
+    logSuccess,
+    logWarning,
+    autoCommit,
+    skipGitHooks,
+    suggestCommitMessage
+  })
 
   const pkg = await readPackageJson(rootDir)
   const dependencyField = findDependencyField(pkg, packageName)