Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Sources/CodexBarCLI/CLIConfigCommand.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,29 @@ import Commander
import Foundation

extension CodexBarCLI {
static func runConfig(path: [String], values: ParsedValues) {
switch path {
case ["config", "validate"]:
self.runConfigValidate(values)
case ["config", "dump"]:
self.runConfigDump(values)
case ["config", "providers"]:
self.runConfigProviders(values)
case ["config", "enable"]:
self.runConfigSetProviderEnabled(values, enabled: true)
case ["config", "disable"]:
self.runConfigSetProviderEnabled(values, enabled: false)
case ["config", "set-api-key"]:
self.runConfigSetAPIKey(values)
default:
self.exit(
code: .failure,
message: "Unknown command",
output: CLIOutputPreferences.from(values: values),
kind: .args)
}
}

static func runConfigValidate(_ values: ParsedValues) {
let output = CLIOutputPreferences.from(values: values)
let config = Self.loadConfig(output: output)
Expand Down
25 changes: 12 additions & 13 deletions Sources/CodexBarCLI/CLIEntry.swift
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,8 @@ enum CodexBarCLI {
await self.runSessionsFocus(invocation.parsedValues)
case ["serve"]:
await self.runServe(invocation.parsedValues)
case ["config", "validate"]:
self.runConfigValidate(invocation.parsedValues)
case ["config", "dump"]:
self.runConfigDump(invocation.parsedValues)
case ["config", "providers"]:
self.runConfigProviders(invocation.parsedValues)
case ["config", "enable"]:
self.runConfigSetProviderEnabled(invocation.parsedValues, enabled: true)
case ["config", "disable"]:
self.runConfigSetProviderEnabled(invocation.parsedValues, enabled: false)
case ["config", "set-api-key"]:
self.runConfigSetAPIKey(invocation.parsedValues)
case let path where path.first == "config":
self.runConfig(path: path, values: invocation.parsedValues)
case let path where path.first == "hooks":
await self.runHooks(path: path, values: invocation.parsedValues)
case ["cache", "clear"]:
Expand All @@ -81,6 +71,8 @@ enum CodexBarCLI {
}
defer { signalMonitor.cancel() }
await self.runDiagnose(invocation.parsedValues)
case ["guard"]:
await self.runGuard(invocation.parsedValues)
default:
Self.exit(
code: .failure,
Expand All @@ -89,7 +81,8 @@ enum CodexBarCLI {
kind: .args)
}
} catch let error as CommanderProgramError {
Self.exit(code: .failure, message: error.description, output: outputPreferences, kind: .args)
let exitCode: ExitCode = argv.first == "guard" ? .usage : .failure
Self.exit(code: exitCode, message: error.description, output: outputPreferences, kind: .args)
} catch {
Self.exit(code: .failure, message: error.localizedDescription, output: outputPreferences, kind: .runtime)
}
Expand All @@ -109,6 +102,7 @@ enum CodexBarCLI {
let diagnoseSignature = CommandSignature.describe(DiagnoseOptions())
let hooksSignature = CommandSignature.describe(HooksOptions())
let hooksTestSignature = CommandSignature.describe(HooksTestOptions())
let guardSignature = CommandSignature.describe(GuardOptions())

return [
CommandDescriptor(
Expand All @@ -121,6 +115,11 @@ enum CodexBarCLI {
abstract: "Print usage as text or JSON",
discussion: nil,
signature: usageSignature),
CommandDescriptor(
name: "guard",
abstract: "Exit non-zero when a provider lacks quota headroom (for gating scripts)",
discussion: nil,
signature: guardSignature),
CommandDescriptor(
name: "cost",
abstract: "Print local cost usage as text or JSON",
Expand Down
1 change: 1 addition & 0 deletions Sources/CodexBarCLI/CLIExitCode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ enum ExitCode: Int32 {
case binaryNotFound = 2
case parseError = 3
case timeout = 4
case usage = 64

init(_ rawValue: Int) {
self = ExitCode(rawValue: Int32(rawValue)) ?? .failure
Expand Down
Loading