chore(cli): scope env exports and drop theme poll override

Author: brandonkachen

.github/workflows/cli-release-build.yml

@@ -21,6 +21,11 @@ on:
         type: string
         description: 'Git ref to checkout'
         default: ''
+      env-overrides:
+        required: false
+        type: string
+        description: 'JSON object of environment variable overrides'
+        default: '{}'
 
 jobs:
   build-binaries:
@@ -87,18 +92,19 @@ jobs:
       - name: Configure environment variables
         env:
           SECRETS_CONTEXT: ${{ toJSON(secrets) }}
+          ENV_OVERRIDES: ${{ inputs.env-overrides }}
         shell: bash
         run: |
-          VAR_NAMES=$(node scripts/generate-ci-env.js | jq '[.[] | select(startswith("NEXT_PUBLIC_"))]')
-          if [ "$VAR_NAMES" = "[]" ]; then
-            echo "No NEXT_PUBLIC_ variables detected from generate-ci-env.js"
-          else
-            echo "$SECRETS_CONTEXT" | jq -r --argjson vars "$VAR_NAMES" '
-              to_entries | .[] | select(.key as $k | $vars | index($k)) | .key + "=" + .value
-            ' >> $GITHUB_ENV
-          fi
+          VAR_NAMES=$(node scripts/generate-ci-env.js --prefix NEXT_PUBLIC_)
+
+          echo "$SECRETS_CONTEXT" | jq -r --argjson vars "$VAR_NAMES" '
+            to_entries | .[] | select(.key as $k | $vars | index($k)) | .key + "=" + .value
+          ' >> $GITHUB_ENV
           echo "CODEBUFF_GITHUB_ACTIONS=true" >> $GITHUB_ENV
           echo "CODEBUFF_GITHUB_TOKEN=${{ secrets.CODEBUFF_GITHUB_TOKEN }}" >> $GITHUB_ENV
+          if [ "$ENV_OVERRIDES" != "{}" ]; then
+            echo "$ENV_OVERRIDES" | jq -r 'to_entries | .[] | .key + "=" + .value' >> $GITHUB_ENV
+          fi
 
       - name: Build binary
         run: bun run scripts/build-binary.ts ${{ inputs.binary-name }} ${{ inputs.new-version }}

.github/workflows/cli-release-staging.yml

@@ -131,6 +131,7 @@ jobs:
       new-version: ${{ needs.prepare-and-commit-staging.outputs.new_version }}
       artifact-name: cli-staging-metadata
       checkout-ref: ${{ github.event.pull_request.head.sha }}
+      env-overrides: '{}'
     secrets: inherit
 
   create-staging-release:
