klaude-code 1.2.6__py3-none-any.whl → 1.8.0__py3-none-any.whl

klaude_code/session/selector.py

@@ -1,76 +1,98 @@
 import time
-from typing import TYPE_CHECKING
+from dataclasses import dataclass
 
-from klaude_code.trace import log, log_debug
+from .session import Session
 
-if TYPE_CHECKING:
-    from questionary import Choice
 
-from .session import Session
+def _relative_time(ts: float) -> str:
+    """Format timestamp as relative time like '5 days ago'."""
+    now = time.time()
+    diff = now - ts
+
+    if diff < 60:
+        return "just now"
+    elif diff < 3600:
+        mins = int(diff / 60)
+        return f"{mins} minute{'s' if mins != 1 else ''} ago"
+    elif diff < 86400:
+        hours = int(diff / 3600)
+        return f"{hours} hour{'s' if hours != 1 else ''} ago"
+    elif diff < 604800:
+        days = int(diff / 86400)
+        return f"{days} day{'s' if days != 1 else ''} ago"
+    elif diff < 2592000:
+        weeks = int(diff / 604800)
+        return f"{weeks} week{'s' if weeks != 1 else ''} ago"
+    else:
+        months = int(diff / 2592000)
+        return f"{months} month{'s' if months != 1 else ''} ago"
+
+
+@dataclass(frozen=True, slots=True)
+class SessionSelectOption:
+    """Option data for session selection UI."""
+
+    session_id: str
+    user_messages: list[str]
+    messages_count: str
+    relative_time: str
+    model_name: str
+
+
+def _format_message(msg: str) -> str:
+    """Format a user message for display (strip and collapse newlines)."""
+    return msg.strip().replace("\n", " ")
+
+
+def format_user_messages_display(messages: list[str]) -> list[str]:
+    """Format user messages for display in session selection.
 
+    Shows up to 6 messages. If more than 6, shows first 3 and last 3 with ellipsis.
+    Each message is on its own line.
 
-def resume_select_session() -> str | None:
+    Args:
+        messages: List of user messages.
+
+    Returns:
+        List of formatted message lines for display.
+    """
+    if len(messages) <= 6:
+        return messages
+
+    # More than 6: show first 3, ellipsis, last 3
+    result = messages[:3]
+    result.append("⋮")
+    result.extend(messages[-3:])
+    return result
+
+
+def build_session_select_options() -> list[SessionSelectOption]:
+    """Build session selection options data.
+
+    Returns:
+        List of SessionSelectOption, or empty list if no sessions exist.
+    """
     sessions = Session.list_sessions()
     if not sessions:
-        log("No sessions found for this project.")
-        return None
-
-    def _fmt(ts: float) -> str:
-        try:
-            return time.strftime("%m-%d %H:%M:%S", time.localtime(ts))
-        except Exception:
-            return str(ts)
-
-    try:
-        import questionary
-
-        choices: list[Choice] = []
-        for s in sessions:
-            first_user_message = s.first_user_message or "N/A"
-            msg_count_display = "N/A" if s.messages_count == -1 else str(s.messages_count)
-            model_display = s.model_name or "N/A"
-
-            title = [
-                ("class:d", f"{_fmt(s.updated_at):<16} "),
-                ("class:b", f"{msg_count_display:>3}  "),
-                (
-                    "class:t",
-                    f"{model_display[:29] + '…' if len(model_display) > 29 else model_display:<30}  ",
-                ),
-                (
-                    "class:t",
-                    f"{first_user_message.strip().replace('\n', ' ↩ '):<50}",
-                ),
-            ]
-            choices.append(questionary.Choice(title=title, value=s.id))
-        return questionary.select(
-            message=f"{' Updated at':<17} {'Msg':>3}  {'Model':<30}  {'First message':<50}",
-            choices=choices,
-            pointer="→",
-            instruction="↑↓ to move",
-            style=questionary.Style(
-                [
-                    ("t", ""),
-                    ("b", "bold"),
-                    ("d", "dim"),
-                ]
-            ),
-        ).ask()
-    except Exception as e:
-        log_debug(f"Failed to use questionary for session select, {e}")
-
-        for i, s in enumerate(sessions, 1):
-            msg_count_display = "N/A" if s.messages_count == -1 else str(s.messages_count)
-            model_display = s.model_name or "N/A"
-            print(
-                f"{i}. {_fmt(s.updated_at)}  {msg_count_display:>3} "
-                f"{model_display[:29] + '…' if len(model_display) > 29 else model_display:<30} {s.id}  {s.work_dir}"
+        return []
+
+    options: list[SessionSelectOption] = []
+    for s in sessions:
+        user_messages = [_format_message(m) for m in s.user_messages if m.strip()]
+        if not user_messages:
+            user_messages = ["N/A"]
+
+        msg_count = "N/A" if s.messages_count == -1 else f"{s.messages_count} messages"
+        model = s.model_name or "N/A"
+
+        options.append(
+            SessionSelectOption(
+                session_id=str(s.id),
+                user_messages=user_messages,
+                messages_count=msg_count,
+                relative_time=_relative_time(s.updated_at),
+                model_name=model,
             )
-        try:
-            raw = input("Select a session number: ").strip()
-            idx = int(raw)
-            if 1 <= idx <= len(sessions):
-                return str(sessions[idx - 1].id)
-        except Exception:
-            return None
-    return None
+        )
+
+    return options