feat: add TemplatableInt32.ToValue() helper and use it in ToMap()

Copilot · pelikhan · web-flow · commit 820d4643c303 · 2026-04-01T12:41:05.000Z
Agent-Logs-Url: https://github.com/github/gh-aw/sessions/eb163ff9-7e13-4960-a275-ac6ca9961fa8 Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
diff --git a/pkg/workflow/frontmatter_types.go b/pkg/workflow/frontmatter_types.go
@@ -538,12 +538,7 @@ func (fc *FrontmatterConfig) ToMap() map[string]any {
 		result["version"] = fc.Version
 	}
 	if fc.TimeoutMinutes != nil {
-		// Return as integer for numeric literals, string for expressions
-		if fc.TimeoutMinutes.IsExpression() {
-			result["timeout-minutes"] = fc.TimeoutMinutes.String()
-		} else {
-			result["timeout-minutes"] = fc.TimeoutMinutes.IntValue()
-		}
+		result["timeout-minutes"] = fc.TimeoutMinutes.ToValue()
 	}
 	if fc.Strict != nil {
 		result["strict"] = *fc.Strict
diff --git a/pkg/workflow/templatables.go b/pkg/workflow/templatables.go
@@ -112,6 +112,22 @@ func (t *TemplatableInt32) IntValue() int {
 	return 0 // expression strings are not evaluable at compile time
 }
 
+// ToValue returns the native Go value for use in map literals and JSON output:
+//   - an int for numeric literals (e.g. 30)
+//   - a string for GitHub Actions expressions (e.g. "${{ inputs.timeout }}")
+//
+// This is the canonical helper for producing a map[string]any entry;
+// callers should prefer it over calling IsExpression + IntValue/String manually.
+func (t *TemplatableInt32) ToValue() any {
+	if t.IsExpression() {
+		return string(*t)
+	}
+	if n, err := strconv.Atoi(string(*t)); err == nil {
+		return n
+	}
+	return string(*t)
+}
+
 // Ptr returns a pointer to a copy of t, convenient for constructing
 // *TemplatableInt32 values inline.
 func (t *TemplatableInt32) Ptr() *TemplatableInt32 {

Original file line number	Diff line number	Diff line change
`@@ -538,12 +538,7 @@ func (fc *FrontmatterConfig) ToMap() map[string]any {`
`538`	`538`	`result["version"] = fc.Version`
`539`	`539`	`}`
`540`	`540`	`if fc.TimeoutMinutes != nil {`
`541`		`- // Return as integer for numeric literals, string for expressions`
`542`		`- if fc.TimeoutMinutes.IsExpression() {`
`543`		`- result["timeout-minutes"] = fc.TimeoutMinutes.String()`
`544`		`- } else {`
`545`		`- result["timeout-minutes"] = fc.TimeoutMinutes.IntValue()`
`546`		`- }`
	`541`	`+ result["timeout-minutes"] = fc.TimeoutMinutes.ToValue()`
`547`	`542`	`}`
`548`	`543`	`if fc.Strict != nil {`
`549`	`544`	`result["strict"] = *fc.Strict`