finish rewrite (actually?)

Author: chaynabors

crates/chat-cli/Cargo.toml

@@ -6,6 +6,7 @@ homepage.workspace = true
 publish.workspace = true
 version.workspace = true
 license.workspace = true
+default-run = "chat_cli"
 
 [lints]
 workspace = true

crates/chat-cli/src/api_client/clients/client.rs

@@ -18,10 +18,9 @@ use crate::aws_common::{
     UserAgentOverrideInterceptor,
     app_name,
 };
-use crate::database::Database;
-use crate::database::state::{
+use crate::database::{
     AuthProfile,
-    StateDatabase,
+    Database,
 };
 
 mod inner {

crates/chat-cli/src/api_client/clients/streaming_client.rs

@@ -30,10 +30,9 @@ use crate::aws_common::{
     UserAgentOverrideInterceptor,
     app_name,
 };
-use crate::database::Database;
-use crate::database::state::{
+use crate::database::{
     AuthProfile,
-    StateDatabase,
+    Database,
 };
 
 mod inner {

crates/chat-cli/src/api_client/endpoints.rs

@@ -14,7 +14,6 @@ use crate::api_client::consts::{
 };
 use crate::database::Database;
 use crate::database::settings::Setting;
-use crate::database::state::StateDatabase;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Endpoint {

crates/chat-cli/src/api_client/profile.rs

@@ -1,8 +1,10 @@
 use crate::api_client::Client;
 use crate::api_client::endpoints::Endpoint;
 use crate::auth::AuthError;
-use crate::database::Database;
-use crate::database::state::AuthProfile;
+use crate::database::{
+    AuthProfile,
+    Database,
+};
 
 pub async fn list_available_profiles(database: &mut Database) -> Result<Vec<AuthProfile>, AuthError> {
     let mut profiles = vec![];

crates/chat-cli/src/auth/builder_id.rs

@@ -57,19 +57,20 @@ use crate::database::secret_store::{
     Secret,
     SecretStore,
 };
-use crate::database::state::StateDatabase;
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub enum OAuthFlow {
     DeviceCode,
+    // This must remain backwards compatible
+    #[serde(rename = "PKCE")]
     Pkce,
 }
 
 impl std::fmt::Display for OAuthFlow {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match *self {
             OAuthFlow::DeviceCode => write!(f, "DeviceCode"),
-            OAuthFlow::Pkce => write!(f, "Pkce"),
+            OAuthFlow::Pkce => write!(f, "PKCE"),
         }
     }
 }
@@ -577,7 +578,7 @@ mod tests {
     #[test]
     fn test_oauth_flow_ser_deser() {
         test_ser_deser!(OAuthFlow, OAuthFlow::DeviceCode, "DeviceCode");
-        test_ser_deser!(OAuthFlow, OAuthFlow::Pkce, "Pkce");
+        test_ser_deser!(OAuthFlow, OAuthFlow::Pkce, "PKCE");
     }
 
     #[tokio::test]

crates/chat-cli/src/cli/chat/mod.rs

@@ -97,7 +97,6 @@ use crate::api_client::model::{
 };
 use crate::database::Database;
 use crate::database::settings::Setting;
-use crate::database::state::StateDatabase;
 use crate::platform::Context;
 use crate::telemetry::TelemetryThread;
 use crate::telemetry::core::ToolUseEventBuilder;

crates/chat-cli/src/cli/settings.rs

@@ -17,7 +17,6 @@ use serde_json::json;
 use super::OutputFormat;
 use crate::database::Database;
 use crate::database::settings::Setting;
-use crate::database::state::StateDatabase;
 use crate::util::{
     CliContext,
     directories,
@@ -32,6 +31,9 @@ pub enum SettingsSubcommands {
         /// Format of the output
         #[arg(long, short, value_enum, default_value_t)]
         format: OutputFormat,
+        /// Whether or not we want to modify state instead
+        #[arg(long, short, hide = true)]
+        state: bool,
     },
 }
 
@@ -52,9 +54,6 @@ pub struct SettingsArgs {
     /// Format of the output
     #[arg(long, short, value_enum, default_value_t)]
     format: OutputFormat,
-    /// Whether or not we want to modify state instead
-    #[arg(hide = true)]
-    state: bool,
 }
 
 impl SettingsArgs {
@@ -69,8 +68,8 @@ impl SettingsArgs {
                     bail!("The EDITOR environment variable is not set")
                 }
             },
-            Some(SettingsSubcommands::All { format }) => {
-                let settings = match self.state {
+            Some(SettingsSubcommands::All { format, state }) => {
+                let settings = match state {
                     true => database.get_all_entries()?,
                     false => database.settings.map().clone(),
                 };