Merge branch 'qv2' into qv2-merge

Author: kkashilk

build-config/buildspec-macos_aarch64.yml

@@ -12,6 +12,7 @@ phases:
     commands:
       - export AWS_MAX_ATTEMPTS=10
       - echo "path - $PATH"
+      - echo "user - $(whoami)"
       - AWS_ACCOUNT=`aws sts get-caller-identity | jq -r '.Account'`
       # For now assume there is a suitable EC2 instance running. Obviously, we could add a StepFunction here to
       # get a new one, but this is a start
@@ -36,6 +37,7 @@ phases:
       # TODO(grant): change bucket name to env var
       - aws s3 cp --recursive s3://fig-io-desktop-build-output-$AWS_ACCOUNT-$AWS_REGION/staging .
       - aws s3 rm --recursive s3://fig-io-desktop-build-output-$AWS_ACCOUNT-$AWS_REGION/staging
+      - ls -la
 
 artifacts:
   files:

build-scripts/build.py

@@ -54,6 +54,7 @@
     PTY_BINARY_NAME,
     PTY_PACKAGE_NAME,
     URL_SCHEMA,
+    CHAT_BINARY_BRANCH,
 )
 
 BUILD_DIR_RELATIVE = pathlib.Path(os.environ.get("BUILD_DIR") or "build")

crates/fig_auth/src/session.rs

@@ -8,6 +8,7 @@ use aws_smithy_runtime_api::client::identity::{
     IdentityFuture,
     ResolveIdentity,
 };
+use fig_settings::sqlite::database;
 use tracing::{
     info,
     warn,
@@ -73,6 +74,12 @@ pub async fn logout() -> Result<()> {
         secret_store.delete(SocialToken::SECRET_KEY),
     );
 
+    if let Ok(db) = database() {
+        let _ = db.unset_auth_value(BuilderIdToken::SECRET_KEY);
+        let _ = db.unset_auth_value(DeviceRegistration::SECRET_KEY);
+        let _ = db.unset_auth_value(SocialToken::SECRET_KEY);
+    }
+
     let profile_res = fig_settings::state::remove_value("api.codewhisperer.profile");
 
     builder_res?;

crates/fig_desktop/icons/128x128.png

@@ -45,7 +45,6 @@ pub mod inline_shell_completion_plugin {
 
     #[cfg(test)]
     mod tests {
-        use fig_util::CLI_BINARY_NAME;
 
         use super::*;