gemcode 0.3.4__tar.gz → 0.3.8__tar.gz

{gemcode-0.3.4/src/gemcode.egg-info → gemcode-0.3.8}/PKG-INFO

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

{gemcode-0.3.4 → gemcode-0.3.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gemcode"
-version = "0.3.4"
+version = "0.3.8"
 description = "Local-first coding agent on Google Gemini + ADK"
 readme = "README.md"
 requires-python = ">=3.11"

{gemcode-0.3.4 → gemcode-0.3.8}/src/gemcode/agent.py

@@ -65,7 +65,7 @@ def _build_runtime_facts(cfg: GemCodeConfig) -> str:
   model = (getattr(cfg, "model", None) or "").strip() or "(default)"
   return f"""## Runtime facts (authoritative for this session)
 - **Project root** — every filesystem tool path is relative to: `{root}`
-- **Model id in use:** `{model}`. Changing it requires restarting GemCode with `--model <id>` or env `GEMCODE_MODEL`, or using `/model` in the REPL for routing info. Shell: `gemcode list-models` lists candidate ids.
+- **Model id in use:** `{model}`. In this TUI/REPL you can override it for subsequent turns with `/model use <id>` (use `/model list` to browse IDs). For a full restart you can still use `--model <id>` or env `GEMCODE_MODEL`.
 - **UI banner** phrases such as "GemCode Pro" are **terminal marketing**, not a separate API tier or model you enable from chat.
 - **Env toggles** (`GEMCODE_ENABLE_COMPUTER_USE`, `GEMCODE_MODEL`, etc.) affect only the **OS process** that launched `gemcode`. Pasting `VAR=1` in chat does **not** reconfigure a running session—tell the user to export in their shell, use project `.env`, or restart the CLI.
 - **Working in subfolders** — use tools: e.g. `list_directory("Desktop")`, `glob_files("**/query.ts")`, `read_file("testing/ai-edtech-app/src/app/page.tsx")`, or `run_command` with `cwd_subdir`. Never claim the sandbox cannot reach a subpath unless a tool returned an explicit error."""

{gemcode-0.3.4 → gemcode-0.3.8}/src/gemcode/repl_commands.py

@@ -174,6 +174,8 @@ def slash_help_lines() -> list[str]:
       "  /tools                List tool inventory for this config",
       "  /doctor               Environment sanity check",
       "  /model                Show model routing info",
+      "  /model use <id>       Override model for this REPL session",
+      "  /model list            List available Gemini model IDs",
       "  /permissions          Show permission / HITL settings",
       "  /memory               Show persistent memory settings",
       "  /hooks                Show post-turn hook configuration",

{gemcode-0.3.4 → gemcode-0.3.8}/src/gemcode/repl_slash.py

@@ -81,7 +81,65 @@ async def process_repl_slash(
     return ReplSlashResult(skip_model_turn=True)
 
   if name in ("model", "models"):
+    args = (sc.args or "").strip()
+    if not args:
+      out("\n".join(format_model_lines(cfg)))
+      out()
+      return ReplSlashResult(skip_model_turn=True)
+
+    parts = args.split()
+    sub = parts[0].lower()
+    if sub in ("use", "set") and len(parts) >= 2:
+      new_model = " ".join(parts[1:]).strip()
+      if not new_model:
+        out("Usage: /model use <model-id>")
+        out()
+        return ReplSlashResult(skip_model_turn=True)
+      # Persist override for this session; pick_effective_model() respects this.
+      cfg.model = new_model
+      setattr(cfg, "model_overridden", True)
+      out(f"model: {cfg.model}")
+      out("model_overridden: True")
+      out("Note: this applies to subsequent turns in this REPL session.")
+      out()
+      return ReplSlashResult(skip_model_turn=True)
+
+    if sub in ("list", "ls", "show"):
+      # Best-effort list: query Gemini via the same API used by GemCode.
+      show_all = "--show-all" in parts or "--show-all" in args
+      try:
+        from gemcode.config import load_cli_environment
+
+        load_cli_environment()
+      except Exception:
+        pass
+      from gemcode.cli import require_google_api_key
+
+      require_google_api_key()
+      from google.genai import Client
+
+      client = Client(api_key=os.environ["GOOGLE_API_KEY"])
+      models = client.models.list()
+      out("Available models:")
+      for m in models:
+        name = getattr(m, "name", None)
+        actions = getattr(m, "supported_actions", None)
+        if not name:
+          continue
+        if not show_all and actions and isinstance(actions, list):
+          # Keep only models that support generateContent-style generation.
+          if "generateContent" not in actions:
+            continue
+        if actions and isinstance(actions, list):
+          out(f"  {name}\t{','.join(actions)}")
+        else:
+          out(f"  {name}")
+      out()
+      return ReplSlashResult(skip_model_turn=True)
+
+    # Fallback: show current routing info.
     out("\n".join(format_model_lines(cfg)))
+    out("Tip: /model use <model-id> to override for this session.")
     out()
     return ReplSlashResult(skip_model_turn=True)
 

{gemcode-0.3.4 → gemcode-0.3.8}/src/gemcode/tui/app.py

@@ -179,6 +179,8 @@ async def run_gemcode_tui(
 
   # Non-modal permission prompt state. Modal dialogs can corrupt a full-screen TUI.
   pending_confirm: dict[str, object] = {"future": None, "tool": "", "hint": ""}
+  assistant_busy: dict[str, bool] = {"value": False}
+  spinner_idx: dict[str, int] = {"value": 0}
 
   def _set_input_prompt() -> None:
     if pending_confirm.get("future") is not None:
@@ -218,6 +220,15 @@ async def run_gemcode_tui(
         ("class:muted", "  "),
         ("class:muted", "(Esc cancels)"),
       ]
+    if assistant_busy.get("value"):
+      frames = ["|", "/", "-", "\\"]
+      fr = frames[spinner_idx.get("value", 0) % len(frames)]
+      return [
+        ("class:muted", " "),
+        ("class:pill", f"thinking {fr}"),
+        ("class:muted", "  "),
+        ("class:muted", "Tip: Esc=interrupt"),
+      ]
     return [
       ("class:muted", " "),
       ("class:pill", f"🌿 {_git_branch()}" if _git_branch() else "📁 no-git"),
@@ -228,6 +239,18 @@ async def run_gemcode_tui(
   status.content = FormattedTextControl(_status_text)
   _set_input_prompt()
 
+  async def _spin_status() -> None:
+    frames = ["|", "/", "-", "\\"]
+    i = 0
+    while assistant_busy.get("value"):
+      spinner_idx["value"] = i % len(frames)
+      i += 1
+      try:
+        app.invalidate()
+      except Exception:
+        pass
+      await asyncio.sleep(0.12)
+
   input_help = Window(
     height=1,
     dont_extend_height=True,
@@ -523,6 +546,9 @@ async def run_gemcode_tui(
     apply_capability_routing(cfg, prompt, context="prompt")
     cfg.model = pick_effective_model(cfg, prompt)
 
+    assistant_busy["value"] = True
+    spinner_task = asyncio.create_task(_spin_status())
+
     try:
       REQUEST_CONFIRMATION_FC = "adk_request_confirmation"
       # Terminal width for stable box rendering.
@@ -602,12 +628,20 @@ async def run_gemcode_tui(
 
       assistant_started = False
 
+      def _normalize_ws(s: str) -> str:
+        # For Gemini, "thinking" and final text can sometimes be identical.
+        # Normalize whitespace so we can detect exact duplicates robustly.
+        return " ".join((s or "").split()).strip().lower()
+
       while True:
         # Stream events from ADK runner.
         events: list = []
-        # Buffer assistant text for this pass. If a confirmation is requested,
-        # we discard buffered text to avoid the noisy "rerun with --yes" spiel.
-        buffered: list[str] = []
+        # Buffer assistant text for this pass.
+        # Claude differentiates "thinking" from the final response, and we
+        # also do that here by routing streamed parts with `part.thought=True`
+        # into a separate buffer.
+        buffered_thought: list[str] = []
+        buffered_final: list[str] = []
         kwargs = dict(
             user_id="local",
             session_id=session_state["id"],
@@ -637,7 +671,10 @@ async def run_gemcode_tui(
               if not delta:
                 continue
               assistant_started = True
-              buffered.append(delta)
+              if getattr(part, "thought", None):
+                buffered_thought.append(delta)
+              else:
+                buffered_final.append(delta)
           except Exception:
             continue
 
@@ -648,10 +685,25 @@ async def run_gemcode_tui(
         # Handle in-TUI tool confirmations (HITL) Claude-style.
         confirmation_fcs = _get_confirmation_fcs(events)
         if not confirmation_fcs:
-          # Now that we know no confirmation is needed, render buffered text.
-          if buffered:
+          # Now that we know no confirmation is needed, render buffered
+          # thinking + final response separately.
+          thought_text = "".join(buffered_thought)
+          final_text = "".join(buffered_final)
+          if buffered_thought:
+            # If Gemini returns the same content for both "thought" and
+            # final text, don't repeat it (Claude typically doesn't).
+            if buffered_final and _normalize_ws(thought_text) == _normalize_ws(final_text):
+              append_inline("⎿ GemCode (thinking): ")
+              await typewrite("(omitted: identical to final response)")
+              append("")
+            else:
+              append_inline("⎿ GemCode (thinking): ")
+              await typewrite(thought_text)
+              # Ensure visual separation before the final response section.
+              append("")
+          if buffered_final:
             append_inline("⎿ GemCode: ")
-            await typewrite("".join(buffered))
+            await typewrite("".join(buffered_final))
           break
 
         interactive_enabled = bool(getattr(cfg, "interactive_permission_ask", False))
@@ -724,6 +776,12 @@ async def run_gemcode_tui(
         append("\033[2m" + ("─" * max(40, min(cw - 2, 200))) + "\033[0m")
     except Exception as e:
       append(f"GemCode: error: {e}\n")
+    finally:
+      assistant_busy["value"] = False
+      try:
+        spinner_task.cancel()
+      except Exception:
+        pass
 
   @kb.add("enter")
   def _enter(event) -> None:

{gemcode-0.3.4 → gemcode-0.3.8}/src/gemcode/tui/scrollback.py

@@ -346,16 +346,18 @@ async def run_gemcode_scrollback_tui(
     apply_capability_routing(cfg, prompt, context="prompt")
     cfg.model = pick_effective_model(cfg, prompt)
 
-    # Start streaming assistant output.
-    sys.stdout.write(f"  ⎿  {ansi.bold}GemCode{ansi.reset}: ")
-    sys.stdout.flush()
-
     current_message = types.Content(role="user", parts=[types.Part(text=prompt)])
     do_reset = True
+    def _normalize_ws(s: str) -> str:
+      # Gemini can sometimes return identical content for both "thinking" and
+      # final text; normalize whitespace to detect exact duplicates.
+      return " ".join((s or "").split()).strip().lower()
 
     while True:
       events: list = []
       assistant_wrote_text = False
+      buffered_thought: list[str] = []
+      buffered_final: list[str] = []
       kwargs = dict(
           user_id="local", session_id=current_session_id, new_message=current_message
       )
@@ -373,9 +375,13 @@ async def run_gemcode_scrollback_tui(
             continue
           for part in ev.content.parts:
             delta = getattr(part, "text", None)
-            if delta:
-              assistant_wrote_text = True
-              await typewrite(delta)
+            if not delta:
+              continue
+            assistant_wrote_text = True
+            if getattr(part, "thought", None):
+              buffered_thought.append(delta)
+            else:
+              buffered_final.append(delta)
         except Exception:
           continue
 
@@ -387,6 +393,24 @@ async def run_gemcode_scrollback_tui(
 
       confirmation_fcs = _get_confirmation_fcs(events)
       if not confirmation_fcs:
+        # Render buffered thinking and final response separately.
+        thought_text = "".join(buffered_thought)
+        final_text = "".join(buffered_final)
+        if buffered_thought:
+          if buffered_final and _normalize_ws(thought_text) == _normalize_ws(final_text):
+            print(f"  ⎿  {ansi.dim}{ansi.bold}GemCode{ansi.reset} (thinking): {ansi.reset}(omitted: identical to final response)")
+            print("")
+          else:
+            sys.stdout.write(f"  ⎿  {ansi.dim}{ansi.bold}GemCode{ansi.reset} (thinking): ")
+            sys.stdout.flush()
+            await typewrite(thought_text)
+            sys.stdout.write("\n")
+            sys.stdout.flush()
+
+        if buffered_final:
+          sys.stdout.write(f"  ⎿  {ansi.bold}GemCode{ansi.reset}: ")
+          sys.stdout.flush()
+          await typewrite(final_text)
         break
 
       interactive_enabled = bool(getattr(cfg, "interactive_permission_ask", False))
@@ -414,9 +438,6 @@ async def run_gemcode_scrollback_tui(
             f"  ⎿  Allow? ({ansi.blue_ok}y{ansi.reset}/{ansi.dim}N{ansi.reset}) "
           ).strip().lower()
           ok = ans in ("y", "yes")
-          # Resume the assistant indent after permission prompt.
-          sys.stdout.write(f"  ⎿  {ansi.bold}GemCode{ansi.reset}: ")
-          sys.stdout.flush()
 
         parts.append(
           types.Part(

{gemcode-0.3.4 → gemcode-0.3.8/src/gemcode.egg-info}/PKG-INFO

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

{gemcode-0.3.4 → gemcode-0.3.8}/tests/test_agent_instruction.py

@@ -9,5 +9,4 @@ def test_instruction_includes_runtime_facts(tmp_path: Path) -> None:
   text = build_instruction(cfg)
   assert str(tmp_path.resolve()) in text
   assert "gemini-2.5-flash" in text
-  assert "list-models" in text
   assert "GEMCODE_MODEL" in text