chore(core): prepare 0.6.0 release

Add git-cliff release notes generation so GitHub releases credit PR
authors and contributors, then wire the generated body into the release
workflow.

Bump the workspace to 0.6.0 and fix connection-manager release
blockers around URL paste options, Mongo timeout persistence, and
imported manual order values.

Author: fcoury

.github/workflows/release.yml

@@ -83,6 +83,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
+          fetch-depth: 0
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -97,11 +98,22 @@ jobs:
           sha256sum * > SHA256SUMS.txt
           cat SHA256SUMS.txt
 
+      - name: Generate release notes
+        uses: orhun/git-cliff-action@v4
+        with:
+          config: cliff.toml
+          args: --current --github-repo ${{ github.repository }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+        env:
+          OUTPUT: RELEASE_NOTES.md
+          GITHUB_REPO: ${{ github.repository }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           files: release/*
-          generate_release_notes: true
+          body_path: RELEASE_NOTES.md
           draft: false
           prerelease: ${{ contains(github.ref, '-rc') || contains(github.ref, '-beta') || contains(github.ref, '-alpha') }}
         env:
@@ -125,8 +137,17 @@ jobs:
         run: cargo publish -p tui-syntax --token ${{ secrets.CARGO_REGISTRY_TOKEN }}
         continue-on-error: true  # May already be published
 
-      - name: Wait for crates.io
-        run: sleep 30
+      - name: Wait for crates.io index
+        run: |
+          VERSION=$(cargo metadata --no-deps --format-version 1 | python3 -c 'import json, sys; print(next(p["version"] for p in json.load(sys.stdin)["packages"] if p["name"] == "tui-syntax"))')
+          for _ in {1..20}; do
+            if cargo search tui-syntax --limit 1 | grep -q "tui-syntax = \"$VERSION\""; then
+              exit 0
+            fi
+            sleep 15
+          done
+          echo "tui-syntax $VERSION did not appear in the crates.io index in time" >&2
+          exit 1
 
       - name: Publish tsql
         run: cargo publish -p tsql --token ${{ secrets.CARGO_REGISTRY_TOKEN }}

Cargo.lock

@@ -4,7 +4,7 @@ members = ["crates/*"]
 exclude = ["vendor/tui-confirm-dialog"]
 
 [workspace.package]
-version = "0.5.0"
+version = "0.6.0"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/fcoury/tsql"

Cargo.toml

@@ -0,0 +1,47 @@
+[changelog]
+header = """
+## What's Changed
+
+"""
+body = """
+{% for group, commits in commits | group_by(attribute="group") %}
+### {{ group | upper_first }}
+{% for commit in commits %}
+{% set message = commit.message | split(pat="\n") | first | trim -%}
+{% if commit.remote.pr_number -%}
+{% set pr_suffix = " (#" ~ commit.remote.pr_number ~ ")" -%}
+{% set message = message | replace(from=pr_suffix, to="") -%}
+{% endif -%}
+- {% if commit.scope %}**{{ commit.scope }}:** {% endif %}{{ message | upper_first }}{% if commit.remote.username %} by @{{ commit.remote.username }}{% endif %}{% if commit.remote.pr_number %} in #{{ commit.remote.pr_number }}{% endif %}
+{%- endfor %}
+
+{% endfor %}
+{% if github.contributors %}
+## Contributors
+{% for contributor in github.contributors %}
+- @{{ contributor.username }}{% if contributor.pr_number %} in #{{ contributor.pr_number }}{% endif %}{% if contributor.is_first_time %} (first-time contributor){% endif %}
+{%- endfor %}
+{% endif %}
+"""
+trim = true
+postprocessors = [
+  { pattern = ' by @[^[:space:]]+\[bot\]', replace = "" },
+  { pattern = '\n- @[^[:space:]]+\[bot\][^\n]*', replace = "" },
+]
+
+[git]
+conventional_commits = true
+filter_unconventional = false
+split_commits = false
+tag_pattern = "v[0-9].*"
+sort_commits = "oldest"
+
+commit_parsers = [
+  { message = "^feat", group = "Features" },
+  { message = "^fix", group = "Bug Fixes" },
+  { message = "^perf", group = "Performance" },
+  { message = "^refactor", group = "Refactoring" },
+  { message = "^docs", group = "Documentation" },
+  { message = "^test", group = "Tests" },
+  { message = "^chore", group = "Maintenance" },
+]

cliff.toml

@@ -67,7 +67,7 @@ tui_confirm_dialog_with_mouse.workspace = true
 tempfile.workspace = true
 
 # Internal crate
-tui-syntax = { path = "../tui-syntax", version = "0.5.0" }
+tui-syntax = { path = "../tui-syntax", version = "0.6.0" }
 
 [dev-dependencies]
 dotenvy.workspace = true

crates/tsql/Cargo.toml

@@ -1501,9 +1501,10 @@ pub fn import_from_path(
     let mut summary = ImportSummary::default();
 
     for mut entry in incoming.connections.into_iter() {
-        // Drop favorite slot to avoid collisions on import; the user can
-        // reassign after review.
+        // Drop source-file ordering metadata to avoid collisions on import;
+        // the user can reassign after review.
         entry.favorite = None;
+        entry.order = 0;
 
         if entry.validate().is_err() {
             summary
@@ -1981,6 +1982,43 @@ user = "me"
         assert_eq!(summary3.imported, 0);
     }
 
+    #[test]
+    fn test_import_resets_source_order_before_appending() {
+        let tmp = tempfile::tempdir().unwrap();
+        let path = tmp.path().join("connections.toml");
+
+        let mut incoming = ConnectionsFile::new();
+        incoming.connections.push(ConnectionEntry {
+            name: "imported".to_string(),
+            host: "h".to_string(),
+            database: "d".to_string(),
+            user: "u".to_string(),
+            favorite: Some(1),
+            order: 1,
+            ..Default::default()
+        });
+        write_connections_atomic(&path, &incoming).unwrap();
+
+        let mut target = ConnectionsFile::new();
+        target
+            .add(ConnectionEntry {
+                name: "existing".to_string(),
+                host: "h".to_string(),
+                database: "d".to_string(),
+                user: "u".to_string(),
+                order: 3,
+                ..Default::default()
+            })
+            .unwrap();
+
+        let summary = import_from_path(&mut target, &path, ImportConflict::Rename).unwrap();
+        assert_eq!(summary.imported, 1);
+
+        let imported = target.find_by_name("imported").unwrap();
+        assert_eq!(imported.favorite, None);
+        assert_eq!(imported.order, 4);
+    }
+
     #[test]
     fn test_connection_to_url_without_password() {
         let entry = ConnectionEntry {

crates/tsql/src/config/connections.rs

@@ -1000,12 +1000,7 @@ impl ConnectionFormModal {
                     Some(self.folder.trim().to_string())
                 },
                 application_name: None,
-                connect_timeout_secs: self
-                    .connect_timeout_secs
-                    .trim()
-                    .parse::<u64>()
-                    .ok()
-                    .filter(|v| *v > 0),
+                connect_timeout_secs: None,
                 ..Default::default()
             },
         }
@@ -1028,6 +1023,11 @@ impl ConnectionFormModal {
                 self.user = entry.user;
                 self.ssl_mode = entry.ssl_mode.unwrap_or(SslMode::Disable);
                 self.ssl_mode_index = self.ssl_mode.to_index();
+                self.application_name = entry.application_name.unwrap_or_default();
+                self.connect_timeout_secs = entry
+                    .connect_timeout_secs
+                    .map(|secs| secs.to_string())
+                    .unwrap_or_default();
 
                 if let Some(pwd) = password {
                     self.password = pwd;
@@ -1039,6 +1039,8 @@ impl ConnectionFormModal {
                 self.port_cursor = Self::char_count(&self.port);
                 self.database_cursor = Self::char_count(&self.database);
                 self.user_cursor = Self::char_count(&self.user);
+                self.application_name_cursor = Self::char_count(&self.application_name);
+                self.connect_timeout_cursor = Self::char_count(&self.connect_timeout_secs);
 
                 // Clear URL paste field
                 self.url_paste.clear();
@@ -2133,6 +2135,30 @@ mod tests {
         assert!(form.url_paste.is_empty());
     }
 
+    #[test]
+    fn test_url_paste_preserves_postgres_query_options_on_save() {
+        let mut form = ConnectionFormModal::new();
+        form.name = "prod".to_string();
+        form.focused = FormField::UrlPaste;
+        form.url_paste =
+            "postgres://admin@db.example.com/production?connect_timeout=5&application_name=tsql"
+                .to_string();
+
+        let action = form.handle_key(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
+        assert!(matches!(action, ConnectionFormAction::StatusMessage(_)));
+        assert_eq!(form.application_name, "tsql");
+        assert_eq!(form.connect_timeout_secs, "5");
+
+        let action = form.handle_key(KeyEvent::new(KeyCode::Char('s'), KeyModifiers::CONTROL));
+        match action {
+            ConnectionFormAction::Save { entry, .. } => {
+                assert_eq!(entry.application_name.as_deref(), Some("tsql"));
+                assert_eq!(entry.connect_timeout_secs, Some(5));
+            }
+            other => panic!("Expected Save action, got {:?}", other),
+        }
+    }
+
     #[test]
     fn test_url_paste_decodes_postgres_username() {
         let mut form = ConnectionFormModal::new();
@@ -2193,6 +2219,27 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_save_mongodb_drops_postgres_only_timeout() {
+        let mut form = ConnectionFormModal::new();
+        form.name = "mongo1".to_string();
+        form.kind = DbKind::Mongo;
+        form.host = "mongo.example.com".to_string();
+        form.port = "27018".to_string();
+        form.database = "sample".to_string();
+        form.user = "admin".to_string();
+        form.connect_timeout_secs = "7".to_string();
+
+        let action = form.handle_key(KeyEvent::new(KeyCode::Char('s'), KeyModifiers::CONTROL));
+        match action {
+            ConnectionFormAction::Save { entry, .. } => {
+                assert_eq!(entry.kind, DbKind::Mongo);
+                assert_eq!(entry.connect_timeout_secs, None);
+            }
+            other => panic!("Expected Save action, got {:?}", other),
+        }
+    }
+
     #[test]
     fn test_test_connection_mongodb_includes_password_in_runtime_url() {
         let mut form = ConnectionFormModal::new();