Skip to content

feat(search): support jj workspace filters - #4457

Merged
atuin-bot merged 1 commit into
atuinsh:mainfrom
axtl:main
Nov 9, 2026
Merged

feat(search): support jj workspace filters#4457
atuin-bot merged 1 commit into
atuinsh:mainfrom
axtl:main

Conversation

@axtl

@axtl axtl commented Oct 18, 2026

Copy link
Copy Markdown
Contributor

Atuin workspaces can filter for commands run in the current jujutsu (jj) repo or workspace, even if not collocated with git.

This refactors some function names and database columns to a more generic vcs_repo or vcs_root etc. wherever possible.

Checks

  • I am happy for maintainers to push small adjustments to this PR, to speed up the review cycle
  • I have checked that there are no existing pull requests for the same thing

@greptile-apps

greptile-apps Bot commented Oct 18, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 5/5 Tier: apex

[High impact] The PR appears safe to merge; no actionable issues were found.

Summary

Adds Jujutsu-aware workspace filtering while preserving Git worktree behavior.

  • Workspace search follows Git repositories and Jujutsu workspaces.
  • AI sessions use the repository root to find matching sessions.
  • AI project permissions follow the current repository root.

Reviews (2) · Last reviewed commit: "test(search): ignore every real-jj works..." · Reviewed by Greptile

markovejnovic
markovejnovic requested changes Oct 19, 2026
View reviewed changes
Comment thread crates/atuin-common/src/utils.rs Resolved
Comment thread crates/atuin-common/src/utils.rs Resolved
Comment thread crates/atuin-client/src/database.rs Resolved
Comment thread crates/atuin-client/src/database.rs Resolved
Comment thread crates/atuin-client/src/database.rs Resolved
@markovejnovic markovejnovic added the status:awaiting-response Waiting for a response from the OP label Oct 19, 2026
@axtl

axtl commented Oct 22, 2026

Copy link
Copy Markdown
Contributor Author

Thanks for the feedback, I tried to address it all, and rebased. Happy to iterate further if you have any thoughts, TIA.

@axtl
axtl requested a review from markovejnovic October 22, 2026 05:13
@markovejnovic markovejnovic added status:waiting-for-maintainer Stuff that needs to be reviewed by maintainers and removed status:awaiting-response Waiting for a response from the OP labels Oct 26, 2026
@axtl
axtl force-pushed the main branch 2 times, most recently from 8495c33 to eb91486 Compare November 2, 2026 14:04
markovejnovic
markovejnovic approved these changes Nov 9, 2026
View reviewed changes

@markovejnovic markovejnovic left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, tyvm!

i'm going to rebase this and merge =)

@markovejnovic

markovejnovic commented Nov 9, 2026

Copy link
Copy Markdown
Member

/merge

@markovejnovic markovejnovic removed the status:waiting-for-maintainer Stuff that needs to be reviewed by maintainers label Nov 9, 2026
@atuin-bot

atuin-bot commented Nov 9, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Landed as 33d48da. GitHub shows this merged once it reaches main.

