gemcode 0.3.41__py3-none-any.whl → 0.3.43__py3-none-any.whl

gemcode/intent_classifier.py

@@ -41,35 +41,19 @@ INTENT_DESCRIPTIONS: dict[str, str] = {
     INTENT_ANALYSIS:         "Systematic audit or summarisation — thorough tool sweep, then synthesise.",
 }
 
-# One-line summaries for the TUI — same visual lane as ∴ Thinking (collapsed)
-INTENT_THINKING_SUMMARY: dict[str, str] = {
-    INTENT_GREETING:         "Greeting / chitchat — no tools",
-    INTENT_CONCEPT:          "General knowledge — answer without repo reads if possible",
-    INTENT_PROJECT_QUESTION: "About this repo — a few read-only tools, then answer",
-    INTENT_ENGINEERING_TASK: "Engineering task — orient → plan → execute → verify",
-    INTENT_ANALYSIS:         "Deep analysis — systematic read / grep / synthesise",
-}
-
 # How the intent was determined (for TUI suffix)
 SOURCE_LOCAL = "local"   # obvious greeting / heuristic, no classifier API call
 SOURCE_LLM = "llm"       # gemini-2.5-flash-lite classifier
 SOURCE_OFF = "off"       # classifier disabled
 
 
-def format_intent_thinking_line(intent: str, source: str) -> str | None:
+def show_intentifying_line(source: str) -> bool:
     """
-    Single line of text after ``∴ Intent`` in the TUI (same visual lane as
-    collapsed ``∴ Thinking``).  Returns None when the classifier is off and
-    nothing should be shown.
+    Whether to show the minimal ``∴ Intentifying…`` line in the TUI (same lane
+    as ``∴ Thinking``).  Hidden only when intent classification is disabled
+    (``SOURCE_OFF``).
     """
