fix(ci): bump MSRV to 1.85 + ASCII-only fake-claude payload

After 640eb80 unblocked Linux+macOS, two CI lanes still failed:

MSRV: pinning rmcp-macros to 0.3.1 surfaced clap_lex 1.1.0 as the
next dep needing edition2024. The Rust ecosystem post-2025-02 widely
adopted the 2024 edition; pinning every transitive crate is a losing
race. Single MSRV bump 1.83 → 1.85 unblocks them all (1.85 is GA).
Also reverts rmcp-macros pin so we track the latest 0.3.x patch.

Windows: classifier_surfaces_not_logged_in_with_friendly_hint failed
because the test envelope contained `·` (U+00B7). The fake-claude.cmd
helper emits via `type` on the console code page, which mangles non-
ASCII bytes before our UTF-8 decode. Real `claude` always emits UTF-8
directly, so this is a fake-only concern. Switched the test payload
to ASCII `-` and added a comment explaining the constraint.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: Shahinyanm

.github/workflows/ci.yml

@@ -44,18 +44,18 @@ jobs:
           RUSTDOCFLAGS: -D warnings
 
   msrv:
-    name: msrv (rust 1.83)
+    name: msrv (rust 1.85)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Rust 1.83
-        uses: dtolnay/rust-toolchain@1.83
+      - name: Install Rust 1.85
+        uses: dtolnay/rust-toolchain@1.85
 
       - name: Cache cargo
         uses: Swatinem/rust-cache@v2
         with:
-          key: msrv-1.83
+          key: msrv-1.85
 
       - name: cargo build (MSRV)
         run: cargo build --workspace --all-targets

CHANGELOG.md

@@ -34,10 +34,12 @@ no more manual `bashrc` / `settings.json` edits to use `aimux`, `direnv`,
   interactive bash, so the env var was invisible to the classifier
   and 401s kept piling up in `pending/`. The `--classifier-command`
   flag closes that loop end-to-end.
-- CI: pinned `rmcp-macros` to `=0.3.1` so MSRV (Rust 1.83) builds
-  again. `rmcp-macros 0.3.2` requires the `edition2024` Cargo
-  feature, stabilized only in Rust 1.85+. Re-evaluate when MSRV is
-  raised.
+- CI: bumped MSRV from Rust 1.83 to **1.85** (workspace
+  `rust-version` + GitHub Actions toolchain). The ecosystem (`rmcp`,
+  `clap_lex`, etc.) now ships transitive deps that require the
+  `edition2024` Cargo feature, which only stabilized in 1.85.
+  Pinning each one was a losing race; one MSRV bump unblocks them
+  all. 1.85 has been GA since 2025-02 and is widely available.
 - CI: opened the JSONL append handle with `read(true)` in addition
   to `append(true)`. `fd_lock`'s `LockFileEx` on Windows requires
   GENERIC_READ access on the handle; without it tests panicked with

Cargo.lock

@@ -9,7 +9,7 @@ members = [
 [workspace.package]
 version = "0.2.5"
 edition = "2021"
-rust-version = "1.83"
+rust-version = "1.85"
 license = "MIT"
 authors = ["Mher Shahinyan"]
 repository = "https://github.com/Digital-Threads/Task-Journal"

Cargo.toml

@@ -182,7 +182,12 @@ mod tests {
             "type": "result",
             "subtype": "success",
             "is_error": true,
-            "result": "Not logged in · Please run /login",
+            // ASCII-only payload: Windows `type` (used by fake-claude.cmd)
+            // emits via the console code page, which mangles non-ASCII bytes
+            // (U+00B7 etc.) before our UTF-8 decode in `classify`. Real
+            // `claude` always emits UTF-8 directly, so this is a fake-only
+            // concern, not a production behavior change.
+            "result": "Not logged in - Please run /login",
         });
         let fake = fake_claude(dir.path(), &envelope.to_string());
 

crates/tj-core/src/classifier/cli.rs

@@ -22,10 +22,6 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 rmcp = { workspace = true }
-# Pin rmcp-macros to a version compiled with edition 2021 — 0.3.2 requires
-# `edition2024`, stabilized only in Rust 1.85, which breaks our MSRV (1.83).
-# Re-evaluate when MSRV is bumped to ≥1.85.
-rmcp-macros = "=0.3.1"
 serde = { workspace = true }
 serde_json = { workspace = true }
 schemars = { workspace = true }