kiwi-code 0.0.513__tar.gz → 0.0.514__tar.gz

{kiwi_code-0.0.513 → kiwi_code-0.0.514}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: kiwi-code
-Version: 0.0.513
+Version: 0.0.514
 Summary: A textual-based terminal user interface application
 Project-URL: Homepage, https://kiwicode.ai
 Author-email: Anurag <anurag@meetkiwi.co>

{kiwi_code-0.0.513 → kiwi_code-0.0.514}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kiwi-code"
-version = "0.0.513"
+version = "0.0.514"
 description = "A textual-based terminal user interface application"
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.11,<4.0"

{kiwi_code-0.0.513 → kiwi_code-0.0.514}/src/kiwi_tui/role_mode.py

@@ -113,7 +113,20 @@ def mode_skill_line(*, role: str, mode: str) -> str:
 
 
 
+SYSTEM_PROMPT_HEADING = "# System Prompt"
+MODE_SKILL_INTRO = "Plus use this exact mode skill(only)."
+
+# Wording sent by older versions; still stripped when rendering stored history.
+_LEGACY_MODE_SKILL_INTRO = "Plus extract this exact mode skill(only)."
+
+
 def _general_role_line(role: str) -> str:
+    return (
+        f"Your Current Role is : {role}. Use autocode.{role}.general skill and act accordingly."
+    )
+
+
+def _legacy_general_role_line(role: str) -> str:
     return (
         f"Your Current Role is : {role}. Fetch autocode.{role}.general skill and act accordingly."
     )
@@ -122,14 +135,35 @@ def _general_role_line(role: str) -> str:
 _SKILL_LINE_RE = re.compile(r"^autocode\.([a-z\-]+)\.(plan|build|validate) skill$")
 
 
-def strip_injected_prefix(text: str) -> str:
-    """Strip the silent injection prefix (if present) from a stored user prompt.
+def _injected_lines_end(lines: list[str], start: int) -> int:
+    """Index just past the injected role/mode lines found at `start` (== start if none)."""
+    i = start
+    current = (lines[i] or "").strip() if i < len(lines) else ""
+    for r in CANONICAL_ROLES:
+        if current in (_general_role_line(r), _legacy_general_role_line(r)):
+            i += 1
+            break
+
+    if i < len(lines) and (lines[i] or "").strip() in (MODE_SKILL_INTRO, _LEGACY_MODE_SKILL_INTRO):
+        # Skip the "Plus..." line
+        i += 1
+        # Skip the skill line only if it matches the expected pattern.
+        if i < len(lines) and _SKILL_LINE_RE.match((lines[i] or "").strip()):
+            i += 1
+    return i
+
+
+def strip_injected_prompt(text: str) -> str:
+    """Strip the silent role/mode injection (if present) from a stored user prompt.
 
     The backend persists the full user_input we send, which will include the
-    injected prefix. When rendering conversation history, we must not show these
+    injected lines. When rendering conversation history, we must not show these
     injected lines to the user.
 
-    We only strip when the prefix matches *exactly* our known injection format,
+    Current format: the user's text, then a "# System Prompt" block at the end.
+    Older formats put the injected lines (with or without the heading) first.
+
+    We only strip when the lines match *exactly* our known injection format,
     to avoid altering legitimate user content.
     """
     raw = (text or "")
@@ -140,19 +174,29 @@ def strip_injected_prefix(text: str) -> str:
     if not lines:
         return raw
 
+    # Current format: a trailing "# System Prompt" block that runs to the end.
+    for h in range(len(lines) - 1, -1, -1):
+        if (lines[h] or "").strip() != SYSTEM_PROMPT_HEADING:
+            continue
+        end = _injected_lines_end(lines, h + 1)
+        if end > h + 1 and all(not (rest or "").strip() for rest in lines[end:]):
+            body = lines[:h]
+            while body and body[-1] == "":
+                body.pop()
+            return "\n".join(body)
+        break
+
+    # Older formats: injected lines at the start.
     i = 0
-    first = (lines[0] or "").strip()
-    for r in CANONICAL_ROLES:
-        if first == _general_role_line(r):
-            i = 1
-            break
-
-    if i < len(lines) and (lines[i] or "").strip() == "Plus extract this exact mode skill(only).":
-        # Skip the "Plus..." line
-        i += 1
-        # Skip the skill line only if it matches the expected pattern.
-        if i < len(lines) and _SKILL_LINE_RE.match((lines[i] or "").strip()):
-            i += 1
+    has_heading = (lines[0] or "").strip() == SYSTEM_PROMPT_HEADING
+    if has_heading:
+        i = 1
+    body_start = i
+    i = _injected_lines_end(lines, i)
+
+    # A heading with no injected lines after it is the user's own text; keep it.
+    if has_heading and i == body_start:
+        return raw
 
     # Skip blank separator lines
     while i < len(lines) and lines[i] == "":
@@ -223,7 +267,8 @@ def build_model_user_prompt(
 ) -> tuple[str, RoleModeState]:
     """Return (model_user_prompt, new_state).
 
