flowsh-cli 0.8.0__tar.gz → 0.8.2__tar.gz

{flowsh_cli-0.8.0 → flowsh_cli-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowsh-cli
-Version: 0.8.0
+Version: 0.8.2
 Summary: Generate Bash harness scripts from workflow YAML files.
 License-Expression: MIT
 Classifier: Programming Language :: Python :: 3.11
@@ -88,10 +88,10 @@ Harness paths are derived from workflow ids. `wf_example` becomes `example.sh` i
 
 | Type | Purpose | Notes |
 |---|---|---|
-| `vars` | Capture command output into exported shell variables | Variable names must be uppercase shell identifiers. |
+| `vars` | Execute shell commands and export their stdout into shell variables | Variable names must be uppercase shell identifiers. |
 | `bash` | Run shell commands | Runs with `bash -euo pipefail`. |
 | `agent` | Call OpenCode | Supports `agent`, `model`, `command`, `expandPrompt`, and `dangerouslySkipPermissions`. |
-| `for` | Iterate over newline-delimited input | Flat iteration only; nested `for` steps are not supported. |
+| `for` | Iterate over newline-delimited values from a previous `vars` step | Flat iteration only; nested `for` steps are not supported. |
 | `parallel` | Run child steps concurrently | Children run as separate branches and the parent waits for all of them. |
 
 ## Agent Behavior

{flowsh_cli-0.8.0 → flowsh_cli-0.8.2}/README.md

@@ -72,10 +72,10 @@ Harness paths are derived from workflow ids. `wf_example` becomes `example.sh` i
 
 | Type | Purpose | Notes |
 |---|---|---|
-| `vars` | Capture command output into exported shell variables | Variable names must be uppercase shell identifiers. |
+| `vars` | Execute shell commands and export their stdout into shell variables | Variable names must be uppercase shell identifiers. |
 | `bash` | Run shell commands | Runs with `bash -euo pipefail`. |
 | `agent` | Call OpenCode | Supports `agent`, `model`, `command`, `expandPrompt`, and `dangerouslySkipPermissions`. |
-| `for` | Iterate over newline-delimited input | Flat iteration only; nested `for` steps are not supported. |
+| `for` | Iterate over newline-delimited values from a previous `vars` step | Flat iteration only; nested `for` steps are not supported. |
 | `parallel` | Run child steps concurrently | Children run as separate branches and the parent waits for all of them. |
 
 ## Agent Behavior

{flowsh_cli-0.8.0 → flowsh_cli-0.8.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "flowsh-cli"
-version = "0.8.0"
+version = "0.8.2"
 description = "Generate Bash harness scripts from workflow YAML files."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -42,3 +42,6 @@ target-version = "py311"
 
 [tool.ruff.lint]
 select = ["E", "F", "I", "UP", "B", "SIM"]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/test_workflow_to_harness.py" = ["E501"]

{flowsh_cli-0.8.0 → flowsh_cli-0.8.2}/src/flowsh_cli/__init__.py

@@ -3,7 +3,7 @@
 from flowsh_cli.models import Workflow, WorkflowParseError, parse_workflows
 from flowsh_cli.render import harness_path, render_harness
 
-__version__ = "0.8.0"
+__version__ = "0.8.2"
 
 __all__ = [
     "Workflow",

{flowsh_cli-0.8.0 → flowsh_cli-0.8.2}/src/flowsh_cli/cli.py

@@ -20,7 +20,6 @@ app = typer.Typer(
     context_settings={"terminal_width": 120, "max_content_width": 120},
     help="Generate reproducible OpenCode Bash harness scripts from MADE workflow YAML.",
     pretty_exceptions_enable=False,
-    rich_markup_mode=None,
 )
 
 

{flowsh_cli-0.8.0 → flowsh_cli-0.8.2}/src/flowsh_cli/models.py

@@ -46,6 +46,7 @@ class StrictModel(BaseModel):
 
 class BaseStep(StrictModel):
     name: str | None = None
+    when: str | None = None
 
     @field_validator("name")
     @classmethod
@@ -56,6 +57,15 @@ class BaseStep(StrictModel):
             raise ValueError("must not contain control characters")
         return value
 
+    @field_validator("when")
+    @classmethod
+    def validate_when(cls, value: str | None) -> str | None:
+        if value is not None and value.strip() == "":
+            raise ValueError("must not be empty")
+        if value is not None and has_unsafe_control_characters(value):
+            raise ValueError("must not contain unsafe control characters")
+        return value
+
 
 class BashStep(BaseStep):
     type: Literal["bash"]
@@ -135,7 +145,14 @@ class AgentStep(BaseStep):
 
 class VarsStep(BaseStep):
     type: Literal["vars"]
-    values: dict[str, str]
+    values: dict[str, str] = Field(
+        description=(
+            "Each value is a shell command. "
+            "The command is executed and its stdout (stripped of trailing newline) "
+            "becomes the variable value. "
+            "It is NOT a literal string."
+        )
+    )
 
     @field_validator("values")
     @classmethod
@@ -156,8 +173,19 @@ class VarsStep(BaseStep):
 
 class ForStep(BaseStep):
     type: Literal["for"]
-    in_: str = Field(..., validation_alias="in")
-    item: str = Field(...)
+    in_: str = Field(
+        ...,
+        validation_alias="in",
+        description=(
+            "Name of a variable (defined by a preceding vars step) whose value is "
+            "a newline-delimited list. "
+            "Each line becomes one iteration."
+        ),
+    )
+    item: str = Field(
+        ...,
+        description="Name of the shell variable exported into each iteration body.",
+    )
     steps: list[Step] = Field(min_length=1)
 
     @field_validator("in_", "item")

{flowsh_cli-0.8.0 → flowsh_cli-0.8.2}/src/flowsh_cli/render.py

@@ -241,7 +241,7 @@ def render_step(index: int, step: Step, used_function_names: set[str] | None = N
             inner_title = inner_step.name or default_step_title(i, inner_step)
             prefix_lines.append(section(f"For-inner step ({inner_step.type}): {inner_title}"))
             prefix_lines.append(f"{inner_fn}() {{")
-            prefix_lines.extend(_render_step_body(inner_step))
+            prefix_lines.extend(_render_step_body(inner_step, inner_title))
             prefix_lines.append("}")
             prefix_lines.append("")
 
@@ -259,7 +259,7 @@ def render_step(index: int, step: Step, used_function_names: set[str] | None = N
             child_fns.append(child_fn)
             prefix_lines.append(section(f"Parallel child {i} ({child.type}): {child_title}"))
             prefix_lines.append(f"{child_fn}() {{")
-            prefix_lines.extend(_render_step_body(child))
+            prefix_lines.extend(_render_step_body(child, child_title))
             prefix_lines.append("}")
             prefix_lines.append("")
 
@@ -271,23 +271,36 @@ def render_step(index: int, step: Step, used_function_names: set[str] | None = N
             body_lines.append(f'  wait "$pid_{child_fn}" || status=$?')
         body_lines.append('  return "$status"')
     else:
-        body_lines = _render_step_body(step)
+        body_lines = _render_step_body(step, title)
 
     runner = "run_stateful_step" if isinstance(step, (VarsStep, ForStep)) else "run_step"
     outer_lines = [
         section(f"Step {index} ({step.type}): {title}"),
         f"{function_name}() {{",
-        *body_lines,
-        "}",
-        f"{runner} {function_name}",
-        "",
     ]
+
+    outer_lines.extend(body_lines)
+    outer_lines.extend(
+        [
+            "}",
+            f"{runner} {function_name}",
+            "",
+        ]
+    )
     return prefix_lines + outer_lines
 
 
-def _render_step_body(step: Step) -> list[str]:
+def _render_step_body(step: Step, title: str) -> list[str]:
     """Return indented body lines for a step function (no wrapper, no run_step call)."""
     lines: list[str] = []
+
+    if step.when is not None:
+        lines.append(f"  if ! ({step.when}); then")
+        lines.append(f"    log INFO {bash_quote(f'Step skipped (when): {title}')}")
+        lines.append("    return 0")
+        lines.append("  fi")
+        lines.append("")
+
     if isinstance(step, VarsStep):
         lines.append("  local status=0")
         for name, command in step.values.items():