jac-coder 0.2.7__tar.gz → 0.2.9__tar.gz

{jac_coder-0.2.7 → jac_coder-0.2.9}/PKG-INFO

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: jac-coder
-Version: 0.2.7
+Version: 0.2.9
 Summary: AI coding agent backend for Jac, powered by jac-byllm
 Requires-Python: >=3.12
 Requires-Dist: python-dotenv>=1.0.0
-Requires-Dist: jaclang
-Requires-Dist: byllm
 Requires-Dist: mcp>=1.0.0
 Requires-Dist: jac-mcp
 Requires-Dist: rich>=13.0
+Requires-Dist: litellm<=1.82.6,>=1.70.0
+Requires-Dist: httpx>=0.27.0
+Requires-Dist: loguru<0.8.0,>=0.7.2
+Requires-Dist: pillow<13.0.0,>=12.0.0

{jac_coder-0.2.7 → jac_coder-0.2.9}/README.md

@@ -64,7 +64,6 @@ Root → Session → MainAgent
 - **WorkerAgent (walker)** — in-process SubAgent with 14 tools (can write/edit/run). For known changes.
 - **ExplorerAgent (walker)** — in-process SubAgent with 10 tools (read-only + web search). For root-cause investigation.
 - **Session (node)** — persistent chat state, history, active files, errors, mode hint.
-- **ProjectMemory (node)** — AST-derived codebase knowledge (nodes, walkers, edges, imports). Backed by `.jaccoder/progress.md` as primary source of truth.
 - **McpRegistry (node)** — persisted MCP server configs.
 
 See [docs/ARCHITECTURE.md](docs/ARCHITECTURE.md) for the full picture.
@@ -130,7 +129,7 @@ jac-code/
 │   ├── api.jac                   # Public API — the only module external apps import
 │   ├── server.jac                # JSON-RPC stdio server for the VS Code extension
 │   ├── core/
-│   │   ├── nodes.jac             # MainAgent, WorkerAgent, ExplorerAgent, Session, ProjectMemory
+│   │   ├── nodes.jac             # MainAgent, WorkerAgent, ExplorerAgent, Session
 │   │   └── walkers.jac           # interact, new_session, list_sessions, etc.
 │   ├── lib/
 │   │   └── coder.jac             # JacCoder library-mode class (stateless + service modes)
@@ -140,7 +139,6 @@ jac-code/
 │   ├── runtime/
 │   │   ├── context.jac           # Tiered compaction with LLM-summary fallback
 │   │   ├── events.jac            # Event bus, doom-loop detection, abort signal
-│   │   ├── memory.jac            # AST-first ProjectMemory (LLM fallback)
 │   │   ├── permission.jac        # Permission rule engine (allow / ask / deny)
 │   │   ├── prompt.jac            # Mode-aware dynamic prompt assembly
 │   │   ├── skills.jac            # SKILL.md registry + listing injection

{jac_coder-0.2.7 → jac_coder-0.2.9}/jac_coder/api.impl.jac

@@ -197,7 +197,6 @@ impl chat(
         return {"error": "Session is stale after a server update. Please close this session and open a new one.", "agent": "error"};
     }
 
-    # Override directory if provided
     if directory {
         session.directory = directory;
     }