-    The returned prompt includes any required silent injection prefix.
+    The user's text comes first; any required silent injection follows it as a
+    "# System Prompt" block.
 
     Injection rules:
     - If first model prompt OR role changed: inject the role+general line.
@@ -236,16 +281,16 @@ def build_model_user_prompt(
     inject_general = is_first or state.role_changed
     inject_mode = is_first or state.role_changed or state.mode_changed
 
-    prefix = ""
+    injected: list[str] = []
     if inject_general:
-        prefix += (
-            f"Your Current Role is : {state.role}. Fetch autocode.{state.role}.general skill and act accordingly.\n"
-        )
+        injected.append(_general_role_line(state.role))
     if inject_mode:
-        prefix += "Plus extract this exact mode skill(only).\n"
-        prefix += mode_skill_line(role=state.role, mode=state.mode) + "\n"
+        injected.append(MODE_SKILL_INTRO)
+        injected.append(mode_skill_line(role=state.role, mode=state.mode))
 
-    model_prompt = prefix + (raw_user_prompt or "")
+    model_prompt = raw_user_prompt or ""
+    if injected:
+        model_prompt += "\n\n" + "\n".join([SYSTEM_PROMPT_HEADING, *injected])
 
     new_state = replace(
         state,

{kiwi_code-0.0.513 → kiwi_code-0.0.514}/src/kiwi_tui/screens/term_dashboard.py

@@ -28,13 +28,14 @@ from kiwi_tui.random_words import random_verb
 from kiwi_tui.role_mode import (
     RoleModeState,
     ROLE_DISPLAY,
+    SYSTEM_PROMPT_HEADING,
     allowed_modes_for_role,
     build_model_user_prompt,
     parse_mode_arg,
     parse_role_arg,
     set_mode,
     set_role,
-    strip_injected_prefix,
+    strip_injected_prompt,
 )
 from kiwi_tui.screens.file_browser import FileBrowserScreen
 from kiwi_tui.screens.help import HelpScreen
@@ -3813,7 +3814,7 @@ class TermDashboardScreen(Screen):
             show(f"Could not read the queue ({lines[0]}).", is_error=True)
             return
         # AutoCode prompts are stored with their role/mode lines; show what was typed.
-        prompts = [strip_injected_prefix(prompt) for prompt in found[0]]
+        prompts = [strip_injected_prompt(prompt) for prompt in found[0]]
         if run_id == self.current_run_id:
             self._waiting_locally()[:] = prompts
             self._set_queued_count(len(prompts))
@@ -3827,7 +3828,7 @@ class TermDashboardScreen(Screen):
         known = self._waiting_locally() if run_id == self.current_run_id else []
         expected = known[number - 1] if number <= len(known) else None
         is_expected = (
-            (lambda stored: strip_injected_prefix(stored).strip() == expected.strip())
+            (lambda stored: strip_injected_prompt(stored).strip() == expected.strip())
             if expected is not None else None
         )
         outcome: list[QueueRemoval] = []
@@ -3857,7 +3858,7 @@ class TermDashboardScreen(Screen):
             if number <= len(known):
                 del known[number - 1]
             self._set_queued_count(result.waiting)
-        text = " ".join(strip_injected_prefix(result.removed).split())
+        text = " ".join(strip_injected_prompt(result.removed).split())
         toast(
             f"Removed: {text if len(text) <= 60 else text[:59] + '…'}  ({result.waiting} waiting)",
             title="/queue",
@@ -4537,8 +4538,10 @@ class TermDashboardScreen(Screen):
             )
             user_text = str(extracted_in or "").strip()
             logger.info(f"user text : {user_text}")
-            if is_autocode_run or ("Your Current Role is" in user_text and "autocode." in user_text):
-                user_text = strip_injected_prefix(user_text)
+            if is_autocode_run or SYSTEM_PROMPT_HEADING in user_text or (
+                "Your Current Role is" in user_text and "autocode." in user_text
+            ):
+                user_text = strip_injected_prompt(user_text)
 
             logger.info(f"User Text after stripping : {user_text}")
         assistant_text = None

{kiwi_code-0.0.513 → kiwi_code-0.0.514}/tests/test_role_mode_injection.py

@@ -14,7 +14,7 @@ from kiwi_tui.role_mode import (
     parse_role_arg,
     set_mode,
     set_role,
-    strip_injected_prefix,
+    strip_injected_prompt,
 )
 
 
@@ -58,14 +58,14 @@ def test_first_prompt_injects_general_and_mode_lines() -> None:
     state = RoleModeState()  # default
     model_prompt, new_state = build_model_user_prompt(state, raw_user_prompt="Hello")
 
-    assert "Your Current Role is :" in model_prompt
-    assert (
-        f"Your Current Role is : {DEFAULT_ROLE}. Fetch autocode.{DEFAULT_ROLE}.general skill"
-        in model_prompt
+    assert model_prompt == (
+        "Hello\n"
+        "\n"
+        "# System Prompt\n"
+        f"Your Current Role is : {DEFAULT_ROLE}. Use autocode.{DEFAULT_ROLE}.general skill and act accordingly.\n"
+        "Plus use this exact mode skill(only).\n"
+        f"autocode.{DEFAULT_ROLE}.{DEFAULT_MODE} skill"
     )
-    assert "Plus extract this exact mode skill(only)." in model_prompt
-    assert f"autocode.{DEFAULT_ROLE}.{DEFAULT_MODE} skill" in model_prompt
-    assert model_prompt.endswith("Hello")
 
     assert new_state.has_sent_model_prompt is True
     assert new_state.role_changed is False
@@ -82,10 +82,10 @@ def test_role_change_forces_mode_build_and_triggers_injection_on_next_prompt() -
 
     model_prompt, state3 = build_model_user_prompt(state2, raw_user_prompt="Next")
 
+    assert model_prompt.startswith("Next\n\n# System Prompt\n")
     assert f"Your Current Role is : {ROLE_ZERO_TO_ONE_ENGINEER}." in model_prompt
-    assert "Plus extract this exact mode skill(only)." in model_prompt
-    assert "autocode.zero-to-one-engineer.build skill" in model_prompt
-    assert model_prompt.endswith("Next")
+    assert "Plus use this exact mode skill(only)." in model_prompt
+    assert model_prompt.endswith("autocode.zero-to-one-engineer.build skill")
 
     assert state3.role_changed is False
     assert state3.mode_changed is False
@@ -98,9 +98,13 @@ def test_mode_change_triggers_only_mode_injection_not_general() -> None:
 
     model_prompt, _ = build_model_user_prompt(state2, raw_user_prompt="Ping")
 
-    assert "Your Current Role is :" not in model_prompt
-    assert "Plus extract this exact mode skill(only)." in model_prompt
-    assert "autocode.senior-software-engineer.validate skill" in model_prompt
+    assert model_prompt == (
+        "Ping\n"
+        "\n"
+        "# System Prompt\n"
+        "Plus use this exact mode skill(only).\n"
+        "autocode.senior-software-engineer.validate skill"
+    )
 
 
 def test_x2se_disallows_plan_without_error() -> None:
@@ -112,20 +116,74 @@ def test_x2se_disallows_plan_without_error() -> None:
     assert state2.mode == MODE_BUILD
 
 
-def test_strip_injected_prefix_strips_general_and_mode_block() -> None:
+def test_no_change_sends_prompt_without_system_prompt() -> None:
+    state = RoleModeState(has_sent_model_prompt=True)
+    model_prompt, _ = build_model_user_prompt(state, raw_user_prompt="Plain")
+    assert model_prompt == "Plain"
+
+
+def test_strip_injected_prompt_strips_trailing_general_and_mode_block() -> None:
+    injected = (
+        "Hello world\n"
+        "\n"
+        "# System Prompt\n"
+        f"Your Current Role is : {DEFAULT_ROLE}. Use autocode.{DEFAULT_ROLE}.general skill and act accordingly.\n"
+        "Plus use this exact mode skill(only).\n"
+        f"autocode.{DEFAULT_ROLE}.{DEFAULT_MODE} skill"
+    )
+    assert strip_injected_prompt(injected) == "Hello world"
+
+
+def test_strip_injected_prompt_strips_trailing_mode_only_block() -> None:
+    injected = (
+        "Ping\n"
+        "\n"
+        "# System Prompt\n"
+        "Plus use this exact mode skill(only).\n"
+        "autocode.senior-software-engineer.validate skill"
+    )
+    assert strip_injected_prompt(injected) == "Ping"
+
+
+def test_strip_injected_prompt_round_trips_built_prompt() -> None:
+    raw = "first line\n\nsecond paragraph"
+    model_prompt, _ = build_model_user_prompt(RoleModeState(), raw_user_prompt=raw)
+    assert strip_injected_prompt(model_prompt) == raw
+
+
+def test_strip_injected_prompt_keeps_users_own_heading() -> None:
+    text = "# System Prompt\nthis is my own markdown"
+    assert strip_injected_prompt(text) == text
+    trailing = "notes\n\n# System Prompt\nmy own section"
+    assert strip_injected_prompt(trailing) == trailing
+
+
+def test_strip_injected_prompt_strips_leading_heading_block() -> None:
+    # Format briefly sent before the block moved below the user's text.
+    injected = (
+        "# System Prompt\n"
+        f"Your Current Role is : {DEFAULT_ROLE}. Use autocode.{DEFAULT_ROLE}.general skill and act accordingly.\n"
+        "Plus use this exact mode skill(only).\n"
+        f"autocode.{DEFAULT_ROLE}.{DEFAULT_MODE} skill\n"
+        "hello"
+    )
+    assert strip_injected_prompt(injected) == "hello"
+
+
+def test_strip_injected_prompt_strips_legacy_general_and_mode_block() -> None:
     injected = (
         f"Your Current Role is : {DEFAULT_ROLE}. Fetch autocode.{DEFAULT_ROLE}.general skill and act accordingly.\n"
         "Plus extract this exact mode skill(only).\n"
         f"autocode.{DEFAULT_ROLE}.{DEFAULT_MODE} skill\n"
         "Hello world"
     )
-    assert strip_injected_prefix(injected) == "Hello world"
+    assert strip_injected_prompt(injected) == "Hello world"
 
 
-def test_strip_injected_prefix_strips_mode_only_block() -> None:
+def test_strip_injected_prompt_strips_legacy_mode_only_block() -> None:
     injected = (
         "Plus extract this exact mode skill(only).\n"
         "autocode.senior-software-engineer.validate skill\n"
         "Ping"
     )
-    assert strip_injected_prefix(injected) == "Ping"
+    assert strip_injected_prompt(injected) == "Ping"

{kiwi_code-0.0.513 → kiwi_code-0.0.514}/uv.lock

@@ -412,7 +412,7 @@ wheels = [
 
 [[package]]
 name = "kiwi-code"
-version = "0.0.513"
+version = "0.0.514"
 source = { editable = "." }
 dependencies = [
     { name = "codeglass" },