@wyxos/zephyr 0.6.0 → 0.7.4

package/src/main.mjs

@@ -11,6 +11,7 @@ import * as bootstrap from './project/bootstrap.mjs'
 import {getErrorCode, ZephyrError} from './runtime/errors.mjs'
 import {PROJECT_CONFIG_DIR} from './utils/paths.mjs'
 import {writeStderrLine} from './utils/output.mjs'
+import {mergeDeployOptions} from './config/preset-options.mjs'
 import {createAppContext} from './runtime/app-context.mjs'
 import {createConfigurationService} from './application/configuration/service.mjs'
 import {selectDeploymentTarget} from './application/configuration/select-deployment-target.mjs'
@@ -35,12 +36,21 @@ function normalizeMainOptions(firstArg = null, secondArg = null) {
             resumePending: firstArg.resumePending === true,
             discardPending: firstArg.discardPending === true,
             maintenanceMode: firstArg.maintenanceMode ?? null,
+            autoCommit: firstArg.autoCommit === true,
+            skipVersioning: firstArg.skipVersioning === true,
             skipGitHooks: firstArg.skipGitHooks === true,
             skipChecks: firstArg.skipChecks === true,
             skipTests: firstArg.skipTests === true || firstArg.skipChecks === true,
             skipLint: firstArg.skipLint === true || firstArg.skipChecks === true,
             skipBuild: firstArg.skipBuild === true,
             skipDeploy: firstArg.skipDeploy === true,
+            explicitMaintenanceMode: firstArg.explicitMaintenanceMode === true || 'maintenanceMode' in firstArg,
+            explicitAutoCommit: firstArg.explicitAutoCommit === true || 'autoCommit' in firstArg,
+            explicitSkipVersioning: firstArg.explicitSkipVersioning === true || 'skipVersioning' in firstArg,
+            explicitSkipGitHooks: firstArg.explicitSkipGitHooks === true || 'skipGitHooks' in firstArg,
+            explicitSkipChecks: firstArg.explicitSkipChecks === true || 'skipChecks' in firstArg,
+            explicitSkipTests: firstArg.explicitSkipTests === true || 'skipTests' in firstArg || 'skipChecks' in firstArg,
+            explicitSkipLint: firstArg.explicitSkipLint === true || 'skipLint' in firstArg || 'skipChecks' in firstArg,
             context: firstArg.context ?? null
         }
     }
@@ -54,12 +64,21 @@ function normalizeMainOptions(firstArg = null, secondArg = null) {
         resumePending: false,
         discardPending: false,
         maintenanceMode: null,
+        autoCommit: false,
+        skipVersioning: false,
         skipGitHooks: false,
         skipChecks: false,
         skipTests: false,
         skipLint: false,
         skipBuild: false,
         skipDeploy: false,
+        explicitMaintenanceMode: false,
+        explicitAutoCommit: false,
+        explicitSkipVersioning: false,
+        explicitSkipGitHooks: false,
+        explicitSkipChecks: false,
+        explicitSkipTests: false,
+        explicitSkipLint: false,
         context: null
     }
 }
