feat(cli): add /diff slash command to show git changes in working directory by Ninso112 · Pull Request #22703 · NousResearch/hermes-agent

Ninso112 · 2026-05-09T16:42:44Z

Summary

Add /diff slash command to show git changes in the working directory
Supports optional arguments (e.g. /diff --staged path/to/file)
Checks for git availability and presence in a git repository before running
Output preserves colour when on a TTY with no extra args

… and long forms The generated zsh completion script used invalid _arguments syntax: '(-h --help){-h,--help}[...]'. Zsh () groups must contain only single-letter short options, not long options with spaces. Changed to '(-)'{-h,--help}'[...]' which is the standard zsh completion convention. Closes NousResearch#22686

…d update_fact add_fact() now raises RuntimeError when a concurrent delete removes the fact between a failed INSERT and the follow-up SELECT, instead of crashing with TypeError. update_fact() falls back to category='general' when the category re-fetch returns no row after a concurrent delete. Closes NousResearch#22660

…ectory Runs 'git diff' with optional arguments (e.g. /diff --staged path/to/file). Checks for git availability and presence in a git repository before running. Output is piped through the user's pager when on a TTY and no extra args are given, preserving colour output. Closes NousResearch#22662

alt-glitch · 2026-05-09T22:44:29Z

Competing with #22662 (same feature — /diff slash command). Also related to older #4839.

teknium1

Thanks for the focused raw-git CLI proposal. The /diff capability is still absent from current main: hermes_cli/commands.py:160-220 has no diff command and cli.py:8724-8727 has no dispatch branch.

Problems

cli.py:4774 uses extra_args.split(), which breaks quoted paths and other quoted git arguments.
The PR has no /diff tests; its changed tests only cover completion and memory code. tests/hermes_cli/test_completion.py:159 also duplicates the method at line 143, silently shadowing it.
The completion and holographic-memory commits are unrelated to this feature. The completion behavior is already on main in hermes_cli/completion.py:220-225 via 8c4bec615.
The current command-handler structure places /copy in hermes_cli/cli_commands_mixin.py:361, while dispatch remains in cli.py:8724; a salvage should follow that split and update website/docs/reference/slash-commands.md:120 and :253.

Suggested changes

Preserve quoted git arguments and test paths containing spaces.
Add focused /diff behavior tests and retain only the feature-specific change.

This is an automated hermes-sweeper review.

teknium1 · 2026-07-13T01:38:03Z

+
+        cmd = ["git", "diff"]
+        if extra_args:
+            cmd.extend(extra_args.split())


str.split() does not preserve quoted argv tokens, so /diff -- "dir/file name.py" invokes git with two path arguments. Parse forwarded arguments with quote preservation and add a path-with-spaces regression test.

teknium1 · 2026-07-13T01:38:03Z

+        assert "'(-)'{-V,--version}'" in out
+        assert "'(-)'{-p,--profile}'" in out
+
+    def test_valid_zsh_arguments_syntax(self):


This duplicates the test_valid_zsh_arguments_syntax method at line 143. Python keeps only this later definition, silently discarding the earlier test; remove the duplicate.

@SHL0MS

