@wyxos/zephyr 0.9.4 → 0.9.6

package/package.json

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

package/src/application/deploy/bump-local-package-version.mjs

@@ -22,6 +22,25 @@ async function isGitIgnored(rootDir, filePath, {runCommand} = {}) {
     }
 }
 
+
+async function captureGit(rootDir, args, {runCommand, runCommandCapture} = {}) {
+    if (typeof runCommandCapture === 'function') {
+        return await runCommandCapture('git', args, {cwd: rootDir})
+    }
+
+    if (typeof runCommand !== 'function') {
+        return ''
+    }
+
+    const output = await runCommand('git', args, {capture: true, cwd: rootDir})
+
+    if (typeof output === 'string') {
+        return output
+    }
+
+    return output?.stdout ?? ''
+}
+
 function parseVersionBumpCommit(line) {
     const [hash, shortHash, subject] = line.split('\0')
     const match = /^chore: bump version to (\d+\.\d+\.\d+(?:[-+][^\s]+)?)$/i.exec(subject ?? '')
@@ -33,15 +52,11 @@ function parseVersionBumpCommit(line) {
     return {hash, shortHash, version: match[1]}
 }
 
-async function readVersionBumpCommits(rootDir, {runCommand} = {}) {
-    if (typeof runCommand !== 'function') {
-        return []
-    }
-
+async function readVersionBumpCommits(rootDir, {runCommand, runCommandCapture} = {}) {
     try {
-        const {stdout = ''} = await runCommand('git', ['log', '--format=%H%x00%h%x00%s', '-1000'], {
-            capture: true,
-            cwd: rootDir
+        const stdout = await captureGit(rootDir, ['log', '--format=%H%x00%h%x00%s', '-1000'], {
+            runCommand,
+            runCommandCapture
         })
 
         return stdout
@@ -98,20 +113,20 @@ function formatVersionReferenceLabel(reference, currentVersion) {
 }
 
 
-async function readRecentAppCommitSubjects(rootDir, versionReference, {runCommand} = {}) {
-    if (!versionReference?.hash || typeof runCommand !== 'function') {
+async function readRecentAppCommitSubjects(rootDir, versionReference, {runCommand, runCommandCapture} = {}) {
+    if (!versionReference?.hash) {
         return ''
     }
 
     try {
-        const {stdout = ''} = await runCommand('git', [
+        const stdout = await captureGit(rootDir, [
             'log',
             '--format=%s',
             '--max-count=80',
             `${versionReference.hash}..HEAD`
         ], {
-            capture: true,
-            cwd: rootDir
+            runCommand,
+            runCommandCapture
         })
 
         return stdout.trim()
@@ -138,6 +153,7 @@ async function resolveDeploymentVersionValue(rootDir, {
     interactive = false,
     runPrompt,
     runCommand,
+    runCommandCapture,
     logProcessing,
     logWarning
 } = {}) {
@@ -145,9 +161,9 @@ async function resolveDeploymentVersionValue(rootDir, {
         return String(versionArg).trim()
     }
 
-    const versionBumps = await readVersionBumpCommits(rootDir, {runCommand})
+    const versionBumps = await readVersionBumpCommits(rootDir, {runCommand, runCommandCapture})
     const versionReference = selectVersionSuggestionReference(pkg.version, versionBumps)
-    const commitSubjects = await readRecentAppCommitSubjects(rootDir, versionReference, {runCommand})
+    const commitSubjects = await readRecentAppCommitSubjects(rootDir, versionReference, {runCommand, runCommandCapture})
 
     return await resolveReleaseType({
         currentVersion: pkg.version,
@@ -156,6 +172,7 @@ async function resolveDeploymentVersionValue(rootDir, {
         interactive,
         runPrompt,
         runCommand,
+        runCommandCapture,
         logStep: logProcessing,
         logWarning,
         latestTag: versionReference?.hash ?? null,
@@ -170,6 +187,7 @@ export async function bumpLocalPackageVersion(rootDir, {
     runPrompt,
     skipGitHooks = false,
     runCommand,
+    runCommandCapture,
     logProcessing,
     logSuccess,
     logWarning
@@ -196,6 +214,7 @@ export async function bumpLocalPackageVersion(rootDir, {
         interactive,
         runPrompt,
         runCommand,
+        runCommandCapture,
         logProcessing,
         logWarning
     })

package/src/application/deploy/prepare-local-deployment.mjs

@@ -70,6 +70,7 @@ export async function prepareLocalDeployment(config, {
                 interactive,
                 runPrompt,
                 runCommand,
+                runCommandCapture,
                 logProcessing,
                 logSuccess,
                 logWarning

package/src/release/commit-message.mjs

@@ -3,6 +3,7 @@ import {tmpdir} from 'node:os'
 import path from 'node:path'
 import process from 'node:process'
 
+import {describeCodexAdvisorFailure, logCapturedCodexDiagnostics} from '../runtime/codex-diagnostics.mjs'
 import {commandExists} from '../utils/command.mjs'
 
 const CONVENTIONAL_COMMIT_PATTERN = /^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test): .+/i
@@ -237,7 +238,7 @@ export async function suggestCommitMessage(rootDir = process.cwd(), {
 
     logStep?.('Generating a suggested commit message with Codex...')
 
-    await runCommand('codex', [
+    const codexResult = await runCommand('codex', [
       'exec',
       '--ephemeral',
       '--model',
@@ -258,6 +259,7 @@ export async function suggestCommitMessage(rootDir = process.cwd(), {
       capture: true,
       cwd: rootDir
     })
+    logCapturedCodexDiagnostics(codexResult, {label: 'commit-message advisor', logWarning})
 
     const rawMessage = await readFile(outputPath, 'utf8')
     const message = sanitizeSuggestedCommitMessage(rawMessage)
@@ -269,7 +271,7 @@ export async function suggestCommitMessage(rootDir = process.cwd(), {
     logWarning?.('Codex suggested an unusable commit message.')
     return fallbackMessage()
   } catch (error) {
-    logWarning?.(`Codex could not suggest a commit message: ${error.message}`)
+    logWarning?.(`${describeCodexAdvisorFailure(error, {label: 'commit-message advisor'})} Using path-based fallback.`)
     return fallbackMessage()
   } finally {
     if (tempDir) {

package/src/release/release-type.mjs

@@ -4,6 +4,7 @@ import path from 'node:path'
 import process from 'node:process'
 import semver from 'semver'
 
+import {describeCodexAdvisorFailure, logCapturedCodexDiagnostics} from '../runtime/codex-diagnostics.mjs'
 import {commandExists} from '../utils/command.mjs'
 
 export const RELEASE_TYPES = [
@@ -107,14 +108,30 @@ function buildChoiceOrder(suggestedReleaseType) {
   ]
 }
 
-async function readLatestReleaseTag(rootDir, {runCommand, latestTag = null} = {}) {
+
+async function captureCommand(command, args, {runCommand, runCommandCapture, cwd} = {}) {
+  if (typeof runCommandCapture === 'function') {
+    return {stdout: await runCommandCapture(command, args, {cwd}), stderr: ''}
+  }
+
+  const output = await runCommand(command, args, {capture: true, cwd})
+
+  if (typeof output === 'string') {
+    return {stdout: output, stderr: ''}
+  }
+
+  return output ?? {stdout: '', stderr: ''}
+}
+
+async function readLatestReleaseTag(rootDir, {runCommand, runCommandCapture, latestTag = null} = {}) {
   if (typeof latestTag === 'string' && latestTag.trim() !== '') {
     return latestTag.trim()
   }
 
   try {
-    const {stdout} = await runCommand('git', ['describe', '--tags', '--abbrev=0'], {
-      capture: true,
+    const {stdout} = await captureCommand('git', ['describe', '--tags', '--abbrev=0'], {
+      runCommand,
+      runCommandCapture,
       cwd: rootDir
     })
 
@@ -124,14 +141,15 @@ async function readLatestReleaseTag(rootDir, {runCommand, latestTag = null} = {}
   }
 }
 
-async function readCommitLog(rootDir, {runCommand, latestTag} = {}) {
+async function readCommitLog(rootDir, {runCommand, runCommandCapture, latestTag} = {}) {
   const args = latestTag
     ? ['log', '--format=%h %s', `${latestTag}..HEAD`]
     : ['log', '--format=%h %s', '-20']
 
   try {
-    const {stdout} = await runCommand('git', args, {
-      capture: true,
+    const {stdout} = await captureCommand('git', args, {
+      runCommand,
+      runCommandCapture,
       cwd: rootDir
     })
 
@@ -141,14 +159,15 @@ async function readCommitLog(rootDir, {runCommand, latestTag} = {}) {
   }
 }
 
-async function readDiffStat(rootDir, {runCommand, latestTag} = {}) {
+async function readDiffStat(rootDir, {runCommand, runCommandCapture, latestTag} = {}) {
   const args = latestTag
     ? ['diff', '--stat', `${latestTag}..HEAD`, '--']
     : ['diff', '--stat', 'HEAD~20..HEAD', '--']
 
   try {
-    const {stdout} = await runCommand('git', args, {
-      capture: true,
+    const {stdout} = await captureCommand('git', args, {
+      runCommand,
+      runCommandCapture,
       cwd: rootDir
     })
 
@@ -160,14 +179,15 @@ async function readDiffStat(rootDir, {runCommand, latestTag} = {}) {
 
 async function buildReleaseSuggestionContext(rootDir, {
   runCommand,
+  runCommandCapture,
   currentVersion,
   packageName,
   latestTag = null,
   referenceLabel = null
 } = {}) {
-  const resolvedLatestTag = await readLatestReleaseTag(rootDir, {runCommand, latestTag})
-  const commitLog = await readCommitLog(rootDir, {runCommand, latestTag: resolvedLatestTag})
-  const diffStat = await readDiffStat(rootDir, {runCommand, latestTag: resolvedLatestTag})
+  const resolvedLatestTag = await readLatestReleaseTag(rootDir, {runCommand, runCommandCapture, latestTag})
+  const commitLog = await readCommitLog(rootDir, {runCommand, runCommandCapture, latestTag: resolvedLatestTag})
+  const diffStat = await readDiffStat(rootDir, {runCommand, runCommandCapture, latestTag: resolvedLatestTag})
 
   return {
     currentVersion,
@@ -181,6 +201,7 @@ async function buildReleaseSuggestionContext(rootDir, {
 
 async function suggestReleaseType(rootDir = process.cwd(), {
   runCommand,
+  runCommandCapture,
   currentVersion,
   packageName,
   commandExistsImpl = commandExists,
@@ -192,6 +213,7 @@ async function suggestReleaseType(rootDir = process.cwd(), {
 } = {}) {
   const context = await buildReleaseSuggestionContext(rootDir, {
     runCommand,
+    runCommandCapture,
     currentVersion,
     packageName,
     latestTag,
@@ -219,7 +241,7 @@ async function suggestReleaseType(rootDir = process.cwd(), {
 
     logStep?.('Evaluating the recommended version bump with Codex...')
 
-    await runCommand('codex', [
+    const codexResult = await runCommand('codex', [
       'exec',
       '--ephemeral',
       '--model',
@@ -246,6 +268,7 @@ async function suggestReleaseType(rootDir = process.cwd(), {
       capture: true,
       cwd: rootDir
     })
+    logCapturedCodexDiagnostics(codexResult, {label: 'release advisor', logWarning})
 
     const rawSuggestion = await readFile(outputPath, 'utf8')
     const releaseType = sanitizeSuggestedReleaseType(rawSuggestion, allowedSuggestedReleaseTypes)
@@ -266,7 +289,7 @@ async function suggestReleaseType(rootDir = process.cwd(), {
       source: flooredReleaseType === releaseType ? 'codex' : 'codex+heuristic-floor'
     }
   } catch (error) {
-    logWarning?.(`Codex could not suggest a release type: ${error.message}`)
+    logWarning?.(`${describeCodexAdvisorFailure(error, {label: 'release advisor'})} Using heuristic release type.`)
 
     return {
       ...context,
@@ -288,6 +311,7 @@ export async function resolveReleaseType({
   interactive = true,
   runPrompt,
   runCommand,
+  runCommandCapture,
   logStep,
   logWarning,
   latestTag = null,
@@ -300,6 +324,7 @@ export async function resolveReleaseType({
 
   const suggested = await suggestReleaseType(rootDir, {
     runCommand,
+    runCommandCapture,
     currentVersion,
     packageName,
     logStep,

package/src/runtime/codex-diagnostics.mjs

@@ -0,0 +1,62 @@
+function splitLines(text = '') {
+  return String(text)
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean)
+}
+
+function normalizeCapturedOutput(commandOutput = {}) {
+  if (typeof commandOutput === 'string') {
+    return {stdout: commandOutput, stderr: ''}
+  }
+
+  return {
+    stdout: commandOutput?.stdout ?? '',
+    stderr: commandOutput?.stderr ?? ''
+  }
+}
+
+export function collectCodexDiagnosticLines(commandOutput = {}) {
+  const {stdout, stderr} = normalizeCapturedOutput(commandOutput)
+  const stderrLines = splitLines(stderr)
+  const stdoutDiagnosticLines = splitLines(stdout)
+    .filter((line) => /\b(error|warn|warning|failed|failure|rejected|declined)\b/i.test(line))
+
+  return [...stderrLines, ...stdoutDiagnosticLines]
+}
+
+export function logCapturedCodexDiagnostics(commandOutput = {}, {
+  label = 'advisor',
+  logWarning
+} = {}) {
+  const diagnosticCount = collectCodexDiagnosticLines(commandOutput).length
+
+  if (diagnosticCount === 0) {
+    return
+  }
+
+  const noun = diagnosticCount === 1 ? 'line' : 'lines'
+  logWarning?.(
+    `Codex ${label} emitted ${diagnosticCount} diagnostic ${noun}; ` +
+    'captured and hidden because the advisor returned a usable result.'
+  )
+}
+
+export function describeCodexAdvisorFailure(error, {
+  label = 'advisor'
+} = {}) {
+  const diagnosticCount = collectCodexDiagnosticLines(error).length
+  const exitCode = error?.exitCode
+  const exitText = exitCode == null ? 'failed' : `exited with code ${exitCode}`
+
+  if (diagnosticCount > 0) {
+    const noun = diagnosticCount === 1 ? 'line' : 'lines'
+    return `Codex ${label} ${exitText}; captured ${diagnosticCount} diagnostic ${noun}.`
+  }
+
+  if (error?.code === 'ENOENT') {
+    return `Codex ${label} failed because the codex command was not found.`
+  }
+
+  return `Codex ${label} ${exitText}.`
+}

package/src/runtime/local-command.mjs

@@ -6,10 +6,24 @@ export function createLocalCommandRunners({ runCommandBase, runCommandCaptureBas
   }
 
   const runCommand = async (command, args, {
+    capture = false,
     silent = false,
     cwd,
     forwardStdoutToStderr = false
   } = {}) => {
+    if (capture) {
+      const captured = await runCommandCaptureBase(command, args, {cwd})
+
+      if (typeof captured === 'string') {
+        return {stdout: captured.trim(), stderr: ''}
+      }
+
+      return {
+        stdout: (captured?.stdout ?? '').trim(),
+        stderr: (captured?.stderr ?? '').trim()
+      }
+    }
+
     const stdio = silent
       ? 'ignore'
       : forwardStdoutToStderr