@@ -110,12 +129,21 @@ async function main(optionsOrWorkflowType = null, versionArg = null) {
         workflow: resolveWorkflowName(options.workflowType),
         presetName: options.presetName,
         maintenanceMode: options.maintenanceMode,
+        autoCommit: options.autoCommit === true,
+        skipVersioning: options.skipVersioning === true,
         skipGitHooks: options.skipGitHooks === true,
         skipChecks: options.skipChecks === true,
         skipTests: options.skipTests === true,
         skipLint: options.skipLint === true,
         resumePending: options.resumePending,
-        discardPending: options.discardPending
+        discardPending: options.discardPending,
+        explicitMaintenanceMode: options.explicitMaintenanceMode === true,
+        explicitAutoCommit: options.explicitAutoCommit === true,
+        explicitSkipVersioning: options.explicitSkipVersioning === true,
+        explicitSkipGitHooks: options.explicitSkipGitHooks === true,
+        explicitSkipChecks: options.explicitSkipChecks === true,
+        explicitSkipTests: options.explicitSkipTests === true,
+        explicitSkipLint: options.explicitSkipLint === true
     }
     const appContext = options.context ?? createAppContext({executionMode})
     const {
@@ -127,7 +155,11 @@ async function main(optionsOrWorkflowType = null, versionArg = null) {
         runCommand,
         emitEvent
     } = appContext
-    const currentExecutionMode = appContext.executionMode ?? executionMode
+    let currentExecutionMode = {
+        ...executionMode,
+        ...(appContext.executionMode ?? {})
+    }
+    appContext.executionMode = currentExecutionMode
     const configurationService = createConfigurationService(appContext)
 
     try {
@@ -142,6 +174,8 @@ async function main(optionsOrWorkflowType = null, versionArg = null) {
                     nonInteractive: currentExecutionMode.interactive === false,
                     presetName: currentExecutionMode.presetName,
                     maintenanceMode: currentExecutionMode.maintenanceMode,
+                    autoCommit: currentExecutionMode.autoCommit === true,
+                    skipVersioning: currentExecutionMode.skipVersioning === true,
                     skipGitHooks: currentExecutionMode.skipGitHooks === true,
                     skipChecks: currentExecutionMode.skipChecks === true,
                     skipTests: currentExecutionMode.skipTests === true,
@@ -170,6 +204,7 @@ async function main(optionsOrWorkflowType = null, versionArg = null) {
                 skipGitHooks: options.skipGitHooks,
                 skipTests: options.skipTests,
                 skipLint: options.skipLint,
+                skipVersioning: options.skipVersioning,
                 skipBuild: options.skipBuild,
                 skipDeploy: options.skipDeploy,
                 context: appContext
@@ -198,6 +233,7 @@ async function main(optionsOrWorkflowType = null, versionArg = null) {
                 skipGitHooks: options.skipGitHooks,
                 skipTests: options.skipTests,
                 skipLint: options.skipLint,
+                skipVersioning: options.skipVersioning,
                 context: appContext
             })
             emitEvent?.('run_completed', {
@@ -249,7 +285,7 @@ async function main(optionsOrWorkflowType = null, versionArg = null) {
             })
         }
 
-        const {deploymentConfig} = await selectDeploymentTarget(rootDir, {
+        const {deploymentConfig, presetState} = await selectDeploymentTarget(rootDir, {
             configurationService,
             runPrompt,
             logProcessing,
@@ -259,6 +295,19 @@ async function main(optionsOrWorkflowType = null, versionArg = null) {
             executionMode: currentExecutionMode
         })
 
+        if (presetState) {
+            const effectiveDeployOptions = mergeDeployOptions(currentExecutionMode, presetState.options)
+            currentExecutionMode = {
+                ...currentExecutionMode,
+                presetName: presetState.name,
+                ...effectiveDeployOptions,
+                skipChecks: currentExecutionMode.skipChecks === true ||
+                    (effectiveDeployOptions.skipTests === true && effectiveDeployOptions.skipLint === true)
+            }
+            appContext.executionMode = currentExecutionMode
+            await presetState.applyExecutionMode(currentExecutionMode)
+        }
+
         const snapshotToUse = await resolvePendingSnapshot(rootDir, deploymentConfig, {
             runPrompt,
             logProcessing,
@@ -270,7 +319,8 @@ async function main(optionsOrWorkflowType = null, versionArg = null) {
             rootDir,
             snapshot: snapshotToUse,
             versionArg: options.versionArg,
-            context: appContext
+            context: appContext,
+            presetState
         })
 
         emitEvent?.('run_completed', {

package/src/release/commit-message.mjs

@@ -24,8 +24,6 @@ const GENERIC_SUBJECT_PATTERNS = [
   /^(improve|update|adjust|refine|align|support|enable)\s+.+\s+(workflow|process|flow)$/i
 ]
 const MAX_WORKING_TREE_PREVIEW = 20
-const MAX_DIFF_EXCERPT_LINES = 60
-const MAX_DIFF_EXCERPT_CHARS = 4000
 const STATUS_LABELS = {
   A: 'added',
   C: 'copied',
@@ -35,59 +33,6 @@ const STATUS_LABELS = {
   T: 'type-changed',
   U: 'conflicted'
 }
-const TOPIC_STOP_WORDS = new Set([
-  'src',
-  'test',
-  'tests',
-  '__tests__',
-  'spec',
-  'specs',
-  'app',
-  'lib',
-  'dist',
-  'packages',
-  'package',
-  'application',
-  'shared',
-  'index',
-  'main',
-  'local',
-  'repo',
-  'prepare',
-  'commit',
-  'message',
-  'js',
-  'jsx',
-  'ts',
-  'tsx',
-  'mjs',
-  'cjs',
-  'php',
-  'json',
-  'yaml',
-  'yml',
-  'md',
-  'toml',
-  'lock'
-])
-
-function buildTargetedFallbackCommitMessage(statusEntries = []) {
-  const paths = statusEntries.map((entry) => entry.path.toLowerCase())
-  const touchesDeployPrep = paths.some((pathValue) => pathValue.includes('prepare-local-deployment'))
-  const touchesLocalRepo = paths.some((pathValue) => pathValue.includes('local-repo'))
-  const touchesCommitMessage = paths.some((pathValue) => pathValue.includes('commit-message'))
-  const touchesReleaseFlow = paths.some((pathValue) => pathValue.includes('/release/') || pathValue.includes('release-'))
-
-  if (touchesDeployPrep && touchesLocalRepo) {
-    return 'fix: prompt for dirty deploy changes before version bump'
-  }
-
-  if (touchesCommitMessage && touchesReleaseFlow) {
-    return 'fix: tighten release commit suggestions'
-  }
-
-  return null
-}
 
 function resolveWorkingTreeEntryLabel(entry) {
   if (entry.indexStatus === '?' && entry.worktreeStatus === '?') {
@@ -108,32 +53,6 @@ function resolveWorkingTreeEntryLabel(entry) {
   return 'changed'
 }
 
-function tokenizePath(pathValue = '') {
-  return pathValue
-    .split(/[\\/]/)
-    .flatMap((segment) => segment.split(/[^a-zA-Z0-9]+/))
-    .map((token) => token.toLowerCase())
-    .filter((token) => token.length >= 3 && !TOPIC_STOP_WORDS.has(token))
-}
-
-function inferCommitTypeFromEntries(statusEntries = []) {
-  const paths = statusEntries.map((entry) => entry.path.toLowerCase())
-
-  if (paths.every((pathValue) => pathValue.endsWith('.md') || pathValue.includes('/docs/') || pathValue.startsWith('docs/'))) {
-    return 'docs'
-  }
-
-  if (paths.every((pathValue) => /\.test\.[^.]+$/.test(pathValue) || pathValue.includes('/tests/'))) {
-    return 'test'
-  }
-
-  if (paths.some((pathValue) => pathValue.includes('.github/workflows/') || pathValue.includes('/ci/'))) {
-    return 'ci'
-  }
-
-  return 'chore'
-}
-
 export function parseWorkingTreeStatus(stdout = '') {
   return stdout
     .split(/\r?\n/)
@@ -228,148 +147,11 @@ export function sanitizeSuggestedCommitMessage(message) {
   return normalized
 }
 
-export function buildFallbackCommitMessage(statusEntries = []) {
-  const targetedFallback = buildTargetedFallbackCommitMessage(statusEntries)
-  if (targetedFallback) {
-    return targetedFallback
-  }
-
-  const tokenCounts = new Map()
-
-  for (const entry of statusEntries) {
-    for (const token of tokenizePath(entry.path)) {
-      tokenCounts.set(token, (tokenCounts.get(token) ?? 0) + 1)
-    }
-  }
-
-  const orderedTokens = Array.from(tokenCounts.entries())
-    .sort((left, right) => {
-      if (right[1] !== left[1]) {
-        return right[1] - left[1]
-      }
-
-      return left[0].localeCompare(right[0])
-    })
-    .map(([token]) => token)
-
-  const primaryTopic = orderedTokens[0] ?? 'release'
-  const commitType = inferCommitTypeFromEntries(statusEntries)
-
-  if (commitType === 'docs') {
-    return `docs: update ${primaryTopic} documentation`
-  }
-
-  if (commitType === 'test') {
-    return `test: expand ${primaryTopic} coverage`
-  }
-
-  if (commitType === 'ci') {
-    return `ci: update ${primaryTopic} pipeline`
-  }
-
-  return `chore: update ${primaryTopic} handling`
-}
-
-async function collectDiffNumstat(rootDir, {runCommand} = {}) {
-  try {
-    const {stdout} = await runCommand('git', ['diff', '--numstat', 'HEAD', '--'], {
-      capture: true,
-      cwd: rootDir
-    })
-
-    return stdout
-      .split(/\r?\n/)
-      .map((line) => line.trim())
-      .filter(Boolean)
-      .reduce((map, line) => {
-        const [addedRaw, deletedRaw, filePath] = line.split('\t')
-        if (!filePath) {
-          return map
-        }
-
-        const added = Number.parseInt(addedRaw, 10)
-        const deleted = Number.parseInt(deletedRaw, 10)
-        map.set(filePath, {
-          added: Number.isFinite(added) ? added : 0,
-          deleted: Number.isFinite(deleted) ? deleted : 0
-        })
-        return map
-      }, new Map())
-  } catch {
-    return new Map()
-  }
-}
-
-function shouldIncludeDiffExcerptLine(line = '') {
-  if (line.startsWith('diff --git ')) {
-    return true
-  }
-
-  if (line.startsWith('@@')) {
-    return true
-  }
-
-  return (line.startsWith('+') || line.startsWith('-')) && !line.startsWith('+++') && !line.startsWith('---')
-}
-
-function trimDiffExcerpt(diffText = '') {
-  const selectedLines = []
-  let totalChars = 0
-
-  for (const rawLine of diffText.split(/\r?\n/)) {
-    const line = rawLine.trimEnd()
-
-    if (!shouldIncludeDiffExcerptLine(line)) {
-      continue
-    }
-
-    const truncatedLine = line.length > 180 ? `${line.slice(0, 177)}...` : line
-    const nextTotal = totalChars + truncatedLine.length + 1
-
-    if (selectedLines.length >= MAX_DIFF_EXCERPT_LINES || nextTotal > MAX_DIFF_EXCERPT_CHARS) {
-      break
-    }
-
-    selectedLines.push(truncatedLine)
-    totalChars = nextTotal
-  }
-
-  return selectedLines.join('\n')
-}
-
-async function collectDiffExcerpt(rootDir, {runCommand} = {}) {
-  try {
-    const {stdout} = await runCommand('git', ['diff', '--unified=0', '--no-color', 'HEAD', '--'], {
-      capture: true,
-      cwd: rootDir
-    })
-
-    return trimDiffExcerpt(stdout)
-  } catch {
-    return ''
-  }
-}
-
-async function buildCommitMessageContext(rootDir, {
-  runCommand,
-  statusEntries = []
-} = {}) {
-  const changeCountsByPath = await collectDiffNumstat(rootDir, {runCommand})
-  const summary = statusEntries.map((entry) => `- ${summarizeWorkingTreeEntry(entry, {changeCountsByPath})}`).join('\n')
-  const diffExcerpt = await collectDiffExcerpt(rootDir, {runCommand})
-
-  return {
-    summary,
-    diffExcerpt
-  }
-}
-
 export async function suggestCommitMessage(rootDir = process.cwd(), {
   runCommand,
   commandExistsImpl = commandExists,
   logStep,
-  logWarning,
-  statusEntries = []
+  logWarning
 } = {}) {
   if (!commandExistsImpl('codex')) {
     return null
@@ -380,28 +162,9 @@ export async function suggestCommitMessage(rootDir = process.cwd(), {
   try {
     tempDir = await mkdtemp(path.join(tmpdir(), 'zephyr-release-commit-'))
     const outputPath = path.join(tempDir, 'codex-last-message.txt')
-    const commitContext = await buildCommitMessageContext(rootDir, {
-      runCommand,
-      statusEntries
-    })
 
     logStep?.('Generating a suggested commit message with Codex...')
 
-    const promptSections = [
-      'Write exactly one short conventional commit message for these pending changes.',
-      'Use the exact format "<type>: <subject>" with no scope, no exclamation mark, and no extra text.',
-      'Choose the most appropriate type from: fix, feat, chore, docs, refactor, test, style, perf, build, ci, revert.',
-      'Base the subject on the actual behavior, safeguard, bug fix, feature, or API change shown below.',
-      'Avoid generic nouns like "workflow", "process", "flow", "changes", or "updates" unless the diff truly changes CI or docs.',
-      'Do not describe the commit itself, staging, or "pending changes"; describe the underlying code or product change.',
-      'Pending change summary:',
-      commitContext.summary || '- changed files present'
-    ]
-
-    if (commitContext.diffExcerpt) {
-      promptSections.push('Diff excerpt:', commitContext.diffExcerpt)
-    }
-
     await runCommand('codex', [
       'exec',
       '--ephemeral',
@@ -412,7 +175,13 @@ export async function suggestCommitMessage(rootDir = process.cwd(), {
       '--skip-git-repo-check',
       '--output-last-message',
       outputPath,
-      promptSections.join('\n\n')
+      [
+        'Inspect the current repository and decide the best conventional commit message for the pending changes.',
+        'Use whatever read-only inspection you need.',
+        'Reply with exactly one line in the format "<type>: <subject>".',
+        'Do not use scopes like "fix(scope): ...".',
+        'Do not include extra text.'
+      ].join('\n\n')
     ], {
       capture: true,
       cwd: rootDir

package/src/release-node.mjs

@@ -9,6 +9,7 @@ function hasExplicitReleaseOptions(options = {}) {
         'skipGitHooks',
         'skipTests',
         'skipLint',
+        'skipVersioning',
         'skipBuild',
         'skipDeploy'
     ].some((key) => key in options)
@@ -21,12 +22,17 @@ export async function releaseNode(options = {}) {
             skipGitHooks: options.skipGitHooks === true,
             skipTests: options.skipTests === true,
             skipLint: options.skipLint === true,
+            skipVersioning: options.skipVersioning === true,
             skipBuild: options.skipBuild === true,
             skipDeploy: options.skipDeploy === true
         }
         : parseReleaseArgs({
-            booleanFlags: ['--skip-git-hooks', '--skip-tests', '--skip-lint', '--skip-build', '--skip-deploy']
+            booleanFlags: ['--skip-git-hooks', '--skip-tests', '--skip-lint', '--skip-versioning', '--skip-build', '--skip-deploy']
         })
+
+    if (parsed.skipVersioning && parsed.releaseType) {
+        throw new Error('--skip-versioning cannot be used together with an explicit version or bump argument.')
+    }
     const rootDir = options.rootDir ?? process.cwd()
     const context = options.context ?? createAppContext({
         executionMode: {
@@ -42,6 +48,7 @@ export async function releaseNode(options = {}) {
         skipGitHooks: parsed.skipGitHooks === true || executionMode?.skipGitHooks === true,
         skipTests: parsed.skipTests === true,
         skipLint: parsed.skipLint === true,
+        skipVersioning: parsed.skipVersioning === true,
         skipBuild: parsed.skipBuild === true,
         skipDeploy: parsed.skipDeploy === true,
         rootDir,

package/src/release-packagist.mjs

@@ -8,7 +8,8 @@ function hasExplicitReleaseOptions(options = {}) {
         'releaseType',
         'skipGitHooks',
         'skipTests',
-        'skipLint'
+        'skipLint',
+        'skipVersioning'
     ].some((key) => key in options)
 }
 
@@ -18,11 +19,16 @@ export async function releasePackagist(options = {}) {
             releaseType: 'releaseType' in options ? (options.releaseType ?? null) : null,
             skipGitHooks: options.skipGitHooks === true,
             skipTests: options.skipTests === true,
-            skipLint: options.skipLint === true
+            skipLint: options.skipLint === true,
+            skipVersioning: options.skipVersioning === true
         }
         : parseReleaseArgs({
-            booleanFlags: ['--skip-git-hooks', '--skip-tests', '--skip-lint']
+            booleanFlags: ['--skip-git-hooks', '--skip-tests', '--skip-lint', '--skip-versioning']
         })
+
+    if (parsed.skipVersioning && parsed.releaseType) {
+        throw new Error('--skip-versioning cannot be used together with an explicit version or bump argument.')
+    }
     const rootDir = options.rootDir ?? process.cwd()
     const context = options.context ?? createAppContext({
         executionMode: {
@@ -38,6 +44,7 @@ export async function releasePackagist(options = {}) {
         skipGitHooks: parsed.skipGitHooks === true || executionMode?.skipGitHooks === true,
         skipTests: parsed.skipTests === true,
         skipLint: parsed.skipLint === true,
+        skipVersioning: parsed.skipVersioning === true,
         rootDir,
         logStep,
         logSuccess,

package/src/runtime/app-context.mjs

@@ -24,12 +24,21 @@ export function createAppContext({
         workflow: executionMode.workflow ?? 'deploy',
         presetName: executionMode.presetName ?? null,
         maintenanceMode: executionMode.maintenanceMode ?? null,
+        autoCommit: executionMode.autoCommit === true,
+        skipVersioning: executionMode.skipVersioning === true,
         skipGitHooks: executionMode.skipGitHooks === true,
         skipChecks: executionMode.skipChecks === true,
         skipTests: executionMode.skipTests === true || executionMode.skipChecks === true,
         skipLint: executionMode.skipLint === true || executionMode.skipChecks === true,
         resumePending: executionMode.resumePending === true,
-        discardPending: executionMode.discardPending === true
+        discardPending: executionMode.discardPending === true,
+        explicitMaintenanceMode: executionMode.explicitMaintenanceMode === true,
+        explicitAutoCommit: executionMode.explicitAutoCommit === true,
+        explicitSkipVersioning: executionMode.explicitSkipVersioning === true,
+        explicitSkipGitHooks: executionMode.explicitSkipGitHooks === true,
+        explicitSkipChecks: executionMode.explicitSkipChecks === true,
+        explicitSkipTests: executionMode.explicitSkipTests === true || executionMode.explicitSkipChecks === true,
+        explicitSkipLint: executionMode.explicitSkipLint === true || executionMode.explicitSkipChecks === true
     }
     const emitEvent = normalizedExecutionMode.json
         ? createJsonEventEmitter({workflow: normalizedExecutionMode.workflow})