code-puppy 0.0.195__tar.gz → 0.0.196__tar.gz

{code_puppy-0.0.195 → code_puppy-0.0.196}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.195
+Version: 0.0.196
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy

{code_puppy-0.0.195 → code_puppy-0.0.196}/code_puppy/command_line/command_handler.py

@@ -82,7 +82,7 @@ def get_commands_help():
     help_lines.append(
         Text("/set", style="cyan")
         + Text(
-            "                  Set puppy config key-values (e.g., /set yolo_mode true, /set auto_save_session true, /set max_saved_sessions 20)"
+            "                  Set puppy config key-values (e.g., /set yolo_mode true, /set auto_save_session true)"
         )
     )
     help_lines.append(
@@ -336,6 +336,30 @@ def handle_command(command: str):
         )
         return True
 
+    if command.startswith("/session"):
+        # /session id -> show current autosave id
+        # /session new -> rotate autosave id
+        tokens = command.split()
+        from code_puppy.config import (
+            AUTOSAVE_DIR,
+            get_current_autosave_id,
+            get_current_autosave_session_name,
+            rotate_autosave_id,
+        )
+        if len(tokens) == 1 or tokens[1] == "id":
+            sid = get_current_autosave_id()
+            emit_info(
+                f"[bold magenta]Autosave Session[/bold magenta]: {sid}\n"
+                f"Files prefix: {Path(AUTOSAVE_DIR) / get_current_autosave_session_name()}"
+            )
+            return True
+        if tokens[1] == "new":
+            new_sid = rotate_autosave_id()
+            emit_success(f"New autosave session id: {new_sid}")
+            return True
+        emit_warning("Usage: /session [id|new]")
+        return True
+
     if command.startswith("/set"):
         # Syntax: /set KEY=VALUE or /set KEY VALUE
         from code_puppy.config import set_config_value
