gemcode 0.3.114__tar.gz → 0.3.116__tar.gz

{gemcode-0.3.114/src/gemcode.egg-info → gemcode-0.3.116}/PKG-INFO

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

{gemcode-0.3.114 → gemcode-0.3.116}/pyproject.toml

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

{gemcode-0.3.114 → gemcode-0.3.116}/src/gemcode/invoke.py

@@ -42,7 +42,14 @@ async def _maybe_enqueue_kaira_autopilot(*, cfg: "GemCodeConfig", session_id: st
       return
     object.__setattr__(cfg, "_kaira_autopilot_fp", fp)
 
-    sock = os.environ.get("GEMCODE_KAIRA_SOCKET") or str(cfg.project_root / ".gemcode" / "ipc.sock")
+    try:
+      from gemcode.org import resolve_fleet_root
+
+      fleet_root = resolve_fleet_root(cfg.project_root)
+    except Exception:
+      fleet_root = cfg.project_root
+
+    sock = os.environ.get("GEMCODE_KAIRA_SOCKET") or str(fleet_root / ".gemcode" / "ipc.sock")
     if not Path(sock).exists():
       return
     # Heuristic: suggest likely checks, but let the agent choose based on repo.
@@ -70,7 +77,7 @@ async def _maybe_enqueue_kaira_autopilot(*, cfg: "GemCodeConfig", session_id: st
       )
       if auto_org:
         from gemcode.org import find_member
-        m = find_member(cfg.project_root, "kaira")
+        m = find_member(fleet_root, "kaira")
         if m is not None and m.kind == "kaira_worker":
           from gemcode.tools.org_tools import make_org_tools
           tools = make_org_tools(cfg)

{gemcode-0.3.114 → gemcode-0.3.116}/src/gemcode/kaira_daemon.py

@@ -151,6 +151,7 @@ class KairaJob:
   prompt: str
   priority: int
   session_id: str
+  meta: dict | None = None
 
 
 class KairaDaemon:
@@ -415,6 +416,7 @@ class KairaDaemon:
     prompt: str,
     priority: int | None = None,
     session_id: str,
+    meta: dict | None = None,
   ) -> str:
     """Enqueue a new job into the priority queue and return job_id."""
     job_id = f"job_{uuid.uuid4().hex[:10]}"
@@ -425,9 +427,10 @@ class KairaDaemon:
       prompt=prompt,
       priority=pr,
       session_id=session_id,
+      meta=meta or None,
     )
     try:
-      rec = new_job_record(job_id=job_id, session_id=session_id, priority=pr, prompt=prompt)
+      rec = new_job_record(job_id=job_id, session_id=session_id, priority=pr, prompt=prompt, meta=meta or None)
       self._job_records[job_id] = rec
       self._store.upsert(rec)
     except Exception:
@@ -469,7 +472,11 @@ class KairaDaemon:
 
       try:
         rec = self._job_records.get(job.job_id) or new_job_record(
-          job_id=job.job_id, session_id=job.session_id, priority=job.priority, prompt=job.prompt
+          job_id=job.job_id,
+          session_id=job.session_id,
+          priority=job.priority,
+          prompt=job.prompt,
+          meta=(job.meta if isinstance(getattr(job, "meta", None), dict) else None),
         )
         self._job_records[job.job_id] = rec
         self._store.upsert(mark_running(rec))
@@ -555,6 +562,46 @@ class KairaDaemon:
                   },
                 }
               )
+
+              # If this job was enqueued as an org delegation, automatically publish
+              # an org.report back to the manager (and any notify_chain).
+              try:
+                meta = getattr(rec2, "meta", None) if isinstance(rec2, JobRecord) else None
+                org = meta.get("org") if isinstance(meta, dict) else None
+                if isinstance(org, dict):
+                  member = org.get("member")
+                  task = str(org.get("task") or "").strip()
+                  context = str(org.get("context") or "").strip()
+                  notify_chain = org.get("notify_chain")
+                  if not isinstance(notify_chain, list):
+                    notify_chain = ["manager"]
+                  payload = {
+                    "member": member if isinstance(member, dict) else {},
+                    "capabilities": org.get("capabilities") if isinstance(org.get("capabilities"), dict) else {},
+                    "status": "finished",
+                    "task": task,
+                    "context": context,
+                    "job_id": job.job_id,
+                    "error": "",
+                    "result": {
+                      "report_json": report_obj,
+                      "report": (text or "")[:8000],
+                    },
+                    "notify_chain": notify_chain,
+                  }
+                  for to_addr in notify_chain:
+                    await self._ipc.broadcast(
+                      {
+                        "type": "event",
+                        "event": "bus_message",
+                        "topic": "org.report",
+                        "to": str(to_addr or "manager"),
+                        "from_addr": "runtime",
+                        "payload": payload,
+                      }
+                    )
+              except Exception:
+                pass
             except Exception:
               pass
       except Exception:
