refactor: export plans to plans/ folder when multiple files

kenryu42 · kenryu42 · commit 56aae637c8dd · 2025-12-16T10:58:22.000+09:00
- Single plan file exports to cwd directly
- Multiple plan files (2+) export to plans/ folder
- Plans folder only created when needed
- Updated tests to verify new folder behavior
diff --git a/scripts/export_project_plans.py b/scripts/export_project_plans.py
@@ -59,20 +59,35 @@ def main() -> int:
         print("No slugs found in any transcript files", file=sys.stderr)
         return 0
 
-    # 3. Copy plan files to project root
-    plans_dir = Path.home() / ".claude" / "plans"
-    copied = 0
+    # 3. Collect valid plan files
+    plans_source_dir = Path.home() / ".claude" / "plans"
+    valid_files: list[tuple[str, Path]] = []
 
     for slug in sorted(all_slugs):
-        source_file = plans_dir / f"{slug}.md"
-        dest_file = Path.cwd() / f"plan-{slug}.md"
+        source_file = plans_source_dir / f"{slug}.md"
 
         if not source_file.exists():
             print(
                 f"Plan file not found for slug '{slug}': {source_file}", file=sys.stderr
             )
             continue
 
+        valid_files.append((slug, source_file))
+
+    # 4. Copy plan files (use plans/ folder only if more than one file)
+    copied = 0
+    use_plans_folder = len(valid_files) > 1
+    plans_dest_dir = Path.cwd() / "plans"
+
+    if use_plans_folder and not plans_dest_dir.exists():
+        plans_dest_dir.mkdir(parents=True)
+
+    for slug, source_file in valid_files:
+        if use_plans_folder:
+            dest_file = plans_dest_dir / f"plan-{slug}.md"
+        else:
+            dest_file = Path.cwd() / f"plan-{slug}.md"
+
         try:
             shutil.copy2(source_file, dest_file)
             print(f"Copied: {dest_file}")
diff --git a/scripts/export_project_plans_with_timestamp.py b/scripts/export_project_plans_with_timestamp.py
@@ -52,21 +52,35 @@ def main() -> int:
         print("No slugs found in any transcript files", file=sys.stderr)
         return 0
 
-    # 3. Copy plan files to project root with timestamp prefix
-    plans_dir = Path.home() / ".claude" / "plans"
-    copied = 0
+    # 3. Collect valid plan files
+    plans_source_dir = Path.home() / ".claude" / "plans"
+    valid_files: list[tuple[str, Path]] = []
 
     for slug in sorted(all_slugs):
-        source_file = plans_dir / f"{slug}.md"
+        source_file = plans_source_dir / f"{slug}.md"
 
         if not source_file.exists():
             print(
                 f"Plan file not found for slug '{slug}': {source_file}", file=sys.stderr
             )
             continue
 
+        valid_files.append((slug, source_file))
+
+    # 4. Copy plan files (use plans/ folder only if more than one file)
+    copied = 0
+    use_plans_folder = len(valid_files) > 1
+    plans_dest_dir = Path.cwd() / "plans"
+
+    if use_plans_folder and not plans_dest_dir.exists():
+        plans_dest_dir.mkdir(parents=True)
+
+    for slug, source_file in valid_files:
         timestamp = get_file_timestamp(source_file)
-        dest_file = Path.cwd() / f"{timestamp}-plan-{slug}.md"
+        if use_plans_folder:
+            dest_file = plans_dest_dir / f"{timestamp}-plan-{slug}.md"
+        else:
+            dest_file = Path.cwd() / f"{timestamp}-plan-{slug}.md"
 
         try:
             shutil.copy2(source_file, dest_file)
diff --git a/tests/test_export_project_plans.py b/tests/test_export_project_plans.py
@@ -63,7 +63,40 @@ def test_invalid_transcript_directory(self) -> None:
 
         self.assertEqual(result, 1)
 
