Merge main into dima branch

.github/workflows/slack_notify_label_created.yml

@@ -0,0 +1,83 @@
+name: New label created, notify slack
+
+on:
+  label:
+    types: [created]
+
+jobs:
+  notify-slack:
+    if: >-
+      github.repository_owner == 'zed-industries'
+      && (startsWith(github.event.label.name, 'area:')
+          || startsWith(github.event.label.name, 'platform:'))
+    runs-on: namespace-profile-2x4-ubuntu-2404
+
+    steps:
+      - name: Build Slack message payload
+        env:
+          LABEL_NAME: ${{ github.event.label.name }}
+          LABEL_COLOR: ${{ github.event.label.color }}
+          LABEL_DESCRIPTION: ${{ github.event.label.description }}
+          CREATED_BY: ${{ github.event.sender.login }}
+          REPO_URL: ${{ github.event.repository.html_url }}
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+        run: |
+          LABELS_PAGE_URL="${REPO_URL}/labels"
+          MAPPING_FILE_URL="${REPO_URL}/blob/${DEFAULT_BRANCH}/script/community-pr-track-mapping.json"
+
+          jq -n \
+            --arg label_name "$LABEL_NAME" \
+            --arg label_color "#$LABEL_COLOR" \
+            --arg label_description "${LABEL_DESCRIPTION:-(none)}" \
+            --arg created_by "$CREATED_BY" \
+            --arg labels_url "$LABELS_PAGE_URL" \
+            --arg mapping_file_url "$MAPPING_FILE_URL" \
+            '{
+              "blocks": [
+                {
+                  "type": "section",
+                  "text": {
+                    "type": "mrkdwn",
+                    "text": "New label created: *\($label_name)*\nPlease choose a Track for it <\($mapping_file_url)|community-pr-track-mapping.json>."
+                  }
+                },
+                {
+                  "type": "section",
+                  "fields": [
+                    { "type": "mrkdwn", "text": "*Created by:*\n\($created_by)" },
+                    { "type": "mrkdwn", "text": "*Color:*\n\($label_color)" },
+                    { "type": "mrkdwn", "text": "*Description:*\n\($label_description)" },
+                    { "type": "mrkdwn", "text": "*Labels page:*\n<\($labels_url)|View all labels>" }
+                  ]
+                }
+              ]
+            }' > payload.json
+
+          echo "Payload built successfully:"
+          cat payload.json
+
+      - name: Send Slack notification
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_LABEL_CREATED }}
+        run: |
+          if [ -z "$SLACK_WEBHOOK_URL" ]; then
+            echo "::error::SLACK_WEBHOOK_LABEL_CREATED secret is not set"
+            exit 1
+          fi
+
+          HTTP_RESPONSE=$(curl -s -w "\n%{http_code}" -X POST "$SLACK_WEBHOOK_URL" \
+            -H "Content-Type: application/json" \
+            -d @payload.json)
+
+          HTTP_BODY=$(echo "$HTTP_RESPONSE" | sed '$d')
+          HTTP_STATUS=$(echo "$HTTP_RESPONSE" | tail -n 1)
+
+          echo "Slack API response status: $HTTP_STATUS"
+          echo "Slack API response body: $HTTP_BODY"
+
+          if [ "$HTTP_STATUS" -ne 200 ]; then
+            echo "::error::Slack notification failed with status $HTTP_STATUS: $HTTP_BODY"
+            exit 1
+          fi
+
+          echo "Slack notification sent successfully"

README.md

@@ -184,7 +184,6 @@ You modify the emojis in your `settings.json` like this in the root setting obje
 ## Git
 
 - add `blame > git_blame_font_family` setting to specify the font family for the git blame view because I am using a proportional font and the blame view misaligns otherwise
-- add `git::DiffWithCommit` from https://github.com/zed-industries/zed/pull/44467 and based on that code, `git::DiffWithBranch` is implemented
 - add `({file count})` in the git panel to every directory, inspired by https://github.com/zed-industries/zed/pull/45846 (Improve Git Panel with TreeView, VSCode-style grouping, commit history, and auto-fetch)
 - add `split_diff_font_decrease` setting to configure font size decrease for split diff view (default is 30%)
 - split diff view uses 30% smaller font size than stacked view

assets/keymaps/default-linux.json

@@ -1179,6 +1179,12 @@
       "ctrl-shift-i": "file_finder::ToggleFilterMenu",
     },
   },
+  {
+    "context": "FileFinder > Picker > Editor && end_of_input",
+    "bindings": {
+      "right": "file_finder::OpenWithoutDismiss",
+    },
+  },
   {
     "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
     "bindings": {

assets/keymaps/default-macos.json

@@ -1235,6 +1235,12 @@
       "cmd-shift-i": "file_finder::ToggleFilterMenu",
     },
   },
