teddy-cli 0.1.17.dev1289__tar.gz → 0.1.17.dev1291__tar.gz

{teddy_cli-0.1.17.dev1289 → teddy_cli-0.1.17.dev1291}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: teddy-cli
-Version: 0.1.17.dev1289
+Version: 0.1.17.dev1291
 Summary: A local-first, file-based AI coding workflow that applies the UNIX philosophy to AI collaboration.
 Author: Raphael Atteritano
 License: AGPL-3.0-only

{teddy_cli-0.1.17.dev1289 → teddy_cli-0.1.17.dev1291}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "teddy-cli"
-version = "0.1.17.dev1289"
+version = "0.1.17.dev1291"
 description = "A local-first, file-based AI coding workflow that applies the UNIX philosophy to AI collaboration."
 authors = [{ name = "Raphael Atteritano" }]
 license = { text = "AGPL-3.0-only" }

{teddy_cli-0.1.17.dev1289 → teddy_cli-0.1.17.dev1291}/src/teddy_executor/adapters/inbound/session_cli_handlers.py

@@ -17,7 +17,8 @@ from teddy_executor.core.ports.outbound.user_interactor import IUserInteractor
 from teddy_executor.core.ports.outbound.session_loop_guard import ISessionLoopGuard
 from teddy_executor.core.ports.outbound.config_service import IConfigService
 from teddy_executor.core.ports.outbound.session_repository import ISessionRepository
