apply feedback

yottahmd · yottahmd · commit d75c716c933d · 2025-12-26T23:41:29.000+09:00
diff --git a/internal/core/step.go b/internal/core/step.go
@@ -165,13 +165,13 @@ func (s *Step) UnmarshalJSON(data []byte) error {
 		return nil
 	}
 
-	// Migrate legacy fields to Commands field
-	s.Commands = []CommandEntry{
-		{
+	// Migrate legacy fields to Commands only when legacy command data exists.
+	if s.Command != "" || len(s.Args) > 0 || s.CmdWithArgs != "" {
+		s.Commands = []CommandEntry{{
 			Command:     s.Command,
 			Args:        s.Args,
 			CmdWithArgs: s.CmdWithArgs,
-		},
+		}}
 	}
 
 	return nil
diff --git a/internal/runtime/runner_helper_test.go b/internal/runtime/runner_helper_test.go
@@ -77,17 +77,22 @@ func withOutput(output string) stepOption {
 	}
 }
 
+// parseCommand parses a command string into a CommandEntry.
+func parseCommand(command string) core.CommandEntry {
+	cmd, args, err := cmdutil.SplitCommand(command)
+	if err != nil {
+		panic(fmt.Errorf("failed to parse command %q: %w", command, err))
+	}
+	return core.CommandEntry{
+		Command:     cmd,
+		Args:        args,
+		CmdWithArgs: command,
+	}
+}
+
 func withCommand(command string) stepOption {
 	return func(step *core.Step) {
-		cmd, args, err := cmdutil.SplitCommand(command)
-		if err != nil {
-			panic(fmt.Errorf("unexpected: %w", err))
-		}
-		step.Commands = []core.CommandEntry{{
-			Command:     cmd,
-			Args:        args,
-			CmdWithArgs: command,
-		}}
+		step.Commands = []core.CommandEntry{parseCommand(command)}
 	}
 }
 
@@ -133,18 +138,11 @@ func withMaxActiveRuns(n int) runnerOption {
 	}
 }
 
-func newHandlerStep(t *testing.T, name, id, command string) core.Step {
-	t.Helper()
-	cmd, args, err := cmdutil.SplitCommand(command)
-	require.NoError(t, err)
+func newHandlerStep(_ *testing.T, name, id, command string) core.Step {
 	return core.Step{
-		Name: name,
-		ID:   id,
-		Commands: []core.CommandEntry{{
-			Command:     cmd,
-			Args:        args,
-			CmdWithArgs: command,
-		}},
+		Name:     name,
+		ID:       id,
+		Commands: []core.CommandEntry{parseCommand(command)},
 	}
 }
 
