tunacode-cli 0.0.77.2__py3-none-any.whl → 0.0.77.3__py3-none-any.whl

tunacode/cli/repl.py

@@ -394,7 +394,8 @@ async def execute_repl_request(text: str, state_manager: StateManager, output: b
     except CancelledError:
         await ui.muted(MSG_REQUEST_CANCELLED)
     except UserAbortError:
-        await ui.muted(MSG_OPERATION_ABORTED)
+        # CLAUDE_ANCHOR[7b2c1d4e]: Guided aborts inject user instructions; skip legacy banner.
+        pass
     except UnexpectedModelBehavior as e:
         await ui.muted(str(e))
         patch_tool_messages(str(e), state_manager)

tunacode/constants.py

@@ -9,7 +9,7 @@ from enum import Enum
 
 # Application info
 APP_NAME = "TunaCode"
-APP_VERSION = "0.0.77.2"
+APP_VERSION = "0.0.77.3"
 
 
 # File patterns

tunacode/core/agents/agent_components/node_processor.py

@@ -5,6 +5,7 @@ from typing import Any, Awaitable, Callable, Optional, Tuple
 
 from tunacode.core.logging.logger import get_logger
 from tunacode.core.state import StateManager
+from tunacode.exceptions import UserAbortError
 from tunacode.types import AgentState, UsageTrackerProtocol
 from tunacode.ui.tool_descriptions import get_batch_description, get_tool_description
 
@@ -472,6 +473,8 @@ async def _process_tool_calls(
                     # Execute the tool with robust error handling so one failure doesn't crash the run
                     try:
                         await tool_callback(part, node)
+                    except UserAbortError:
+                        raise
                     except Exception as tool_err:
                         logger.error(
                             "Tool callback failed: tool=%s iter=%s err=%s",

tunacode/core/tool_handler.py

@@ -5,6 +5,7 @@ Tool handling business logic, separated from UI concerns.
 from typing import Optional
 
 from tunacode.constants import READ_ONLY_TOOLS
+from tunacode.core.agents.agent_components.agent_helpers import create_user_message
 from tunacode.core.state import StateManager
 from tunacode.templates.loader import Template
 from tunacode.types import (
@@ -86,6 +87,21 @@ class ToolHandler:
         if response.skip_future:
             self.state.session.tool_ignore.append(tool_name)
 
+        if not response.approved or response.abort:
+            guidance = getattr(response, "instructions", "").strip()
+            # CLAUDE_ANCHOR[3c8b1f70]: Route user rejection guidance back to the agent.
+            if guidance:
+                guidance_section = f"User guidance:\n{guidance}"
+            else:
+                guidance_section = "User cancelled without additional instructions."
+
+            message = (
+                f"Tool '{tool_name}' execution cancelled before running.\n"
+                f"{guidance_section}\n"
+                "Do not assume the operation succeeded; request updated guidance or offer alternatives."
+            )
+            create_user_message(message, self.state)
+
         return response.approved and not response.abort
 
     def create_confirmation_request(

tunacode/types.py

@@ -129,6 +129,7 @@ class ToolConfirmationResponse:
     approved: bool
     skip_future: bool = False
     abort: bool = False
+    instructions: str = ""
 
 
 # =============================================================================

tunacode/ui/tool_ui.py

@@ -25,6 +25,11 @@ if TYPE_CHECKING:
 class ToolUI:
     """Handles tool confirmation UI presentation."""
 
+    REJECTION_FEEDBACK_SESSION = "tool_rejection_feedback"
+    REJECTION_GUIDANCE_PROMPT = (
+        "  Describe what the agent should do instead (leave blank to skip): "
+    )
+
     def __init__(self):
         self.colors = DotDict(UI_COLORS)
 
@@ -133,10 +138,14 @@ class ToolUI:
 
         if resp == "2":
             return ToolConfirmationResponse(approved=True, skip_future=True)
-        elif resp == "3":
-            return ToolConfirmationResponse(approved=False, abort=True)
-        else:
-            return ToolConfirmationResponse(approved=True)
+        if resp == "3":
+            instructions = await self._prompt_rejection_feedback(state_manager)
+            return ToolConfirmationResponse(
+                approved=False,
+                abort=True,
+                instructions=instructions,
+            )
+        return ToolConfirmationResponse(approved=True)
 
     def show_sync_confirmation(self, request: ToolConfirmationRequest) -> ToolConfirmationResponse:
         """
@@ -189,10 +198,23 @@ class ToolUI:
 
         if resp == "2":
             return ToolConfirmationResponse(approved=True, skip_future=True)
-        elif resp == "3":
-            return ToolConfirmationResponse(approved=False, abort=True)
-        else:
-            return ToolConfirmationResponse(approved=True)
+        if resp == "3":
+            instructions = self._prompt_rejection_feedback_sync()
+            return ToolConfirmationResponse(approved=False, abort=True, instructions=instructions)
+        return ToolConfirmationResponse(approved=True)
+
+    async def _prompt_rejection_feedback(self, state_manager: Optional["StateManager"]) -> str:
+        guidance = await ui.input(
+            session_key=self.REJECTION_FEEDBACK_SESSION,
+            pretext=self.REJECTION_GUIDANCE_PROMPT,
+            state_manager=state_manager,
+        )
+        return guidance.strip() if guidance else ""
+
+    def _prompt_rejection_feedback_sync(self) -> str:
+        guidance = input(self.REJECTION_GUIDANCE_PROMPT).strip()
+        ui.console.print()
+        return guidance
 
     async def log_mcp(self, title: str, args: ToolArgs) -> None:
         """

{tunacode_cli-0.0.77.2.dist-info → tunacode_cli-0.0.77.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tunacode-cli
-Version: 0.0.77.2
+Version: 0.0.77.3
 Summary: Your agentic CLI developer.
 Project-URL: Homepage, https://tunacode.xyz/
 Project-URL: Repository, https://github.com/alchemiststudiosDOTai/tunacode

{tunacode_cli-0.0.77.2.dist-info → tunacode_cli-0.0.77.3.dist-info}/RECORD

@@ -1,13 +1,12 @@
 tunacode/__init__.py,sha256=yUul8igNYMfUrHnYfioIGAqvrH8b5BKiO_pt1wVnmd0,119
-tunacode/constants.py,sha256=uOp0kTgQk6GFZXnx1gpSusnIlg72TxI11G-i5iMzmv0,6168
-tunacode/context.py,sha256=4xMzqhSBqtTLuXnPBkJzn0SA61G5kAQytFvVY8TDnYY,2395
+tunacode/constants.py,sha256=4R41mrExdN-66GmxdgKDO8DI9YgeXVn8V1eBxmNrpm8,6168
 tunacode/exceptions.py,sha256=m80njR-LqBXhFAEOPqCE7N2QPU4Fkjlf_f6CWKO0_Is,8479
 tunacode/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tunacode/setup.py,sha256=1GXwD1cNDkGcmylZbytdlGnnHzpsGIwnGpnN0OFp1F0,2022
-tunacode/types.py,sha256=xNpDRjIRYg4qGNbl3EG8B13CWAWBoob9ekVm8_6dvnc,10496
+tunacode/types.py,sha256=ofclq3gZF9xnd0WFaSNqC4OKaKX6kgdqznkNPIpG3cM,10523
 tunacode/cli/__init__.py,sha256=zgs0UbAck8hfvhYsWhWOfBe5oK09ug2De1r4RuQZREA,55
 tunacode/cli/main.py,sha256=MAKPFA4kGSFciqMdxnyp2r9XzVp8TfxvK6ztt7dvjwM,3445
-tunacode/cli/repl.py,sha256=QBw05NNypxuTYoV51FVoTfujJfiOTCIYzAr_1uoi0YA,23515
+tunacode/cli/repl.py,sha256=XzCb6Xx6-uwsTNcaJ2PP6w4Xwc7jY0GpidV1ZWDNpHU,23577
 tunacode/cli/commands/__init__.py,sha256=J7MZofTaSgspAKP64OavPukj4l53qvkv_-sCfYEUi10,1794
 tunacode/cli/commands/base.py,sha256=Ge_lNQA-GDfcb1Ap1oznCH3UrifBiHH3bA9DNL-tCDw,2519
 tunacode/cli/commands/registry.py,sha256=J2zS2QZmVaUyOA6GEgYwKqh1bZ9QBbsuuxMYniF7YSA,15139
@@ -42,7 +41,7 @@ tunacode/configuration/settings.py,sha256=9wtIWBlLhW_ZBlLx-GA4XDfVZyGj2Gs6Zk49vk
 tunacode/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tunacode/core/code_index.py,sha256=2qxEn2eTIegV4F_gLeZO5lAOv8mkf4Y_t21whZ9F2Fk,17370
 tunacode/core/state.py,sha256=4SzI_OPiL2VIDywtUavtE6jZnIJS7K2IVgj8AYcawW0,8706
-tunacode/core/tool_handler.py,sha256=42yUfnq5jgk-0LK93JoJgtsXfVDTf-7hNXyKEfH2FM0,3626
+tunacode/core/tool_handler.py,sha256=ImCqzq5NflovKSkrnUzf26I4E_orFt6K_vCU06Ex12Q,4426
 tunacode/core/agents/__init__.py,sha256=ZOSvWhqBWX3ADzTUZ7ILY92xZ7VMXanjPQ_Sf37WYmU,1005
 tunacode/core/agents/main.py,sha256=IFKuGy-3t9XJDAs4rO0oTPZ1xGkZAXxoK1efdgIN15Q,23251
 tunacode/core/agents/utils.py,sha256=cQJbpXzMcixJ1TKdLsEcpJHMMMXiH6_qcT3wbnSQ9gc,9411
@@ -51,7 +50,7 @@ tunacode/core/agents/agent_components/agent_config.py,sha256=X4S5PCsndoHBd7EHHuN
 tunacode/core/agents/agent_components/agent_helpers.py,sha256=m0sB0_ztHhRJYFnG2tmQyNmyZk_WnZExBE5jKIHN5lA,9121
 tunacode/core/agents/agent_components/json_tool_parser.py,sha256=HuyNT0rs-ppx_gLAI2e0XMVGbR_F0WXZfP3sx38VoMg,3447
 tunacode/core/agents/agent_components/message_handler.py,sha256=KJGOtb9VhumgZpxxwO45HrKLhU9_MwuoWRsSQwJviNU,3704
-tunacode/core/agents/agent_components/node_processor.py,sha256=oOi3Yuccpdmnlza6vZRr_wB2_OczV0OLcqvs0a3BJcA,24734
+tunacode/core/agents/agent_components/node_processor.py,sha256=WnN3K7d2V1B7VZ_qlEh94qY1V6a9y4NAzPdeAi0qucU,24854
 tunacode/core/agents/agent_components/response_state.py,sha256=qnjRSQCYZzac04CcVc4gTvW8epxl4w-Vz0kPjsvM_Qg,4482
 tunacode/core/agents/agent_components/result_wrapper.py,sha256=9CFK0wpsfZx2WT4PBHfkSv22GxL1gAQuUYVMlmYtCJU,1761
 tunacode/core/agents/agent_components/state_transition.py,sha256=uyvLJriexosBDQIrxbVDLR_luvXAMG6tnDsX10mbZcI,4077
@@ -138,7 +137,7 @@ tunacode/ui/panels.py,sha256=DQETEuP2LnliXGWSXKIqtmA3qUD5uJD4hB05XMPikFQ,18319
 tunacode/ui/path_heuristics.py,sha256=SkhGaM8WCRuK86vLwypbfhtI81PrXtOsWoz-P0CTsmQ,2221
 tunacode/ui/prompt_manager.py,sha256=HUL6443pFPb41uDAnAKD-sZsrWd_VhWYRGwvrFH_9SI,5618
 tunacode/ui/tool_descriptions.py,sha256=vk61JPIXy7gHNfJ--77maXgK6WwNwxqY47QYsw_a2uw,4126
-tunacode/ui/tool_ui.py,sha256=MVmBLXx6OTJVFLl58SpoW0KoStOrbAY9sc6XXMKgWtQ,7216
+tunacode/ui/tool_ui.py,sha256=tB1w01ffPVtWJn1veutcUrOZE6yb7t7kMqzxVNPfZZs,8132
 tunacode/ui/utils.py,sha256=yvoCTz8AOdRfV0XIqUX3sgg88g_wntV9yhnQP6WzAVs,114
 tunacode/ui/validators.py,sha256=MMIMT1I2v0l2jIy-gxX_4GSApvUTi8XWIOACr_dmoBA,758
 tunacode/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -158,8 +157,8 @@ tunacode/utils/system.py,sha256=J8KqJ4ZqQrNSnM5rrJxPeMk9z2xQQp6dWtI1SKBY1-0,1112
 tunacode/utils/text_utils.py,sha256=HAwlT4QMy41hr53cDbbNeNo05MI461TpI9b_xdIv8EY,7288
 tunacode/utils/token_counter.py,sha256=dmFuqVz4ywGFdLfAi5Mg9bAGf8v87Ek-mHU-R3fsYjI,2711
 tunacode/utils/user_configuration.py,sha256=OA-L0BgWNbf9sWpc8lyivgLscwJdpdI8TAYbe0wRs1s,4836
-tunacode_cli-0.0.77.2.dist-info/METADATA,sha256=45BWpB2EYn2kWKFd3av6YyPnPsbGrEK4P4MLuO1w0Pg,8904
-tunacode_cli-0.0.77.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tunacode_cli-0.0.77.2.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
-tunacode_cli-0.0.77.2.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
-tunacode_cli-0.0.77.2.dist-info/RECORD,,
+tunacode_cli-0.0.77.3.dist-info/METADATA,sha256=5JwyUQ4xJE5g5G60hnV1JaoFmd14KERAXjjXSA0ADzg,8904
+tunacode_cli-0.0.77.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tunacode_cli-0.0.77.3.dist-info/entry_points.txt,sha256=hbkytikj4dGu6rizPuAd_DGUPBGF191RTnhr9wdhORY,51
+tunacode_cli-0.0.77.3.dist-info/licenses/LICENSE,sha256=Btzdu2kIoMbdSp6OyCLupB1aRgpTCJ_szMimgEnpkkE,1056
+tunacode_cli-0.0.77.3.dist-info/RECORD,,

tunacode/context.py

@@ -1,71 +0,0 @@
-import logging
-import subprocess
-from pathlib import Path
-from typing import Dict, List
-
-from tunacode.utils.ripgrep import ripgrep
-from tunacode.utils.system import list_cwd
-
-logger = logging.getLogger(__name__)
-
-
-async def get_git_status() -> Dict[str, object]:
-    """Return git branch and dirty state information."""
-    try:
-        result = subprocess.run(
-            ["git", "status", "--porcelain", "--branch"],
-            capture_output=True,
-            text=True,
-            check=True,
-            timeout=5,
-        )
-        lines = result.stdout.splitlines()
-        branch_line = lines[0][2:] if lines else ""
-        branch = branch_line.split("...")[0]
-        ahead = behind = 0
-        if "[" in branch_line and "]" in branch_line:
-            bracket = branch_line.split("[", 1)[1].split("]", 1)[0]
-            for part in bracket.split(","):
-                if "ahead" in part:
-                    ahead = int(part.split("ahead")[1].strip().strip(" ]"))
-                if "behind" in part:
-                    behind = int(part.split("behind")[1].strip().strip(" ]"))
-        dirty = any(line for line in lines[1:])
-        return {"branch": branch, "ahead": ahead, "behind": behind, "dirty": dirty}
-    except Exception as e:
-        logger.warning(f"Failed to get git status: {e}")
-        return {}
-
-
-async def get_directory_structure(max_depth: int = 3) -> str:
-    """Return a simple directory tree string."""
-    files = list_cwd(max_depth=max_depth)
-    lines: List[str] = []
-    for path in files:
-        depth = path.count("/")
-        indent = "  " * depth
-        name = path.split("/")[-1]
-        lines.append(f"{indent}{name}")
-    return "\n".join(lines)
-
-
-async def get_code_style() -> str:
-    """Concatenate contents of all AGENTS.md files up the directory tree."""
-    parts: List[str] = []
-    current = Path.cwd()
-    while True:
-        file = current / "AGENTS.md"
-        if file.exists():
-            try:
-                parts.append(file.read_text(encoding="utf-8"))
-            except Exception as e:
-                logger.debug(f"Failed to read AGENTS.md at {file}: {e}")
-        if current == current.parent:
-            break
-        current = current.parent
-    return "\n".join(parts)
-
-
-async def get_claude_files() -> List[str]:
-    """Return a list of additional AGENTS.md files in the repo."""
-    return ripgrep("AGENTS.md", ".")