@axtl @markovejnovic
feat(search): support jj workspace filters (atuinsh#4457)
33d48da 
Atuin workspaces can filter for commands run in the current jujutsu (jj) repo or workspace, even if not collocated with git.

This refactors some function names and database columns to a more generic `vcs_repo` or `vcs_root` etc. wherever possible.


## Checks
- [x] I am happy for maintainers to push small adjustments to this PR, to speed up the review cycle
- [x] I have checked that there are no existing pull requests for the same thing

Co-authored-by: Marko Vejnovic <marko@atuin.sh>
@atuin-bot
atuin-bot merged commit 33d48da into atuinsh:main Nov 9, 2026
3 of 4 checks passed
@ellie ellie mentioned this pull request Nov 10, 2026
Merged
atuin-bot pushed a commit that referenced this pull request Nov 10, 2026
@ellie
chore(release): prepare for release 18.24.6 (#4696)
c71cd7b 
Release 18.24.6


### Bug Fixes

- *(api)* Move to the fixed cowboy, cowlib and grpc_server
- *(copilot)* Register the hook as exec/args so PowerShell can run it ([&#35;4634](#4634))
- *(daemon)* Close inherited fds before autostarting, fixing indefinite pty-proxy hang on shell exit ([&#35;4668](#4668))
- *(daemon)* Don't manage the socket with launchd ([&#35;4669](#4669))
- *(deps)* Bump rmcp for three advisories, and hold the SQLite one until sqlx allows the fix ([&#35;4690](#4690))
- *(setup)* Don't warn about uninstalled harnesses ([&#35;4680](#4680))
- *(threads)* Capture Claude Code shell edits' diffs, and keep the patch of a write that names atuin key ([&#35;4670](#4670))
- *(threads)* Fix mislabeling of omp child transcripts as Pi ([&#35;4694](#4694))
- Include workaround for buggy VTE versions ([&#35;4679](#4679))


### Features

- *(search)* Support jj workspace filters ([&#35;4457](#4457))
- *(setup)* Sharper capture and search labels, and give sync its own section ([&#35;4659](#4659))


### Miscellaneous Tasks

- Add "Writing style" section to AGENTS.md ([&#35;4675](#4675))
- Prefer `cfg!()` over `#[cfg()]` in AGENTS.md ([&#35;4676](#4676))
- Prefer `let _ = ...` over `_ = ...` in AGENTS.md ([&#35;4678](#4678))


### Refactor

- *(deps)* Bump hyper-util from 0.1.20 to 0.1.21 ([&#35;4626](#4626))
- *(deps)* Bump unicode-normalization from 0.1.25 to 0.1.26 ([&#35;4686](#4686))


### Build

- *(atuin)* Make octavo a default feature, still off at runtime ([&#35;4693](#4693))
- *(release)* Compile octavo into release artifacts, still off by default ([&#35;4671](#4671))
renovate Bot added a commit to sdwilsh/ansible-playbooks that referenced this pull request Nov 10, 2026
@renovate
chore(deps): update ghcr.io/atuinsh/atuin docker tag to v18.24.6
ffb3b94 
##### [\`18.24.6\`](https://github.com/atuinsh/atuin/blob/HEAD/CHANGELOG.md#18246)

##### Bug Fixes

- *(api)* Move to the fixed cowboy, cowlib and grpc_server
- *(copilot)* Register the hook as exec/args so PowerShell can run it ([#4634](atuinsh/atuin#4634))
- *(daemon)* Close inherited fds before autostarting, fixing indefinite pty-proxy hang on shell exit ([#4668](atuinsh/atuin#4668))
- *(daemon)* Don't manage the socket with launchd ([#4669](atuinsh/atuin#4669))
- *(deps)* Bump rmcp for three advisories, and hold the SQLite one until sqlx allows the fix ([#4690](atuinsh/atuin#4690))
- *(setup)* Don't warn about uninstalled harnesses ([#4680](atuinsh/atuin#4680))
- *(threads)* Capture Claude Code shell edits' diffs, and keep the patch of a write that names atuin key ([#4670](atuinsh/atuin#4670))
- *(threads)* Fix mislabeling of omp child transcripts as Pi ([#4694](atuinsh/atuin#4694))
- Include workaround for buggy VTE versions ([#4679](atuinsh/atuin#4679))

##### Features

- *(search)* Support jj workspace filters ([#4457](atuinsh/atuin#4457))
- *(setup)* Sharper capture and search labels, and give sync its own section ([#4659](atuinsh/atuin#4659))

##### Miscellaneous Tasks

- Add "Writing style" section to AGENTS.md ([#4675](atuinsh/atuin#4675))
- Prefer `cfg!()` over `#[cfg()]` in AGENTS.md ([#4676](atuinsh/atuin#4676))
- Prefer `let _ = ...` over `_ = ...` in AGENTS.md ([#4678](atuinsh/atuin#4678))

##### Refactor

- *(deps)* Bump hyper-util from 0.1.20 to 0.1.21 ([#4626](atuinsh/atuin#4626))
- *(deps)* Bump unicode-normalization from 0.1.25 to 0.1.26 ([#4686](atuinsh/atuin#4686))

##### Build

- *(atuin)* Make octavo a default feature, still off at runtime ([#4693](atuinsh/atuin#4693))
- *(release)* Compile octavo into release artifacts, still off by default ([#4671](atuinsh/atuin#4671))
renovate Bot added a commit to sdwilsh/ansible-playbooks that referenced this pull request Nov 10, 2026
@renovate
chore(deps): update ghcr.io/atuinsh/atuin docker tag to v18.24.6
b205751 
##### [\`18.24.6\`](https://github.com/atuinsh/atuin/blob/HEAD/CHANGELOG.md#18246)

##### Bug Fixes

- *(api)* Move to the fixed cowboy, cowlib and grpc_server
- *(copilot)* Register the hook as exec/args so PowerShell can run it ([#4634](atuinsh/atuin#4634))
- *(daemon)* Close inherited fds before autostarting, fixing indefinite pty-proxy hang on shell exit ([#4668](atuinsh/atuin#4668))
- *(daemon)* Don't manage the socket with launchd ([#4669](atuinsh/atuin#4669))
- *(deps)* Bump rmcp for three advisories, and hold the SQLite one until sqlx allows the fix ([#4690](atuinsh/atuin#4690))
- *(setup)* Don't warn about uninstalled harnesses ([#4680](atuinsh/atuin#4680))
- *(threads)* Capture Claude Code shell edits' diffs, and keep the patch of a write that names atuin key ([#4670](atuinsh/atuin#4670))
- *(threads)* Fix mislabeling of omp child transcripts as Pi ([#4694](atuinsh/atuin#4694))
- Include workaround for buggy VTE versions ([#4679](atuinsh/atuin#4679))

##### Features

- *(search)* Support jj workspace filters ([#4457](atuinsh/atuin#4457))
- *(setup)* Sharper capture and search labels, and give sync its own section ([#4659](atuinsh/atuin#4659))

##### Miscellaneous Tasks

- Add "Writing style" section to AGENTS.md ([#4675](atuinsh/atuin#4675))
- Prefer `cfg!()` over `#[cfg()]` in AGENTS.md ([#4676](atuinsh/atuin#4676))
- Prefer `let _ = ...` over `_ = ...` in AGENTS.md ([#4678](atuinsh/atuin#4678))

##### Refactor

- *(deps)* Bump hyper-util from 0.1.20 to 0.1.21 ([#4626](atuinsh/atuin#4626))
- *(deps)* Bump unicode-normalization from 0.1.25 to 0.1.26 ([#4686](atuinsh/atuin#4686))

##### Build

- *(atuin)* Make octavo a default feature, still off at runtime ([#4693](atuinsh/atuin#4693))
- *(release)* Compile octavo into release artifacts, still off by default ([#4671](atuinsh/atuin#4671))
renovate Bot added a commit to sdwilsh/ansible-playbooks that referenced this pull request Nov 10, 2026
@renovate
chore(deps): update ghcr.io/atuinsh/atuin docker tag to v18.24.6
3a24be8 
##### [\`18.24.6\`](https://github.com/atuinsh/atuin/blob/HEAD/CHANGELOG.md#18246)

##### Bug Fixes

- *(api)* Move to the fixed cowboy, cowlib and grpc_server
- *(copilot)* Register the hook as exec/args so PowerShell can run it ([#4634](atuinsh/atuin#4634))
- *(daemon)* Close inherited fds before autostarting, fixing indefinite pty-proxy hang on shell exit ([#4668](atuinsh/atuin#4668))
- *(daemon)* Don't manage the socket with launchd ([#4669](atuinsh/atuin#4669))
- *(deps)* Bump rmcp for three advisories, and hold the SQLite one until sqlx allows the fix ([#4690](atuinsh/atuin#4690))
- *(setup)* Don't warn about uninstalled harnesses ([#4680](atuinsh/atuin#4680))
- *(threads)* Capture Claude Code shell edits' diffs, and keep the patch of a write that names atuin key ([#4670](atuinsh/atuin#4670))
- *(threads)* Fix mislabeling of omp child transcripts as Pi ([#4694](atuinsh/atuin#4694))
- Include workaround for buggy VTE versions ([#4679](atuinsh/atuin#4679))

##### Features

- *(search)* Support jj workspace filters ([#4457](atuinsh/atuin#4457))
- *(setup)* Sharper capture and search labels, and give sync its own section ([#4659](atuinsh/atuin#4659))

##### Miscellaneous Tasks

- Add "Writing style" section to AGENTS.md ([#4675](atuinsh/atuin#4675))
- Prefer `cfg!()` over `#[cfg()]` in AGENTS.md ([#4676](atuinsh/atuin#4676))
- Prefer `let _ = ...` over `_ = ...` in AGENTS.md ([#4678](atuinsh/atuin#4678))

##### Refactor

- *(deps)* Bump hyper-util from 0.1.20 to 0.1.21 ([#4626](atuinsh/atuin#4626))
- *(deps)* Bump unicode-normalization from 0.1.25 to 0.1.26 ([#4686](atuinsh/atuin#4686))

##### Build

- *(atuin)* Make octavo a default feature, still off at runtime ([#4693](atuinsh/atuin#4693))
- *(release)* Compile octavo into release artifacts, still off by default ([#4671](atuinsh/atuin#4671))
renovate Bot added a commit to sdwilsh/ansible-playbooks that referenced this pull request Nov 10, 2026
@renovate
chore(deps): update ghcr.io/atuinsh/atuin docker tag to v18.24.6
ab3b548 
##### [\`18.24.6\`](https://github.com/atuinsh/atuin/blob/HEAD/CHANGELOG.md#18246)

##### Bug Fixes

- *(api)* Move to the fixed cowboy, cowlib and grpc_server
- *(copilot)* Register the hook as exec/args so PowerShell can run it ([#4634](atuinsh/atuin#4634))
- *(daemon)* Close inherited fds before autostarting, fixing indefinite pty-proxy hang on shell exit ([#4668](atuinsh/atuin#4668))
- *(daemon)* Don't manage the socket with launchd ([#4669](atuinsh/atuin#4669))
- *(deps)* Bump rmcp for three advisories, and hold the SQLite one until sqlx allows the fix ([#4690](atuinsh/atuin#4690))
- *(setup)* Don't warn about uninstalled harnesses ([#4680](atuinsh/atuin#4680))
- *(threads)* Capture Claude Code shell edits' diffs, and keep the patch of a write that names atuin key ([#4670](atuinsh/atuin#4670))
- *(threads)* Fix mislabeling of omp child transcripts as Pi ([#4694](atuinsh/atuin#4694))
- Include workaround for buggy VTE versions ([#4679](atuinsh/atuin#4679))

##### Features

- *(search)* Support jj workspace filters ([#4457](atuinsh/atuin#4457))
- *(setup)* Sharper capture and search labels, and give sync its own section ([#4659](atuinsh/atuin#4659))

##### Miscellaneous Tasks

- Add "Writing style" section to AGENTS.md ([#4675](atuinsh/atuin#4675))
- Prefer `cfg!()` over `#[cfg()]` in AGENTS.md ([#4676](atuinsh/atuin#4676))
- Prefer `let _ = ...` over `_ = ...` in AGENTS.md ([#4678](atuinsh/atuin#4678))

##### Refactor

- *(deps)* Bump hyper-util from 0.1.20 to 0.1.21 ([#4626](atuinsh/atuin#4626))
- *(deps)* Bump unicode-normalization from 0.1.25 to 0.1.26 ([#4686](atuinsh/atuin#4686))

##### Build

- *(atuin)* Make octavo a default feature, still off at runtime ([#4693](atuinsh/atuin#4693))
- *(release)* Compile octavo into release artifacts, still off by default ([#4671](atuinsh/atuin#4671))
eleboucher pushed a commit to eleboucher/homelab that referenced this pull request Nov 10, 2026
bot-owl @eleboucher
fix(container): update image ghcr.io/atuinsh/atuin (18.24.5 ➔ 18.24.6…
174c132 
…) (#2584)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [ghcr.io/atuinsh/atuin](https://github.com/atuinsh/atuin) | patch | `18.24.5` → `18.24.6` |

---

### Release Notes

<details>
<summary>atuinsh/atuin (ghcr.io/atuinsh/atuin)</summary>

### [`v18.24.6`](https://github.com/atuinsh/atuin/blob/HEAD/CHANGELOG.md#18246)

[Compare Source](atuinsh/atuin@v18.24.5...v18.24.6)

##### Bug Fixes

- *(api)* Move to the fixed cowboy, cowlib and grpc_server
- *(copilot)* Register the hook as exec/args so PowerShell can run it ([#&#8203;4634](atuinsh/atuin#4634))
- *(daemon)* Close inherited fds before autostarting, fixing indefinite pty-proxy hang on shell exit ([#&#8203;4668](atuinsh/atuin#4668))
- *(daemon)* Don't manage the socket with launchd ([#&#8203;4669](atuinsh/atuin#4669))
- *(deps)* Bump rmcp for three advisories, and hold the SQLite one until sqlx allows the fix ([#&#8203;4690](atuinsh/atuin#4690))
- *(setup)* Don't warn about uninstalled harnesses ([#&#8203;4680](atuinsh/atuin#4680))
- *(threads)* Capture Claude Code shell edits' diffs, and keep the patch of a write that names atuin key ([#&#8203;4670](atuinsh/atuin#4670))
- *(threads)* Fix mislabeling of omp child transcripts as Pi ([#&#8203;4694](atuinsh/atuin#4694))
- Include workaround for buggy VTE versions ([#&#8203;4679](atuinsh/atuin#4679))

##### Features

- *(search)* Support jj workspace filters ([#&#8203;4457](atuinsh/atuin#4457))
- *(setup)* Sharper capture and search labels, and give sync its own section ([#&#8203;4659](atuinsh/atuin#4659))

##### Miscellaneous Tasks

- Add "Writing style" section to AGENTS.md ([#&#8203;4675](atuinsh/atuin#4675))
- Prefer `cfg!()` over `#[cfg()]` in AGENTS.md ([#&#8203;4676](atuinsh/atuin#4676))
- Prefer `let _ = ...` over `_ = ...` in AGENTS.md ([#&#8203;4678](atuinsh/atuin#4678))

##### Refactor

- *(deps)* Bump hyper-util from 0.1.20 to 0.1.21 ([#&#8203;4626](atuinsh/atuin#4626))
- *(deps)* Bump unicode-normalization from 0.1.25 to 0.1.26 ([#&#8203;4686](atuinsh/atuin#4686))

##### Build

- *(atuin)* Make octavo a default feature, still off at runtime ([#&#8203;4693](atuinsh/atuin#4693))
- *(release)* Compile octavo into release artifacts, still off by default ([#&#8203;4671](atuinsh/atuin#4671))

</details>

---

### Configuration

📅 **Schedule**: (UTC)

- Branch creation
  - At any time (no schedule defined)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate CLI](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4yMjIuNSIsInVwZGF0ZWRJblZlciI6IjQ0LjIyMi41IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Reviewed-on: https://git.erwanleboucher.dev/eleboucher/homelab/pulls/2584
doonga pushed a commit to greyrock-labs/home-ops that referenced this pull request Nov 10, 2026
renovate[bot] git.greyrock.io Instance
fix(container): update image ghcr.io/atuinsh/atuin (18.24.5 ➔ 18.24.6…
63d78cc 
…) (#718)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [ghcr.io/atuinsh/atuin](https://github.com/atuinsh/atuin) | patch | `18.24.5` → `18.24.6` |

---

### Release Notes

<details>
<summary>atuinsh/atuin (ghcr.io/atuinsh/atuin)</summary>

### [`v18.24.6`](https://github.com/atuinsh/atuin/blob/HEAD/CHANGELOG.md#18246)

[Compare Source](atuinsh/atuin@v18.24.5...v18.24.6)

##### Bug Fixes

- *(api)* Move to the fixed cowboy, cowlib and grpc_server
- *(copilot)* Register the hook as exec/args so PowerShell can run it ([#&#8203;4634](atuinsh/atuin#4634))
- *(daemon)* Close inherited fds before autostarting, fixing indefinite pty-proxy hang on shell exit ([#&#8203;4668](atuinsh/atuin#4668))
- *(daemon)* Don't manage the socket with launchd ([#&#8203;4669](atuinsh/atuin#4669))
- *(deps)* Bump rmcp for three advisories, and hold the SQLite one until sqlx allows the fix ([#&#8203;4690](atuinsh/atuin#4690))
- *(setup)* Don't warn about uninstalled harnesses ([#&#8203;4680](atuinsh/atuin#4680))
- *(threads)* Capture Claude Code shell edits' diffs, and keep the patch of a write that names atuin key ([#&#8203;4670](atuinsh/atuin#4670))
- *(threads)* Fix mislabeling of omp child transcripts as Pi ([#&#8203;4694](atuinsh/atuin#4694))
- Include workaround for buggy VTE versions ([#&#8203;4679](atuinsh/atuin#4679))

##### Features

- *(search)* Support jj workspace filters ([#&#8203;4457](atuinsh/atuin#4457))
- *(setup)* Sharper capture and search labels, and give sync its own section ([#&#8203;4659](atuinsh/atuin#4659))

##### Miscellaneous Tasks

- Add "Writing style" section to AGENTS.md ([#&#8203;4675](atuinsh/atuin#4675))
- Prefer `cfg!()` over `#[cfg()]` in AGENTS.md ([#&#8203;4676](atuinsh/atuin#4676))
- Prefer `let _ = ...` over `_ = ...` in AGENTS.md ([#&#8203;4678](atuinsh/atuin#4678))

##### Refactor

- *(deps)* Bump hyper-util from 0.1.20 to 0.1.21 ([#&#8203;4626](atuinsh/atuin#4626))
- *(deps)* Bump unicode-normalization from 0.1.25 to 0.1.26 ([#&#8203;4686](atuinsh/atuin#4686))

##### Build

- *(atuin)* Make octavo a default feature, still off at runtime ([#&#8203;4693](atuinsh/atuin#4693))
- *(release)* Compile octavo into release artifacts, still off by default ([#&#8203;4671](atuinsh/atuin#4671))

</details>

---

### Configuration

📅 **Schedule**: (in timezone America/New_York)

- Branch creation
  - At any time (no schedule defined)
- Automerge
  - At any time (no schedule defined)

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Mend Renovate CLI](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4yMjIuNSIsInVwZGF0ZWRJblZlciI6IjQ0LjIyMi41IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZS9jb250YWluZXIiLCJ0eXBlL3BhdGNoIl19-->

Reviewed-on: https://git.greyrock.io/todd/home-ops/pulls/718
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@markovejnovic markovejnovic markovejnovic approved these changes

Assignees

No one assigned

Labels

mergebot:merged

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@axtl @markovejnovic @atuin-bot