-    if source == SOURCE_OFF:
-        return None
-    summary = INTENT_THINKING_SUMMARY.get(intent, intent)
-    if source == SOURCE_LOCAL:
-        tag = "instant"
-    else:
-        tag = "flash-lite classifier"
-    return f"{intent} — {summary}  ·  {tag}"
+    return source != SOURCE_OFF
 
 # ── Prompts ───────────────────────────────────────────────────────────────────
 _CLASSIFY_PROMPT = """\
@@ -110,6 +94,16 @@ _OBVIOUS_GREETINGS: frozenset[str] = frozenset({
     "what's up", "whats up", "wassup",
 })
 
+# Single-token "control" messages users often type after transient model errors.
+# Treat these as "resume the last task", not greetings.
+_RESUME_WORDS: frozenset[str] = frozenset({
+    "continue",
+    "go on",
+    "resume",
+    "retry",
+    "try again",
+})
+
 
 def _classifier_enabled() -> bool:
     v = os.environ.get("GEMCODE_INTENT_CLASSIFY_ENABLED", "1")
@@ -144,6 +138,8 @@ async def classify_intent_with_source(message: str) -> tuple[str, str]:
 
     # Fast local check for unambiguously short greetings — saves an API round-trip.
     lower = stripped.lower()
+    if lower in _RESUME_WORDS:
+        return INTENT_ENGINEERING_TASK, SOURCE_LOCAL
     if lower in _OBVIOUS_GREETINGS or (len(lower) <= 3 and lower.isalpha()):
         return INTENT_GREETING, SOURCE_LOCAL
 

gemcode/tui/scrollback.py

@@ -251,6 +251,10 @@ async def run_gemcode_scrollback_tui(
       get_cfg=lambda: cfg,
   )
 
+  # Turn-scoped monitors/state.
+  # Declared up-front so nested render helpers can update them via `nonlocal`.
+  last_tool_error: dict | None = None
+
   async def typewrite(text: str) -> None:
     if not text:
       return
@@ -386,6 +390,7 @@ async def run_gemcode_scrollback_tui(
 
   def _render_tool_results(ev) -> None:
     """Show a one-line result summary; transition spinner to 'Querying…'."""
+    nonlocal last_tool_error
     try:
       frs: list = []
       try:
@@ -409,6 +414,28 @@ async def run_gemcode_scrollback_tui(
         summary = _fmt_tool_result(resp)
         if summary:
           print(f"  ⎿    {ansi.dim}\u21b3 {summary}{ansi.reset}")
+        # Capture the most recent tool error (best-effort) so we can offer to fix it.
+        try:
+          d = resp if isinstance(resp, dict) else {}
+          inner = d.get("result", d)
+          if not isinstance(inner, dict):
+            inner = d
+          err = inner.get("error") or d.get("error")
+          exit_code = inner.get("exit_code")
+          stderr = inner.get("stderr") or ""
+          if err or (isinstance(exit_code, int) and exit_code != 0):
+            full = ""
+            if isinstance(err, str) and err.strip():
+              full = err.strip()
+            elif isinstance(stderr, str) and stderr.strip():
+              full = stderr.strip()
+            last_tool_error = {
+              "tool": getattr(fr, "name", "") or "tool",
+              "summary": (summary or str(err) or str(exit_code) or "error")[:120],
+              "full": full[:2000],
+            }
+        except Exception:
+          pass
       # Restart spinner while model re-queries with the tool outputs.
       _start_anim("Querying\u2026")
     except Exception:
@@ -446,18 +473,24 @@ async def run_gemcode_scrollback_tui(
   )
 
   current_session_id = session_id
+  pending_prompt: str | None = None
+  last_user_prompt: str | None = None
 
   while True:
-    try:
-      prompt = await input_handler.prompt_async()
-    except EOFError:
-      print("")
+    if pending_prompt:
+      prompt = pending_prompt
+      pending_prompt = None
+    else:
       try:
-        from gemcode.hooks import run_session_stop_hook
-        run_session_stop_hook(cfg.project_root, model=getattr(cfg, "model", "") or "")
-      except Exception:
-        pass
-      return
+        prompt = await input_handler.prompt_async()
+      except EOFError:
+        print("")
+        try:
+          from gemcode.hooks import run_session_stop_hook
+          run_session_stop_hook(cfg.project_root, model=getattr(cfg, "model", "") or "")
+        except Exception:
+          pass
+        return
     if not prompt:
       continue
     if prompt in (":q", "quit", "exit", "/exit"):
@@ -468,6 +501,13 @@ async def run_gemcode_scrollback_tui(
         pass
       return
 
+    # Plain-text resume command: rerun the last user message (useful after 503s).
+    if (prompt or "").strip().lower() in ("continue", "resume", "retry", "try again", "go on"):
+      if last_user_prompt:
+        print(f"  ⎿  {ansi.dim}↻ Continuing last request…{ansi.reset}")
+        print("")
+        prompt = last_user_prompt
+
     old_model = getattr(cfg, "model", "")
     old_model_overridden = bool(getattr(cfg, "model_overridden", False))
 
@@ -515,21 +555,28 @@ async def run_gemcode_scrollback_tui(
         continue
       prompt = slash.model_prompt or prompt
 
+    # Track the last real user request so "continue" can rerun it later.
+    try:
+      pnorm = (prompt or "").strip()
+      if pnorm:
+        last_user_prompt = pnorm
+    except Exception:
+      pass
+
     # ── LLM intent pre-classifier ────────────────────────────────────────────
     # gemini-2.5-flash-lite classifies the message (same lane as Thinking)
     try:
       from gemcode.intent_classifier import (
           classify_intent_with_source,
           generate_greeting_reply,
-          format_intent_thinking_line,
+          show_intentifying_line,
           INTENT_GREETING,
           INTENT_DESCRIPTIONS,
       )
       _intent, _intent_src = await classify_intent_with_source(prompt)
-      _intent_line = format_intent_thinking_line(_intent, _intent_src)
-      if _intent_line:
+      if show_intentifying_line(_intent_src):
         print(
-            f"  \u23bf  {ansi.dim}\u2234 Intent  {_intent_line}{ansi.reset}"
+            f"  \u23bf  {ansi.dim}\u2234 Intentifying\u2026{ansi.reset}"
         )
         print("")
 
@@ -611,6 +658,7 @@ async def run_gemcode_scrollback_tui(
       assistant_wrote_text = False
       buffered_thought: list[str] = []
       buffered_final: list[str] = []
+      last_tool_error = None
       kwargs = dict(
           user_id="local", session_id=current_session_id, new_message=current_message
       )
@@ -708,6 +756,40 @@ async def run_gemcode_scrollback_tui(
           console.print(
               _RichPadding(_RichMarkdown(final_text), (0, 0, 0, 4)),
           )
+
+        # If a tool error occurred during this turn, ask whether to resolve it.
+        if last_tool_error:
+          try:
+            tool_name = last_tool_error.get("tool") or "tool"
+            summary = last_tool_error.get("summary") or "an error"
+            full = last_tool_error.get("full") or ""
+            print("")
+            print(
+              f"  ⎿  {ansi.blue_warn}{ansi.bold}Detected an error{ansi.reset} "
+              f"in {ansi.bold}{tool_name}{ansi.reset}: {ansi.dim}{summary}{ansi.reset}"
+            )
+            sys.stdout.flush()
+            prompt_str = (
+              f"  ⎿  Try to resolve it now? "
+              f"[{ansi.blue_ok}y{ansi.reset} = yes  "
+              f"{ansi.dim}any other key = no{ansi.reset}]  "
+            )
+            sys.stdout.write(prompt_str)
+            sys.stdout.flush()
+            ok = await _read_permission_char(asyncio.get_running_loop())
+            sys.stdout.write(("y" if ok else "n") + "\n")
+            sys.stdout.flush()
+            if ok:
+              pending_prompt = (
+                "We encountered an error during the last turn.\n\n"
+                f"Tool: {tool_name}\n"
+                f"Summary: {summary}\n\n"
+                f"{full}\n\n"
+                "Please fix the issue. If a command needs to be run, propose it "
+                "and ask for confirmation."
+              )
+          except Exception:
+            pass
         break
 
       interactive_enabled = bool(getattr(cfg, "interactive_permission_ask", False))

{gemcode-0.3.41.dist-info → gemcode-0.3.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gemcode
-Version: 0.3.41
+Version: 0.3.43
 Summary: Local-first coding agent on Google Gemini + ADK
 Author: GemCode Contributors
 License:                                  Apache License

{gemcode-0.3.41.dist-info → gemcode-0.3.43.dist-info}/RECORD

@@ -13,7 +13,7 @@ gemcode/context_warning.py,sha256=Q8mg5Vojj7EglPhsGAVL7vb8ROLuHVPgdzw25yw-Q2c,42
 gemcode/credentials.py,sha256=04v-rLD8_Ams69FQdof2FwcL3ZgsroGUnMcHNQFuBZo,1296
 gemcode/hitl_session.py,sha256=oNiI7odFJGUcmqPavjKLJOEumZKrgklLvwjjrIG9GPg,281
 gemcode/hooks.py,sha256=FHz175d_18j-4ByZZVdEIagmdOvLHcjDjo7HD2Cikf4,6339
-gemcode/intent_classifier.py,sha256=7nwjb69kJV-Z8AmQ-4sKni7ASExeh06-BDrZVqLQ41s,8967
+gemcode/intent_classifier.py,sha256=YfRVEe8gHeKlRkjuSWef1bZ0MPBwyYMp5jymP5Vig5U,8507
 gemcode/interactions.py,sha256=B0b3QNE_I2i5_HtiebX4ehhjlc4Nbqjf_XbvcTLyJT0,641
 gemcode/invoke.py,sha256=qnIBAZeFJQhRYmx-IoaXdDGLTSXYMRn6r6CvKNAWBbA,7553
 gemcode/kairos_daemon.py,sha256=giINipslAIhBtdbqA0o4RYwt4fBsZjtkiKDjp4zSEvw,6980
@@ -73,16 +73,16 @@ gemcode/tools/think.py,sha256=WrNATR-bi97aLkbSsOFOYYAGxbzihe9AnPDZfw3z5-Q,1704
 gemcode/tools/todo.py,sha256=d9aXiyT04r1RFZIk6qdVif17-_Oc3oi4ymDnsPBRg68,3143
 gemcode/tools/web.py,sha256=ULg1e3inG4FjPSUCYI8dVBzTrcCHINNRo76SIU9qw-A,4489
 gemcode/tui/input_handler.py,sha256=VWF92Fe3WkD3QP9kBDY5zrx333Vj2eShO3UO0x2n6eo,10079
-gemcode/tui/scrollback.py,sha256=xia_FN66p-OrLh3r0s9orBysma5MiogayibFMGfHRqE,30229
+gemcode/tui/scrollback.py,sha256=oNUKV2VXFEXxVeam49QZoY0r0WrMjJZgu2bKNsWoeZk,33453
 gemcode/tui/spinner.py,sha256=AJrApG5od-Sh40-5uWcNM9RHb5ax7gr-NbgAZmTbIYY,4848
 gemcode/tui/welcome_banner.py,sha256=aocl1lnoyLIM6RN4f65g3i0wRA71RqUlgPrGsXeVLW4,4387
 gemcode/tui/welcome_rich.py,sha256=8FEZzLXrzqly5JWiDgV9ooRV1LNXDk-CXV1a7K6ua-U,4048
 gemcode/web/__init__.py,sha256=EysmUAWs6g-lmMk4VFljKfaHVrEgb_FiIzwQmBdORJc,40
 gemcode/web/claude_sse_adapter.py,sha256=HcNp0Lh4DdBZBLOpstsqa-VzfqAUrRngZ6FSuJ-mIMg,8609
 gemcode/web/terminal_repl.py,sha256=k2irvFGbCY8gDm_pbirR7b_cakaeafcctoTIvnJkVXk,3902
-gemcode-0.3.41.dist-info/licenses/LICENSE,sha256=TD4524qn-W8Z07GTDnag-9jJPFutFZNB0a1WbMHPC54,8388
-gemcode-0.3.41.dist-info/METADATA,sha256=CGtENkiu0yb2-sOTv63EcyXeNzJp61VLDzeUqv6EmhI,23695
-gemcode-0.3.41.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-gemcode-0.3.41.dist-info/entry_points.txt,sha256=cZdLTLDiHbks7OSUCuxCh66dCWeQdpLR8BozoqfEjV4,45
-gemcode-0.3.41.dist-info/top_level.txt,sha256=UYrjULLBY2bcgK6KI6flomJWmsbDXu7n0rvW2SWFrbo,8
-gemcode-0.3.41.dist-info/RECORD,,
+gemcode-0.3.43.dist-info/licenses/LICENSE,sha256=TD4524qn-W8Z07GTDnag-9jJPFutFZNB0a1WbMHPC54,8388
+gemcode-0.3.43.dist-info/METADATA,sha256=qVqS1HsxBO5iLKgSwBRzNoQYlnI3ka4oadbjMxLKuNI,23695
+gemcode-0.3.43.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+gemcode-0.3.43.dist-info/entry_points.txt,sha256=cZdLTLDiHbks7OSUCuxCh66dCWeQdpLR8BozoqfEjV4,45
+gemcode-0.3.43.dist-info/top_level.txt,sha256=UYrjULLBY2bcgK6KI6flomJWmsbDXu7n0rvW2SWFrbo,8
+gemcode-0.3.43.dist-info/RECORD,,