@@ -184,21 +185,21 @@ jobs:
           VERSION: ${{ needs.prepare-and-commit-staging.outputs.new_version }}
         run: |
           CURRENT_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-          RELEASE_BODY=$(cat <<EOF
-## Codebuff CLI v${VERSION} (Staging)
+          RELEASE_BODY=$(cat <<'EOF'
+          ## Codebuff CLI v${VERSION} (Staging)
 
-**⚠️ This is a staging build intended for internal testing.**
+          **⚠️ This is a staging build intended for internal testing.**
 
-### Included Binaries
-- \`codebuff-cli-linux-x64.tar.gz\`
-- \`codebuff-cli-linux-arm64.tar.gz\`
-- \`codebuff-cli-darwin-x64.tar.gz\`
-- \`codebuff-cli-darwin-arm64.tar.gz\`
-- \`codebuff-cli-win32-x64.tar.gz\`
+          ### Included Binaries
+          - `codebuff-cli-linux-x64.tar.gz`
+          - `codebuff-cli-linux-arm64.tar.gz`
+          - `codebuff-cli-darwin-x64.tar.gz`
+          - `codebuff-cli-darwin-arm64.tar.gz`
+          - `codebuff-cli-win32-x64.tar.gz`
 
-After downloading, extract the tarball, add the binary to your PATH, and run \`codebuff-cli --help\` for usage.
-EOF
-)
+          After downloading, extract the tarball, add the binary to your PATH, and run `codebuff-cli --help` for usage.
+          EOF
+          )
 
           curl -s -X POST \
             -H "Accept: application/vnd.github.v3+json" \

cli/src/hooks/use-system-theme-detector.ts

@@ -15,10 +15,6 @@ const DEFAULT_POLL_INTERVAL_MS = 60000 // 60 seconds
  * Falls back to slower polling on other platforms or if watcher fails.
  *
  * @returns The current system theme name
- *
- * Environment Variables:
- * - OPEN_TUI_THEME_POLL_INTERVAL: Polling interval in milliseconds (default: 60000)
- *   Set to 0 to disable automatic polling (only affects non-macOS or if watcher fails)
  */
 export const useSystemThemeDetector = (): ThemeName => {
   const [themeName, setThemeName] = useState<ThemeName>(() => detectSystemTheme())
@@ -58,17 +54,7 @@ export const useSystemThemeDetector = (): ThemeName => {
     }
 
     // Fall back to polling for non-macOS or if listener failed
-    const envInterval = process.env.OPEN_TUI_THEME_POLL_INTERVAL
-    const pollIntervalMs = envInterval
-      ? parseInt(envInterval, 10)
-      : DEFAULT_POLL_INTERVAL_MS
-
-    // If interval is 0 or invalid, disable polling
-    if (!pollIntervalMs || pollIntervalMs <= 0 || isNaN(pollIntervalMs)) {
-      return
-    }
-
-    const intervalId = setInterval(handleThemeChange, pollIntervalMs)
+    const intervalId = setInterval(handleThemeChange, DEFAULT_POLL_INTERVAL_MS)
 
     return () => {
       clearInterval(intervalId)

scripts/generate-ci-env.js

@@ -2,6 +2,7 @@
 
 // Script to dynamically generate environment variables for GitHub Actions
 // by reading the required variables from env.ts and outputting them as a JSON array.
+// Supports optional filters so callers can request only specific subsets.
 
 import fs from 'fs'
 import path from 'path'
@@ -10,6 +11,40 @@ import { fileURLToPath } from 'url'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
+const args = process.argv.slice(2)
+
+function parseArgs() {
+  let prefix = ''
+  let scope = 'all'
+
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i]
+    if (arg === '--prefix' && args[i + 1]) {
+      prefix = args[i + 1]
+      i += 1
+      continue
+    }
+    if (arg.startsWith('--prefix=')) {
+      prefix = arg.split('=')[1] ?? ''
+      continue
+    }
+    if (arg === '--scope' && args[i + 1]) {
+      scope = args[i + 1]
+      i += 1
+      continue
+    }
+    if (arg.startsWith('--scope=')) {
+      scope = arg.split('=')[1] ?? 'all'
+    }
+  }
+
+  if (!['all', 'server', 'client'].includes(scope)) {
+    scope = 'all'
+  }
+
+  return { prefix, scope }
+}
+
 function extractEnvVarsFromEnvTs() {
   const envTsPath = path.join(
     __dirname,
@@ -21,33 +56,47 @@ function extractEnvVarsFromEnvTs() {
   )
   const envTsContent = fs.readFileSync(envTsPath, 'utf8')
 
-  // Extract server and client variables from the env.ts file
   const serverMatch = envTsContent.match(/server:\s*{([^}]+)}/s)
   const clientMatch = envTsContent.match(/client:\s*{([^}]+)}/s)
 
-  const envVars = new Set()
-
-  const extractVars = (match) => {
-    if (match) {
-      // Look for variable names followed by a colon
-      const vars = match[1].match(/(\w+):/g)
-      if (vars) {
-        vars.forEach((v) => {
-          envVars.add(v.replace(':', ''))
-        })
-      }
-    }
+  const serverVars = new Set()
+  const clientVars = new Set()
+
+  const extractVars = (match, targetSet) => {
+    if (!match) return
+    const vars = match[1].match(/(\w+):/g)
+    if (!vars) return
+    vars.forEach((v) => targetSet.add(v.replace(':', '')))
   }
 
-  extractVars(serverMatch)
-  extractVars(clientMatch)
+  extractVars(serverMatch, serverVars)
+  extractVars(clientMatch, clientVars)
 
-  return Array.from(envVars).sort()
+  return {
+    server: Array.from(serverVars),
+    client: Array.from(clientVars),
+  }
 }
 
 function generateGitHubEnv() {
-  const envVars = extractEnvVarsFromEnvTs()
-  console.log(JSON.stringify(envVars))
+  const { prefix, scope } = parseArgs()
+  const varsByScope = extractEnvVarsFromEnvTs()
+
+  let selected = []
+  if (scope === 'server') {
+    selected = varsByScope.server
+  } else if (scope === 'client') {
+    selected = varsByScope.client
+  } else {
+    selected = Array.from(new Set([...varsByScope.server, ...varsByScope.client]))
+  }
+
+  if (prefix) {
+    selected = selected.filter((name) => name.startsWith(prefix))
+  }
+
+  selected.sort()
+  console.log(JSON.stringify(selected))
 }
 
 generateGitHubEnv()