teddy-cli 0.1.17.dev1349__tar.gz → 0.1.17.dev1351__tar.gz

{teddy_cli-0.1.17.dev1349 → teddy_cli-0.1.17.dev1351}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: teddy-cli
-Version: 0.1.17.dev1349
+Version: 0.1.17.dev1351
 Summary: The local-first, test-driven agentic engineering harness. Because you should own the means of development.
 Author: Raphael Atteritano
 License: AGPL-3.0-only

{teddy_cli-0.1.17.dev1349 → teddy_cli-0.1.17.dev1351}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "teddy-cli"
-version = "0.1.17.dev1349"
+version = "0.1.17.dev1351"
 description = "The local-first, test-driven agentic engineering harness. Because you should own the means of development."
 readme = "README.md"
 keywords = [

{teddy_cli-0.1.17.dev1349 → teddy_cli-0.1.17.dev1351}/src/teddy_executor/adapters/inbound/session_cli_handlers.py

@@ -727,7 +727,6 @@ def _echo_config_success(
     container: Container,
     agent: Optional[str] = None,
     model: Optional[str] = None,
-    actual_model: Optional[str] = None,
 ) -> None:
     """Retrieves and echoes the active model and agent configuration on success.
 
@@ -736,13 +735,9 @@ def _echo_config_success(
         agent: Optional agent name to display.
         model: Optional model override from CLI. If provided, this takes
                precedence over the config file value.
-        actual_model: Optional actual serving model from meta.yaml. If provided,
-                      this takes precedence over the model parameter.
     """
     config_service = container.resolve(IConfigService)
-    if actual_model:
-        resolved_model = actual_model
-    elif model:
+    if model:
         resolved_model = model
     else:
         resolved_model = config_service.get_setting("llm.model", "unknown")
@@ -1149,13 +1144,18 @@ def _sync_and_display_session_meta(
 
     latest_turn_path = session_manager.get_latest_turn(session_name)
     meta = repository.load_meta(latest_turn_path)
-    # Clear actual_model so display falls through to current model (override or config)
-    meta.pop("actual_model", None)
+
+    changed = False
+    # Clear actual_model so display falls through to current model (override or config).
+    # A removed key must count as a change so the clear reaches disk without an override.
+    if "actual_model" in meta:
+        meta.pop("actual_model", None)
+        changed = True
+
     _echo_config_success(container, agent=agent or meta.get("agent_name"), model=model)
 
     # Sync latest turn's meta.yaml with current config model/overrides
     config_model = config_service.get_setting("llm.model", "unknown")
-    changed = False
     if model:
         meta["model"] = model
         changed = True

{teddy_cli-0.1.17.dev1349 → teddy_cli-0.1.17.dev1351}/src/teddy_executor/adapters/outbound/system_environment_inspector.py

@@ -58,27 +58,11 @@ class SystemEnvironmentInspector(IEnvironmentInspector):
 
     def get_git_status(self) -> Optional[str]:
         """
-        Gathers the current Git status of the working directory (short format).
+        Gathers the current Git status of the working directory in porcelain format.
         """
         try:
             result = self._run_func(  # nosec B603 B607
-                ["git", "status", "-s"],
-                capture_output=True,
-                text=True,
-                check=True,
-                stdin=subprocess.DEVNULL,
-            )
-            return result.stdout.rstrip() if result.stdout else ""
-        except (subprocess.CalledProcessError, FileNotFoundError):
-            return None
-
-    def get_full_git_status(self) -> Optional[str]:
-        """
-        Gathers the full Git status of the working directory (including branch info).
-        """
-        try:
-            result = self._run_func(  # nosec B603 B607
-                ["git", "status"],
+                ["git", "status", "--porcelain", "-b"],
                 capture_output=True,
                 text=True,
                 check=True,

{teddy_cli-0.1.17.dev1349 → teddy_cli-0.1.17.dev1351}/src/teddy_executor/core/domain/models/project_context.py

@@ -38,7 +38,7 @@ class ProjectContext:
         header: A string containing metadata about the context (e.g., CWD, OS).
         content: The main body of the context (e.g., file tree and contents).
         scoped_paths: A mapping of scope names (e.g., 'Turn', 'Session') to lists of file paths.
-        git_status: An optional string containing the output of 'git status -s'.
+        git_status: An optional string containing the output of 'git status --porcelain -b'.
         items: Structured list of context files and metadata.
         agent_name: Name of the active agent.
         system_prompt_tokens: Token count of the system prompt.

{teddy_cli-0.1.17.dev1349 → teddy_cli-0.1.17.dev1351}/src/teddy_executor/core/ports/outbound/environment_inspector.py

@@ -22,18 +22,9 @@ class IEnvironmentInspector(Protocol):
 
     def get_git_status(self) -> Optional[str]:
         """
-        Gathers the current Git status of the working directory (short format).
+        Gathers the current Git status of the working directory in porcelain format.
 
         Returns:
-            Optional[str]: The output of 'git status -s' or None if not a git repo.
-        """
-        ...
-
-    def get_full_git_status(self) -> Optional[str]:
-        """
-        Gathers the full Git status of the working directory (including branch info).
-
-        Returns:
-            Optional[str]: The output of 'git status' or None if not a git repo.
+            Optional[str]: The output of 'git status --porcelain -b', or None if not a git repo.
         """
         ...

{teddy_cli-0.1.17.dev1349 → teddy_cli-0.1.17.dev1351}/src/teddy_executor/core/services/context_service.py

@@ -53,8 +53,7 @@ class ContextService(IGetContextUseCase):
         Gathers all project context information by orchestrating its dependencies.
         """
         system_info = self._environment_inspector.get_environment_info()
-        short_git_status = self._environment_inspector.get_git_status()
-        full_git_status = self._environment_inspector.get_full_git_status()
+        git_status = self._environment_inspector.get_git_status()
         repo_tree = self._repo_tree_generator.generate_tree()
 
         scoped_paths, all_resolved_paths = self._resolve_scoped_paths(context_files)
@@ -101,7 +100,7 @@ class ContextService(IGetContextUseCase):
             web_cache = {}
 
         content = self._format_content(
-            repo_tree, scoped_paths, file_contents, full_git_status
+            repo_tree, scoped_paths, file_contents, git_status
         )
         content_tokens = (
             self._llm_client.get_text_token_count(content) if include_tokens else 0
@@ -111,9 +110,9 @@ class ContextService(IGetContextUseCase):
             header=self._format_header(system_info, current_turn),
             content=content,
             scoped_paths=scoped_paths,
-            git_status=full_git_status,
+            git_status=git_status,
             items=self._collect_items(
-                scoped_paths, file_contents, short_git_status, include_tokens
+                scoped_paths, file_contents, git_status, include_tokens
             ),
             agent_name=agent_name,
             total_window=total_window,
@@ -301,7 +300,7 @@ class ContextService(IGetContextUseCase):
         return token_counts
 
     def _parse_git_status(self, git_status: Optional[str]) -> Dict[str, str]:
-        """Parses git status -s output into a map of path -> status code."""
+        """Parses porcelain git status output into a map of path -> status code."""
         if not git_status:
             return {}
 
@@ -309,10 +308,17 @@ class ContextService(IGetContextUseCase):
         min_line_length = 4
         status_map = {}
         for line in git_status.splitlines():
+            # The porcelain branch header carries no file status.
+            if line.startswith("##"):
+                continue
             if len(line) >= min_line_length:
                 code = line[:2].strip()
                 path = line[3:].strip()
 
+                # A rename line reads "old -> new"; key the badge by the new path.
+                if " -> " in path:
+                    path = path.split(" -> ", 1)[1]
+
                 # Guideline: Map ?? to U (Untracked)
                 if code == "??":
                     code = "U"
@@ -356,9 +362,14 @@ class ContextService(IGetContextUseCase):
         workspace_paths = [p for p in all_paths if not is_session_file_path(p)]
         session_paths = [p for p in all_paths if is_session_file_path(p)]
 
+        git_status_body = (
+            embed_in_fence(git_status, "")
+            if isinstance(git_status, str) and git_status
+            else ""
+        )
         content_parts = [
             "\n## Git Status",
-            git_status if isinstance(git_status, str) else "",
+            git_status_body,
             "\n## Project Structure",
             f"```\n{repo_tree}\n```",
         ]