Merge branch 'main' into mcp-enablement-squashed

Author: dingfeli

README.md

@@ -156,12 +156,26 @@ pnpm install --ignore-scripts
 ### 3. Start Local Development
 To compile and view changes made to `q chat`:
 ```shell
-alias run_q_chat='cargo run --bin q_cli -- chat'
-run_q_chat
+cargo run --bin q_cli -- chat
 ```
 
 > If you are working on other q commands, just replace `chat` with the command name 
 
+To run tests for the Q CLI crate:
+```shell
+cargo test -p q_cli
+```
+
+To format Rust files:
+```shell
+cargo +nightly fmt
+```
+
+To run clippy:
+```shell
+cargo clippy --locked --workspace --color always -- -D warnings
+```
+
 
 
 ### 💡 Quick Tip for Onboarding
@@ -198,7 +212,7 @@ Great for speeding up your ramp-up and navigating the repo more effectively.
 Several projects live here:
 
 - [`autocomplete`](packages/autocomplete/) - The autocomplete react app
-- [`dashboard`](packages/dashboard/) - The dashboard react app
+- [`dashboard`](packages/dashboard-app/) - The dashboard react app
 - [`figterm`](crates/figterm/) - figterm, our headless terminal/pseudoterminal that
   intercepts the user’s terminal edit buffer.
 - [`q_cli`](crates/q_cli/) - the `q` CLI, allows users to interface with Amazon Q Developer from

crates/fig_desktop/README.md

@@ -6,7 +6,7 @@ instructions in the [root README](../README.md).
 
 ## Developing
 
-1. Follow the instructions under [the dashboard README](../packages/dashboard/README.md) to run the development server.
+1. Follow the instructions under [the dashboard README](../packages/dashboard-app/README.md) to run the development server.
 1. Run `cargo run`.
 1. Once the UI opens, right click anywhere to inspect element, go to the console tab, and set `window.location.href`
 to the URL of the dashboard development server.

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

@@ -1441,6 +1441,8 @@ where
                     context_manager: self.conversation_state.context_manager.clone(),
                     transcript: self.conversation_state.transcript.clone(),
                     failed_request_ids: self.failed_request_ids.clone(),
+                    accept_all: self.accept_all,
+                    interactive: self.interactive,
                 });
             },
             _ => (),

crates/q_cli/src/cli/chat/parse.rs

@@ -404,9 +404,30 @@ fn url<'a, 'b>(
     state: &'b mut ParseState,
 ) -> impl FnMut(&mut Partial<&'a str>) -> PResult<(), Error<'a>> + 'b {
     move |i| {
-        let display = delimited("[", take_until(1.., "]("), "]").parse_next(i)?;
-        let link = delimited("(", take_till(0.., ')'), ")").parse_next(i)?;
+        // Save the current input position
+        let start = i.checkpoint();
+
+        // Try to match the first part of URL pattern "[text]"
+        let display = match delimited::<_, _, _, _, Error<'a>, _, _, _>("[", take_until(1.., "]("), "]").parse_next(i) {
+            Ok(display) => display,
+            Err(_) => {
+                // If it doesn't match, reset position and fail
+                i.reset(&start);
+                return Err(ErrMode::from_error_kind(i, ErrorKind::Fail));
+            },
+        };
+
+        // Try to match the second part of URL pattern "(url)"
+        let link = match delimited::<_, _, _, _, Error<'a>, _, _, _>("(", take_till(0.., ')'), ")").parse_next(i) {
+            Ok(link) => link,
+            Err(_) => {
+                // If it doesn't match, reset position and fail
+                i.reset(&start);
+                return Err(ErrMode::from_error_kind(i, ErrorKind::Fail));
+            },
+        };
 
+        // Only generate output if the complete URL pattern matches
         queue_newline_or_advance(&mut o, state, display.width() + 1)?;
         queue(&mut o, style::SetForegroundColor(URL_TEXT_COLOR))?;
         queue(&mut o, style::Print(format!("{display} ")))?;
@@ -726,4 +747,16 @@ mod tests {
         style::SetForegroundColor(BLOCKQUOTE_COLOR),
         style::Print("│ hello"),
     ]);
+    validate!(square_bracket_1, "[test]", [style::Print("[test]")]);
+    validate!(square_bracket_2, "Text with [brackets]", [style::Print(
+        "Text with [brackets]"
+    )]);
+    validate!(square_bracket_empty, "[]", [style::Print("[]")]);
+    validate!(square_bracket_array, "a[i]", [style::Print("a[i]")]);
+    validate!(square_bracket_url_like_1, "[text] without url part", [style::Print(
+        "[text] without url part"
+    )]);
+    validate!(square_bracket_url_like_2, "[text](without url part", [style::Print(
+        "[text](without url part"
+    )]);
 }

crates/q_cli/src/cli/chat/tools/gh_issue.rs