@@ -361,7 +385,6 @@ def handle_command(command: str):
             session_help = (
                 "\n[yellow]Session Management[/yellow]"
                 "\n  [cyan]auto_save_session[/cyan]    Auto-save chat after every response (true/false)"
-                "\n  [cyan]max_saved_sessions[/cyan]  Cap how many auto-saves to keep (0 = unlimited)"
             )
             emit_warning(
                 f"Usage: /set KEY=VALUE or /set KEY VALUE\nConfig keys: {', '.join(config_keys)}\n[dim]Note: compaction_strategy can be 'summarization' or 'truncation'[/dim]{session_help}"
@@ -712,9 +735,17 @@ def handle_command(command: str):
         agent.set_message_history(history)
         total_tokens = sum(agent.estimate_tokens_for_message(m) for m in history)
 
+        # Rotate autosave id to avoid overwriting any existing autosave
+        try:
+            from code_puppy.config import rotate_autosave_id
+            new_id = rotate_autosave_id()
+            autosave_info = f"\n[dim]Autosave session rotated to: {new_id}[/dim]"
+        except Exception:
+            autosave_info = ""
+
         emit_success(
             f"✅ Context loaded: {len(history)} messages ({total_tokens} tokens)\n"
-            f"📁 From: {session_path}"
+            f"📁 From: {session_path}{autosave_info}"
         )
         return True
 

{code_puppy-0.0.195 → code_puppy-0.0.196}/code_puppy/config.py

@@ -3,8 +3,9 @@ import datetime
 import json
 import os
 import pathlib
+from typing import Optional
 
-from code_puppy.session_storage import cleanup_sessions, save_session
+from code_puppy.session_storage import save_session
 
 CONFIG_DIR = os.path.join(os.path.expanduser("~"), ".code_puppy")
 CONFIG_FILE = os.path.join(CONFIG_DIR, "puppy.cfg")
@@ -19,6 +20,9 @@ AUTOSAVE_DIR = os.path.join(CONFIG_DIR, "autosaves")
 DEFAULT_SECTION = "puppy"
 REQUIRED_KEYS = ["puppy_name", "owner_name"]
 
+# Runtime-only autosave session ID (per-process)
+_CURRENT_AUTOSAVE_ID: Optional[str] = None
+
 # Cache containers for model validation and defaults
 _model_validation_cache = {}
 _default_model_cache = None
@@ -702,22 +706,40 @@ def set_max_saved_sessions(max_sessions: int):
     set_config_value("max_saved_sessions", str(max_sessions))
 
 
-def _cleanup_old_sessions():
-    """Remove oldest auto-saved sessions if we exceed the max_saved_sessions limit."""
-    max_sessions = get_max_saved_sessions()
-    if max_sessions <= 0:
-        return
+def get_current_autosave_id() -> str:
+    """Get or create the current autosave session ID for this process."""
+    global _CURRENT_AUTOSAVE_ID
+    if not _CURRENT_AUTOSAVE_ID:
+        # Use a full timestamp so tests and UX can predict the name if needed
+        _CURRENT_AUTOSAVE_ID = datetime.datetime.now().strftime('%Y%m%d_%H%M%S')
+    return _CURRENT_AUTOSAVE_ID
 
-    autosave_dir = pathlib.Path(AUTOSAVE_DIR)
-    removed_sessions = cleanup_sessions(autosave_dir, max_sessions)
-    if not removed_sessions:
-        return
 
-    from rich.console import Console
+def rotate_autosave_id() -> str:
+    """Force a new autosave session ID and return it."""
+    global _CURRENT_AUTOSAVE_ID
+    _CURRENT_AUTOSAVE_ID = datetime.datetime.now().strftime('%Y%m%d_%H%M%S')
+    return _CURRENT_AUTOSAVE_ID
+
 
-    console = Console()
-    for session_name in removed_sessions:
-        console.print(f"[dim]🗑️  Removed old session: {session_name}.pkl[/dim]")
+def get_current_autosave_session_name() -> str:
+    """Return the full session name used for autosaves (no file extension)."""
+    return f"auto_session_{get_current_autosave_id()}"
+
+
+def set_current_autosave_from_session_name(session_name: str) -> str:
+    """Set the current autosave ID based on a full session name.
+
+    Accepts names like 'auto_session_YYYYMMDD_HHMMSS' and extracts the ID part.
+    Returns the ID that was set.
+    """
+    global _CURRENT_AUTOSAVE_ID
+    prefix = "auto_session_"
+    if session_name.startswith(prefix):
+        _CURRENT_AUTOSAVE_ID = session_name[len(prefix):]
+    else:
+        _CURRENT_AUTOSAVE_ID = session_name
+    return _CURRENT_AUTOSAVE_ID
 
 
 def auto_save_session_if_enabled() -> bool:
@@ -739,7 +761,7 @@ def auto_save_session_if_enabled() -> bool:
             return False
 
         now = datetime.datetime.now()
-        session_name = f"auto_session_{now.strftime('%Y%m%d_%H%M%S')}"
+        session_name = get_current_autosave_session_name()
         autosave_dir = pathlib.Path(AUTOSAVE_DIR)
 
         metadata = save_session(
@@ -755,7 +777,6 @@ def auto_save_session_if_enabled() -> bool:
             f"🐾 [dim]Auto-saved session: {metadata.message_count} messages ({metadata.total_tokens} tokens)[/dim]"
         )
 
-        _cleanup_old_sessions()
         return True
 
     except Exception as exc:  # pragma: no cover - defensive logging

{code_puppy-0.0.195 → code_puppy-0.0.196}/code_puppy/session_storage.py

@@ -96,6 +96,12 @@ def load_session(session_name: str, base_dir: Path) -> SessionHistory:
         return pickle.load(pickle_file)
 
 
+def list_sessions(base_dir: Path) -> List[str]:
+    if not base_dir.exists():
+        return []
+    return sorted(path.stem for path in base_dir.glob("*.pkl"))
+
+
 def cleanup_sessions(base_dir: Path, max_sessions: int) -> List[str]:
     if max_sessions <= 0:
         return []
@@ -126,12 +132,6 @@ def cleanup_sessions(base_dir: Path, max_sessions: int) -> List[str]:
     return removed_sessions
 
 
-def list_sessions(base_dir: Path) -> List[str]:
-    if not base_dir.exists():
-        return []
-    return sorted(path.stem for path in base_dir.glob("*.pkl"))
-
-
 async def restore_autosave_interactively(base_dir: Path) -> None:
     """Prompt the user to load an autosave session from base_dir, if any exist.
 
@@ -232,6 +232,15 @@ async def restore_autosave_interactively(base_dir: Path) -> None:
 
     agent = get_current_agent()
     agent.set_message_history(history)
+
+    # Set current autosave session id so subsequent autosaves overwrite this session
+    try:
+        from code_puppy.config import set_current_autosave_from_session_name
+
+        set_current_autosave_from_session_name(chosen_name)
+    except Exception:
+        pass
+
     total_tokens = sum(agent.estimate_tokens_for_message(msg) for msg in history)
 
     session_path = base_dir / f"{chosen_name}.pkl"

{code_puppy-0.0.195 → code_puppy-0.0.196}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy"
-version = "0.0.195"
+version = "0.0.196"
 description = "Code generation agent"
 readme = "README.md"
 requires-python = ">=3.11"