Widen the cherry-picked /diff base (#4839 by @SHL0MS) into one cross-surface implementation, folding in the review feedback and the best ideas from the two sibling PRs (#22703, #53527): - tools/working_diff.py: shared git collection layer — unstaged (default), staged, and all (vs HEAD) modes; untracked files folded in via `git diff --no-index` so new files appear as additions (Codex /diff parity); shlex-split arguments preserve quoted paths. - CLI: handler moved to hermes_cli/cli_commands_mixin.py per the current god-file decomposition (dispatch stays in cli.py), renders through the rich console with a 400-line terminal-flood guard. - Gateway: _handle_diff_command in gateway/slash_commands.py + dispatch in gateway/run.py; fenced ```diff output truncated to 60 lines / 3000 chars before the platform senders apply their own per-platform message clamps (tool-progress-style layered truncation). Localized strings in all 17 locale catalogs. - /diff session (from #53527): cumulative checkpoint-baseline diff of everything Hermes changed, via new CheckpointManager.session_diff(); docstring records the retained-baseline approximation caveat from review. Works on both surfaces; degrades with an actionable message when checkpoints are off. - Slack: /diff routed via /hermes diff (50-slash cap; keeps telegram-parity test green and /version native). - Registry: cross-surface CommandDef with staged|all|session subcommands; docs: slash-commands reference (CLI + gateway tables + both-surfaces list) and hermes-agent skill reference. - Tests: tests/tools/test_working_diff.py (real git repos), tests/hermes_cli/test_diff_command.py (real git + stubbed checkpoint manager), tests/gateway/test_diff_command.py (end-to-end handler, real checkpoint store), TestSessionDiff in tests/tools/test_checkpoint_manager.py. Salvaged from the /diff PR cluster #4839 + #22703 + #53527. Co-authored-by: Ninso112 <ninso112@proton.me> Co-authored-by: Harshkamdar67 <harshkamdar67@gmail.com>

@SHL0MS

Widen the cherry-picked /diff base (#4839 by @SHL0MS) into one cross-surface implementation, folding in the review feedback and the best ideas from the two sibling PRs (#22703, #53527): - tools/working_diff.py: shared git collection layer — unstaged (default), staged, and all (vs HEAD) modes; untracked files folded in via `git diff --no-index` so new files appear as additions (Codex /diff parity); shlex-split arguments preserve quoted paths. - CLI: handler moved to hermes_cli/cli_commands_mixin.py per the current god-file decomposition (dispatch stays in cli.py), renders through the rich console with a 400-line terminal-flood guard. - Gateway: _handle_diff_command in gateway/slash_commands.py + dispatch in gateway/run.py; fenced ```diff output truncated to 60 lines / 3000 chars before the platform senders apply their own per-platform message clamps (tool-progress-style layered truncation). Localized strings in all 17 locale catalogs. - /diff session (from #53527): cumulative checkpoint-baseline diff of everything Hermes changed, via new CheckpointManager.session_diff(); docstring records the retained-baseline approximation caveat from review. Works on both surfaces; degrades with an actionable message when checkpoints are off. - Slack: /diff routed via /hermes diff (50-slash cap; keeps telegram-parity test green and /version native). - Registry: cross-surface CommandDef with staged|all|session subcommands; docs: slash-commands reference (CLI + gateway tables + both-surfaces list) and hermes-agent skill reference. - Tests: tests/tools/test_working_diff.py (real git repos), tests/hermes_cli/test_diff_command.py (real git + stubbed checkpoint manager), tests/gateway/test_diff_command.py (end-to-end handler, real checkpoint store), TestSessionDiff in tests/tools/test_checkpoint_manager.py. Salvaged from the /diff PR cluster #4839 + #22703 + #53527. Co-authored-by: Ninso112 <ninso112@proton.me> Co-authored-by: Harshkamdar67 <harshkamdar67@gmail.com>

@SHL0MS

Widen the cherry-picked /diff base (#4839 by @SHL0MS) into one cross-surface implementation, folding in the review feedback and the best ideas from the two sibling PRs (#22703, #53527): - tools/working_diff.py: shared git collection layer — unstaged (default), staged, and all (vs HEAD) modes; untracked files folded in via `git diff --no-index` so new files appear as additions (Codex /diff parity); shlex-split arguments preserve quoted paths. - CLI: handler moved to hermes_cli/cli_commands_mixin.py per the current god-file decomposition (dispatch stays in cli.py), renders through the rich console with a 400-line terminal-flood guard. - Gateway: _handle_diff_command in gateway/slash_commands.py + dispatch in gateway/run.py; fenced ```diff output truncated to 60 lines / 3000 chars before the platform senders apply their own per-platform message clamps (tool-progress-style layered truncation). Localized strings in all 17 locale catalogs. - /diff session (from #53527): cumulative checkpoint-baseline diff of everything Hermes changed, via new CheckpointManager.session_diff(); docstring records the retained-baseline approximation caveat from review. Works on both surfaces; degrades with an actionable message when checkpoints are off. - Slack: /diff routed via /hermes diff (50-slash cap; keeps telegram-parity test green and /version native). - Registry: cross-surface CommandDef with staged|all|session subcommands; docs: slash-commands reference (CLI + gateway tables + both-surfaces list) and hermes-agent skill reference. - Tests: tests/tools/test_working_diff.py (real git repos), tests/hermes_cli/test_diff_command.py (real git + stubbed checkpoint manager), tests/gateway/test_diff_command.py (end-to-end handler, real checkpoint store), TestSessionDiff in tests/tools/test_checkpoint_manager.py. Salvaged from the /diff PR cluster #4839 + #22703 + #53527. Co-authored-by: Ninso112 <ninso112@proton.me> Co-authored-by: Harshkamdar67 <harshkamdar67@gmail.com>

@SHL0MS

Widen the cherry-picked /diff base (#4839 by @SHL0MS) into one cross-surface implementation, folding in the review feedback and the best ideas from the two sibling PRs (#22703, #53527): - tools/working_diff.py: shared git collection layer — unstaged (default), staged, and all (vs HEAD) modes; untracked files folded in via `git diff --no-index` so new files appear as additions (Codex /diff parity); shlex-split arguments preserve quoted paths. - CLI: handler moved to hermes_cli/cli_commands_mixin.py per the current god-file decomposition (dispatch stays in cli.py), renders through the rich console with a 400-line terminal-flood guard. - Gateway: _handle_diff_command in gateway/slash_commands.py + dispatch in gateway/run.py; fenced ```diff output truncated to 60 lines / 3000 chars before the platform senders apply their own per-platform message clamps (tool-progress-style layered truncation). Localized strings in all 17 locale catalogs. - /diff session (from #53527): cumulative checkpoint-baseline diff of everything Hermes changed, via new CheckpointManager.session_diff(); docstring records the retained-baseline approximation caveat from review. Works on both surfaces; degrades with an actionable message when checkpoints are off. - Slack: /diff routed via /hermes diff (50-slash cap; keeps telegram-parity test green and /version native). - Registry: cross-surface CommandDef with staged|all|session subcommands; docs: slash-commands reference (CLI + gateway tables + both-surfaces list) and hermes-agent skill reference. - Tests: tests/tools/test_working_diff.py (real git repos), tests/hermes_cli/test_diff_command.py (real git + stubbed checkpoint manager), tests/gateway/test_diff_command.py (end-to-end handler, real checkpoint store), TestSessionDiff in tests/tools/test_checkpoint_manager.py. Salvaged from the /diff PR cluster #4839 + #22703 + #53527. Co-authored-by: Ninso112 <ninso112@proton.me> Co-authored-by: Harshkamdar67 <harshkamdar67@gmail.com>

teknium1 · 2026-07-27T01:29:00Z

The /diff command landed via #72240 (now merged), unifying this with #4839 (earliest submission, used as the cherry-picked base) and the session-mode concept from #53527 — CLI polish ideas from here were folded in with credit. Thanks!

@SHL0MS

Widen the cherry-picked /diff base (NousResearch#4839 by @SHL0MS) into one cross-surface implementation, folding in the review feedback and the best ideas from the two sibling PRs (NousResearch#22703, NousResearch#53527): - tools/working_diff.py: shared git collection layer — unstaged (default), staged, and all (vs HEAD) modes; untracked files folded in via `git diff --no-index` so new files appear as additions (Codex /diff parity); shlex-split arguments preserve quoted paths. - CLI: handler moved to hermes_cli/cli_commands_mixin.py per the current god-file decomposition (dispatch stays in cli.py), renders through the rich console with a 400-line terminal-flood guard. - Gateway: _handle_diff_command in gateway/slash_commands.py + dispatch in gateway/run.py; fenced ```diff output truncated to 60 lines / 3000 chars before the platform senders apply their own per-platform message clamps (tool-progress-style layered truncation). Localized strings in all 17 locale catalogs. - /diff session (from NousResearch#53527): cumulative checkpoint-baseline diff of everything Hermes changed, via new CheckpointManager.session_diff(); docstring records the retained-baseline approximation caveat from review. Works on both surfaces; degrades with an actionable message when checkpoints are off. - Slack: /diff routed via /hermes diff (50-slash cap; keeps telegram-parity test green and /version native). - Registry: cross-surface CommandDef with staged|all|session subcommands; docs: slash-commands reference (CLI + gateway tables + both-surfaces list) and hermes-agent skill reference. - Tests: tests/tools/test_working_diff.py (real git repos), tests/hermes_cli/test_diff_command.py (real git + stubbed checkpoint manager), tests/gateway/test_diff_command.py (end-to-end handler, real checkpoint store), TestSessionDiff in tests/tools/test_checkpoint_manager.py. Salvaged from the /diff PR cluster NousResearch#4839 + NousResearch#22703 + NousResearch#53527. Co-authored-by: Ninso112 <ninso112@proton.me> Co-authored-by: Harshkamdar67 <harshkamdar67@gmail.com>

Ninso112 added 3 commits May 9, 2026 18:20

liuhao1024 mentioned this pull request May 9, 2026

fix(openrouter): add x-grok-conv-id header for Grok models to improve prompt cache hit rates #22708

Closed

alt-glitch added type/feature New feature or request P3 Low — cosmetic, nice to have comp/cli CLI entry point, hermes_cli/, setup wizard duplicate This issue or pull request already exists labels May 9, 2026

Harshkamdar67 mentioned this pull request Jun 27, 2026

feat(diff): /diff — review everything Hermes changed this session #53527

Closed

10 tasks

teknium1 reviewed Jul 13, 2026

View reviewed changes

teknium1 added the sweeper:blast-contained Sweeper blast radius: contained — one narrow path / opt-in / few users label Jul 13, 2026

teknium1 mentioned this pull request Jul 26, 2026

feat(diff): cross-surface /diff with staged/all/session modes (salvage of #4839 by @SHL0MS) #72240

Merged

teknium1 closed this Jul 27, 2026

GottZ mentioned this pull request Jul 27, 2026

[UX] No /diff command to see what the agent changed this session #4865

Open

Navigation Menu

Uh oh!

feat(cli): add /diff slash command to show git changes in working directory - #22703

feat(cli): add /diff slash command to show git changes in working directory#22703
Ninso112 wants to merge 3 commits into
NousResearch:mainfrom
Ninso112:feat-diff-command

Ninso112 commented May 9, 2026

Uh oh!

alt-glitch commented May 9, 2026

Uh oh!

teknium1 left a comment

Uh oh!

teknium1 Jul 13, 2026

Uh oh!

teknium1 Jul 13, 2026

Uh oh!

teknium1 commented Jul 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

Ninso112 commented May 9, 2026

Summary

Uh oh!

alt-glitch commented May 9, 2026

Uh oh!

teknium1 left a comment

Choose a reason for hiding this comment

Problems

Suggested changes

Uh oh!

teknium1 Jul 13, 2026

Choose a reason for hiding this comment

Uh oh!

teknium1 Jul 13, 2026

Choose a reason for hiding this comment

Uh oh!

teknium1 commented Jul 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants