zrb 1.10.0__tar.gz → 1.10.2__tar.gz

{zrb-1.10.0 → zrb-1.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.10.0
+Version: 1.10.2
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.10.0 → zrb-1.10.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.10.0"
+version = "1.10.2"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

{zrb-1.10.0 → zrb-1.10.2}/src/zrb/__init__.py

@@ -47,7 +47,7 @@ _LAZY_LOAD = {
     "BaseTrigger": "zrb.task.base_trigger",
     "CmdTask": "zrb.task.cmd_task",
     "HttpCheck": "zrb.task.http_check",
-    "ConversationHistoryData": "zrb.task.llm.history",
+    "ConversationHistory": "zrb.task.llm.conversation_history",
     "LLMTask": "zrb.task.llm_task",
     "make_task": "zrb.task.make_task",
     "RsyncTask": "zrb.task.rsync_task",
@@ -107,7 +107,7 @@ if TYPE_CHECKING:
     from zrb.task.base_trigger import BaseTrigger
     from zrb.task.cmd_task import CmdTask
     from zrb.task.http_check import HttpCheck
-    from zrb.task.llm.conversation_history import ConversationHistoryData
+    from zrb.task.llm.conversation_history import ConversationHistory
     from zrb.task.llm_task import LLMTask
     from zrb.task.make_task import make_task
     from zrb.task.rsync_task import RsyncTask

{zrb-1.10.0 → zrb-1.10.2}/src/zrb/builtin/llm/history.py

@@ -11,7 +11,7 @@ from zrb.util.file import read_file, write_file
 def read_chat_conversation(ctx: AnySharedContext) -> dict[str, Any] | list | None:
     """Reads conversation history from the session file.
     Returns the raw dictionary or list loaded from JSON, or None if not found/empty.
-    The LLMTask will handle parsing this into ConversationHistoryData.
+    The LLMTask will handle parsing this into ConversationHistory.
     """
     if ctx.input.start_new:
         return None  # Indicate no history to load

{zrb-1.10.0 → zrb-1.10.2}/src/zrb/config/llm_config.py

@@ -83,7 +83,7 @@ _DEFAULT_SYSTEM_PROMPT = (
 ).strip()
 
 _DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
-    "## Guiding Principles\n"
+    "# Guiding Principles\n"
     "- **Clarify and Scope First:** Before undertaking any complex task (like "
     "writing a new feature or a large test suite), you MUST ensure the request "
     "is not ambiguous. If it is, ask clarifying questions. Propose a concise "
@@ -97,7 +97,7 @@ _DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
     "conventions.\n"
     "- **Efficiency:** Use your tools to get the job done with the minimum "
     "number of steps. Combine commands where possible.\n\n"
-    "## Critical Prohibitions\n"
+    "# Critical Prohibitions\n"
     "- **NEVER Assume Dependencies:** Do not use a library or framework unless "
     "you have first verified it is an existing project dependency (e.g., in "
     "`package.json`, `requirements.txt`).\n"
@@ -108,7 +108,7 @@ _DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
     "- **NEVER Commit Without Verification:** Do not use `git commit` until you "
     "have staged the changes and run the project's own verification steps "
     "(tests, linter, build).\n\n"
-    "## Common Task Workflows\n\n"
+    "# Common Task Workflows\n\n"
     "**File System Operations:**\n"
     "1.  **Analyze:** Before modifying, read the file or list the "
     "directory.\n"
@@ -160,7 +160,7 @@ _DEFAULT_SPECIAL_INSTRUCTION_PROMPT = (
     "reputable sources.\n"
     "3.  **Synthesize & Cite:** Present the information clearly. For factual "
     "claims, cite the source URL.\n\n"
-    "## Communicating with the User\n"
+    "# Communicating with the User\n"
     "- **Be Concise:** When reporting results, be brief. Focus on the outcome "
     "and the verification step.\n"
     "- **Explain 'Why,' Not Just 'What':** For complex changes or bug fixes, "
@@ -187,7 +187,7 @@ _DEFAULT_SUMMARIZATION_PROMPT = (
     "    - Identify any new, stable, and globally relevant information from "
     "the recent conversation. This includes user preferences, high-level "
     "goals, or facts that will be true regardless of the current working "
-    "directory.\n"
+    "directory. Only extract facts.\n"
     "    - If you find such information, use the `write_long_term_note` tool "
     "to save a concise, updated version of the note. Keep it brief and "
     "factual.\n\n"
@@ -195,7 +195,9 @@ _DEFAULT_SUMMARIZATION_PROMPT = (
     "    - Read the existing `Contextual` note.\n"
     "    - Identify new information relevant *only* to the current project "
     "or directory. This could be the file the user is working on, the "
-    "specific bug they are fixing, or the feature they are building.\n"
+    "specific bug they are fixing, or the feature they are building. "
+    "This note might contain temporary context, and information should be "
+    "deleted once it is no longer relevant.\n"
     "    - Use the `write_contextual_note` tool to save a concise, updated "
     "note about the current working context. This note should be focused on "
     "the immediate task at hand.\n\n"

{zrb-1.10.0 → zrb-1.10.2}/src/zrb/task/llm/conversation_history_model.py

@@ -81,9 +81,11 @@ class ConversationHistory:
         return None
 
     def fetch_newest_notes(self):
+        self.long_term_note = ""
         long_term_note_path = self._get_long_term_note_path()
         if os.path.isfile(long_term_note_path):
             self.long_term_note = read_file(long_term_note_path)
+        self.contextual_note = ""
         contextual_note_path = self._get_contextual_note_path()
         if os.path.isfile(contextual_note_path):
             self.contextual_note = read_file(contextual_note_path)

{zrb-1.10.0 → zrb-1.10.2}/src/zrb/task/llm/prompt.py

@@ -153,16 +153,30 @@ def extract_conversation_context(user_message: str) -> tuple[str, str]:
             modified_user_message = modified_user_message.replace(f"@{ref}", ref, 1)
     conversation_context = "\n".join(
         [
-            make_prompt_section(
-                "Current Time", datetime.now(timezone.utc).astimezone().isoformat()
-            ),
-            make_prompt_section("Current Working Directory", os.getcwd()),
             make_prompt_section("Current OS", platform.system()),
             make_prompt_section("OS Version", platform.version()),
             make_prompt_section("Python Version", platform.python_version()),
             make_prompt_section("Apendixes", "\n".join(apendixes)),
         ]
     )
+    iso_date = datetime.now(timezone.utc).astimezone().isoformat()
+    current_directory = os.getcwd()
+    modified_user_message = "\n".join(
+        [
+            make_prompt_section("User Message", modified_user_message),
+            make_prompt_section(
+                "Context",
+                "\n".join(
+                    [
+                        make_prompt_section(
+                            "Current working directory", current_directory
+                        ),
+                        make_prompt_section("Current time", iso_date),
+                    ]
+                ),
+            ),
+        ]
+    )
     return conversation_context, modified_user_message