Use only sessions from cwd

Author: HacksonClark

src/handoff/cli.py

@@ -177,9 +177,12 @@ def transfer_cmd(
         return
 
     if session_id:
-        ref = extractor.find_by_id(session_id, project) or extractor.find_by_id(session_id)
+        ref = extractor.find_by_id(session_id, project)
         if not ref:
-            _die(f"no {from_a} session with id starting with {session_id!r}")
+            _die(
+                f"no {from_a} session with id starting with {session_id!r} "
+                f"for project {project}"
+            )
             return
     else:
         ref = extractor.find_latest(project)

tests/test_cli.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 from pathlib import Path
 
 from click.testing import CliRunner
@@ -34,6 +35,56 @@ def test_transfer_no_sessions_errors(tmp_path: Path, monkeypatch) -> None:
     )
 
 
+def test_transfer_session_id_is_scoped_to_project(tmp_path: Path, monkeypatch) -> None:
+    monkeypatch.setenv("HOME", str(tmp_path))
+    monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
+
+    from handoff.agents.codex import CodexInjector
+    from handoff.canonical import CanonicalTranscript, Message, Metadata, now_iso
+
+    source_project = tmp_path / "source-project"
+    other_project = tmp_path / "other-project"
+    source_project.mkdir()
+    other_project.mkdir()
+
+    transcript = CanonicalTranscript(
+        metadata=Metadata(
+            session_id="src",
+            source_agent="claude",
+            source_session_path="/tmp/src.jsonl",
+            created_at=now_iso(),
+            last_activity=now_iso(),
+            message_count=1,
+            cwd=str(other_project),
+            model="gpt-5.4",
+        ),
+        transcript=[
+            Message(
+                id="1",
+                timestamp=now_iso(),
+                author="user",
+                type="message",
+                content="Continue from the other project",
+            )
+        ],
+    )
+    session_path = CodexInjector(tmp_path / ".codex").inject(transcript)
+
+    first_line = session_path.read_text(encoding="utf-8").splitlines()[0]
+    session_uuid = json.loads(first_line)["payload"]["id"]
+
+    runner = CliRunner()
+    result = runner.invoke(
+        main,
+        ["codex", "claude", "--cwd", str(source_project), "--session-id", session_uuid],
+    )
+
+    assert result.exit_code != 0
+    output = result.output.lower()
+    assert "no codex session with id starting with" in output
+    assert str(source_project).lower() in output
+
+
 def test_unknown_agent_errors(tmp_path: Path, monkeypatch) -> None:
     monkeypatch.setattr("pathlib.Path.home", lambda: tmp_path)
     runner = CliRunner()