Skip to content

Fix text_threads_dir() non-compliance with XDG spec#45771

Merged
ConradIrwin merged 5 commits intozed-industries:mainfrom
maekilae:main
Feb 6, 2026
Merged

Fix text_threads_dir() non-compliance with XDG spec#45771
ConradIrwin merged 5 commits intozed-industries:mainfrom
maekilae:main

Conversation

@maekilae
Copy link
Contributor

@maekilae maekilae commented Dec 28, 2025

Closes #41373

Release Notes:

  • Ensures that XDG specs are followed on MacOS and Linux with backwards compatibility.

Changes
-Added state_dir to get XDG_STATE_HOME on macos and linux, no change to windows.
-Changed text_threads_dir to a fallback, text_threads_dir_fallback
-Re-implemented text_threads_dir to use state_dir

@cla-bot
Copy link

cla-bot bot commented Dec 28, 2025

Thank you for your pull request and welcome to our community. We could not parse the GitHub identity of the following contributors: Maekilae.
This is most likely caused by a git client misconfiguration; please make sure to:

  1. check if your git client is configured with an email to sign commits git config --list | grep email
  2. If not, set it up using git config --global user.email email@example.com
  3. Make sure that the git commit email is configured in your GitHub account settings, see https://github.com/settings/emails

@maekilae
Copy link
Contributor Author

@cla-bot check

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 28, 2025
@cla-bot
Copy link

cla-bot bot commented Dec 28, 2025

The cla-bot has been summoned, and re-checked this pull request!

@SomeoneToIgnore SomeoneToIgnore added the area:ai Improvement related to Agent Panel, Edit Prediction, Copilot, or other AI features label Jan 5, 2026
@ConradIrwin ConradIrwin enabled auto-merge (squash) February 5, 2026 05:11
@ConradIrwin
Copy link
Member

Thanks!

auto-merge was automatically disabled February 6, 2026 14:38

Head branch was pushed to by a user without write access

maekilae and others added 5 commits February 6, 2026 15:39
Add `state_dir` to provide a standardized location for application
state. Migrate `text_threads_dir` to use this new state directory, with
a fallback to the old path for existing data to ensure continuity.
Co-authored-by: AdamJedl <100023363+AdamJedl@users.noreply.github.com>
Co-authored-by: AdamJedl <100023363+AdamJedl@users.noreply.github.com>
@maekilae
Copy link
Contributor Author

maekilae commented Feb 6, 2026

@ConradIrwin Fixed the formatting issue and rebased since they where causing issues with the merge.

@ConradIrwin ConradIrwin enabled auto-merge (squash) February 6, 2026 15:19
@ConradIrwin ConradIrwin merged commit e2267ab into zed-industries:main Feb 6, 2026
27 checks passed
naaiyy added a commit to Glass-HQ/Glass that referenced this pull request Feb 16, 2026
Key changes:
- LSP folding ranges support (zed-industries#48611) - textDocument/foldingRange with custom fold text
- LSP refactoring (zed-industries#48604) - extracted document_colors, code_lens, folding_ranges into modules
- Crate graph restructuring (zed-industries#48602) - terminal moved closer to editor
- Side-by-side diff searching (zed-industries#48539) and OpenExcerpts for LHS (zed-industries#48438)
- SplittableEditor: sync custom blocks between RHS/LHS (zed-industries#48575)
- Thinking effort for Zed/OpenAI providers (zed-industries#48545, zed-industries#48605)
- Agent default_model.enable_thinking setting (zed-industries#48536)
- Configurable LSP timeout setting (zed-industries#44745)
- PaneSearchBarCallbacks global (search bar setup extracted from vim)
- Settings migrations for nested platform/channel/profile keys (zed-industries#48550)
- Shell parser: I/O redirects, here-documents, compound commands (zed-industries#48635)
- Hardened tool authorization: sensitive settings, deferred ops (zed-industries#48641)
- rm security bypass fixes (zed-industries#48640, zed-industries#48647)
- MCP tool name parsing fix: newline delimiter (zed-industries#48636)
- Canonicalize --user-data-dir path (zed-industries#48470)
- Fix text_threads_dir XDG spec compliance (zed-industries#45771)
- Buffer font for folds (zed-industries#48652)
- Multibuffer toolbar layout shift fix (zed-industries#48472)
- Editor: tabs bitmask syncing (zed-industries#48366)

Conflict resolution:
- collab tests: deleted (collab removed)
- util/archive.rs, util/shell.rs: deleted (extracted to Obsydian)
- copilot_ui/sign_in.rs: kept native_button style
- editor_tests.rs: merged imports (kept MoveItemToPaneInDirection, added ViewId/FollowEvent)
- lsp_store.rs: took upstream refactored imports, added FoldingRangeData, removed collab imports
- main.rs: added PaneSearchBarCallbacks, removed vim::init

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:ai Improvement related to Agent Panel, Edit Prediction, Copilot, or other AI features cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

text_threads_dir() non-compliant with XDG spec

5 participants