-from teddy_executor.core.utils.interrupt_guard import INTERRUPT_REASON, InterruptGuard
+from teddy_executor.core.utils.interrupt_guard import InterruptGuard
+from teddy_executor.core.utils.session_notices import format_interrupt_notice
 from teddy_executor.core.utils.string import canonical_agent_name, slugify
 from teddy_executor.adapters.inbound.cli_formatter import format_project_context
 from teddy_executor.adapters.inbound.cli_helpers import (
@@ -358,7 +359,10 @@ def _orchestrate_session_loop(  # noqa: PLR0913
             # the orchestrator's turn-transition path. EXIT the session so the
             # user regains control instead of auto-advancing to the next turn.
             if interrupt_guard.interrupted.is_set():
-                typer.secho(INTERRUPT_REASON, fg=typer.colors.YELLOW)
+                typer.secho(
+                    format_interrupt_notice(interrupt_guard.source),
+                    fg=typer.colors.YELLOW,
+                )
                 break
 
             cumulative_cost = float(report.metadata.get("cumulative_cost", 0.0))
@@ -376,7 +380,10 @@ def _orchestrate_session_loop(  # noqa: PLR0913
         # Immediate-exit semantics (Task Brief): Ctrl+C while nothing is in
         # flight (prompts, planning) terminates the session with a notice —
         # no report is generated and nothing is mutated.
-        typer.secho(INTERRUPT_REASON, fg=typer.colors.YELLOW)
+        typer.secho(
+            format_interrupt_notice(interrupt_guard.source),
+            fg=typer.colors.YELLOW,
+        )
     finally:
         # Caller-owned restoration contract: restore the SIGINT disposition
         # that preceded the guard's install() when the turn loop ends. Stop the

{teddy_cli-0.1.17.dev1289 → teddy_cli-0.1.17.dev1291}/src/teddy_executor/container.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import os
+import signal
 import time
 
 import punq
@@ -31,6 +33,20 @@ def create_container() -> punq.Container:
     return container
 
 
+def _record_quit_source(container: punq.Container) -> None:
+    """Record the bare-`q` source on the shared guard, then self-deliver SIGINT.
+
+    Invoked from the quit-key listener's reader thread when `q` is pressed.
+    Recording the source lets the boundary notice name `q` instead of the
+    default `Ctrl+C`; the self-delivered SIGINT then drives the shared guard's
+    already-tested WAITING/EXECUTING branch unchanged.
+    """
+    from teddy_executor.core.utils.interrupt_guard import InterruptGuard
+
+    container.resolve(InterruptGuard).record_source("q")
+    os.kill(os.getpid(), signal.SIGINT)
+
+
 def _register_services(container: punq.Container) -> None:
     """Registers core application services."""
     from teddy_executor.core.ports.inbound.edit_simulator import IEditSimulator
@@ -176,7 +192,9 @@ def _register_orchestration_services(container: punq.Container) -> None:
     # so ONE instance serves the boundary's install/restore window.
     container.register(
         IQuitKeyListener,
-        factory=lambda: TerminalQuitKeyListener(),
+        factory=lambda: TerminalQuitKeyListener(
+            on_quit=lambda: _record_quit_source(container)
+        ),
         scope=punq.Scope.singleton,
     )
     container.register(

{teddy_cli-0.1.17.dev1289 → teddy_cli-0.1.17.dev1291}/src/teddy_executor/core/services/session_orchestrator.py

@@ -14,6 +14,7 @@ from teddy_executor.core.ports.inbound.run_plan_use_case import IRunPlanUseCase
 from teddy_executor.core.ports.outbound.file_system_manager import IFileSystemManager
 from teddy_executor.core.services.session_replanner import SessionReplanner
 from teddy_executor.core.utils.io import Tee as _Tee
+from teddy_executor.core.utils.session_notices import format_termination_notice
 from teddy_executor.core.utils.terminal import emit_user_message
 import typer
 
@@ -304,12 +305,10 @@ class SessionOrchestrator(IRunPlanUseCase):
                 )
                 if user_reply is not None and not user_reply.strip():
                     typer.secho(
-                        "\nSession terminated (empty message).",
-                        fg=typer.colors.RED,
-                        err=True,
-                    )
-                    typer.secho(
-                        "To continue the session, use `teddy resume [session_path]`.",
+                        format_termination_notice(
+                            "Session terminated (empty message)."
+                        ),
+                        fg=typer.colors.YELLOW,
                         err=True,
                     )
                     return None  # type: ignore
@@ -334,9 +333,9 @@ class SessionOrchestrator(IRunPlanUseCase):
             elif is_session and plan_path:
                 report = self._handle_aborted_session(report, plan)
                 if report is None:
-                    typer.secho("\nSession terminated.", fg=typer.colors.RED, err=True)
                     typer.secho(
-                        "To continue the session, use `teddy resume [session_path]`.",
+                        format_termination_notice("Session terminated."),
+                        fg=typer.colors.YELLOW,
                         err=True,
                     )
                     return None  # type: ignore

{teddy_cli-0.1.17.dev1289 → teddy_cli-0.1.17.dev1291}/src/teddy_executor/core/utils/interrupt_guard.py

@@ -51,6 +51,10 @@ class InterruptGuard:
         self._grace_window = GRACE_WINDOW_SECONDS
         self._monotonic = monotonic
         self.interrupted = threading.Event()
+        # The key that triggered the interrupt (e.g. "q"), recorded by the
+        # quit-key listener before it self-delivers SIGINT. None means a
+        # genuine Ctrl+C (or a direct interrupted.set() in tests).
+        self.source: Optional[str] = None
         self._executing = False
         self._first_signal_at: Optional[float] = None
 
@@ -62,6 +66,15 @@ class InterruptGuard:
         """
         return signal.signal(signal.SIGINT, self._handle_signal)
 
+    def record_source(self, source: str) -> None:
+        """Record which key triggered the interrupt (e.g. ``"q"``).
+
+        The quit-key listener's ``on_quit`` callback calls this BEFORE
+        self-delivering SIGINT so the boundary notice can name the key the
+        user actually pressed instead of defaulting to ``Ctrl+C``.
+        """
+        self.source = source
+
     def _handle_signal(self, signum: int, frame: Optional[FrameType]) -> None:
         """The installed SIGINT handler; branches on the current phase."""
         if not self._executing:

teddy_cli-0.1.17.dev1291/src/teddy_executor/core/utils/session_notices.py

@@ -0,0 +1,42 @@
+"""Shared session-termination and interrupt notice strings.
+
+Single source for the resume hint and the interrupt-notice composition so the
+session-loop boundary (interrupt notices) and the session orchestrator
+(termination notices) render the same actionable next step.
+
+The interrupt notice names the key the user actually pressed: the shared
+guard's ``source`` marker (set by the bare-``q`` listener callback) when
+present, and the ``Ctrl+C`` default otherwise.
+"""
+
+from typing import Optional
+
+from teddy_executor.core.utils.interrupt_guard import INTERRUPT_REASON
+
+# The single resume hint shared by every termination and interrupt notice.
+RESUME_HINT = "To continue the session, use `teddy resume`."
+
+# Key label used when no interrupt source was recorded (a genuine Ctrl+C).
+DEFAULT_INTERRUPT_KEY = "Ctrl+C"
+
+
+def format_interrupt_notice(source: Optional[str] = None) -> str:
+    """Compose the one-line interrupt notice naming the pressed key.
+
+    The prefix is derived from ``INTERRUPT_REASON`` (sans its trailing period)
+    so the boundary notice and the audit-trail reason stay in lockstep; the key
+    label defaults to ``Ctrl+C`` when no source was recorded.
+    """
+    key = source or DEFAULT_INTERRUPT_KEY
+    return f"{INTERRUPT_REASON.removesuffix('.')} ({key}). {RESUME_HINT}"
+
+
+def format_termination_notice(reason: str) -> str:
+    """Compose a one-line termination notice ending with the shared resume hint.
+
+    ``reason`` is the situation-specific lead-in (e.g. ``"Session terminated."``
+    or ``"Session terminated (empty message)."``); the shared ``RESUME_HINT``
+    is appended so every termination notice ends with the same actionable next
+    step on a single line.
+    """
+    return f"{reason} {RESUME_HINT}"