-    def test_exports_multiple_plan_files_skipping_agent_transcripts(self) -> None:
+    def test_single_plan_file_exported_to_cwd_not_plans_folder(self) -> None:
+        """When only one plan file exists, it should go to cwd, not plans/."""
+        project_dir = self.tmpdir / "project"
+        project_dir.mkdir()
+
+        home_dir = self.tmpdir / "home"
+        plans_dir = home_dir / ".claude" / "plans"
+        plans_dir.mkdir(parents=True)
+
+        transcript_dir = self.tmpdir / "transcripts"
+        transcript_dir.mkdir()
+
+        (transcript_dir / "a.jsonl").write_text(
+            json.dumps({"slug": "only"}), encoding="utf-8"
+        )
+        (plans_dir / "only.md").write_text("single plan", encoding="utf-8")
+
+        with mock.patch.dict(
+            os.environ, {"TRANSCRIPT_DIR": str(transcript_dir)}, clear=True
+        ):
+            with mock.patch("pathlib.Path.home", return_value=home_dir):
+                with mock.patch("pathlib.Path.cwd", return_value=project_dir):
+                    result = export_project_plans.main()
+
+        self.assertEqual(result, 0)
+        # Single file should be in cwd, not plans/ folder
+        self.assertTrue((project_dir / "plan-only.md").exists())
+        self.assertFalse((project_dir / "plans").exists())
+        self.assertEqual(
+            (project_dir / "plan-only.md").read_text(encoding="utf-8"), "single plan"
+        )
+
+    def test_multiple_plan_files_exported_to_plans_folder(self) -> None:
+        """When 2+ plan files exist, they should go to plans/ folder."""
         project_dir = self.tmpdir / "project"
         project_dir.mkdir()
 
@@ -100,13 +133,18 @@ def test_exports_multiple_plan_files_skipping_agent_transcripts(self) -> None:
                     result = export_project_plans.main()
 
         self.assertEqual(result, 0)
-        exported_one = project_dir / "plan-one.md"
-        exported_two = project_dir / "plan-two.md"
+        # Multiple files should be in plans/ folder
+        self.assertTrue((project_dir / "plans").is_dir())
+        exported_one = project_dir / "plans" / "plan-one.md"
+        exported_two = project_dir / "plans" / "plan-two.md"
 
         self.assertTrue(exported_one.exists())
         self.assertTrue(exported_two.exists())
         self.assertEqual(exported_one.read_text(encoding="utf-8"), "plan one")
         self.assertEqual(exported_two.read_text(encoding="utf-8"), "plan two")
+        # Should NOT be in project root
+        self.assertFalse((project_dir / "plan-one.md").exists())
+        self.assertFalse((project_dir / "plan-two.md").exists())
 
     def test_no_slugs_in_any_file_returns_zero(self) -> None:
         project_dir = self.tmpdir / "project"
@@ -186,10 +224,10 @@ def mock_copy2(src, dst):
 
         # Should return 0 (logs error but continues)
         self.assertEqual(result, 0)
-        # Succeed file should be copied
-        self.assertTrue((project_dir / "plan-succeed.md").exists())
+        # Succeed file should be copied (in plans/ folder since 2 valid files)
+        self.assertTrue((project_dir / "plans" / "plan-succeed.md").exists())
         # Fail file should NOT be copied
-        self.assertFalse((project_dir / "plan-fail.md").exists())
+        self.assertFalse((project_dir / "plans" / "plan-fail.md").exists())
 
 
 if __name__ == "__main__":
diff --git a/tests/test_export_project_plans_with_timestamp.py b/tests/test_export_project_plans_with_timestamp.py
@@ -43,7 +43,8 @@ def test_invalid_transcript_directory(self) -> None:
             result = export_project_plans_with_timestamp.main()
         self.assertEqual(result, 1)
 