+  {
+    "context": "FileFinder > Picker > Editor && end_of_input",
+    "bindings": {
+      "right": "file_finder::OpenWithoutDismiss",
+    },
+  },
   {
     "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
     "use_key_equivalents": true,

assets/keymaps/default-windows.json

@@ -1186,6 +1186,12 @@
       "ctrl-shift-i": "file_finder::ToggleFilterMenu",
     },
   },
+  {
+    "context": "FileFinder > Picker > Editor && end_of_input",
+    "bindings": {
+      "right": "file_finder::OpenWithoutDismiss",
+    },
+  },
   {
     "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
     "use_key_equivalents": true,

crates/acp_tools/src/acp_tools.rs

@@ -767,7 +767,7 @@ impl Render for AcpTools {
                     } else {
                         div()
                             .size_full()
-                            .flex_grow()
+                            .flex_grow_1()
                             .child(
                                 list(
                                     connection.list_state.clone(),

crates/agent/src/tool_permissions.rs

@@ -580,6 +580,7 @@ mod tests {
             inline_assistant_model: None,
             inline_assistant_use_streaming_tools: false,
             commit_message_model: None,
+            commit_message_instructions: None,
             thread_summary_model: None,
             inline_alternatives: vec![],
             favorite_models: vec![],

crates/agent_settings/src/agent_settings.rs

@@ -150,6 +150,7 @@ pub struct AgentSettings {
     pub inline_assistant_model: Option<LanguageModelSelection>,
     pub inline_assistant_use_streaming_tools: bool,
     pub commit_message_model: Option<LanguageModelSelection>,
+    pub commit_message_instructions: Option<String>,
     pub thread_summary_model: Option<LanguageModelSelection>,
     pub inline_alternatives: Vec<LanguageModelSelection>,
     pub favorite_models: Vec<LanguageModelSelection>,
@@ -649,6 +650,7 @@ impl Settings for AgentSettings {
                 .inline_assistant_use_streaming_tools
                 .unwrap_or(true),
             commit_message_model: agent.commit_message_model,
+            commit_message_instructions: agent.commit_message_instructions,
             thread_summary_model: agent.thread_summary_model,
             inline_alternatives: agent.inline_alternatives.unwrap_or_default(),
             favorite_models: agent.favorite_models,

crates/agent_ui/src/agent_panel.rs

@@ -4949,7 +4949,7 @@ impl AgentPanel {
         h_flex()
             .key_context("TitleEditor")
             .group("title_editor")
-            .flex_grow()
+            .flex_grow_1()
             .w_full()
             .min_w_0()
             .max_w_full()

crates/agent_ui/src/agent_registry_ui.rs

@@ -650,7 +650,7 @@ impl Render for AgentRegistryPage {
                     let scroll_handle = &self.list;
                     this.child(
                         uniform_list("registry-entries", count, cx.processor(Self::render_agents))
-                            .flex_grow()
+                            .flex_grow_1()
                             .pb_4()
                             .track_scroll(scroll_handle),
                     )

crates/agent_ui/src/agent_ui.rs

@@ -1013,6 +1013,7 @@ mod tests {
             inline_assistant_model: None,
             inline_assistant_use_streaming_tools: false,
             commit_message_model: None,
+            commit_message_instructions: None,
             thread_summary_model: None,
             inline_alternatives: vec![],
             favorite_models: vec![],

crates/agent_ui/src/conversation_view/thread_view.rs

@@ -2629,7 +2629,7 @@ impl ThreadView {
                 v_flex()
                     .when_some(max_content_width, |this, max_w| this.flex_basis(max_w))
                     .when(max_content_width.is_none(), |this| this.w_full())
-                    .flex_shrink()
+                    .flex_shrink_1()
                     .flex_grow_0()
                     .max_w_full()
                     .bg(self.activity_bar_bg(cx))
@@ -3731,7 +3731,7 @@ impl ThreadView {
                     .when_some(max_content_width, |this, max_w| this.flex_basis(max_w))
                     .when(max_content_width.is_none(), |this| this.w_full())
                     .when(fills_container, |this| this.h_full())
-                    .flex_shrink()
+                    .flex_shrink_1()
                     .flex_grow_0()
                     .justify_between()
                     .gap_2()
@@ -4188,9 +4188,6 @@ impl ThreadView {
     }
 
     fn fast_mode_available(&self, cx: &Context<Self>) -> bool {
-        if !cx.is_staff() {
-            return false;
-        }
         self.as_native_thread(cx)
             .and_then(|thread| thread.read(cx).model())
             .map(|model| model.supports_fast_mode())
@@ -5105,7 +5102,7 @@ impl ThreadView {
             }),
         )
         .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
-        .flex_grow()
+        .flex_grow_1()
     }
 
     fn render_entry(

crates/agent_ui/src/draft_prompt_store.rs

@@ -8,11 +8,13 @@
 //! alongside the storage so the sidebar's preview rendering can't drift from
 //! the format we persist.
 
+use agent::ZED_AGENT_ID;
 use agent_client_protocol::schema as acp;
 use anyhow::Context as _;
 use db::kvp::KeyValueStore;
 use gpui::{App, AppContext as _, Entity, Task};
 use itertools::Itertools;
+use project::AgentId;
 use ui::SharedString;
 use util::ResultExt as _;
 use workspace::Workspace;
@@ -164,6 +166,23 @@ pub fn display_label_for_draft(
     truncate_draft_label(&raw)
 }
 
+pub fn empty_draft_placeholder_label(
+    workspace: Option<&Entity<Workspace>>,
+    agent_id: &AgentId,
+    cx: &App,
+) -> SharedString {
+    let agent_name = if agent_id.as_ref() == ZED_AGENT_ID.as_ref() {
+        SharedString::from(ZED_AGENT_ID.to_string())
+    } else {
+        workspace
+            .map(|ws| ws.read(cx).project().read(cx).agent_server_store().clone())
+            .and_then(|store| store.read(cx).agent_display_name(agent_id))
+            .unwrap_or_else(|| SharedString::from(agent_id.to_string()))
+    };
+
+    format!("New {} Thread", agent_name).into()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

crates/agent_ui/src/text_thread_editor.rs

@@ -2670,7 +2670,7 @@ impl Render for TextThreadEditor {
             .size_full()
             .child(
                 div()
-                    .flex_grow()
+                    .flex_grow(1.)
                     .bg(cx.theme().colors().editor_background)
                     .child(self.editor.clone()),
             )

crates/agent_ui/src/threads_archive_view.rs

@@ -1580,7 +1580,7 @@ impl PickerDelegate for ProjectPickerDelegate {
                         .child(
                             h_flex()
                                 .gap_3()
-                                .flex_grow()
+                                .flex_grow_1()
                                 .child(highlighted_match.render(window, cx)),
                         )
                         .tooltip(Tooltip::text(tooltip_path))

crates/breadcrumbs/src/breadcrumbs.rs

@@ -49,7 +49,7 @@ impl Render for Breadcrumbs {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let element = h_flex()
             .id("breadcrumb-container")
-            .flex_grow()
+            .flex_grow_1()
             .h_8()
             .overflow_x_scroll()
             .text_ui(cx);

crates/call/src/call_impl/room.rs

@@ -895,7 +895,8 @@ impl Room {
                             if this.created.elapsed() > Duration::from_millis(100) {
                                 if let proto::ChannelRole::Guest = role {
                                     Audio::play_sound(Sound::GuestJoined, cx);
-                                } else {
+                                // Do not play join sound in large meetings
+                                } else if this.remote_participants().len() < 10 {
                                     Audio::play_sound(Sound::Joined, cx);
                                 }
                             }

crates/collab/migrations.sqlite/20221109000000_test_schema.sql

@@ -172,6 +172,7 @@ CREATE TABLE "language_servers" (
     "id" INTEGER NOT NULL,
     "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
     "name" VARCHAR NOT NULL,
+    "language_name" VARCHAR,
     "capabilities" TEXT NOT NULL,
     "worktree_id" BIGINT,
     PRIMARY KEY (project_id, id)

crates/collab/src/db/queries/projects.rs

@@ -586,6 +586,7 @@ impl Database {
                 project_id: ActiveValue::set(project_id),
                 id: ActiveValue::set(server.id as i64),
                 name: ActiveValue::set(server.name.clone()),
+                language_name: ActiveValue::set(server.language_name.clone()),
                 worktree_id: ActiveValue::set(server.worktree_id.map(|id| id as i64)),
                 capabilities: ActiveValue::set(update.capabilities.clone()),
             })
@@ -596,6 +597,7 @@ impl Database {
                 ])
                 .update_columns([
                     language_server::Column::Name,
+                    language_server::Column::LanguageName,
                     language_server::Column::Capabilities,
                     language_server::Column::WorktreeId,
                 ])
@@ -986,6 +988,7 @@ impl Database {
                         id: language_server.id as u64,
                         name: language_server.name,
                         worktree_id: language_server.worktree_id.map(|id| id as u64),
+                        language_name: language_server.language_name,
                     },
                     capabilities: language_server.capabilities,
                 })

crates/collab/src/db/queries/rooms.rs

@@ -824,6 +824,7 @@ impl Database {
                     id: language_server.id as u64,
                     name: language_server.name,
                     worktree_id: language_server.worktree_id.map(|id| id as u64),
+                    language_name: language_server.language_name,
                 },
                 capabilities: language_server.capabilities,
             })

crates/collab/src/db/tables/language_server.rs

@@ -9,6 +9,7 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i64,
     pub name: String,
+    pub language_name: Option<String>,
     pub capabilities: String,
     pub worktree_id: Option<i64>,
 }