fix(dream): filter non-Dream history commits (#4905)

* fix(dream): filter non-Dream history commits

* fix(dream): resolve filtered commit diffs

tests/command/test_builtin_dream.py

@@ -65,17 +65,34 @@ class _FakeGit:
         self._commits = commits or []
         self._diff_map = diff_map or {}
         self._revert_result = revert_result
+        self.revert_calls: list[tuple[str, str | None]] = []
 
     def is_initialized(self) -> bool:
         return self._initialized
 
-    def log(self, max_entries: int = 20) -> list[CommitInfo]:
-        return self._commits[:max_entries]
+    def log(
+        self,
+        max_entries: int = 20,
+        message_prefix: str | None = None,
+    ) -> list[CommitInfo]:
+        commits = self._commits
+        if message_prefix is not None:
+            commits = [c for c in commits if c.message.startswith(message_prefix)]
+        return commits[:max_entries]
 
-    def show_commit_diff(self, sha: str, max_entries: int = 20):
-        return self._diff_map.get(sha)
+    def show_commit_diff(
+        self,
+        sha: str,
+        max_entries: int = 20,
+        message_prefix: str | None = None,
+    ):
+        result = self._diff_map.get(sha)
+        if result and message_prefix is not None and not result[0].message.startswith(message_prefix):
+            return None
+        return result
 
-    def revert(self, sha: str) -> str | None:
+    def revert(self, sha: str, *, message_prefix: str | None = None) -> str | None:
+        self.revert_calls.append((sha, message_prefix))
         return self._revert_result
 
     def auto_commit(self, message: str) -> str | None:
@@ -260,6 +277,26 @@ async def test_dream_log_latest_is_more_user_friendly() -> None:
     assert "```diff" in out.content
 
 
+@pytest.mark.asyncio
+async def test_dream_log_latest_skips_non_dream_commit() -> None:
+    backup = CommitInfo(
+        sha="bbbb2222", message="backup: workspace snapshot", timestamp="2026-04-04 13:00",
+    )
+    dream = CommitInfo(
+        sha="abcd1234", message="dream: latest", timestamp="2026-04-04 12:00",
+    )
+    diff = "diff --git a/SOUL.md b/SOUL.md\n"
+    git = _FakeGit(
+        commits=[backup, dream],
+        diff_map={dream.sha: (dream, diff), backup.sha: (backup, "unrelated diff")},
+    )
+
+    out = await cmd_dream_log(_make_ctx("/dream-log", git))
+
+    assert "`abcd1234`" in out.content
+    assert "`bbbb2222`" not in out.content
+
+
 @pytest.mark.asyncio
 async def test_dream_log_missing_commit_guides_user() -> None:
     git = _FakeGit(diff_map={})
@@ -357,6 +394,7 @@ def test_dream_prompt_command_in_help_and_palette() -> None:
 async def test_dream_restore_lists_versions_with_next_steps() -> None:
     commits = [
         CommitInfo(sha="abcd1234", message="dream: latest", timestamp="2026-04-04 12:00"),
+        CommitInfo(sha="cccc3333", message="backup: workspace", timestamp="2026-04-04 10:00"),
         CommitInfo(sha="bbbb2222", message="dream: older", timestamp="2026-04-04 08:00"),
     ]
     git = _FakeGit(commits=commits)
@@ -366,6 +404,8 @@ async def test_dream_restore_lists_versions_with_next_steps() -> None:
     assert "## Dream Restore" in out.content
     assert "Choose a Dream memory version to restore." in out.content
     assert "`abcd1234` 2026-04-04 12:00 - dream: latest" in out.content
+    assert "`bbbb2222` 2026-04-04 08:00 - dream: older" in out.content
+    assert "backup: workspace" not in out.content
     assert "Preview a version with `/dream-log <sha>`" in out.content
     assert "Restore a version with `/dream-restore <sha>`." in out.content
 
@@ -398,3 +438,21 @@ async def test_dream_restore_success_mentions_files_and_followup() -> None:
     assert "- New safety commit: `eeee9999`" in out.content
     assert "- Restored files: `SOUL.md`, `memory/MEMORY.md`" in out.content
     assert "Use `/dream-log eeee9999` to inspect the restore diff." in out.content
+    assert git.revert_calls == [("abcd1234", "dream:")]
+
+
+@pytest.mark.asyncio
+async def test_dream_restore_rejects_non_dream_commit_clearly() -> None:
+    commit = CommitInfo(
+        sha="cccc3333", message="backup: workspace", timestamp="2026-04-04 10:00",
+    )
+    git = _FakeGit(
+        diff_map={commit.sha: (commit, "unrelated diff")},
+        revert_result="eeee9999",
+    )
+
+    out = await cmd_dream_restore(_make_ctx("/dream-restore cccc3333", git, args="cccc3333"))
+
+    assert "Only Dream memory versions can be restored." in out.content
+    assert "Use `/dream-restore` to list recent versions." in out.content
+    assert git.revert_calls == []