markdown-flow 0.4.2.dev2__tar.gz → 0.4.2.dev4__tar.gz

{markdown_flow-0.4.2.dev2 → markdown_flow-0.4.2.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-flow
-Version: 0.4.2.dev2
+Version: 0.4.2.dev4
 Summary: An agent library designed to parse and process MarkdownFlow documents
 Project-URL: Homepage, https://github.com/ai-shifu/markdown-flow-agent-py
 Project-URL: Bug Tracker, https://github.com/ai-shifu/markdown-flow-agent-py/issues

{markdown_flow-0.4.2.dev2 → markdown_flow-0.4.2.dev4}/markdown_flow/__init__.py

@@ -118,4 +118,4 @@ __all__ = [
     "format_variable_assignment",
 ]
 
-__version__ = "0.4.2.dev2"
+__version__ = "0.4.2.dev4"

{markdown_flow-0.4.2.dev2 → markdown_flow-0.4.2.dev4}/markdown_flow/parser/document_context.py

@@ -410,7 +410,8 @@ def _document_units(text: str) -> Iterator[tuple[int, int, bool]]:
                 continue
             if text.startswith("?[", at):
                 limit, closed = reader.blocks.interaction_limit(at + 2, lambda position: marker.end if (marker := read_variable_marker(text, position)) is not None else None)
-                interaction_until = limit if closed else limit - 1
+                if not (closed and text[limit + 1 : limit + 2] == "("):
+                    interaction_until = limit if closed else limit - 1
         if text.startswith("{{", at):
             marker = read_variable_marker(text, at)
             end = marker.end if marker is not None else len(text)
@@ -459,8 +460,11 @@ def find_document_interaction_spans(text: str) -> Iterator[tuple[int, int]]:
             if not closed:
                 at = end
                 continue
-            if text[end + 1 : end + 2] != "(":
-                yield at, end + 1
+            if text[end + 1 : end + 2] == "(":
+                # Replay the native label instead of losing its resource state.
+                at += 1
+                continue
+            yield at, end + 1
             at = end + 1
         else:
             at += 1

{markdown_flow-0.4.2.dev2 → markdown_flow-0.4.2.dev4}/markdown_flow/parser/output.py

@@ -31,6 +31,7 @@ def is_preserved_content_block(content: str) -> bool:
     Returns:
         True if content is fully wrapped by preserved markers
     """
+    content, _, _ = _protect_variable_names(content)
     content = content.strip()
     if not content:
         return False
@@ -104,6 +105,14 @@ def _protect_variable_names(content: str) -> tuple[str, dict[str, str], str]:
     return "".join(pieces), markers, prefix
 
 
+def _restore_variable_names(content: str, markers: dict[str, str], prefix: str) -> str:
+    """Restore protected marker source once after output syntax processing."""
+    if not markers:
+        return content
+    token_pattern = re.compile(re.escape(prefix) + r"[0-9]+\x00")
+    return token_pattern.sub(lambda match: markers[match.group()], content)
+
+
 def process_output_instructions(content: str) -> tuple[str, bool]:
     """
     Process output instruction markers, converting === and !=== formats to XML format.
@@ -231,9 +240,7 @@ def process_output_instructions(content: str) -> tuple[str, bool]:
 
     # Assemble final content
     processed_content = "\n".join(result_lines)
-    if variable_markers:
-        token_pattern = re.compile(re.escape(variable_prefix) + r"[0-9]+\x00")
-        processed_content = token_pattern.sub(lambda match: variable_markers[match.group()], processed_content)
+    processed_content = _restore_variable_names(processed_content, variable_markers, variable_prefix)
 
     # Return both processed content and whether it contains preserved content
     return processed_content, has_output_instruction
@@ -251,6 +258,7 @@ def extract_preserved_content(content: str) -> str:
     Returns:
         Actual content with === and !=== markers removed
     """
+    content, variable_markers, variable_prefix = _protect_variable_names(content)
     content = content.strip()
     if not content:
         return ""
@@ -275,4 +283,4 @@ def extract_preserved_content(content: str) -> str:
             # Normal content line, keep
             result_lines.append(line)
 
-    return "\n".join(result_lines)
+    return _restore_variable_names("\n".join(result_lines), variable_markers, variable_prefix)

{markdown_flow-0.4.2.dev2 → markdown_flow-0.4.2.dev4}/markdown_flow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown-flow
-Version: 0.4.2.dev2
+Version: 0.4.2.dev4
 Summary: An agent library designed to parse and process MarkdownFlow documents
 Project-URL: Homepage, https://github.com/ai-shifu/markdown-flow-agent-py
 Project-URL: Bug Tracker, https://github.com/ai-shifu/markdown-flow-agent-py/issues