-    def test_exports_with_correct_timestamp_prefix(self) -> None:
+    def test_single_file_exports_to_cwd_not_plans_folder(self) -> None:
+        """When only one plan file exists, it should go to cwd, not plans/."""
         project_dir = self.tmpdir / "project"
         project_dir.mkdir()
 
@@ -72,10 +73,60 @@ def test_exports_with_correct_timestamp_prefix(self) -> None:
                     result = export_project_plans_with_timestamp.main()
 
         self.assertEqual(result, 0)
+        # Single file should be in cwd, not plans/ folder
         exported = project_dir / f"{expected_prefix}-plan-one.md"
         self.assertTrue(exported.exists())
+        self.assertFalse((project_dir / "plans").exists())
         self.assertEqual(exported.read_text(encoding="utf-8"), "plan one")
 
+    def test_multiple_files_export_to_plans_folder(self) -> None:
+        """When 2+ plan files exist, they should go to plans/ folder."""
+        project_dir = self.tmpdir / "project"
+        project_dir.mkdir()
+
+        home_dir = self.tmpdir / "home"
+        plans_dir = home_dir / ".claude" / "plans"
+        plans_dir.mkdir(parents=True)
+
+        transcript_dir = self.tmpdir / "transcripts"
+        transcript_dir.mkdir()
+        (transcript_dir / "a.jsonl").write_text(
+            json.dumps({"slug": "one"}) + "\n" + json.dumps({"slug": "two"}),
+            encoding="utf-8",
+        )
+
+        plan_one = plans_dir / "one.md"
+        plan_two = plans_dir / "two.md"
+        plan_one.write_text("plan one", encoding="utf-8")
+        plan_two.write_text("plan two", encoding="utf-8")
+
+        ts_one = 1735689600
+        ts_two = 1735689700
+        os.utime(plan_one, (ts_one, ts_one))
+        os.utime(plan_two, (ts_two, ts_two))
+        prefix_one = datetime.fromtimestamp(ts_one).strftime("%Y%m%d-%H:%M:%S")
+        prefix_two = datetime.fromtimestamp(ts_two).strftime("%Y%m%d-%H:%M:%S")
+
+        with mock.patch.dict(
+            os.environ, {"TRANSCRIPT_DIR": str(transcript_dir)}, clear=True
+        ):
+            with mock.patch("pathlib.Path.home", return_value=home_dir):
+                with mock.patch("pathlib.Path.cwd", return_value=project_dir):
+                    result = export_project_plans_with_timestamp.main()
+
+        self.assertEqual(result, 0)
+        # Multiple files should be in plans/ folder
+        self.assertTrue((project_dir / "plans").is_dir())
+        exported_one = project_dir / "plans" / f"{prefix_one}-plan-one.md"
+        exported_two = project_dir / "plans" / f"{prefix_two}-plan-two.md"
+        self.assertTrue(exported_one.exists())
+        self.assertTrue(exported_two.exists())
+        self.assertEqual(exported_one.read_text(encoding="utf-8"), "plan one")
+        self.assertEqual(exported_two.read_text(encoding="utf-8"), "plan two")
+        # Should NOT be in project root
+        self.assertFalse(any(project_dir.glob("*-plan-one.md")))
+        self.assertFalse(any(project_dir.glob("*-plan-two.md")))
+
     def test_skips_agent_transcripts(self) -> None:
         project_dir = self.tmpdir / "project"
         project_dir.mkdir()
@@ -166,8 +217,9 @@ def mock_copy2(src, dst):
                         result = export_project_plans_with_timestamp.main()
 
         self.assertEqual(result, 0)
-        self.assertFalse(any(project_dir.glob("*-plan-fail.md")))
-        self.assertTrue(any(project_dir.glob("*-plan-succeed.md")))
+        # Files should be in plans/ folder since 2 valid files
+        self.assertFalse(any((project_dir / "plans").glob("*-plan-fail.md")))
+        self.assertTrue(any((project_dir / "plans").glob("*-plan-succeed.md")))
 
 
 if __name__ == "__main__":