@@ -34,6 +34,8 @@ pub struct GhIssueContext {
     pub context_manager: Option<ContextManager>,
     pub transcript: VecDeque<String>,
     pub failed_request_ids: Vec<String>,
+    pub accept_all: bool,
+    pub interactive: bool,
 }
 
 /// Max amount of user chat + assistant recent chat messages to include in the issue.
@@ -48,7 +50,12 @@ impl GhIssue {
         };
 
         // Prepare additional details from the chat session
-        let additional_environment = [Self::get_request_ids(context), Self::get_context(context).await].join("\n\n");
+        let additional_environment = [
+            Self::get_chat_settings(context),
+            Self::get_request_ids(context),
+            Self::get_context(context).await,
+        ]
+        .join("\n\n");
 
         // Add chat history to the actual behavior text.
         let actual_behavior = self.actual_behavior.as_ref().map_or_else(
@@ -124,20 +131,29 @@ impl GhIssue {
             return ctx_str;
         };
 
-        ctx_str.push_str(&format!("current_profile={}\n\n", ctx_manager.current_profile));
+        ctx_str.push_str(&format!("current_profile={}\n", ctx_manager.current_profile));
+        match ctx_manager.list_profiles().await {
+            Ok(profiles) if !profiles.is_empty() => {
+                ctx_str.push_str(&format!("profiles=\n{}\n\n", profiles.join("\n")));
+            },
+            _ => ctx_str.push_str("profiles=none\n\n"),
+        }
 
         // Context file categories
         if ctx_manager.global_config.paths.is_empty() {
-            ctx_str.push_str("global=none\n\n");
+            ctx_str.push_str("global_context=none\n\n");
         } else {
-            ctx_str.push_str(&format!("global=\n{}\n\n", &ctx_manager.global_config.paths.join("\n")));
+            ctx_str.push_str(&format!(
+                "global_context=\n{}\n\n",
+                &ctx_manager.global_config.paths.join("\n")
+            ));
         }
 
         if ctx_manager.profile_config.paths.is_empty() {
-            ctx_str.push_str("profile=none\n\n");
+            ctx_str.push_str("profile_context=none\n\n");
         } else {
             ctx_str.push_str(&format!(
-                "profile=\n{}\n\n",
+                "profile_context=\n{}\n\n",
                 &ctx_manager.profile_config.paths.join("\n")
             ));
         }
@@ -162,6 +178,14 @@ impl GhIssue {
         ctx_str
     }
 
+    fn get_chat_settings(context: &GhIssueContext) -> String {
+        let mut result_str = "[chat-settings]\n".to_string();
+        result_str.push_str(&format!("accept_all={}\n", context.accept_all));
+        result_str.push_str(&format!("interactive={}", context.interactive));
+
+        result_str
+    }
+
     pub fn queue_description(&self, updates: &mut impl Write) -> Result<()> {
         Ok(queue!(
             updates,

crates/q_cli/src/cli/mod.rs

@@ -348,7 +348,7 @@ impl Cli {
                 CliRootCommands::Inline(subcommand) => subcommand.execute(&cli_context).await,
             },
             // Root command
-            None => launch_dashboard(true).await,
+            None => chat::chat(None, false, false, None).await,
         }
     }
 

docs/assets/architecture.mermaid

@@ -14,7 +14,7 @@ flowchart LR
       autocomplete[fa:fa-window-restore Autocomplete *]
       click autocomplete href "packages/autocomplete"
       dashboard[fa:fa-window-maximize Dashboard *]
-      click dashboard href "packages/dashboard"
+      click dashboard href "packages/dashboard-app"
     end
     localCli[Q CLI *]
     click localCli href "q_cli"

docs/assets/architecture.svg

@@ -20,9 +20,9 @@
     "lint:fix": "turbo lint:fix --parallel",
     "dev": "turbo dev",
     "dev:autocomplete": "pnpm -C packages/autocomplete dev",
-    "dev:dashboard": "pnpm -C packages/dashboard dev",
+    "dev:dashboard": "pnpm -C packages/dashboard-app dev",
     "preview:autocomplete": "pnpm -C packages/autocomplete preview",
-    "preview:dashboard": "pnpm -C packages/dashboard preview",
+    "preview:dashboard": "pnpm -C packages/dashboard-app preview",
     "clean": "turbo clean --parallel",
     "prepare": "husky",
     "precommit": "lint-staged --config .lintstagedrc.mjs",

package.json

@@ -122,7 +122,7 @@ export function Setting({
                 <SelectTrigger className="w-60">
                   <SelectValue />
                 </SelectTrigger>
-                <SelectContent>
+                <SelectContent className="max-h-64 overflow-auto">
                   <SelectGroup>
                     {data.options?.map((o, i) => {
                       // console.log({ pref: data.id, localValue, inputValue: o, equal: localValue === o })