gemcode 0.3.97__py3-none-any.whl → 0.3.99__py3-none-any.whl

gemcode/invoke.py

@@ -184,15 +184,33 @@ async def run_turn(
         # user-granted "Files and Folders" permissions on first access.
         # If approved once, we don't re-prompt for the rest of this session.
         attach_allow = True
-        if cfg is not None:
-          attach_allow = bool(getattr(cfg, "interactive_permission_ask", False))
-          attach_allow = attach_allow and hasattr(sys.stdin, "isatty") and sys.stdin.isatty()
-          if attach_allow and not bool(getattr(cfg, "_attachments_allowed", False)):
-            attach_allow = _prompt_yes_no(
-              "Allow GemCode to read and upload the attached file(s) from disk? (y/n) "
-            )
-            if attach_allow:
+        if hasattr(sys.stdin, "isatty") and sys.stdin.isatty():
+          # Default-on: attachments can read any local file path (not workspace-scoped),
+          # but we ask once per session so the user is in control and macOS can trigger
+          # its permission prompt at the moment we attempt the read.
+          attach_allow = os.environ.get("GEMCODE_ATTACHMENTS_ASK", "1").lower() not in (
+            "0",
+            "false",
+            "no",
+            "off",
+          )
+          if cfg is not None:
+            # If user already approved earlier in this session, don't prompt again.
+            if bool(getattr(cfg, "_attachments_allowed", False)):
+              attach_allow = True
+            # If yes-to-all is enabled, auto-allow attachments.
+            elif bool(getattr(cfg, "yes_to_all", False)):
+              attach_allow = True
               object.__setattr__(cfg, "_attachments_allowed", True)
+            elif attach_allow:
+              attach_allow = _prompt_yes_no(
+                "Allow GemCode to read and upload the attached file(s) from disk? (y/n) "
+              )
+              if attach_allow:
+                object.__setattr__(cfg, "_attachments_allowed", True)
+        else:
+          # Non-interactive sessions can't prompt; default to allow.
+          attach_allow = True
         effective_attachments = attachment_paths if attach_allow else None
 
         root = cfg.project_root if cfg is not None else Path.cwd()

gemcode/multimodal_input.py

@@ -97,6 +97,18 @@ def _infer_mime(path: Path, data: bytes) -> tuple[str, list[str]]:
   return "application/octet-stream", warnings
 
 
+def _is_supported_mime(m: str) -> bool:
+  mm = (m or "").strip().lower()
+  if not mm:
+    return False
+  if mm.startswith(("image/", "audio/", "video/", "text/")):
+    return True
+  if mm == "application/pdf":
+    return True
+  # Most other application/* types are rejected by Gemini file parts.
+  return False
+
+
 def build_user_content(
   prompt: str,
   attachment_paths: Sequence[Path | str] | None,
@@ -135,6 +147,12 @@ def build_user_content(
         continue
       mime, mw = _infer_mime(p, data)
       warnings.extend(mw)
+      if not _is_supported_mime(mime) or mime == "application/octet-stream":
+        warnings.append(
+          f"unsupported attachment type for {p} (mime={mime}); "
+          "skipping (export to PDF/image/text if needed)"
+        )
+        continue
       parts.append(types.Part(inline_data=types.Blob(data=data, mime_type=mime)))
 
   text = (prompt or "").strip() or (

gemcode/session_summariser.py

@@ -100,16 +100,51 @@ def _build_prompt(transcript_lines: list[str], *, focus: str = "") -> str:
   )
 
 
-def _call_summary_model(*, model: str, prompt: str) -> dict[str, Any]:
+def _extract_json_object(text: str) -> dict[str, Any] | None:
+  """
+  Best-effort parse:
+  - strict JSON object
+  - JSON object embedded in extra text (common model behavior)
+  """
+  raw = (text or "").strip()
+  if not raw:
+    return None
+  try:
+    obj = json.loads(raw)
+    return obj if isinstance(obj, dict) else None
+  except Exception:
+    pass
+
+  # Try to recover embedded JSON: find the largest {...} span.
+  start = raw.find("{")
+  end = raw.rfind("}")
+  if start == -1 or end == -1 or end <= start:
+    return None
+  candidate = raw[start : end + 1].strip()
+  try:
+    obj = json.loads(candidate)
+    return obj if isinstance(obj, dict) else None
+  except Exception:
+    return None
+
+
+def _call_summary_model(*, model: str, prompt: str) -> tuple[dict[str, Any] | None, str]:
   api_key = os.environ.get("GOOGLE_API_KEY")
   if not api_key:
     raise RuntimeError("GOOGLE_API_KEY not set")
 
   client = Client(api_key=api_key)
+  cfg = types.GenerateContentConfig(temperature=0.2)
+  # Prefer structured JSON output when supported by the SDK/model.
+  try:
+    setattr(cfg, "response_mime_type", "application/json")
+  except Exception:
+    pass
+
   resp = client.models.generate_content(
-    model=model,
-    contents=[types.Content(role="user", parts=[types.Part(text=prompt)])],
-    config=types.GenerateContentConfig(temperature=0.2),
+      model=model,
+      contents=[types.Content(role="user", parts=[types.Part(text=prompt)])],
+      config=cfg,
   )
 
   out_parts: list[str] = []
@@ -127,14 +162,7 @@ def _call_summary_model(*, model: str, prompt: str) -> dict[str, Any]:
   text = "".join(out_parts).strip()
   if not text:
     raise RuntimeError("session summariser returned empty text")
-
-  try:
-    data = json.loads(text)
-  except Exception as e:
-    raise RuntimeError(f"session summariser returned invalid JSON: {e}") from e
-  if not isinstance(data, dict):
-    raise RuntimeError("session summariser returned non-object JSON")
-  return data
+  return _extract_json_object(text), text
 
 
 def summarise_session(
@@ -149,7 +177,18 @@ def summarise_session(
     return {"error": "session transcript is empty", "session_id": session_id}
 
   prompt = _build_prompt(transcript_lines, focus=focus)
-  data = _call_summary_model(model=model, prompt=prompt)
+  data, raw_text = _call_summary_model(model=model, prompt=prompt)
+  if data is None:
+    # Graceful fallback: save raw text as summary_markdown so /summarise never hard-fails
+    # due to JSON formatting drift.
+    data = {
+      "title": f"Session {session_id[:8]}",
+      "summary_markdown": raw_text[:20_000],
+      "memory_facts": [],
+      "user_facts": [],
+      "notes_markdown": "",
+      "open_items": [],
+    }
 
   title = str(data.get("title") or f"Session {session_id[:8]}").strip()[:120]
   summary_markdown = str(data.get("summary_markdown") or "").strip()
@@ -219,6 +258,7 @@ def summarise_session(
     "summary_path": str(out_path),
     "title": title,
     "summary_markdown": summary_markdown,
+    "used_json": bool(data is not None and _extract_json_object(raw_text) is not None),
     "memory_facts_saved": saved_memory,
     "user_facts_saved": saved_user,
     "notes_status": note_status,

{gemcode-0.3.97.dist-info → gemcode-0.3.99.dist-info}/METADATA

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

{gemcode-0.3.97.dist-info → gemcode-0.3.99.dist-info}/RECORD

@@ -21,7 +21,7 @@ gemcode/ide_protocol.py,sha256=WJO4KdwyxjQcH1O_vTn7SPuy1ZZMm0eC8_xRLA9RYQo,2108
 gemcode/ide_stdio.py,sha256=qDZ8qCR0kWipvyxLJ3tbZfAXChZtosi46dLeNuMejFk,11066
 gemcode/intent_classifier.py,sha256=YfRVEe8gHeKlRkjuSWef1bZ0MPBwyYMp5jymP5Vig5U,8507
 gemcode/interactions.py,sha256=B0b3QNE_I2i5_HtiebX4ehhjlc4Nbqjf_XbvcTLyJT0,641
-gemcode/invoke.py,sha256=mjCxQGlkZVaIh2eRxsxaojZGrV3FikMqoVCpNo0CV50,11904
+gemcode/invoke.py,sha256=CpDnz3v8NdWPV9JTJVfh2nzkIGN7I7ihIw452QJhEcI,12694
 gemcode/kaira_daemon.py,sha256=Bzkpc96HocfYAV9D5skid_Gi4bJDOLgO5YlD8vbTgyY,6960
 gemcode/learning.py,sha256=o4Ivczm626NPRiNbSEb7-RvKJMefnv0ZpYt4UB2C3JA,3856
 gemcode/limits.py,sha256=3j6N8V643X7-nP-cAIf37Xg9bkGpQlEJB3nPptApQWk,2504
@@ -31,7 +31,7 @@ gemcode/mcp_loader.py,sha256=alipHTl5aA7ZCPG6Rq9cyy3UZLsdCra0CETb_fRJl_k,4964
 gemcode/modality_tools.py,sha256=L2U756l0YM4SOUx5YxcKEkjSF1QOGzFOSE4o3U0q-4Y,7213
 gemcode/model_errors.py,sha256=j1nb1dopJyZ6MQQvuuADBqvmcqdL80kQWACuWKMkP4Q,4185
 gemcode/model_routing.py,sha256=_8mnXNwxMPA8wAfl-Yx5lWNgjhyWYTCCCMGlqdGAw90,5174
-gemcode/multimodal_input.py,sha256=FrfwcmqgDKnPDWxj76GOltl34D3PNQHxgbSR7ykL8SU,4450
+gemcode/multimodal_input.py,sha256=eLFNj_yAykvoTMyiv0hGUXMgb6xlN4pyZ6X--swhnw0,5015
 gemcode/openapi_loader.py,sha256=g_NZD8YL9_9iIJJ9qykhdbBrylJ1195A4FyHGC0mroc,4157
 gemcode/output_styles.py,sha256=6ZgbEsEM5qbdGDZMuRFRHAmHCoKpi53SqPqXZ2sfbS4,2189
 gemcode/paths.py,sha256=UQp4R4sUBv7HsM2OVoGlPxyOIOQZE5wpY53G6nHpB5Q,2671
@@ -47,7 +47,7 @@ gemcode/review_agent.py,sha256=4t7_5-aE60b4-EheJ_eSB_H2eQYf9GppKoui6jw0TME,5264
 gemcode/rules.py,sha256=Itg02VpifOo6jqGj5xwna_ahaPPb0OVtaeR2cNI0pLE,3018
 gemcode/session_runtime.py,sha256=MGOWWUz4ZUnWkuaYkc5EZ_uYYIvLjJc1N35X2GUX79k,23489
 gemcode/session_store.py,sha256=POUT_QQf715c74jbXj0s5vCd4dlAgJz_CLsIWuEUoO0,6051
-gemcode/session_summariser.py,sha256=ZXBD9vgvZQ7gueFyckKcIOirq_15uVjsZqjHDa3yE-o,7237
+gemcode/session_summariser.py,sha256=ixRJVGbgWGWP-tT8hGLEqBlZ3uMXJlwQdbFsYfwF4hk,8370
 gemcode/skills.py,sha256=nnrzYUCiuEkU_i57p_jJpPHRfw1t2t2EA3pJHNqvpzw,12554
 gemcode/slash_commands.py,sha256=bcD-S_H7p7AlTli6g2dLPPG46HejPje0Imb3ScDTCaQ,798
 gemcode/thinking.py,sha256=-1TVkOMG-7CSQN0Mc18EqINkUxWOMBgeTlF7CX9zYL4,4641
@@ -107,9 +107,9 @@ gemcode/web/__init__.py,sha256=EysmUAWs6g-lmMk4VFljKfaHVrEgb_FiIzwQmBdORJc,40
 gemcode/web/sse_adapter.py,sha256=fXhKxn_bdJJUGqlmvkxLNSYL-ZiIZDaLHtQCF_BheRc,7108
 gemcode/web/terminal_repl.py,sha256=fQt895g0qcr6VBhXfv_5b_bsC5zHT5-MO0ysBdgi2Fg,3886
 gemcode/web/web_sse_compat.py,sha256=9A2s-GI7El7AotJqhO263FrLwppCXXkdydZ5EiOQbao,504
-gemcode-0.3.97.dist-info/licenses/LICENSE,sha256=TD4524qn-W8Z07GTDnag-9jJPFutFZNB0a1WbMHPC54,8388
-gemcode-0.3.97.dist-info/METADATA,sha256=-rLJq9S6zklxs9L4oMQ3RVatlE4MkOUlcfvtkgTZvwo,17084
-gemcode-0.3.97.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-gemcode-0.3.97.dist-info/entry_points.txt,sha256=cZdLTLDiHbks7OSUCuxCh66dCWeQdpLR8BozoqfEjV4,45
-gemcode-0.3.97.dist-info/top_level.txt,sha256=UYrjULLBY2bcgK6KI6flomJWmsbDXu7n0rvW2SWFrbo,8
-gemcode-0.3.97.dist-info/RECORD,,
+gemcode-0.3.99.dist-info/licenses/LICENSE,sha256=TD4524qn-W8Z07GTDnag-9jJPFutFZNB0a1WbMHPC54,8388
+gemcode-0.3.99.dist-info/METADATA,sha256=xCMSBtFzQrLEDtt9BawkHs1NfdmLTQbGf0lcJ-RHsWg,17084
+gemcode-0.3.99.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+gemcode-0.3.99.dist-info/entry_points.txt,sha256=cZdLTLDiHbks7OSUCuxCh66dCWeQdpLR8BozoqfEjV4,45
+gemcode-0.3.99.dist-info/top_level.txt,sha256=UYrjULLBY2bcgK6KI6flomJWmsbDXu7n0rvW2SWFrbo,8
+gemcode-0.3.99.dist-info/RECORD,,