chore: fix conflict with upstream

Author: Konippi

Cargo.lock

@@ -248,7 +248,9 @@ def build_macos_desktop_app(
 
     info("Building tauri config")
     tauri_config_path = pathlib.Path(DESKTOP_PACKAGE_PATH) / "build-config.json"
-    tauri_config_path.write_text(macos_tauri_config(cli_path=cli_path, chat_path=chat_path, pty_path=pty_path, target=target))
+    tauri_config_path.write_text(
+        macos_tauri_config(cli_path=cli_path, chat_path=chat_path, pty_path=pty_path, target=target)
+    )
 
     info("Building", DESKTOP_PACKAGE_NAME)
 
@@ -394,13 +396,14 @@ def sign_and_rebundle_macos(app_path: pathlib.Path, dmg_path: pathlib.Path, sign
     info("Done signing!!")
 
 
-def build_linux_minimal(cli_path: pathlib.Path, pty_path: pathlib.Path):
+def build_linux_minimal(cli_path: pathlib.Path, pty_path: pathlib.Path, chat_path: pathlib.Path):
     """
     Creates tar.gz, tar.xz, tar.zst, and zip archives under `BUILD_DIR`.
 
     Each archive has the following structure:
     - archive/bin/q
     - archive/bin/qterm
+    - archive/bin/qchat
     - archive/install.sh
     - archive/README
     - archive/BUILD-INFO
@@ -431,6 +434,7 @@ def build_linux_minimal(cli_path: pathlib.Path, pty_path: pathlib.Path):
 
     shutil.copy2(cli_path, archive_bin_path / CLI_BINARY_NAME)
     shutil.copy2(pty_path, archive_bin_path / PTY_BINARY_NAME)
+    shutil.copy2(chat_path, archive_bin_path / CHAT_BINARY_NAME)
 
     signer = load_gpg_signer()
 
@@ -708,7 +712,7 @@ def copy_extension(extension_uuid, extension_dir_name):
         cwd=DESKTOP_PACKAGE_PATH,
         env={**os.environ, **rust_env(release=release, variant=Variant.FULL), "BUILD_DIR": BUILD_DIR},
     )
-    desktop_path = pathlib.Path(f'target/{target}/{"release" if release else "debug"}/{DESKTOP_BINARY_NAME}')
+    desktop_path = pathlib.Path(f"target/{target}/{'release' if release else 'debug'}/{DESKTOP_BINARY_NAME}")
 
     deb_resources = LinuxDebResources(
         cli_path=cli_path,
@@ -732,7 +736,7 @@ def copy_extension(extension_uuid, extension_dir_name):
     # Determine architecture suffix based on the target triple
     arch_suffix = "aarch64" if "aarch64" in target else "amd64"
     info(f"Using architecture suffix: {arch_suffix} for target: {target}")
-    
+
     bundle_name = f"{tauri_product_name()}_{version()}_{arch_suffix}"
     target_subdir = "release" if release else "debug"
     bundle_grandparent_path = f"target/{target}/{target_subdir}/bundle"
@@ -917,7 +921,7 @@ def build(
                 )
                 build_output[variant] = BinaryPaths(cli_path=cli_path, pty_path=pty_path)
             else:
-                build_linux_minimal(cli_path=cli_path, pty_path=pty_path)
+                build_linux_minimal(cli_path=cli_path, pty_path=pty_path, chat_path=chat_path)
                 build_output[variant] = BinaryPaths(cli_path=cli_path, pty_path=pty_path)
 
     return build_output

build-scripts/build.py

@@ -57,7 +57,7 @@ def cd_signer_request(method: str, path: str, data: str | None = None):
         response = requests.request(method=method, url=url, headers=dict(request.headers), data=data)
         info(f"CDSigner Request ({url}): {response.status_code}")
         if response.status_code == 429:
-            warn(f"Too many requests, backing off for {2 ** i} seconds")
+            warn(f"Too many requests, backing off for {2**i} seconds")
             time.sleep(2**i)
             continue
         return response

build-scripts/signing.py

@@ -45,7 +45,6 @@ bstr = "1.12.0"
 bytes = "1.10.1"
 camino = { version = "1.1.3", features = ["serde1"] }
 cfg-if = "1.0.0"
-chrono = { version = "0.4.41", default-features = false, features = ["std"] }
 clap = { version = "4.5.32", features = [
     "deprecated",
     "derive",

crates/chat-cli/Cargo.toml

@@ -55,7 +55,7 @@ impl Client {
             .http_client(crate::aws_common::http_client::client())
             .interceptor(OptOutInterceptor::new(database))
             .interceptor(UserAgentOverrideInterceptor::new())
-            .bearer_token_resolver(BearerResolver::new(database).await?)
+            .bearer_token_resolver(BearerResolver)
             .app_name(app_name())
             .endpoint_url(endpoint.url())
             .build();

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

@@ -90,7 +90,7 @@ impl StreamingClient {
             .http_client(crate::aws_common::http_client::client())
             .interceptor(OptOutInterceptor::new(database))
             .interceptor(UserAgentOverrideInterceptor::new())
-            .bearer_token_resolver(BearerResolver::new(database).await?)
+            .bearer_token_resolver(BearerResolver)
             .app_name(app_name())
             .endpoint_url(endpoint.url())
             .stalled_stream_protection(stalled_stream_protection_config())

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

@@ -518,17 +518,7 @@ pub async fn logout(database: &mut Database) -> Result<(), AuthError> {
 }
 
 #[derive(Debug, Clone)]
-pub struct BearerResolver {
-    token: Option<BuilderIdToken>,
-}
-
-impl BearerResolver {
-    pub async fn new(database: &mut Database) -> Result<Self, AuthError> {
-        Ok(Self {
-            token: BuilderIdToken::load(database).await?,
-        })
-    }
-}
+pub struct BearerResolver;
 
 impl ResolveIdentity for BearerResolver {
     fn resolve_identity<'a>(
@@ -537,7 +527,8 @@ impl ResolveIdentity for BearerResolver {
         _config_bag: &'a ConfigBag,
     ) -> IdentityFuture<'a> {
         IdentityFuture::new_boxed(Box::pin(async {
-            match &self.token {
+            let database = Database::new().await?;
+            match BuilderIdToken::load(&database).await? {
                 Some(token) => Ok(Identity::new(
                     Token::new(token.access_token.0.clone(), Some(token.expires_at.into())),
                     Some(token.expires_at.into()),

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

@@ -1,4 +1,11 @@
-use clap::Parser;
+use std::collections::HashMap;
+
+use clap::{
+    Args,
+    Parser,
+    Subcommand,
+    ValueEnum,
+};
 
 #[derive(Debug, Clone, PartialEq, Eq, Default, Parser)]
 pub struct Chat {
@@ -10,6 +17,9 @@ pub struct Chat {
     /// prompt requests permissions to use a tool, unless --trust-all-tools is also used.
     #[arg(long)]
     pub no_interactive: bool,
+    /// Resumes the previous conversation from this directory.
+    #[arg(short, long)]
+    pub resume: bool,
     /// The first question to ask
     pub input: Option<String>,
     /// Context profile to use
@@ -23,3 +33,127 @@ pub struct Chat {
     #[arg(long, value_delimiter = ',', value_name = "TOOL_NAMES")]
     pub trust_tools: Option<Vec<String>>,
 }
+
+#[derive(Debug, Clone, PartialEq, Eq, Subcommand)]
+pub enum Mcp {
+    /// Add or replace a configured server
+    Add(McpAdd),
+    /// Remove a server from the MCP configuration
+    #[command(alias = "rm")]
+    Remove(McpRemove),
+    /// List configured servers
+    List(McpList),
+    /// Import a server configuration from another file
+    Import(McpImport),
+    /// Get the status of a configured server
+    Status {
+        #[arg(long)]
+        name: String,
+    },
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Args)]
+pub struct McpAdd {
+    /// Name for the server
+    #[arg(long)]
+    pub name: String,
+    /// The command used to launch the server
+    #[arg(long)]
+    pub command: String,
+    /// Where to add the server to. For profile scope, the name of the profile must specified with
+    /// --profile.
+    #[arg(long, value_enum)]
+    pub scope: Option<Scope>,
+    /// Name of the profile to add the server config to. Not compatible with workspace scope or
+    /// global scope.
+    #[arg(long)]
+    pub profile: Option<String>,
+    /// Environment variables to use when launching the server
+    #[arg(long, value_parser = parse_env_vars)]
+    pub env: Vec<HashMap<String, String>>,
+    /// Server launch timeout, in milliseconds
+    #[arg(long)]
+    pub timeout: Option<u64>,
+    /// Overwrite an existing server with the same name
+    #[arg(long, default_value_t = false)]
+    pub force: bool,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Args)]
+pub struct McpRemove {
+    #[arg(long)]
+    pub name: String,
+    #[arg(long, value_enum)]
+    pub scope: Option<Scope>,
+    #[arg(long)]
+    pub profile: Option<String>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Args)]
+pub struct McpList {
+    #[arg(value_enum)]
+    pub scope: Option<Scope>,
+    #[arg(long)]
+    pub profile: Option<String>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Args)]
+pub struct McpImport {
+    #[arg(long)]
+    pub file: String,
+    #[arg(value_enum)]
+    pub scope: Option<Scope>,
+    #[arg(long)]
+    pub profile: Option<String>,
+    /// Overwrite an existing server with the same name
+    #[arg(long, default_value_t = false)]
+    pub force: bool,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, ValueEnum)]
+pub enum Scope {
+    Workspace,
+    Profile,
+    Global,
+}
+
+impl std::fmt::Display for Scope {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Scope::Workspace => write!(f, "workspace"),
+            Scope::Profile => write!(f, "profile"),
+            Scope::Global => write!(f, "global"),
+        }
+    }
+}
+
+#[derive(Debug)]
+struct EnvVarParseError(String);
+
+impl std::fmt::Display for EnvVarParseError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Failed to parse environment variables: {}", self.0)
+    }
+}
+
+impl std::error::Error for EnvVarParseError {}
+
+fn parse_env_vars(arg: &str) -> Result<HashMap<String, String>, EnvVarParseError> {
+    let mut vars = HashMap::new();
+
+    for pair in arg.split(",") {
+        match pair.split_once('=') {
+            Some((key, value)) => {
+                vars.insert(key.trim().to_string(), value.trim().to_string());
+            },
+            None => {
+                return Err(EnvVarParseError(format!(
+                    "Invalid environment variable '{}'. Expected 'name=value'",
+                    pair
+                )));
+            },
+        }
+    }
+
+    Ok(vars)
+}

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

@@ -51,10 +51,10 @@ pub enum Command {
         subcommand: Option<PromptsSubcommand>,
     },
     Usage,
-    Import {
+    Load {
         path: String,
     },
-    Export {
+    Save {
         path: String,
         force: bool,
     },
@@ -818,15 +818,15 @@ impl Command {
                     }
                 },
                 "usage" => Self::Usage,
-                "import" => {
+                "load" => {
                     let Some(path) = parts.get(1) else {
                         return Err("path is required".to_string());
                     };
-                    Self::Import {
+                    Self::Load {
                         path: (*path).to_string(),
                     }
                 },
-                "export" => {
+                "save" => {
                     let force = parts.contains(&"-f") || parts.contains(&"--force");
                     let Some(path) = parts.get(1) else {
                         return Err("path is required".to_string());
@@ -835,7 +835,7 @@ impl Command {
                     if !path.ends_with(".json") {
                         path.push_str(".json");
                     }
-                    Self::Export { path, force }
+                    Self::Save { path, force }
                 },
                 unknown_command => {
                     let looks_like_path = {

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

@@ -7,10 +7,10 @@ pub const MAX_CURRENT_WORKING_DIRECTORY_LEN: usize = 256;
 /// Limit to send the number of messages as part of chat.
 pub const MAX_CONVERSATION_STATE_HISTORY_LEN: usize = 250;
 
-pub const MAX_TOOL_RESPONSE_SIZE: usize = 800_000;
+/// Actual service limit is 800_000
+pub const MAX_TOOL_RESPONSE_SIZE: usize = 600_000;
 
-/// TODO: Use this to gracefully handle user message sizes.
-#[allow(dead_code)]
+/// Actual service limit is 600_000
 pub const MAX_USER_MESSAGE_SIZE: usize = 600_000;
 
 /// In tokens

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

@@ -59,6 +59,7 @@ pub struct ContextManager {
     /// Context configuration for the current profile.
     pub profile_config: ContextConfig,
 
+    #[serde(skip)]
     pub hook_executor: HookExecutor,
 }
 
@@ -128,6 +129,13 @@ impl ContextManager {
         Ok(())
     }
 
+    /// Reloads the global and profile config from disk.
+    pub async fn reload_config(&mut self) -> Result<()> {
+        self.global_config = load_global_config(&self.ctx).await?;
+        self.profile_config = load_profile_config(&self.ctx, &self.current_profile).await?;
+        Ok(())
+    }
+
     /// Add paths to the context configuration.
     ///
     /// # Arguments