@@ -230,7 +229,6 @@ impl chat(
     # whether to auto-allow, prompt, or deny write/edit/bash operations.
     _set_chat_session(session_id, edit_mode);
 
-    # Setup
     clear_abort();
     reset_steps();
     start_turn();
@@ -242,7 +240,6 @@ impl chat(
     }
 
     try {
-        # Memory initialization
         _ensure_memory(session, work_dir);
 
         session.updated_at = datetime.now().isoformat();
@@ -339,7 +336,7 @@ impl chat(
         user_image = None;
         if images and len(images) > 0 {
             try {
-                import from byllm.lib { Image }
+                import from jaclang.byllm.lib { Image }
                 ;
                 first_img = images[0];
                 data_url = first_img.get("data_url", "") if isinstance(first_img, dict) else str(first_img);
@@ -358,6 +355,7 @@ impl chat(
 
         response_text = stream_result["content"];
         tools_used = stream_result["tools_used"];
+        tool_records = stream_result.get("tool_records", []);
 
         # Finalize turn — get accumulated file/error data from tool internals
         tool_end();
@@ -366,7 +364,6 @@ impl chat(
         files_modified = summary.get("files_modified", []);
         has_errors = summary.get("errors", 0) > 0;
 
-        # Update session state
         if files_modified {
             for f in files_modified {
                 if f not in session.active_files {
@@ -421,6 +418,14 @@ impl chat(
         import from jac_coder.runtime.prompt { infer_mode_hint as _infer_hint }
         session.last_mode_hint = _infer_hint(tools_used, files_modified);
 
+        # Guaranteed end-of-turn struggle reflection (work turns only).
+        if not is_abort_requested() {
+            import from jac_coder.runtime.struggle_report { reflect_and_log }
+            reflect_and_log(
+                main_agent, tool_records, files_modified, has_errors, response_text
+            );
+        }
+
         return {
             "response": response_text,
             "agent": "main",
@@ -474,63 +479,6 @@ def _ensure_memory(session: Session, work_dir: str) -> None {
 }
 
 
-def _post_process(session: Session, response_obj: Any) -> None {
-    # Track files
-    if response_obj.files_modified {
-        for f in response_obj.files_modified {
-            if f not in session.active_files {
-                session.active_files.append(f);
-            }
-        }
-        if len(session.active_files) > 10 {
-            session.active_files = session.active_files[-10:];
-        }
-    }
-
-    # Track errors
-    if response_obj.has_errors {
-        files_str = ", ".join(response_obj.files_modified)
-            if response_obj.files_modified
-            else "unknown";
-        session.pending_errors = [f"Errors in previous turn (files: {files_str})"];
-    } else {
-        session.pending_errors = [];
-    }
-
-    # Refresh project_summary from progress.md (agent may have updated it).
-    if session.directory {
-        progress_path = os.path.join(session.directory, ".jaccoder", "progress.md");
-        if os.path.isfile(progress_path) {
-            try {
-                with open(progress_path, "r", encoding="utf-8") as f {
-                    pc = f.read();
-                }
-                if len(pc) > 4000 {
-                    pc = pc[:4000] + "\n\n[... truncated]";
-                }
-                session.project_summary = pc;
-            } except Exception { }
-        }
-    }
-
-    # Persist response
-    record: dict = {
-        "role": "assistant",
-        "content": response_obj.content,
-        "agent": "main"
-    };
-    if response_obj.tools_used {
-        record["tools_used"] = response_obj.tools_used;
-    }
-    if response_obj.files_modified {
-        record["files_modified"] = response_obj.files_modified;
-    }
-    session.chat_history.append(record);
-    session.last_agent = "main";
-    session.updated_at = datetime.now().isoformat();
-}
-
-
 # ---------------------------------------------------------------------------
 # Model management API
 # ---------------------------------------------------------------------------
@@ -552,8 +500,8 @@ impl api_check_local_setup(alias: str) -> dict {
     model: bool = False;
     valid_alias: bool = False;
     try {
-        import from byllm.local_runtime { LOCAL_MODELS }
-        import from byllm.model_cache { is_downloaded }
+        import from jaclang.byllm.local_runtime { LOCAL_MODELS }
+        import from jaclang.byllm.model_cache { is_downloaded }
         spec = LOCAL_MODELS.get(alias);
         if spec is not None {
             valid_alias = True;

{jac_coder-0.2.7 → jac_coder-0.2.9}/jac_coder/api.jac

@@ -11,8 +11,7 @@ import from jac_coder.infra.config {
 }
 import from jac_coder.util.tool_output { tool_end }
 import from jac_coder.runtime.permission { permission_engine }
-import from jac_coder.util.sandbox { set_sandbox_root, set_browser_exec }
-import from jac_coder.runtime.context { build_context, ContextConfig }
+import from jac_coder.util.sandbox { set_sandbox_root }
 import from jac_coder.core.walkers {
     new_session,
     ensure_main_agent,
@@ -28,11 +27,6 @@ import from jac_coder.infra.mcp_manager {
     mcp_get_tools,
     mcp_register_builtin
 }
-import from jac_coder.runtime.memory {
-    find_or_create_memory,
-    _init_memory,
-    update_memory_from_session
-}
 import from jac_coder.core.nodes { Session, MainAgent }
 import from jac_coder.runtime.cost_tracker {
     get_summary as _ct_get_summary,
@@ -41,7 +35,6 @@ import from jac_coder.runtime.cost_tracker {
 import from jac_coder.tool.run.guarded {
     _set_chat_session,
     _clear_chat_session,
-    _chat_contexts,
     _clarification_events,
     _clarification_decisions,
     _CLRFY_KEY_PREFIX
@@ -52,7 +45,6 @@ import from jac_coder.runtime.events {
     reset_steps,
     start_turn,
     emit_turn_summary,
-    emit_event,
     is_abort_requested,
     clear_abort
 }

{jac_coder-0.2.7 → jac_coder-0.2.9}/jac_coder/cli.jac

@@ -2,19 +2,15 @@
 
 import os;
 import sys;
-import from datetime { datetime }
 import from jac_coder.core.nodes { Session, MainAgent }
 import from jac_coder.core.walkers {
     new_session,
-    list_sessions,
-    get_session,
-    close_session,
     interact,
     ensure_main_agent
 }
-import from jac_coder.infra.config { llm, model_name, get_config, set_model, get_model }
+import from jac_coder.infra.config { model_name, get_config, set_model, get_model }
 import from jac_coder.runtime.permission { permission_engine }
-import from jac_coder.runtime.events { register_event_callback, get_agent_prefix }
+import from jac_coder.runtime.events { register_event_callback }
 import from jac_coder.runtime.file_logger { init_file_logger, file_log_event, close_file_logger }
 import from jac_coder.tool.meta.todo { get_todos }
 import from jac_coder.util.colors {
@@ -26,7 +22,6 @@ import from jac_coder.util.colors {
     GREEN,
     YELLOW,
     RED,
-    MAGENTA,
     WHITE,
     AGENT_COLORS
 }

{jac_coder-0.2.7 → jac_coder-0.2.9}/jac_coder/core/nodes.impl.jac

@@ -14,68 +14,6 @@ impl Session.postinit{
 }
 
 
-# ---------------------------------------------------------------------------
-# ProjectMemory
-# ---------------------------------------------------------------------------
-sem ProjectMemory.profile_project = """Analyze a Jac project and extract structured memory.
-Given the file tree and key file contents, return:
-- architecture: 1-2 sentences describing the project purpose, tech stack, and node/walker structure
-- file_map: dict mapping up to 15 important file paths (relative) to 1-line descriptions of their role
-- conventions: list of coding conventions observed (naming style, file organization, patterns)
-Be concise and factual. This context will help future coding sessions start smart.""";
-
-sem ProjectMemory.collect_learnings = """Extract learnings from a completed coding session.
-Given the files modified and a session summary, return only NEW information:
-- new_files: dict of newly created or significantly changed file paths to 1-line descriptions
-- new_conventions: new coding patterns or conventions established (empty list if none)
-- new_decisions: architectural or design decisions made (empty list if none)
-- known_issues: bugs or issues discovered but not yet fixed (empty list if none)
-Be selective — only include genuinely new information.""";
-
-sem ProjectScan.architecture = "1-2 sentences: project purpose, tech stack, and overall node/walker structure";
-sem ProjectScan.file_map = "dict mapping relative file paths to 1-line role descriptions (max 15 files)";
-sem ProjectScan.conventions = "list of coding conventions: naming style, file organization, patterns used";
-
-sem SessionLearnings.new_files = "dict of new/modified file paths to 1-line descriptions of their content";
-sem SessionLearnings.new_conventions = "new coding conventions established this session (empty list if none)";
-sem SessionLearnings.new_decisions = "architectural decisions made this session (empty list if none)";
-sem SessionLearnings.known_issues = "bugs or issues discovered but not yet fixed (empty list if none)";
-
-impl ProjectMemory.summarize() -> str {
-    parts = [];
-    if self.architecture {
-        parts.append("Architecture: " + self.architecture);
-    }
-    if self.node_details {
-        parts.append(self.node_details);
-    }
-    if self.walker_details {
-        parts.append(self.walker_details);
-    }
-    if self.graph_topology {
-        parts.append("Graph: " + self.graph_topology);
-    }
-    if self.import_map {
-        parts.append(self.import_map);
-    }
-    if self.file_map {
-        items = list(self.file_map.items())[:10];
-        file_lines = [f"  {k}: {v}" for (k, v) in items];
-        parts.append("Key files:\n" + "\n".join(file_lines));
-    }
-    if self.conventions {
-        parts.append("Conventions: " + ", ".join(self.conventions[:5]));
-    }
-    if self.past_decisions {
-        parts.append("Past decisions: " + "; ".join(self.past_decisions[:3]));
-    }
-    if self.known_issues {
-        parts.append("Known issues: " + "; ".join(self.known_issues[:3]));
-    }
-    return "\n".join(parts);
-}
-
-
 # ---------------------------------------------------------------------------
 # MainAgent — the orchestrator
 # ---------------------------------------------------------------------------
@@ -87,10 +25,14 @@ sem MainAgent.respond = "Respond to the user's coding request.";
 # ---------------------------------------------------------------------------
 # SubAgent walkers — sem annotations and entry ability implementations
 # ---------------------------------------------------------------------------
-sem WorkerAgent.do_work = "Execute the delegated coding task.";
+sem WorkerAgent.do_work = "Execute the delegated coding task as a pure implementer. When .jaccoder/ui_spec.json exists, treat it as a binding UI contract — never change style, theme, base_color, nav_pattern, or pages (those belong to UIDesignerAgent). If a mechanical implementation need arises for a component not in primitive_components (e.g. a spinner), add it to primitive_components in ui_spec.json first, then run jac add --shadcn. Never make freestyle design decisions.";
 
 sem ExplorerAgent.do_work = "Investigate the codebase and report findings.";
 
+sem UIDesignerAgent = "UI design authority — produces or updates .jaccoder/ui_spec.json, the living design contract for the application.";
+sem UIDesignerAgent.do_work = "Write or update .jaccoder/ui_spec.json. Create mode (no UISpec in task): analyse project from scratch and produce a full spec. Update mode (current UISpec JSON provided in task): apply the user's change request to only the affected fields, preserve everything else.";
+sem UIDesignerAgent.task = "Input context in one of two forms. Create: project path + directory listing + jac.toml + user request. Update: project path + current UISpec JSON + user request.";
+
 
 """Consume a SubAgent's by llm() stream, forward events, and return results."""
 def _consume_subagent_stream(event_stream: Any, prefix: str, track_files: bool = False) -> dict {
@@ -134,6 +76,11 @@ def _consume_subagent_stream(event_stream: Any, prefix: str, track_files: bool =
             }
         } elif event.event_type == "steps_done" {
             emit_event("llm_steps_done", dict(event.data));
+        } elif event.event_type == "stream_reset" {
+            # byllm retried a transient mid-stream drop; drop the partial subagent
+            # reply so the regenerated text isn't doubled.
+            content = "";
+            emit_event("llm_stream_reset", dict(event.data));
         } elif event.event_type == "chunk" {
             content += event.data.get("content", "");
         } elif event.event_type == "usage" {
@@ -169,3 +116,11 @@ impl ExplorerAgent.execute with MainAgent entry {
     self.result_files = [];
     self.result_errors = list(result["errors"]);
 }
+
+
+impl UIDesignerAgent.execute with MainAgent entry {
+    result = _consume_subagent_stream(
+        self.do_work(task_str=self.task), "sub:designer"
+    );
+    self.result_content = str(result["content"]);
+}