@@ -618,6 +665,42 @@ class KairaDaemon:
           )
         except Exception:
           pass
+        # Also emit org.report failures for org-delegated jobs.
+        try:
+          recf = self._job_records.get(job.job_id)
+          meta = getattr(recf, "meta", None) if recf is not None else None
+          org = meta.get("org") if isinstance(meta, dict) else None
+          if isinstance(org, dict):
+            member = org.get("member")
+            task = str(org.get("task") or "").strip()
+            context = str(org.get("context") or "").strip()
+            notify_chain = org.get("notify_chain")
+            if not isinstance(notify_chain, list):
+              notify_chain = ["manager"]
+            payload = {
+              "member": member if isinstance(member, dict) else {},
+              "capabilities": org.get("capabilities") if isinstance(org.get("capabilities"), dict) else {},
+              "status": "failed",
+              "task": task,
+              "context": context,
+              "job_id": job.job_id,
+              "error": f"{type(e).__name__}: {e}",
+              "result": None,
+              "notify_chain": notify_chain,
+            }
+            for to_addr in notify_chain:
+              await self._ipc.broadcast(
+                {
+                  "type": "event",
+                  "event": "bus_message",
+                  "topic": "org.report",
+                  "to": str(to_addr or "manager"),
+                  "from_addr": "runtime",
+                  "payload": payload,
+                }
+              )
+        except Exception:
+          pass
       try:
         rec3 = self._job_records.get(job.job_id)
         if rec3 is not None:

{gemcode-0.3.114 → gemcode-0.3.116}/src/gemcode/kaira_ipc.py

@@ -250,7 +250,10 @@ class KairaIpcServer:
           try:
             pr = msg.get("priority", None)
             sid = str(msg.get("session_id") or "").strip()
-            job_id = self._enqueue_fn(prompt=prompt, priority=pr, session_id=sid)
+            meta = msg.get("meta", None)
+            if not isinstance(meta, dict):
+              meta = None
+            job_id = self._enqueue_fn(prompt=prompt, priority=pr, session_id=sid, meta=meta)
             client.emitter.send(make_response(id=req_id, ok=True, job_id=job_id))
           except Exception as e:
             client.emitter.send(

{gemcode-0.3.114 → gemcode-0.3.116}/src/gemcode/kaira_job_store.py

@@ -35,6 +35,7 @@ class JobRecord:
   finished_ms: int | None = None
   error: str | None = None
   last_text: str = ""
+  meta: dict[str, Any] | None = None
 
   def to_dict(self) -> dict[str, Any]:
     return {
@@ -42,6 +43,7 @@ class JobRecord:
       "session_id": self.session_id,
       "priority": int(self.priority),
       "prompt": self.prompt,
+      "meta": (self.meta or None),
       "status": self.status,
       "created_ms": int(self.created_ms),
       "updated_ms": int(self.updated_ms),
@@ -83,6 +85,7 @@ class KairaJobStore:
         session_id=str(obj.get("session_id") or ""),
         priority=int(obj.get("priority") or 0),
         prompt=str(obj.get("prompt") or ""),
+        meta=(obj.get("meta") if isinstance(obj.get("meta"), dict) else None),
         status=str(obj.get("status") or "queued"),  # type: ignore[arg-type]
         created_ms=int(obj.get("created_ms") or 0),
         updated_ms=int(obj.get("updated_ms") or 0),
@@ -110,13 +113,14 @@ class KairaJobStore:
     return out
 
 
-def new_job_record(*, job_id: str, session_id: str, priority: int, prompt: str) -> JobRecord:
+def new_job_record(*, job_id: str, session_id: str, priority: int, prompt: str, meta: dict[str, Any] | None = None) -> JobRecord:
   now = _now_ms()
   return JobRecord(
     job_id=job_id,
     session_id=session_id,
     priority=int(priority),
     prompt=prompt,
+    meta=meta or None,
     status="queued",
     created_ms=now,
     updated_ms=now,

{gemcode-0.3.114 → gemcode-0.3.116}/src/gemcode/tools/org_tools.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import os
 from pathlib import Path
 from typing import Any
 
@@ -82,42 +83,60 @@ def make_org_tools(cfg: GemCodeConfig) -> list:
   ) -> None:
     if not _bus_enabled():
       return
-    try:
-      from gemcode.kaira_client import KairaIpcClient
-      import os
+    fleet_root = resolve_fleet_root(getattr(cfg, "project_root", Path.cwd()))
 
-      sock = os.environ.get("GEMCODE_KAIRA_SOCKET") or str(
-        getattr(cfg, "project_root", Path.cwd()) / ".gemcode" / "ipc.sock"
-      )
-      # Only attempt publish if socket exists (avoid noisy failures).
+    def _audit_fallback(payload: dict[str, Any], *, why: str) -> None:
       try:
-        if not Path(sock).exists():
-          return
+        from gemcode.audit import append_audit
+
+        append_audit(
+          fleet_root,
+          {
+            "event": "org.report",
+            "why": why,
+            "payload": payload,
+          },
+        )
       except Exception:
-        pass
+        return
+
+    from_addr = str(getattr(m, "address", "") or getattr(m, "name", "") or "")
+    member_dict = (m.to_dict() if hasattr(m, "to_dict") else {})
+    # Capabilities snapshot: keep it small and stable.
+    caps = {
+      "kind": member_dict.get("kind"),
+      "address": member_dict.get("address") or from_addr,
+      "workspace_rel": member_dict.get("workspace_rel", ""),
+      "reports_to": member_dict.get("reports_to", ""),
+    }
+    chain = _ancestor_addresses_for(m)
+    payload: dict[str, Any] = {
+      "member": member_dict,
+      "capabilities": caps,
+      "status": status,
+      "task": task,
+      "context": context,
+      "job_id": job_id,
+      "error": error,
+      "result": result,
+      "notify_chain": chain,
+    }
+
+    sock = os.environ.get("GEMCODE_KAIRA_SOCKET") or str(fleet_root / ".gemcode" / "ipc.sock")
+    # If runtime IPC isn't up, still persist the report locally.
+    try:
+      if not Path(sock).exists():
+        _audit_fallback(payload, why="ipc_socket_missing")
+        return
+    except Exception:
+      _audit_fallback(payload, why="ipc_socket_stat_failed")
+      return
+
+    try:
+      from gemcode.kaira_client import KairaIpcClient
+
       c = await KairaIpcClient.connect(socket_path=str(sock))
       try:
-        from_addr = str(getattr(m, "address", "") or getattr(m, "name", "") or "")
-        member_dict = (m.to_dict() if hasattr(m, "to_dict") else {})
-        # Capabilities snapshot: keep it small and stable.
-        caps = {
-          "kind": member_dict.get("kind"),
-          "address": member_dict.get("address") or from_addr,
-          "workspace_rel": member_dict.get("workspace_rel", ""),
-          "reports_to": member_dict.get("reports_to", ""),
-        }
-        chain = _ancestor_addresses_for(m)
-        payload = {
-          "member": member_dict,
-          "capabilities": caps,
-          "status": status,
-          "task": task,
-          "context": context,
-          "job_id": job_id,
-          "error": error,
-          "result": result,
-          "notify_chain": chain,
-        }
         # Notify parent, grandparent, ... (and manager).
         for to_addr in chain:
           await c.publish(
@@ -128,7 +147,8 @@ def make_org_tools(cfg: GemCodeConfig) -> list:
           )
       finally:
         await c.close()
-    except Exception:
+    except Exception as e:
+      _audit_fallback(payload, why=f"ipc_publish_failed: {type(e).__name__}: {e}")
       return
 
   def org_list() -> dict:
@@ -191,21 +211,38 @@ def make_org_tools(cfg: GemCodeConfig) -> list:
       prompt += "\n\nContext:\n" + ctx
 
     if m.kind == "kaira_worker":
-      # Delegate to Kaira via IPC enqueue (background).
+      # Delegate to Kaira via IPC enqueue (background). If IPC is unavailable,
+      # fall back to an in-process subagent run so delegation still "just works".
       try:
         from gemcode.kaira_client import KairaIpcClient
-        sock = (
-          getattr(cfg, "project_root", Path.cwd()) / ".gemcode" / "ipc.sock"
-        )
-        sock_s = str(sock)
+        fleet_root = resolve_fleet_root(getattr(cfg, "project_root", Path.cwd()))
+        sock_s = os.environ.get("GEMCODE_KAIRA_SOCKET") or str(fleet_root / ".gemcode" / "ipc.sock")
         client = await KairaIpcClient.connect(socket_path=sock_s)
         try:
           session_id = str(getattr(cfg, "_active_session_id", "") or "")
+          notify_chain = _ancestor_addresses_for(m)
+          # Attach org metadata so the runtime can auto-publish org.report when
+          # the job finishes/fails (default, no extra prompting needed).
+          meta = {
+            "org": {
+              "member": (m.to_dict() if hasattr(m, "to_dict") else {}),
+              "capabilities": {
+                "kind": getattr(m, "kind", ""),
+                "address": getattr(m, "address", "") or getattr(m, "name", ""),
+                "workspace_rel": getattr(m, "workspace_rel", "") or "",
+                "reports_to": getattr(m, "reports_to", "") or "",
+              },
+              "task": task,
+              "context": ctx,
+              "notify_chain": notify_chain,
+            }
+          }
           res = await client.request(
             action="enqueue",
             prompt=prompt,
             priority=0,
             session_id=session_id,
+            meta=meta,
           )
           if not res.get("ok"):
             await _publish_org_report(
@@ -229,14 +266,31 @@ def make_org_tools(cfg: GemCodeConfig) -> list:
         finally:
           await client.close()
       except Exception as e:
-        await _publish_org_report(
-          m=m,
-          status="failed",
-          task=task,
-          context=ctx,
-          error=f"kaira_ipc_unavailable: {type(e).__name__}: {e}",
-        )
-        return {"ok": False, "error": f"kaira_ipc_unavailable: {type(e).__name__}: {e}"}
+        # Fallback: run as a subagent right now (best-effort). This keeps UX
+        # consistent when users think "agent delegation" should always work.
+        try:
+          from gemcode.tools.subtask import make_run_subtask_tool
+
+          run_subtask = make_run_subtask_tool(cfg)
+          out = await run_subtask(prompt, "")
+          result = out.get("result") if isinstance(out, dict) else out
+          await _publish_org_report(
+            m=m,
+            status="finished",
+            task=task,
+            context=ctx,
+            result={"kind": "fallback_subagent", "error": f"kaira_ipc_unavailable: {type(e).__name__}: {e}", "result": result},
+          )
+          return {"ok": True, "delegated_to": m.to_dict(), "result": result, "fallback": "subagent"}
+        except Exception as e2:
+          await _publish_org_report(
+            m=m,
+            status="failed",
+            task=task,
+            context=ctx,
+            error=f"kaira_ipc_unavailable: {type(e).__name__}: {e}; fallback_subagent_failed: {type(e2).__name__}: {e2}",
+          )
+          return {"ok": False, "error": f"kaira_ipc_unavailable: {type(e).__name__}: {e}"}
 
     # Delegate to an in-process isolated subagent.
     try:

{gemcode-0.3.114 → gemcode-0.3.116}/src/gemcode/tools/subtask.py

@@ -23,6 +23,9 @@ The sub-agent:
 from __future__ import annotations
 
 import asyncio
+import os
+from pathlib import Path
+from typing import Any
 from gemcode.config import GemCodeConfig
 
 
@@ -70,6 +73,60 @@ def _build_sub_tools(cfg: GemCodeConfig) -> list:
     return tools
 
 
+async def _publish_subtask_report(
+    *,
+    cfg: GemCodeConfig,
+    status: str,
+    task: str,
+    context: str,
+    sub_session_id: str,
+    result: object | None = None,
+    error: str = "",
+) -> None:
+    """
+    Durable report path for *all* in-process subagents:
+    - Publish to runtime bus when available
+    - Otherwise append to fleet-root `.gemcode/audit.log`
+    """
+    try:
+        from gemcode.org import resolve_fleet_root
+
+        fleet_root = resolve_fleet_root(getattr(cfg, "project_root", Path.cwd()))
+    except Exception:
+        fleet_root = Path(getattr(cfg, "project_root", Path.cwd()))
+
+    payload: dict[str, Any] = {
+        "kind": "subagent",
+        "status": status,
+        "task": task,
+        "context": context,
+        "sub_session_id": sub_session_id,
+        "error": error,
+        "result": result,
+    }
+
+    sock = os.environ.get("GEMCODE_KAIRA_SOCKET") or str(fleet_root / ".gemcode" / "ipc.sock")
+    try:
+        if Path(sock).exists():
+            from gemcode.kaira_client import KairaIpcClient
+
+            c = await KairaIpcClient.connect(socket_path=str(sock))
+            try:
+                await c.publish(topic="agent.report", to="manager", from_addr="subagent", payload=payload)
+                return
+            finally:
+                await c.close()
+    except Exception:
+        pass
+
+    try:
+        from gemcode.audit import append_audit
+
+        append_audit(fleet_root, {"event": "agent.report", "payload": payload})
+    except Exception:
+        return
+
+
 def make_run_subtask_tool(cfg: GemCodeConfig):
     async def run_subtask(task: str, context: str = "") -> dict:
         """
@@ -155,8 +212,15 @@ def make_run_subtask_tool(cfg: GemCodeConfig):
         sub_session_id = str(uuid.uuid4())
 
         # Compose the sub-agent prompt.
-        task_clean = task.strip()
+        task_clean = (task or "").strip()
         ctx_clean = (context or "").strip()
+        await _publish_subtask_report(
+            cfg=cfg,
+            status="started",
+            task=task_clean,
+            context=ctx_clean,
+            sub_session_id=sub_session_id,
+        )
         prompt = task_clean
         if ctx_clean:
             prompt = f"{task_clean}\n\nAdditional context:\n{ctx_clean}"
@@ -188,6 +252,14 @@ def make_run_subtask_tool(cfg: GemCodeConfig):
                 cfg=cfg,
             )
         except Exception as e:
+            await _publish_subtask_report(
+                cfg=cfg,
+                status="failed",
+                task=task_clean,
+                context=ctx_clean,
+                sub_session_id=sub_session_id,
+                error=f"{type(e).__name__}: {e}",
+            )
             return {"error": f"Sub-agent error: {type(e).__name__}: {e}"}
 
         # Extract only non-thinking text parts from the sub-agent's output.
@@ -226,6 +298,18 @@ def make_run_subtask_tool(cfg: GemCodeConfig):
                     text=result_text,
                     preview_max_chars=max_chars,
                 )
+                await _publish_subtask_report(
+                    cfg=cfg,
+                    status="finished",
+                    task=task_clean,
+                    context=ctx_clean,
+                    sub_session_id=sub_session_id,
+                    result={
+                        "offloaded": True,
+                        "ref": ref_obj.get("ref"),
+                        "preview": ref_obj.get("preview", "") or "",
+                    },
+                )
                 return {
                     "result": ref_obj.get("preview", "") or "",
                     "offloaded": True,
@@ -234,8 +318,24 @@ def make_run_subtask_tool(cfg: GemCodeConfig):
                 }
             except Exception:
                 result_text = result_text[:max_chars] + "\n… [truncated]"
+                await _publish_subtask_report(
+                    cfg=cfg,
+                    status="finished",
+                    task=task_clean,
+                    context=ctx_clean,
+                    sub_session_id=sub_session_id,
+                    result={"truncated": True, "result": result_text},
+                )
                 return {"result": result_text, "truncated": True}
 
+        await _publish_subtask_report(
+            cfg=cfg,
+            status="finished",
+            task=task_clean,
+            context=ctx_clean,
+            sub_session_id=sub_session_id,
+            result={"result": result_text},
+        )
         return {"result": result_text}
 
     return run_subtask

{gemcode-0.3.114 → gemcode-0.3.116}/src/gemcode/tui/scrollback.py

@@ -446,6 +446,38 @@ async def run_gemcode_scrollback_tui(
           route = ""
           if from_addr or to:
             route = f" {from_addr or '?'}→{to or '*'}"
+
+          # Human-friendly rendering for common fleet-wide agent events.
+          try:
+            if topic in ("agent.report", "org.report") and isinstance(payload, dict):
+              status = str(payload.get("status") or "")
+              task = str(payload.get("task") or "").strip().replace("\n", " ")
+              task_short = (task[:160] + "…") if len(task) > 160 else task
+              if topic == "org.report":
+                mem = payload.get("member") or {}
+                mem_name = ""
+                try:
+                  if isinstance(mem, dict):
+                    mem_name = str(mem.get("name") or mem.get("id") or "")
+                except Exception:
+                  mem_name = ""
+                jid = str(payload.get("job_id") or "")[:10]
+                prefix = f"{mem_name} " if mem_name else ""
+                extra = f" job={jid}" if jid else ""
+                await _kaira_print(
+                  f"{ansi.dim}[{label}{route}]{ansi.reset} {prefix}{status}{extra} — {task_short}".rstrip()
+                )
+                continue
+              # agent.report
+              sid = str(payload.get("sub_session_id") or "")[:8]
+              extra = f" sub={sid}" if sid else ""
+              await _kaira_print(
+                f"{ansi.dim}[{label}{route}]{ansi.reset} {status}{extra} — {task_short}".rstrip()
+              )
+              continue
+          except Exception:
+            pass
+
           try:
             if isinstance(payload, (dict, list)):
               import json as _json

{gemcode-0.3.114 → gemcode-0.3.116/src/gemcode.egg-info}/PKG-INFO

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